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

Commit 72a9441d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "stack: Remove casts and spell local_keys correctly"

parents e11ba82c e2214c2a

system/stack/avdt/avdt_ccb.cc

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ const tAVDT_CCB_ST_TBL avdt_ccb_st_tbl[] = { 
 ******************************************************************************/

void avdt_ccb_init(void) {

  memset(&avdt_cb.ccb[0], 0, sizeof(tAVDT_CCB) * AVDT_NUM_LINKS);

  avdt_cb.p_ccb_act = (tAVDT_CCB_ACTION*)avdt_ccb_action;

  avdt_cb.p_ccb_act = avdt_ccb_action;

}



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

system/stack/avdt/avdt_int.h

+2 −2
Original line number Diff line number Diff line
@@ -516,8 +516,8 @@ typedef struct { 
  tAVDT_SCB scb[AVDT_NUM_SEPS];    /* stream control blocks */

  tAVDT_AD ad;                     /* adaption layer control block */

  tAVDTC_CTRL_CBACK* p_conf_cback; /* conformance callback function */

  tAVDT_CCB_ACTION* p_ccb_act;     /* pointer to CCB action functions */

  tAVDT_SCB_ACTION* p_scb_act;     /* pointer to SCB action functions */

  const tAVDT_CCB_ACTION* p_ccb_act; /* pointer to CCB action functions */

  const tAVDT_SCB_ACTION* p_scb_act; /* pointer to SCB action functions */

  tAVDT_CTRL_CBACK* p_conn_cback;  /* connection callback function */

  uint8_t trace_level;             /* trace level */

} tAVDT_CB;

system/stack/avdt/avdt_scb.cc

+2 −2
Original line number Diff line number Diff line
@@ -809,8 +809,8 @@ void avdt_scb_event(tAVDT_SCB* p_scb, uint8_t event, tAVDT_SCB_EVT* p_data) { 
 *

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

void avdt_scb_init(void) {

  memset(&avdt_cb.scb[0], 0, sizeof(tAVDT_SCB) * AVDT_NUM_SEPS);

  avdt_cb.p_scb_act = (tAVDT_SCB_ACTION*)avdt_scb_action;

  memset(avdt_cb.scb, 0, sizeof(tAVDT_SCB) * AVDT_NUM_SEPS);

  avdt_cb.p_scb_act = avdt_scb_action;

}



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

system/stack/avrc/avrc_sdp.cc

+3 −3
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ uint16_t AVRC_AddRecord(uint16_t service_uuid, const char* p_service_name, 
    avrc_proto_desc_list[index].params[1] = 0;

  }

  result &= SDP_AddProtocolList(sdp_handle, AVRC_NUM_PROTO_ELEMS,

                                (tSDP_PROTOCOL_ELEM*)avrc_proto_desc_list);

                                &avrc_proto_desc_list[0]);



  /* additional protocal descriptor, required only for version > 1.3    */

  if ((profile_version > AVRC_REV_1_3) && (browse_supported)) {
@@ -237,8 +237,8 @@ uint16_t AVRC_AddRecord(uint16_t service_uuid, const char* p_service_name, 
    avrc_add_proto_desc_list.list_elem[1].params[0] = AVCT_REV_1_4;

    avrc_add_proto_desc_list.list_elem[1].params[1] = 0;



    result &= SDP_AddAdditionProtoLists(

        sdp_handle, 1, (tSDP_PROTO_LIST_ELEM*)&avrc_add_proto_desc_list);

    result &=

        SDP_AddAdditionProtoLists(sdp_handle, 1, &avrc_add_proto_desc_list);

  }

  /* add profile descriptor list   */

  result &= SDP_AddProfileDescriptorList(

system/stack/btm/btm_ble.cc

+9 −9
Original line number Diff line number Diff line
@@ -2333,7 +2333,7 @@ bool BTM_BleSecurityProcedureIsRunning(const RawAddress& bd_addr) { 
extern uint8_t BTM_BleGetSupportedKeySize(const RawAddress& bd_addr) {

#if (L2CAP_LE_COC_INCLUDED == TRUE)

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);

  tBTM_LE_IO_REQ dev_io_cfg;

  tBTM_LE_EVT_DATA btm_le_evt_data;

  uint8_t callback_rc;



  if (!p_dev_rec) {
@@ -2348,7 +2348,7 @@ extern uint8_t BTM_BleGetSupportedKeySize(const RawAddress& bd_addr) { 
  }



  callback_rc = (*btm_cb.api.p_le_callback)(

      BTM_LE_IO_REQ_EVT, p_dev_rec->bd_addr, (tBTM_LE_EVT_DATA*)&dev_io_cfg);

      BTM_LE_IO_REQ_EVT, p_dev_rec->bd_addr, &btm_le_evt_data);



  if (callback_rc != BTM_SUCCESS) {

    BTM_TRACE_ERROR("%s can't access supported key size", __func__);
@@ -2356,8 +2356,8 @@ extern uint8_t BTM_BleGetSupportedKeySize(const RawAddress& bd_addr) { 
  }



  BTM_TRACE_DEBUG("%s device supports key size = %d", __func__,

                  dev_io_cfg.max_key_size);

  return (dev_io_cfg.max_key_size);

                  btm_le_evt_data.io_req.max_key_size);

  return (btm_le_evt_data.io_req.max_key_size);

#else

  return 0;

#endif
@@ -2377,7 +2377,7 @@ extern uint8_t BTM_BleGetSupportedKeySize(const RawAddress& bd_addr) { 
 *

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

static void btm_notify_new_key(uint8_t key_type) {

  tBTM_BLE_LOCAL_KEYS* p_locak_keys = NULL;

  tBTM_BLE_LOCAL_KEYS* p_local_keys = NULL;



  BTM_TRACE_DEBUG("btm_notify_new_key key_type=%d", key_type);
@@ -2385,12 +2385,12 @@ static void btm_notify_new_key(uint8_t key_type) { 
    switch (key_type) {

      case BTM_BLE_KEY_TYPE_ID:

        BTM_TRACE_DEBUG("BTM_BLE_KEY_TYPE_ID");

        p_locak_keys = (tBTM_BLE_LOCAL_KEYS*)&btm_cb.devcb.id_keys;

        p_local_keys = (tBTM_BLE_LOCAL_KEYS*)&btm_cb.devcb.id_keys;

        break;



      case BTM_BLE_KEY_TYPE_ER:

        BTM_TRACE_DEBUG("BTM_BLE_KEY_TYPE_ER");

        p_locak_keys =

        p_local_keys =

            (tBTM_BLE_LOCAL_KEYS*)&btm_cb.devcb.ble_encryption_key_value;

        break;
@@ -2398,8 +2398,8 @@ static void btm_notify_new_key(uint8_t key_type) { 
        BTM_TRACE_ERROR("unknown key type: %d", key_type);

        break;

    }

    if (p_locak_keys != NULL)

      (*btm_cb.api.p_le_key_callback)(key_type, p_locak_keys);

    if (p_local_keys != NULL)

      (*btm_cb.api.p_le_key_callback)(key_type, p_local_keys);

  }

}