Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf7424e8 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge "HCI 1.1"

parents c53e008d 03140459

system/hci/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ cc_defaults { 
    defaults: ["fluoride_defaults"],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "libhidlbase",

    ],

}

system/hci/include/bt_hci_bdroid.h

+3 −1
Original line number Diff line number Diff line
@@ -53,15 +53,17 @@ typedef enum { 
#define MSG_SUB_EVT_MASK 0x00FF /* eq. BT_SUB_EVT_MASK */



/* Message event ID passed from Host/Controller lib to stack */

#define MSG_HC_TO_STACK_HCI_ERR 0x1300      /* eq. BT_EVT_TO_BTU_HCIT_ERR */

#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 */

#define MSG_HC_TO_STACK_HCI_ERR 0x1300      /* eq. BT_EVT_TO_BTU_HCIT_ERR */

#define MSG_HC_TO_STACK_HCI_ISO 0x1700      /* eq. BT_EVT_TO_BTU_HCI_ISO */

#define MSG_HC_TO_STACK_HCI_EVT 0x1000      /* eq. BT_EVT_TO_BTU_HCI_EVT */

#define MSG_HC_TO_STACK_L2C_SEG_XMIT 0x1900 /* BT_EVT_TO_BTU_L2C_SEG_XMIT */



/* 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 */

#define MSG_STACK_TO_HC_HCI_ISO 0x2d00 /* eq. BT_EVT_TO_LM_HCI_ISO */

#define MSG_STACK_TO_HC_HCI_CMD 0x2000 /* eq. BT_EVT_TO_LM_HCI_CMD */



/* Local Bluetooth Controller ID for BR/EDR */

system/hci/include/hci_hal.h

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ typedef enum { 
  DATA_TYPE_COMMAND = 1,

  DATA_TYPE_ACL = 2,

  DATA_TYPE_SCO = 3,

  DATA_TYPE_EVENT = 4

  DATA_TYPE_EVENT = 4,

  DATA_TYPE_ISO = 5

} serial_data_type_t;



typedef void (*data_ready_cb)(serial_data_type_t type);

system/hci/include/hci_internals.h

+2 −0
Original line number Diff line number Diff line
@@ -26,3 +26,5 @@ 
#define HCI_SCO_PREAMBLE_SIZE 3

// 1 byte for event code, 1 byte for parameter length (Volume 2, Part E, 5.4.4)

#define HCI_EVENT_PREAMBLE_SIZE 2

// 2 bytes for handle, 2 bytes for data length (Volume 2, Part E, 5.4.5)

#define HCI_ISO_PREAMBLE_SIZE 4
 
 No newline at end of file

system/hci/include/hci_layer.h

+3 −1
Original line number Diff line number Diff line
@@ -37,15 +37,17 @@ static const char HCI_MODULE[] = "hci_module"; 
#define MSG_SUB_EVT_MASK 0x00FF /* eq. BT_SUB_EVT_MASK */



/* Message event ID passed from Host/Controller lib to stack */

#define MSG_HC_TO_STACK_HCI_ERR 0x1300      /* eq. BT_EVT_TO_BTU_HCIT_ERR */

#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 */

#define MSG_HC_TO_STACK_HCI_ERR 0x1300      /* eq. BT_EVT_TO_BTU_HCIT_ERR */

#define MSG_HC_TO_STACK_HCI_ISO 0x1700      /* eq. BT_EVT_TO_BTU_HCI_ISO */

#define MSG_HC_TO_STACK_HCI_EVT 0x1000      /* eq. BT_EVT_TO_BTU_HCI_EVT */

#define MSG_HC_TO_STACK_L2C_SEG_XMIT 0x1900 /* BT_EVT_TO_BTU_L2C_SEG_XMIT */



/* 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 */

#define MSG_STACK_TO_HC_HCI_ISO 0x2d00 /* eq. BT_EVT_TO_LM_HCI_ISO */

#define MSG_STACK_TO_HC_HCI_CMD 0x2000 /* eq. BT_EVT_TO_LM_HCI_CMD */



/* Local Bluetooth Controller ID for BR/EDR */