rtk: Pull SCO/ACL definitions here

* Dropped in QPR2, hold them here until we can properly deprecate.

Change-Id: If602ae8782a5f14c344a50ffa747cf9043bedc90

diff --git a/rtkbt/code/libbt-vendor/include/hci_definitions.h b/rtkbt/code/libbt-vendor/include/hci_definitions.h
new file mode 100644 (file)
index 0000000..806efcc
--- /dev/null
+++ b/rtkbt/code/libbt-vendor/include/hci_definitions.h
@@ -0,0 +1,25 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2024 The LineageOS Project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/* Message event ID passed from Host/Controller lib to stack */
+#define MSG_HC_TO_STACK_HCI_ACL 0x1100      /* eq. BT_EVT_TO_BTU_HCI_ACL */
+#define MSG_HC_TO_STACK_HCI_SCO 0x1200      /* eq. BT_EVT_TO_BTU_HCI_SCO */
+
+/* Message event ID passed from stack to vendor lib */
+#define MSG_STACK_TO_HC_HCI_ACL 0x2100 /* eq. BT_EVT_TO_LM_HCI_ACL */
+#define MSG_STACK_TO_HC_HCI_SCO 0x2200 /* eq. BT_EVT_TO_LM_HCI_SCO */

diff --git a/rtkbt/code/libbt-vendor/include/rtk_btsnoop_net.h b/rtkbt/code/libbt-vendor/include/rtk_btsnoop_net.h
index 8fa21d4b111c7103856b5902aaf9932889d775bb..2e8d1f7a78694a05ff6d3fc5f03799c666cb1bb3 100755 (executable)
--- a/rtkbt/code/libbt-vendor/include/rtk_btsnoop_net.h
+++ b/rtkbt/code/libbt-vendor/include/rtk_btsnoop_net.h
@@ -40,6 +40,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <time.h>
+#include "hci_definitions.h"
 #include "hci_h5_int.h"
 #include <utils/Log.h>
 #include <sys/stat.h>

diff --git a/rtkbt/code/libbt-vendor/src/hci_h5.c b/rtkbt/code/libbt-vendor/src/hci_h5.c
index fc59163a259d5e91201e61eab9499439416520bd..24e2cf956e1e86f38b18e0801951ee872fbad15d 100755 (executable)
--- a/rtkbt/code/libbt-vendor/src/hci_h5.c
+++ b/rtkbt/code/libbt-vendor/src/hci_h5.c
@@ -50,6 +50,7 @@
 #include <linux/wait.h>
 #include <hci_layer_legacy.h>
 
+#include "hci_definitions.h"
 #include "hci_h5_int.h"
 #include "bt_skbuff.h"
 #include "bt_list.h"

diff --git a/rtkbt/code/libbt-vendor/src/rtk_btsnoop_net.c b/rtkbt/code/libbt-vendor/src/rtk_btsnoop_net.c
index 27edcd7dad155c11b175fb0c0853d4368d75b18d..521e5f06a9f9c1abc85ac4a2dd4fbcd661a96bf3 100755 (executable)
--- a/rtkbt/code/libbt-vendor/src/rtk_btsnoop_net.c
+++ b/rtkbt/code/libbt-vendor/src/rtk_btsnoop_net.c
@@ -16,6 +16,7 @@
  *
  ******************************************************************************/
 #define LOG_TAG "rtk_btsnoop_net"
+#include "hci_definitions.h"
 #include "rtk_btsnoop_net.h"
 #include <unistd.h>
 #include <hci_layer_legacy.h>

diff --git a/rtkbt/code/libbt-vendor/src/userial_vendor.c b/rtkbt/code/libbt-vendor/src/userial_vendor.c
index 16cbe9966ca38ff6a33f66f24ea666c7dc8e71f8..23ac39444dd6417faf6c08d237361ec7af3b96ee 100755 (executable)
--- a/rtkbt/code/libbt-vendor/src/userial_vendor.c
+++ b/rtkbt/code/libbt-vendor/src/userial_vendor.c
@@ -32,6 +32,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <sys/eventfd.h>
+#include "hci_definitions.h"
 #include "userial.h"
 #include "userial_vendor.h"
 #include "rtk_socket.h"