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

Commit a3e16c7c authored by Chris Manton's avatar Chris Manton
Browse files

Move stack/include/hcimsgs#defs into ble compilation unit 

Removing unnecessary exposure

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I99c216852f96a8d12b1bdafc73414dc0ad03ff02
parent 8943e7cc

system/stack/hcic/hciblecmds.cc

+71 −0
Original line number Diff line number Diff line
@@ -33,6 +33,77 @@ 
#include <stddef.h>

#include <string.h>



/*******************************************************************************

 * BLE Commands

 *      Note: "local_controller_id" is for transport, not counted in HCI

 *             message size

 ******************************************************************************/

#define HCIC_BLE_RAND_DI_SIZE 8

#define HCIC_BLE_IRK_SIZE 16



#define HCIC_PARAM_SIZE_SET_USED_FEAT_CMD 8

#define HCIC_PARAM_SIZE_WRITE_RANDOM_ADDR_CMD 6

#define HCIC_PARAM_SIZE_BLE_WRITE_ADV_PARAMS 15

#define HCIC_PARAM_SIZE_BLE_WRITE_SCAN_RSP 31

#define HCIC_PARAM_SIZE_WRITE_ADV_ENABLE 1

#define HCIC_PARAM_SIZE_BLE_WRITE_SCAN_PARAM 7

#define HCIC_PARAM_SIZE_BLE_WRITE_SCAN_ENABLE 2

#define HCIC_PARAM_SIZE_BLE_CREATE_LL_CONN 25

#define HCIC_PARAM_SIZE_BLE_CREATE_CONN_CANCEL 0

#define HCIC_PARAM_SIZE_CLEAR_ACCEPTLIST 0

#define HCIC_PARAM_SIZE_ADD_ACCEPTLIST 7

#define HCIC_PARAM_SIZE_REMOVE_ACCEPTLIST 7

#define HCIC_PARAM_SIZE_BLE_UPD_LL_CONN_PARAMS 14

#define HCIC_PARAM_SIZE_SET_HOST_CHNL_CLASS 5

#define HCIC_PARAM_SIZE_READ_CHNL_MAP 2

#define HCIC_PARAM_SIZE_BLE_READ_REMOTE_FEAT 2

#define HCIC_PARAM_SIZE_BLE_ENCRYPT 32

#define HCIC_PARAM_SIZE_WRITE_LE_HOST_SUPPORTED 2



#define HCIC_BLE_RAND_DI_SIZE 8

#define HCIC_BLE_ENCRYPT_KEY_SIZE 16

#define HCIC_PARAM_SIZE_BLE_START_ENC \

  (4 + HCIC_BLE_RAND_DI_SIZE + HCIC_BLE_ENCRYPT_KEY_SIZE)

#define HCIC_PARAM_SIZE_LTK_REQ_REPLY (2 + HCIC_BLE_ENCRYPT_KEY_SIZE)

#define HCIC_PARAM_SIZE_LTK_REQ_NEG_REPLY 2

#define HCIC_BLE_CHNL_MAP_SIZE 5

#define HCIC_PARAM_SIZE_BLE_WRITE_ADV_DATA 31



#define HCIC_PARAM_SIZE_BLE_ADD_DEV_RESOLVING_LIST (7 + HCIC_BLE_IRK_SIZE * 2)

#define HCIC_PARAM_SIZE_BLE_RM_DEV_RESOLVING_LIST 7

#define HCIC_PARAM_SIZE_BLE_SET_PRIVACY_MODE 8

#define HCIC_PARAM_SIZE_BLE_CLEAR_RESOLVING_LIST 0

#define HCIC_PARAM_SIZE_BLE_READ_RESOLVING_LIST_SIZE 0

#define HCIC_PARAM_SIZE_BLE_READ_RESOLVABLE_ADDR_PEER 7

#define HCIC_PARAM_SIZE_BLE_READ_RESOLVABLE_ADDR_LOCAL 7

#define HCIC_PARAM_SIZE_BLE_SET_ADDR_RESOLUTION_ENABLE 1

#define HCIC_PARAM_SIZE_BLE_SET_RAND_PRIV_ADDR_TIMOUT 2



#define HCIC_PARAM_SIZE_BLE_READ_PHY 2

#define HCIC_PARAM_SIZE_BLE_SET_DEFAULT_PHY 3

#define HCIC_PARAM_SIZE_BLE_SET_PHY 7

#define HCIC_PARAM_SIZE_BLE_ENH_RX_TEST 3

#define HCIC_PARAM_SIZE_BLE_ENH_TX_TEST 4



#define HCIC_PARAM_SIZE_BLE_SET_DATA_LENGTH 6

#define HCIC_PARAM_SIZE_BLE_WRITE_EXTENDED_SCAN_PARAM 11



#define HCIC_PARAM_SIZE_BLE_RC_PARAM_REQ_REPLY 14

#define HCIC_PARAM_SIZE_BLE_RC_PARAM_REQ_NEG_REPLY 3



#define HCIC_PARAM_SIZE_PERIODIC_ADVERTISING_CREATE_SYNC 14

#define HCIC_PARAM_SIZE_PERIODIC_ADVERTISING_CREATE_SYNC_CANCEL 0

#define HCIC_PARAM_SIZE_PERIODIC_ADVERTISING_TERMINATE_SYNC 2

#define HCIC_PARAM_SIZE_ADD_DEVICE_TO_PERIODIC_ADVERTISER_LIST 8

#define HCIC_PARAM_SIZE_REMOVE_DEVICE_FROM_PERIODIC_ADVERTISER_LIST 8

#define HCIC_PARAM_SIZE_CLEAR_PERIODIC_ADVERTISER_LIST 0

#define HCIC_PARAM_SIZE_READ_PERIODIC_ADVERTISER_LIST_SIZE 0

#define HCIC_PARAM_SIZE_SET_PERIODIC_ADVERTISING_RECEIVE_ENABLE 3

#define HCIC_PARAM_SIZE_PERIODIC_ADVERTISING_SYNC_TRANSFER 6

#define HCIC_PARAM_SIZE_PERIODIC_ADVERTISING_SET_INFO_TRANSFER 5

#define HCIC_PARAM_SIZE_SET_PERIODIC_ADVERTISING_SYNC_TRANSFER_PARAMS 8

#define HCIC_PARAM_SIZE_SET_DEFAULT_PERIODIC_ADVERTISING_SYNC_TRANSFER_PARAMS 8



void btsnd_hcic_ble_set_local_used_feat(uint8_t feat_set[8]) {

  BT_HDR* p = (BT_HDR*)osi_malloc(HCI_CMD_BUF_SIZE);

  uint8_t* pp = (uint8_t*)(p + 1);

system/stack/include/hcimsgs.h

+0 −59
Original line number Diff line number Diff line
@@ -355,54 +355,10 @@ extern void btsnd_hcic_vendor_spec_cmd(void* buffer, uint16_t opcode, 
 *             message size

 ******************************************************************************/

#define HCIC_BLE_RAND_DI_SIZE 8

#define HCIC_BLE_IRK_SIZE 16



#define HCIC_PARAM_SIZE_SET_USED_FEAT_CMD 8

#define HCIC_PARAM_SIZE_WRITE_RANDOM_ADDR_CMD 6

#define HCIC_PARAM_SIZE_BLE_WRITE_ADV_PARAMS 15

#define HCIC_PARAM_SIZE_BLE_WRITE_SCAN_RSP 31

#define HCIC_PARAM_SIZE_WRITE_ADV_ENABLE 1

#define HCIC_PARAM_SIZE_BLE_WRITE_SCAN_PARAM 7

#define HCIC_PARAM_SIZE_BLE_WRITE_SCAN_ENABLE 2

#define HCIC_PARAM_SIZE_BLE_CREATE_LL_CONN 25

#define HCIC_PARAM_SIZE_BLE_CREATE_CONN_CANCEL 0

#define HCIC_PARAM_SIZE_CLEAR_ACCEPTLIST 0

#define HCIC_PARAM_SIZE_ADD_ACCEPTLIST 7

#define HCIC_PARAM_SIZE_REMOVE_ACCEPTLIST 7

#define HCIC_PARAM_SIZE_BLE_UPD_LL_CONN_PARAMS 14

#define HCIC_PARAM_SIZE_SET_HOST_CHNL_CLASS 5

#define HCIC_PARAM_SIZE_READ_CHNL_MAP 2

#define HCIC_PARAM_SIZE_BLE_READ_REMOTE_FEAT 2

#define HCIC_PARAM_SIZE_BLE_ENCRYPT 32

#define HCIC_PARAM_SIZE_WRITE_LE_HOST_SUPPORTED 2



#define HCIC_BLE_RAND_DI_SIZE 8

#define HCIC_BLE_ENCRYPT_KEY_SIZE 16

#define HCIC_PARAM_SIZE_BLE_START_ENC \

  (4 + HCIC_BLE_RAND_DI_SIZE + HCIC_BLE_ENCRYPT_KEY_SIZE)

#define HCIC_PARAM_SIZE_LTK_REQ_REPLY (2 + HCIC_BLE_ENCRYPT_KEY_SIZE)

#define HCIC_PARAM_SIZE_LTK_REQ_NEG_REPLY 2

#define HCIC_BLE_CHNL_MAP_SIZE 5

#define HCIC_PARAM_SIZE_BLE_WRITE_ADV_DATA 31



#define HCIC_PARAM_SIZE_BLE_ADD_DEV_RESOLVING_LIST (7 + HCIC_BLE_IRK_SIZE * 2)

#define HCIC_PARAM_SIZE_BLE_RM_DEV_RESOLVING_LIST 7

#define HCIC_PARAM_SIZE_BLE_SET_PRIVACY_MODE 8

#define HCIC_PARAM_SIZE_BLE_CLEAR_RESOLVING_LIST 0

#define HCIC_PARAM_SIZE_BLE_READ_RESOLVING_LIST_SIZE 0

#define HCIC_PARAM_SIZE_BLE_READ_RESOLVABLE_ADDR_PEER 7

#define HCIC_PARAM_SIZE_BLE_READ_RESOLVABLE_ADDR_LOCAL 7

#define HCIC_PARAM_SIZE_BLE_SET_ADDR_RESOLUTION_ENABLE 1

#define HCIC_PARAM_SIZE_BLE_SET_RAND_PRIV_ADDR_TIMOUT 2



#define HCIC_PARAM_SIZE_BLE_READ_PHY 2

#define HCIC_PARAM_SIZE_BLE_SET_DEFAULT_PHY 3

#define HCIC_PARAM_SIZE_BLE_SET_PHY 7

#define HCIC_PARAM_SIZE_BLE_ENH_RX_TEST 3

#define HCIC_PARAM_SIZE_BLE_ENH_TX_TEST 4



#define HCIC_PARAM_SIZE_BLE_SET_DATA_LENGTH 6

#define HCIC_PARAM_SIZE_BLE_WRITE_EXTENDED_SCAN_PARAM 11



/* ULP HCI command */

extern void btsnd_hcic_ble_set_evt_mask(BT_EVENT_MASK event_mask);
@@ -499,13 +455,11 @@ extern void btsnd_hcic_ble_test_end(void); 


#if (BLE_LLT_INCLUDED == TRUE)



#define HCIC_PARAM_SIZE_BLE_RC_PARAM_REQ_REPLY 14

extern void btsnd_hcic_ble_rc_param_req_reply(

    uint16_t handle, uint16_t conn_int_min, uint16_t conn_int_max,

    uint16_t conn_latency, uint16_t conn_timeout, uint16_t min_ce_len,

    uint16_t max_ce_len);



#define HCIC_PARAM_SIZE_BLE_RC_PARAM_REQ_NEG_REPLY 3

extern void btsnd_hcic_ble_rc_param_req_neg_reply(uint16_t handle,

                                                  uint8_t reason);
@@ -662,19 +616,6 @@ extern void btsnd_hcic_remove_iso_data_path( 
extern void btsnd_hcic_read_iso_link_quality(

    uint16_t iso_handle, base::OnceCallback<void(uint8_t*, uint16_t)> cb);



#define HCIC_PARAM_SIZE_PERIODIC_ADVERTISING_CREATE_SYNC 14

#define HCIC_PARAM_SIZE_PERIODIC_ADVERTISING_CREATE_SYNC_CANCEL 0

#define HCIC_PARAM_SIZE_PERIODIC_ADVERTISING_TERMINATE_SYNC 2

#define HCIC_PARAM_SIZE_ADD_DEVICE_TO_PERIODIC_ADVERTISER_LIST 8

#define HCIC_PARAM_SIZE_REMOVE_DEVICE_FROM_PERIODIC_ADVERTISER_LIST 8

#define HCIC_PARAM_SIZE_CLEAR_PERIODIC_ADVERTISER_LIST 0

#define HCIC_PARAM_SIZE_READ_PERIODIC_ADVERTISER_LIST_SIZE 0

#define HCIC_PARAM_SIZE_SET_PERIODIC_ADVERTISING_RECEIVE_ENABLE 3

#define HCIC_PARAM_SIZE_PERIODIC_ADVERTISING_SYNC_TRANSFER 6

#define HCIC_PARAM_SIZE_PERIODIC_ADVERTISING_SET_INFO_TRANSFER 5

#define HCIC_PARAM_SIZE_SET_PERIODIC_ADVERTISING_SYNC_TRANSFER_PARAMS 8

#define HCIC_PARAM_SIZE_SET_DEFAULT_PERIODIC_ADVERTISING_SYNC_TRANSFER_PARAMS 8



extern void btsnd_hcic_ble_periodic_advertising_create_sync(

    uint8_t options, uint8_t adv_sid, uint8_t adv_addr_type,

    const RawAddress& adv_addr, uint16_t skip_num, uint16_t sync_timeout,