From 82d0a118de082b95cc41b63de8fcd79c9f1f0831 Mon Sep 17 00:00:00 2001 From: Sharvil Nanavati Date: Fri, 6 Jun 2014 00:18:40 -0700 Subject: [PATCH] Eliminate dead code: remove GKI_sched* from the codebase. Change-Id: I607bd3bf88ef8847c8a7e984a54eabedd4fb7516 --- bta/ag/bta_ag_api.c | 2 -- bta/ag/bta_ag_main.c | 2 -- bta/av/bta_av_api.c | 2 -- bta/dm/bta_dm_api.c | 12 +---------- bta/gatt/bta_gattc_api.c | 12 ----------- bta/gatt/bta_gattc_cache.c | 4 ---- bta/gatt/bta_gatts_api.c | 6 ++---- bta/hf_client/bta_hf_client_api.c | 2 -- bta/hf_client/bta_hf_client_main.c | 2 -- bta/hh/bta_hh_api.c | 2 -- bta/hh/bta_hh_utils.c | 3 --- bta/hl/bta_hl_api.c | 2 -- bta/jv/bta_jv_api.c | 2 -- bta/pan/bta_pan_api.c | 2 -- gki/common/gki.h | 2 -- gki/ulinux/gki_ulinux.c | 42 -------------------------------------- 16 files changed, 3 insertions(+), 96 deletions(-) diff --git a/bta/ag/bta_ag_api.c b/bta/ag/bta_ag_api.c index 07dceb9c2..c80ba8f83 100644 --- a/bta/ag/bta_ag_api.c +++ b/bta/ag/bta_ag_api.c @@ -71,9 +71,7 @@ tBTA_STATUS BTA_AgEnable(tBTA_AG_PARSE_MODE parse_mode, tBTA_AG_CBACK *p_cback) } /* register with BTA system manager */ - GKI_sched_lock(); bta_sys_register(BTA_ID_AG, &bta_ag_reg); - GKI_sched_unlock(); if ((p_buf = (tBTA_AG_API_ENABLE *) GKI_getbuf(sizeof(tBTA_AG_API_ENABLE))) != NULL) { diff --git a/bta/ag/bta_ag_main.c b/bta/ag/bta_ag_main.c index 712e50e80..7eaec307b 100644 --- a/bta/ag/bta_ag_main.c +++ b/bta/ag/bta_ag_main.c @@ -713,9 +713,7 @@ static void bta_ag_api_disable(tBTA_AG_DATA *p_data) } /* De-register with BTA system manager */ - GKI_sched_lock(); bta_sys_deregister(BTA_ID_AG); - GKI_sched_unlock(); for (i = 0; i < BTA_AG_NUM_SCB; i++, p_scb++) { diff --git a/bta/av/bta_av_api.c b/bta/av/bta_av_api.c index 98718fd91..9b07399e4 100644 --- a/bta/av/bta_av_api.c +++ b/bta/av/bta_av_api.c @@ -63,9 +63,7 @@ void BTA_AvEnable(tBTA_SEC sec_mask, tBTA_AV_FEAT features, tBTA_AV_CBACK *p_cba tBTA_AV_API_ENABLE *p_buf; /* register with BTA system manager */ - GKI_sched_lock(); bta_sys_register(BTA_ID_AV, &bta_av_reg); - GKI_sched_unlock(); if ((p_buf = (tBTA_AV_API_ENABLE *) GKI_getbuf(sizeof(tBTA_AV_API_ENABLE))) != NULL) { diff --git a/bta/dm/bta_dm_api.c b/bta/dm/bta_dm_api.c index ff762f990..92af9c7b7 100644 --- a/bta/dm/bta_dm_api.c +++ b/bta/dm/bta_dm_api.c @@ -71,15 +71,12 @@ tBTA_STATUS BTA_EnableBluetooth(tBTA_DM_SEC_CBACK *p_cback) memset(&bta_dm_cb, 0, sizeof(bta_dm_cb)); - GKI_sched_lock(); bta_sys_register (BTA_ID_DM, &bta_dm_reg ); bta_sys_register (BTA_ID_DM_SEARCH, &bta_dm_search_reg ); /* if UUID list is not provided as static data */ bta_sys_eir_register(bta_dm_eir_update_uuid); - GKI_sched_unlock(); - if ((p_msg = (tBTA_DM_API_ENABLE *) GKI_getbuf(sizeof(tBTA_DM_API_ENABLE))) != NULL) { p_msg->hdr.event = BTA_DM_API_ENABLE_EVT; @@ -179,14 +176,7 @@ void BTA_DisableTestMode(void) *******************************************************************************/ BOOLEAN BTA_DmIsDeviceUp(void) { - - BOOLEAN status; - - GKI_sched_lock(); - status = BTM_IsDeviceUp(); - GKI_sched_unlock(); - return status; - + return BTM_IsDeviceUp(); } /******************************************************************************* diff --git a/bta/gatt/bta_gattc_api.c b/bta/gatt/bta_gattc_api.c index bfbaf63d1..87ad1ef56 100644 --- a/bta/gatt/bta_gattc_api.c +++ b/bta/gatt/bta_gattc_api.c @@ -91,9 +91,7 @@ void BTA_GATTC_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTC_CBACK *p_client_cb) if (bta_sys_is_register(BTA_ID_GATTC) == FALSE) { - GKI_sched_lock(); bta_sys_register(BTA_ID_GATTC, &bta_gattc_reg); - GKI_sched_unlock(); } if ((p_buf = (tBTA_GATTC_API_REG *) GKI_getbuf(sizeof(tBTA_GATTC_API_REG))) != NULL) @@ -909,9 +907,6 @@ tBTA_GATT_STATUS BTA_GATTC_RegisterForNotifications (tBTA_GATTC_IF client_if, return status; } - /* lock other GKI task */ - GKI_sched_lock(); - if ((p_clreg = bta_gattc_cl_get_regcb(client_if)) != NULL) { for (i = 0; i < BTA_GATTC_NOTIF_REG_MAX; i ++) @@ -956,8 +951,6 @@ tBTA_GATT_STATUS BTA_GATTC_RegisterForNotifications (tBTA_GATTC_IF client_if, APPL_TRACE_ERROR1("Client_if: %d Not Registered", client_if); } - GKI_sched_unlock(); - return status; } @@ -988,9 +981,6 @@ tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications (tBTA_GATTC_IF client_if, return status; } - /* lock other GKI task */ - GKI_sched_lock(); - if ((p_clreg = bta_gattc_cl_get_regcb(client_if)) != NULL) { for (i = 0; i < BTA_GATTC_NOTIF_REG_MAX; i ++) @@ -1017,8 +1007,6 @@ tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications (tBTA_GATTC_IF client_if, APPL_TRACE_ERROR1("Client_if: %d Not Registered", client_if); } - GKI_sched_unlock(); - return status; } diff --git a/bta/gatt/bta_gattc_cache.c b/bta/gatt/bta_gattc_cache.c index 64147e2df..cf0cf955c 100644 --- a/bta/gatt/bta_gattc_cache.c +++ b/bta/gatt/bta_gattc_cache.c @@ -1440,9 +1440,6 @@ tBTA_GATT_STATUS bta_gattc_query_cache(UINT16 conn_id, tBTA_GATTC_CLCB *p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id); tBTA_GATT_STATUS status = BTA_GATT_ILLEGAL_PARAMETER; - /* lock other GKI task */ - GKI_sched_lock(); - if (p_clcb != NULL ) { if (p_clcb->state == BTA_GATTC_CONN_ST) @@ -1476,7 +1473,6 @@ tBTA_GATT_STATUS bta_gattc_query_cache(UINT16 conn_id, { APPL_TRACE_ERROR1("Unknown conn ID: %d", conn_id); } - GKI_sched_unlock(); return status; } diff --git a/bta/gatt/bta_gatts_api.c b/bta/gatt/bta_gatts_api.c index 79eb6f911..86bb2f1a4 100644 --- a/bta/gatt/bta_gatts_api.c +++ b/bta/gatt/bta_gatts_api.c @@ -90,11 +90,9 @@ void BTA_GATTS_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTS_CBACK *p_cback) tBTA_GATTS_API_REG *p_buf; /* register with BTA system manager */ - if (bta_sys_is_register(BTA_ID_GATTS) == FALSE) - { - GKI_sched_lock(); + if (bta_sys_is_register(BTA_ID_GATTS) == FALSE) + { bta_sys_register(BTA_ID_GATTS, &bta_gatts_reg); - GKI_sched_unlock(); } if ((p_buf = (tBTA_GATTS_API_REG *) GKI_getbuf(sizeof(tBTA_GATTS_API_REG))) != NULL) diff --git a/bta/hf_client/bta_hf_client_api.c b/bta/hf_client/bta_hf_client_api.c index 9920ac911..a7c62559a 100644 --- a/bta/hf_client/bta_hf_client_api.c +++ b/bta/hf_client/bta_hf_client_api.c @@ -68,9 +68,7 @@ BTA_API tBTA_STATUS BTA_HfClientEnable(tBTA_HF_CLIENT_CBACK *p_cback) } /* register with BTA system manager */ - GKI_sched_lock(); bta_sys_register(BTA_ID_HS, &bta_hf_client_reg); - GKI_sched_unlock(); if ((p_buf = (tBTA_HF_CLIENT_API_ENABLE *) GKI_getbuf(sizeof(tBTA_HF_CLIENT_API_ENABLE))) != NULL) { diff --git a/bta/hf_client/bta_hf_client_main.c b/bta/hf_client/bta_hf_client_main.c index facb62e7f..8311183b1 100644 --- a/bta/hf_client/bta_hf_client_main.c +++ b/bta/hf_client/bta_hf_client_main.c @@ -417,9 +417,7 @@ static void bta_hf_client_api_disable(tBTA_HF_CLIENT_DATA *p_data) } /* De-register with BTA system manager */ - GKI_sched_lock(); bta_sys_deregister(BTA_ID_HS); - GKI_sched_unlock(); bta_hf_client_sm_execute(BTA_HF_CLIENT_API_DEREGISTER_EVT, p_data); diff --git a/bta/hh/bta_hh_api.c b/bta/hh/bta_hh_api.c index df41a5275..e7672d93c 100644 --- a/bta/hh/bta_hh_api.c +++ b/bta/hh/bta_hh_api.c @@ -63,9 +63,7 @@ void BTA_HhEnable(tBTA_SEC sec_mask, tBTA_HH_CBACK *p_cback) tBTA_HH_API_ENABLE *p_buf; /* register with BTA system manager */ - GKI_sched_lock(); bta_sys_register(BTA_ID_HH, &bta_hh_reg); - GKI_sched_unlock(); APPL_TRACE_ERROR0("Calling BTA_HhEnable"); p_buf = (tBTA_HH_API_ENABLE *)GKI_getbuf((UINT16)sizeof(tBTA_HH_API_ENABLE)); diff --git a/bta/hh/bta_hh_utils.c b/bta/hh/bta_hh_utils.c index 6130a8866..629281b61 100644 --- a/bta/hh/bta_hh_utils.c +++ b/bta/hh/bta_hh_utils.c @@ -413,8 +413,6 @@ tBTA_HH_STATUS bta_hh_read_ssr_param(BD_ADDR bd_addr, UINT16 *p_max_ssr_lat, UIN tBTA_HH_CB *p_cb = &bta_hh_cb; UINT8 i; UINT16 ssr_max_latency; - /* lock other GKI task */ - GKI_sched_lock(); for (i = 0; i < BTA_HH_MAX_KNOWN; i ++) { if (memcmp(p_cb->kdev[i].addr, bd_addr, BD_ADDR_LEN) == 0) @@ -449,7 +447,6 @@ tBTA_HH_STATUS bta_hh_read_ssr_param(BD_ADDR bd_addr, UINT16 *p_max_ssr_lat, UIN break; } } - GKI_sched_unlock(); return status; } diff --git a/bta/hl/bta_hl_api.c b/bta/hl/bta_hl_api.c index 6f5572bfb..53b822dde 100644 --- a/bta/hl/bta_hl_api.c +++ b/bta/hl/bta_hl_api.c @@ -63,9 +63,7 @@ void BTA_HlEnable(tBTA_HL_CTRL_CBACK *p_ctrl_cback) tBTA_HL_API_ENABLE *p_buf; /* register with BTA system manager */ - GKI_sched_lock(); bta_sys_register(BTA_ID_HL, &bta_hl_reg); - GKI_sched_unlock(); if ((p_buf = (tBTA_HL_API_ENABLE *)GKI_getbuf(sizeof(tBTA_HL_API_ENABLE))) != NULL) { diff --git a/bta/jv/bta_jv_api.c b/bta/jv/bta_jv_api.c index ad0b694e0..c91eacf00 100644 --- a/bta/jv/bta_jv_api.c +++ b/bta/jv/bta_jv_api.c @@ -74,9 +74,7 @@ tBTA_JV_STATUS BTA_JvEnable(tBTA_JV_DM_CBACK *p_cback) } /* register with BTA system manager */ - GKI_sched_lock(); bta_sys_register(BTA_ID_JV, &bta_jv_reg); - GKI_sched_unlock(); if (p_cback && (p_buf = (tBTA_JV_API_ENABLE *) GKI_getbuf(sizeof(tBTA_JV_API_ENABLE))) != NULL) { diff --git a/bta/pan/bta_pan_api.c b/bta/pan/bta_pan_api.c index 6588230d1..c515ff91b 100644 --- a/bta/pan/bta_pan_api.c +++ b/bta/pan/bta_pan_api.c @@ -59,9 +59,7 @@ void BTA_PanEnable(tBTA_PAN_CBACK p_cback) tBTA_PAN_API_ENABLE *p_buf; /* register with BTA system manager */ - GKI_sched_lock(); bta_sys_register(BTA_ID_PAN, &bta_pan_reg); - GKI_sched_unlock(); if ((p_buf = (tBTA_PAN_API_ENABLE *) GKI_getbuf(sizeof(tBTA_PAN_API_ENABLE))) != NULL) { diff --git a/gki/common/gki.h b/gki/common/gki.h index 5180dcdd1..bff0c6c34 100644 --- a/gki/common/gki.h +++ b/gki/common/gki.h @@ -461,8 +461,6 @@ GKI_API extern void GKI_timer_queue_register_callback(SYSTEM_TICK_CBACK *); */ GKI_API extern void GKI_enable(void); GKI_API extern void GKI_disable(void); -GKI_API extern void GKI_sched_lock(void); -GKI_API extern void GKI_sched_unlock(void); /* Allocate (Free) memory from an OS */ diff --git a/gki/ulinux/gki_ulinux.c b/gki/ulinux/gki_ulinux.c index 912b5b2e9..a566bdd77 100644 --- a/gki/ulinux/gki_ulinux.c +++ b/gki/ulinux/gki_ulinux.c @@ -1308,45 +1308,3 @@ void GKI_exit_task (UINT8 task_id) GKI_INFO("GKI_exit_task %d done", task_id); return; } - - -/******************************************************************************* -** -** Function GKI_sched_lock -** -** Description This function is called by tasks to disable scheduler -** task context switching. -** -** Returns void -** -** NOTE This function is NOT called by the Broadcom stack and -** profiles. If you want to use it in your own implementation, -** put code here to tell the OS to disable context switching. -** -*******************************************************************************/ -void GKI_sched_lock(void) -{ - GKI_TRACE("GKI_sched_lock"); - return; -} - - -/******************************************************************************* -** -** Function GKI_sched_unlock -** -** Description This function is called by tasks to enable scheduler switching. -** -** Returns void -** -** NOTE This function is NOT called by the Broadcom stack and -** profiles. If you want to use it in your own implementation, -** put code here to tell the OS to re-enable context switching. -** -*******************************************************************************/ -void GKI_sched_unlock(void) -{ - GKI_TRACE("GKI_sched_unlock"); -} - - -- 2.11.0