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

Commit 35b899d6 authored by Jakub Rotkiewicz's avatar Jakub Rotkiewicz
Browse files

bta_av: Remove redundant function call 

Bug: 329809288
Flag: EXEMPT - minor refactor
Test: mmm packages/modules/Bluetooth
Change-Id: I09fc6938933acbb21084775b8ef3fb69134f9221
parent f42a4ac5

system/bta/av/bta_av_main.cc

+3 −7
Original line number Diff line number Diff line
@@ -1192,7 +1192,9 @@ static void bta_av_non_state_machine_event(uint16_t event, tBTA_AV_DATA* p_data) 
  }

}



static void bta_av_better_state_machine(tBTA_AV_CB* p_cb, uint16_t event, tBTA_AV_DATA* p_data) {

void bta_av_sm_execute(tBTA_AV_CB* p_cb, uint16_t event, tBTA_AV_DATA* p_data) {

  log::verbose("AV event=0x{:x}({}) state={}({})", event, bta_av_evt_code(event), p_cb->state,

               bta_av_st_code(p_cb->state));

  switch (p_cb->state) {

    case BTA_AV_INIT_ST:

      switch (event) {
@@ -1246,12 +1248,6 @@ static void bta_av_better_state_machine(tBTA_AV_CB* p_cb, uint16_t event, tBTA_A 
  }

}



void bta_av_sm_execute(tBTA_AV_CB* p_cb, uint16_t event, tBTA_AV_DATA* p_data) {

  log::verbose("AV event=0x{:x}({}) state={}({})", event, bta_av_evt_code(event), p_cb->state,

               bta_av_st_code(p_cb->state));

  bta_av_better_state_machine(p_cb, event, p_data);

}



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

 *

 * Function         bta_av_hdl_event

system/bta/av/bta_av_ssm.cc

+18 −22
Original line number Diff line number Diff line
@@ -45,11 +45,27 @@ enum { 
  BTA_AV_CLOSING_SST

};



static void bta_av_better_stream_state_machine(tBTA_AV_SCB* p_scb, uint16_t event,

                                               tBTA_AV_DATA* p_data) {

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

 *

 * Function         bta_av_ssm_execute

 *

 * Description      Stream state machine event handling function for AV

 *

 *

 * Returns          void

 *

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

void bta_av_ssm_execute(tBTA_AV_SCB* p_scb, uint16_t event, tBTA_AV_DATA* p_data) {

  if (p_scb == NULL) {

    /* this stream is not registered */

    log::error("AV channel not registered");

    return;

  }



  uint8_t previous_state = p_scb->state;

  tBTA_AV_ACT event_handler1 = nullptr;

  tBTA_AV_ACT event_handler2 = nullptr;



  switch (p_scb->state) {

    case BTA_AV_INIT_SST:

      switch (event) {
@@ -439,26 +455,6 @@ static void bta_av_better_stream_state_machine(tBTA_AV_SCB* p_scb, uint16_t even 
  }

}



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

 *

 * Function         bta_av_ssm_execute

 *

 * Description      Stream state machine event handling function for AV

 *

 *

 * Returns          void

 *

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

void bta_av_ssm_execute(tBTA_AV_SCB* p_scb, uint16_t event, tBTA_AV_DATA* p_data) {

  if (p_scb == NULL) {

    /* this stream is not registered */

    log::verbose("AV channel not registered");

    return;

  }



  bta_av_better_stream_state_machine(p_scb, event, p_data);

}



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

 *

 * Function         bta_av_is_scb_opening