Delete unused code and empty functions after cleanup

This commit is contained in:
Carlos Garces 2021-10-24 13:26:10 +02:00
parent 2c4c2e5a98
commit f8fe43f625
25 changed files with 9 additions and 682 deletions

View File

@ -1273,102 +1273,6 @@ u16 rtw_btcoex_parse_recv_data(u8 *msg, u8 msg_size)
return res;
}
void rtw_btcoex_recvmsgbysocket(void *data)
{
u8 recv_data[255];
u8 tx_msg[255] = leave_ack;
u32 len = 0;
u16 recv_length = 0;
u16 parse_res = 0;
struct bt_coex_info *pcoex_info = NULL;
struct sock *sk = NULL;
struct sk_buff *skb = NULL;
/*RTW_INFO("%s\n",__func__);*/
if (pbtcoexadapter == NULL) {
RTW_INFO("%s: btcoexadapter NULL!\n", __func__);
return;
}
pcoex_info = &pbtcoexadapter->coex_info;
sk = pcoex_info->sk_store;
if (sk == NULL) {
RTW_INFO("%s: critical error when receive socket data!\n", __func__);
return;
}
len = skb_queue_len(&sk->sk_receive_queue);
while (len > 0) {
skb = skb_dequeue(&sk->sk_receive_queue);
/*important: cut the udp header from skb->data! header length is 8 byte*/
recv_length = skb->len - 8;
memset(recv_data, 0, sizeof(recv_data));
memcpy(recv_data, skb->data + 8, recv_length);
parse_res = rtw_btcoex_parse_recv_data(recv_data, recv_length);
switch (parse_res) {
case RX_ATTEND_ACK:
/* attend ack */
pcoex_info->BT_attend = _TRUE;
RTW_INFO("RX_ATTEND_ACK!,sock_open:%d, BT_attend:%d\n", pcoex_info->sock_open, pcoex_info->BT_attend);
rtw_btcoex_pta_off_on_notify(pbtcoexadapter, pcoex_info->BT_attend);
break;
case RX_ATTEND_REQ:
pcoex_info->BT_attend = _TRUE;
RTW_INFO("RX_BT_ATTEND_REQ!,sock_open:%d, BT_attend:%d\n", pcoex_info->sock_open, pcoex_info->BT_attend);
rtw_btcoex_sendmsgbysocket(pbtcoexadapter, attend_ack, sizeof(attend_ack), _FALSE);
rtw_btcoex_pta_off_on_notify(pbtcoexadapter, pcoex_info->BT_attend);
break;
case RX_INVITE_REQ:
/* invite req from BT */
pcoex_info->BT_attend = _TRUE;
RTW_INFO("RX_INVITE_REQ!,sock_open:%d, BT_attend:%d\n", pcoex_info->sock_open, pcoex_info->BT_attend);
rtw_btcoex_sendmsgbysocket(pbtcoexadapter, invite_rsp, sizeof(invite_rsp), _FALSE);
rtw_btcoex_pta_off_on_notify(pbtcoexadapter, pcoex_info->BT_attend);
break;
case RX_INVITE_RSP:
/*invite rsp*/
pcoex_info->BT_attend = _TRUE;
RTW_INFO("RX_INVITE_RSP!,sock_open:%d, BT_attend:%d\n", pcoex_info->sock_open, pcoex_info->BT_attend);
rtw_btcoex_pta_off_on_notify(pbtcoexadapter, pcoex_info->BT_attend);
break;
case RX_LEAVE_ACK:
/* mean BT know wifi will leave */
pcoex_info->BT_attend = _FALSE;
RTW_INFO("RX_LEAVE_ACK!,sock_open:%d, BT_attend:%d\n", pcoex_info->sock_open, pcoex_info->BT_attend);
rtw_btcoex_pta_off_on_notify(pbtcoexadapter, pcoex_info->BT_attend);
break;
case RX_BT_LEAVE:
/* BT leave */
rtw_btcoex_sendmsgbysocket(pbtcoexadapter, leave_ack, sizeof(leave_ack), _FALSE); /* no ack */
pcoex_info->BT_attend = _FALSE;
RTW_INFO("RX_BT_LEAVE!sock_open:%d, BT_attend:%d\n", pcoex_info->sock_open, pcoex_info->BT_attend);
rtw_btcoex_pta_off_on_notify(pbtcoexadapter, pcoex_info->BT_attend);
break;
default:
if (_TRUE == pcoex_info->BT_attend)
rtw_btcoex_parse_hci_cmd(pbtcoexadapter, recv_data, recv_length);
else
RTW_INFO("ERROR!! BT is UP\n");
break;
}
len--;
kfree_skb(skb);
}
}
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0))
void rtw_btcoex_recvmsg_init(struct sock *sk_in, s32 bytes)
#else
@ -1565,16 +1469,6 @@ void rtw_btcoex_close_socket(_adapter *padapter)
}
}
void rtw_btcoex_dump_tx_msg(u8 *tx_msg, u8 len, u8 *msg_name)
{
u8 i = 0;
RTW_INFO("======> Msg name: %s\n", msg_name);
for (i = 0; i < len; i++)
printk("%02x ", tx_msg[i]);
printk("\n");
RTW_INFO("Msg name: %s <======\n", msg_name);
}
/* Porting from Windows team */
void rtw_btcoex_SendEventExtBtCoexControl(PADAPTER padapter, u8 bNeedDbgRsp, u8 dataLen, void *pData)
{

View File

@ -237,8 +237,6 @@ void sd_f0_reg_dump(void *sel, _adapter *adapter)
if (i % 16 == 0)
RTW_PRINT_SEL(sel, "0x%02x ", i);
_RTW_PRINT_SEL(sel, "%02x ", rtw_sd_f0_read8(adapter, i));
if (i % 16 == 15)
_RTW_PRINT_SEL(sel, "\n");
else if (i % 8 == 7)
@ -5570,11 +5568,6 @@ int proc_get_efuse_map(struct seq_file *m, void *v)
return 0;
}
ssize_t proc_set_efuse_map(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data)
{
return count;
}
#ifdef CONFIG_IEEE80211W
ssize_t proc_set_tx_sa_query(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data)
{

View File

@ -157,23 +157,6 @@ int rtw_writeN(_adapter *adapter, u32 addr , u32 length , u8 *pdata)
}
#ifdef CONFIG_SDIO_HCI
u8 _rtw_sd_f0_read8(_adapter *adapter, u32 addr)
{
u8 r_val = 0x00;
struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf);
u8(*_sd_f0_read8)(struct intf_hdl *pintfhdl, u32 addr);
_sd_f0_read8 = pintfhdl->io_ops._sd_f0_read8;
if (_sd_f0_read8)
r_val = _sd_f0_read8(pintfhdl, addr);
else
RTW_WARN(FUNC_ADPT_FMT" _sd_f0_read8 callback is NULL\n", FUNC_ADPT_ARG(adapter));
return r_val;
}
#ifdef CONFIG_SDIO_INDIRECT_ACCESS
u8 _rtw_sd_iread8(_adapter *adapter, u32 addr)
{
@ -715,13 +698,6 @@ bool match_rf_write_sniff_ranges(_adapter *adapter, u8 path, u32 addr, u32 mask)
}
#ifdef CONFIG_SDIO_HCI
u8 dbg_rtw_sd_f0_read8(_adapter *adapter, u32 addr, const char *caller, const int line)
{
u8 val = _rtw_sd_f0_read8(adapter, addr);
return val;
}
#ifdef CONFIG_SDIO_INDIRECT_ACCESS
u8 dbg_rtw_sd_iread8(_adapter *adapter, u32 addr, const char *caller, const int line)
{

View File

@ -281,17 +281,6 @@ void WapiSMS4CalculateMic(u8 *Key, u8 *IV, u8 *Input1, u8 Input1Length,
*OutputLength = 16;
}
void SecCalculateMicSMS4(
u8 KeyIdx,
u8 *MicKey,
u8 *pHeader,
u8 *pData,
u16 DataLen,
u8 *MicBuffer
)
{
}
/* AddCount: 1 or 2.
* If overflow, return 1,
* else return 0.
@ -393,23 +382,6 @@ void WapiSetLastRxUnicastPNForQoSData(
WAPI_TRACE(WAPI_RX, "<=========== %s\n", __FUNCTION__);
}
/****************************************************************************
FALSE not RX-Reorder
TRUE do RX Reorder
add to support WAPI to N-mode
*****************************************************************************/
u8 WapiCheckPnInSwDecrypt(
_adapter *padapter,
struct sk_buff *pskb
)
{
u8 ret = false;
WAPI_TRACE(WAPI_RX, "%s: return %d\n", __FUNCTION__, ret);
return ret;
}
int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
{
struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib;
@ -491,7 +463,6 @@ void SecSWSMS4Encryption(
}
SecPtr = pframe;
SecCalculateMicSMS4(KeyIdx, pMicKey, SecPtr, (SecPtr + DataOffset), pattrib->pktlen, MicBuffer);
WAPI_DATA(WAPI_TX, "Encryption - MIC", MicBuffer, padapter->wapiInfo.extra_postfix_len);
@ -531,7 +502,7 @@ u8 SecSWSMS4Decryption(
precv_hdr = &((union recv_frame *)precv_frame)->u.hdr;
pskb = (struct sk_buff *)(precv_hdr->rx_data);
precv_hdr->bWapiCheckPNInDecrypt = WapiCheckPnInSwDecrypt(padapter, pskb);
precv_hdr->bWapiCheckPNInDecrypt = false;
WAPI_TRACE(WAPI_RX, "=========>%s: check PN %d\n", __FUNCTION__, precv_hdr->bWapiCheckPNInDecrypt);
WAPI_DATA(WAPI_RX, "Decryption - Before decryption", pskb->data, pskb->len);
@ -654,8 +625,6 @@ u8 SecSWSMS4Decryption(
DataLen -= padapter->wapiInfo.extra_postfix_len;
SecCalculateMicSMS4(KeyIdx, pMicKey, pskb->data, pSecData, DataLen, MicBuffer);
WAPI_DATA(WAPI_RX, "Decryption - MIC received", pRecvMic, SMS4_MIC_LEN);
WAPI_DATA(WAPI_RX, "Decryption - MIC calculated", MicBuffer, SMS4_MIC_LEN);

View File

@ -3295,11 +3295,6 @@ void update_wireless_mode(_adapter *padapter)
update_mgnt_tx_rate(padapter, IEEE80211_OFDM_RATE_6MB);
}
void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value);
void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value)
{
}
void update_sta_basic_rate(struct sta_info *psta, u8 wireless_mode)
{
if (IsSupportedTxCCK(wireless_mode)) {

View File

@ -2473,13 +2473,6 @@ void halbtc8192e1ant_wifi_off_hw_cfg(IN struct btc_coexist* btcoexist)
* ************************************************************
* extern function start with ex_halbtc8192e1ant_
* ************************************************************ */
void ex_halbtc8192e1ant_power_on_setting(IN struct btc_coexist *btcoexist)
{
}
void ex_halbtc8192e1ant_pre_load_firmware(IN struct btc_coexist *btcoexist)
{
}
void ex_halbtc8192e1ant_init_hw_config(IN struct btc_coexist *btcoexist,
IN boolean wifi_only)

View File

@ -185,8 +185,6 @@ struct coex_sta_8192e_1ant {
/* *******************************************
* The following is interface which will notify coex module.
* ******************************************* */
void ex_halbtc8192e1ant_power_on_setting(IN struct btc_coexist *btcoexist);
void ex_halbtc8192e1ant_pre_load_firmware(IN struct btc_coexist *btcoexist);
void ex_halbtc8192e1ant_init_hw_config(IN struct btc_coexist *btcoexist,
IN boolean wifi_only);
void ex_halbtc8192e1ant_init_coex_dm(IN struct btc_coexist *btcoexist);
@ -216,8 +214,6 @@ void ex_halbtc8192e1ant_dbg_control(IN struct btc_coexist *btcoexist,
IN u8 op_code, IN u8 op_len, IN u8 *pdata);
#else /* #if (RTL8192E_SUPPORT == 1) */
#define ex_halbtc8192e1ant_power_on_setting(btcoexist)
#define ex_halbtc8192e1ant_pre_load_firmware(btcoexist)
#define ex_halbtc8192e1ant_init_hw_config(btcoexist, wifi_only)
#define ex_halbtc8192e1ant_init_coex_dm(btcoexist)
#define ex_halbtc8192e1ant_ips_notify(btcoexist, type)

View File

@ -1117,65 +1117,6 @@ EXhalbtcoutsrc_PowerOnSetting(
IN PBTC_COEXIST pBtCoexist
);
VOID
EXhalbtcoutsrc_PreLoadFirmware(
IN PBTC_COEXIST pBtCoexist
);
VOID
EXhalbtcoutsrc_InitHwConfig(
IN PBTC_COEXIST pBtCoexist,
IN BOOLEAN bWifiOnly
);
VOID
EXhalbtcoutsrc_InitCoexDm(
IN PBTC_COEXIST pBtCoexist
);
VOID
EXhalbtcoutsrc_IpsNotify(
IN PBTC_COEXIST pBtCoexist,
IN u1Byte type
);
VOID
EXhalbtcoutsrc_LpsNotify(
IN PBTC_COEXIST pBtCoexist,
IN u1Byte type
);
VOID
EXhalbtcoutsrc_ScanNotify(
IN PBTC_COEXIST pBtCoexist,
IN u1Byte type
);
VOID
EXhalbtcoutsrc_SetAntennaPathNotify(
IN PBTC_COEXIST pBtCoexist,
IN u1Byte type
);
VOID
EXhalbtcoutsrc_ConnectNotify(
IN PBTC_COEXIST pBtCoexist,
IN u1Byte action
);
VOID
EXhalbtcoutsrc_MediaStatusNotify(
IN PBTC_COEXIST pBtCoexist,
IN RT_MEDIA_STATUS mediaStatus
);
VOID
EXhalbtcoutsrc_SpecificPacketNotify(
IN PBTC_COEXIST pBtCoexist,
IN u1Byte pktType
);
VOID
EXhalbtcoutsrc_BtInfoNotify(
IN PBTC_COEXIST pBtCoexist,
IN pu1Byte tmpBuf,
IN u1Byte length
);
VOID
EXhalbtcoutsrc_RfStatusNotify(
IN PBTC_COEXIST pBtCoexist,
IN u1Byte type
);
VOID
EXhalbtcoutsrc_WlFwDbgInfoNotify(
IN PBTC_COEXIST pBtCoexist,
IN pu1Byte tmpBuf,
@ -1188,43 +1129,6 @@ EXhalbtcoutsrc_rx_rate_change_notify(
IN u1Byte btc_rate_id
);
VOID
EXhalbtcoutsrc_StackOperationNotify(
IN PBTC_COEXIST pBtCoexist,
IN u1Byte type
);
VOID
EXhalbtcoutsrc_HaltNotify(
IN PBTC_COEXIST pBtCoexist
);
VOID
EXhalbtcoutsrc_PnpNotify(
IN PBTC_COEXIST pBtCoexist,
IN u1Byte pnpState
);
VOID
EXhalbtcoutsrc_CoexDmSwitch(
IN PBTC_COEXIST pBtCoexist
);
VOID
EXhalbtcoutsrc_Periodical(
IN PBTC_COEXIST pBtCoexist
);
VOID
EXhalbtcoutsrc_DbgControl(
IN PBTC_COEXIST pBtCoexist,
IN u1Byte opCode,
IN u1Byte opLen,
IN pu1Byte pData
);
VOID
EXhalbtcoutsrc_AntennaDetection(
IN PBTC_COEXIST pBtCoexist,
IN u4Byte centFreq,
IN u4Byte offset,
IN u4Byte span,
IN u4Byte seconds
);
VOID
EXhalbtcoutsrc_StackUpdateProfileInfo(
VOID
);
@ -1237,16 +1141,8 @@ EXhalbtcoutsrc_SetBtPatchVersion(
IN u2Byte btHciVersion,
IN u2Byte btPatchVersion
);
VOID
EXhalbtcoutsrc_UpdateMinBtRssi(
IN s1Byte btRssi
);
VOID
EXhalbtcoutsrc_SetChipType(
IN u1Byte chipType
);
VOID
EXhalbtcoutsrc_SetAntNum(
IN u1Byte type,
IN u1Byte antNum
@ -1259,10 +1155,6 @@ VOID
EXhalbtcoutsrc_DisplayBtCoexInfo(
IN PBTC_COEXIST pBtCoexist
);
VOID
EXhalbtcoutsrc_DisplayAntDetection(
IN PBTC_COEXIST pBtCoexist
);
#define MASKBYTE0 0xff
#define MASKBYTE1 0xff00

View File

@ -1558,10 +1558,6 @@ void halbtcoutsrc_DisplayCoexStatistics(PBTC_COEXIST pBtCoexist)
}
}
void halbtcoutsrc_DisplayBtLinkInfo(PBTC_COEXIST pBtCoexist)
{
}
void halbtcoutsrc_DisplayWifiStatus(PBTC_COEXIST pBtCoexist)
{
PADAPTER padapter = pBtCoexist->Adapter;
@ -1739,7 +1735,7 @@ void halbtcoutsrc_DisplayDbgMsg(void *pBtcContext, u8 dispType)
halbtcoutsrc_DisplayCoexStatistics(pBtCoexist);
break;
case BTC_DBG_DISP_BT_LINK_INFO:
halbtcoutsrc_DisplayBtLinkInfo(pBtCoexist);
/* halbtcoutsrc_DisplayBtLinkInfo(pBtCoexist); */
break;
case BTC_DBG_DISP_WIFI_STATUS:
halbtcoutsrc_DisplayWifiStatus(pBtCoexist);
@ -1948,22 +1944,6 @@ u16 halbtcoutsrc_SetBtReg(void *pBtcContext, u8 RegType, u32 RegAddr, u32 Data)
return ret;
}
u8 halbtcoutsrc_SetBtAntDetection(void *pBtcContext, u8 txTime, u8 btChnl)
{
/* Always return _FALSE since we don't implement this yet */
return _FALSE;
}
BOOLEAN
halbtcoutsrc_SetBtTRXMASK(
IN PVOID pBtcContext,
IN u1Byte bt_trx_mask
)
{
/* Always return _FALSE since we don't implement this yet */
return _FALSE;
}
u16 halbtcoutsrc_GetBtReg_with_status(void *pBtcContext, u8 RegType, u32 RegAddr, u32 *data)
{
PBTC_COEXIST pBtCoexist;
@ -2120,12 +2100,6 @@ COL_H2C_STATUS halbtcoutsrc_CoexH2cProcess(void *pBtCoexist,
return ret_status;
}
u8 halbtcoutsrc_GetAntDetValFromBt(void *pBtcContext)
{
/* Always return 0 since we don't implement this yet */
return 0;
}
u8 halbtcoutsrc_GetBleScanTypeFromBt(void *pBtcContext)
{
PBTC_COEXIST pBtCoexist;
@ -2415,12 +2389,12 @@ u8 EXhalbtcoutsrc_InitlizeVariables(void *padapter)
pBtCoexist->btc_set = halbtcoutsrc_Set;
pBtCoexist->btc_get_bt_reg = halbtcoutsrc_GetBtReg;
pBtCoexist->btc_set_bt_reg = halbtcoutsrc_SetBtReg;
pBtCoexist->btc_set_bt_ant_detection = halbtcoutsrc_SetBtAntDetection;
pBtCoexist->btc_set_bt_trx_mask = halbtcoutsrc_SetBtTRXMASK;
pBtCoexist->btc_set_bt_ant_detection = _FALSE;
pBtCoexist->btc_set_bt_trx_mask = _FALSE;
pBtCoexist->btc_coex_h2c_process = halbtcoutsrc_CoexH2cProcess;
pBtCoexist->btc_get_bt_coex_supported_feature = halbtcoutsrc_GetBtCoexSupportedFeature;
pBtCoexist->btc_get_bt_coex_supported_version= halbtcoutsrc_GetBtCoexSupportedVersion;
pBtCoexist->btc_get_ant_det_val_from_bt = halbtcoutsrc_GetAntDetValFromBt;
pBtCoexist->btc_get_ant_det_val_from_bt = 0;
pBtCoexist->btc_get_ble_scan_type_from_bt = halbtcoutsrc_GetBleScanTypeFromBt;
pBtCoexist->btc_get_ble_scan_para_from_bt = halbtcoutsrc_GetBleScanParaFromBt;
pBtCoexist->btc_get_bt_afh_map_from_bt = halbtcoutsrc_GetBtAFHMapFromBt;
@ -2992,10 +2966,6 @@ void EXhalbtcoutsrc_scan_notify(PBTC_COEXIST pBtCoexist, u8 type)
/* halbtcoutsrc_NormalLowPower(pBtCoexist); */
}
void EXhalbtcoutsrc_SetAntennaPathNotify(PBTC_COEXIST pBtCoexist, u8 type)
{
}
void EXhalbtcoutsrc_connect_notify(PBTC_COEXIST pBtCoexist, u8 assoType)
{
if (!halbtcoutsrc_IsBtCoexistAvailable(pBtCoexist))
@ -3447,60 +3417,6 @@ void EXhalbtcoutsrc_rx_rate_change_notify(PBTC_COEXIST pBtCoexist, u8 is_data_fr
#endif
}
VOID
EXhalbtcoutsrc_RfStatusNotify(
IN PBTC_COEXIST pBtCoexist,
IN u1Byte type
)
{
if (!halbtcoutsrc_IsBtCoexistAvailable(pBtCoexist))
return;
pBtCoexist->statistics.cnt_rf_status_notify++;
if (IS_HARDWARE_TYPE_8723B(pBtCoexist->Adapter)) {
#ifdef CONFIG_RTL8723B
if (pBtCoexist->board_info.btdm_ant_num == 1)
ex_halbtc8723b1ant_rf_status_notify(pBtCoexist, type);
#endif
}
#ifdef CONFIG_RTL8703B
else if (IS_HARDWARE_TYPE_8703B(pBtCoexist->Adapter)) {
if (pBtCoexist->board_info.btdm_ant_num == 1)
ex_halbtc8703b1ant_rf_status_notify(pBtCoexist, type);
}
#endif
#ifdef CONFIG_RTL8723D
else if (IS_HARDWARE_TYPE_8723D(pBtCoexist->Adapter)) {
if (pBtCoexist->board_info.btdm_ant_num == 1)
ex_halbtc8723d1ant_rf_status_notify(pBtCoexist, type);
}
#endif
#ifdef CONFIG_RTL8822B
else if (IS_HARDWARE_TYPE_8822B(pBtCoexist->Adapter)) {
if (pBtCoexist->board_info.btdm_ant_num == 1)
ex_halbtc8822b1ant_rf_status_notify(pBtCoexist, type);
else if (pBtCoexist->board_info.btdm_ant_num == 2)
ex_halbtc8822b2ant_rf_status_notify(pBtCoexist, type);
}
#endif
#ifdef CONFIG_RTL8821C
else if (IS_HARDWARE_TYPE_8821C(pBtCoexist->Adapter)) {
if (pBtCoexist->board_info.btdm_ant_num == 2)
ex_halbtc8821c2ant_rf_status_notify(pBtCoexist, type);
else if (pBtCoexist->board_info.btdm_ant_num == 1)
ex_halbtc8821c1ant_rf_status_notify(pBtCoexist, type);
}
#endif
}
void EXhalbtcoutsrc_StackOperationNotify(PBTC_COEXIST pBtCoexist, u8 type)
{
}
void EXhalbtcoutsrc_halt_notify(PBTC_COEXIST pBtCoexist)
{
if (!halbtcoutsrc_IsBtCoexistAvailable(pBtCoexist))
@ -3668,43 +3584,6 @@ void EXhalbtcoutsrc_pnp_notify(PBTC_COEXIST pBtCoexist, u8 pnpState)
#endif
}
void EXhalbtcoutsrc_CoexDmSwitch(PBTC_COEXIST pBtCoexist)
{
if (!halbtcoutsrc_IsBtCoexistAvailable(pBtCoexist))
return;
pBtCoexist->statistics.cnt_coex_dm_switch++;
halbtcoutsrc_LeaveLowPower(pBtCoexist);
if (IS_HARDWARE_TYPE_8723B(pBtCoexist->Adapter)) {
#ifdef CONFIG_RTL8723B
if (pBtCoexist->board_info.btdm_ant_num == 1) {
pBtCoexist->stop_coex_dm = TRUE;
ex_halbtc8723b1ant_coex_dm_reset(pBtCoexist);
EXhalbtcoutsrc_SetAntNum(BT_COEX_ANT_TYPE_DETECTED, 2);
ex_halbtc8723b2ant_init_hw_config(pBtCoexist, FALSE);
ex_halbtc8723b2ant_init_coex_dm(pBtCoexist);
pBtCoexist->stop_coex_dm = FALSE;
}
#endif
}
#ifdef CONFIG_RTL8723D
else if (IS_HARDWARE_TYPE_8723D(pBtCoexist->Adapter)) {
if (pBtCoexist->board_info.btdm_ant_num == 1) {
pBtCoexist->stop_coex_dm = TRUE;
ex_halbtc8723d1ant_coex_dm_reset(pBtCoexist);
EXhalbtcoutsrc_SetAntNum(BT_COEX_ANT_TYPE_DETECTED, 2);
ex_halbtc8723d2ant_init_hw_config(pBtCoexist, FALSE);
ex_halbtc8723d2ant_init_coex_dm(pBtCoexist);
pBtCoexist->stop_coex_dm = FALSE;
}
}
#endif
halbtcoutsrc_NormalLowPower(pBtCoexist);
}
void EXhalbtcoutsrc_periodical(PBTC_COEXIST pBtCoexist)
{
if (!halbtcoutsrc_IsBtCoexistAvailable(pBtCoexist))
@ -3877,16 +3756,6 @@ void EXhalbtcoutsrc_StackUpdateProfileInfo(void)
#endif /* CONFIG_BT_COEXIST_SOCKET_TRX */
}
void EXhalbtcoutsrc_UpdateMinBtRssi(s8 btRssi)
{
PBTC_COEXIST pBtCoexist = &GLBtCoexist;
if (!halbtcoutsrc_IsBtCoexistAvailable(pBtCoexist))
return;
pBtCoexist->stack_info.min_bt_rssi = btRssi;
}
void EXhalbtcoutsrc_SetHciVersion(u16 hciVersion)
{
PBTC_COEXIST pBtCoexist = &GLBtCoexist;
@ -3908,34 +3777,6 @@ void EXhalbtcoutsrc_SetBtPatchVersion(u16 btHciVersion, u16 btPatchVersion)
pBtCoexist->bt_info.bt_hci_ver = btHciVersion;
}
void EXhalbtcoutsrc_SetChipType(u8 chipType)
{
switch (chipType) {
default:
case BT_2WIRE:
case BT_ISSC_3WIRE:
case BT_ACCEL:
case BT_RTL8756:
GLBtCoexist.board_info.bt_chip_type = BTC_CHIP_UNDEF;
break;
case BT_CSR_BC4:
GLBtCoexist.board_info.bt_chip_type = BTC_CHIP_CSR_BC4;
break;
case BT_CSR_BC8:
GLBtCoexist.board_info.bt_chip_type = BTC_CHIP_CSR_BC8;
break;
case BT_RTL8723A:
GLBtCoexist.board_info.bt_chip_type = BTC_CHIP_RTL8723A;
break;
case BT_RTL8821:
GLBtCoexist.board_info.bt_chip_type = BTC_CHIP_RTL8821;
break;
case BT_RTL8723B:
GLBtCoexist.board_info.bt_chip_type = BTC_CHIP_RTL8723B;
break;
}
}
void EXhalbtcoutsrc_SetAntNum(u8 type, u8 antNum)
{
if (BT_COEX_ANT_TYPE_PG == type) {
@ -4043,23 +3884,6 @@ void EXhalbtcoutsrc_DisplayBtCoexInfo(PBTC_COEXIST pBtCoexist)
halbtcoutsrc_NormalLowPower(pBtCoexist);
}
void EXhalbtcoutsrc_DisplayAntDetection(PBTC_COEXIST pBtCoexist)
{
if (!halbtcoutsrc_IsBtCoexistAvailable(pBtCoexist))
return;
halbtcoutsrc_LeaveLowPower(pBtCoexist);
if (IS_HARDWARE_TYPE_8723B(pBtCoexist->Adapter)) {
#ifdef CONFIG_RTL8723B
if (pBtCoexist->board_info.btdm_ant_num == 1)
ex_halbtc8723b1ant_display_ant_detection(pBtCoexist);
#endif
}
halbtcoutsrc_NormalLowPower(pBtCoexist);
}
void ex_halbtcoutsrc_pta_off_on_notify(PBTC_COEXIST pBtCoexist, u8 bBTON)
{
#ifdef CONFIG_RTL8812A

View File

@ -677,11 +677,6 @@ void halrf_iqk_debug(void *dm_void, u32 *const dm_value, u32 *_used,
halrf_do_imr_test(dm, (u8)dm_value[1]);
}
void halrf_iqk_hwtx_check(void *dm_void, boolean is_check)
{
}
void halrf_segment_iqk_trigger(void *dm_void, boolean clear,
boolean segment_iqk)
{

View File

@ -461,7 +461,6 @@ struct _hal_rf_ {
void halrf_iqk_info_dump(void *dm_void, u32 *_used, char *output,
u32 *_out_len);
void halrf_iqk_hwtx_check(void *dm_void, boolean is_check);
#endif
u8 halrf_match_iqk_version(void *dm_void);

View File

@ -473,11 +473,6 @@ void phydm_c2h_ra_report_handler(void *dm_void, u8 *cmd_buf, u8 cmd_len)
}
void odm_ra_post_action_on_assoc(void *dm_void)
{
}
void phydm_modify_RA_PCR_threshold(void *dm_void, u8 ra_ofst_direc,
u8 ra_th_ofst)
{
@ -662,14 +657,6 @@ void phydm_rate_adaptive_mask_init(void *dm_void)
ra_t->up_ramask_cnt_tmp = 0;
}
void phydm_refresh_rate_adaptive_mask(void *dm_void)
{
/*@Will be removed*/
struct dm_struct *dm = (struct dm_struct *)dm_void;
phydm_ra_mask_watchdog(dm);
}
void phydm_show_sta_info(void *dm_void, char input[][16], u32 *_used,
char *output, u32 *_out_len)
{
@ -1689,120 +1676,6 @@ void phydm_ra_info_init(void *dm_void)
phydm_rate_adaptive_mask_init(dm);
}
u8 odm_find_rts_rate(void *dm_void, u8 tx_rate, boolean is_erp_protect)
{
struct dm_struct *dm = (struct dm_struct *)dm_void;
u8 rts_ini_rate = ODM_RATE6M;
if (is_erp_protect) { /* use CCK rate as RTS*/
rts_ini_rate = ODM_RATE1M;
} else {
switch (tx_rate) {
case ODM_RATEVHTSS4MCS9:
case ODM_RATEVHTSS4MCS8:
case ODM_RATEVHTSS4MCS7:
case ODM_RATEVHTSS4MCS6:
case ODM_RATEVHTSS4MCS5:
case ODM_RATEVHTSS4MCS4:
case ODM_RATEVHTSS4MCS3:
case ODM_RATEVHTSS3MCS9:
case ODM_RATEVHTSS3MCS8:
case ODM_RATEVHTSS3MCS7:
case ODM_RATEVHTSS3MCS6:
case ODM_RATEVHTSS3MCS5:
case ODM_RATEVHTSS3MCS4:
case ODM_RATEVHTSS3MCS3:
case ODM_RATEVHTSS2MCS9:
case ODM_RATEVHTSS2MCS8:
case ODM_RATEVHTSS2MCS7:
case ODM_RATEVHTSS2MCS6:
case ODM_RATEVHTSS2MCS5:
case ODM_RATEVHTSS2MCS4:
case ODM_RATEVHTSS2MCS3:
case ODM_RATEVHTSS1MCS9:
case ODM_RATEVHTSS1MCS8:
case ODM_RATEVHTSS1MCS7:
case ODM_RATEVHTSS1MCS6:
case ODM_RATEVHTSS1MCS5:
case ODM_RATEVHTSS1MCS4:
case ODM_RATEVHTSS1MCS3:
case ODM_RATEMCS31:
case ODM_RATEMCS30:
case ODM_RATEMCS29:
case ODM_RATEMCS28:
case ODM_RATEMCS27:
case ODM_RATEMCS23:
case ODM_RATEMCS22:
case ODM_RATEMCS21:
case ODM_RATEMCS20:
case ODM_RATEMCS19:
case ODM_RATEMCS15:
case ODM_RATEMCS14:
case ODM_RATEMCS13:
case ODM_RATEMCS12:
case ODM_RATEMCS11:
case ODM_RATEMCS7:
case ODM_RATEMCS6:
case ODM_RATEMCS5:
case ODM_RATEMCS4:
case ODM_RATEMCS3:
case ODM_RATE54M:
case ODM_RATE48M:
case ODM_RATE36M:
case ODM_RATE24M:
rts_ini_rate = ODM_RATE24M;
break;
case ODM_RATEVHTSS4MCS2:
case ODM_RATEVHTSS4MCS1:
case ODM_RATEVHTSS3MCS2:
case ODM_RATEVHTSS3MCS1:
case ODM_RATEVHTSS2MCS2:
case ODM_RATEVHTSS2MCS1:
case ODM_RATEVHTSS1MCS2:
case ODM_RATEVHTSS1MCS1:
case ODM_RATEMCS26:
case ODM_RATEMCS25:
case ODM_RATEMCS18:
case ODM_RATEMCS17:
case ODM_RATEMCS10:
case ODM_RATEMCS9:
case ODM_RATEMCS2:
case ODM_RATEMCS1:
case ODM_RATE18M:
case ODM_RATE12M:
rts_ini_rate = ODM_RATE12M;
break;
case ODM_RATEVHTSS4MCS0:
case ODM_RATEVHTSS3MCS0:
case ODM_RATEVHTSS2MCS0:
case ODM_RATEVHTSS1MCS0:
case ODM_RATEMCS24:
case ODM_RATEMCS16:
case ODM_RATEMCS8:
case ODM_RATEMCS0:
case ODM_RATE9M:
case ODM_RATE6M:
rts_ini_rate = ODM_RATE6M;
break;
case ODM_RATE11M:
case ODM_RATE5_5M:
case ODM_RATE2M:
case ODM_RATE1M:
rts_ini_rate = ODM_RATE1M;
break;
default:
rts_ini_rate = ODM_RATE6M;
break;
}
}
if (*dm->band_type == ODM_BAND_5G) {
if (rts_ini_rate < ODM_RATE6M)
rts_ini_rate = ODM_RATE6M;
}
return rts_ini_rate;
}
#if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
void odm_refresh_basic_rate_mask(

View File

@ -242,14 +242,8 @@ void phydm_update_hal_ra_mask(
u8 phydm_get_plcp(void *dm_void, u16 macid);
#endif
void phydm_refresh_rate_adaptive_mask(void *dm_void);
u8 phydm_rssi_lv_dec(void *dm_void, u32 rssi, u8 ratr_state);
void odm_ra_post_action_on_assoc(void *dm);
u8 odm_find_rts_rate(void *dm_void, u8 tx_rate, boolean is_erp_protect);
void phydm_show_sta_info(void *dm_void, char input[][16], u32 *_used,
char *output, u32 *_out_len);

View File

@ -250,7 +250,7 @@ void hal_com_txbf_fw_ndpa_work_item_callback(
else if (dm->support_ic_type & ODM_RTL8814A)
hal_txbf_8814a_fw_txbf(dm, idx);
else if (dm->support_ic_type & ODM_RTL8822B)
hal_txbf_8822b_fw_txbf(dm, idx);
/*hal_txbf_8822b_fw_txbf(dm, idx);*/
}
void hal_com_txbf_clk_work_item_callback(

View File

@ -85,12 +85,6 @@ u8 hal_txbf_8822b_get_nrx(
}
/***************SU & MU BFee Entry********************/
void hal_txbf_8822b_rf_mode(
void *dm_void,
struct _RT_BEAMFORMING_INFO *beamforming_info,
u8 idx)
{
}
void hal_txbf_8822b_enter(
void *dm_void,
@ -165,7 +159,6 @@ void hal_txbf_8822b_enter(
if (beamforming_info->beamformee_su_cnt > 0 && bfee_idx < BEAMFORMEE_ENTRY_NUM) {
p_beamformee_entry = &beamforming_info->beamformee_entry[bfee_idx];
p_beamformee_entry->is_mu_sta = false;
hal_txbf_8822b_rf_mode(dm, beamforming_info, bfee_idx);
if (phydm_acting_determine(dm, phydm_acting_as_ibss))
sta_id = p_beamformee_entry->mac_id;
@ -368,7 +361,6 @@ void hal_txbf_8822b_enter(
odm_write_1byte(dm, REG_RXFLTMAP0_8822B + 1, u1b_tmp);
/* @End of MAC registers setting */
hal_txbf_8822b_rf_mode(dm, beamforming_info, bfee_idx);
#if (SUPPORT_MU_BF == 1)
/*Special for plugfest*/
mdelay(50); /* wait for 4-way handshake ending*/
@ -441,7 +433,6 @@ void hal_txbf_8822b_leave(
}
if (p_beamformee_entry->beamform_entry_cap == BEAMFORMING_CAP_NONE) {
hal_txbf_8822b_rf_mode(dm, beamforming_info, idx);
if (p_beamformee_entry->is_mu_sta == 0) { /*SU BFee*/
if (p_beamformee_entry->su_reg_index == 0) {
odm_write_2byte(dm, REG_TXBF_CTRL_8822B, 0x0);
@ -691,12 +682,6 @@ void hal_txbf_8822b_config_gtab(
odm_write_4byte(dm, 0x14c0, beamforming_info->reg_mu_tx_ctrl);
}
void hal_txbf_8822b_fw_txbf(
void *dm_void,
u8 idx)
{
}
#endif
#if (defined(CONFIG_BB_TXBF_API))

View File

@ -43,14 +43,10 @@ void hal_txbf_8822b_status(
void hal_txbf_8822b_config_gtab(
void *dm_void);
void hal_txbf_8822b_fw_txbf(
void *dm_void,
u8 idx);
#else
#define hal_txbf_8822b_enter(dm_void, idx)
#define hal_txbf_8822b_leave(dm_void, idx)
#define hal_txbf_8822b_status(dm_void, idx)
#define hal_txbf_8822b_fw_txbf(dm_void, idx)
#define hal_txbf_8822b_config_gtab(dm_void)
#endif
@ -71,7 +67,6 @@ void phydm_8822b_sutxbfer_workaroud(void *dm_void, boolean enable_su_bfer,
#define hal_txbf_8822b_enter(dm_void, idx)
#define hal_txbf_8822b_leave(dm_void, idx)
#define hal_txbf_8822b_status(dm_void, idx)
#define hal_txbf_8822b_fw_txbf(dm_void, idx)
#define hal_txbf_8822b_config_gtab(dm_void)
#endif

View File

@ -4327,7 +4327,7 @@ void rtl8192e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->set_chnl_bw_handler = &PHY_SetSwChnlBWMode8192E;
pHalFunc->set_tx_power_level_handler = &PHY_SetTxPowerLevel8192E;
pHalFunc->get_tx_power_level_handler = &PHY_GetTxPowerLevel8192E;
/*pHalFunc->get_tx_power_level_handler = &PHY_GetTxPowerLevel8192E;*/
pHalFunc->set_tx_power_index_handler = PHY_SetTxPowerIndex_8192E;
pHalFunc->get_tx_power_index_handler = PHY_GetTxPowerIndex_8192E;

View File

@ -454,14 +454,6 @@ PHY_RFConfig8192E(
return rtStatus;
}
VOID
PHY_GetTxPowerLevel8192E(
IN PADAPTER Adapter,
OUT s32 *powerlevel
)
{
}
VOID
PHY_SetTxPowerIndex_8192E(
IN PADAPTER Adapter,

View File

@ -906,9 +906,4 @@ static void rtl8192eu_hostap_mgnt_xmit_cb(struct urb *urb)
rtw_skb_free(skb);
}
s32 rtl8192eu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt)
{
return 0;
}
#endif

View File

@ -162,11 +162,6 @@ void rtl8192eu_interface_configure(_adapter *padapter)
}
static VOID
_InitBurstPktLen_8192EU(IN PADAPTER Adapter)
{
}
static u32 _InitPowerOn_8192EU(_adapter *padapter)
{
u16 value16;
@ -755,8 +750,6 @@ u32 rtl8192eu_hal_init(PADAPTER Adapter)
_InitBeaconParameters_8192E(Adapter);
_InitBeaconMaxError_8192E(Adapter, _TRUE);
_InitBurstPktLen_8192EU(Adapter); /* added by page. 20110919 */
/* */
/* Init CR MACTXEN, MACRXEN after setting RxFF boundary REG_TRXFF_BNDY to patch */
/* Hw bug which Hw initials RxFF boundry size to a value which is larger than the real Rx buffer size in 88E. */
@ -1200,14 +1193,6 @@ hal_CustomizedBehavior_8192EU(
#endif
}
static void
hal_CustomizeByCustomerID_8192EU(
IN PADAPTER padapter
)
{
}
static VOID
ReadLEDSetting_8192EU(
IN PADAPTER Adapter,
@ -1264,7 +1249,6 @@ InitAdapterVariablesByPROM_8192EU(
Hal_ReadPAType_8192E(Adapter, pHalData->efuse_eeprom_data, pHalData->bautoload_fail_flag);
Hal_ReadAmplifierType_8192E(Adapter, pHalData->efuse_eeprom_data, pHalData->bautoload_fail_flag);
Hal_ReadRFEType_8192E(Adapter, pHalData->efuse_eeprom_data, pHalData->bautoload_fail_flag);
hal_CustomizeByCustomerID_8192EU(Adapter);
ReadLEDSetting_8192EU(Adapter, pHalData->efuse_eeprom_data, pHalData->bautoload_fail_flag);
@ -1552,7 +1536,7 @@ void rtl8192eu_set_hal_ops(_adapter *padapter)
#ifdef CONFIG_HOSTAPD_MLME
pHalFunc->hostap_mgnt_xmit_entry = &rtl8192eu_hostap_mgnt_xmit_entry;
pHalFunc->hostap_mgnt_xmit_entry = 0;
#endif
pHalFunc->interface_ps_func = &rtl8192eu_ps_func;
#ifdef CONFIG_XMIT_THREAD_MODE

View File

@ -82,7 +82,6 @@ int PHY_RFConfig8192E(IN PADAPTER Adapter);
/*
* BB TX Power R/W
* */
void PHY_GetTxPowerLevel8192E(IN PADAPTER Adapter, OUT s32 *powerlevel);
void PHY_SetTxPowerLevel8192E(IN PADAPTER Adapter, IN u8 channel);
BOOLEAN PHY_UpdateTxPowerDbm8192E(IN PADAPTER Adapter, IN int powerInDbm);

View File

@ -417,11 +417,9 @@ void rtw_btcoex_SetHciVersion(PADAPTER padapter, u16 hciVersion);
void rtw_btcoex_StackUpdateProfileInfo(void);
void rtw_btcoex_init_socket(_adapter *padapter);
void rtw_btcoex_close_socket(_adapter *padapter);
void rtw_btcoex_dump_tx_msg(u8 *tx_msg, u8 len, u8 *msg_name);
u8 rtw_btcoex_sendmsgbysocket(_adapter *padapter, u8 *msg, u8 msg_size, bool force);
u8 rtw_btcoex_create_kernel_socket(_adapter *padapter);
void rtw_btcoex_close_kernel_socket(_adapter *padapter);
void rtw_btcoex_recvmsgbysocket(void *data);
u16 rtw_btcoex_parse_recv_data(u8 *msg, u8 msg_size);
u8 rtw_btcoex_btinfo_cmd(PADAPTER padapter, u8 *pbuf, u16 length);
void rtw_btcoex_parse_hci_cmd(_adapter *padapter, u8 *cmd, u16 len);

View File

@ -501,7 +501,6 @@ int proc_get_tx_auth(struct seq_file *m, void *v);
#endif /* CONFIG_PROC_DEBUG */
int proc_get_efuse_map(struct seq_file *m, void *v);
ssize_t proc_set_efuse_map(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data);
#ifdef CONFIG_CUSTOMER01_SMART_ANTENNA
int proc_get_pathb_phase(struct seq_file *m, void *v);

View File

@ -330,7 +330,6 @@ extern int rtw_write32(_adapter *adapter, u32 addr, u32 val);
extern int rtw_writeN(_adapter *adapter, u32 addr, u32 length, u8 *pdata);
#ifdef CONFIG_SDIO_HCI
u8 _rtw_sd_f0_read8(_adapter *adapter, u32 addr);
#ifdef CONFIG_SDIO_INDIRECT_ACCESS
u8 _rtw_sd_iread8(_adapter *adapter, u32 addr);
u16 _rtw_sd_iread16(_adapter *adapter, u32 addr);
@ -359,7 +358,6 @@ bool match_rf_read_sniff_ranges(_adapter *adapter, u8 path, u32 addr, u32 mask);
bool match_rf_write_sniff_ranges(_adapter *adapter, u8 path, u32 addr, u32 mask);
#ifdef CONFIG_SDIO_HCI
u8 dbg_rtw_sd_f0_read8(_adapter *adapter, u32 addr, const char *caller, const int line);
#ifdef CONFIG_SDIO_INDIRECT_ACCESS
u8 dbg_rtw_sd_iread8(_adapter *adapter, u32 addr, const char *caller, const int line);
u16 dbg_rtw_sd_iread16(_adapter *adapter, u32 addr, const char *caller, const int line);
@ -384,7 +382,6 @@ int dbg_rtw_sd_iwrite32(_adapter *adapter, u32 addr, u32 val, const char *caller
#define rtw_write_port_cancel(adapter) _rtw_write_port_cancel(adapter)
#ifdef CONFIG_SDIO_HCI
#define rtw_sd_f0_read8(adapter, addr) dbg_rtw_sd_f0_read8((adapter), (addr), __func__, __LINE__)
#ifdef CONFIG_SDIO_INDIRECT_ACCESS
#define rtw_sd_iread8(adapter, addr) dbg_rtw_sd_iread8((adapter), (addr), __func__, __LINE__)
#define rtw_sd_iread16(adapter, addr) dbg_rtw_sd_iread16((adapter), (addr), __func__, __LINE__)
@ -411,7 +408,6 @@ int dbg_rtw_sd_iwrite32(_adapter *adapter, u32 addr, u32 val, const char *caller
#define rtw_write_port_cancel(adapter) _rtw_write_port_cancel((adapter))
#ifdef CONFIG_SDIO_HCI
#define rtw_sd_f0_read8(adapter, addr) _rtw_sd_f0_read8((adapter), (addr))
#ifdef CONFIG_SDIO_INDIRECT_ACCESS
#define rtw_sd_iread8(adapter, addr) _rtw_sd_iread8((adapter), (addr))
#define rtw_sd_iread16(adapter, addr) _rtw_sd_iread16((adapter), (addr))

View File

@ -3043,15 +3043,6 @@ exit:
return ret;
}
static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, u32 changed)
{
RTW_INFO("%s\n", __func__);
return 0;
}
static int rtw_cfg80211_set_wpa_version(struct security_priv *psecuritypriv, u32 wpa_version)
{
RTW_INFO("%s, wpa_version=%d\n", __func__, wpa_version);
@ -9488,7 +9479,7 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
#endif /*CONFIG_GTK_OL*/
.get_station = cfg80211_rtw_get_station,
.scan = cfg80211_rtw_scan,
.set_wiphy_params = cfg80211_rtw_set_wiphy_params,
.set_wiphy_params = 0,
.connect = cfg80211_rtw_connect,
.disconnect = cfg80211_rtw_disconnect,
.join_ibss = cfg80211_rtw_join_ibss,