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

Commit f1ff2fd6 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Remove useless #def bta/hh/bta_hh_::BTA_HH_FST_BTE_TRANS_EVT am: 8ff2ca8b 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1700650

Change-Id: I30b22df76e4dae927bc065cd82e606b0a8e6ac37
parents ea71d39f 8ff2ca8b

system/bta/hh/bta_hh_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -1014,8 +1014,8 @@ static uint8_t convert_api_sndcmd_param(const tBTA_HH_CMD_DATA& api_sndcmd) { 


void bta_hh_write_dev_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  tBTA_HH_CBDATA cbdata = {BTA_HH_OK, 0};

  uint16_t event = (p_data->api_sndcmd.t_type - BTA_HH_FST_BTE_TRANS_EVT) +

                   BTA_HH_GET_RPT_EVT;

  uint16_t event =

      (p_data->api_sndcmd.t_type - HID_TRANS_GET_REPORT) + BTA_HH_GET_RPT_EVT;



  if (p_cb->is_le_device)

    bta_hh_le_write_dev_act(p_cb, p_data);

system/bta/hh/bta_hh_int.h

+0 −3
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ typedef uint16_t tBTA_HH_INT_EVT; /* HID host internal events */ 


#define BTA_HH_INVALID_EVT (BTA_HH_DISC_CMPL_EVT + 1)



/* event used to map between BTE event and BTA event */

#define BTA_HH_FST_BTE_TRANS_EVT HID_TRANS_GET_REPORT



/* sub event code used for device maintainence API call */

#define BTA_HH_ADD_DEV 0

#define BTA_HH_REMOVE_DEV 1

system/bta/hh/bta_hh_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ void bta_hh_sm_execute(tBTA_HH_DEV_CB* p_cb, uint16_t event, 
          }

          break;

        case BTA_HH_API_WRITE_DEV_EVT:

          cback_event = (p_data->api_sndcmd.t_type - BTA_HH_FST_BTE_TRANS_EVT) +

          cback_event = (p_data->api_sndcmd.t_type - HID_TRANS_GET_REPORT) +

                        BTA_HH_GET_RPT_EVT;

          osi_free_and_reset((void**)&p_data->api_sndcmd.p_data);

          if (p_data->api_sndcmd.t_type == HID_TRANS_SET_PROTOCOL ||