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

Commit 574ef1b3 authored by Sharvil Nanavati's avatar Sharvil Nanavati
Browse files

Eliminate dead code (helped by compiler warnings). 

I've removed all functions that the compiler decided were unused.

Change-Id: I0cbddf874ebd1586abe29b80e8d6390680679542
parent 24eb6a1e

system/bta/dm/bta_dm_act.c

+0 −42
Original line number Diff line number Diff line
@@ -238,26 +238,6 @@ const tBTA_DM_LMP_VER_INFO bta_role_switch_blacklist[BTA_DM_MAX_ROLE_SWITCH_BLAC 
#define MAX_DISC_RAW_DATA_BUF       (4096)

UINT8 g_disc_raw_data_buf[MAX_DISC_RAW_DATA_BUF];



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

**

** Function         bta_dm_app_ready_timer_cback

**

** Description      allow sending EIR to controller

**

**

** Returns          void

**

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

#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&(BTA_EIR_CANNED_UUID_LIST != TRUE)

static void bta_dm_app_ready_timer_cback (TIMER_LIST_ENT *p_tle)

{

    UNUSED(p_tle);

    bta_dm_set_eir (NULL);

}

#else

#define bta_dm_app_ready_timer_cback (x)

#endif



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

**

** Function         bta_dm_enable
@@ -415,28 +395,6 @@ static void bta_dm_sys_hw_cback( tBTA_SYS_HW_EVT status ) 


        bta_sys_policy_register((tBTA_SYS_CONN_CBACK*)bta_dm_policy_cback);





        // BLUEDROID REMOVE ??

#if 0

#if 1

        /* Create broadcom primary DI record */

        if(WBT_ExtCreateRecord())

        {

#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )

            /* while app_ready_timer is running, BTA DM doesn't send EIR to controller */

            bta_dm_cb.app_ready_timer.p_cback = (TIMER_CBACK*)&bta_dm_app_ready_timer_cback;

            bta_sys_start_timer(&bta_dm_cb.app_ready_timer, 0, 100);



            bta_sys_add_uuid(UUID_SERVCLASS_PNP_INFORMATION);

#endif

            bta_dm_di_cb.di_handle[bta_dm_di_cb.di_num] = 0;    /* primary DI record */

            bta_dm_di_cb.di_num ++;

        }

#else   /* Eventually implement pin code */

        if (WBT_ExtCreateRecord())

            WBT_ExtAddPinCode();

#endif

#endif

#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)

        memset (&app_uuid.uu.uuid128, 0x87, LEN_UUID_128);

        bta_dm_gattc_register();

system/bta/jv/bta_jv_act.c

+0 −153
Original line number Diff line number Diff line
@@ -1475,65 +1475,6 @@ void bta_jv_delete_record(tBTA_JV_MSG *p_data) 
    }

}



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

**

** Function     bta_jv_l2cap_client_cback

**

** Description  handles the l2cap client events

**

** Returns      void

**

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

static void bta_jv_l2cap_client_cback(UINT16 gap_handle, UINT16 event)

{

    UNUSED(gap_handle);

    UNUSED(event);

#if 0

    tBTA_JV_L2C_CB  *p_cb = &bta_jv_cb.l2c_cb[gap_handle];

    tBTA_JV     evt_data;



    if(gap_handle >= BTA_JV_MAX_L2C_CONN && !p_cb->p_cback)

        return;



    APPL_TRACE_DEBUG2( "bta_jv_l2cap_client_cback: %d evt:x%x",

        gap_handle, event);

    evt_data.l2c_open.status = BTA_JV_SUCCESS;

    evt_data.l2c_open.handle = gap_handle;

    switch (event)

    {

    case GAP_EVT_CONN_OPENED:

        bdcpy(evt_data.l2c_open.rem_bda, GAP_ConnGetRemoteAddr(gap_handle));

        evt_data.l2c_open.tx_mtu = GAP_ConnGetRemMtuSize(gap_handle);

        p_cb->state = BTA_JV_ST_CL_OPEN;

        p_cb->p_cback(BTA_JV_L2CAP_OPEN_EVT, &evt_data);

        break;



    case GAP_EVT_CONN_CLOSED:

        p_cb->state = BTA_JV_ST_NONE;

        bta_jv_free_sec_id(&p_cb->sec_id);

        evt_data.l2c_close.async = TRUE;

        p_cb->p_cback(BTA_JV_L2CAP_CLOSE_EVT, &evt_data);

        p_cb->p_cback = NULL;

        break;



    case GAP_EVT_CONN_DATA_AVAIL:

        evt_data.handle = gap_handle;

        p_cb->p_cback(BTA_JV_L2CAP_DATA_IND_EVT, &evt_data);

        break;



    case GAP_EVT_CONN_CONGESTED:

    case GAP_EVT_CONN_UNCONGESTED:

        p_cb->cong = (event == GAP_EVT_CONN_CONGESTED) ? TRUE : FALSE;

        evt_data.l2c_cong.cong = p_cb->cong;

        p_cb->p_cback(BTA_JV_L2CAP_CONG_EVT, &evt_data);

        break;



    default:

        break;

    }

#endif

}



#if SDP_FOR_JV_INCLUDED == TRUE

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

**
@@ -1710,67 +1651,6 @@ void bta_jv_l2cap_close(tBTA_JV_MSG *p_data) 
#endif

}



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

**

** Function         bta_jv_l2cap_server_cback

**

** Description      handles the l2cap server callback

**

** Returns          void

**

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

static void bta_jv_l2cap_server_cback(UINT16 gap_handle, UINT16 event)

{

    UNUSED(gap_handle);

    UNUSED(event);

#if 0

    tBTA_JV_L2C_CB  *p_cb = &bta_jv_cb.l2c_cb[gap_handle];

    tBTA_JV evt_data;

    tBTA_JV_L2CAP_CBACK *p_cback;



    if(gap_handle >= BTA_JV_MAX_L2C_CONN && !p_cb->p_cback)

        return;



    APPL_TRACE_DEBUG2( "bta_jv_l2cap_server_cback: %d evt:x%x",

        gap_handle, event);

    evt_data.l2c_open.status = BTA_JV_SUCCESS;

    evt_data.l2c_open.handle = gap_handle;



    switch (event)

    {

    case GAP_EVT_CONN_OPENED:

        bdcpy(evt_data.l2c_open.rem_bda, GAP_ConnGetRemoteAddr(gap_handle));

        evt_data.l2c_open.tx_mtu = GAP_ConnGetRemMtuSize(gap_handle);

        p_cb->state = BTA_JV_ST_SR_OPEN;

        p_cb->p_cback(BTA_JV_L2CAP_OPEN_EVT, &evt_data);

        break;



    case GAP_EVT_CONN_CLOSED:

        evt_data.l2c_close.async = TRUE;

        evt_data.l2c_close.handle = p_cb->handle;

        p_cback = p_cb->p_cback;

        evt_data.l2c_close.status = bta_jv_free_l2c_cb(p_cb);

        p_cback(BTA_JV_L2CAP_CLOSE_EVT, &evt_data);

        break;



    case GAP_EVT_CONN_DATA_AVAIL:

        evt_data.handle = gap_handle;

        p_cb->p_cback(BTA_JV_L2CAP_DATA_IND_EVT, &evt_data);

        break;



    case GAP_EVT_CONN_CONGESTED:

    case GAP_EVT_CONN_UNCONGESTED:

        p_cb->cong = (event == GAP_EVT_CONN_CONGESTED) ? TRUE : FALSE;

        evt_data.l2c_cong.cong = p_cb->cong;

        p_cb->p_cback(BTA_JV_L2CAP_CONG_EVT, &evt_data);

        break;



    default:

        break;

    }

#endif

}



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

**

** Function     bta_jv_l2cap_start_server
@@ -2244,39 +2124,6 @@ void bta_jv_rfcomm_close(tBTA_JV_MSG *p_data) 
                get_sec_id_used(), get_rfc_cb_used());

}



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

**

** Function     bta_jv_get_num_rfc_listen

**

** Description  when a RFCOMM connection goes down, make sure that there's only

**              one port stays listening on this scn.

**

** Returns

**

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

static UINT8 bta_jv_get_num_rfc_listen(tBTA_JV_RFC_CB *p_cb)

{

    UINT8   i, listen=1;

    tBTA_JV_PCB *p_pcb;



    if (p_cb->max_sess > 1)

    {

        listen = 0;

        for (i=0; i<p_cb->max_sess; i++)

        {

            if (p_cb->rfc_hdl[i] != 0)

            {

                p_pcb = &bta_jv_cb.port_cb[p_cb->rfc_hdl[i] - 1];

                if (BTA_JV_ST_SR_LISTEN == p_pcb->state)

                {

                    listen++;

                }

            }

        }

    }

    return listen;

}



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

**

** Function     bta_jv_port_mgmt_sr_cback

system/btif/co/bta_gatts_co.c

+0 −91
Original line number Diff line number Diff line
@@ -61,97 +61,6 @@ static void btif_gatts_check_init(void) 
    }

}



static BOOLEAN btif_gatts_srv_chg(tBTA_GATTS_SRV_CHG_CMD cmd,

                                  tBTA_GATTS_SRV_CHG_REQ *p_req,

                                  tBTA_GATTS_SRV_CHG_RSP *p_rsp)

{

    BOOLEAN status = TRUE;

    BOOLEAN found = FALSE;

    UINT8   i, j, idx, last_idx;

    btif_gatts_srv_chg_cb_t *p_cb = &btif_gatts_srv_chg_cb;



    btif_gatts_check_init();



    switch (cmd)

    {

        case BTA_GATTS_SRV_CHG_CMD_ADD_CLIENT:



            if (p_cb->num_clients < BTIF_GATTS_MAX_SRV_CHG_CLT_SIZE)

            {

                memcpy(&p_cb->srv_chg[p_cb->num_clients], &p_req->srv_chg, sizeof(tBTA_GATTS_SRV_CHG));

                p_cb->num_clients++;

            } else {

                status = FALSE;

            }

            break;



        case BTA_GATTS_SRV_CHG_CMD_UPDATE_CLIENT:



            for (i=0; i != p_cb->num_clients; ++i)

            {

                if (!memcmp(p_cb->srv_chg[i].bda, p_req->srv_chg.bda, sizeof(BD_ADDR)))

                {

                    found = TRUE;

                    memcpy(&p_cb->srv_chg[i], &p_req->srv_chg, sizeof(tBTA_GATTS_SRV_CHG));

                    break;

                }

            }



            if (!found)

                status = FALSE;

            break;



        case BTA_GATTS_SRV_CHG_CMD_REMOVE_CLIENT:



            for (i=0; i != p_cb->num_clients; ++i)

            {

                if (!memcmp(p_cb->srv_chg[i].bda, p_req->srv_chg.bda, sizeof(BD_ADDR)))

                {

                    found = TRUE;

                    last_idx = p_cb->num_clients - 1;



                    if (i != last_idx )

                    {

                        /* Update the array so there is no gap */

                        for (j=i; j != last_idx; ++j )

                        {

                            memcpy(&p_cb->srv_chg[j], &p_cb->srv_chg[j+1], sizeof(tBTA_GATTS_SRV_CHG));

                        }



                    }



                    /* Reset the last client and update num_clients */

                    memset(&p_cb->srv_chg[last_idx], 0, sizeof(tBTA_GATTS_SRV_CHG));

                    p_cb->num_clients--;

                    break;

                }

            }



            if (!found)

                status = FALSE;

            break;



        case BTA_GATTS_SRV_CHG_CMD_READ_NUM_CLENTS:

            p_rsp->num_clients = p_cb->num_clients;

            break;



        case BTA_GATTS_SRV_CHG_CMD_READ_CLENT:

            idx = p_req->client_read_index - 1;



            if (idx < p_cb->num_clients )

                memcpy(&p_rsp->srv_chg, &p_cb->srv_chg[idx], sizeof(tBTA_GATTS_SRV_CHG));

            else

                status = FALSE;

            break;



        default:

            status = FALSE;

            break;

    }



    return status;

}



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

**  Externally called functions

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

system/btif/src/btif_config.c

+0 −2
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ static int processing_save_cmd; 
static void cfg_cmd_callback(int cmd_fd, int type, int flags, uint32_t user_id);

static inline short alloc_node(cfg_node* p, short grow);

static inline void free_node(cfg_node* p);

static inline void free_inode(cfg_node* p, int child);

static inline short find_inode(const cfg_node* p, const char* name);

static cfg_node* find_node(const char* section, const char* key, const char* name);

static int remove_node(const char* section, const char* key, const char* name);
@@ -104,7 +103,6 @@ static int set_node(const char* section, const char* key, const char* name, 
static int save_cfg();

static void load_cfg();

static short find_next_node(const cfg_node* p, short start, char* name, int* bytes);

static int create_dir(const char* path);

#ifdef UNIT_TEST

static void cfg_test_load();

static void cfg_test_write();

system/btif/src/btif_dm.c

+0 −17
Original line number Diff line number Diff line
@@ -450,23 +450,6 @@ static void btif_update_remote_properties(BD_ADDR bd_addr, BD_NAME bd_name, 
    HAL_CBACK(bt_hal_cbacks, remote_device_properties_cb,

                     status, &bdaddr, num_properties, properties);

}

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

**

** Function         hid_remote_name_cback

**

** Description      Remote name callback for HID device. Called in stack context

**                  Special handling for HID devices

**

** Returns          void

**

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

static void hid_remote_name_cback(void *p_param)

{

    BTIF_TRACE_DEBUG1("%s", __FUNCTION__);



    btif_transfer_context(btif_dm_generic_evt, BTIF_DM_CB_HID_REMOTE_NAME,

        (char *)p_param, sizeof(tBTM_REMOTE_DEV_NAME), NULL);

}



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

**