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

Commit 70556f32 authored by Myles Watson's avatar Myles Watson
Browse files

Remove SMP_INCLUDED define 

Test: Connect to a BLE Keyboard
Change-Id: I785692cb61f4ca5ccccab7424aa03f50c54523c9
parent dc5e0f7e

system/bta/dm/bta_dm_act.cc

+9 −15
Original line number Diff line number Diff line
@@ -101,10 +101,8 @@ static void bta_dm_discover_device(BD_ADDR remote_bd_addr); 
static void bta_dm_sys_hw_cback(tBTA_SYS_HW_EVT status);

static void bta_dm_disable_search_and_disc(void);



#if (SMP_INCLUDED == TRUE)

static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, BD_ADDR bda,

                                    tBTM_LE_EVT_DATA* p_data);

#endif

static void bta_dm_ble_id_key_cback(uint8_t key_type,

                                    tBTM_BLE_LOCAL_KEYS* p_key);

#if (BTA_GATT_INCLUDED == TRUE)
@@ -235,19 +233,17 @@ const uint32_t bta_service_id_to_btm_srv_id_lkup_tbl[BTA_MAX_SERVICE_ID] = { 
};



/* bta security callback */

const tBTM_APPL_INFO bta_security = {

    &bta_dm_authorize_cback, &bta_dm_pin_cback, &bta_dm_new_link_key_cback,

    &bta_dm_authentication_complete_cback, &bta_dm_bond_cancel_complete_cback,

const tBTM_APPL_INFO bta_security = {&bta_dm_authorize_cback,

                                     &bta_dm_pin_cback,

                                     &bta_dm_new_link_key_cback,

                                     &bta_dm_authentication_complete_cback,

                                     &bta_dm_bond_cancel_complete_cback,

#if (BTM_LOCAL_IO_CAPS != BTM_IO_CAP_NONE)

    &bta_dm_sp_cback

                                     &bta_dm_sp_cback,

#else

                                     NULL

#endif

#if (SMP_INCLUDED == TRUE)

    ,

    &bta_dm_ble_smp_cback

#endif

    ,

                                     &bta_dm_ble_smp_cback,

                                     &bta_dm_ble_id_key_cback};



#define MAX_DISC_RAW_DATA_BUF (4096)
@@ -4034,7 +4030,6 @@ static void bta_dm_observe_cmpl_cb(void* p_result) { 
  }

}



#if (SMP_INCLUDED == TRUE)

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

 *

 * Function         bta_dm_ble_smp_cback
@@ -4150,7 +4145,6 @@ static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, BD_ADDR bda, 
  }

  return status;

}

#endif /* SMP_INCLUDED == TRUE */



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

 *

system/bta/include/bta_api.h

+4 −6
Original line number Diff line number Diff line
@@ -683,9 +683,7 @@ typedef struct { 
#define BTA_IO_CAP_IO BTM_IO_CAP_IO         /* 1 DisplayYesNo */

#define BTA_IO_CAP_IN BTM_IO_CAP_IN         /* 2 KeyboardOnly */

#define BTA_IO_CAP_NONE BTM_IO_CAP_NONE     /* 3 NoInputNoOutput */

#if (SMP_INCLUDED == TRUE)

#define BTA_IO_CAP_KBDISP BTM_IO_CAP_KBDISP /* 4 Keyboard display */

#endif

typedef tBTM_IO_CAP tBTA_IO_CAP;



#define BTA_AUTH_SP_NO                                      \

system/btif/co/bta_dm_co.cc

+0 −4
Original line number Diff line number Diff line
@@ -28,11 +28,7 @@ 
#include "bte_appl.h"



tBTE_APPL_CFG bte_appl_cfg = {

#if (SMP_INCLUDED == TRUE)

    BTA_LE_AUTH_REQ_SC_MITM_BOND,  // Authentication requirements

#else

    BTM_AUTH_SPGB_YES,  // Authentication requirements

#endif

    BTM_LOCAL_IO_CAPS_BLE, BTM_BLE_INITIATOR_KEY_SIZE,

    BTM_BLE_RESPONDER_KEY_SIZE, BTM_BLE_MAX_KEY_SIZE};

system/include/bt_target.h

+0 −4
Original line number Diff line number Diff line
@@ -775,10 +775,6 @@ 
 * SMP

 *

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

#ifndef SMP_INCLUDED

#define SMP_INCLUDED TRUE

#endif



#ifndef SMP_DEBUG

#define SMP_DEBUG FALSE

#endif

system/include/bte_appl.h

+0 −2
Original line number Diff line number Diff line
@@ -29,13 +29,11 @@ extern "C" { 
#endif



typedef struct {

#if (SMP_INCLUDED == TRUE)

  uint8_t ble_auth_req;

  uint8_t ble_io_cap;

  uint8_t ble_init_key;

  uint8_t ble_resp_key;

  uint8_t ble_max_key_size;

#endif

} tBTE_APPL_CFG;



extern tBTE_APPL_CFG bte_appl_cfg;