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

Commit 42c67c65 authored by Chris Manton's avatar Chris Manton
Browse files

Localize HCI_EIR_ definitions to used file 

Bug: 163134718
Tag: #refactor
Test: gd/cert/run
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ibf2378f93329653918202c1821e602b97865157d
parent 986fb371

system/stack/include/bt_types.h

+0 −20
Original line number Diff line number Diff line
@@ -448,24 +448,4 @@ typedef uint8_t COF[COF_LEN]; /* ciphering offset number */ 


#define BT_1SEC_TIMEOUT_MS (1 * 1000) /* 1 second */



#define BT_EIR_FLAGS_TYPE 0x01

#define BT_EIR_MORE_16BITS_UUID_TYPE 0x02

#define BT_EIR_COMPLETE_16BITS_UUID_TYPE 0x03

#define BT_EIR_MORE_32BITS_UUID_TYPE 0x04

#define BT_EIR_COMPLETE_32BITS_UUID_TYPE 0x05

#define BT_EIR_MORE_128BITS_UUID_TYPE 0x06

#define BT_EIR_COMPLETE_128BITS_UUID_TYPE 0x07

#define BT_EIR_SHORTENED_LOCAL_NAME_TYPE 0x08

#define BT_EIR_COMPLETE_LOCAL_NAME_TYPE 0x09

#define BT_EIR_TX_POWER_LEVEL_TYPE 0x0A

#define BT_EIR_OOB_BD_ADDR_TYPE 0x0C

#define BT_EIR_OOB_COD_TYPE 0x0D

#define BT_EIR_OOB_SSP_HASH_C_TYPE 0x0E

#define BT_EIR_OOB_SSP_RAND_R_TYPE 0x0F

#define BT_EIR_SERVICE_DATA_TYPE 0x16

#define BT_EIR_SERVICE_DATA_16BITS_UUID_TYPE 0x16

#define BT_EIR_SERVICE_DATA_32BITS_UUID_TYPE 0x20

#define BT_EIR_SERVICE_DATA_128BITS_UUID_TYPE 0x21

#define BT_EIR_MANUFACTURER_SPECIFIC_TYPE 0xFF



#endif

system/stack/include/hcidefs.h

+19 −22
Original line number Diff line number Diff line
@@ -733,28 +733,25 @@ inline std::string hci_mode_text(const tHCI_MODE& mode) { 


/* Definitions for Extended Inquiry Response */

#define HCI_EXT_INQ_RESPONSE_LEN 240

#define HCI_EIR_FLAGS_TYPE BT_EIR_FLAGS_TYPE

#define HCI_EIR_MORE_16BITS_UUID_TYPE BT_EIR_MORE_16BITS_UUID_TYPE

#define HCI_EIR_COMPLETE_16BITS_UUID_TYPE BT_EIR_COMPLETE_16BITS_UUID_TYPE

#define HCI_EIR_MORE_32BITS_UUID_TYPE BT_EIR_MORE_32BITS_UUID_TYPE

#define HCI_EIR_COMPLETE_32BITS_UUID_TYPE BT_EIR_COMPLETE_32BITS_UUID_TYPE

#define HCI_EIR_MORE_128BITS_UUID_TYPE BT_EIR_MORE_128BITS_UUID_TYPE

#define HCI_EIR_COMPLETE_128BITS_UUID_TYPE BT_EIR_COMPLETE_128BITS_UUID_TYPE

#define HCI_EIR_SHORTENED_LOCAL_NAME_TYPE BT_EIR_SHORTENED_LOCAL_NAME_TYPE

#define HCI_EIR_COMPLETE_LOCAL_NAME_TYPE BT_EIR_COMPLETE_LOCAL_NAME_TYPE

#define HCI_EIR_TX_POWER_LEVEL_TYPE BT_EIR_TX_POWER_LEVEL_TYPE

#define HCI_EIR_MANUFACTURER_SPECIFIC_TYPE BT_EIR_MANUFACTURER_SPECIFIC_TYPE

#define HCI_EIR_SERVICE_DATA_TYPE BT_EIR_SERVICE_DATA_TYPE

#define HCI_EIR_SERVICE_DATA_16BITS_UUID_TYPE \

  BT_EIR_SERVICE_DATA_16BITS_UUID_TYPE

#define HCI_EIR_SERVICE_DATA_32BITS_UUID_TYPE \

  BT_EIR_SERVICE_DATA_32BITS_UUID_TYPE

#define HCI_EIR_SERVICE_DATA_128BITS_UUID_TYPE \

  BT_EIR_SERVICE_DATA_128BITS_UUID_TYPE

#define HCI_EIR_OOB_BD_ADDR_TYPE BT_EIR_OOB_BD_ADDR_TYPE

#define HCI_EIR_OOB_COD_TYPE BT_EIR_OOB_COD_TYPE

#define HCI_EIR_OOB_SSP_HASH_C_TYPE BT_EIR_OOB_SSP_HASH_C_TYPE

#define HCI_EIR_OOB_SSP_RAND_R_TYPE BT_EIR_OOB_SSP_RAND_R_TYPE

#define HCI_EIR_FLAGS_TYPE 0x01

#define HCI_EIR_MORE_16BITS_UUID_TYPE 0x02

#define HCI_EIR_COMPLETE_16BITS_UUID_TYPE 0x03

#define HCI_EIR_MORE_32BITS_UUID_TYPE 0x04

#define HCI_EIR_COMPLETE_32BITS_UUID_TYPE 0x05

#define HCI_EIR_MORE_128BITS_UUID_TYPE 0x06

#define HCI_EIR_COMPLETE_128BITS_UUID_TYPE 0x07

#define HCI_EIR_SHORTENED_LOCAL_NAME_TYPE 0x08

#define HCI_EIR_COMPLETE_LOCAL_NAME_TYPE 0x09

#define HCI_EIR_TX_POWER_LEVEL_TYPE 0x0A

#define HCI_EIR_MANUFACTURER_SPECIFIC_TYPE 0xFF

#define HCI_EIR_SERVICE_DATA_TYPE 0x16

#define HCI_EIR_SERVICE_DATA_16BITS_UUID_TYPE 0x16

#define HCI_EIR_SERVICE_DATA_32BITS_UUID_TYPE 0x20

#define HCI_EIR_SERVICE_DATA_128BITS_UUID_TYPE 0x21

#define HCI_EIR_OOB_BD_ADDR_TYPE 0x0C

#define HCI_EIR_OOB_COD_TYPE 0x0D

#define HCI_EIR_OOB_SSP_HASH_C_TYPE 0x0E

#define HCI_EIR_OOB_SSP_RAND_R_TYPE 0x0F



/* Definitions for Write Simple Pairing Mode */

#define HCI_SP_MODE_ENABLED 0x01