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

Commit 8a5e73f3 authored by Chris Manton's avatar Chris Manton
Browse files

Enum-ify bta/include/bta_ag_api::tBTA_AG_EVT 

Towards readable code

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

Change-Id: Ic430d4ca56ce4c734e9f8cf3b157f466a646d8a6
parent beb00304

system/bta/ag/bta_ag_cmd.cc

+23 −23
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ void bta_ag_at_hsp_cback(tBTA_AG_SCB* p_scb, uint16_t command_id, 
  strlcpy(val.str, p_arg, sizeof(val.str));



  /* call callback with event */

  (*bta_ag_cb.p_cback)(command_id, (tBTA_AG*)&val);

  (*bta_ag_cb.p_cback)(static_cast<tBTA_AG_EVT>(command_id), (tBTA_AG*)&val);

}



static void remove_spaces(char* str) {
@@ -867,7 +867,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
   * If |event| is 0 at the end of this function, the application

   * callback is NOT invoked.

   */

  tBTA_AG_EVT event = 0;

  tBTA_AG_EVT event = BTA_AG_ENABLE_EVT;

  if (cmd < BTA_AG_LOCAL_EVT_FIRST) {

    event = static_cast<tBTA_AG_EVT>(cmd);

  }
@@ -885,7 +885,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
      if (!bta_ag_sco_is_active_device(p_scb->peer_addr)) {

        LOG(WARNING) << __func__ << ": AT+CHUP rejected as " << p_scb->peer_addr

                << " is not the active device";

        event = 0;

        event = BTA_AG_ENABLE_EVT;

        bta_ag_send_error(p_scb, BTA_AG_ERR_OP_NOT_ALLOWED);

      } else {

        bta_ag_send_ok(p_scb);
@@ -908,7 +908,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
        remove_spaces(val.str + 1);



        if (!utl_isintstr(val.str + 1)) {

          event = 0;

          event = BTA_AG_ENABLE_EVT;

          bta_ag_send_error(p_scb, BTA_AG_ERR_INV_CHAR_IN_DSTR);

        }

      } else if (val.str[0] == 'V') /* ATDV : Dial VoIP Call */
@@ -916,7 +916,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
        /* We do not check string. Code will be added later if needed. */

        if (!((p_scb->peer_features & BTA_AG_PEER_FEAT_VOIP) &&

              (p_scb->features & BTA_AG_FEAT_VOIP))) {

          event = 0;

          event = BTA_AG_ENABLE_EVT;

          bta_ag_send_error(p_scb, BTA_AG_ERR_OP_NOT_SUPPORTED);

        }

      }
@@ -928,7 +928,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
        remove_spaces(val.str);



        if (!utl_isdialstr(val.str)) {

          event = 0;

          event = BTA_AG_ENABLE_EVT;

          bta_ag_send_error(p_scb, BTA_AG_ERR_INV_CHAR_IN_DSTR);

        }

      }
@@ -945,7 +945,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
    case BTA_AG_AT_CHLD_EVT:

      if (arg_type == BTA_AG_AT_TEST) {

        /* don't call callback */

        event = 0;

        event = BTA_AG_ENABLE_EVT;



        /* send CHLD string */

        /* Form string based on supported 1.5 feature */
@@ -973,7 +973,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
        val.idx = bta_ag_parse_chld(p_scb, val.str);



        if (val.idx == BTA_AG_INVALID_CHLD) {

          event = 0;

          event = BTA_AG_ENABLE_EVT;

          bta_ag_send_error(p_scb, BTA_AG_ERR_OP_NOT_SUPPORTED);

          break;

        }
@@ -982,7 +982,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
              (p_scb->peer_features & BTA_AG_PEER_FEAT_ECC))) {

          /* we do not support ECC, but HF is sending us a CHLD with call

           * index*/

          event = 0;

          event = BTA_AG_ENABLE_EVT;

          bta_ag_send_error(p_scb, BTA_AG_ERR_OP_NOT_SUPPORTED);



        } else {
@@ -1014,7 +1014,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
        if (bta_ag_parse_bind_set(p_scb, val)) {

          bta_ag_send_ok(p_scb);

        } else {

          event = 0; /* don't call callback */

          event = BTA_AG_ENABLE_EVT; /* don't call callback */

          bta_ag_send_error(p_scb, BTA_AG_ERR_INVALID_INDEX);

        }

      } else {
@@ -1022,7 +1022,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 


        /* Need not pass this command beyond BTIF.*/

        /* Stack handles it internally */

        event = 0; /* don't call callback */

        event = BTA_AG_ENABLE_EVT; /* don't call callback */

      }

      break;
@@ -1032,14 +1032,14 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
      } else {

        bta_ag_send_error(p_scb, BTA_AG_ERR_INVALID_INDEX);

        /* don't call callback receiving invalid indicator */

        event = 0;

        event = BTA_AG_ENABLE_EVT;

      }

      break;



    case BTA_AG_AT_CIND_EVT:

      if (arg_type == BTA_AG_AT_TEST) {

        /* don't call callback */

        event = 0;

        event = BTA_AG_ENABLE_EVT;



        /* send CIND string, send OK */

        bta_ag_send_result(p_scb, BTA_AG_CIND_RES, p_bta_ag_cfg->cind_info, 0);
@@ -1078,7 +1078,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
      if (strlen(p_arg) == 1) {

        bta_ag_send_ok(p_scb);

      } else {

        event = 0;

        event = BTA_AG_ENABLE_EVT;

        bta_ag_send_error(p_scb, BTA_AG_ERR_INV_CHAR_IN_TSTR);

      }

      break;
@@ -1086,7 +1086,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
    case BTA_AG_AT_BINP_EVT:

      /* if feature not set don't call callback, send ERROR */

      if (!(p_scb->features & BTA_AG_FEAT_VTAG)) {

        event = 0;

        event = BTA_AG_ENABLE_EVT;

        bta_ag_send_error(p_scb, BTA_AG_ERR_OP_NOT_SUPPORTED);

      }

      break;
@@ -1095,7 +1095,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
      /* if feature not supported don't call callback, send ERROR. App will send

       * OK */

      if (!(p_scb->features & BTA_AG_FEAT_VREC)) {

        event = 0;

        event = BTA_AG_ENABLE_EVT;

        bta_ag_send_error(p_scb, BTA_AG_ERR_OP_NOT_SUPPORTED);

      }

      break;
@@ -1124,7 +1124,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
      if (p_scb->features & BTA_AG_FEAT_ECNR) {

        bta_ag_send_ok(p_scb);

      } else {

        event = 0;

        event = BTA_AG_ENABLE_EVT;

        bta_ag_send_error(p_scb, BTA_AG_ERR_OP_NOT_SUPPORTED);

      }

      break;
@@ -1146,7 +1146,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
          val.num = BTA_AG_BTRH_READ;

        }

      } else {

        event = 0;

        event = BTA_AG_ENABLE_EVT;

        bta_ag_send_error(p_scb, BTA_AG_ERR_OP_NOT_SUPPORTED);

      }

      break;
@@ -1154,7 +1154,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
    case BTA_AG_AT_COPS_EVT:

      if (arg_type == BTA_AG_AT_SET) {

        /* don't call callback */

        event = 0;

        event = BTA_AG_ENABLE_EVT;



        /* send OK */

        bta_ag_send_ok(p_scb);
@@ -1172,7 +1172,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
        bta_ag_send_error(p_scb, BTA_AG_ERR_OP_NOT_SUPPORTED);

      }

      /* don't call callback */

      event = 0;

      event = BTA_AG_ENABLE_EVT;

      break;



    case BTA_AG_AT_BIA_EVT:
@@ -1203,7 +1203,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
        val.num = bia_masked_out;

        bta_ag_send_ok(p_scb);

      } else {

        event = 0;

        event = BTA_AG_ENABLE_EVT;

        bta_ag_send_error(p_scb, BTA_AG_ERR_INVALID_INDEX);

      }

      break;
@@ -1213,7 +1213,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 


    case BTA_AG_AT_CLCC_EVT:

      if (!(p_scb->features & BTA_AG_FEAT_ECS)) {

        event = 0;

        event = BTA_AG_ENABLE_EVT;

        bta_ag_send_error(p_scb, BTA_AG_ERR_OP_NOT_SUPPORTED);

      }

      break;
@@ -1300,7 +1300,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
  }



  /* call callback */

  if (event != 0) {

  if (event != BTA_AG_ENABLE_EVT) {

    (*bta_ag_cb.p_cback)(event, (tBTA_AG*)&val);

  }

}

system/bta/ag/bta_ag_sco.cc

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static void bta_ag_cback_sco(tBTA_AG_SCB* p_scb, uint8_t event) { 
  sco.handle = bta_ag_scb_to_idx(p_scb);

  sco.app_id = p_scb->app_id;

  /* call close cback */

  (*bta_ag_cb.p_cback)(event, (tBTA_AG*)&sco);

  (*bta_ag_cb.p_cback)(static_cast<tBTA_AG_EVT>(event), (tBTA_AG*)&sco);

}



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

system/bta/include/bta_ag_api.h

+37 −37
Original line number Diff line number Diff line
@@ -332,43 +332,43 @@ struct tBTA_AG_RES_DATA { 
  static const tBTA_AG_RES_DATA kEmpty;

};



typedef enum : uint8_t {

  /* AG callback events */

#define BTA_AG_ENABLE_EVT 0      /* AG enabled */

#define BTA_AG_REGISTER_EVT 1    /* AG registered */

#define BTA_AG_OPEN_EVT 2        /* AG connection open */

#define BTA_AG_CLOSE_EVT 3       /* AG connection closed */

#define BTA_AG_CONN_EVT 4        /* Service level connection opened */

#define BTA_AG_AUDIO_OPEN_EVT 5  /* Audio connection open */

#define BTA_AG_AUDIO_CLOSE_EVT 6 /* Audio connection closed */

#define BTA_AG_SPK_EVT 7         /* Speaker volume changed */

#define BTA_AG_MIC_EVT 8         /* Microphone volume changed */

#define BTA_AG_AT_CKPD_EVT 9     /* CKPD from the HS */

#define BTA_AG_DISABLE_EVT 30    /* AG disabled */

#define BTA_AG_WBS_EVT 31 /* SCO codec info */

  BTA_AG_ENABLE_EVT = 0,      /* AG enabled */

  BTA_AG_REGISTER_EVT = 1,    /* AG registered */

  BTA_AG_OPEN_EVT = 2,        /* AG connection open */

  BTA_AG_CLOSE_EVT = 3,       /* AG connection closed */

  BTA_AG_CONN_EVT = 4,        /* Service level connection opened */

  BTA_AG_AUDIO_OPEN_EVT = 5,  /* Audio connection open */

  BTA_AG_AUDIO_CLOSE_EVT = 6, /* Audio connection closed */

  BTA_AG_SPK_EVT = 7,         /* Speaker volume changed */

  BTA_AG_MIC_EVT = 8,         /* Microphone volume changed */

  BTA_AG_AT_CKPD_EVT = 9,     /* CKPD from the HS */

  BTA_AG_DISABLE_EVT = 30,    /* AG disabled */

  BTA_AG_WBS_EVT = 31,        /* SCO codec info */

  /* Values below are for HFP only */

#define BTA_AG_AT_A_EVT 10    /* Answer a call */

#define BTA_AG_AT_D_EVT 11    /* Place a call using number or memory dial */

#define BTA_AG_AT_CHLD_EVT 12 /* Call hold */

#define BTA_AG_AT_CHUP_EVT 13 /* Hang up a call */

#define BTA_AG_AT_CIND_EVT 14 /* Read indicator settings */

#define BTA_AG_AT_VTS_EVT 15  /* Transmit DTMF tone */

#define BTA_AG_AT_BINP_EVT 16 /* Retrieve number from voice tag */

#define BTA_AG_AT_BLDN_EVT 17 /* Place call to last dialed number */

#define BTA_AG_AT_BVRA_EVT 18 /* Enable/disable voice recognition */

#define BTA_AG_AT_NREC_EVT 19 /* Disable echo canceling */

#define BTA_AG_AT_CNUM_EVT 20 /* Retrieve subscriber number */

#define BTA_AG_AT_BTRH_EVT 21 /* CCAP-style incoming call hold */

#define BTA_AG_AT_CLCC_EVT 22 /* Query list of current calls */

#define BTA_AG_AT_COPS_EVT 23 /* Query list of current calls */

#define BTA_AG_AT_UNAT_EVT 24 /* Unknown AT command */

#define BTA_AG_AT_CBC_EVT 25  /* Battery Level report from HF */

#define BTA_AG_AT_BAC_EVT 26  /* avablable codec */

#define BTA_AG_AT_BCS_EVT 27  /* Codec select */

#define BTA_AG_AT_BIND_EVT 28 /* HF indicator */

#define BTA_AG_AT_BIEV_EVT 29 /* HF indicator updates from peer */

#define BTA_AG_AT_BIA_EVT 32  /* AG indicator activation event from peer */



typedef uint8_t tBTA_AG_EVT;

  BTA_AG_AT_A_EVT = 10,    /* Answer a call */

  BTA_AG_AT_D_EVT = 11,    /* Place a call using number or memory dial */

  BTA_AG_AT_CHLD_EVT = 12, /* Call hold */

  BTA_AG_AT_CHUP_EVT = 13, /* Hang up a call */

  BTA_AG_AT_CIND_EVT = 14, /* Read indicator settings */

  BTA_AG_AT_VTS_EVT = 15,  /* Transmit DTMF tone */

  BTA_AG_AT_BINP_EVT = 16, /* Retrieve number from voice tag */

  BTA_AG_AT_BLDN_EVT = 17, /* Place call to last dialed number */

  BTA_AG_AT_BVRA_EVT = 18, /* Enable/disable voice recognition */

  BTA_AG_AT_NREC_EVT = 19, /* Disable echo canceling */

  BTA_AG_AT_CNUM_EVT = 20, /* Retrieve subscriber number */

  BTA_AG_AT_BTRH_EVT = 21, /* CCAP-style incoming call hold */

  BTA_AG_AT_CLCC_EVT = 22, /* Query list of current calls */

  BTA_AG_AT_COPS_EVT = 23, /* Query list of current calls */

  BTA_AG_AT_UNAT_EVT = 24, /* Unknown AT command */

  BTA_AG_AT_CBC_EVT = 25,  /* Battery Level report from HF */

  BTA_AG_AT_BAC_EVT = 26,  /* avablable codec */

  BTA_AG_AT_BCS_EVT = 27,  /* Codec select */

  BTA_AG_AT_BIND_EVT = 28, /* HF indicator */

  BTA_AG_AT_BIEV_EVT = 29, /* HF indicator updates from peer */

  BTA_AG_AT_BIA_EVT = 32,  /* AG indicator activation event from peer */

} tBTA_AG_EVT;



/* data associated with most non-AT events */

typedef struct {