From 452f4494cd0a749e3d9f823da2e3b692e4002ed1 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 14 Oct 2017 16:19:56 -0500 Subject: [PATCH] rtl8723ds: Fix some Sparse warnings Signed-off-by: Larry Finger --- core/rtw_mp.c | 10 +- hal/btc/HalBtc8192e1Ant.c | 2 +- hal/btc/HalBtc8812a1Ant.c | 2 +- hal/btc/HalBtc8812a2Ant.c | 2 +- hal/btc/HalBtc8821a2Ant.c | 2 +- hal/btc/HalBtc8821aCsr2Ant.c | 2 +- hal/btc/halbtc8723d1ant.c | 148 +++++++++++------------ hal/btc/halbtc8723d2ant.c | 158 ++++++++++++------------- hal/phydm/phydm_ccx.c | 2 +- hal/phydm/phydm_kfree.c | 4 +- hal/phydm/rtl8723d/halhwimg8723d_bb.c | 6 +- hal/phydm/rtl8723d/halhwimg8723d_mac.c | 2 +- hal/phydm/rtl8723d/halhwimg8723d_rf.c | 32 ++--- hal/phydm/rtl8723d/halphyrf_8723d.c | 40 +++---- include/basic_types.h | 24 ++-- include/wifi.h | 18 +-- platform/platform_ops.c | 3 + 17 files changed, 230 insertions(+), 227 deletions(-) diff --git a/core/rtw_mp.c b/core/rtw_mp.c index 8402c59..b341921 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -392,7 +392,7 @@ static VOID PHY_SetRFPathSwitch_default( } -void mpt_InitHWConfig(PADAPTER Adapter) +static void mpt_InitHWConfig(PADAPTER Adapter) { if (IS_HARDWARE_TYPE_8723B(Adapter)) { /* TODO: <20130114, Kordan> The following setting is only for DPDT and Fixed board type. */ @@ -1121,7 +1121,7 @@ int SetTxPower(PADAPTER pAdapter) return _TRUE; } -void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset) +static void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset) { u32 TxAGCOffset_B, TxAGCOffset_C, TxAGCOffset_D, tmpAGC; @@ -1185,13 +1185,13 @@ void SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart) hal_mpt_SetCarrierSuppressionTx(pAdapter, bStart); } -void SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart) +static void SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart) { PhySetTxPowerLevel(pAdapter); hal_mpt_SetCCKContinuousTx(pAdapter, bStart); } -void SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart) +static void SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart) { PhySetTxPowerLevel(pAdapter); hal_mpt_SetOFDMContinuousTx(pAdapter, bStart); @@ -1626,7 +1626,7 @@ void fill_tx_desc_8188f(PADAPTER padapter) #endif #if defined(CONFIG_RTL8723D) -void fill_tx_desc_8723d(PADAPTER padapter) +static void fill_tx_desc_8723d(PADAPTER padapter) { struct mp_priv *pmp_priv = &padapter->mppriv; struct pkt_attrib *pattrib = &(pmp_priv->tx.attrib); diff --git a/hal/btc/HalBtc8192e1Ant.c b/hal/btc/HalBtc8192e1Ant.c index 8a4d977..b19a1f1 100644 --- a/hal/btc/HalBtc8192e1Ant.c +++ b/hal/btc/HalBtc8192e1Ant.c @@ -3414,4 +3414,4 @@ void ex_halbtc8192e1ant_dbg_control(IN struct btc_coexist *btcoexist, #endif /* #if (RTL8192E_SUPPORT == 1) */ -#endif /* #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1) */ \ No newline at end of file +#endif /* #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1) */ diff --git a/hal/btc/HalBtc8812a1Ant.c b/hal/btc/HalBtc8812a1Ant.c index e094caa..f5a4a6d 100644 --- a/hal/btc/HalBtc8812a1Ant.c +++ b/hal/btc/HalBtc8812a1Ant.c @@ -3454,4 +3454,4 @@ void ex_halbtc8812a1ant_dbg_control(IN struct btc_coexist *btcoexist, #endif -#endif /* #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1) */ \ No newline at end of file +#endif /* #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1) */ diff --git a/hal/btc/HalBtc8812a2Ant.c b/hal/btc/HalBtc8812a2Ant.c index cd8a547..c5c0186 100644 --- a/hal/btc/HalBtc8812a2Ant.c +++ b/hal/btc/HalBtc8812a2Ant.c @@ -4779,4 +4779,4 @@ void ex_halbtc8812a2ant_dbg_control(IN struct btc_coexist *btcoexist, #endif -#endif /* #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1) */ \ No newline at end of file +#endif /* #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1) */ diff --git a/hal/btc/HalBtc8821a2Ant.c b/hal/btc/HalBtc8821a2Ant.c index 010a422..db26f41 100644 --- a/hal/btc/HalBtc8821a2Ant.c +++ b/hal/btc/HalBtc8821a2Ant.c @@ -4557,4 +4557,4 @@ void ex_halbtc8821a2ant_periodical(IN struct btc_coexist *btcoexist) #endif -#endif /* #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1) */ \ No newline at end of file +#endif /* #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1) */ diff --git a/hal/btc/HalBtc8821aCsr2Ant.c b/hal/btc/HalBtc8821aCsr2Ant.c index b69d156..acf641a 100644 --- a/hal/btc/HalBtc8821aCsr2Ant.c +++ b/hal/btc/HalBtc8821aCsr2Ant.c @@ -3994,4 +3994,4 @@ void ex_halbtc8821aCsr2ant_periodical(IN struct btc_coexist *btcoexist) #endif -#endif /* #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1) */ \ No newline at end of file +#endif /* #if (BT_SUPPORT == 1 && COEX_SUPPORT == 1) */ diff --git a/hal/btc/halbtc8723d1ant.c b/hal/btc/halbtc8723d1ant.c index a78e9b3..d14fbe6 100644 --- a/hal/btc/halbtc8723d1ant.c +++ b/hal/btc/halbtc8723d1ant.c @@ -28,7 +28,7 @@ static struct psdscan_sta_8723d_1ant gl_psd_scan_8723d_1ant; static struct psdscan_sta_8723d_1ant *psd_scan = &gl_psd_scan_8723d_1ant; -const char *const glbt_info_src_8723d_1ant[] = { +static const char *const glbt_info_src_8723d_1ant[] = { "BT Info[wifi fw]", "BT Info[bt rsp]", "BT Info[bt auto report]", @@ -44,9 +44,9 @@ const char *const glbt_info_src_8723d_1ant[] = { * Please strictly follow this order and naming style !!! * * ************************************************************ */ -u32 glcoex_ver_date_8723d_1ant = 20161208; -u32 glcoex_ver_8723d_1ant = 0x12; -u32 glcoex_ver_btdesired_8723d_1ant = 0x10; +static u32 glcoex_ver_date_8723d_1ant = 20161208; +static u32 glcoex_ver_8723d_1ant = 0x12; +static u32 glcoex_ver_btdesired_8723d_1ant = 0x10; /* ************************************************************ @@ -55,7 +55,7 @@ u32 glcoex_ver_btdesired_8723d_1ant = 0x10; * ************************************************************ * local function start with halbtc8723d1ant_ * ************************************************************ */ -u8 halbtc8723d1ant_bt_rssi_state(u8 level_num, u8 rssi_thresh, u8 rssi_thresh1) +static u8 halbtc8723d1ant_bt_rssi_state(u8 level_num, u8 rssi_thresh, u8 rssi_thresh1) { s32 bt_rssi = 0; u8 bt_rssi_state = coex_sta->pre_bt_rssi_state; @@ -117,7 +117,7 @@ u8 halbtc8723d1ant_bt_rssi_state(u8 level_num, u8 rssi_thresh, u8 rssi_thresh1) return bt_rssi_state; } -u8 halbtc8723d1ant_wifi_rssi_state(IN struct btc_coexist *btcoexist, +static u8 halbtc8723d1ant_wifi_rssi_state(IN struct btc_coexist *btcoexist, IN u8 index, IN u8 level_num, IN u8 rssi_thresh, IN u8 rssi_thresh1) { s32 wifi_rssi = 0; @@ -182,7 +182,7 @@ u8 halbtc8723d1ant_wifi_rssi_state(IN struct btc_coexist *btcoexist, return wifi_rssi_state; } -void halbtc8723d1ant_update_ra_mask(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_update_ra_mask(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u32 dis_rate_mask) { coex_dm->cur_ra_mask = dis_rate_mask; @@ -193,7 +193,7 @@ void halbtc8723d1ant_update_ra_mask(IN struct btc_coexist *btcoexist, coex_dm->pre_ra_mask = coex_dm->cur_ra_mask; } -void halbtc8723d1ant_auto_rate_fallback_retry(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_auto_rate_fallback_retry(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 type) { boolean wifi_under_b_mode = false; @@ -232,7 +232,7 @@ void halbtc8723d1ant_auto_rate_fallback_retry(IN struct btc_coexist *btcoexist, coex_dm->pre_arfr_type = coex_dm->cur_arfr_type; } -void halbtc8723d1ant_retry_limit(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_retry_limit(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 type) { coex_dm->cur_retry_limit_type = type; @@ -257,7 +257,7 @@ void halbtc8723d1ant_retry_limit(IN struct btc_coexist *btcoexist, coex_dm->pre_retry_limit_type = coex_dm->cur_retry_limit_type; } -void halbtc8723d1ant_ampdu_max_time(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_ampdu_max_time(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 type) { coex_dm->cur_ampdu_time_type = type; @@ -281,7 +281,7 @@ void halbtc8723d1ant_ampdu_max_time(IN struct btc_coexist *btcoexist, coex_dm->pre_ampdu_time_type = coex_dm->cur_ampdu_time_type; } -void halbtc8723d1ant_limited_tx(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_limited_tx(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 ra_mask_type, IN u8 arfr_type, IN u8 retry_limit_type, IN u8 ampdu_time_type) { @@ -308,7 +308,7 @@ void halbtc8723d1ant_limited_tx(IN struct btc_coexist *btcoexist, halbtc8723d1ant_ampdu_max_time(btcoexist, force_exec, ampdu_time_type); } -void halbtc8723d1ant_limited_rx(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_limited_rx(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN boolean rej_ap_agg_pkt, IN boolean bt_ctrl_agg_buf_size, IN u8 agg_buf_size) { @@ -332,7 +332,7 @@ void halbtc8723d1ant_limited_rx(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_query_bt_info(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_query_bt_info(IN struct btc_coexist *btcoexist) { u8 h2c_parameter[1] = {0}; @@ -345,7 +345,7 @@ void halbtc8723d1ant_query_bt_info(IN struct btc_coexist *btcoexist) BTC_TRACE(trace_buf); } -void halbtc8723d1ant_monitor_bt_ctr(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_monitor_bt_ctr(IN struct btc_coexist *btcoexist) { u32 reg_hp_txrx, reg_lp_txrx, u32tmp; u32 reg_hp_tx = 0, reg_hp_rx = 0, reg_lp_tx = 0, reg_lp_rx = 0; @@ -455,7 +455,7 @@ void halbtc8723d1ant_monitor_bt_ctr(IN struct btc_coexist *btcoexist) } -void halbtc8723d1ant_monitor_wifi_ctr(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_monitor_wifi_ctr(IN struct btc_coexist *btcoexist) { #if 1 s32 wifi_rssi = 0; @@ -572,7 +572,7 @@ void halbtc8723d1ant_monitor_wifi_ctr(IN struct btc_coexist *btcoexist) #endif } -void halbtc8723d1ant_update_bt_link_info(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_update_bt_link_info(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; boolean bt_hs_on = false; @@ -714,7 +714,7 @@ void halbtc8723d1ant_update_bt_link_info(IN struct btc_coexist *btcoexist) } -void halbtc8723d1ant_update_wifi_channel_info(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_update_wifi_channel_info(IN struct btc_coexist *btcoexist, IN u8 type) { u8 h2c_parameter[3] = {0}; @@ -745,7 +745,7 @@ void halbtc8723d1ant_update_wifi_channel_info(IN struct btc_coexist *btcoexist, } -u8 halbtc8723d1ant_action_algorithm(IN struct btc_coexist *btcoexist) +static u8 halbtc8723d1ant_action_algorithm(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; boolean bt_hs_on = false; @@ -949,7 +949,7 @@ u8 halbtc8723d1ant_action_algorithm(IN struct btc_coexist *btcoexist) return algorithm; } -void halbtc8723d1ant_set_bt_auto_report(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_set_bt_auto_report(IN struct btc_coexist *btcoexist, IN boolean enable_auto_report) { u8 h2c_parameter[1] = {0}; @@ -962,7 +962,7 @@ void halbtc8723d1ant_set_bt_auto_report(IN struct btc_coexist *btcoexist, btcoexist->btc_fill_h2c(btcoexist, 0x68, 1, h2c_parameter); } -void halbtc8723d1ant_bt_auto_report(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_bt_auto_report(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN boolean enable_auto_report) { coex_dm->cur_bt_auto_report = enable_auto_report; @@ -977,7 +977,7 @@ void halbtc8723d1ant_bt_auto_report(IN struct btc_coexist *btcoexist, coex_dm->pre_bt_auto_report = coex_dm->cur_bt_auto_report; } -void halbtc8723d1ant_set_fw_low_penalty_ra(IN struct btc_coexist +static void halbtc8723d1ant_set_fw_low_penalty_ra(IN struct btc_coexist *btcoexist, IN boolean low_penalty_ra) { #if 1 @@ -998,7 +998,7 @@ void halbtc8723d1ant_set_fw_low_penalty_ra(IN struct btc_coexist #endif } -void halbtc8723d1ant_low_penalty_ra(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_low_penalty_ra(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN boolean low_penalty_ra) { #if 1 @@ -1024,7 +1024,7 @@ void halbtc8723d1ant_low_penalty_ra(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_write_score_board( +static void halbtc8723d1ant_write_score_board( IN struct btc_coexist *btcoexist, IN u16 bitpos, IN boolean state @@ -1043,7 +1043,7 @@ void halbtc8723d1ant_write_score_board( } -void halbtc8723d1ant_read_score_board( +static void halbtc8723d1ant_read_score_board( IN struct btc_coexist *btcoexist, IN u16 *score_board_val ) @@ -1053,7 +1053,7 @@ void halbtc8723d1ant_read_score_board( 0xaa)) & 0x7fff; } -void halbtc8723d1ant_post_state_to_bt( +static void halbtc8723d1ant_post_state_to_bt( IN struct btc_coexist *btcoexist, IN u16 type, IN boolean state @@ -1067,7 +1067,7 @@ void halbtc8723d1ant_post_state_to_bt( halbtc8723d1ant_write_score_board(btcoexist, (u16) type, state); } -boolean halbtc8723d1ant_is_wifibt_status_changed(IN struct btc_coexist +static boolean halbtc8723d1ant_is_wifibt_status_changed(IN struct btc_coexist *btcoexist) { static boolean pre_wifi_busy = false, pre_under_4way = false, @@ -1148,7 +1148,7 @@ boolean halbtc8723d1ant_is_wifibt_status_changed(IN struct btc_coexist return false; } -void halbtc8723d1ant_monitor_bt_enable_disable(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_monitor_bt_enable_disable(IN struct btc_coexist *btcoexist) { static u32 bt_disable_cnt = 0; boolean bt_active = true, bt_disabled = false; @@ -1213,7 +1213,7 @@ void halbtc8723d1ant_monitor_bt_enable_disable(IN struct btc_coexist *btcoexist) -void halbtc8723d1ant_enable_gnt_to_gpio(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_enable_gnt_to_gpio(IN struct btc_coexist *btcoexist, boolean isenable) { #if BT_8723D_1ANT_COEX_DBG @@ -1252,7 +1252,7 @@ void halbtc8723d1ant_enable_gnt_to_gpio(IN struct btc_coexist *btcoexist, #endif } -u32 halbtc8723d1ant_ltecoex_indirect_read_reg(IN struct btc_coexist *btcoexist, +static u32 halbtc8723d1ant_ltecoex_indirect_read_reg(IN struct btc_coexist *btcoexist, IN u16 reg_addr) { u32 j = 0, delay_count = 0; @@ -1278,7 +1278,7 @@ u32 halbtc8723d1ant_ltecoex_indirect_read_reg(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_ltecoex_indirect_write_reg(IN struct btc_coexist +static void halbtc8723d1ant_ltecoex_indirect_write_reg(IN struct btc_coexist *btcoexist, IN u16 reg_addr, IN u32 bit_mask, IN u32 reg_value) { @@ -1342,7 +1342,7 @@ void halbtc8723d1ant_ltecoex_indirect_write_reg(IN struct btc_coexist } -void halbtc8723d1ant_ltecoex_enable(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_ltecoex_enable(IN struct btc_coexist *btcoexist, IN boolean enable) { u8 val; @@ -1353,7 +1353,7 @@ void halbtc8723d1ant_ltecoex_enable(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_ltecoex_pathcontrol_owner(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_ltecoex_pathcontrol_owner(IN struct btc_coexist *btcoexist, IN boolean wifi_control) { u8 val; @@ -1364,7 +1364,7 @@ void halbtc8723d1ant_ltecoex_pathcontrol_owner(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_ltecoex_set_gnt_bt(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_ltecoex_set_gnt_bt(IN struct btc_coexist *btcoexist, IN u8 control_block, IN boolean sw_control, IN u8 state) { u32 val = 0, val_orig = 0; @@ -1397,7 +1397,7 @@ void halbtc8723d1ant_ltecoex_set_gnt_bt(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_ltecoex_set_gnt_wl(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_ltecoex_set_gnt_wl(IN struct btc_coexist *btcoexist, IN u8 control_block, IN boolean sw_control, IN u8 state) { u32 val = 0, val_orig = 0; @@ -1430,7 +1430,7 @@ void halbtc8723d1ant_ltecoex_set_gnt_wl(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_ltecoex_set_coex_table(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_ltecoex_set_coex_table(IN struct btc_coexist *btcoexist, IN u8 table_type, IN u16 table_content) { u16 reg_addr = 0x0000; @@ -1452,7 +1452,7 @@ void halbtc8723d1ant_ltecoex_set_coex_table(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_ltecoex_set_break_table(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_ltecoex_set_break_table(IN struct btc_coexist *btcoexist, IN u8 table_type, IN u8 table_content) { u16 reg_addr = 0x0000; @@ -1478,7 +1478,7 @@ void halbtc8723d1ant_ltecoex_set_break_table(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_set_wltoggle_coex_table(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_set_wltoggle_coex_table(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 interval, IN u8 val0x6c4_b0, IN u8 val0x6c4_b1, IN u8 val0x6c4_b2, IN u8 val0x6c4_b3) @@ -1514,7 +1514,7 @@ void halbtc8723d1ant_set_wltoggle_coex_table(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_set_coex_table(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_set_coex_table(IN struct btc_coexist *btcoexist, IN u32 val0x6c0, IN u32 val0x6c4, IN u32 val0x6c8, IN u8 val0x6cc) { btcoexist->btc_write_4byte(btcoexist, 0x6c0, val0x6c0); @@ -1526,7 +1526,7 @@ void halbtc8723d1ant_set_coex_table(IN struct btc_coexist *btcoexist, btcoexist->btc_write_1byte(btcoexist, 0x6cc, val0x6cc); } -void halbtc8723d1ant_coex_table(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_coex_table(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u32 val0x6c0, IN u32 val0x6c4, IN u32 val0x6c8, IN u8 val0x6cc) { @@ -1552,7 +1552,7 @@ void halbtc8723d1ant_coex_table(IN struct btc_coexist *btcoexist, coex_dm->pre_val0x6cc = coex_dm->cur_val0x6cc; } -void halbtc8723d1ant_coex_table_with_type(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_coex_table_with_type(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 type) { u32 break_table; @@ -1625,7 +1625,7 @@ void halbtc8723d1ant_coex_table_with_type(IN struct btc_coexist *btcoexist, } } -void halbtc8723d1ant_set_fw_ignore_wlan_act(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_set_fw_ignore_wlan_act(IN struct btc_coexist *btcoexist, IN boolean enable) { u8 h2c_parameter[1] = {0}; @@ -1637,7 +1637,7 @@ void halbtc8723d1ant_set_fw_ignore_wlan_act(IN struct btc_coexist *btcoexist, btcoexist->btc_fill_h2c(btcoexist, 0x63, 1, h2c_parameter); } -void halbtc8723d1ant_ignore_wlan_act(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_ignore_wlan_act(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN boolean enable) { coex_dm->cur_ignore_wlan_act = enable; @@ -1652,7 +1652,7 @@ void halbtc8723d1ant_ignore_wlan_act(IN struct btc_coexist *btcoexist, coex_dm->pre_ignore_wlan_act = coex_dm->cur_ignore_wlan_act; } -void halbtc8723d1ant_set_lps_rpwm(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_set_lps_rpwm(IN struct btc_coexist *btcoexist, IN u8 lps_val, IN u8 rpwm_val) { u8 lps = lps_val; @@ -1662,7 +1662,7 @@ void halbtc8723d1ant_set_lps_rpwm(IN struct btc_coexist *btcoexist, btcoexist->btc_set(btcoexist, BTC_SET_U1_RPWM_VAL, &rpwm); } -void halbtc8723d1ant_lps_rpwm(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_lps_rpwm(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 lps_val, IN u8 rpwm_val) { coex_dm->cur_lps = lps_val; @@ -1679,7 +1679,7 @@ void halbtc8723d1ant_lps_rpwm(IN struct btc_coexist *btcoexist, coex_dm->pre_rpwm = coex_dm->cur_rpwm; } -void halbtc8723d1ant_ps_tdma_check_for_power_save_state( +static void halbtc8723d1ant_ps_tdma_check_for_power_save_state( IN struct btc_coexist *btcoexist, IN boolean new_ps_state) { u8 lps_mode = 0x0; @@ -1710,7 +1710,7 @@ void halbtc8723d1ant_ps_tdma_check_for_power_save_state( } } -void halbtc8723d1ant_power_save_state(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_power_save_state(IN struct btc_coexist *btcoexist, IN u8 ps_type, IN u8 lps_val, IN u8 rpwm_val) { boolean low_pwr_disable = false; @@ -1757,7 +1757,7 @@ void halbtc8723d1ant_power_save_state(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_set_fw_pstdma(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_set_fw_pstdma(IN struct btc_coexist *btcoexist, IN u8 byte1, IN u8 byte2, IN u8 byte3, IN u8 byte4, IN u8 byte5) { u8 h2c_parameter[5] = {0}; @@ -1822,7 +1822,7 @@ void halbtc8723d1ant_set_fw_pstdma(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_ps_tdma(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_ps_tdma(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN boolean turn_on, IN u8 type) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; @@ -2113,7 +2113,7 @@ void halbtc8723d1ant_ps_tdma(IN struct btc_coexist *btcoexist, } -void halbtc8723d1ant_set_ant_path(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_set_ant_path(IN struct btc_coexist *btcoexist, IN u8 ant_pos_type, IN boolean force_exec, IN u8 phase) { @@ -2495,7 +2495,7 @@ void halbtc8723d1ant_set_ant_path(IN struct btc_coexist *btcoexist, } -boolean halbtc8723d1ant_is_common_action(IN struct btc_coexist *btcoexist) +static boolean halbtc8723d1ant_is_common_action(IN struct btc_coexist *btcoexist) { boolean common = false, wifi_connected = false, wifi_busy = false; @@ -2561,7 +2561,7 @@ boolean halbtc8723d1ant_is_common_action(IN struct btc_coexist *btcoexist) * Non-Software Coex Mechanism start * * ********************************************* */ -void halbtc8723d1ant_action_bt_whql_test(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_action_bt_whql_test(IN struct btc_coexist *btcoexist) { halbtc8723d1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8); halbtc8723d1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, NORMAL_EXEC, @@ -2569,20 +2569,20 @@ void halbtc8723d1ant_action_bt_whql_test(IN struct btc_coexist *btcoexist) halbtc8723d1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0); } -void halbtc8723d1ant_action_bt_hs(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_action_bt_hs(IN struct btc_coexist *btcoexist) { halbtc8723d1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 5); halbtc8723d1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 2); } -void halbtc8723d1ant_action_bt_relink(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_action_bt_relink(IN struct btc_coexist *btcoexist) { halbtc8723d1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 5); halbtc8723d1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1); coex_sta->bt_relink_downcount = 2; } -void halbtc8723d1ant_action_bt_idle(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_action_bt_idle(IN struct btc_coexist *btcoexist) { boolean wifi_busy = false; @@ -2607,7 +2607,7 @@ void halbtc8723d1ant_action_bt_idle(IN struct btc_coexist *btcoexist) } -void halbtc8723d1ant_action_bt_inquiry(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_action_bt_inquiry(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; boolean wifi_connected = false, wifi_busy = false, bt_busy = false; @@ -2665,7 +2665,7 @@ void halbtc8723d1ant_action_bt_inquiry(IN struct btc_coexist *btcoexist) } -void halbtc8723d1ant_action_bt_sco_hid_only_busy(IN struct btc_coexist +static void halbtc8723d1ant_action_bt_sco_hid_only_busy(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; @@ -2731,7 +2731,7 @@ void halbtc8723d1ant_action_bt_sco_hid_only_busy(IN struct btc_coexist } -void halbtc8723d1ant_action_wifi_only(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_action_wifi_only(IN struct btc_coexist *btcoexist) { halbtc8723d1ant_ps_tdma(btcoexist, FORCE_EXEC, false, 8); halbtc8723d1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, FORCE_EXEC, @@ -2739,7 +2739,7 @@ void halbtc8723d1ant_action_wifi_only(IN struct btc_coexist *btcoexist) halbtc8723d1ant_coex_table_with_type(btcoexist, FORCE_EXEC, 0); } -void halbtc8723d1ant_action_wifi_multi_port(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_action_wifi_multi_port(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; @@ -2758,7 +2758,7 @@ void halbtc8723d1ant_action_wifi_multi_port(IN struct btc_coexist *btcoexist) halbtc8723d1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 2); } -void halbtc8723d1ant_action_wifi_linkscan_process(IN struct btc_coexist +static void halbtc8723d1ant_action_wifi_linkscan_process(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; @@ -2782,7 +2782,7 @@ void halbtc8723d1ant_action_wifi_linkscan_process(IN struct btc_coexist } } -void halbtc8723d1ant_action_wifi_connected_bt_acl_busy(IN struct btc_coexist +static void halbtc8723d1ant_action_wifi_connected_bt_acl_busy(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; @@ -2958,7 +2958,7 @@ void halbtc8723d1ant_action_wifi_connected_bt_acl_busy(IN struct btc_coexist } } -void halbtc8723d1ant_action_wifi_not_connected(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_action_wifi_not_connected(IN struct btc_coexist *btcoexist) { /* tdma and coex table */ halbtc8723d1ant_ps_tdma(btcoexist, FORCE_EXEC, false, 8); @@ -2968,7 +2968,7 @@ void halbtc8723d1ant_action_wifi_not_connected(IN struct btc_coexist *btcoexist) } -void halbtc8723d1ant_action_wifi_connected(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_action_wifi_connected(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; boolean wifi_busy = false; @@ -2998,7 +2998,7 @@ void halbtc8723d1ant_action_wifi_connected(IN struct btc_coexist *btcoexist) } -void halbtc8723d1ant_run_sw_coexist_mechanism(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_run_sw_coexist_mechanism(IN struct btc_coexist *btcoexist) { u8 algorithm = 0; @@ -3070,7 +3070,7 @@ void halbtc8723d1ant_run_sw_coexist_mechanism(IN struct btc_coexist *btcoexist) } -void halbtc8723d1ant_run_coexist_mechanism(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_run_coexist_mechanism(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; boolean wifi_connected = false, bt_hs_on = false; @@ -3284,7 +3284,7 @@ void halbtc8723d1ant_run_coexist_mechanism(IN struct btc_coexist *btcoexist) } -void halbtc8723d1ant_init_coex_dm(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_init_coex_dm(IN struct btc_coexist *btcoexist) { /* force to reset coex mechanism */ halbtc8723d1ant_low_penalty_ra(btcoexist, NORMAL_EXEC, false); @@ -3304,7 +3304,7 @@ void halbtc8723d1ant_init_coex_dm(IN struct btc_coexist *btcoexist) halbtc8723d1ant_query_bt_info(btcoexist); } -void halbtc8723d1ant_init_hw_config(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_init_hw_config(IN struct btc_coexist *btcoexist, IN boolean back_up, IN boolean wifi_only) { u32 u32tmp1 = 0, u32tmp2 = 0; @@ -3425,7 +3425,7 @@ void halbtc8723d1ant_init_hw_config(IN struct btc_coexist *btcoexist, } -u32 halbtc8723d1ant_psd_log2base(IN struct btc_coexist *btcoexist, IN u32 val) +static u32 halbtc8723d1ant_psd_log2base(IN struct btc_coexist *btcoexist, IN u32 val) { u8 j; u32 tmp, tmp2, val_integerd_b = 0, tindex, shiftcount = 0; @@ -3470,7 +3470,7 @@ u32 halbtc8723d1ant_psd_log2base(IN struct btc_coexist *btcoexist, IN u32 val) } -void halbtc8723d1ant_psd_show_antenna_detect_result(IN struct btc_coexist +static void halbtc8723d1ant_psd_show_antenna_detect_result(IN struct btc_coexist *btcoexist) { u8 *cli_buf = btcoexist->cli_buf; @@ -3657,7 +3657,7 @@ void halbtc8723d1ant_psd_show_antenna_detect_result(IN struct btc_coexist -void halbtc8723d1ant_psd_showdata(IN struct btc_coexist *btcoexist) +static void halbtc8723d1ant_psd_showdata(IN struct btc_coexist *btcoexist) { u8 *cli_buf = btcoexist->cli_buf; u32 delta_freq_per_point; @@ -3853,7 +3853,7 @@ void halbtc8723d1ant_psd_showdata(IN struct btc_coexist *btcoexist) #ifdef PLATFORM_WINDOWS #pragma optimize("", off) #endif -void halbtc8723d1ant_psd_maxholddata(IN struct btc_coexist *btcoexist, +static void halbtc8723d1ant_psd_maxholddata(IN struct btc_coexist *btcoexist, IN u32 gen_count) { u32 i = 0; @@ -3887,7 +3887,7 @@ void halbtc8723d1ant_psd_maxholddata(IN struct btc_coexist *btcoexist, #ifdef PLATFORM_WINDOWS #pragma optimize("", off) #endif -u32 halbtc8723d1ant_psd_getdata(IN struct btc_coexist *btcoexist, IN u32 point) +static u32 halbtc8723d1ant_psd_getdata(IN struct btc_coexist *btcoexist, IN u32 point) { /* reg 0x808[9:0]: FFT data x */ /* reg 0x808[22]: 0-->1 to get 1 FFT data y */ @@ -3921,7 +3921,7 @@ u32 halbtc8723d1ant_psd_getdata(IN struct btc_coexist *btcoexist, IN u32 point) #ifdef PLATFORM_WINDOWS #pragma optimize("", off) #endif -boolean halbtc8723d1ant_psd_sweep_point(IN struct btc_coexist *btcoexist, +static boolean halbtc8723d1ant_psd_sweep_point(IN struct btc_coexist *btcoexist, IN u32 cent_freq, IN s32 offset, IN u32 span, IN u32 points, IN u32 avgnum, IN u32 loopcnt) { @@ -4253,7 +4253,7 @@ boolean halbtc8723d1ant_psd_sweep_point(IN struct btc_coexist *btcoexist, #ifdef PLATFORM_WINDOWS #pragma optimize("", off) #endif -boolean halbtc8723d1ant_psd_antenna_detection(IN struct btc_coexist +static boolean halbtc8723d1ant_psd_antenna_detection(IN struct btc_coexist *btcoexist) { u32 i = 0; @@ -4637,7 +4637,7 @@ boolean halbtc8723d1ant_psd_antenna_detection(IN struct btc_coexist #ifdef PLATFORM_WINDOWS #pragma optimize("", off) #endif -boolean halbtc8723d1ant_psd_antenna_detection_check(IN struct btc_coexist +static boolean halbtc8723d1ant_psd_antenna_detection_check(IN struct btc_coexist *btcoexist) { static u32 ant_det_count = 0, ant_det_fail_count = 0; diff --git a/hal/btc/halbtc8723d2ant.c b/hal/btc/halbtc8723d2ant.c index cf8455e..6afc5ed 100644 --- a/hal/btc/halbtc8723d2ant.c +++ b/hal/btc/halbtc8723d2ant.c @@ -27,7 +27,7 @@ static struct coex_sta_8723d_2ant *coex_sta = &glcoex_sta_8723d_2ant; static struct psdscan_sta_8723d_2ant gl_psd_scan_8723d_2ant; static struct psdscan_sta_8723d_2ant *psd_scan = &gl_psd_scan_8723d_2ant; -const char *const glbt_info_src_8723d_2ant[] = { +static const char *const glbt_info_src_8723d_2ant[] = { "BT Info[wifi fw]", "BT Info[bt rsp]", "BT Info[bt auto report]", @@ -43,9 +43,9 @@ const char *const glbt_info_src_8723d_2ant[] = { * Please strictly follow this order and naming style !!! * * ************************************************************ */ -u32 glcoex_ver_date_8723d_2ant = 20161208; -u32 glcoex_ver_8723d_2ant = 0x12; -u32 glcoex_ver_btdesired_8723d_2ant = 0x10; +static u32 glcoex_ver_date_8723d_2ant = 20161208; +static u32 glcoex_ver_8723d_2ant = 0x12; +static u32 glcoex_ver_btdesired_8723d_2ant = 0x10; /* ************************************************************ @@ -54,7 +54,7 @@ u32 glcoex_ver_btdesired_8723d_2ant = 0x10; * ************************************************************ * local function start with halbtc8723d2ant_ * ************************************************************ */ -u8 halbtc8723d2ant_bt_rssi_state(u8 *ppre_bt_rssi_state, u8 level_num, +static u8 halbtc8723d2ant_bt_rssi_state(u8 *ppre_bt_rssi_state, u8 level_num, u8 rssi_thresh, u8 rssi_thresh1) { s32 bt_rssi = 0; @@ -113,7 +113,7 @@ u8 halbtc8723d2ant_bt_rssi_state(u8 *ppre_bt_rssi_state, u8 level_num, return bt_rssi_state; } -u8 halbtc8723d2ant_wifi_rssi_state(IN struct btc_coexist *btcoexist, +static u8 halbtc8723d2ant_wifi_rssi_state(IN struct btc_coexist *btcoexist, IN u8 *pprewifi_rssi_state, IN u8 level_num, IN u8 rssi_thresh, IN u8 rssi_thresh1) { @@ -173,7 +173,7 @@ u8 halbtc8723d2ant_wifi_rssi_state(IN struct btc_coexist *btcoexist, return wifi_rssi_state; } -void halbtc8723d2ant_coex_switch_threshold(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_coex_switch_threshold(IN struct btc_coexist *btcoexist, IN u8 isolation_measuared) { s8 interference_wl_tx = 0, interference_bt_tx = 0; @@ -224,7 +224,7 @@ void halbtc8723d2ant_coex_switch_threshold(IN struct btc_coexist *btcoexist, } -void halbtc8723d2ant_limited_rx(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_limited_rx(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN boolean rej_ap_agg_pkt, IN boolean bt_ctrl_agg_buf_size, IN u8 agg_buf_size) { @@ -246,7 +246,7 @@ void halbtc8723d2ant_limited_rx(IN struct btc_coexist *btcoexist, btcoexist->btc_set(btcoexist, BTC_SET_ACT_AGGREGATE_CTRL, NULL); } -void halbtc8723d2ant_query_bt_info(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_query_bt_info(IN struct btc_coexist *btcoexist) { u8 h2c_parameter[1] = {0}; @@ -256,7 +256,7 @@ void halbtc8723d2ant_query_bt_info(IN struct btc_coexist *btcoexist) btcoexist->btc_fill_h2c(btcoexist, 0x61, 1, h2c_parameter); } -void halbtc8723d2ant_monitor_bt_ctr(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_monitor_bt_ctr(IN struct btc_coexist *btcoexist) { u32 reg_hp_txrx, reg_lp_txrx, u32tmp; u32 reg_hp_tx = 0, reg_hp_rx = 0, reg_lp_tx = 0, reg_lp_rx = 0; @@ -366,7 +366,7 @@ void halbtc8723d2ant_monitor_bt_ctr(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_monitor_wifi_ctr(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_monitor_wifi_ctr(IN struct btc_coexist *btcoexist) { #if 1 s32 wifi_rssi = 0; @@ -481,7 +481,7 @@ void halbtc8723d2ant_monitor_wifi_ctr(IN struct btc_coexist *btcoexist) #endif } -void halbtc8723d2ant_update_bt_link_info(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_update_bt_link_info(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; boolean bt_hs_on = false; @@ -622,7 +622,7 @@ void halbtc8723d2ant_update_bt_link_info(IN struct btc_coexist *btcoexist) btcoexist->btc_set(btcoexist, BTC_SET_BL_BT_TRAFFIC_BUSY, &bt_busy); } -void halbtc8723d2ant_update_wifi_channel_info(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_update_wifi_channel_info(IN struct btc_coexist *btcoexist, IN u8 type) { u8 h2c_parameter[3] = {0}; @@ -653,7 +653,7 @@ void halbtc8723d2ant_update_wifi_channel_info(IN struct btc_coexist *btcoexist, } -void halbtc8723d2ant_set_fw_dac_swing_level(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_set_fw_dac_swing_level(IN struct btc_coexist *btcoexist, IN u8 dac_swing_lvl) { u8 h2c_parameter[1] = {0}; @@ -665,7 +665,7 @@ void halbtc8723d2ant_set_fw_dac_swing_level(IN struct btc_coexist *btcoexist, btcoexist->btc_fill_h2c(btcoexist, 0x64, 1, h2c_parameter); } -void halbtc8723d2ant_fw_dac_swing_lvl(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_fw_dac_swing_lvl(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 fw_dac_swing_lvl) { coex_dm->cur_fw_dac_swing_lvl = fw_dac_swing_lvl; @@ -682,7 +682,7 @@ void halbtc8723d2ant_fw_dac_swing_lvl(IN struct btc_coexist *btcoexist, coex_dm->pre_fw_dac_swing_lvl = coex_dm->cur_fw_dac_swing_lvl; } -void halbtc8723d2ant_set_fw_dec_bt_pwr(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_set_fw_dec_bt_pwr(IN struct btc_coexist *btcoexist, IN u8 dec_bt_pwr_lvl) { u8 h2c_parameter[1] = {0}; @@ -692,7 +692,7 @@ void halbtc8723d2ant_set_fw_dec_bt_pwr(IN struct btc_coexist *btcoexist, btcoexist->btc_fill_h2c(btcoexist, 0x62, 1, h2c_parameter); } -void halbtc8723d2ant_dec_bt_pwr(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_dec_bt_pwr(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 dec_bt_pwr_lvl) { coex_dm->cur_bt_dec_pwr_lvl = dec_bt_pwr_lvl; @@ -707,7 +707,7 @@ void halbtc8723d2ant_dec_bt_pwr(IN struct btc_coexist *btcoexist, coex_dm->pre_bt_dec_pwr_lvl = coex_dm->cur_bt_dec_pwr_lvl; } -void halbtc8723d2ant_set_fw_low_penalty_ra(IN struct btc_coexist +static void halbtc8723d2ant_set_fw_low_penalty_ra(IN struct btc_coexist *btcoexist, IN boolean low_penalty_ra) { #if 1 @@ -728,7 +728,7 @@ void halbtc8723d2ant_set_fw_low_penalty_ra(IN struct btc_coexist #endif } -void halbtc8723d2ant_low_penalty_ra(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_low_penalty_ra(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN boolean low_penalty_ra) { #if 1 @@ -753,7 +753,7 @@ void halbtc8723d2ant_low_penalty_ra(IN struct btc_coexist *btcoexist, #endif } -void halbtc8723d2ant_set_bt_auto_report(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_set_bt_auto_report(IN struct btc_coexist *btcoexist, IN boolean enable_auto_report) { u8 h2c_parameter[1] = {0}; @@ -766,7 +766,7 @@ void halbtc8723d2ant_set_bt_auto_report(IN struct btc_coexist *btcoexist, btcoexist->btc_fill_h2c(btcoexist, 0x68, 1, h2c_parameter); } -void halbtc8723d2ant_bt_auto_report(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_bt_auto_report(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN boolean enable_auto_report) { coex_dm->cur_bt_auto_report = enable_auto_report; @@ -781,7 +781,7 @@ void halbtc8723d2ant_bt_auto_report(IN struct btc_coexist *btcoexist, coex_dm->pre_bt_auto_report = coex_dm->cur_bt_auto_report; } -void halbtc8723d2ant_write_score_board( +static void halbtc8723d2ant_write_score_board( IN struct btc_coexist *btcoexist, IN u16 bitpos, IN boolean state @@ -800,7 +800,7 @@ void halbtc8723d2ant_write_score_board( } -void halbtc8723d2ant_read_score_board( +static void halbtc8723d2ant_read_score_board( IN struct btc_coexist *btcoexist, IN u16 *score_board_val ) @@ -811,7 +811,7 @@ void halbtc8723d2ant_read_score_board( } -void halbtc8723d2ant_post_state_to_bt( +static void halbtc8723d2ant_post_state_to_bt( IN struct btc_coexist *btcoexist, IN u16 type, IN boolean state @@ -826,7 +826,7 @@ void halbtc8723d2ant_post_state_to_bt( } -boolean halbtc8723d2ant_is_wifibt_status_changed(IN struct btc_coexist +static boolean halbtc8723d2ant_is_wifibt_status_changed(IN struct btc_coexist *btcoexist) { @@ -908,7 +908,7 @@ boolean halbtc8723d2ant_is_wifibt_status_changed(IN struct btc_coexist return false; } -void halbtc8723d2ant_monitor_bt_enable_disable(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_monitor_bt_enable_disable(IN struct btc_coexist *btcoexist) { static u32 bt_disable_cnt = 0; boolean bt_active = true, bt_disabled = false; @@ -973,7 +973,7 @@ void halbtc8723d2ant_monitor_bt_enable_disable(IN struct btc_coexist *btcoexist) -void halbtc8723d2ant_enable_gnt_to_gpio(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_enable_gnt_to_gpio(IN struct btc_coexist *btcoexist, boolean isenable) { #if BT_8723D_2ANT_COEX_DBG @@ -1012,7 +1012,7 @@ void halbtc8723d2ant_enable_gnt_to_gpio(IN struct btc_coexist *btcoexist, #endif } -u32 halbtc8723d2ant_ltecoex_indirect_read_reg(IN struct btc_coexist *btcoexist, +static u32 halbtc8723d2ant_ltecoex_indirect_read_reg(IN struct btc_coexist *btcoexist, IN u16 reg_addr) { u32 j = 0, delay_count = 0; @@ -1038,7 +1038,7 @@ u32 halbtc8723d2ant_ltecoex_indirect_read_reg(IN struct btc_coexist *btcoexist, } -void halbtc8723d2ant_ltecoex_indirect_write_reg(IN struct btc_coexist +static void halbtc8723d2ant_ltecoex_indirect_write_reg(IN struct btc_coexist *btcoexist, IN u16 reg_addr, IN u32 bit_mask, IN u32 reg_value) { @@ -1102,7 +1102,7 @@ void halbtc8723d2ant_ltecoex_indirect_write_reg(IN struct btc_coexist } -void halbtc8723d2ant_ltecoex_enable(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_ltecoex_enable(IN struct btc_coexist *btcoexist, IN boolean enable) { u8 val; @@ -1113,7 +1113,7 @@ void halbtc8723d2ant_ltecoex_enable(IN struct btc_coexist *btcoexist, } -void halbtc8723d2ant_ltecoex_pathcontrol_owner(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_ltecoex_pathcontrol_owner(IN struct btc_coexist *btcoexist, IN boolean wifi_control) { u8 val; @@ -1124,7 +1124,7 @@ void halbtc8723d2ant_ltecoex_pathcontrol_owner(IN struct btc_coexist *btcoexist, } -void halbtc8723d2ant_ltecoex_set_gnt_bt(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_ltecoex_set_gnt_bt(IN struct btc_coexist *btcoexist, IN u8 control_block, IN boolean sw_control, IN u8 state) { u32 val = 0, val_orig = 0; @@ -1157,7 +1157,7 @@ void halbtc8723d2ant_ltecoex_set_gnt_bt(IN struct btc_coexist *btcoexist, } -void halbtc8723d2ant_ltecoex_set_gnt_wl(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_ltecoex_set_gnt_wl(IN struct btc_coexist *btcoexist, IN u8 control_block, IN boolean sw_control, IN u8 state) { u32 val = 0, val_orig = 0; @@ -1189,7 +1189,7 @@ void halbtc8723d2ant_ltecoex_set_gnt_wl(IN struct btc_coexist *btcoexist, 0x38, 0xffffffff, val); } -void halbtc8723d2ant_ltecoex_set_coex_table(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_ltecoex_set_coex_table(IN struct btc_coexist *btcoexist, IN u8 table_type, IN u16 table_content) { u16 reg_addr = 0x0000; @@ -1211,7 +1211,7 @@ void halbtc8723d2ant_ltecoex_set_coex_table(IN struct btc_coexist *btcoexist, } -void halbtc8723d2ant_ltecoex_set_break_table(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_ltecoex_set_break_table(IN struct btc_coexist *btcoexist, IN u8 table_type, IN u8 table_content) { u16 reg_addr = 0x0000; @@ -1238,7 +1238,7 @@ void halbtc8723d2ant_ltecoex_set_break_table(IN struct btc_coexist *btcoexist, } -void halbtc8723d2ant_set_wltoggle_coex_table(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_set_wltoggle_coex_table(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 interval, IN u8 val0x6c4_b0, IN u8 val0x6c4_b1, IN u8 val0x6c4_b2, IN u8 val0x6c4_b3) @@ -1273,7 +1273,7 @@ void halbtc8723d2ant_set_wltoggle_coex_table(IN struct btc_coexist *btcoexist, btcoexist->btc_fill_h2c(btcoexist, 0x69, 6, cur_h2c_parameter); } -void halbtc8723d2ant_set_coex_table(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_set_coex_table(IN struct btc_coexist *btcoexist, IN u32 val0x6c0, IN u32 val0x6c4, IN u32 val0x6c8, IN u8 val0x6cc) { btcoexist->btc_write_4byte(btcoexist, 0x6c0, val0x6c0); @@ -1285,7 +1285,7 @@ void halbtc8723d2ant_set_coex_table(IN struct btc_coexist *btcoexist, btcoexist->btc_write_1byte(btcoexist, 0x6cc, val0x6cc); } -void halbtc8723d2ant_coex_table(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_coex_table(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u32 val0x6c0, IN u32 val0x6c4, IN u32 val0x6c8, IN u8 val0x6cc) { @@ -1310,7 +1310,7 @@ void halbtc8723d2ant_coex_table(IN struct btc_coexist *btcoexist, coex_dm->pre_val0x6cc = coex_dm->cur_val0x6cc; } -void halbtc8723d2ant_coex_table_with_type(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_coex_table_with_type(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 type) { u32 break_table; @@ -1373,7 +1373,7 @@ void halbtc8723d2ant_coex_table_with_type(IN struct btc_coexist *btcoexist, } } -void halbtc8723d2ant_set_fw_ignore_wlan_act(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_set_fw_ignore_wlan_act(IN struct btc_coexist *btcoexist, IN boolean enable) { u8 h2c_parameter[1] = {0}; @@ -1385,7 +1385,7 @@ void halbtc8723d2ant_set_fw_ignore_wlan_act(IN struct btc_coexist *btcoexist, btcoexist->btc_fill_h2c(btcoexist, 0x63, 1, h2c_parameter); } -void halbtc8723d2ant_ignore_wlan_act(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_ignore_wlan_act(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN boolean enable) { coex_dm->cur_ignore_wlan_act = enable; @@ -1400,7 +1400,7 @@ void halbtc8723d2ant_ignore_wlan_act(IN struct btc_coexist *btcoexist, coex_dm->pre_ignore_wlan_act = coex_dm->cur_ignore_wlan_act; } -void halbtc8723d2ant_set_lps_rpwm(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_set_lps_rpwm(IN struct btc_coexist *btcoexist, IN u8 lps_val, IN u8 rpwm_val) { u8 lps = lps_val; @@ -1410,7 +1410,7 @@ void halbtc8723d2ant_set_lps_rpwm(IN struct btc_coexist *btcoexist, btcoexist->btc_set(btcoexist, BTC_SET_U1_RPWM_VAL, &rpwm); } -void halbtc8723d2ant_lps_rpwm(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_lps_rpwm(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN u8 lps_val, IN u8 rpwm_val) { coex_dm->cur_lps = lps_val; @@ -1427,7 +1427,7 @@ void halbtc8723d2ant_lps_rpwm(IN struct btc_coexist *btcoexist, coex_dm->pre_rpwm = coex_dm->cur_rpwm; } -void halbtc8723d2ant_ps_tdma_check_for_power_save_state( +static void halbtc8723d2ant_ps_tdma_check_for_power_save_state( IN struct btc_coexist *btcoexist, IN boolean new_ps_state) { u8 lps_mode = 0x0; @@ -1458,7 +1458,7 @@ void halbtc8723d2ant_ps_tdma_check_for_power_save_state( } } -void halbtc8723d2ant_power_save_state(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_power_save_state(IN struct btc_coexist *btcoexist, IN u8 ps_type, IN u8 lps_val, IN u8 rpwm_val) { boolean low_pwr_disable = false; @@ -1503,7 +1503,7 @@ void halbtc8723d2ant_power_save_state(IN struct btc_coexist *btcoexist, -void halbtc8723d2ant_set_fw_pstdma(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_set_fw_pstdma(IN struct btc_coexist *btcoexist, IN u8 byte1, IN u8 byte2, IN u8 byte3, IN u8 byte4, IN u8 byte5) { u8 h2c_parameter[5] = {0}; @@ -1567,7 +1567,7 @@ void halbtc8723d2ant_set_fw_pstdma(IN struct btc_coexist *btcoexist, btcoexist->btc_fill_h2c(btcoexist, 0x60, 5, h2c_parameter); } -void halbtc8723d2ant_ps_tdma(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_ps_tdma(IN struct btc_coexist *btcoexist, IN boolean force_exec, IN boolean turn_on, IN u8 type) { @@ -1793,7 +1793,7 @@ void halbtc8723d2ant_ps_tdma(IN struct btc_coexist *btcoexist, coex_dm->pre_ps_tdma = coex_dm->cur_ps_tdma; } -void halbtc8723d2ant_set_ant_path(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_set_ant_path(IN struct btc_coexist *btcoexist, IN u8 ant_pos_type, IN boolean force_exec, IN u8 phase) { @@ -2194,7 +2194,7 @@ void halbtc8723d2ant_set_ant_path(IN struct btc_coexist *btcoexist, } -u8 halbtc8723d2ant_action_algorithm(IN struct btc_coexist *btcoexist) +static u8 halbtc8723d2ant_action_algorithm(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; boolean bt_hs_on = false; @@ -2412,7 +2412,7 @@ u8 halbtc8723d2ant_action_algorithm(IN struct btc_coexist *btcoexist) -void halbtc8723d2ant_action_coex_all_off(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_coex_all_off(IN struct btc_coexist *btcoexist) { halbtc8723d2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0); @@ -2424,7 +2424,7 @@ void halbtc8723d2ant_action_coex_all_off(IN struct btc_coexist *btcoexist) halbtc8723d2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0); } -void halbtc8723d2ant_action_bt_whql_test(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_bt_whql_test(IN struct btc_coexist *btcoexist) { halbtc8723d2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0x18); halbtc8723d2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0); @@ -2434,7 +2434,7 @@ void halbtc8723d2ant_action_bt_whql_test(IN struct btc_coexist *btcoexist) halbtc8723d2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0); } -void halbtc8723d2ant_action_bt_hs(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_bt_hs(IN struct btc_coexist *btcoexist) { static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW; static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW; @@ -2513,7 +2513,7 @@ void halbtc8723d2ant_action_bt_hs(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_action_bt_inquiry(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_bt_inquiry(IN struct btc_coexist *btcoexist) { boolean wifi_connected = false; @@ -2583,7 +2583,7 @@ void halbtc8723d2ant_action_bt_inquiry(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_action_bt_relink(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_bt_relink(IN struct btc_coexist *btcoexist) { halbtc8723d2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 8); halbtc8723d2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1); @@ -2593,7 +2593,7 @@ void halbtc8723d2ant_action_bt_relink(IN struct btc_coexist *btcoexist) coex_sta->bt_relink_downcount = 2; } -void halbtc8723d2ant_action_bt_idle(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_bt_idle(IN struct btc_coexist *btcoexist) { boolean wifi_busy = false; @@ -2631,7 +2631,7 @@ void halbtc8723d2ant_action_bt_idle(IN struct btc_coexist *btcoexist) /* SCO only or SCO+PAN(HS) */ -void halbtc8723d2ant_action_sco(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_sco(IN struct btc_coexist *btcoexist) { static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW; static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW; @@ -2692,7 +2692,7 @@ void halbtc8723d2ant_action_sco(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_action_hid(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_hid(IN struct btc_coexist *btcoexist) { static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW; static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW; @@ -2785,7 +2785,7 @@ void halbtc8723d2ant_action_hid(IN struct btc_coexist *btcoexist) /* A2DP only / PAN(EDR) only/ A2DP+PAN(HS) */ -void halbtc8723d2ant_action_a2dp(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_a2dp(IN struct btc_coexist *btcoexist) { static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW; static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW; @@ -2893,7 +2893,7 @@ void halbtc8723d2ant_action_a2dp(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_action_pan_edr(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_pan_edr(IN struct btc_coexist *btcoexist) { static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW; static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW; @@ -2999,7 +2999,7 @@ void halbtc8723d2ant_action_pan_edr(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_action_hid_a2dp(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_hid_a2dp(IN struct btc_coexist *btcoexist) { static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW; static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW; @@ -3107,7 +3107,7 @@ void halbtc8723d2ant_action_hid_a2dp(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_action_a2dp_pan_hs(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_a2dp_pan_hs(IN struct btc_coexist *btcoexist) { static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW; static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW; @@ -3215,7 +3215,7 @@ void halbtc8723d2ant_action_a2dp_pan_hs(IN struct btc_coexist *btcoexist) /* PAN(EDR)+A2DP */ -void halbtc8723d2ant_action_pan_edr_a2dp(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_pan_edr_a2dp(IN struct btc_coexist *btcoexist) { static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW; static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW; @@ -3323,7 +3323,7 @@ void halbtc8723d2ant_action_pan_edr_a2dp(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_action_pan_edr_hid(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_pan_edr_hid(IN struct btc_coexist *btcoexist) { static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW; static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW; @@ -3424,7 +3424,7 @@ void halbtc8723d2ant_action_pan_edr_hid(IN struct btc_coexist *btcoexist) /* HID+A2DP+PAN(EDR) */ -void halbtc8723d2ant_action_hid_a2dp_pan_edr(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_hid_a2dp_pan_edr(IN struct btc_coexist *btcoexist) { static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW; static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW; @@ -3534,7 +3534,7 @@ void halbtc8723d2ant_action_hid_a2dp_pan_edr(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_action_wifi_multi_port(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_wifi_multi_port(IN struct btc_coexist *btcoexist) { halbtc8723d2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0x18); halbtc8723d2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0); @@ -3545,7 +3545,7 @@ void halbtc8723d2ant_action_wifi_multi_port(IN struct btc_coexist *btcoexist) halbtc8723d2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0); } -void halbtc8723d2ant_action_wifi_linkscan_process(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_wifi_linkscan_process(IN struct btc_coexist *btcoexist) { struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info; @@ -3574,7 +3574,7 @@ void halbtc8723d2ant_action_wifi_linkscan_process(IN struct btc_coexist *btcoexi } -void halbtc8723d2ant_action_wifi_not_connected(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_wifi_not_connected(IN struct btc_coexist *btcoexist) { halbtc8723d2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0); @@ -3585,7 +3585,7 @@ void halbtc8723d2ant_action_wifi_not_connected(IN struct btc_coexist *btcoexist) halbtc8723d2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0); } -void halbtc8723d2ant_action_wifi_connected(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_action_wifi_connected(IN struct btc_coexist *btcoexist) { switch (coex_dm->cur_algorithm) { @@ -3663,7 +3663,7 @@ void halbtc8723d2ant_action_wifi_connected(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_run_coexist_mechanism(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_run_coexist_mechanism(IN struct btc_coexist *btcoexist) { u8 algorithm = 0; u32 num_of_wifi_link = 0; @@ -3847,7 +3847,7 @@ void halbtc8723d2ant_run_coexist_mechanism(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_init_coex_dm(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_init_coex_dm(IN struct btc_coexist *btcoexist) { BTC_SPRINTF(trace_buf, BT_TMP_BUF_SIZE, "[BTCoex], Coex Mechanism Init!!\n"); @@ -3870,7 +3870,7 @@ void halbtc8723d2ant_init_coex_dm(IN struct btc_coexist *btcoexist) } -void halbtc8723d2ant_init_hw_config(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_init_hw_config(IN struct btc_coexist *btcoexist, IN boolean wifi_only) { u8 u8tmp0 = 0, u8tmp1 = 0; @@ -4007,7 +4007,7 @@ void halbtc8723d2ant_init_hw_config(IN struct btc_coexist *btcoexist, } -u32 halbtc8723d2ant_psd_log2base(IN struct btc_coexist *btcoexist, IN u32 val) +static u32 halbtc8723d2ant_psd_log2base(IN struct btc_coexist *btcoexist, IN u32 val) { u8 j; u32 tmp, tmp2, val_integerd_b = 0, tindex, shiftcount = 0; @@ -4052,7 +4052,7 @@ u32 halbtc8723d2ant_psd_log2base(IN struct btc_coexist *btcoexist, IN u32 val) } -void halbtc8723d2ant_psd_show_antenna_detect_result(IN struct btc_coexist +static void halbtc8723d2ant_psd_show_antenna_detect_result(IN struct btc_coexist *btcoexist) { u8 *cli_buf = btcoexist->cli_buf; @@ -4239,7 +4239,7 @@ void halbtc8723d2ant_psd_show_antenna_detect_result(IN struct btc_coexist } -void halbtc8723d2ant_psd_showdata(IN struct btc_coexist *btcoexist) +static void halbtc8723d2ant_psd_showdata(IN struct btc_coexist *btcoexist) { u8 *cli_buf = btcoexist->cli_buf; u32 delta_freq_per_point; @@ -4434,7 +4434,7 @@ void halbtc8723d2ant_psd_showdata(IN struct btc_coexist *btcoexist) #ifdef PLATFORM_WINDOWS #pragma optimize("", off) #endif -void halbtc8723d2ant_psd_maxholddata(IN struct btc_coexist *btcoexist, +static void halbtc8723d2ant_psd_maxholddata(IN struct btc_coexist *btcoexist, IN u32 gen_count) { u32 i = 0; @@ -4470,7 +4470,7 @@ void halbtc8723d2ant_psd_maxholddata(IN struct btc_coexist *btcoexist, #ifdef PLATFORM_WINDOWS #pragma optimize("", off) #endif -u32 halbtc8723d2ant_psd_getdata(IN struct btc_coexist *btcoexist, IN u32 point) +static u32 halbtc8723d2ant_psd_getdata(IN struct btc_coexist *btcoexist, IN u32 point) { /* reg 0x808[9:0]: FFT data x */ /* reg 0x808[22]: 0-->1 to get 1 FFT data y */ @@ -4504,7 +4504,7 @@ u32 halbtc8723d2ant_psd_getdata(IN struct btc_coexist *btcoexist, IN u32 point) #ifdef PLATFORM_WINDOWS #pragma optimize("", off) #endif -boolean halbtc8723d2ant_psd_sweep_point(IN struct btc_coexist *btcoexist, +static boolean halbtc8723d2ant_psd_sweep_point(IN struct btc_coexist *btcoexist, IN u32 cent_freq, IN s32 offset, IN u32 span, IN u32 points, IN u32 avgnum, IN u32 loopcnt) { @@ -4836,7 +4836,7 @@ boolean halbtc8723d2ant_psd_sweep_point(IN struct btc_coexist *btcoexist, #ifdef PLATFORM_WINDOWS #pragma optimize("", off) #endif -boolean halbtc8723d2ant_psd_antenna_detection(IN struct btc_coexist +static boolean halbtc8723d2ant_psd_antenna_detection(IN struct btc_coexist *btcoexist) { u32 i = 0; @@ -5219,7 +5219,7 @@ boolean halbtc8723d2ant_psd_antenna_detection(IN struct btc_coexist #ifdef PLATFORM_WINDOWS #pragma optimize("", off) #endif -boolean halbtc8723d2ant_psd_antenna_detection_check(IN struct btc_coexist +static boolean halbtc8723d2ant_psd_antenna_detection_check(IN struct btc_coexist *btcoexist) { static u32 ant_det_count = 0, ant_det_fail_count = 0; diff --git a/hal/phydm/phydm_ccx.c b/hal/phydm/phydm_ccx.c index 7d81f22..5510952 100644 --- a/hal/phydm/phydm_ccx.c +++ b/hal/phydm/phydm_ccx.c @@ -292,7 +292,7 @@ phydm_checkNHMready( return ret; } -VOID +static VOID phydm_storeNHMsetting( IN PVOID pDM_VOID ) diff --git a/hal/phydm/phydm_kfree.c b/hal/phydm/phydm_kfree.c index a91cdee..490ed4c 100644 --- a/hal/phydm/phydm_kfree.c +++ b/hal/phydm/phydm_kfree.c @@ -28,7 +28,7 @@ /* Add for KFree Feature Requested by RF David.*/ /*This is a phydm API*/ -VOID +static VOID phydm_SetKfreeToRF_8814A( IN PVOID pDM_VOID, IN u1Byte eRFPath, @@ -119,7 +119,7 @@ phydm_SetKfreeToRF_8814A( } -VOID +static VOID phydm_SetKfreeToRF( IN PVOID pDM_VOID, IN u1Byte eRFPath, diff --git a/hal/phydm/rtl8723d/halhwimg8723d_bb.c b/hal/phydm/rtl8723d/halhwimg8723d_bb.c index 5ce660f..6cff789 100644 --- a/hal/phydm/rtl8723d/halhwimg8723d_bb.c +++ b/hal/phydm/rtl8723d/halhwimg8723d_bb.c @@ -124,7 +124,7 @@ CheckNegative( * AGC_TAB.TXT ******************************************************************************/ -u4Byte Array_MP_8723D_AGC_TAB[] = { +static u4Byte Array_MP_8723D_AGC_TAB[] = { 0xC78, 0xFE000101, 0xC78, 0xFD010101, 0xC78, 0xFC020101, @@ -578,7 +578,7 @@ ODM_GetVersion_MP_8723D_AGC_TAB(void) * PHY_REG.TXT ******************************************************************************/ -u4Byte Array_MP_8723D_PHY_REG[] = { +static u4Byte Array_MP_8723D_PHY_REG[] = { 0x800, 0x80046C00, 0x804, 0x00000003, 0x808, 0x0000FC00, @@ -869,7 +869,7 @@ ODM_GetVersion_MP_8723D_PHY_REG(void) * PHY_REG_PG.TXT ******************************************************************************/ -u4Byte Array_MP_8723D_PHY_REG_PG[] = { +static u4Byte Array_MP_8723D_PHY_REG_PG[] = { 0, 0, 0, 0x00000e08, 0x0000ff00, 0x00003200, 0, 0, 0, 0x0000086c, 0xffffff00, 0x32323200, 0, 0, 0, 0x00000e00, 0xffffffff, 0x32343434, diff --git a/hal/phydm/rtl8723d/halhwimg8723d_mac.c b/hal/phydm/rtl8723d/halhwimg8723d_mac.c index 7db8825..6856636 100644 --- a/hal/phydm/rtl8723d/halhwimg8723d_mac.c +++ b/hal/phydm/rtl8723d/halhwimg8723d_mac.c @@ -124,7 +124,7 @@ CheckNegative( * MAC_REG.TXT ******************************************************************************/ -u4Byte Array_MP_8723D_MAC_REG[] = { +static u4Byte Array_MP_8723D_MAC_REG[] = { 0x020, 0x00000013, 0x02F, 0x00000010, 0x077, 0x00000007, diff --git a/hal/phydm/rtl8723d/halhwimg8723d_rf.c b/hal/phydm/rtl8723d/halhwimg8723d_rf.c index 8094080..1cc8a74 100644 --- a/hal/phydm/rtl8723d/halhwimg8723d_rf.c +++ b/hal/phydm/rtl8723d/halhwimg8723d_rf.c @@ -124,7 +124,7 @@ CheckNegative( * RadioA.TXT ******************************************************************************/ -u4Byte Array_MP_8723D_RadioA[] = { +static u4Byte Array_MP_8723D_RadioA[] = { 0x050, 0x00019000, 0x000, 0x00010000, 0x0B1, 0x00054573, @@ -430,34 +430,34 @@ ODM_ReadAndConfig_MP_8723D_TxPowerTrack_PCIE( ******************************************************************************/ #if DEV_BUS_TYPE == RT_SDIO_INTERFACE -u1Byte gDeltaSwingTableIdx_MP_5GB_N_TxPowerTrack_SDIO_8723D[][DELTA_SWINGIDX_SIZE] = { +static u1Byte gDeltaSwingTableIdx_MP_5GB_N_TxPowerTrack_SDIO_8723D[][DELTA_SWINGIDX_SIZE] = { {0, 1, 2, 3, 3, 5, 5, 6, 6, 7, 8, 9, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 16, 17, 17, 17, 17, 18, 18, 18}, {0, 1, 2, 3, 3, 5, 5, 6, 6, 7, 8, 9, 10, 11, 11, 12, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 18, 18, 18}, {0, 1, 2, 3, 3, 5, 5, 6, 6, 7, 8, 9, 10, 11, 11, 12, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 18, 18, 18}, }; -u1Byte gDeltaSwingTableIdx_MP_5GB_P_TxPowerTrack_SDIO_8723D[][DELTA_SWINGIDX_SIZE] = { +static u1Byte gDeltaSwingTableIdx_MP_5GB_P_TxPowerTrack_SDIO_8723D[][DELTA_SWINGIDX_SIZE] = { {0, 1, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}, {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}, {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}, }; -u1Byte gDeltaSwingTableIdx_MP_5GA_N_TxPowerTrack_SDIO_8723D[][DELTA_SWINGIDX_SIZE] = { +static u1Byte gDeltaSwingTableIdx_MP_5GA_N_TxPowerTrack_SDIO_8723D[][DELTA_SWINGIDX_SIZE] = { {0, 1, 2, 3, 3, 5, 5, 6, 6, 7, 8, 9, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 16, 17, 17, 17, 17, 18, 18, 18}, {0, 1, 2, 3, 3, 5, 5, 6, 6, 7, 8, 9, 10, 11, 11, 12, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 18, 18, 18}, {0, 1, 2, 3, 3, 5, 5, 6, 6, 7, 8, 9, 10, 11, 11, 12, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 18, 18, 18}, }; -u1Byte gDeltaSwingTableIdx_MP_5GA_P_TxPowerTrack_SDIO_8723D[][DELTA_SWINGIDX_SIZE] = { +static u1Byte gDeltaSwingTableIdx_MP_5GA_P_TxPowerTrack_SDIO_8723D[][DELTA_SWINGIDX_SIZE] = { {0, 1, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}, {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}, {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}, }; -u1Byte gDeltaSwingTableIdx_MP_2GB_N_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 1, 2, 2, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 10, 10}; -u1Byte gDeltaSwingTableIdx_MP_2GB_P_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 7, 8, 8, 8, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10}; -u1Byte gDeltaSwingTableIdx_MP_2GA_N_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 1, 2, 2, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 10, 10}; -u1Byte gDeltaSwingTableIdx_MP_2GA_P_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 7, 8, 8, 8, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10}; -u1Byte gDeltaSwingTableIdx_MP_2GCCKB_N_TxPowerTrack_SDIO_8723D[] = {0, 1, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11}; -u1Byte gDeltaSwingTableIdx_MP_2GCCKB_P_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11}; -u1Byte gDeltaSwingTableIdx_MP_2GCCKA_N_TxPowerTrack_SDIO_8723D[] = {0, 1, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11}; -u1Byte gDeltaSwingTableIdx_MP_2GCCKA_P_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11}; +static u1Byte gDeltaSwingTableIdx_MP_2GB_N_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 1, 2, 2, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 10, 10}; +static u1Byte gDeltaSwingTableIdx_MP_2GB_P_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 7, 8, 8, 8, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10}; +static u1Byte gDeltaSwingTableIdx_MP_2GA_N_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 1, 2, 2, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 10, 10}; +static u1Byte gDeltaSwingTableIdx_MP_2GA_P_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 7, 8, 8, 8, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10}; +static u1Byte gDeltaSwingTableIdx_MP_2GCCKB_N_TxPowerTrack_SDIO_8723D[] = {0, 1, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11}; +static u1Byte gDeltaSwingTableIdx_MP_2GCCKB_P_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11}; +static u1Byte gDeltaSwingTableIdx_MP_2GCCKA_N_TxPowerTrack_SDIO_8723D[] = {0, 1, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11}; +static u1Byte gDeltaSwingTableIdx_MP_2GCCKA_P_TxPowerTrack_SDIO_8723D[] = {0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11}; #endif void @@ -555,7 +555,7 @@ ODM_ReadAndConfig_MP_8723D_TxPowerTrack_USB( * TXPWR_LMT.TXT ******************************************************************************/ -const char *Array_MP_8723D_TXPWR_LMT[] = { +static const char *Array_MP_8723D_TXPWR_LMT[] = { "FCC", "2.4G", "20M", "CCK", "1T", "01", "30", "ETSI", "2.4G", "20M", "CCK", "1T", "01", "30", "MKK", "2.4G", "20M", "CCK", "1T", "01", "30", @@ -1178,8 +1178,8 @@ ODM_ReadAndConfig_MP_8723D_TXPWR_LMT( * TxXtalTrack.TXT ******************************************************************************/ -s1Byte gDeltaSwingTableXtal_MP_N_TxXtalTrack_8723D[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; -s1Byte gDeltaSwingTableXtal_MP_P_TxXtalTrack_8723D[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -12, -14, -16, -16, -16, -16, -16, -16, -16, -16, -16, -16, -16}; +static s1Byte gDeltaSwingTableXtal_MP_N_TxXtalTrack_8723D[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; +static s1Byte gDeltaSwingTableXtal_MP_P_TxXtalTrack_8723D[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10, -12, -14, -16, -16, -16, -16, -16, -16, -16, -16, -16, -16, -16}; void ODM_ReadAndConfig_MP_8723D_TxXtalTrack( diff --git a/hal/phydm/rtl8723d/halphyrf_8723d.c b/hal/phydm/rtl8723d/halphyrf_8723d.c index e8cfa9a..59a0cae 100644 --- a/hal/phydm/rtl8723d/halphyrf_8723d.c +++ b/hal/phydm/rtl8723d/halphyrf_8723d.c @@ -58,7 +58,7 @@ /* Tx Power Tracking*/ -void setIqkMatrix_8723D(PDM_ODM_T pDM_Odm, +static void setIqkMatrix_8723D(PDM_ODM_T pDM_Odm, u1Byte OFDM_index, u1Byte RFPath, s4Byte IqkResult_X, @@ -738,7 +738,7 @@ GetDeltaSwingTable_8723D( return; } -VOID +static VOID GetDeltaSwingXtalTable_8723D( PVOID pDM_VOID, ps1Byte *TemperatureUP_Xtal, @@ -809,7 +809,7 @@ void ConfigureTxpowerTrack_8723D( #define MAX_TOLERANCE 5 #define IQK_DELAY_TIME 1 -u1Byte +static u1Byte phy_PathS1_IQK_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -955,7 +955,7 @@ phy_PathS1_IQK_8723D( } -u1Byte +static u1Byte phy_PathS1_RxIQK_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -1205,7 +1205,7 @@ phy_PathS1_RxIQK_8723D( } -u1Byte +static u1Byte phy_PathS0_IQK_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -1345,7 +1345,7 @@ phy_PathS0_IQK_8723D( return result; } -u1Byte +static u1Byte phy_PathS0_RxIQK_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1587,7 +1587,7 @@ phy_PathS0_RxIQK_8723D( } -VOID +static VOID _PHY_PathS1FillIQKMatrix_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1675,7 +1675,7 @@ _PHY_PathS1FillIQKMatrix_8723D( } } -VOID +static VOID _PHY_PathS0FillIQKMatrix_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1759,7 +1759,7 @@ _PHY_PathS0FillIQKMatrix_8723D( // // MP Already declare in odm.c #if !(DM_ODM_SUPPORT_TYPE & ODM_WIN) -BOOLEAN +static BOOLEAN ODM_CheckPowerStatus( IN PADAPTER Adapter) { @@ -1824,7 +1824,7 @@ _PHY_SaveADDARegisters_8723D( } -VOID +static VOID _PHY_SaveMACRegisters_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1854,7 +1854,7 @@ _PHY_SaveMACRegisters_8723D( } -VOID +static VOID _PHY_ReloadADDARegisters_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1883,7 +1883,7 @@ _PHY_ReloadADDARegisters_8723D( } } -VOID +static VOID _PHY_ReloadMACRegisters_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1993,7 +1993,7 @@ _PHY_MACSettingCalibration_8723D( } -VOID +static VOID _PHY_PathAStandBy_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -2020,7 +2020,7 @@ _PHY_PathAStandBy_8723D( ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, 0xffffff00, 0x808000); } -VOID +static VOID _PHY_PathBStandBy_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -2047,7 +2047,7 @@ _PHY_PathBStandBy_8723D( } -VOID +static VOID _PHY_PIModeSwitch_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -2074,7 +2074,7 @@ _PHY_PIModeSwitch_8723D( ODM_SetBBReg(pDM_Odm, rFPGA0_XB_HSSIParameter1, bMaskDWord, mode); } -BOOLEAN +static BOOLEAN phy_SimularityCompare_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -2186,7 +2186,7 @@ phy_SimularityCompare_8723D( } } -VOID +static VOID phy_IQCalibrate_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -2514,7 +2514,7 @@ phy_IQCalibrate_8723D( ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("phy_IQCalibrate_8723D() <==\n")); } -VOID +static VOID phy_LCCalibrate_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_CE) PVOID pDM_VOID, @@ -2570,7 +2570,7 @@ phy_LCCalibrate_8723D( #define APK_CURVE_REG_NUM 4 #define PATH_NUM 2 -VOID +static VOID phy_APCalibrate_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -3499,7 +3499,7 @@ PHY_APCalibrate_8723D( #endif } -VOID phy_SetRFPathSwitch_8723D( +static VOID phy_SetRFPathSwitch_8723D( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else diff --git a/include/basic_types.h b/include/basic_types.h index 245286d..c903c4a 100644 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -195,43 +195,43 @@ /* * Read LE data from memory to host byte order */ -#define ReadLE4Byte(_ptr) le32_to_cpu(*((u32 *)(_ptr))) -#define ReadLE2Byte(_ptr) le16_to_cpu(*((u16 *)(_ptr))) +#define ReadLE4Byte(_ptr) le32_to_cpu(*((__le32 *)(_ptr))) +#define ReadLE2Byte(_ptr) le16_to_cpu(*((__le16 *)(_ptr))) #define ReadLE1Byte(_ptr) (*((u8 *)(_ptr))) /* * Read BE data from memory to host byte order */ -#define ReadBEE4Byte(_ptr) be32_to_cpu(*((u32 *)(_ptr))) -#define ReadBE2Byte(_ptr) be16_to_cpu(*((u16 *)(_ptr))) +#define ReadBEE4Byte(_ptr) be32_to_cpu(*((__be32 *)(_ptr))) +#define ReadBE2Byte(_ptr) be16_to_cpu(*((__be16 *)(_ptr))) #define ReadBE1Byte(_ptr) (*((u8 *)(_ptr))) /* * Write host byte order data to memory in LE order */ -#define WriteLE4Byte(_ptr, _val) ((*((u32 *)(_ptr))) = cpu_to_le32(_val)) -#define WriteLE2Byte(_ptr, _val) ((*((u16 *)(_ptr))) = cpu_to_le16(_val)) +#define WriteLE4Byte(_ptr, _val) ((*((__le32 *)(_ptr))) = cpu_to_le32(_val)) +#define WriteLE2Byte(_ptr, _val) ((*((__le16 *)(_ptr))) = cpu_to_le16(_val)) #define WriteLE1Byte(_ptr, _val) ((*((u8 *)(_ptr))) = ((u8)(_val))) /* * Write host byte order data to memory in BE order */ -#define WriteBE4Byte(_ptr, _val) ((*((u32 *)(_ptr))) = cpu_to_be32(_val)) -#define WriteBE2Byte(_ptr, _val) ((*((u16 *)(_ptr))) = cpu_to_be16(_val)) +#define WriteBE4Byte(_ptr, _val) ((*((__be32 *)(_ptr))) = cpu_to_be32(_val)) +#define WriteBE2Byte(_ptr, _val) ((*((__be16 *)(_ptr))) = cpu_to_be16(_val)) #define WriteBE1Byte(_ptr, _val) ((*((u8 *)(_ptr))) = ((u8)(_val))) /* * Return 4-byte value in host byte ordering from 4-byte pointer in litten-endian system. */ -#define LE_P4BYTE_TO_HOST_4BYTE(__pStart) (le32_to_cpu(*((u32 *)(__pStart)))) -#define LE_P2BYTE_TO_HOST_2BYTE(__pStart) (le16_to_cpu(*((u16 *)(__pStart)))) +#define LE_P4BYTE_TO_HOST_4BYTE(__pStart) (le32_to_cpu(*((__le32 *)(__pStart)))) +#define LE_P2BYTE_TO_HOST_2BYTE(__pStart) (le16_to_cpu(*((__le16 *)(__pStart)))) #define LE_P1BYTE_TO_HOST_1BYTE(__pStart) ((*((u8 *)(__pStart)))) /* * Return 4-byte value in host byte ordering from 4-byte pointer in big-endian system. */ -#define BE_P4BYTE_TO_HOST_4BYTE(__pStart) (be32_to_cpu(*((u32 *)(__pStart)))) -#define BE_P2BYTE_TO_HOST_2BYTE(__pStart) (be16_to_cpu(*((u16 *)(__pStart)))) +#define BE_P4BYTE_TO_HOST_4BYTE(__pStart) (be32_to_cpu(*((__be32 *)(__pStart)))) +#define BE_P2BYTE_TO_HOST_2BYTE(__pStart) (be16_to_cpu(*((__be16 *)(__pStart)))) #define BE_P1BYTE_TO_HOST_1BYTE(__pStart) ((*((u8 *)(__pStart)))) /* diff --git a/include/wifi.h b/include/wifi.h index 3ff52d8..a7a2fa0 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -364,23 +364,23 @@ enum WIFI_REG_DOMAIN { #define SetFrameType(pbuf, type) \ do { \ - *(unsigned short *)(pbuf) &= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \ - *(unsigned short *)(pbuf) |= __constant_cpu_to_le16(type); \ + *(__le16 *)(pbuf) &= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \ + *(__le16 *)(pbuf) |= __constant_cpu_to_le16(type); \ } while (0) -#define GetFrameSubType(pbuf) (cpu_to_le16(*(unsigned short *)(pbuf)) & (BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))) +#define GetFrameSubType(pbuf) (cpu_to_le16(*(__le16 *)(pbuf)) & (BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))) #define SetFrameSubType(pbuf, type) \ do { \ - *(unsigned short *)(pbuf) &= cpu_to_le16(~(BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))); \ - *(unsigned short *)(pbuf) |= cpu_to_le16(type); \ + *(__le16 *)(pbuf) &= cpu_to_le16(~(BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))); \ + *(__le16 *)(pbuf) |= cpu_to_le16(type); \ } while (0) -#define GetSequence(pbuf) (cpu_to_le16(*(unsigned short *)((SIZE_PTR)(pbuf) + 22)) >> 4) +#define GetSequence(pbuf) (cpu_to_le16(*(__le16 *)((SIZE_PTR)(pbuf) + 22)) >> 4) -#define GetFragNum(pbuf) (cpu_to_le16(*(unsigned short *)((SIZE_PTR)(pbuf) + 22)) & 0x0f) +#define GetFragNum(pbuf) (cpu_to_le16(*(__le16 *)((SIZE_PTR)(pbuf) + 22)) & 0x0f) -#define GetTupleCache(pbuf) (cpu_to_le16(*(unsigned short *)((SIZE_PTR)(pbuf) + 22))) +#define GetTupleCache(pbuf) (cpu_to_le16(*(__le16 *)((SIZE_PTR)(pbuf) + 22))) #define SetFragNum(pbuf, num) \ do { \ @@ -407,7 +407,7 @@ enum WIFI_REG_DOMAIN { *(unsigned short *)(pbuf) |= cpu_to_le16(tid & 0xf); \ } while (0) -#define GetPriority(pbuf) ((le16_to_cpu(*(unsigned short *)(pbuf))) & 0xf) +#define GetPriority(pbuf) ((le16_to_cpu(*(__le16 *)(pbuf))) & 0xf) #define SetEOSP(pbuf, eosp) \ do { \ diff --git a/platform/platform_ops.c b/platform/platform_ops.c index 95da669..10c45e7 100644 --- a/platform/platform_ops.c +++ b/platform/platform_ops.c @@ -18,6 +18,9 @@ * ******************************************************************************/ #ifndef CONFIG_PLATFORM_OPS + +#include "platform_ops.h" + /* * Return: * 0: power on successfully