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

Commit d04c6d4d authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Get rid of AMP_INCLUDED 

Change-Id: I0f43061b150cfc61bb31cfc7a580592454cfbf9f
parent aa5f54d9

system/bta/dm/bta_dm_cfg.cc

+0 −6
Original line number Diff line number Diff line
@@ -434,9 +434,6 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = { 
         {{BTA_DM_PM_SNIFF_A2DP_IDX, 10000},

          {BTA_DM_PM_NO_ACTION, 0}},                        /* idle */

         {{BTA_DM_PM_ACTIVE, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* busy */

#if (AMP_INCLUDED == TRUE)

         {{BTA_DM_PM_NO_ACTION, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* amp */

#endif

         {{BTA_DM_PM_RETRY, 5000},

          {BTA_DM_PM_NO_ACTION, 0}} /* mode change retry */

     }}
@@ -456,9 +453,6 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = { 
         {{BTA_DM_PM_NO_PREF, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* sco close */

         {{BTA_DM_PM_NO_PREF, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* idle */

         {{BTA_DM_PM_NO_PREF, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* busy */

#if (AMP_INCLUDED == TRUE)

         {{BTA_DM_PM_NO_PREF, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* amp */

#endif

         {{BTA_DM_PM_RETRY, 5000},

          {BTA_DM_PM_NO_ACTION, 0}} /* mode change retry */

     }}

system/stack/gap/gap_conn.cc

+1 −32
Original line number Diff line number Diff line
@@ -72,11 +72,7 @@ typedef struct { 
} tGAP_CCB;



typedef struct {

#if (AMP_INCLUDED == TRUE)

  tAMP_APPL_INFO reg_info;

#else

  tL2CAP_APPL_INFO reg_info; /* L2CAP Registration info */

#endif

  tGAP_CCB ccb_pool[GAP_MAX_CONNECTIONS];

} tGAP_CONN;
@@ -115,25 +111,6 @@ static void gap_checks_con_flags(tGAP_CCB* p_ccb); 
 ******************************************************************************/

void gap_conn_init(void) {

  memset(&conn, 0, sizeof(tGAP_CONN));



#if (AMP_INCLUDED == TRUE)

  conn.reg_info.pAMP_ConnectInd_Cb = gap_connect_ind;

  conn.reg_info.pAMP_ConnectCfm_Cb = gap_connect_cfm;

  conn.reg_info.pAMP_ConnectPnd_Cb = NULL;

  conn.reg_info.pAMP_ConfigInd_Cb = gap_config_ind;

  conn.reg_info.pAMP_ConfigCfm_Cb = gap_config_cfm;

  conn.reg_info.pAMP_DisconnectInd_Cb = gap_disconnect_ind;

  conn.reg_info.pAMP_DisconnectCfm_Cb = NULL;

  conn.reg_info.pAMP_QoSViolationInd_Cb = NULL;

  conn.reg_info.pAMP_DataInd_Cb = gap_data_ind;

  conn.reg_info.pAMP_CongestionStatus_Cb = gap_congestion_ind;

  conn.reg_info.pAMP_TxComplete_Cb = NULL;

  conn.reg_info.pAMP_MoveInd_Cb = NULL;

  conn.reg_info.pAMP_MoveRsp_Cb = NULL;

  conn.reg_info.pAMP_MoveCfm_Cb = NULL;     // gap_move_cfm

  conn.reg_info.pAMP_MoveCfmRsp_Cb = NULL;  // gap_move_cfm_rsp



#else

  conn.reg_info.pL2CA_ConnectInd_Cb = gap_connect_ind;

  conn.reg_info.pL2CA_ConnectCfm_Cb = gap_connect_cfm;

  conn.reg_info.pL2CA_ConnectPnd_Cb = NULL;
@@ -145,7 +122,6 @@ void gap_conn_init(void) { 
  conn.reg_info.pL2CA_DataInd_Cb = gap_data_ind;

  conn.reg_info.pL2CA_CongestionStatus_Cb = gap_congestion_ind;

  conn.reg_info.pL2CA_TxComplete_Cb = gap_tx_complete_ind;

#endif

}



/*******************************************************************************
@@ -233,17 +209,10 @@ uint16_t GAP_ConnOpen(const char* p_serv_name, uint8_t service_id, 
  p_ccb->p_callback = p_cb;



  /* If originator, use a dynamic PSM */

#if (AMP_INCLUDED == TRUE)

  if (!is_server)

    conn.reg_info.pAMP_ConnectInd_Cb = NULL;

  else

    conn.reg_info.pAMP_ConnectInd_Cb = gap_connect_ind;

#else

  if (!is_server)

    conn.reg_info.pL2CA_ConnectInd_Cb = NULL;

  else

    conn.reg_info.pL2CA_ConnectInd_Cb = gap_connect_ind;

#endif



  /* Register the PSM with L2CAP */

  if (transport == BT_TRANSPORT_BR_EDR) {