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

Commit a85f7c66 authored by Zach Johnson's avatar Zach Johnson Committed by Andre Eisenbach
Browse files

Remove unused security abort callback 

The callback in BTA was null, so it never was actually
used.
parent 5886d2e1

system/bta/dm/bta_dm_act.c

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ const tBTM_APPL_INFO bta_security = 
    &bta_dm_pin_cback,

    &bta_dm_new_link_key_cback,

    &bta_dm_authentication_complete_cback,

    NULL,

    &bta_dm_bond_cancel_complete_cback,

#if (BTM_LOCAL_IO_CAPS != BTM_IO_CAP_NONE)

    &bta_dm_sp_cback

system/stack/btm/btm_sec.c

+0 −3
Original line number Diff line number Diff line
@@ -2868,9 +2868,6 @@ void btm_sec_abort_access_req (BD_ADDR bd_addr) 
    if (!p_dev_rec)

        return;



    if (btm_cb.api.p_abort_callback)

        (*btm_cb.api.p_abort_callback)(bd_addr, p_dev_rec->dev_class, p_dev_rec->sec_bd_name);



    if ((p_dev_rec->sec_state != BTM_SEC_STATE_AUTHORIZING)

        && (p_dev_rec->sec_state != BTM_SEC_STATE_AUTHENTICATING))

        return;

system/stack/include/btm_api.h

+0 −9
Original line number Diff line number Diff line
@@ -1362,14 +1362,6 @@ typedef void (tBTM_RMT_NAME_CALLBACK) (BD_ADDR bd_addr, DEV_CLASS dc, 
typedef UINT8 (tBTM_AUTH_COMPLETE_CALLBACK) (BD_ADDR bd_addr, DEV_CLASS dev_class,

                                             tBTM_BD_NAME bd_name, int result);



/* Operation abort.  Called by the stack when link goes down during.  Pin code

** request or authorization.  Parameters are

**              BD Address of remote

**

*/

typedef UINT8 (tBTM_ABORT_CALLBACK) (BD_ADDR bd_addr, DEV_CLASS dev_class,

                                     tBTM_BD_NAME bd_name);



enum

{

    BTM_SP_IO_REQ_EVT,      /* received IO_CAPABILITY_REQUEST event */
@@ -1731,7 +1723,6 @@ typedef struct 
    tBTM_PIN_CALLBACK           *p_pin_callback;

    tBTM_LINK_KEY_CALLBACK      *p_link_key_callback;

    tBTM_AUTH_COMPLETE_CALLBACK *p_auth_complete_callback;

    tBTM_ABORT_CALLBACK         *p_abort_callback;

    tBTM_BOND_CANCEL_CMPL_CALLBACK *p_bond_cancel_cmpl_callback;

    tBTM_SP_CALLBACK            *p_sp_callback;

#if BLE_INCLUDED == TRUE