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

Commit f42a4ac5 authored by Jakub Rotkiewicz's avatar Jakub Rotkiewicz
Browse files

bta_av: Remove redundant API to SM event parser 

Bug: 329809288
Flag: EXEMPT - minor refactor
Test: mmm packages/modules/Bluetooth
Change-Id: I3553199f03e0c3079c9d4fde72dadd075cc73a71
parent 8234b73e

system/bta/av/bta_av_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ void BTA_AvStart(tBTA_AV_HNDL handle, bool use_latency_mode) { 
            use_latency_mode);



  tBTA_AV_DO_START* p_buf = (tBTA_AV_DO_START*)osi_malloc(sizeof(tBTA_AV_DO_START));

  p_buf->hdr.event = BTA_AV_API_START_EVT;

  p_buf->hdr.event = BTA_AV_AP_START_EVT;

  p_buf->hdr.layer_specific = handle;

  p_buf->use_latency_mode = use_latency_mode;
@@ -273,7 +273,7 @@ void BTA_AvStop(tBTA_AV_HNDL handle, bool suspend) { 


  tBTA_AV_API_STOP* p_buf = (tBTA_AV_API_STOP*)osi_malloc(sizeof(tBTA_AV_API_STOP));



  p_buf->hdr.event = BTA_AV_API_STOP_EVT;

  p_buf->hdr.event = BTA_AV_AP_STOP_EVT;

  p_buf->hdr.layer_specific = handle;

  p_buf->flush = true;

  p_buf->suspend = suspend;

system/bta/av/bta_av_int.h

+3 −11
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ enum { 
  /* these events are handled by the AV stream state machine */

  BTA_AV_API_OPEN_EVT,

  BTA_AV_API_CLOSE_EVT,

  BTA_AV_AP_START_EVT, /* the following 2 events must be in the same order as

                          the *API_*EVT */

  BTA_AV_AP_START_EVT,

  BTA_AV_AP_STOP_EVT,

  BTA_AV_API_RECONFIG_EVT,

  BTA_AV_API_PROTECT_REQ_EVT,
@@ -117,9 +116,6 @@ enum { 
  BTA_AV_DEREG_COMP_EVT,

  BTA_AV_AVDT_RPT_CONN_EVT,

  BTA_AV_API_PEER_SEP_EVT,

  BTA_AV_API_START_EVT, /* the following 2 events must be in the same order as

                           the *AP_*EVT */

  BTA_AV_API_STOP_EVT,

  BTA_AV_API_SET_LATENCY_EVT,

};
@@ -134,10 +130,6 @@ enum { 
#define BTA_AV_FIRST_NSM_EVT BTA_AV_API_ENABLE_EVT

#define BTA_AV_LAST_NSM_EVT BTA_AV_API_SET_LATENCY_EVT



/* API events passed to both SSMs (by bta_av_api_to_ssm) */

#define BTA_AV_FIRST_A2S_API_EVT BTA_AV_API_START_EVT

#define BTA_AV_FIRST_A2S_SSM_EVT BTA_AV_AP_START_EVT



#define BTA_AV_LAST_EVT BTA_AV_API_SET_LATENCY_EVT



/* maximum number of SEPS in stream discovery results */
@@ -263,13 +255,13 @@ typedef struct { 
  bool is_low_latency;

} tBTA_AV_API_SET_LATENCY;



/* data type for BTA_AV_API_START_EVT and bta_av_do_start */

/* data type for BTA_AV_AP_START_EVT from API and bta_av_do_start */

typedef struct {

  BT_HDR_RIGID hdr;

  bool use_latency_mode;

} tBTA_AV_DO_START;



/* data type for BTA_AV_API_STOP_EVT */

/* data type for BTA_AV_AP_STOP_EVT from API*/

typedef struct {

  BT_HDR_RIGID hdr;

  bool suspend;

system/bta/av/bta_av_main.cc

+0 −31
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ static void bta_av_api_enable(tBTA_AV_DATA* p_data); 
static void bta_av_api_register(tBTA_AV_DATA* p_data);

static void bta_av_ci_data(tBTA_AV_DATA* p_data);

static void bta_av_rpc_conn(tBTA_AV_DATA* p_data);

static void bta_av_api_to_ssm(tBTA_AV_DATA* p_data);



static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status, uint8_t num_sco_links, uint8_t app_id,

                                 const RawAddress& peer_addr);
@@ -797,26 +796,6 @@ static void bta_av_ci_data(tBTA_AV_DATA* p_data) { 
 ******************************************************************************/

static void bta_av_rpc_conn(tBTA_AV_DATA* /* p_data */) {}



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

 *

 * Function         bta_av_api_to_ssm

 *

 * Description      forward the API request to stream state machine

 *

 *

 * Returns          void

 *

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

static void bta_av_api_to_ssm(tBTA_AV_DATA* p_data) {

  uint16_t event = p_data->hdr.event - BTA_AV_FIRST_A2S_API_EVT + BTA_AV_FIRST_A2S_SSM_EVT;

  tBTA_AV_HNDL handle = p_data->hdr.layer_specific;

  tBTA_AV_SCB* p_scb = bta_av_hndl_to_scb(handle);



  if (p_scb != nullptr) {

    bta_av_ssm_execute(p_scb, event, p_data);

  }

}



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

 *

 * Function         bta_av_chk_start
@@ -1207,12 +1186,6 @@ static void bta_av_non_state_machine_event(uint16_t event, tBTA_AV_DATA* p_data) 
    case BTA_AV_AVDT_RPT_CONN_EVT:

      bta_av_rpc_conn(p_data);

      break;

    case BTA_AV_API_START_EVT:

      bta_av_api_to_ssm(p_data);

      break;

    case BTA_AV_API_STOP_EVT:

      bta_av_api_to_ssm(p_data);

      break;

    case BTA_AV_API_PEER_SEP_EVT:

      bta_av_api_set_peer_sep(p_data);

      break;
@@ -1462,10 +1435,6 @@ const char* bta_av_evt_code(uint16_t evt_code) { 
      return "DEREG_COMP";

    case BTA_AV_AVDT_RPT_CONN_EVT:

      return "RPT_CONN";

    case BTA_AV_API_START_EVT:

      return "API_START";

    case BTA_AV_API_STOP_EVT:

      return "API_STOP";

    default:

      return "unknown";

  }