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

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

Remove unused link supervision timeout code 

The btm callback was never set, so this code
did nothing useful.
parent 5443c850

system/stack/btm/btm_acl.c

+0 −27
Original line number Diff line number Diff line
@@ -1476,33 +1476,6 @@ tBTM_STATUS BTM_SetLinkSuperTout (BD_ADDR remote_bda, UINT16 timeout) 
    return(BTM_UNKNOWN_ADDR);

}



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

**

** Function         btm_proc_lsto_evt

**

** Description      process the HCI "Link Supervision Timeout Change" event

**

** Returns          void

**

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

void btm_proc_lsto_evt(UINT16 handle, UINT16 timeout)

{

    UINT8 xx;



    BTM_TRACE_DEBUG ("btm_proc_lsto_evt");

    if (btm_cb.p_lsto_cback)

    {

        /* Look up the connection by handle and set the current mode */

        xx = btm_handle_to_acl_index(handle);



        /* don't assume that we can never get a bad hci_handle */

        if (xx < MAX_L2CAP_LINKS)

        {

            (*btm_cb.p_lsto_cback)(btm_cb.acl_db[xx].remote_addr, timeout);

        }

    }

}



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

**

** Function         BTM_SetPacketTypes

system/stack/btm/btm_int.h

+0 −3
Original line number Diff line number Diff line
@@ -769,8 +769,6 @@ typedef struct 
    tBTM_BL_EVENT_MASK     bl_evt_mask;

    tBTM_BL_CHANGE_CB     *p_bl_changed_cb;    /* Callback for when Busy Level changed */



    tBTM_LSTO_CBACK       *p_lsto_cback;  /* for link supervision timeout change event */



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

    **      Power Management

    ****************************************************/
@@ -1042,7 +1040,6 @@ extern tBTM_STATUS btm_sec_mx_access_request (BD_ADDR bd_addr, UINT16 psm, BOOL 
                                        tBTM_SEC_CALLBACK *p_callback, void *p_ref_data);

extern void  btm_sec_conn_req (UINT8 *bda, UINT8 *dc);

extern void btm_create_conn_cancel_complete (UINT8 *p);

extern void btm_proc_lsto_evt(UINT16 handle, UINT16 timeout);

extern void btm_read_linq_tx_power_complete (UINT8 *p);



extern void  btm_sec_init (UINT8 sec_mode);

system/stack/btu/btu_hcif.c

+0 −22
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static void btu_hcif_user_conf_request_evt (UINT8 *p); 
static void btu_hcif_user_passkey_request_evt (UINT8 *p);

static void btu_hcif_user_passkey_notif_evt (UINT8 *p);

static void btu_hcif_keypress_notif_evt (UINT8 *p);

static void btu_hcif_link_super_tout_evt (UINT8 *p);



    #if BTM_OOB_INCLUDED == TRUE

static void btu_hcif_rem_oob_request_evt (UINT8 *p);
@@ -297,9 +296,6 @@ void btu_hcif_process_event (UNUSED_ATTR UINT8 controller_id, BT_HDR *p_msg) 
        case HCI_KEYPRESS_NOTIFY_EVT:

            btu_hcif_keypress_notif_evt (p);

            break;

        case HCI_LINK_SUPER_TOUT_CHANGED_EVT:

            btu_hcif_link_super_tout_evt (p);

            break;

#if L2CAP_NON_FLUSHABLE_PB_INCLUDED == TRUE

        case HCI_ENHANCED_FLUSH_COMPLETE_EVT:

            btu_hcif_enhanced_flush_complete_evt ();
@@ -1588,24 +1584,6 @@ static void btu_hcif_keypress_notif_evt (UINT8 *p) 
    btm_keypress_notif_evt(p);

}



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

**

** Function         btu_hcif_link_super_tout_evt

**

** Description      Process event HCI_LINK_SUPER_TOUT_CHANGED_EVT

**

** Returns          void

**

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

static void btu_hcif_link_super_tout_evt (UINT8 *p)

{

    UINT16 handle, timeout;

    STREAM_TO_UINT16 (handle, p);

    STREAM_TO_UINT16 (timeout, p);



    btm_proc_lsto_evt(handle, timeout);

}



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

**

** Function         btu_hcif_rem_oob_request_evt