Eliminate dead code (helped by compiler warnings).
I've removed all functions that the compiler decided were unused.
Change-Id: I0cbddf874ebd1586abe29b80e8d6390680679542
diff --git a/bta/dm/bta_dm_act.c b/bta/dm/bta_dm_act.c
index 7013862..ed79803 100644
--- a/bta/dm/bta_dm_act.c
+++ b/bta/dm/bta_dm_act.c
@@ -241,26 +241,6 @@
/*******************************************************************************
**
-** 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
**
** Description Initialises the BT device manager
@@ -416,28 +396,6 @@
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();
diff --git a/bta/jv/bta_jv_act.c b/bta/jv/bta_jv_act.c
index c1c6875..03d8901 100644
--- a/bta/jv/bta_jv_act.c
+++ b/bta/jv/bta_jv_act.c
@@ -1475,65 +1475,6 @@
}
}
-/*******************************************************************************
-**
-** 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
/*******************************************************************************
**
@@ -1712,67 +1653,6 @@
/*******************************************************************************
**
-** 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
**
** Description starts an L2CAP server
@@ -2246,39 +2126,6 @@
/*******************************************************************************
**
-** 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
**
** Description callback for port mamangement function of rfcomm
diff --git a/btif/co/bta_gatts_co.c b/btif/co/bta_gatts_co.c
index d030075..c061a28 100644
--- a/btif/co/bta_gatts_co.c
+++ b/btif/co/bta_gatts_co.c
@@ -61,97 +61,6 @@
}
}
-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
*****************************************************************************/
diff --git a/btif/src/btif_config.c b/btif/src/btif_config.c
index e7809a7..06035cf 100644
--- a/btif/src/btif_config.c
+++ b/btif/src/btif_config.c
@@ -93,7 +93,6 @@
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 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();
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
index 4ef9e2c..662883a 100644
--- a/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@ -450,23 +450,6 @@
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);
-}
/*******************************************************************************
**
diff --git a/btif/src/btif_hh.c b/btif/src/btif_hh.c
index 051e746..73bcb0c 100644
--- a/btif/src/btif_hh.c
+++ b/btif/src/btif_hh.c
@@ -337,29 +337,6 @@
/*******************************************************************************
**
-** Function btif_hh_find_dev_by_handle
-**
-** Description Return the device pointer of the specified device handle
-**
-** Returns Device entry pointer in the device table
-*******************************************************************************/
-static btif_hh_device_t *btif_hh_find_dev_by_handle(UINT8 handle)
-{
- UINT32 i;
- // LOGV("%s: handle = %d", __FUNCTION__, handle);
- for (i = 0; i < BTIF_HH_MAX_HID; i++) {
- if (btif_hh_cb.devices[i].dev_status != BTHH_CONN_STATE_UNKNOWN &&
- btif_hh_cb.devices[i].dev_handle == handle)
- {
- return &btif_hh_cb.devices[i];
- }
- }
- return NULL;
-}
-
-
-/*******************************************************************************
-**
** Function btif_hh_find_connected_dev_by_handle
**
** Description Return the connected device pointer of the specified device handle
@@ -1402,75 +1379,6 @@
return BT_STATUS_SUCCESS;
}
-/*******************************************************************************
-**
-** Function get_idle_time
-**
-** Description Get the HID idle time
-**
-** Returns bt_status_t
-**
-*******************************************************************************/
-static bt_status_t get_idle_time(bt_bdaddr_t *bd_addr)
-{
- CHECK_BTHH_INIT();
- btif_hh_device_t *p_dev;
- BD_ADDR* bda = (BD_ADDR*) bd_addr;
-
- BTIF_TRACE_DEBUG6(" addr = %02X:%02X:%02X:%02X:%02X:%02X",
- (*bda)[0], (*bda)[1], (*bda)[2], (*bda)[3], (*bda)[4], (*bda)[5]);
-
- if (btif_hh_cb.status == BTIF_HH_DISABLED) {
- BTIF_TRACE_ERROR2("%s: Error, HH status = %d", __FUNCTION__, btif_hh_cb.status);
- return BT_STATUS_FAIL;
- }
-
- p_dev = btif_hh_find_connected_dev_by_bda(bd_addr);
- if (p_dev != NULL) {
- //BTA_HhGetIdle(p_dev->dev_handle);
- }
- else {
- return BT_STATUS_FAIL;
- }
- return BT_STATUS_SUCCESS;
-}
-
-/*******************************************************************************
-**
-** Function set_idle_time
-**
-** Description Set the HID idle time
-**
-** Returns bt_status_t
-**
-*******************************************************************************/
-static bt_status_t set_idle_time (bt_bdaddr_t *bd_addr, uint8_t idle_time)
-{
- UNUSED(idle_time);
-
- CHECK_BTHH_INIT();
- btif_hh_device_t *p_dev;
- BD_ADDR* bda = (BD_ADDR*) bd_addr;
-
- BTIF_TRACE_DEBUG6("addr = %02X:%02X:%02X:%02X:%02X:%02X",
- (*bda)[0], (*bda)[1], (*bda)[2], (*bda)[3], (*bda)[4], (*bda)[5]);
-
- if (btif_hh_cb.status == BTIF_HH_DISABLED) {
- BTIF_TRACE_ERROR2("%s: Error, HH status = %d", __FUNCTION__, btif_hh_cb.status);
- return BT_STATUS_FAIL;
- }
-
- p_dev = btif_hh_find_connected_dev_by_bda(bd_addr);
- if (p_dev == NULL) {
- BTIF_TRACE_WARNING6(" Error, device %02X:%02X:%02X:%02X:%02X:%02X not opened.",
- (*bda)[0], (*bda)[1], (*bda)[2], (*bda)[3], (*bda)[4], (*bda)[5]);
- return BT_STATUS_FAIL;
- }
- else {
- //BTA_HhSetIdle(p_dev->dev_handle, idle_time);
- }
- return BT_STATUS_SUCCESS;
-}
/*******************************************************************************
**
diff --git a/btif/src/btif_hl.c b/btif/src/btif_hl.c
index efa5ca7..e0ae6fe 100644
--- a/btif/src/btif_hl.c
+++ b/btif/src/btif_hl.c
@@ -94,7 +94,6 @@
static int reg_counter;
static inline int btif_hl_select_wakeup(void);
-static inline int btif_hl_select_exit(void);
static inline int btif_hl_select_close_connected(void);
static inline int btif_hl_close_select_thread(void);
static UINT8 btif_hl_get_next_app_id(void);
@@ -1236,51 +1235,6 @@
return found;
}
-/*******************************************************************************
-**
-** Function btif_hl_find_local_mdep_id
-**
-** Description Find the local MDEP ID from the MDEP configuration
-**
-** Returns BOOLEAN
-**
-*******************************************************************************/
-static BOOLEAN btif_hl_find_local_mdep_id(UINT8 app_id,
- tBTA_HL_MDEP_ROLE local_mdep_role,
- UINT16 mdep_data_type,
- tBTA_HL_MDEP_ID *p_local_mdep_id){
- UINT8 app_idx;
- btif_hl_app_cb_t *p_acb;
- UINT8 i,j;
- BOOLEAN found = FALSE;
-
- BTIF_TRACE_DEBUG1("%s", __FUNCTION__);
-
- if (btif_hl_find_app_idx(app_id, &app_idx) )
- {
- p_acb =BTIF_HL_GET_APP_CB_PTR(app_idx);
-
- for (i=0; i< p_acb->sup_feature.num_of_mdeps; i++)
- {
- if (p_acb->sup_feature.mdep[i].mdep_cfg.mdep_role == local_mdep_role )
- {
- for (j=0; j< p_acb->sup_feature.mdep[i].mdep_cfg.num_of_mdep_data_types; j++)
- {
- if ( p_acb->sup_feature.mdep[i].mdep_cfg.data_cfg[j].data_type == mdep_data_type)
- {
- found = TRUE;
- *p_local_mdep_id = p_acb->sup_feature.mdep[i].mdep_id;
- return found;
- }
- }
- }
- }
-
-
- }
- BTIF_TRACE_DEBUG2("found=%d local mdep id=%d", found, *p_local_mdep_id );
- return found;
-}
/*******************************************************************************
**
@@ -2220,28 +2174,6 @@
/*******************************************************************************
**
-** Function btif_hl_proc_sdp_info_ind
-**
-** Description Process the SDP info indication
-**
-** Returns Nothing
-**
-*******************************************************************************/
-static void btif_hl_proc_sdp_info_ind(tBTA_HL *p_data)
-
-{
- btif_hl_app_cb_t *p_acb;
- UINT8 app_idx;
-
- BTIF_TRACE_DEBUG1("%s", __FUNCTION__);
- if (btif_hl_find_app_idx_using_handle(p_data->sdp_info_ind.app_handle, &app_idx))
- {
- p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx);
- memcpy(&p_acb->sdp_info_ind, &p_data->sdp_info_ind, sizeof(tBTA_HL_SDP_INFO_IND));
- }
-}
-/*******************************************************************************
-**
** Function btif_hl_set_chan_cb_state
**
** Description set the channel callback state
@@ -4502,45 +4434,6 @@
/*******************************************************************************
**
-** Function get_device_datatype
-**
-** Description Start SDP on remote device and look for Remote HDP Data type and role
-**
-** Returns bt_status_t
-**
-*******************************************************************************/
-static bt_status_t get_device_datatype(int app_id, bt_bdaddr_t *bd_addr){
- btif_hl_app_cb_t *p_acb;
- UINT8 app_idx;
- bt_status_t status = BT_STATUS_SUCCESS;
- BD_ADDR bda;
- UINT8 i;
-
- CHECK_BTHL_INIT();
- BTIF_TRACE_EVENT2("%s app_id=%d", __FUNCTION__, app_id);
- btif_hl_display_calling_process_name();
-
- for (i=0; i<6; i++)
- {
- bda[i] = (UINT8) bd_addr->address[i];
- }
-
- if (btif_hl_find_app_idx(((UINT8)app_id), &app_idx))
- {
- p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx);
- BTA_HlSdpQuery(app_id,p_acb->app_handle,bda);
- }
- else
- {
- status = BT_STATUS_FAIL;
- }
-
- BTIF_TRACE_DEBUG1("de-reg return status=%d", status);
- return status;
-}
-
-/*******************************************************************************
-**
** Function init
**
** Description initializes the hl interface
diff --git a/btif/src/btif_media_task.c b/btif/src/btif_media_task.c
index 39eb705..26bda41 100644
--- a/btif/src/btif_media_task.c
+++ b/btif/src/btif_media_task.c
@@ -284,49 +284,6 @@
** Misc helper functions
*****************************************************************************/
-static void tput_mon(int is_rx, int len, int reset)
-{
- /* only monitor one connection at a time for now */
- static t_stat cur_stat;
- struct timespec now;
- unsigned long long prev_us;
- unsigned long long now_us;
-
- if (reset == TRUE)
- {
- memset(&cur_stat, 0, sizeof(t_stat));
- return;
- }
-
- if (is_rx)
- {
- cur_stat.rx+=len;
- cur_stat.rx_tot+=len;
- }
- else
- {
- cur_stat.tx+=len;
- cur_stat.tx_tot+=len;
- }
- clock_gettime(CLOCK_MONOTONIC, &now);
-
- now_us = now.tv_sec*USEC_PER_SEC + now.tv_nsec/1000;
-
- if ((now_us - cur_stat.ts_prev_us) < TPUT_STATS_INTERVAL_US)
- return;
-
- APPL_TRACE_WARNING4("tput rx:%d, tx:%d (bytes/s) (tot : rx %d, tx %d bytes)",
- (cur_stat.rx*1000000)/((now_us - cur_stat.ts_prev_us)),
- (cur_stat.tx*1000000)/((now_us - cur_stat.ts_prev_us)),
- cur_stat.rx_tot, cur_stat.tx_tot);
-
- /* stats dumped. now reset stats for next interval */
- cur_stat.rx = 0;
- cur_stat.tx = 0;
- cur_stat.ts_prev_us = now_us;
-}
-
-
static void log_tstamps_us(char *comment)
{
#define USEC_PER_SEC 1000000L
@@ -994,40 +951,6 @@
btif_media_cb.tx_flush = enable;
}
-/*****************************************************************************
-**
-** Function btif_calc_pcmtime
-**
-** Description Calculates the pcmtime equivalent of a datapacket
-**
-** Returns microseconds
-**
-*******************************************************************************/
-
-static int btif_calc_pcmtime(UINT32 bytes_processed)
-{
- int pcm_time_us = 0;
- tBTIF_AV_MEDIA_FEED_CFG *p_cfg;
-
- p_cfg = &btif_media_cb.media_feeding.cfg;
-
- /* calculate corresponding pcm time based on data processed */
- switch(btif_media_cb.media_feeding.format)
- {
- case BTIF_AV_CODEC_PCM:
- pcm_time_us = (bytes_processed*1000000)/
- (p_cfg->pcm.num_channel*p_cfg->pcm.sampling_freq*p_cfg->pcm.bit_per_sample/8);
- break;
-
- default :
- APPL_TRACE_ERROR1("mediafeeding format invalid : %d", btif_media_cb.media_feeding.format);
- break;
- }
-
- return pcm_time_us;
-}
-
-
/*******************************************************************************
**
** Function btif_media_task_aa_handle_timer
@@ -1758,34 +1681,6 @@
/*******************************************************************************
**
- ** Function btif_media_task_uipc_cback
- **
- ** Description UIPC call back function for synchronous mode only
- **
- ** Returns void
- **
- *******************************************************************************/
-static void btif_media_task_uipc_cback(BT_HDR *p_msg)
-{
- /* Sanity check */
- if (NULL == p_msg)
- {
- return;
- }
-
- /* Just handle RX_EVT */
- if (p_msg->event != UIPC_RX_DATA_EVT)
- {
- return;
- }
-
- p_msg->event = BTIF_MEDIA_UIPC_RX_RDY;
-
- GKI_send_msg(BT_MEDIA_TASK, BTIF_MEDIA_TASK_CMD_MBOX, p_msg);
-}
-
-/*******************************************************************************
- **
** Function btif_media_task_feeding_state_reset
**
** Description Reset the media feeding state
diff --git a/btif/src/btif_sock_rfc.c b/btif/src/btif_sock_rfc.c
index 4eed96f..f4a3052 100644
--- a/btif/src/btif_sock_rfc.c
+++ b/btif/src/btif_sock_rfc.c
@@ -102,9 +102,6 @@
static volatile int pth = -1; //poll thread handle
static void jv_dm_cback(tBTA_JV_EVT event, tBTA_JV *p_data, void *user_data);
static void cleanup_rfc_slot(rfc_slot_t* rs);
-static inline void close_rfc_connection(int rfc_handle, int server);
-static bt_status_t dm_get_remote_service_record(bt_bdaddr_t *remote_addr,
- bt_uuid_t *uuid);
static void *rfcomm_cback(tBTA_JV_EVT event, tBTA_JV *p_data, void *user_data);
static inline BOOLEAN send_app_scn(rfc_slot_t* rs);
static pthread_mutex_t slot_lock;
diff --git a/btif/src/btif_storage.c b/btif/src/btif_storage.c
index 8e03c05..1e58778 100644
--- a/btif/src/btif_storage.c
+++ b/btif/src/btif_storage.c
@@ -186,35 +186,6 @@
/*******************************************************************************
**
-** Function btif_in_make_filename
-**
-** Description Internal helper function to create NVRAM file path
-** from address and filename
-**
-** Returns NVRAM file path if successfull, NULL otherwise
-**
-*******************************************************************************/
-static char* btif_in_make_filename(bt_bdaddr_t *bd_addr, char *fname)
-{
- static char path[256];
- bdstr_t bdstr;
-
- if (fname == NULL)return NULL;
- if (bd_addr)
- {
- sprintf(path, "%s/%s/%s", BTIF_STORAGE_PATH_BLUEDROID,
- bd2str(bd_addr, &bdstr), fname);
- }
- else
- {
- /* local adapter */
- sprintf(path, "%s/LOCAL/%s", BTIF_STORAGE_PATH_BLUEDROID, fname);
- }
-
- return(char*)path;
-}
-/*******************************************************************************
-**
** Function btif_in_split_uuids_string_to_list
**
** Description Internal helper function to split the string of UUIDs
@@ -539,29 +510,6 @@
return BT_STATUS_SUCCESS;
}
-static int hex_str_to_int(const char* str, int size)
-{
- int n = 0;
- char c = *str++;
- while (size-- != 0)
- {
- n <<= 4;
- if (c >= '0' && c <= '9') {
- n |= c - '0';
- }
- else if (c >= 'a' && c <= 'z') {
- n |= c - 'a' + 10;
- }
- else // (c >= 'A' && c <= 'Z')
- {
- n |= c - 'A' + 10;
- }
-
- c = *str++;
- }
- return n;
-}
-
/************************************************************************************
** Externs
************************************************************************************/
diff --git a/main/bte_conf.c b/main/bte_conf.c
index ddad0c7..eff9c44 100644
--- a/main/bte_conf.c
+++ b/main/bte_conf.c
@@ -452,4 +452,3 @@
}
}
}
-
diff --git a/udrv/ulinux/uipc.c b/udrv/ulinux/uipc.c
index 186e58c..32fbbf0 100644
--- a/udrv/ulinux/uipc.c
+++ b/udrv/ulinux/uipc.c
@@ -140,49 +140,6 @@
}
/*****************************************************************************
-**
-** Function
-**
-** Description
-**
-** Returns
-**
-*******************************************************************************/
-
-static void uipc_wait(tUIPC_CH_ID ch_id, tUIPC_EVENT wait_event_flags)
-{
- int ret;
- tUIPC_CHAN *p = &uipc_main.ch[ch_id];
-
- //BTIF_TRACE_EVENT2("WAIT UIPC CH %d EVT %x BEGIN", ch_id, wait_event_flags);
- pthread_mutex_lock(&p->cond_mutex);
- p->cond_flags |= wait_event_flags;
- ret = pthread_cond_wait(&p->cond, &p->cond_mutex);
- pthread_mutex_unlock(&p->cond_mutex);
- //BTIF_TRACE_EVENT2("WAIT UIPC CH %d EVT %x DONE", ch_id, wait_event_flags);
-}
-
-static void uipc_signal(tUIPC_CH_ID ch_id, tUIPC_EVENT event)
-{
- int ret;
- tUIPC_CHAN *p = &uipc_main.ch[ch_id];
-
- //BTIF_TRACE_EVENT2("SIGNAL UIPC CH %d EVT %x BEGIN", ch_id, dump_uipc_event(event));
- pthread_mutex_lock(&p->cond_mutex);
-
- if (event & p->cond_flags)
- {
- //BTIF_TRACE_EVENT0("UNBLOCK");
- ret = pthread_cond_signal(&p->cond);
- p->cond_flags = 0;
- }
-
- pthread_mutex_unlock(&p->cond_mutex);
-}
-
-
-
-/*****************************************************************************
** socket helper functions
*****************************************************************************/