skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-02-08 07:42:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove all trailing spaces from code

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-19 00:59:46 -06:00
parent 8db176767f
commit bb33327257
190 changed files with 53569 additions and 53764 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -654,4 +654,3 @@ clean: $(clean_more)
cd hal ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko cd hal ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko
cd os_dep ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko cd os_dep ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko
endif endif

13
core/rtw_ap.c
View file

@ -28,7 +28,7 @@
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
extern unsigned char RTW_WPA_OUI[]; extern unsigned char RTW_WPA_OUI[];
extern unsigned char WMM_OUI[]; extern unsigned char WMM_OUI[];
extern unsigned char WPS_OUI[]; extern unsigned char WPS_OUI[];
extern unsigned char P2P_OUI[]; extern unsigned char P2P_OUI[];
extern unsigned char WFD_OUI[]; extern unsigned char WFD_OUI[];
@ -2067,7 +2067,7 @@ static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8*oui)
else else
{ {
DBG_871X("unknown OUI type!\n"); DBG_871X("unknown OUI type!\n");
} }
} }
@ -2308,7 +2308,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
pmlmepriv->num_sta_no_short_preamble++; pmlmepriv->num_sta_no_short_preamble++;
if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
(pmlmepriv->num_sta_no_short_preamble == 1)) (pmlmepriv->num_sta_no_short_preamble == 1))
{ {
beacon_updated = _TRUE; beacon_updated = _TRUE;
update_beacon(padapter, 0xFF, NULL, _TRUE); update_beacon(padapter, 0xFF, NULL, _TRUE);
@ -2325,7 +2325,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
pmlmepriv->num_sta_no_short_preamble--; pmlmepriv->num_sta_no_short_preamble--;
if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
(pmlmepriv->num_sta_no_short_preamble == 0)) (pmlmepriv->num_sta_no_short_preamble == 0))
{ {
beacon_updated = _TRUE; beacon_updated = _TRUE;
update_beacon(padapter, 0xFF, NULL, _TRUE); update_beacon(padapter, 0xFF, NULL, _TRUE);
@ -2397,7 +2397,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
pmlmepriv->num_sta_no_short_slot_time++; pmlmepriv->num_sta_no_short_slot_time++;
if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
(pmlmepriv->num_sta_no_short_slot_time == 1)) (pmlmepriv->num_sta_no_short_slot_time == 1))
{ {
beacon_updated = _TRUE; beacon_updated = _TRUE;
update_beacon(padapter, 0xFF, NULL, _TRUE); update_beacon(padapter, 0xFF, NULL, _TRUE);
@ -2414,7 +2414,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
pmlmepriv->num_sta_no_short_slot_time--; pmlmepriv->num_sta_no_short_slot_time--;
if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
(pmlmepriv->num_sta_no_short_slot_time == 0)) (pmlmepriv->num_sta_no_short_slot_time == 0))
{ {
beacon_updated = _TRUE; beacon_updated = _TRUE;
update_beacon(padapter, 0xFF, NULL, _TRUE); update_beacon(padapter, 0xFF, NULL, _TRUE);
@ -2957,4 +2957,3 @@ void stop_ap_mode(struct adapter *padapter)
#endif //CONFIG_NATIVEAP_MLME #endif //CONFIG_NATIVEAP_MLME
#endif //CONFIG_AP_MODE #endif //CONFIG_AP_MODE

3
core/rtw_br_ext.c
View file

@ -1405,7 +1405,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
} }
/*---------------------------------------------------*/ /*---------------------------------------------------*/
/* Handle IPV6 frame */ /* Handle IPV6 frame */
/*---------------------------------------------------*/ /*---------------------------------------------------*/
#ifdef CL_IPV6_PASS #ifdef CL_IPV6_PASS
else if(protocol == __constant_htons(ETH_P_IPV6)) else if(protocol == __constant_htons(ETH_P_IPV6))
@ -1664,4 +1664,3 @@ void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr,
} }
#endif // CONFIG_BR_EXT #endif // CONFIG_BR_EXT

55
core/rtw_cmd.c
View file

@ -681,7 +681,7 @@ u8 rtw_setstandby_cmd(struct adapter *padapter, uint action)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct usb_suspend_parm* psetusbsuspend; struct usb_suspend_parm* psetusbsuspend;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
@ -724,7 +724,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssi
u8 res = _FAIL; u8 res = _FAIL;
struct cmd_obj *ph2c; struct cmd_obj *ph2c;
struct sitesurvey_parm *psurveyPara; struct sitesurvey_parm *psurveyPara;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
@ -902,7 +902,7 @@ u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct setphy_parm* psetphypara; struct setphy_parm* psetphypara;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
// struct mlme_priv *pmlmepriv = &padapter->mlmepriv; // struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
// struct registry_priv* pregistry_priv = &padapter->registrypriv; // struct registry_priv* pregistry_priv = &padapter->registrypriv;
u8 res=_SUCCESS; u8 res=_SUCCESS;
@ -939,7 +939,7 @@ u8 rtw_setbbreg_cmd(struct adapter*padapter, u8 offset, u8 val)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct writeBB_parm* pwritebbparm; struct writeBB_parm* pwritebbparm;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
u8 res=_SUCCESS; u8 res=_SUCCESS;
_func_enter_; _func_enter_;
ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
@ -970,7 +970,7 @@ u8 rtw_getbbreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct readBB_parm* prdbbparm; struct readBB_parm* prdbbparm;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
u8 res=_SUCCESS; u8 res=_SUCCESS;
_func_enter_; _func_enter_;
@ -1005,7 +1005,7 @@ u8 rtw_setrfreg_cmd(struct adapter *padapter, u8 offset, u32 val)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct writeRF_parm* pwriterfparm; struct writeRF_parm* pwriterfparm;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
u8 res=_SUCCESS; u8 res=_SUCCESS;
_func_enter_; _func_enter_;
ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
@ -1036,7 +1036,7 @@ u8 rtw_getrfreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct readRF_parm* prdrfparm; struct readRF_parm* prdrfparm;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
u8 res=_SUCCESS; u8 res=_SUCCESS;
_func_enter_; _func_enter_;
@ -1096,7 +1096,7 @@ _func_exit_;
u8 rtw_createbss_cmd(struct adapter *padapter) u8 rtw_createbss_cmd(struct adapter *padapter)
{ {
struct cmd_obj* pcmd; struct cmd_obj* pcmd;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
WLAN_BSSID_EX *pdev_network = &padapter->registrypriv.dev_network; WLAN_BSSID_EX *pdev_network = &padapter->registrypriv.dev_network;
u8 res=_SUCCESS; u8 res=_SUCCESS;
@ -1138,7 +1138,7 @@ _func_exit_;
u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned int sz) u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned int sz)
{ {
struct cmd_obj* pcmd; struct cmd_obj* pcmd;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
u8 res=_SUCCESS; u8 res=_SUCCESS;
_func_enter_; _func_enter_;
@ -1435,12 +1435,12 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool en
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct set_stakey_parm *psetstakey_para; struct set_stakey_parm *psetstakey_para;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
struct set_stakey_rsp *psetstakey_rsp = NULL; struct set_stakey_rsp *psetstakey_rsp = NULL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
struct sta_info* sta = (struct sta_info* )psta; struct sta_info* sta = (struct sta_info* )psta;
u8 res=_SUCCESS; u8 res=_SUCCESS;
_func_enter_; _func_enter_;
@ -1516,11 +1516,11 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct set_stakey_parm *psetstakey_para; struct set_stakey_parm *psetstakey_para;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
struct set_stakey_rsp *psetstakey_rsp = NULL; struct set_stakey_rsp *psetstakey_rsp = NULL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
struct sta_info* sta = (struct sta_info* )psta; struct sta_info* sta = (struct sta_info* )psta;
u8 res=_SUCCESS; u8 res=_SUCCESS;
_func_enter_; _func_enter_;
@ -1577,7 +1577,7 @@ u8 rtw_setrttbl_cmd(struct adapter *padapter, struct setratable_parm *prate_tab
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct setratable_parm * psetrttblparm; struct setratable_parm * psetrttblparm;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
u8 res=_SUCCESS; u8 res=_SUCCESS;
_func_enter_; _func_enter_;
@ -1609,7 +1609,7 @@ u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct getratable_parm * pgetrttblparm; struct getratable_parm * pgetrttblparm;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
u8 res=_SUCCESS; u8 res=_SUCCESS;
_func_enter_; _func_enter_;
@ -1646,7 +1646,7 @@ _func_exit_;
u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr) u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr)
{ {
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct set_assocsta_parm *psetassocsta_para; struct set_assocsta_parm *psetassocsta_para;
struct set_stakey_rsp *psetassocsta_rsp = NULL; struct set_stakey_rsp *psetassocsta_rsp = NULL;
@ -2010,7 +2010,7 @@ u8 rtw_set_csa_cmd(struct adapter*padapter, u8 new_ch_no)
{ {
struct cmd_obj* pcmdobj; struct cmd_obj* pcmdobj;
struct SetChannelSwitch_param*setChannelSwitch_param; struct SetChannelSwitch_param*setChannelSwitch_param;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res=_SUCCESS; u8 res=_SUCCESS;
@ -2048,7 +2048,7 @@ u8 rtw_tdls_cmd(struct adapter *padapter, u8 *addr, u8 option)
{ {
struct cmd_obj* pcmdobj; struct cmd_obj* pcmdobj;
struct TDLSoption_param *TDLSoption; struct TDLSoption_param *TDLSoption;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res=_SUCCESS; u8 res=_SUCCESS;
@ -2512,7 +2512,7 @@ u8 rtw_antenna_select_cmd(struct adapter*padapter, u8 antenna,u8 enqueue)
struct cmd_obj *ph2c; struct cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 bSupportAntDiv = _FALSE; u8 bSupportAntDiv = _FALSE;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_; _func_enter_;
@ -2969,7 +2969,7 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf)
void rtw_survey_cmd_callback(struct adapter* padapter , struct cmd_obj *pcmd) void rtw_survey_cmd_callback(struct adapter* padapter , struct cmd_obj *pcmd)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_; _func_enter_;
@ -2992,7 +2992,7 @@ _func_exit_;
void rtw_disassoc_cmd_callback(struct adapter* padapter, struct cmd_obj *pcmd) void rtw_disassoc_cmd_callback(struct adapter* padapter, struct cmd_obj *pcmd)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_; _func_enter_;
@ -3022,7 +3022,7 @@ _func_exit_;
void rtw_joinbss_cmd_callback(struct adapter* padapter, struct cmd_obj *pcmd) void rtw_joinbss_cmd_callback(struct adapter* padapter, struct cmd_obj *pcmd)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_; _func_enter_;
@ -3049,7 +3049,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
u8 timer_cancelled; u8 timer_cancelled;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct wlan_network *pwlan = NULL; struct wlan_network *pwlan = NULL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)pcmd->parmbuf; WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)pcmd->parmbuf;
struct wlan_network *tgt_network = &(pmlmepriv->cur_network); struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
@ -3066,7 +3066,7 @@ _func_enter_;
#ifdef CONFIG_FW_MLMLE #ifdef CONFIG_FW_MLMLE
//endian_convert //endian_convert
pnetwork->Length = le32_to_cpu(pnetwork->Length); pnetwork->Length = le32_to_cpu(pnetwork->Length);
pnetwork->Ssid.SsidLength = le32_to_cpu(pnetwork->Ssid.SsidLength); pnetwork->Ssid.SsidLength = le32_to_cpu(pnetwork->Ssid.SsidLength);
pnetwork->Privacy =le32_to_cpu(pnetwork->Privacy); pnetwork->Privacy =le32_to_cpu(pnetwork->Privacy);
pnetwork->Rssi = le32_to_cpu(pnetwork->Rssi); pnetwork->Rssi = le32_to_cpu(pnetwork->Rssi);
pnetwork->NetworkTypeInUse =le32_to_cpu(pnetwork->NetworkTypeInUse); pnetwork->NetworkTypeInUse =le32_to_cpu(pnetwork->NetworkTypeInUse);
@ -3128,7 +3128,7 @@ _func_enter_;
//rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); //rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);
// copy pdev_network information to pmlmepriv->cur_network // copy pdev_network information to pmlmepriv->cur_network
_rtw_memcpy(&tgt_network->network, pnetwork, (get_WLAN_BSSID_EX_sz(pnetwork))); _rtw_memcpy(&tgt_network->network, pnetwork, (get_WLAN_BSSID_EX_sz(pnetwork)));
// reset DSConfig // reset DSConfig
@ -3236,4 +3236,3 @@ _func_enter_;
_func_exit_; _func_exit_;
} }

7
core/rtw_debug.c
View file

@ -496,7 +496,7 @@ int proc_get_bb_reg_dump1(char *page, char **start,
len += snprintf(page + len, count - len, "\n======= BB REG =======\n"); len += snprintf(page + len, count - len, "\n======= BB REG =======\n");
for(i=0x800;i<0xB00;i+=4) for(i=0x800;i<0xB00;i+=4)
{ {
if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i); if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i)); len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n"); if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
} }
@ -516,7 +516,7 @@ int proc_get_bb_reg_dump2(char *page, char **start,
len += snprintf(page + len, count - len, "\n======= BB REG =======\n"); len += snprintf(page + len, count - len, "\n======= BB REG =======\n");
for(i=0xB00;i<0xE00;i+=4) for(i=0xB00;i<0xE00;i+=4)
{ {
if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i); if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i)); len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n"); if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
} }
@ -536,7 +536,7 @@ int proc_get_bb_reg_dump3(char *page, char **start,
len += snprintf(page + len, count - len, "\n======= BB REG =======\n"); len += snprintf(page + len, count - len, "\n======= BB REG =======\n");
for(i=0xE00;i<0x1000;i+=4) for(i=0xE00;i<0x1000;i+=4)
{ {
if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i); if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i)); len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n"); if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
} }
@ -1367,4 +1367,3 @@ int proc_set_odm_adaptivity(struct file *file, const char *buffer, unsigned long
} }
#endif #endif

3
core/rtw_eeprom.c
View file

@ -135,7 +135,7 @@ _func_exit_;
u16 wait_eeprom_cmd_done(_adapter* padapter) u16 wait_eeprom_cmd_done(_adapter* padapter)
{ {
u8 x; u8 x;
u16 i,res=_FALSE; u16 i,res=_FALSE;
_func_enter_; _func_enter_;
standby(padapter ); standby(padapter );
@ -374,4 +374,3 @@ _func_enter_;
_func_exit_; _func_exit_;
} }

52
core/rtw_efuse.c
View file

@ -77,12 +77,12 @@ BOOLEAN
Efuse_Write1ByteToFakeContent( Efuse_Write1ByteToFakeContent(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN u8 Value ); IN u8 Value );
BOOLEAN BOOLEAN
Efuse_Write1ByteToFakeContent( Efuse_Write1ByteToFakeContent(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN u8 Value ) IN u8 Value )
{ {
if(Offset >= EFUSE_MAX_HW_SIZE) if(Offset >= EFUSE_MAX_HW_SIZE)
{ {
@ -112,7 +112,7 @@ Efuse_Write1ByteToFakeContent(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/17/2008 MHC Create Version 0. * 11/17/2008 MHC Create Version 0.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
VOID VOID
@ -137,7 +137,7 @@ Efuse_PowerSwitch(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/16/2008 MHC Create Version 0. * 11/16/2008 MHC Create Version 0.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
u16 u16
@ -179,8 +179,8 @@ Efuse_CalculateWordCnts(IN u8 word_en)
VOID VOID
ReadEFuseByte( ReadEFuseByte(
struct adapter *Adapter, struct adapter *Adapter,
u16 _offset, u16 _offset,
u8 *pbuf, u8 *pbuf,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
{ {
u32 value32; u32 value32;
@ -238,7 +238,7 @@ ReadEFuseByte(
// //
// Created by Roger, 2008.10.21. // Created by Roger, 2008.10.21.
// //
// 2008/12/12 MH 1. Reorganize code flow and reserve bytes. and add description. // 2008/12/12 MH 1. Reorganize code flow and reserve bytes. and add description.
// 2. Add efuse utilization collect. // 2. Add efuse utilization collect.
// 2008/12/22 MH Read Efuse must check if we write section 1 data again!!! Sec1 // 2008/12/22 MH Read Efuse must check if we write section 1 data again!!! Sec1
// write addr must be after sec5. // write addr must be after sec5.
@ -249,8 +249,8 @@ efuse_ReadEFuse(
struct adapter *Adapter, struct adapter *Adapter,
u8 efuseType, u8 efuseType,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
u8 *pbuf, u8 *pbuf,
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
); );
VOID VOID
@ -258,8 +258,8 @@ efuse_ReadEFuse(
struct adapter *Adapter, struct adapter *Adapter,
u8 efuseType, u8 efuseType,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
u8 *pbuf, u8 *pbuf,
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
{ {
@ -291,7 +291,7 @@ EFUSE_GetEfuseDefinition(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 09/23/2008 MHC Copy from WMAC. * 09/23/2008 MHC Copy from WMAC.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
u8 u8
@ -355,7 +355,7 @@ EFUSE_Read1Byte(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 09/23/2008 MHC Copy from WMAC. * 09/23/2008 MHC Copy from WMAC.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
@ -512,7 +512,7 @@ Efuse_PgPacketRead( IN struct adapter *pAdapter,
int int
Efuse_PgPacketWrite(IN struct adapter *pAdapter, Efuse_PgPacketWrite(IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -527,7 +527,7 @@ Efuse_PgPacketWrite(IN struct adapter *pAdapter,
int int
Efuse_PgPacketWrite_BT(IN struct adapter *pAdapter, Efuse_PgPacketWrite_BT(IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -552,8 +552,8 @@ Efuse_PgPacketWrite_BT(IN struct adapter *pAdapter,
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/16/2008 MHC Create Version 0. * 11/16/2008 MHC Create Version 0.
* 11/21/2008 MHC Fix Write bug when we only enable late word. * 11/21/2008 MHC Fix Write bug when we only enable late word.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
@ -911,7 +911,7 @@ exit:
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/11/2008 MHC Create Version 0. * 11/11/2008 MHC Create Version 0.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
VOID VOID
@ -953,7 +953,7 @@ Efuse_ReadAllMap(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/12/2008 MHC Create Version 0. * 11/12/2008 MHC Create Version 0.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static VOID static VOID
@ -1014,7 +1014,7 @@ efuse_ShadowRead4Byte(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/12/2008 MHC Create Version 0. * 11/12/2008 MHC Create Version 0.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#ifdef PLATFORM #ifdef PLATFORM
@ -1022,13 +1022,13 @@ static VOID
efuse_ShadowWrite1Byte( efuse_ShadowWrite1Byte(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN u8 Value); IN u8 Value);
#endif //PLATFORM #endif //PLATFORM
static VOID static VOID
efuse_ShadowWrite1Byte( efuse_ShadowWrite1Byte(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN u8 Value) IN u8 Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
@ -1041,7 +1041,7 @@ static VOID
efuse_ShadowWrite2Byte( efuse_ShadowWrite2Byte(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN u16 Value) IN u16 Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
@ -1079,7 +1079,7 @@ efuse_ShadowWrite4Byte(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/13/2008 MHC Create Version 0. * 11/13/2008 MHC Create Version 0.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void EFUSE_ShadowMapUpdate( void EFUSE_ShadowMapUpdate(
@ -1128,7 +1128,7 @@ void EFUSE_ShadowMapUpdate(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/12/2008 MHC Create Version 0. * 11/12/2008 MHC Create Version 0.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
@ -1160,7 +1160,7 @@ EFUSE_ShadowRead(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/12/2008 MHC Create Version 0. * 11/12/2008 MHC Create Version 0.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
VOID VOID

19
core/rtw_ieee80211.c
View file

@ -50,13 +50,13 @@ u8 RSN_CIPHER_SUITE_WEP104[] = { 0x00, 0x0f, 0xac, 5 };
// for adhoc-master to generate ie and provide supported-rate to fw // for adhoc-master to generate ie and provide supported-rate to fw
//----------------------------------------------------------- //-----------------------------------------------------------
static u8 WIFI_CCKRATES[] = static u8 WIFI_CCKRATES[] =
{(IEEE80211_CCK_RATE_1MB | IEEE80211_BASIC_RATE_MASK), {(IEEE80211_CCK_RATE_1MB | IEEE80211_BASIC_RATE_MASK),
(IEEE80211_CCK_RATE_2MB | IEEE80211_BASIC_RATE_MASK), (IEEE80211_CCK_RATE_2MB | IEEE80211_BASIC_RATE_MASK),
(IEEE80211_CCK_RATE_5MB | IEEE80211_BASIC_RATE_MASK), (IEEE80211_CCK_RATE_5MB | IEEE80211_BASIC_RATE_MASK),
(IEEE80211_CCK_RATE_11MB | IEEE80211_BASIC_RATE_MASK)}; (IEEE80211_CCK_RATE_11MB | IEEE80211_BASIC_RATE_MASK)};
static u8 WIFI_OFDMRATES[] = static u8 WIFI_OFDMRATES[] =
{(IEEE80211_OFDM_RATE_6MB), {(IEEE80211_OFDM_RATE_6MB),
(IEEE80211_OFDM_RATE_9MB), (IEEE80211_OFDM_RATE_9MB),
(IEEE80211_OFDM_RATE_12MB), (IEEE80211_OFDM_RATE_12MB),
@ -128,7 +128,7 @@ int rtw_check_network_type(unsigned char *rate, int ratelen, int channel)
if ((rtw_is_cckratesonly_included(rate)) == _TRUE) if ((rtw_is_cckratesonly_included(rate)) == _TRUE)
return WIRELESS_11B; return WIRELESS_11B;
else if((rtw_is_cckrates_included(rate)) == _TRUE) else if((rtw_is_cckrates_included(rate)) == _TRUE)
return WIRELESS_11BG; return WIRELESS_11BG;
else else
return WIRELESS_11G; return WIRELESS_11G;
} }
@ -406,7 +406,7 @@ _func_exit_;
int rtw_generate_ie(struct registry_priv *pregistrypriv) int rtw_generate_ie(struct registry_priv *pregistrypriv)
{ {
u8 wireless_mode; u8 wireless_mode;
int sz = 0, rateLen; int sz = 0, rateLen;
WLAN_BSSID_EX* pdev_network = &pregistrypriv->dev_network; WLAN_BSSID_EX* pdev_network = &pregistrypriv->dev_network;
u8* ie = pdev_network->IEs; u8* ie = pdev_network->IEs;
@ -644,7 +644,7 @@ int rtw_parse_wpa_ie(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis
if (count == 0 || left < count * WPA_SELECTOR_LEN) { if (count == 0 || left < count * WPA_SELECTOR_LEN) {
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie count botch (pairwise), " RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie count botch (pairwise), "
"count %u left %u", __FUNCTION__, count, left)); "count %u left %u", __FUNCTION__, count, left));
return _FAIL; return _FAIL;
} }
@ -722,7 +722,7 @@ int rtw_parse_wpa2_ie(u8* rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi
if (count == 0 || left < count * RSN_SELECTOR_LEN) { if (count == 0 || left < count * RSN_SELECTOR_LEN) {
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie count botch (pairwise), " RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie count botch (pairwise), "
"count %u left %u", __FUNCTION__, count, left)); "count %u left %u", __FUNCTION__, count, left));
return _FAIL; return _FAIL;
} }
@ -760,7 +760,7 @@ int rtw_parse_wpa2_ie(u8* rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi
int rtw_get_wapi_ie(u8 *in_ie,uint in_len,u8 *wapi_ie,u16 *wapi_len) int rtw_get_wapi_ie(u8 *in_ie,uint in_len,u8 *wapi_ie,u16 *wapi_len)
{ {
u8 authmode, i; u8 authmode, i;
uint cnt; uint cnt;
u8 wapi_oui1[4]={0x0,0x14,0x72,0x01}; u8 wapi_oui1[4]={0x0,0x14,0x72,0x01};
u8 wapi_oui2[4]={0x0,0x14,0x72,0x02}; u8 wapi_oui2[4]={0x0,0x14,0x72,0x02};
@ -772,7 +772,7 @@ _func_enter_;
//if(authmode==_WAPI_IE_) //if(authmode==_WAPI_IE_)
if(authmode==_WAPI_IE_ && (_rtw_memcmp(&in_ie[cnt+6], wapi_oui1,4)==_TRUE || if(authmode==_WAPI_IE_ && (_rtw_memcmp(&in_ie[cnt+6], wapi_oui1,4)==_TRUE ||
_rtw_memcmp(&in_ie[cnt+6], wapi_oui2,4)==_TRUE)) _rtw_memcmp(&in_ie[cnt+6], wapi_oui2,4)==_TRUE))
{ {
if (wapi_ie) { if (wapi_ie) {
_rtw_memcpy(wapi_ie, &in_ie[cnt],in_ie[cnt+1]+2); _rtw_memcpy(wapi_ie, &in_ie[cnt],in_ie[cnt+1]+2);
@ -804,7 +804,7 @@ int rtw_get_sec_ie(u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16
{ {
u8 authmode, sec_idx, i; u8 authmode, sec_idx, i;
u8 wpa_oui[4]={0x0,0x50,0xf2,0x01}; u8 wpa_oui[4]={0x0,0x50,0xf2,0x01};
uint cnt; uint cnt;
_func_enter_; _func_enter_;
@ -2181,4 +2181,3 @@ const char *action_public_str(u8 action)
action = (action >= ACT_PUBLIC_MAX) ? ACT_PUBLIC_MAX : action; action = (action >= ACT_PUBLIC_MAX) ? ACT_PUBLIC_MAX : action;
return _action_public_str[action]; return _action_public_str[action];
} }

38
core/rtw_io.c
View file

@ -71,12 +71,12 @@ jackson@realtek.com.tw
#endif #endif
#ifdef CONFIG_SDIO_HCI #ifdef CONFIG_SDIO_HCI
#define rtw_le16_to_cpu(val) val #define rtw_le16_to_cpu(val) val
#define rtw_le32_to_cpu(val) val #define rtw_le32_to_cpu(val) val
#define rtw_cpu_to_le16(val) val #define rtw_cpu_to_le16(val) val
#define rtw_cpu_to_le32(val) val #define rtw_cpu_to_le32(val) val
#else #else
#define rtw_le16_to_cpu(val) le16_to_cpu(val) #define rtw_le16_to_cpu(val) le16_to_cpu(val)
#define rtw_le32_to_cpu(val) le32_to_cpu(val) #define rtw_le32_to_cpu(val) le32_to_cpu(val)
#define rtw_cpu_to_le16(val) cpu_to_le16(val) #define rtw_cpu_to_le16(val) cpu_to_le16(val)
#define rtw_cpu_to_le32(val) cpu_to_le32(val) #define rtw_cpu_to_le32(val) cpu_to_le32(val)
@ -86,7 +86,7 @@ jackson@realtek.com.tw
u8 _rtw_read8(struct adapter *adapter, u32 addr) u8 _rtw_read8(struct adapter *adapter, u32 addr)
{ {
u8 r_val; u8 r_val;
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
u8 (*_read8)(struct intf_hdl *pintfhdl, u32 addr); u8 (*_read8)(struct intf_hdl *pintfhdl, u32 addr);
@ -101,10 +101,10 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr)
u16 _rtw_read16(struct adapter *adapter, u32 addr) u16 _rtw_read16(struct adapter *adapter, u32 addr)
{ {
u16 r_val; u16 r_val;
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
u16 (*_read16)(struct intf_hdl *pintfhdl, u32 addr); u16 (*_read16)(struct intf_hdl *pintfhdl, u32 addr);
_func_enter_; _func_enter_;
_read16 = pintfhdl->io_ops._read16; _read16 = pintfhdl->io_ops._read16;
@ -116,10 +116,10 @@ u16 _rtw_read16(struct adapter *adapter, u32 addr)
u32 _rtw_read32(struct adapter *adapter, u32 addr) u32 _rtw_read32(struct adapter *adapter, u32 addr)
{ {
u32 r_val; u32 r_val;
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
u32 (*_read32)(struct intf_hdl *pintfhdl, u32 addr); u32 (*_read32)(struct intf_hdl *pintfhdl, u32 addr);
_func_enter_; _func_enter_;
_read32 = pintfhdl->io_ops._read32; _read32 = pintfhdl->io_ops._read32;
@ -131,7 +131,7 @@ u32 _rtw_read32(struct adapter *adapter, u32 addr)
int _rtw_write8(struct adapter *adapter, u32 addr, u8 val) int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
int (*_write8)(struct intf_hdl *pintfhdl, u32 addr, u8 val); int (*_write8)(struct intf_hdl *pintfhdl, u32 addr, u8 val);
@ -146,7 +146,7 @@ int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)
} }
int _rtw_write16(struct adapter *adapter, u32 addr, u16 val) int _rtw_write16(struct adapter *adapter, u32 addr, u16 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
int (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val); int (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val);
@ -162,7 +162,7 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val)
} }
int _rtw_write32(struct adapter *adapter, u32 addr, u32 val) int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
int (*_write32)(struct intf_hdl *pintfhdl, u32 addr, u32 val); int (*_write32)(struct intf_hdl *pintfhdl, u32 addr, u32 val);
@ -179,7 +179,7 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)
int _rtw_writeN(struct adapter *adapter, u32 addr ,u32 length , u8 *pdata) int _rtw_writeN(struct adapter *adapter, u32 addr ,u32 length , u8 *pdata)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = (struct intf_hdl*)(&(pio_priv->intf)); struct intf_hdl *pintfhdl = (struct intf_hdl*)(&(pio_priv->intf));
int (*_writeN)(struct intf_hdl *pintfhdl, u32 addr,u32 length, u8 *pdata); int (*_writeN)(struct intf_hdl *pintfhdl, u32 addr,u32 length, u8 *pdata);
@ -194,7 +194,7 @@ int _rtw_writeN(struct adapter *adapter, u32 addr ,u32 length , u8 *pdata)
} }
int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val) int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
int (*_write8_async)(struct intf_hdl *pintfhdl, u32 addr, u8 val); int (*_write8_async)(struct intf_hdl *pintfhdl, u32 addr, u8 val);
@ -209,7 +209,7 @@ int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val)
} }
int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val) int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
int (*_write16_async)(struct intf_hdl *pintfhdl, u32 addr, u16 val); int (*_write16_async)(struct intf_hdl *pintfhdl, u32 addr, u16 val);
@ -224,7 +224,7 @@ int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val)
} }
int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val) int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
int (*_write32_async)(struct intf_hdl *pintfhdl, u32 addr, u32 val); int (*_write32_async)(struct intf_hdl *pintfhdl, u32 addr, u32 val);
@ -241,7 +241,7 @@ int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val)
void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{ {
void (*_read_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); void (*_read_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -264,7 +264,7 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{ {
void (*_write_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); void (*_write_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -281,7 +281,7 @@ void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{ {
u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -317,7 +317,7 @@ void _rtw_read_port_cancel(struct adapter *adapter)
u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{ {
u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
u32 ret = _SUCCESS; u32 ret = _SUCCESS;
@ -501,5 +501,3 @@ int dbg_rtw_writeN(struct adapter *adapter, u32 addr ,u32 length , u8 *data, con
return _rtw_writeN(adapter, addr, length, data); return _rtw_writeN(adapter, addr, length, data);
} }
#endif #endif

3
core/rtw_ioctl_query.c
View file

@ -24,6 +24,3 @@
#include <drv_types.h> #include <drv_types.h>
#include <rtw_ioctl_query.h> #include <rtw_ioctl_query.h>
#include <wifi.h> #include <wifi.h>

83
core/rtw_ioctl_rtl.c
View file

@ -58,7 +58,7 @@ struct oid_obj_priv oid_rtl_seg_01_01[] =
{1, &oid_null_function}, //0x97 {1, &oid_null_function}, //0x97
{1, &oid_rt_get_ap_ip_hdl}, //0x98 {1, &oid_rt_get_ap_ip_hdl}, //0x98
{1, &oid_rt_get_channelplan_hdl}, //0x99 {1, &oid_rt_get_channelplan_hdl}, //0x99
{1, &oid_rt_set_preamble_mode_hdl}, //0x9A {1, &oid_rt_set_preamble_mode_hdl}, //0x9A
{1, &oid_rt_set_bcn_intvl_hdl}, //0x9B {1, &oid_rt_set_bcn_intvl_hdl}, //0x9B
{1, &oid_null_function}, //0x9C {1, &oid_null_function}, //0x9C
{1, &oid_rt_dedicate_probe_hdl}, //0x9D {1, &oid_rt_dedicate_probe_hdl}, //0x9D
@ -74,7 +74,7 @@ struct oid_obj_priv oid_rtl_seg_01_01[] =
{1, &oid_rt_get_total_tx_bytes_hdl}, //0xA7 {1, &oid_rt_get_total_tx_bytes_hdl}, //0xA7
{1, &oid_rt_get_total_rx_bytes_hdl}, //0xA8 {1, &oid_rt_get_total_rx_bytes_hdl}, //0xA8
{1, &oid_rt_current_tx_power_level_hdl}, //0xA9 {1, &oid_rt_current_tx_power_level_hdl}, //0xA9
{1, &oid_rt_get_enc_key_mismatch_count_hdl}, //0xAA {1, &oid_rt_get_enc_key_mismatch_count_hdl}, //0xAA
{1, &oid_rt_get_enc_key_match_count_hdl}, //0xAB {1, &oid_rt_get_enc_key_match_count_hdl}, //0xAB
{1, &oid_rt_get_channel_hdl}, //0xAC {1, &oid_rt_get_channel_hdl}, //0xAC
{1, &oid_rt_set_channelplan_hdl}, //0xAD {1, &oid_rt_set_channelplan_hdl}, //0xAD
@ -90,7 +90,7 @@ struct oid_obj_priv oid_rtl_seg_01_01[] =
{1, &oid_null_function}, //0xB7 {1, &oid_null_function}, //0xB7
{1, &oid_null_function}, //0xB8 {1, &oid_null_function}, //0xB8
{1, &oid_null_function}, //0xB9 {1, &oid_null_function}, //0xB9
{1, &oid_null_function}, //0xBA {1, &oid_null_function}, //0xBA
{1, &oid_rt_supported_wireless_mode_hdl}, //0xBB {1, &oid_rt_supported_wireless_mode_hdl}, //0xBB
{1, &oid_rt_get_channel_list_hdl}, //0xBC {1, &oid_rt_get_channel_list_hdl}, //0xBC
{1, &oid_rt_get_scan_in_progress_hdl}, //0xBD {1, &oid_rt_get_scan_in_progress_hdl}, //0xBD
@ -106,7 +106,7 @@ struct oid_obj_priv oid_rtl_seg_01_01[] =
{1, &oid_null_function}, //0xC7 {1, &oid_null_function}, //0xC7
{1, &oid_null_function}, //0xC8 {1, &oid_null_function}, //0xC8
{1, &oid_null_function}, //0xC9 {1, &oid_null_function}, //0xC9
{1, &oid_null_function}, //0xCA {1, &oid_null_function}, //0xCA
{1, &oid_null_function}, //0xCB {1, &oid_null_function}, //0xCB
{1, &oid_null_function}, //0xCC {1, &oid_null_function}, //0xCC
{1, &oid_null_function}, //0xCD {1, &oid_null_function}, //0xCD
@ -228,7 +228,7 @@ NDIS_STATUS oid_rt_pro_set_fw_ra_state_hdl(struct oid_par_priv* poid_par_priv)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
NDIS_STATUS oid_rt_get_signal_quality_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_signal_quality_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
//DEBUG_ERR(("<**********************oid_rt_get_signal_quality_hdl \n")); //DEBUG_ERR(("<**********************oid_rt_get_signal_quality_hdl \n"));
@ -258,7 +258,7 @@ NDIS_STATUS oid_rt_get_signal_quality_hdl(struct oid_par_priv* poid_par_priv)
NDIS_STATUS oid_rt_get_small_packet_crc_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_small_packet_crc_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -282,7 +282,7 @@ NDIS_STATUS oid_rt_get_small_packet_crc_hdl(struct oid_par_priv* poid_par_priv)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -307,7 +307,7 @@ NDIS_STATUS oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv* poid_par_priv)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_get_large_packet_crc_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_large_packet_crc_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -333,7 +333,7 @@ NDIS_STATUS oid_rt_get_large_packet_crc_hdl(struct oid_par_priv* poid_par_priv)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_get_tx_retry_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_tx_retry_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -346,7 +346,7 @@ NDIS_STATUS oid_rt_get_tx_retry_hdl(struct oid_par_priv* poid_par_priv)
} }
NDIS_STATUS oid_rt_get_rx_retry_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_rx_retry_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -384,7 +384,7 @@ NDIS_STATUS oid_rt_get_rx_total_packet_hdl(struct oid_par_priv* poid_par_priv)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_get_tx_beacon_ok_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_tx_beacon_ok_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -397,7 +397,7 @@ NDIS_STATUS oid_rt_get_tx_beacon_ok_hdl(struct oid_par_priv* poid_par_priv)
} }
NDIS_STATUS oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -411,7 +411,7 @@ NDIS_STATUS oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv* poid_par_priv)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_get_rx_icv_err_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_rx_icv_err_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -436,7 +436,7 @@ NDIS_STATUS oid_rt_get_rx_icv_err_hdl(struct oid_par_priv* poid_par_priv)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != SET_OID) if(poid_par_priv->type_of_oid != SET_OID)
@ -450,7 +450,7 @@ NDIS_STATUS oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv* poid_par_pr
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_get_preamble_mode_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_preamble_mode_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
ULONG preamblemode = 0 ; ULONG preamblemode = 0 ;
@ -481,7 +481,7 @@ NDIS_STATUS oid_rt_get_preamble_mode_hdl(struct oid_par_priv* poid_par_priv)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_get_ap_ip_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_ap_ip_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -495,7 +495,7 @@ NDIS_STATUS oid_rt_get_ap_ip_hdl(struct oid_par_priv* poid_par_priv)
NDIS_STATUS oid_rt_get_channelplan_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_channelplan_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
struct eeprom_priv* peeprompriv = &padapter->eeprompriv; struct eeprom_priv* peeprompriv = &padapter->eeprompriv;
@ -511,7 +511,7 @@ NDIS_STATUS oid_rt_get_channelplan_hdl(struct oid_par_priv* poid_par_priv)
} }
NDIS_STATUS oid_rt_set_channelplan_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_set_channelplan_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
struct eeprom_priv* peeprompriv = &padapter->eeprompriv; struct eeprom_priv* peeprompriv = &padapter->eeprompriv;
@ -528,7 +528,7 @@ NDIS_STATUS oid_rt_set_channelplan_hdl(struct oid_par_priv* poid_par_priv)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_set_preamble_mode_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_set_preamble_mode_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
ULONG preamblemode = 0; ULONG preamblemode = 0;
if(poid_par_priv->type_of_oid != SET_OID) if(poid_par_priv->type_of_oid != SET_OID)
@ -560,7 +560,7 @@ NDIS_STATUS oid_rt_set_preamble_mode_hdl(struct oid_par_priv* poid_par_priv)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_set_bcn_intvl_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_set_bcn_intvl_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != SET_OID) if(poid_par_priv->type_of_oid != SET_OID)
@ -573,7 +573,7 @@ NDIS_STATUS oid_rt_set_bcn_intvl_hdl(struct oid_par_priv* poid_par_priv)
} }
NDIS_STATUS oid_rt_dedicate_probe_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_dedicate_probe_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
return status; return status;
@ -581,7 +581,7 @@ NDIS_STATUS oid_rt_dedicate_probe_hdl(struct oid_par_priv* poid_par_priv)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -628,14 +628,14 @@ NDIS_STATUS oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv* poid_par_priv)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
NDIS_STATUS oid_rt_current_tx_power_level_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_current_tx_power_level_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
return status; return status;
} }
NDIS_STATUS oid_rt_get_enc_key_mismatch_count_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_enc_key_mismatch_count_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -648,7 +648,7 @@ NDIS_STATUS oid_rt_get_enc_key_mismatch_count_hdl(struct oid_par_priv* poid_par_
} }
NDIS_STATUS oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -661,7 +661,7 @@ NDIS_STATUS oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv* poid_par_pri
} }
NDIS_STATUS oid_rt_get_channel_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_channel_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
NDIS_802_11_CONFIGURATION *pnic_Config; NDIS_802_11_CONFIGURATION *pnic_Config;
@ -694,7 +694,7 @@ NDIS_STATUS oid_rt_get_channel_hdl(struct oid_par_priv* poid_par_priv)
} }
NDIS_STATUS oid_rt_get_hardware_radio_off_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_hardware_radio_off_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -707,7 +707,7 @@ NDIS_STATUS oid_rt_get_hardware_radio_off_hdl(struct oid_par_priv* poid_par_priv
} }
NDIS_STATUS oid_rt_get_key_mismatch_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_key_mismatch_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -720,9 +720,9 @@ NDIS_STATUS oid_rt_get_key_mismatch_hdl(struct oid_par_priv* poid_par_priv)
} }
NDIS_STATUS oid_rt_supported_wireless_mode_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_supported_wireless_mode_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
ULONG ulInfo = 0 ; ULONG ulInfo = 0 ;
//DEBUG_ERR(("<**********************oid_rt_supported_wireless_mode_hdl \n")); //DEBUG_ERR(("<**********************oid_rt_supported_wireless_mode_hdl \n"));
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
{ {
@ -746,7 +746,7 @@ NDIS_STATUS oid_rt_supported_wireless_mode_hdl(struct oid_par_priv* poid_par_pri
} }
NDIS_STATUS oid_rt_get_channel_list_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_channel_list_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -759,7 +759,7 @@ NDIS_STATUS oid_rt_get_channel_list_hdl(struct oid_par_priv* poid_par_priv)
} }
NDIS_STATUS oid_rt_get_scan_in_progress_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_scan_in_progress_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -774,21 +774,21 @@ NDIS_STATUS oid_rt_get_scan_in_progress_hdl(struct oid_par_priv* poid_par_priv)
NDIS_STATUS oid_rt_forced_data_rate_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_forced_data_rate_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
return status; return status;
} }
NDIS_STATUS oid_rt_wireless_mode_for_scan_list_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_wireless_mode_for_scan_list_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
return status; return status;
} }
NDIS_STATUS oid_rt_get_bss_wireless_mode_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_get_bss_wireless_mode_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -802,7 +802,7 @@ NDIS_STATUS oid_rt_get_bss_wireless_mode_hdl(struct oid_par_priv* poid_par_priv)
NDIS_STATUS oid_rt_scan_with_magic_packet_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_scan_with_magic_packet_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
return status; return status;
@ -812,7 +812,7 @@ NDIS_STATUS oid_rt_scan_with_magic_packet_hdl(struct oid_par_priv* poid_par_priv
//************** oid_rtl_seg_01_03 section start ************** //************** oid_rtl_seg_01_03 section start **************
NDIS_STATUS oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != QUERY_OID) if(poid_par_priv->type_of_oid != QUERY_OID)
@ -825,21 +825,21 @@ NDIS_STATUS oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv* poid_
} }
NDIS_STATUS oid_rt_ap_switch_into_ap_mode_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_ap_switch_into_ap_mode_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
return status; return status;
} }
NDIS_STATUS oid_rt_ap_supported_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_ap_supported_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
return status; return status;
} }
NDIS_STATUS oid_rt_ap_set_passphrase_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_ap_set_passphrase_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != SET_OID) if(poid_par_priv->type_of_oid != SET_OID)
@ -1013,7 +1013,7 @@ NDIS_STATUS oid_rt_get_connect_state_hdl(struct oid_par_priv* poid_par_priv)
NDIS_STATUS oid_rt_set_default_key_id_hdl(struct oid_par_priv* poid_par_priv) NDIS_STATUS oid_rt_set_default_key_id_hdl(struct oid_par_priv* poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
if(poid_par_priv->type_of_oid != SET_OID) if(poid_par_priv->type_of_oid != SET_OID)
@ -1025,4 +1025,3 @@ NDIS_STATUS oid_rt_set_default_key_id_hdl(struct oid_par_priv* poid_par_priv)
return status; return status;
} }
//************** oid_rtl_seg_03_00 section end ************** //************** oid_rtl_seg_03_00 section end **************

7
core/rtw_ioctl_set.c
View file

@ -161,7 +161,7 @@ _func_enter_;
{ {
// submit createbss_cmd to change to a ADHOC_MASTER // submit createbss_cmd to change to a ADHOC_MASTER
//pmlmepriv->lock has been acquired by caller... //pmlmepriv->lock has been acquired by caller...
WLAN_BSSID_EX *pdev_network = &(padapter->registrypriv.dev_network); WLAN_BSSID_EX *pdev_network = &(padapter->registrypriv.dev_network);
pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE; pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
@ -182,7 +182,7 @@ _func_enter_;
goto exit; goto exit;
} }
pmlmepriv->to_join = _FALSE; pmlmepriv->to_join = _FALSE;
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("***Error=> rtw_select_and_join_from_scanned_queue FAIL under STA_Mode*** \n ")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("***Error=> rtw_select_and_join_from_scanned_queue FAIL under STA_Mode*** \n "));
@ -333,7 +333,7 @@ u8 rtw_set_802_11_ssid(struct adapter* padapter, NDIS_802_11_SSID *ssid)
_func_enter_; _func_enter_;
DBG_871X_LEVEL(_drv_always_, "set ssid [%s] fw_state=0x%08x\n", DBG_871X_LEVEL(_drv_always_, "set ssid [%s] fw_state=0x%08x\n",
ssid->Ssid, get_fwstate(pmlmepriv)); ssid->Ssid, get_fwstate(pmlmepriv));
if(padapter->hw_init_completed==_FALSE){ if(padapter->hw_init_completed==_FALSE){
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
@ -1379,4 +1379,3 @@ int rtw_set_country(struct adapter *adapter, const char *country_code)
return rtw_set_channel_plan(adapter, channel_plan); return rtw_set_channel_plan(adapter, channel_plan);
} }

1
core/rtw_iol.c
View file

@ -400,4 +400,3 @@ int rtw_IOL_exec_empty_cmds_sync(struct adapter *adapter, u32 max_wating_ms)
#endif //CONFIG_IOL #endif //CONFIG_IOL

73
core/rtw_led.c
View file

@ -268,7 +268,7 @@ SwLedBlink1(
#endif #endif
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
PLED_871x pLed1 = &(ledpriv->SwLed1); PLED_871x pLed1 = &(ledpriv->SwLed1);
u8 bStopBlinking = _FALSE; u8 bStopBlinking = _FALSE;
#ifndef CONFIG_LED_REMOVE_HAL #ifndef CONFIG_LED_REMOVE_HAL
@ -656,7 +656,7 @@ SwLedBlink3(
} }
else else
{ {
if( pLed->bLedOn ) if( pLed->bLedOn )
pLed->BlinkingLedState = RTW_LED_OFF; pLed->BlinkingLedState = RTW_LED_OFF;
else else
pLed->BlinkingLedState = RTW_LED_ON; pLed->BlinkingLedState = RTW_LED_ON;
@ -770,7 +770,7 @@ SwLedBlink4(
struct adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
PLED_871x pLed1 = &(ledpriv->SwLed1); PLED_871x pLed1 = &(ledpriv->SwLed1);
u8 bStopBlinking = _FALSE; u8 bStopBlinking = _FALSE;
// Change LED according to BlinkingLedState specified. // Change LED according to BlinkingLedState specified.
@ -1252,11 +1252,11 @@ SwLedControlMode1(
_cancel_timer_ex(&(pLed->BlinkTimer)); _cancel_timer_ex(&(pLed->BlinkTimer));
pLed->bLedLinkBlinkInProgress = _FALSE; pLed->bLedLinkBlinkInProgress = _FALSE;
} }
if(pLed->bLedBlinkInProgress ==_TRUE) if(pLed->bLedBlinkInProgress ==_TRUE)
{ {
_cancel_timer_ex(&(pLed->BlinkTimer)); _cancel_timer_ex(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = _FALSE; pLed->bLedBlinkInProgress = _FALSE;
} }
pLed->bLedNoLinkBlinkInProgress = _TRUE; pLed->bLedNoLinkBlinkInProgress = _TRUE;
pLed->CurrLedState = LED_BLINK_SLOWLY; pLed->CurrLedState = LED_BLINK_SLOWLY;
@ -1284,7 +1284,7 @@ SwLedControlMode1(
{ {
_cancel_timer_ex(&(pLed->BlinkTimer)); _cancel_timer_ex(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = _FALSE; pLed->bLedBlinkInProgress = _FALSE;
} }
pLed->bLedLinkBlinkInProgress = _TRUE; pLed->bLedLinkBlinkInProgress = _TRUE;
pLed->CurrLedState = LED_BLINK_NORMAL; pLed->CurrLedState = LED_BLINK_NORMAL;
if( pLed->bLedOn ) if( pLed->bLedOn )
@ -1297,13 +1297,13 @@ SwLedControlMode1(
case LED_CTL_SITE_SURVEY: case LED_CTL_SITE_SURVEY:
if((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) if((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE))
; ;
else if(pLed->bLedScanBlinkInProgress ==_FALSE) else if(pLed->bLedScanBlinkInProgress ==_FALSE)
{ {
if(IS_LED_WPS_BLINKING(pLed)) if(IS_LED_WPS_BLINKING(pLed))
return; return;
if(pLed->bLedNoLinkBlinkInProgress == _TRUE) if(pLed->bLedNoLinkBlinkInProgress == _TRUE)
{ {
_cancel_timer_ex(&(pLed->BlinkTimer)); _cancel_timer_ex(&(pLed->BlinkTimer));
pLed->bLedNoLinkBlinkInProgress = _FALSE; pLed->bLedNoLinkBlinkInProgress = _FALSE;
@ -1313,7 +1313,7 @@ SwLedControlMode1(
_cancel_timer_ex(&(pLed->BlinkTimer)); _cancel_timer_ex(&(pLed->BlinkTimer));
pLed->bLedLinkBlinkInProgress = _FALSE; pLed->bLedLinkBlinkInProgress = _FALSE;
} }
if(pLed->bLedBlinkInProgress ==_TRUE) if(pLed->bLedBlinkInProgress ==_TRUE)
{ {
_cancel_timer_ex(&(pLed->BlinkTimer)); _cancel_timer_ex(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = _FALSE; pLed->bLedBlinkInProgress = _FALSE;
@ -1501,19 +1501,19 @@ SwLedControlMode2(
{ {
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
PLED_871x pLed = &(ledpriv->SwLed0); PLED_871x pLed = &(ledpriv->SwLed0);
switch(LedAction) switch(LedAction)
{ {
case LED_CTL_SITE_SURVEY: case LED_CTL_SITE_SURVEY:
if(pmlmepriv->LinkDetectInfo.bBusyTraffic) if(pmlmepriv->LinkDetectInfo.bBusyTraffic)
; ;
else if(pLed->bLedScanBlinkInProgress ==_FALSE) else if(pLed->bLedScanBlinkInProgress ==_FALSE)
{ {
if(IS_LED_WPS_BLINKING(pLed)) if(IS_LED_WPS_BLINKING(pLed))
return; return;
if(pLed->bLedBlinkInProgress ==_TRUE) if(pLed->bLedBlinkInProgress ==_TRUE)
{ {
_cancel_timer_ex(&(pLed->BlinkTimer)); _cancel_timer_ex(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = _FALSE; pLed->bLedBlinkInProgress = _FALSE;
@ -1531,9 +1531,9 @@ SwLedControlMode2(
case LED_CTL_TX: case LED_CTL_TX:
case LED_CTL_RX: case LED_CTL_RX:
if((pLed->bLedBlinkInProgress ==_FALSE) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) if((pLed->bLedBlinkInProgress ==_FALSE) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE))
{ {
if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed))
{ {
return; return;
} }
@ -1696,9 +1696,9 @@ SwLedControlMode2(
case LED_CTL_TX: case LED_CTL_TX:
case LED_CTL_RX: case LED_CTL_RX:
if((pLed->bLedBlinkInProgress ==_FALSE) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) if((pLed->bLedBlinkInProgress ==_FALSE) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE))
{ {
if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed))
{ {
return; return;
} }
@ -1869,16 +1869,16 @@ SwLedControlMode4(
{ {
return; return;
} }
if(pLed->bLedBlinkInProgress ==_TRUE) if(pLed->bLedBlinkInProgress ==_TRUE)
{ {
_cancel_timer_ex(&(pLed->BlinkTimer)); _cancel_timer_ex(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = _FALSE; pLed->bLedBlinkInProgress = _FALSE;
} }
if(pLed->bLedNoLinkBlinkInProgress ==_TRUE) if(pLed->bLedNoLinkBlinkInProgress ==_TRUE)
{ {
_cancel_timer_ex(&(pLed->BlinkTimer)); _cancel_timer_ex(&(pLed->BlinkTimer));
pLed->bLedNoLinkBlinkInProgress = _FALSE; pLed->bLedNoLinkBlinkInProgress = _FALSE;
} }
pLed->bLedStartToLinkBlinkInProgress = _TRUE; pLed->bLedStartToLinkBlinkInProgress = _TRUE;
pLed->CurrLedState = LED_BLINK_StartToBlink; pLed->CurrLedState = LED_BLINK_StartToBlink;
@ -1919,11 +1919,11 @@ SwLedControlMode4(
{ {
return; return;
} }
if(pLed->bLedBlinkInProgress ==_TRUE) if(pLed->bLedBlinkInProgress ==_TRUE)
{ {
_cancel_timer_ex(&(pLed->BlinkTimer)); _cancel_timer_ex(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = _FALSE; pLed->bLedBlinkInProgress = _FALSE;
} }
pLed->bLedNoLinkBlinkInProgress = _TRUE; pLed->bLedNoLinkBlinkInProgress = _TRUE;
pLed->CurrLedState = LED_BLINK_SLOWLY; pLed->CurrLedState = LED_BLINK_SLOWLY;
@ -1966,13 +1966,13 @@ SwLedControlMode4(
case LED_CTL_TX: case LED_CTL_TX:
case LED_CTL_RX: case LED_CTL_RX:
if(pLed->bLedBlinkInProgress ==_FALSE) if(pLed->bLedBlinkInProgress ==_FALSE)
{ {
if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed))
{ {
return; return;
} }
if(pLed->bLedNoLinkBlinkInProgress == _TRUE) if(pLed->bLedNoLinkBlinkInProgress == _TRUE)
{ {
_cancel_timer_ex(&(pLed->BlinkTimer)); _cancel_timer_ex(&(pLed->BlinkTimer));
pLed->bLedNoLinkBlinkInProgress = _FALSE; pLed->bLedNoLinkBlinkInProgress = _FALSE;
@ -2191,7 +2191,7 @@ SwLedControlMode5(
{ {
case LED_CTL_POWER_ON: case LED_CTL_POWER_ON:
case LED_CTL_NO_LINK: case LED_CTL_NO_LINK:
case LED_CTL_LINK: //solid blue case LED_CTL_LINK: //solid blue
pLed->CurrLedState = RTW_LED_ON; pLed->CurrLedState = RTW_LED_ON;
pLed->BlinkingLedState = RTW_LED_ON; pLed->BlinkingLedState = RTW_LED_ON;
@ -2221,9 +2221,9 @@ SwLedControlMode5(
case LED_CTL_TX: case LED_CTL_TX:
case LED_CTL_RX: case LED_CTL_RX:
if(pLed->bLedBlinkInProgress ==_FALSE) if(pLed->bLedBlinkInProgress ==_FALSE)
{ {
if(pLed->CurrLedState == LED_BLINK_SCAN) if(pLed->CurrLedState == LED_BLINK_SCAN)
{ {
return; return;
} }
@ -2356,7 +2356,7 @@ LedControl871x(
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
if( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE) if( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)
||(padapter->hw_init_completed == _FALSE) ) ||(padapter->hw_init_completed == _FALSE) )
{ {
return; return;
} }
@ -2393,7 +2393,7 @@ LedControl871x(
break; break;
case SW_LED_MODE2: case SW_LED_MODE2:
SwLedControlMode2(padapter, LedAction); SwLedControlMode2(padapter, LedAction);
break; break;
case SW_LED_MODE3: case SW_LED_MODE3:
SwLedControlMode3(padapter, LedAction); SwLedControlMode3(padapter, LedAction);
@ -2419,4 +2419,3 @@ LedControl871x(
} }
#endif #endif

79
core/rtw_mlme.c
View file

@ -605,9 +605,9 @@ _func_enter_;
#ifdef PLATFORM_OS_XP #ifdef PLATFORM_OS_XP
if ( ((uint)dst) <= 0x7fffffff || if ( ((uint)dst) <= 0x7fffffff ||
((uint)src) <= 0x7fffffff || ((uint)src) <= 0x7fffffff ||
((uint)&s_cap) <= 0x7fffffff || ((uint)&s_cap) <= 0x7fffffff ||
((uint)&d_cap) <= 0x7fffffff) ((uint)&d_cap) <= 0x7fffffff)
{ {
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n@@@@ error address of dst\n")); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n@@@@ error address of dst\n"));
@ -766,9 +766,9 @@ _func_enter_;
last_evm = padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index]; last_evm = padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index];
padapter->recvpriv.signal_qual_data.total_val -= last_evm; padapter->recvpriv.signal_qual_data.total_val -= last_evm;
} }
padapter->recvpriv.signal_qual_data.total_val += query_rx_pwr_percentage(src->Rssi); padapter->recvpriv.signal_qual_data.total_val += query_rx_pwr_percentage(src->Rssi);
padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index++] = query_rx_pwr_percentage(src->Rssi); padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index++] = query_rx_pwr_percentage(src->Rssi);
if(padapter->recvpriv.signal_qual_data.index >= PHY_LINKQUALITY_SLID_WIN_MAX) if(padapter->recvpriv.signal_qual_data.index >= PHY_LINKQUALITY_SLID_WIN_MAX)
padapter->recvpriv.signal_qual_data.index = 0; padapter->recvpriv.signal_qual_data.index = 0;
@ -1042,10 +1042,10 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor
} }
if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) { if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) {
DBG_871X("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy); DBG_871X("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy);
bselected = _FALSE; bselected = _FALSE;
} }
if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)
{ {
@ -1116,7 +1116,7 @@ _func_enter_;
// lock pmlmepriv->lock when you accessing network_q // lock pmlmepriv->lock when you accessing network_q
if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == _FALSE) if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == _FALSE)
{ {
if( pnetwork->Ssid.Ssid[0] == 0 ) if( pnetwork->Ssid.Ssid[0] == 0 )
{ {
pnetwork->Ssid.SsidLength = 0; pnetwork->Ssid.SsidLength = 0;
} }
@ -1192,12 +1192,12 @@ _func_enter_;
{ {
set_fwstate(pmlmepriv, _FW_UNDER_LINKING); set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
if(rtw_select_and_join_from_scanned_queue(pmlmepriv)==_SUCCESS) if(rtw_select_and_join_from_scanned_queue(pmlmepriv)==_SUCCESS)
{ {
_set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT ); _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT );
} }
else else
{ {
WLAN_BSSID_EX *pdev_network = &(adapter->registrypriv.dev_network); WLAN_BSSID_EX *pdev_network = &(adapter->registrypriv.dev_network);
u8 *pibss = adapter->registrypriv.dev_network.MacAddress; u8 *pibss = adapter->registrypriv.dev_network.MacAddress;
@ -1212,16 +1212,16 @@ _func_enter_;
rtw_update_registrypriv_dev_network(adapter); rtw_update_registrypriv_dev_network(adapter);
rtw_generate_random_ibss(pibss); rtw_generate_random_ibss(pibss);
pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE; pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
if(rtw_createbss_cmd(adapter)!=_SUCCESS) if(rtw_createbss_cmd(adapter)!=_SUCCESS)
{ {
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Error=>rtw_createbss_cmd status FAIL\n")); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Error=>rtw_createbss_cmd status FAIL\n"));
} }
pmlmepriv->to_join = _FALSE; pmlmepriv->to_join = _FALSE;
} }
} }
} }
else else
{ {
@ -1230,7 +1230,7 @@ _func_enter_;
pmlmepriv->to_join = _FALSE; pmlmepriv->to_join = _FALSE;
if(_SUCCESS == (s_ret=rtw_select_and_join_from_scanned_queue(pmlmepriv))) if(_SUCCESS == (s_ret=rtw_select_and_join_from_scanned_queue(pmlmepriv)))
{ {
_set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
} }
else if(s_ret == 2)//there is no need to wait for join else if(s_ret == 2)//there is no need to wait for join
{ {
@ -1358,8 +1358,8 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
{ {
_irqL irqL; _irqL irqL;
struct wlan_network* pwlan = NULL; struct wlan_network* pwlan = NULL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct wlan_network *tgt_network = &pmlmepriv->cur_network; struct wlan_network *tgt_network = &pmlmepriv->cur_network;
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
@ -1818,12 +1818,12 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
static u8 retry=0; static u8 retry=0;
u8 timer_cancelled; u8 timer_cancelled;
struct sta_info *ptarget_sta= NULL, *pcur_sta = NULL; struct sta_info *ptarget_sta= NULL, *pcur_sta = NULL;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct wlan_network *pnetwork = (struct wlan_network *)pbuf; struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct wlan_network *cur_network = &(pmlmepriv->cur_network);
struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL; struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL;
unsigned int the_same_macaddr = _FALSE; unsigned int the_same_macaddr = _FALSE;
_func_enter_; _func_enter_;
@ -2006,7 +2006,7 @@ ignore_joinbss_callback:
void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf) void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
struct wlan_network *pnetwork = (struct wlan_network *)pbuf; struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
_func_enter_; _func_enter_;
@ -2090,7 +2090,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
struct sta_info *psta; struct sta_info *psta;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct stassoc_event *pstassoc = (struct stassoc_event*)pbuf; struct stassoc_event *pstassoc = (struct stassoc_event*)pbuf;
struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct wlan_network *cur_network = &(pmlmepriv->cur_network);
struct wlan_network *ptarget_wlan = NULL; struct wlan_network *ptarget_wlan = NULL;
_func_enter_; _func_enter_;
@ -2216,8 +2216,8 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
WLAN_BSSID_EX *pdev_network=NULL; WLAN_BSSID_EX *pdev_network=NULL;
u8* pibss = NULL; u8* pibss = NULL;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct stadel_event *pstadel = (struct stadel_event*)pbuf; struct stadel_event *pstadel = (struct stadel_event*)pbuf;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct wlan_network *tgt_network = &(pmlmepriv->cur_network); struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
_func_enter_; _func_enter_;
@ -2437,7 +2437,7 @@ _func_enter_;
rtw_cfg80211_indicate_disconnect(adapter); rtw_cfg80211_indicate_disconnect(adapter);
#endif //CONFIG_IOCTL_CFG80211 #endif //CONFIG_IOCTL_CFG80211
} }
_exit_critical_bh(&pmlmepriv->lock, &irqL); _exit_critical_bh(&pmlmepriv->lock, &irqL);
@ -2660,7 +2660,7 @@ void rtw_set_scan_deny(struct adapter *adapter, u32 ms)
if (0) if (0)
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter->pbuddy_adapter)); DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter->pbuddy_adapter));
b_mlmepriv = &adapter->pbuddy_adapter->mlmepriv; b_mlmepriv = &adapter->pbuddy_adapter->mlmepriv;
ATOMIC_SET(&b_mlmepriv->set_scan_deny, 1); ATOMIC_SET(&b_mlmepriv->set_scan_deny, 1);
_set_timer(&b_mlmepriv->set_scan_deny_timer, ms); _set_timer(&b_mlmepriv->set_scan_deny_timer, ms);
#endif #endif
@ -2766,7 +2766,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
_queue *queue = &(pmlmepriv->scanned_queue); _queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
struct wlan_network *candidate = NULL; struct wlan_network *candidate = NULL;
u8 bSupportAntDiv = _FALSE; u8 bSupportAntDiv = _FALSE;
_func_enter_; _func_enter_;
@ -2793,7 +2793,7 @@ _func_enter_;
rtw_check_join_candidate(pmlmepriv, &candidate, pnetwork); rtw_check_join_candidate(pmlmepriv, &candidate, pnetwork);
} }
if(candidate == NULL) { if(candidate == NULL) {
DBG_871X("%s: return _FAIL(candidate == NULL)\n", __FUNCTION__); DBG_871X("%s: return _FAIL(candidate == NULL)\n", __FUNCTION__);
@ -2859,7 +2859,7 @@ _func_exit_;
sint rtw_set_auth(struct adapter * adapter,struct security_priv *psecuritypriv) sint rtw_set_auth(struct adapter * adapter,struct security_priv *psecuritypriv)
{ {
struct cmd_obj* pcmd; struct cmd_obj* pcmd;
struct setauth_parm *psetauthparm; struct setauth_parm *psetauthparm;
struct cmd_priv *pcmdpriv=&(adapter->cmdpriv); struct cmd_priv *pcmdpriv=&(adapter->cmdpriv);
sint res=_SUCCESS; sint res=_SUCCESS;
@ -3047,7 +3047,7 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
// //
// Search by BSSID, // Search by BSSID,
// Return Value: // Return Value:
// -1 :if there is no pre-auth key in the table // -1 :if there is no pre-auth key in the table
// >=0 :if there is pre-auth key, and return the entry id // >=0 :if there is pre-auth key, and return the entry id
// //
// //
@ -3117,12 +3117,12 @@ sint rtw_restruct_sec_ie(struct adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_
u8 authmode, securitytype, match; u8 authmode, securitytype, match;
u8 sec_ie[255], uncst_oui[4], bkup_ie[255]; u8 sec_ie[255], uncst_oui[4], bkup_ie[255];
u8 wpa_oui[4]={0x0, 0x50, 0xf2, 0x01}; u8 wpa_oui[4]={0x0, 0x50, 0xf2, 0x01};
uint ielength, cnt, remove_cnt; uint ielength, cnt, remove_cnt;
int iEntry; int iEntry;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
struct security_priv *psecuritypriv=&adapter->securitypriv; struct security_priv *psecuritypriv=&adapter->securitypriv;
uint ndisauthmode=psecuritypriv->ndisauthtype; uint ndisauthmode=psecuritypriv->ndisauthtype;
uint ndissecuritytype = psecuritypriv->ndisencryptstatus; uint ndissecuritytype = psecuritypriv->ndisencryptstatus;
_func_enter_; _func_enter_;
@ -3351,7 +3351,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
struct rtw_ieee80211_ht_cap ht_capie; struct rtw_ieee80211_ht_cap ht_capie;
unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00}; unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00};
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct qos_priv *pqospriv= &pmlmepriv->qospriv; struct qos_priv *pqospriv= &pmlmepriv->qospriv;
struct ht_priv *phtpriv = &pmlmepriv->htpriv; struct ht_priv *phtpriv = &pmlmepriv->htpriv;
@ -3794,4 +3794,3 @@ u8 rtw_get_buddy_bBusyTraffic(struct adapter *padapter)
} }
#endif //CONFIG_CONCURRENT_MODE #endif //CONFIG_CONCURRENT_MODE

77
core/rtw_mlme_ext.c
View file

@ -626,7 +626,7 @@ static void _mgt_dispatcher(struct adapter *padapter, struct mlme_handler *ptabl
if(ptable->func) if(ptable->func)
{ {
//receive the frames that ra(a1) is my address or ra(a1) is bc address. //receive the frames that ra(a1) is my address or ra(a1) is bc address.
if (!_rtw_memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN) && if (!_rtw_memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN) &&
!_rtw_memcmp(GetAddr1Ptr(pframe), bc_addr, ETH_ALEN)) !_rtw_memcmp(GetAddr1Ptr(pframe), bc_addr, ETH_ALEN))
{ {
@ -832,7 +832,7 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur = &(pmlmeinfo->network); WLAN_BSSID_EX *cur = &(pmlmeinfo->network);
u8 *pframe = precv_frame->u.hdr.rx_data; u8 *pframe = precv_frame->u.hdr.rx_data;
uint len = precv_frame->u.hdr.len; uint len = precv_frame->u.hdr.len;
u8 is_valid_p2p_probereq = _FALSE; u8 is_valid_p2p_probereq = _FALSE;
@ -1091,8 +1091,8 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)
if ((*(p + 1 + ielen) == 0x2D) && (*(p + 2 + ielen) != 0x2D)) if ((*(p + 1 + ielen) == 0x2D) && (*(p + 2 + ielen) != 0x2D))
{ {
/* Invalid value 0x2D is detected in Extended Supported Rates (ESR) IE. Try to fix the IE length to avoid failed Beacon parsing. */ /* Invalid value 0x2D is detected in Extended Supported Rates (ESR) IE. Try to fix the IE length to avoid failed Beacon parsing. */
DBG_871X("[WIFIDBG] Error in ESR IE is detected in Beacon of BSSID:"MAC_FMT". Fix the length of ESR IE to avoid failed Beacon parsing.\n", MAC_ARG(GetAddr3Ptr(pframe))); DBG_871X("[WIFIDBG] Error in ESR IE is detected in Beacon of BSSID:"MAC_FMT". Fix the length of ESR IE to avoid failed Beacon parsing.\n", MAC_ARG(GetAddr3Ptr(pframe)));
*(p + 1) = ielen - 1; *(p + 1) = ielen - 1;
} }
} }
#endif #endif
@ -1466,9 +1466,9 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram
offset = (GetPrivacy(pframe))? 4: 0; offset = (GetPrivacy(pframe))? 4: 0;
algthm = le16_to_cpu(*(__le16 *)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN + offset)); algthm = le16_to_cpu(*(__le16 *)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN + offset));
seq = le16_to_cpu(*(__le16 *)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN + offset + 2)); seq = le16_to_cpu(*(__le16 *)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN + offset + 2));
status = le16_to_cpu(*(__le16 *)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN + offset + 4)); status = le16_to_cpu(*(__le16 *)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN + offset + 4));
if (status != 0) if (status != 0)
{ {
@ -1564,7 +1564,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur = &(pmlmeinfo->network); WLAN_BSSID_EX *cur = &(pmlmeinfo->network);
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
u8 *pframe = precv_frame->u.hdr.rx_data; u8 *pframe = precv_frame->u.hdr.rx_data;
uint pkt_len = precv_frame->u.hdr.len; uint pkt_len = precv_frame->u.hdr.len;
@ -1743,7 +1743,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
//check RSN/WPA/WPS //check RSN/WPA/WPS
pstat->dot8021xalg = 0; pstat->dot8021xalg = 0;
pstat->wpa_psk = 0; pstat->wpa_psk = 0;
pstat->wpa_group_cipher = 0; pstat->wpa_group_cipher = 0;
pstat->wpa2_group_cipher = 0; pstat->wpa2_group_cipher = 0;
pstat->wpa_pairwise_cipher = 0; pstat->wpa_pairwise_cipher = 0;
@ -1859,7 +1859,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
if(psecuritypriv->wpa_psk == 0) if(psecuritypriv->wpa_psk == 0)
{ {
DBG_871X("STA " MAC_FMT ": WPA/RSN IE in association " DBG_871X("STA " MAC_FMT ": WPA/RSN IE in association "
"request, but AP don't support WPA/RSN\n", MAC_ARG(pstat->hwaddr)); "request, but AP don't support WPA/RSN\n", MAC_ARG(pstat->hwaddr));
status = WLAN_STATUS_INVALID_IE; status = WLAN_STATUS_INVALID_IE;
@ -2168,7 +2168,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
//WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); //WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
u8 *pframe = precv_frame->u.hdr.rx_data; u8 *pframe = precv_frame->u.hdr.rx_data;
uint pkt_len = precv_frame->u.hdr.len; uint pkt_len = precv_frame->u.hdr.len;
PNDIS_802_11_VARIABLE_IEs pWapiIE = NULL; PNDIS_802_11_VARIABLE_IEs pWapiIE = NULL;
@ -2313,7 +2313,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)
//_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); //_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
DBG_871X_LEVEL(_drv_always_, "ap recv deauth reason code(%d) sta:%pM\n", DBG_871X_LEVEL(_drv_always_, "ap recv deauth reason code(%d) sta:%pM\n",
reason, GetAddr2Ptr(pframe)); reason, GetAddr2Ptr(pframe));
psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
if(psta) if(psta)
@ -2359,7 +2359,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)
} }
DBG_871X_LEVEL(_drv_always_, "sta recv deauth reason code(%d) sta:%pM, ignore = %d\n", DBG_871X_LEVEL(_drv_always_, "sta recv deauth reason code(%d) sta:%pM, ignore = %d\n",
reason, GetAddr3Ptr(pframe), ignore_received_deauth); reason, GetAddr3Ptr(pframe), ignore_received_deauth);
if ( 0 == ignore_received_deauth ) if ( 0 == ignore_received_deauth )
{ {
@ -4655,12 +4655,12 @@ static u8 is_matched_in_profilelist( u8* peermacaddr, struct profile_info* profi
u8 i, match_result = 0; u8 i, match_result = 0;
DBG_871X( "[%s] peermac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__, DBG_871X( "[%s] peermac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__,
peermacaddr[0], peermacaddr[1],peermacaddr[2],peermacaddr[3],peermacaddr[4],peermacaddr[5]); peermacaddr[0], peermacaddr[1],peermacaddr[2],peermacaddr[3],peermacaddr[4],peermacaddr[5]);
for( i = 0; i < P2P_MAX_PERSISTENT_GROUP_NUM; i++, profileinfo++ ) for( i = 0; i < P2P_MAX_PERSISTENT_GROUP_NUM; i++, profileinfo++ )
{ {
DBG_871X( "[%s] profileinfo_mac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__, DBG_871X( "[%s] profileinfo_mac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__,
profileinfo->peermac[0], profileinfo->peermac[1],profileinfo->peermac[2],profileinfo->peermac[3],profileinfo->peermac[4],profileinfo->peermac[5]); profileinfo->peermac[0], profileinfo->peermac[1],profileinfo->peermac[2],profileinfo->peermac[3],profileinfo->peermac[4],profileinfo->peermac[5]);
if ( _rtw_memcmp( peermacaddr, profileinfo->peermac, ETH_ALEN ) ) if ( _rtw_memcmp( peermacaddr, profileinfo->peermac, ETH_ALEN ) )
{ {
match_result = 1; match_result = 1;
@ -4684,7 +4684,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da)
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
//WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); //WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
u16 beacon_interval = 100; u16 beacon_interval = 100;
u16 capInfo = 0; u16 capInfo = 0;
struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
@ -6354,7 +6354,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
#endif //#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) #endif //#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
@ -6670,7 +6670,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
#endif //#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) #endif //#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
unsigned int rate_len; unsigned int rate_len;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
@ -7970,7 +7970,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
unsigned char *pframe; unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
__le16 *fctrl; __le16 *fctrl;
unsigned short *qc; unsigned short *qc;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -8297,7 +8297,7 @@ void issue_action_SA_Query(struct adapter *padapter, unsigned char *raddr, unsig
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct sta_info *psta; struct sta_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct registry_priv *pregpriv = &padapter->registrypriv; struct registry_priv *pregpriv = &padapter->registrypriv;
DBG_871X("%s\n", __FUNCTION__); DBG_871X("%s\n", __FUNCTION__);
@ -8381,7 +8381,7 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct sta_info *psta; struct sta_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct registry_priv *pregpriv = &padapter->registrypriv; struct registry_priv *pregpriv = &padapter->registrypriv;
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
u8 tendaAPMac[] = {0xC8, 0x3A, 0x35}; u8 tendaAPMac[] = {0xC8, 0x3A, 0x35};
#endif #endif
@ -9245,7 +9245,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA
u32 packet_len = precv_frame->u.hdr.len; u32 packet_len = precv_frame->u.hdr.len;
u8 ie_offset; u8 ie_offset;
__le32 le_tmp; __le32 le_tmp;
struct registry_priv *pregistrypriv = &padapter->registrypriv; struct registry_priv *pregistrypriv = &padapter->registrypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -10156,7 +10156,7 @@ void report_join_res(struct adapter *padapter, int res)
pjoinbss_evt = (struct joinbss_event*)(pevtcmd + sizeof(struct C2HEvent_Header)); pjoinbss_evt = (struct joinbss_event*)(pevtcmd + sizeof(struct C2HEvent_Header));
_rtw_memcpy((unsigned char *)(&(pjoinbss_evt->network.network)), &(pmlmeinfo->network), sizeof(WLAN_BSSID_EX)); _rtw_memcpy((unsigned char *)(&(pjoinbss_evt->network.network)), &(pmlmeinfo->network), sizeof(WLAN_BSSID_EX));
pjoinbss_evt->network.join_res = pjoinbss_evt->network.aid = res; pjoinbss_evt->network.join_res = pjoinbss_evt->network.aid = res;
DBG_871X("report_join_res(%d)\n", res); DBG_871X("report_join_res(%d)\n", res);
@ -10341,7 +10341,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
struct sta_info *psta, *psta_bmc; struct sta_info *psta, *psta_bmc;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
u8 join_type; u8 join_type;
u16 media_status; u16 media_status;
@ -10812,7 +10812,7 @@ void survey_timer_hdl(struct adapter *padapter)
struct cmd_obj *ph2c; struct cmd_obj *ph2c;
struct sitesurvey_parm *psurveyPara; struct sitesurvey_parm *psurveyPara;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
#endif #endif
@ -11053,7 +11053,7 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf)
else if(psetop->mode == Ndis802_11Infrastructure) else if(psetop->mode == Ndis802_11Infrastructure)
{ {
pmlmeinfo->state &= ~(BIT(0)|BIT(1));// clear state pmlmeinfo->state &= ~(BIT(0)|BIT(1));// clear state
pmlmeinfo->state |= WIFI_FW_STATION_STATE;//set to STATION_STATE pmlmeinfo->state |= WIFI_FW_STATION_STATE;//set to STATION_STATE
type = _HW_STATE_STATION_; type = _HW_STATE_STATION_;
} }
else if(psetop->mode == Ndis802_11IBSS) else if(psetop->mode == Ndis802_11IBSS)
@ -11398,7 +11398,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf)
rtw_free_uc_swdec_pending_queue(padapter); rtw_free_uc_swdec_pending_queue(padapter);
return H2C_SUCCESS; return H2C_SUCCESS;
} }
static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_channel *out, static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_channel *out,
@ -11611,7 +11611,7 @@ u8 setauth_hdl(struct adapter *padapter, unsigned char *pbuf)
pmlmeinfo->auth_algo = pparm->mode; pmlmeinfo->auth_algo = pparm->mode;
} }
return H2C_SUCCESS; return H2C_SUCCESS;
} }
u8 setkey_hdl(struct adapter *padapter, u8 *pbuf) u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)
@ -11697,7 +11697,7 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)
#endif #endif
DBG_871X_LEVEL(_drv_always_, "set pairwise key to hw: alg:%d(WEP40-1 WEP104-5 TKIP-2 AES-4) camid:%d\n", DBG_871X_LEVEL(_drv_always_, "set pairwise key to hw: alg:%d(WEP40-1 WEP104-5 TKIP-2 AES-4) camid:%d\n",
pparm->algorithm, cam_id); pparm->algorithm, cam_id);
if((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) if((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
{ {
@ -11775,14 +11775,14 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)
u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf) u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)
{ {
struct addBaReq_parm *pparm = (struct addBaReq_parm *)pbuf; struct addBaReq_parm *pparm = (struct addBaReq_parm *)pbuf;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, pparm->addr); struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, pparm->addr);
if(!psta) if(!psta)
return H2C_SUCCESS; return H2C_SUCCESS;
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
if (((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && (pmlmeinfo->HT_enable)) || if (((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && (pmlmeinfo->HT_enable)) ||
@ -11812,13 +11812,13 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)
psta->htpriv.candidate_tid_bitmap &= ~BIT(pparm->tid); psta->htpriv.candidate_tid_bitmap &= ~BIT(pparm->tid);
} }
#endif //CONFIG_80211N_HT #endif //CONFIG_80211N_HT
return H2C_SUCCESS; return H2C_SUCCESS;
} }
u8 set_tx_beacon_cmd(struct adapter* padapter) u8 set_tx_beacon_cmd(struct adapter* padapter)
{ {
struct cmd_obj *ph2c; struct cmd_obj *ph2c;
struct Tx_Beacon_param *ptxBeacon_parm; struct Tx_Beacon_param *ptxBeacon_parm;
struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -11866,7 +11866,7 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
{ {
u8 evt_code, evt_seq; u8 evt_code, evt_seq;
u16 evt_sz; u16 evt_sz;
uint *peventbuf; uint *peventbuf;
void (*event_callback)(struct adapter *dev, u8 *pbuf); void (*event_callback)(struct adapter *dev, u8 *pbuf);
struct evt_priv *pevt_priv = &(padapter->evtpriv); struct evt_priv *pevt_priv = &(padapter->evtpriv);
@ -13074,7 +13074,7 @@ u8 set_ch_hdl(struct adapter *padapter, u8 *pbuf)
set_channel_bwmode(padapter, set_ch_parm->ch, set_ch_parm->ch_offset, set_ch_parm->bw); set_channel_bwmode(padapter, set_ch_parm->ch, set_ch_parm->ch_offset, set_ch_parm->bw);
return H2C_SUCCESS; return H2C_SUCCESS;
} }
u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf) u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf)
@ -13091,7 +13091,7 @@ u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf)
pmlmeext->max_chan_nums = init_channel_set(padapter, setChannelPlan_param->channel_plan, pmlmeext->channel_set); pmlmeext->max_chan_nums = init_channel_set(padapter, setChannelPlan_param->channel_plan, pmlmeext->channel_set);
init_channel_list(padapter, pmlmeext->channel_set, pmlmeext->max_chan_nums, &pmlmeext->channel_list); init_channel_list(padapter, pmlmeext->channel_set, pmlmeext->max_chan_nums, &pmlmeext->channel_list);
return H2C_SUCCESS; return H2C_SUCCESS;
} }
u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf) u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf)
@ -13107,7 +13107,7 @@ u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf)
BlinkHandler(ledBlink_param->pLed); BlinkHandler(ledBlink_param->pLed);
#endif #endif
return H2C_SUCCESS; return H2C_SUCCESS;
} }
u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf) u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf)
@ -13142,7 +13142,7 @@ u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf)
DBG_871X("Switched to DFS band (ch %02x) again!!\n", new_ch_no); DBG_871X("Switched to DFS band (ch %02x) again!!\n", new_ch_no);
} }
return H2C_SUCCESS; return H2C_SUCCESS;
#else #else
return H2C_REJECTED; return H2C_REJECTED;
#endif //CONFIG_DFS #endif //CONFIG_DFS
@ -13324,4 +13324,3 @@ u8 tdls_hdl(struct adapter *padapter, unsigned char *pbuf)
#endif //CONFIG_TDLS #endif //CONFIG_TDLS
} }

17
core/rtw_mp_ioctl.c
View file

@ -176,7 +176,7 @@ _func_enter_;
path, offset, value)); path, offset, value));
_irqlevel_changed_(&oldirql, LOWER); _irqlevel_changed_(&oldirql, LOWER);
write_rfreg(Adapter, path, offset, value); write_rfreg(Adapter, path, offset, value);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_; _func_exit_;
@ -828,7 +828,7 @@ NDIS_STATUS oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv *poid_par_priv
#ifdef PLATFORM_OS_XP #ifdef PLATFORM_OS_XP
_irqL oldirql; _irqL oldirql;
#endif #endif
u32 bStartTest; u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -924,7 +924,7 @@ NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)
#ifdef PLATFORM_OS_XP #ifdef PLATFORM_OS_XP
_irqL oldirql; _irqL oldirql;
#endif #endif
pRW_Reg RegRWStruct; pRW_Reg RegRWStruct;
u32 offset, width; u32 offset, width;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -976,7 +976,7 @@ NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
#ifdef PLATFORM_OS_XP #ifdef PLATFORM_OS_XP
_irqL oldirql; _irqL oldirql;
#endif #endif
pRW_Reg RegRWStruct; pRW_Reg RegRWStruct;
u32 offset, width, value; u32 offset, width, value;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -1125,7 +1125,7 @@ _func_enter_;
TxCmd_Info=(TX_CMD_Desc*)poid_par_priv->information_buf; TxCmd_Info=(TX_CMD_Desc*)poid_par_priv->information_buf;
RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:Addr=%.8X\n", TxCmd_Info->offset)); RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:Addr=%.8X\n", TxCmd_Info->offset));
RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:1.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[0])); RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:1.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[0]));
RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:2.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[1])); RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:2.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[1]));
RT_TRACE(_module_mp_, _drv_info_, (("WRITE_TXCMD:3.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[2])); RT_TRACE(_module_mp_, _drv_info_, (("WRITE_TXCMD:3.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[2]));
RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:4.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[3])); RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:4.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[3]));
@ -1929,7 +1929,7 @@ NDIS_STATUS oid_rt_pro_add_sta_info_hdl(struct oid_par_priv *poid_par_priv)
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
UCHAR *macaddr; UCHAR *macaddr;
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -2693,7 +2693,7 @@ NDIS_STATUS oid_rt_pro_set_tx_agc_offset_hdl(struct oid_par_priv *poid_par_priv)
#endif #endif
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
u32 txagc; u32 txagc;
_func_enter_; _func_enter_;
@ -2728,7 +2728,7 @@ NDIS_STATUS oid_rt_pro_set_pkt_test_mode_hdl(struct oid_par_priv *poid_par_priv)
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
struct mp_priv *pmppriv = &Adapter->mppriv; struct mp_priv *pmppriv = &Adapter->mppriv;
u32 type; u32 type;
_func_enter_; _func_enter_;
@ -2944,4 +2944,3 @@ _func_exit_;
return 0; return 0;
#endif #endif
} }

1
core/rtw_odm.c
View file

@ -203,4 +203,3 @@ void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini, s8 TH_E
odm->AdapEn_RSSI = AdapEn_RSSI; odm->AdapEn_RSSI = AdapEn_RSSI;
odm->IGI_LowerBound = IGI_LowerBound; odm->IGI_LowerBound = IGI_LowerBound;
} }

9
core/rtw_p2p.c
View file

@ -960,7 +960,7 @@ u32 build_assoc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
struct adapter *padapter = NULL; struct adapter *padapter = NULL;
struct mlme_priv *pmlmepriv = NULL; struct mlme_priv *pmlmepriv = NULL;
struct wifi_display_info *pwfd_info = NULL; struct wifi_display_info *pwfd_info = NULL;
@ -2438,7 +2438,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO , pattr_content, (uint*)&attr_contentlen); rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO , pattr_content, (uint*)&attr_contentlen);
_rtw_memcpy(psta->dev_addr, pattr_content, ETH_ALEN);//P2P Device Address _rtw_memcpy(psta->dev_addr, pattr_content, ETH_ALEN);//P2P Device Address
pattr_content += ETH_ALEN; pattr_content += ETH_ALEN;
@ -3321,7 +3321,7 @@ void find_phase_handler( struct adapter* padapter )
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
NDIS_802_11_SSID ssid; NDIS_802_11_SSID ssid;
_irqL irqL; _irqL irqL;
u8 _status = 0; u8 _status = 0;
@ -4750,7 +4750,7 @@ static void restore_p2p_state_timer_process (void *FunctionContext)
static void pre_tx_scan_timer_process (void *FunctionContext) static void pre_tx_scan_timer_process (void *FunctionContext)
{ {
struct adapter *adapter = (struct adapter *) FunctionContext; struct adapter *adapter = (struct adapter *) FunctionContext;
struct wifidirect_info *pwdinfo = &adapter->wdinfo; struct wifidirect_info *pwdinfo = &adapter->wdinfo;
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -5309,4 +5309,3 @@ exit:
} }
#endif //CONFIG_P2P #endif //CONFIG_P2P

8
core/rtw_pwrctrl.c
View file

@ -1833,9 +1833,9 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
){ ){
DBG_8192C("%s: bDriverStopped=%d, bup=%d, hw_init_completed=%u\n" DBG_8192C("%s: bDriverStopped=%d, bup=%d, hw_init_completed=%u\n"
, caller , caller
, padapter->bDriverStopped , padapter->bDriverStopped
, padapter->bup , padapter->bup
, padapter->hw_init_completed); , padapter->hw_init_completed);
ret= _FALSE; ret= _FALSE;
goto exit; goto exit;
} }
@ -1896,5 +1896,3 @@ int rtw_pm_set_ips(struct adapter *padapter, u8 mode)
} }
return 0; return 0;
} }

17
core/rtw_recv.c
View file

@ -354,7 +354,7 @@ using spinlock to protect
void rtw_free_recvframe_queue(_queue *pframequeue, _queue *pfree_recv_queue) void rtw_free_recvframe_queue(_queue *pframequeue, _queue *pfree_recv_queue)
{ {
union recv_frame *precvframe; union recv_frame *precvframe;
_list *plist, *phead; _list *plist, *phead;
_func_enter_; _func_enter_;
@ -481,7 +481,7 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe){
//u8 *iv,rxdata_key_idx=0; //u8 *iv,rxdata_key_idx=0;
struct sta_info *stainfo; struct sta_info *stainfo;
struct rx_pkt_attrib *prxattrib=&precvframe->u.hdr.attrib; struct rx_pkt_attrib *prxattrib=&precvframe->u.hdr.attrib;
struct security_priv *psecuritypriv=&adapter->securitypriv; struct security_priv *psecuritypriv=&adapter->securitypriv;
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1121,7 +1121,7 @@ sint sta2sta_data_frame(
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
sint ret = _SUCCESS; sint ret = _SUCCESS;
struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
u8 *mybssid = get_bssid(pmlmepriv); u8 *mybssid = get_bssid(pmlmepriv);
u8 *myhwaddr = myid(&adapter->eeprompriv); u8 *myhwaddr = myid(&adapter->eeprompriv);
@ -1335,7 +1335,7 @@ sint ap2sta_data_frame(
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
sint ret = _SUCCESS; sint ret = _SUCCESS;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
u8 *mybssid = get_bssid(pmlmepriv); u8 *mybssid = get_bssid(pmlmepriv);
u8 *myhwaddr = myid(&adapter->eeprompriv); u8 *myhwaddr = myid(&adapter->eeprompriv);
@ -1491,7 +1491,7 @@ sint sta2ap_data_frame(
{ {
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
unsigned char *mybssid = get_bssid(pmlmepriv); unsigned char *mybssid = get_bssid(pmlmepriv);
sint ret=_SUCCESS; sint ret=_SUCCESS;
@ -1834,7 +1834,7 @@ sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_f
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
sint ret = _SUCCESS; sint ret = _SUCCESS;
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
@ -3151,7 +3151,7 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr
//_enter_critical_ex(&ppending_recvframe_queue->lock, &irql); //_enter_critical_ex(&ppending_recvframe_queue->lock, &irql);
//_rtw_spinlock_ex(&ppending_recvframe_queue->lock); //_rtw_spinlock_ex(&ppending_recvframe_queue->lock);
phead = get_list_head(ppending_recvframe_queue); phead = get_list_head(ppending_recvframe_queue);
plist = get_next(phead); plist = get_next(phead);
#if 0 #if 0
@ -3955,6 +3955,3 @@ set_timer:
} }
#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS #endif //CONFIG_NEW_SIGNAL_STAT_PROCESS

1
core/rtw_rf.c
View file

@ -92,4 +92,3 @@ u32 rtw_freq2ch(u32 freq)
return ch; return ch;
} }

37
core/rtw_security.c
View file

@ -38,7 +38,7 @@ struct arc4context
}; };
static void arcfour_init(struct arc4context *parc4ctx, u8 * key,u32 key_len) static void arcfour_init(struct arc4context *parc4ctx, u8 * key,u32 key_len)
{ {
u32 t, u; u32 t, u;
u32 keyindex; u32 keyindex;
@ -173,7 +173,7 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
u8 wepkey[16]; u8 wepkey[16];
u8 hw_hdr_offset=0; u8 hw_hdr_offset=0;
struct pkt_attrib *pattrib = &((struct xmit_frame*)pxmitframe)->attrib; struct pkt_attrib *pattrib = &((struct xmit_frame*)pxmitframe)->attrib;
struct security_priv *psecuritypriv=&padapter->securitypriv; struct security_priv *psecuritypriv=&padapter->securitypriv;
struct xmit_priv *pxmitpriv=&padapter->xmitpriv; struct xmit_priv *pxmitpriv=&padapter->xmitpriv;
_func_enter_; _func_enter_;
@ -245,12 +245,12 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
// exclude ICV // exclude ICV
u8 crc[4]; u8 crc[4];
struct arc4context mycontext; struct arc4context mycontext;
sint length; sint length;
u32 keylength; u32 keylength;
u8 *pframe, *payload,*iv,wepkey[16]; u8 *pframe, *payload,*iv,wepkey[16];
u8 keyindex; u8 keyindex;
struct rx_pkt_attrib *prxattrib = &(((union recv_frame*)precvframe)->u.hdr.attrib); struct rx_pkt_attrib *prxattrib = &(((union recv_frame*)precvframe)->u.hdr.attrib);
struct security_priv *psecuritypriv=&padapter->securitypriv; struct security_priv *psecuritypriv=&padapter->securitypriv;
_func_enter_; _func_enter_;
@ -291,7 +291,7 @@ _func_exit_;
} }
//3 =====TKIP related===== //3 =====TKIP related=====
static u32 secmicgetuint32( u8 * p ) static u32 secmicgetuint32( u8 * p )
// Convert from Byte[] to Us4Byte32 in a portable way // Convert from Byte[] to Us4Byte32 in a portable way
@ -567,7 +567,7 @@ _func_enter_;
/* size on the 80-bit block P1K[], using the 128-bit key TK[] */ /* size on the 80-bit block P1K[], using the 128-bit key TK[] */
for (i=0; i < PHASE1_LOOP_CNT ;i++) for (i=0; i < PHASE1_LOOP_CNT ;i++)
{ /* Each add operation here is mod 2**16 */ { /* Each add operation here is mod 2**16 */
p1k[0] += _S_(p1k[4] ^ TK16((i&1)+0)); p1k[0] += _S_(p1k[4] ^ TK16((i&1)+0));
p1k[1] += _S_(p1k[0] ^ TK16((i&1)+2)); p1k[1] += _S_(p1k[0] ^ TK16((i&1)+2));
p1k[2] += _S_(p1k[1] ^ TK16((i&1)+4)); p1k[2] += _S_(p1k[1] ^ TK16((i&1)+4));
p1k[3] += _S_(p1k[2] ^ TK16((i&1)+6)); p1k[3] += _S_(p1k[2] ^ TK16((i&1)+6));
@ -657,14 +657,14 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
u8 crc[4]; u8 crc[4];
u8 hw_hdr_offset = 0; u8 hw_hdr_offset = 0;
struct arc4context mycontext; struct arc4context mycontext;
sint curfragnum,length; sint curfragnum,length;
u32 prwskeylen; u32 prwskeylen;
u8 *pframe, *payload,*iv,*prwskey; u8 *pframe, *payload,*iv,*prwskey;
union pn48 dot11txpn; union pn48 dot11txpn;
struct sta_info *stainfo; struct sta_info *stainfo;
struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib; struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib;
struct security_priv *psecuritypriv=&padapter->securitypriv; struct security_priv *psecuritypriv=&padapter->securitypriv;
struct xmit_priv *pxmitpriv=&padapter->xmitpriv; struct xmit_priv *pxmitpriv=&padapter->xmitpriv;
u32 res=_SUCCESS; u32 res=_SUCCESS;
_func_enter_; _func_enter_;
@ -778,14 +778,14 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
u8 ttkey[16]; u8 ttkey[16];
u8 crc[4]; u8 crc[4];
struct arc4context mycontext; struct arc4context mycontext;
sint length; sint length;
u32 prwskeylen; u32 prwskeylen;
u8 *pframe, *payload,*iv,*prwskey; u8 *pframe, *payload,*iv,*prwskey;
union pn48 dot11txpn; union pn48 dot11txpn;
struct sta_info *stainfo; struct sta_info *stainfo;
struct rx_pkt_attrib *prxattrib = &((union recv_frame *)precvframe)->u.hdr.attrib; struct rx_pkt_attrib *prxattrib = &((union recv_frame *)precvframe)->u.hdr.attrib;
struct security_priv *psecuritypriv=&padapter->securitypriv; struct security_priv *psecuritypriv=&padapter->securitypriv;
// struct recv_priv *precvpriv=&padapter->recvpriv; // struct recv_priv *precvpriv=&padapter->recvpriv;
u32 res=_SUCCESS; u32 res=_SUCCESS;
@ -1513,7 +1513,7 @@ _func_enter_;
/* Insert MIC into payload */ /* Insert MIC into payload */
for (j = 0; j < 8; j++) for (j = 0; j < 8; j++)
pframe[payload_index+j] = mic[j]; //message[payload_index+j] = mic[j]; pframe[payload_index+j] = mic[j]; //message[payload_index+j] = mic[j];
payload_index = hdrlen + 8; payload_index = hdrlen + 8;
for (i=0; i< num_blocks; i++) for (i=0; i< num_blocks; i++)
@ -1586,14 +1586,14 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
/*static*/ /*static*/
// unsigned char message[MAX_MSG_SIZE]; // unsigned char message[MAX_MSG_SIZE];
/* Intermediate Buffers */ /* Intermediate Buffers */
sint curfragnum,length; sint curfragnum,length;
u32 prwskeylen; u32 prwskeylen;
u8 *pframe,*prwskey; //, *payload,*iv u8 *pframe,*prwskey; //, *payload,*iv
u8 hw_hdr_offset = 0; u8 hw_hdr_offset = 0;
struct sta_info *stainfo; struct sta_info *stainfo;
struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib; struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib;
struct security_priv *psecuritypriv=&padapter->securitypriv; struct security_priv *psecuritypriv=&padapter->securitypriv;
struct xmit_priv *pxmitpriv=&padapter->xmitpriv; struct xmit_priv *pxmitpriv=&padapter->xmitpriv;
// uint offset = 0; // uint offset = 0;
@ -1895,7 +1895,7 @@ _func_enter_;
/* Insert MIC into payload */ /* Insert MIC into payload */
for (j = 0; j < 8; j++) for (j = 0; j < 8; j++)
message[payload_index+j] = mic[j]; message[payload_index+j] = mic[j];
payload_index = hdrlen + 8; payload_index = hdrlen + 8;
for (i=0; i< num_blocks; i++) for (i=0; i< num_blocks; i++)
@ -1977,14 +1977,14 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
// unsigned char message[MAX_MSG_SIZE]; // unsigned char message[MAX_MSG_SIZE];
/* Intermediate Buffers */ /* Intermediate Buffers */
sint length; sint length;
u8 *pframe,*prwskey; //, *payload,*iv u8 *pframe,*prwskey; //, *payload,*iv
struct sta_info *stainfo; struct sta_info *stainfo;
struct rx_pkt_attrib *prxattrib = &((union recv_frame *)precvframe)->u.hdr.attrib; struct rx_pkt_attrib *prxattrib = &((union recv_frame *)precvframe)->u.hdr.attrib;
struct security_priv *psecuritypriv=&padapter->securitypriv; struct security_priv *psecuritypriv=&padapter->securitypriv;
// struct recv_priv *precvpriv=&padapter->recvpriv; // struct recv_priv *precvpriv=&padapter->recvpriv;
u32 res=_SUCCESS; u32 res=_SUCCESS;
_func_enter_; _func_enter_;
@ -3127,4 +3127,3 @@ u8 rtw_handle_tkip_countermeasure(struct adapter* adapter, const char *caller)
return status; return status;
} }

1
core/rtw_sreset.c
View file

@ -353,4 +353,3 @@ void sreset_reset(struct adapter *padapter)
DBG_871X("%s done in %d ms\n", __FUNCTION__, rtw_get_passing_time_ms(start)); DBG_871X("%s done in %d ms\n", __FUNCTION__, rtw_get_passing_time_ms(start));
#endif #endif
} }

13
core/rtw_sta_mgt.c
View file

@ -284,11 +284,11 @@ void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv)
u32 _rtw_free_sta_priv(struct sta_priv *pstapriv) u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)
{ {
_irqL irqL; _irqL irqL;
_list *phead, *plist; _list *phead, *plist;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct recv_reorder_ctrl *preorder_ctrl; struct recv_reorder_ctrl *preorder_ctrl;
int index; int index;
_func_enter_; _func_enter_;
if(pstapriv){ if(pstapriv){
@ -573,7 +573,7 @@ _func_enter_;
_enter_critical_bh(&ppending_recvframe_queue->lock, &irqL); _enter_critical_bh(&ppending_recvframe_queue->lock, &irqL);
phead = get_list_head(ppending_recvframe_queue); phead = get_list_head(ppending_recvframe_queue);
plist = get_next(phead); plist = get_next(phead);
while(!rtw_is_list_empty(phead)) while(!rtw_is_list_empty(phead))
@ -760,7 +760,7 @@ _func_exit_;
u32 rtw_init_bcmc_stainfo(struct adapter* padapter) u32 rtw_init_bcmc_stainfo(struct adapter* padapter)
{ {
struct sta_info *psta; struct sta_info *psta;
struct tx_servq *ptxservq; struct tx_servq *ptxservq;
u32 res=_SUCCESS; u32 res=_SUCCESS;
NDIS_802_11_MAC_ADDRESS bcast_addr= {0xff,0xff,0xff,0xff,0xff,0xff}; NDIS_802_11_MAC_ADDRESS bcast_addr= {0xff,0xff,0xff,0xff,0xff,0xff};
@ -801,8 +801,8 @@ _func_exit_;
struct sta_info* rtw_get_bcmc_stainfo(struct adapter* padapter) struct sta_info* rtw_get_bcmc_stainfo(struct adapter* padapter)
{ {
struct sta_info *psta; struct sta_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
_func_enter_; _func_enter_;
psta = rtw_get_stainfo(pstapriv, bc_addr); psta = rtw_get_stainfo(pstapriv, bc_addr);
@ -861,4 +861,3 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)
return res; return res;
} }

47
core/rtw_tdls.c
View file

@ -247,7 +247,7 @@ exit:
void free_tdls_sta(_adapter *padapter, struct sta_info *ptdls_sta) void free_tdls_sta(_adapter *padapter, struct sta_info *ptdls_sta)
{ {
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
_irqL irqL; _irqL irqL;
//free peer sta_info //free peer sta_info
@ -544,7 +544,7 @@ void issue_tdls_setup_req(_adapter *padapter, u8 *mac_addr)
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *ptdls_sta= NULL; struct sta_info *ptdls_sta= NULL;
_irqL irqL; _irqL irqL;
static u8 dialogtoken = 0; static u8 dialogtoken = 0;
@ -1090,7 +1090,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
struct tdls_info *ptdlsinfo = &adapter->tdlsinfo; struct tdls_info *ptdlsinfo = &adapter->tdlsinfo;
u8 *psa, *pmyid; u8 *psa, *pmyid;
struct sta_info *ptdls_sta= NULL; struct sta_info *ptdls_sta= NULL;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
@ -1288,7 +1288,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
goto exit; goto exit;
} }
issue_tdls_setup_rsp(adapter, precv_frame); issue_tdls_setup_rsp(adapter, precv_frame);
if(ptdls_sta->stat_code==0) if(ptdls_sta->stat_code==0)
{ {
@ -1308,7 +1308,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
{ {
struct tdls_info *ptdlsinfo = &adapter->tdlsinfo; struct tdls_info *ptdlsinfo = &adapter->tdlsinfo;
struct sta_info *ptdls_sta= NULL; struct sta_info *ptdls_sta= NULL;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
_irqL irqL; _irqL irqL;
struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib;
@ -1483,7 +1483,7 @@ sint On_TDLS_Setup_Cfm(_adapter *adapter, union recv_frame *precv_frame)
{ {
struct tdls_info *ptdlsinfo = &adapter->tdlsinfo; struct tdls_info *ptdlsinfo = &adapter->tdlsinfo;
struct sta_info *ptdls_sta= NULL; struct sta_info *ptdls_sta= NULL;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
_irqL irqL; _irqL irqL;
struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib;
@ -1528,7 +1528,7 @@ sint On_TDLS_Setup_Cfm(_adapter *adapter, union recv_frame *precv_frame)
break; break;
case _VENDOR_SPECIFIC_IE_: case _VENDOR_SPECIFIC_IE_:
break; break;
case _FTIE_: case _FTIE_:
pftie=(u8*)pIE; pftie=(u8*)pIE;
break; break;
case _TIMEOUT_ITVL_IE_: case _TIMEOUT_ITVL_IE_:
@ -1536,7 +1536,7 @@ sint On_TDLS_Setup_Cfm(_adapter *adapter, union recv_frame *precv_frame)
break; break;
case _HT_EXTRA_INFO_IE_: case _HT_EXTRA_INFO_IE_:
break; break;
case _LINK_ID_IE_: case _LINK_ID_IE_:
plinkid_ie=(u8*)pIE; plinkid_ie=(u8*)pIE;
break; break;
default: default:
@ -1641,7 +1641,7 @@ sint On_TDLS_Teardown(_adapter *adapter, union recv_frame *precv_frame)
struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib;
struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct sta_info *ptdls_sta= NULL; struct sta_info *ptdls_sta= NULL;
_irqL irqL; _irqL irqL;
@ -1771,7 +1771,7 @@ sint On_TDLS_Peer_Traffic_Rsp(_adapter *adapter, union recv_frame *precv_frame)
sint On_TDLS_Ch_Switch_Req(_adapter *adapter, union recv_frame *precv_frame) sint On_TDLS_Ch_Switch_Req(_adapter *adapter, union recv_frame *precv_frame)
{ {
struct sta_info *ptdls_sta= NULL; struct sta_info *ptdls_sta= NULL;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib;
u8 *psa; u8 *psa;
@ -1807,7 +1807,7 @@ sint On_TDLS_Ch_Switch_Req(_adapter *adapter, union recv_frame *precv_frame)
break; break;
case _CH_SWTICH_ANNOUNCE_: case _CH_SWTICH_ANNOUNCE_:
break; break;
case _LINK_ID_IE_: case _LINK_ID_IE_:
break; break;
case _CH_SWITCH_TIMING_: case _CH_SWITCH_TIMING_:
_rtw_memcpy(&ptdls_sta->ch_switch_time, pIE->data, 2); _rtw_memcpy(&ptdls_sta->ch_switch_time, pIE->data, 2);
@ -1844,7 +1844,7 @@ sint On_TDLS_Ch_Switch_Req(_adapter *adapter, union recv_frame *precv_frame)
sint On_TDLS_Ch_Switch_Rsp(_adapter *adapter, union recv_frame *precv_frame) sint On_TDLS_Ch_Switch_Rsp(_adapter *adapter, union recv_frame *precv_frame)
{ {
struct sta_info *ptdls_sta= NULL; struct sta_info *ptdls_sta= NULL;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib;
u8 *psa; u8 *psa;
@ -1898,7 +1898,7 @@ sint On_TDLS_Ch_Switch_Rsp(_adapter *adapter, union recv_frame *precv_frame)
switch (pIE->ElementID) switch (pIE->ElementID)
{ {
case _LINK_ID_IE_: case _LINK_ID_IE_:
break; break;
case _CH_SWITCH_TIMING_: case _CH_SWITCH_TIMING_:
_rtw_memcpy(&switch_time, pIE->data, 2); _rtw_memcpy(&switch_time, pIE->data, 2);
@ -2029,11 +2029,11 @@ void rtw_build_tdls_setup_req_ies(_adapter * padapter, struct xmit_frame * pxmit
u8 category = RTW_WLAN_CATEGORY_TDLS; u8 category = RTW_WLAN_CATEGORY_TDLS;
u8 action = TDLS_SETUP_REQUEST; u8 action = TDLS_SETUP_REQUEST;
u8 bssrate[NDIS_802_11_LENGTH_RATES_EX]; //Use NDIS_802_11_LENGTH_RATES_EX in order to call func.rtw_set_supported_rate u8 bssrate[NDIS_802_11_LENGTH_RATES_EX]; //Use NDIS_802_11_LENGTH_RATES_EX in order to call func.rtw_set_supported_rate
int bssrate_len = 0, i = 0 ; int bssrate_len = 0, i = 0 ;
u8 more_supportedrates = 0; u8 more_supportedrates = 0;
unsigned int ie_len; unsigned int ie_len;
u8 *p; u8 *p;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 link_id_addr[18] = {0}; u8 link_id_addr[18] = {0};
u8 iedata=0; u8 iedata=0;
u8 sup_ch[ 30 * 2 ] = {0x00 }, sup_ch_idx = 0, idx_5g = 2; //For supported channel u8 sup_ch[ 30 * 2 ] = {0x00 }, sup_ch_idx = 0, idx_5g = 2; //For supported channel
@ -2152,7 +2152,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmit
u8 more_supportedrates = 0; u8 more_supportedrates = 0;
unsigned int ie_len; unsigned int ie_len;
unsigned char *p; unsigned char *p;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 link_id_addr[18] = {0}; u8 link_id_addr[18] = {0};
u8 iedata=0; u8 iedata=0;
u8 timeout_itvl[5]; //setup response timeout interval will copy from request u8 timeout_itvl[5]; //setup response timeout interval will copy from request
@ -2300,7 +2300,7 @@ void rtw_build_tdls_setup_cfm_ies(_adapter * padapter, struct xmit_frame * pxmit
unsigned int ie_len; unsigned int ie_len;
unsigned char *p; unsigned char *p;
u8 timeout_itvl[5]; //set timeout interval to maximum value u8 timeout_itvl[5]; //set timeout interval to maximum value
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 link_id_addr[18] = {0}; u8 link_id_addr[18] = {0};
u8 *pftie, *ptimeout_ie, *plinkid_ie, *prsnie, *pftie_mic; u8 *pftie, *ptimeout_ie, *plinkid_ie, *prsnie, *pftie_mic;
@ -2367,7 +2367,7 @@ void rtw_build_tdls_teardown_ies(_adapter * padapter, struct xmit_frame * pxmitf
u8 link_id_addr[18] = {0}; u8 link_id_addr[18] = {0};
struct sta_info *ptdls_sta = rtw_get_stainfo( &(padapter->stapriv) , pattrib->dst); struct sta_info *ptdls_sta = rtw_get_stainfo( &(padapter->stapriv) , pattrib->dst);
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
//payload type //payload type
pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen));
@ -2426,10 +2426,10 @@ void rtw_build_tdls_dis_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitfr
u8 category = RTW_WLAN_CATEGORY_PUBLIC; u8 category = RTW_WLAN_CATEGORY_PUBLIC;
u8 action = TDLS_DISCOVERY_RESPONSE; u8 action = TDLS_DISCOVERY_RESPONSE;
u8 bssrate[NDIS_802_11_LENGTH_RATES_EX]; u8 bssrate[NDIS_802_11_LENGTH_RATES_EX];
int bssrate_len = 0; int bssrate_len = 0;
u8 more_supportedrates = 0; u8 more_supportedrates = 0;
u8 *p; u8 *p;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 link_id_addr[18] = {0}; u8 link_id_addr[18] = {0};
u8 iedata=0; u8 iedata=0;
u8 timeout_itvl[5]; //set timeout interval to maximum value u8 timeout_itvl[5]; //set timeout interval to maximum value
@ -2518,7 +2518,7 @@ void rtw_build_tdls_peer_traffic_indication_ies(_adapter * padapter, struct xmit
u8 link_id_addr[18] = {0}; u8 link_id_addr[18] = {0};
u8 AC_queue=0; u8 AC_queue=0;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst); struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst);
//payload type //payload type
@ -2557,7 +2557,7 @@ void rtw_build_tdls_ch_switch_req_ies(_adapter * padapter, struct xmit_frame * p
unsigned char category = RTW_WLAN_CATEGORY_TDLS; unsigned char category = RTW_WLAN_CATEGORY_TDLS;
unsigned char action = TDLS_CHANNEL_SWITCH_REQUEST; unsigned char action = TDLS_CHANNEL_SWITCH_REQUEST;
u8 link_id_addr[18] = {0}; u8 link_id_addr[18] = {0};
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst); struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst);
u8 ch_switch_timing[4] = {0}; u8 ch_switch_timing[4] = {0};
u16 switch_time= CH_SWITCH_TIME, switch_timeout=CH_SWITCH_TIMEOUT; u16 switch_time= CH_SWITCH_TIME, switch_timeout=CH_SWITCH_TIMEOUT;
@ -2595,7 +2595,7 @@ void rtw_build_tdls_ch_switch_rsp_ies(_adapter * padapter, struct xmit_frame * p
unsigned char category = RTW_WLAN_CATEGORY_TDLS; unsigned char category = RTW_WLAN_CATEGORY_TDLS;
unsigned char action = TDLS_CHANNEL_SWITCH_RESPONSE; unsigned char action = TDLS_CHANNEL_SWITCH_RESPONSE;
u8 link_id_addr[18] = {0}; u8 link_id_addr[18] = {0};
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst); struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@ -2938,4 +2938,3 @@ u32 update_mask_tdls(_adapter *padapter, struct sta_info *psta)
} }
#endif //CONFIG_TDLS #endif //CONFIG_TDLS

34
core/rtw_wlan_util.c
View file

@ -172,7 +172,7 @@ u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int ratelen
} }
} }
return network_type; return network_type;
} }
unsigned char ratetbl_val_2wifirate(unsigned char rate); unsigned char ratetbl_val_2wifirate(unsigned char rate);
@ -646,8 +646,8 @@ unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval)
} }
void CAM_empty_entry( void CAM_empty_entry(
struct adapter * Adapter, struct adapter * Adapter,
u8 ucIndex u8 ucIndex
) )
{ {
rtw_hal_set_hwreg(Adapter, HW_VAR_CAM_EMPTY_ENTRY, (u8 *)(&ucIndex)); rtw_hal_set_hwreg(Adapter, HW_VAR_CAM_EMPTY_ENTRY, (u8 *)(&ucIndex));
@ -1101,7 +1101,7 @@ static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_
if(_TRUE == pmlmeinfo->bwmode_updated) if(_TRUE == pmlmeinfo->bwmode_updated)
{ {
struct sta_info *psta; struct sta_info *psta;
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
//set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); //set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);
@ -1141,9 +1141,9 @@ void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
u8 max_AMPDU_len, min_MPDU_spacing; u8 max_AMPDU_len, min_MPDU_spacing;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct ht_priv *phtpriv = &pmlmepriv->htpriv; struct ht_priv *phtpriv = &pmlmepriv->htpriv;
struct registry_priv *pregistrypriv = &padapter->registrypriv; struct registry_priv *pregistrypriv = &padapter->registrypriv;
if(pIE==NULL) return; if(pIE==NULL) return;
@ -1225,7 +1225,7 @@ void HT_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct ht_priv *phtpriv = &pmlmepriv->htpriv; struct ht_priv *phtpriv = &pmlmepriv->htpriv;
if(pIE==NULL) return; if(pIE==NULL) return;
@ -1427,7 +1427,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
struct HT_info_element *pht_info = NULL; struct HT_info_element *pht_info = NULL;
struct rtw_ieee80211_ht_cap *pht_cap = NULL; struct rtw_ieee80211_ht_cap *pht_cap = NULL;
u32 bcn_channel; u32 bcn_channel;
unsigned short ht_cap_info; unsigned short ht_cap_info;
unsigned char ht_info_infos_0; unsigned char ht_info_infos_0;
if (is_client_associated_to_ap(Adapter) == _FALSE) if (is_client_associated_to_ap(Adapter) == _FALSE)
@ -1479,9 +1479,9 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
if (ht_cap_info != cur_network->BcnInfo.ht_cap_info || if (ht_cap_info != cur_network->BcnInfo.ht_cap_info ||
((ht_info_infos_0&0x03) != (cur_network->BcnInfo.ht_info_infos_0&0x03))) { ((ht_info_infos_0&0x03) != (cur_network->BcnInfo.ht_info_infos_0&0x03))) {
DBG_871X("%s bcn now: ht_cap_info:%x ht_info_infos_0:%x\n", __func__, DBG_871X("%s bcn now: ht_cap_info:%x ht_info_infos_0:%x\n", __func__,
ht_cap_info, ht_info_infos_0); ht_cap_info, ht_info_infos_0);
DBG_871X("%s bcn link: ht_cap_info:%x ht_info_infos_0:%x\n", __func__, DBG_871X("%s bcn link: ht_cap_info:%x ht_info_infos_0:%x\n", __func__,
cur_network->BcnInfo.ht_cap_info, cur_network->BcnInfo.ht_info_infos_0); cur_network->BcnInfo.ht_cap_info, cur_network->BcnInfo.ht_info_infos_0);
DBG_871X("%s bw mode change, disconnect\n", __func__); DBG_871X("%s bw mode change, disconnect\n", __func__);
{ {
//bcn_info_update //bcn_info_update
@ -1706,7 +1706,7 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)
PNDIS_802_11_VARIABLE_IEs pIE; PNDIS_802_11_VARIABLE_IEs pIE;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
if (rtw_get_capability((WLAN_BSSID_EX *)cur_network) & WLAN_CAPABILITY_PRIVACY) if (rtw_get_capability((WLAN_BSSID_EX *)cur_network) & WLAN_CAPABILITY_PRIVACY)
{ {
@ -1795,7 +1795,7 @@ unsigned int is_ap_in_wep(struct adapter *padapter)
PNDIS_802_11_VARIABLE_IEs pIE; PNDIS_802_11_VARIABLE_IEs pIE;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
if (rtw_get_capability((WLAN_BSSID_EX *)cur_network) & WLAN_CAPABILITY_PRIVACY) if (rtw_get_capability((WLAN_BSSID_EX *)cur_network) & WLAN_CAPABILITY_PRIVACY)
{ {
@ -2228,7 +2228,7 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap)
//B Mode //B Mode
pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME; pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME;
} }
} }
rtw_hal_set_hwreg( Adapter, HW_VAR_SLOT_TIME, &pmlmeinfo->slotTime ); rtw_hal_set_hwreg( Adapter, HW_VAR_SLOT_TIME, &pmlmeinfo->slotTime );
@ -2240,7 +2240,7 @@ void update_wireless_mode(struct adapter *padapter)
u32 SIFS_Timer; u32 SIFS_Timer;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
unsigned char *rate = cur_network->SupportedRates; unsigned char *rate = cur_network->SupportedRates;
ratelen = rtw_get_rateset_len(cur_network->SupportedRates); ratelen = rtw_get_rateset_len(cur_network->SupportedRates);
@ -2437,14 +2437,14 @@ unsigned int setup_beacon_frame(struct adapter *padapter, unsigned char *beacon_
{ {
unsigned short ATIMWindow; unsigned short ATIMWindow;
unsigned char *pframe; unsigned char *pframe;
struct tx_desc *ptxdesc; struct tx_desc *ptxdesc;
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl; unsigned short *fctrl;
unsigned int rate_len, len = 0; unsigned int rate_len, len = 0;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
_rtw_memset(beacon_frame, 0, 256); _rtw_memset(beacon_frame, 0, 256);

21
core/rtw_xmit.c
View file

@ -378,7 +378,7 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
rtw_mfree_xmit_priv_lock(pxmitpriv); rtw_mfree_xmit_priv_lock(pxmitpriv);
if(pxmitpriv->pxmit_frame_buf==NULL) if(pxmitpriv->pxmit_frame_buf==NULL)
goto out; goto out;
for(i=0; i<NR_XMITFRAME; i++) for(i=0; i<NR_XMITFRAME; i++)
@ -960,13 +960,13 @@ _func_exit_;
} }
static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitframe){ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitframe){
sint curfragnum,length; sint curfragnum,length;
u8 *pframe, *payload,mic[8]; u8 *pframe, *payload,mic[8];
struct mic_data micdata; struct mic_data micdata;
struct sta_info *stainfo; struct sta_info *stainfo;
struct qos_priv *pqospriv= &(padapter->mlmepriv.qospriv); struct qos_priv *pqospriv= &(padapter->mlmepriv.qospriv);
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
struct security_priv *psecuritypriv=&padapter->securitypriv; struct security_priv *psecuritypriv=&padapter->securitypriv;
struct xmit_priv *pxmitpriv=&padapter->xmitpriv; struct xmit_priv *pxmitpriv=&padapter->xmitpriv;
u8 priority[4]={0x0,0x0,0x0,0x0}; u8 priority[4]={0x0,0x0,0x0,0x0};
u8 hw_hdr_offset = 0; u8 hw_hdr_offset = 0;
@ -1110,7 +1110,7 @@ _func_exit_;
static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmitframe){ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmitframe){
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
//struct security_priv *psecuritypriv=&padapter->securitypriv; //struct security_priv *psecuritypriv=&padapter->securitypriv;
_func_enter_; _func_enter_;
@ -1157,7 +1157,7 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
u8 qos_option = _FALSE; u8 qos_option = _FALSE;
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *ptdls_sta=NULL, *psta_backup=NULL; struct sta_info *ptdls_sta=NULL, *psta_backup=NULL;
u8 direct_link=0; u8 direct_link=0;
#endif //CONFIG_TDLS #endif //CONFIG_TDLS
@ -1489,7 +1489,7 @@ s32 rtw_make_tdls_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib
struct rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr; struct rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct qos_priv *pqospriv = &pmlmepriv->qospriv; struct qos_priv *pqospriv = &pmlmepriv->qospriv;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *psta=NULL, *ptdls_sta=NULL; struct sta_info *psta=NULL, *ptdls_sta=NULL;
u8 tdls_seq=0, baddr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; u8 tdls_seq=0, baddr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@ -2697,7 +2697,7 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, _queue *pframequeue)
{ {
_irqL irqL; _irqL irqL;
_list *plist, *phead; _list *plist, *phead;
struct xmit_frame *pxmitframe; struct xmit_frame *pxmitframe;
_func_enter_; _func_enter_;
@ -2999,7 +2999,7 @@ void rtw_alloc_hwxmits(struct adapter *padapter)
//hwxmits[3] .phwtxqueue = &pxmitpriv->bk_txqueue; //hwxmits[3] .phwtxqueue = &pxmitpriv->bk_txqueue;
hwxmits[3] .sta_queue = &pxmitpriv->bk_pending; hwxmits[3] .sta_queue = &pxmitpriv->bk_pending;
//pxmitpriv->be_txqueue.head = 0; //pxmitpriv->be_txqueue.head = 0;
//hwxmits[4] .phwtxqueue = &pxmitpriv->be_txqueue; //hwxmits[4] .phwtxqueue = &pxmitpriv->be_txqueue;
hwxmits[4] .sta_queue = &pxmitpriv->be_pending; hwxmits[4] .sta_queue = &pxmitpriv->be_pending;
@ -3249,7 +3249,7 @@ u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe)
case 0: case 0:
case 3: case 3:
addr = BE_QUEUE_INX; addr = BE_QUEUE_INX;
break; break;
case 1: case 1:
case 2: case 2:
addr = BK_QUEUE_INX; addr = BK_QUEUE_INX;
@ -3651,7 +3651,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc
u8 ac_index; u8 ac_index;
struct tx_servq *ptxservq; struct tx_servq *ptxservq;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
struct xmit_frame *pxmitframe; struct xmit_frame *pxmitframe;
struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits; struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits;
phead = get_list_head(pframequeue); phead = get_list_head(pframequeue);
@ -4372,4 +4372,3 @@ void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status)
} }
} }
#endif //CONFIG_XMIT_ACK #endif //CONFIG_XMIT_ACK

1
hal/Hal8188EPwrSeq.c
View file

@ -94,4 +94,3 @@ WLAN_PWR_CFG rtl8188E_leave_lps_flow[RTL8188E_TRANS_LPS_TO_ACT_STEPS+RTL8188E_TR
RTL8188E_TRANS_LPS_TO_ACT RTL8188E_TRANS_LPS_TO_ACT
RTL8188E_TRANS_END RTL8188E_TRANS_END
}; };

89
hal/Hal8188ERateAdaptive.c
View file

@ -64,7 +64,7 @@ static u1Byte PT_PENALTY[RETRYSIZE+1]={34,31,30,24,0,32};
#if 0 #if 0
static u1Byte RETRY_PENALTY_IDX[2][RATESIZE] = {{4,4,4,5,4,4,5,7,7,7,8,0x0a, // SS>TH static u1Byte RETRY_PENALTY_IDX[2][RATESIZE] = {{4,4,4,5,4,4,5,7,7,7,8,0x0a, // SS>TH
4,4,4,4,6,0x0a,0x0b,0x0d, 4,4,4,4,6,0x0a,0x0b,0x0d,
5,5,7,7,8,0x0b,0x0d,0x0f}, // 0329 R01 5,5,7,7,8,0x0b,0x0d,0x0f}, // 0329 R01
{4,4,4,5,7,7,9,9,0x0c,0x0e,0x10,0x12, // SS<TH {4,4,4,5,7,7,9,9,0x0c,0x0e,0x10,0x12, // SS<TH
4,4,5,5,6,0x0a,0x11,0x13, 4,4,5,5,6,0x0a,0x11,0x13,
9,9,9,9,0x0c,0x0e,0x11,0x13}}; 9,9,9,9,0x0c,0x0e,0x11,0x13}};
@ -72,18 +72,18 @@ static u1Byte RETRY_PENALTY_IDX[2][RATESIZE] = {{4,4,4,5,4,4,5,7,7,7,8,0x0a,
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
static u1Byte RETRY_PENALTY_IDX[2][RATESIZE] = {{4,4,4,5,4,4,5,7,7,7,8,0x0a, // SS>TH static u1Byte RETRY_PENALTY_IDX[2][RATESIZE] = {{4,4,4,5,4,4,5,7,7,7,8,0x0a, // SS>TH
4,4,4,4,6,0x0a,0x0b,0x0d, 4,4,4,4,6,0x0a,0x0b,0x0d,
5,5,7,7,8,0x0b,0x0d,0x0f}, // 0329 R01 5,5,7,7,8,0x0b,0x0d,0x0f}, // 0329 R01
{0x0a,0x0a,0x0a,0x0a,0x0c,0x0c,0x0e,0x10,0x11,0x12,0x12,0x13, // SS<TH {0x0a,0x0a,0x0a,0x0a,0x0c,0x0c,0x0e,0x10,0x11,0x12,0x12,0x13, // SS<TH
0x0e,0x0f,0x10,0x10,0x11,0x14,0x14,0x15, 0x0e,0x0f,0x10,0x10,0x11,0x14,0x14,0x15,
9,9,9,9,0x0c,0x0e,0x11,0x13}}; 9,9,9,9,0x0c,0x0e,0x11,0x13}};
static u1Byte RETRY_PENALTY_UP_IDX[RATESIZE] = {0x10,0x10,0x10,0x10,0x11,0x11,0x12,0x12,0x12,0x13,0x13,0x14, // SS>TH static u1Byte RETRY_PENALTY_UP_IDX[RATESIZE] = {0x10,0x10,0x10,0x10,0x11,0x11,0x12,0x12,0x12,0x13,0x13,0x14, // SS>TH
0x13,0x13,0x14,0x14,0x15,0x15,0x15,0x15, 0x13,0x13,0x14,0x14,0x15,0x15,0x15,0x15,
0x11,0x11,0x12,0x13,0x13,0x13,0x14,0x15}; 0x11,0x11,0x12,0x13,0x13,0x13,0x14,0x15};
static u1Byte RSSI_THRESHOLD[RATESIZE] = {0,0,0,0, static u1Byte RSSI_THRESHOLD[RATESIZE] = {0,0,0,0,
0,0,0,0,0,0x24,0x26,0x2a, 0,0,0,0,0,0x24,0x26,0x2a,
0x13,0x15,0x17,0x18,0x1a,0x1c,0x1d,0x1f, 0x13,0x15,0x17,0x18,0x1a,0x1c,0x1d,0x1f,
0,0,0,0x1f,0x23,0x28,0x2a,0x2c}; 0,0,0,0x1f,0x23,0x28,0x2a,0x2c};
@ -92,7 +92,7 @@ static u1Byte RSSI_THRESHOLD[RATESIZE] = {0,0,0,0,
// wilson modify // wilson modify
static u1Byte RETRY_PENALTY_IDX[2][RATESIZE] = {{4,4,4,5,4,4,5,7,7,7,8,0x0a, // SS>TH static u1Byte RETRY_PENALTY_IDX[2][RATESIZE] = {{4,4,4,5,4,4,5,7,7,7,8,0x0a, // SS>TH
4,4,4,4,6,0x0a,0x0b,0x0d, 4,4,4,4,6,0x0a,0x0b,0x0d,
5,5,7,7,8,0x0b,0x0d,0x0f}, // 0329 R01 5,5,7,7,8,0x0b,0x0d,0x0f}, // 0329 R01
{0x0a,0x0a,0x0b,0x0c,0x0a,0x0a,0x0b,0x0c,0x0d,0x10,0x13,0x14, // SS<TH {0x0a,0x0a,0x0b,0x0c,0x0a,0x0a,0x0b,0x0c,0x0d,0x10,0x13,0x14, // SS<TH
0x0b,0x0c,0x0d,0x0e,0x0f,0x11,0x13,0x15, 0x0b,0x0c,0x0d,0x0e,0x0f,0x11,0x13,0x15,
9,9,9,9,0x0c,0x0e,0x11,0x13}}; 9,9,9,9,0x0c,0x0e,0x11,0x13}};
@ -116,7 +116,7 @@ static u2Byte N_THRESHOLD_HIGH[RATESIZE] = {4,4,8,16,
24,36,48,72,96,144,192,216, 24,36,48,72,96,144,192,216,
60,80,100,160,240,400,560,640, 60,80,100,160,240,400,560,640,
300,320,480,720,1000,1200,1600,2000}; 300,320,480,720,1000,1200,1600,2000};
static u2Byte N_THRESHOLD_LOW[RATESIZE] = {2,2,4,8, static u2Byte N_THRESHOLD_LOW[RATESIZE] = {2,2,4,8,
12,18,24,36,48,72,96,108, 12,18,24,36,48,72,96,108,
30,40,50,80,120,200,280,320, 30,40,50,80,120,200,280,320,
150,160,240,360,500,600,800,1000}; 150,160,240,360,500,600,800,1000};
@ -163,8 +163,8 @@ static u2Byte DynamicTxRPTTiming[6]={0x186a, 0x30d4, 0x493e, 0x61a8, 0x7a12 ,0x9
static void static void
odm_SetTxRPTTiming_8188E( odm_SetTxRPTTiming_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN PODM_RA_INFO_T pRaInfo, IN PODM_RA_INFO_T pRaInfo,
IN u1Byte extend IN u1Byte extend
) )
{ {
u1Byte idx = 0; u1Byte idx = 0;
@ -192,7 +192,7 @@ odm_SetTxRPTTiming_8188E(
static int static int
odm_RateDown_8188E( odm_RateDown_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN PODM_RA_INFO_T pRaInfo IN PODM_RA_INFO_T pRaInfo
) )
{ {
u1Byte RateID, LowestRate, HighestRate; u1Byte RateID, LowestRate, HighestRate;
@ -265,7 +265,7 @@ RateDownFinish:
static int static int
odm_RateUp_8188E( odm_RateUp_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN PODM_RA_INFO_T pRaInfo IN PODM_RA_INFO_T pRaInfo
) )
{ {
u1Byte RateID, HighestRate; u1Byte RateID, HighestRate;
@ -340,7 +340,7 @@ static void odm_ResetRaCounter_8188E( IN PODM_RA_INFO_T pRaInfo){
static void static void
odm_RateDecision_8188E( odm_RateDecision_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN PODM_RA_INFO_T pRaInfo IN PODM_RA_INFO_T pRaInfo
) )
{ {
u1Byte RateID = 0, RtyPtID = 0, PenaltyID1 = 0, PenaltyID2 = 0; u1Byte RateID = 0, RtyPtID = 0, PenaltyID1 = 0, PenaltyID2 = 0;
@ -431,8 +431,8 @@ odm_RateDecision_8188E(
static int static int
odm_ARFBRefresh_8188E( odm_ARFBRefresh_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN PODM_RA_INFO_T pRaInfo IN PODM_RA_INFO_T pRaInfo
) )
{ // Wilson 2011/10/26 { // Wilson 2011/10/26
u4Byte MaskFromReg; u4Byte MaskFromReg;
@ -535,7 +535,7 @@ odm_ARFBRefresh_8188E(
#if POWER_TRAINING_ACTIVE == 1 #if POWER_TRAINING_ACTIVE == 1
static void static void
odm_PTTryState_8188E( odm_PTTryState_8188E(
IN PODM_RA_INFO_T pRaInfo IN PODM_RA_INFO_T pRaInfo
) )
{ {
pRaInfo->PTTryState=0; pRaInfo->PTTryState=0;
@ -595,7 +595,7 @@ odm_PTTryState_8188E(
static void static void
odm_PTDecision_8188E( odm_PTDecision_8188E(
IN PODM_RA_INFO_T pRaInfo IN PODM_RA_INFO_T pRaInfo
) )
{ {
u1Byte stage_BUF; u1Byte stage_BUF;
@ -639,7 +639,7 @@ odm_PTDecision_8188E(
static VOID static VOID
odm_RATxRPTTimerSetting( odm_RATxRPTTimerSetting(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u2Byte minRptTime IN u2Byte minRptTime
) )
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,(" =====>odm_RATxRPTTimerSetting()\n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,(" =====>odm_RATxRPTTimerSetting()\n"));
@ -676,8 +676,8 @@ ODM_RASupport_Init(
int int
ODM_RAInfo_Init( ODM_RAInfo_Init(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u1Byte MacID IN u1Byte MacID
) )
{ {
PODM_RA_INFO_T pRaInfo = &pDM_Odm->RAInfo[MacID]; PODM_RA_INFO_T pRaInfo = &pDM_Odm->RAInfo[MacID];
@ -765,8 +765,8 @@ ODM_RAInfo_Init_all(
u1Byte u1Byte
ODM_RA_GetShortGI_8188E( ODM_RA_GetShortGI_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u1Byte MacID IN u1Byte MacID
) )
{ {
if((NULL == pDM_Odm) || (MacID >= ASSOCIATE_ENTRY_NUM)) if((NULL == pDM_Odm) || (MacID >= ASSOCIATE_ENTRY_NUM))
@ -778,8 +778,8 @@ ODM_RA_GetShortGI_8188E(
u1Byte u1Byte
ODM_RA_GetDecisionRate_8188E( ODM_RA_GetDecisionRate_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u1Byte MacID IN u1Byte MacID
) )
{ {
u1Byte DecisionRate = 0; u1Byte DecisionRate = 0;
@ -794,8 +794,8 @@ ODM_RA_GetDecisionRate_8188E(
u1Byte u1Byte
ODM_RA_GetHwPwrStatus_8188E( ODM_RA_GetHwPwrStatus_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u1Byte MacID IN u1Byte MacID
) )
{ {
u1Byte PTStage = 5; u1Byte PTStage = 5;
@ -833,9 +833,9 @@ ODM_RA_UpdateRateInfo_8188E(
VOID VOID
ODM_RA_SetRSSI_8188E( ODM_RA_SetRSSI_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u1Byte MacID, IN u1Byte MacID,
IN u1Byte Rssi IN u1Byte Rssi
) )
{ {
PODM_RA_INFO_T pRaInfo = NULL; PODM_RA_INFO_T pRaInfo = NULL;
@ -852,7 +852,7 @@ ODM_RA_SetRSSI_8188E(
VOID VOID
ODM_RA_Set_TxRPT_Time( ODM_RA_Set_TxRPT_Time(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u2Byte minRptTime IN u2Byte minRptTime
) )
{ {
#if(DM_ODM_SUPPORT_TYPE & (ODM_AP)) #if(DM_ODM_SUPPORT_TYPE & (ODM_AP))
@ -875,7 +875,7 @@ ODM_RA_TxRPT2Handle_8188E(
u1Byte MacId = 0; u1Byte MacId = 0;
pu1Byte pBuffer = NULL; pu1Byte pBuffer = NULL;
u4Byte valid = 0, ItemNum = 0; u4Byte valid = 0, ItemNum = 0;
u2Byte minRptTime = 0x927c; u2Byte minRptTime = 0x927c;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("=====>ODM_RA_TxRPT2Handle_8188E(): valid0=%d valid1=%d BufferLength=%d\n", ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("=====>ODM_RA_TxRPT2Handle_8188E(): valid0=%d valid1=%d BufferLength=%d\n",
MacIDValidEntry0, MacIDValidEntry1, TxRPT_Len)); MacIDValidEntry0, MacIDValidEntry1, TxRPT_Len));
@ -1002,7 +1002,7 @@ ODM_RA_TxRPT2Handle_8188E(
static VOID static VOID
odm_RATxRPTTimerSetting( odm_RATxRPTTimerSetting(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u2Byte minRptTime IN u2Byte minRptTime
) )
{ {
return; return;
@ -1011,7 +1011,7 @@ odm_RATxRPTTimerSetting(
VOID VOID
ODM_RASupport_Init( ODM_RASupport_Init(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
return; return;
@ -1019,8 +1019,8 @@ ODM_RASupport_Init(
int int
ODM_RAInfo_Init( ODM_RAInfo_Init(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u1Byte MacID IN u1Byte MacID
) )
{ {
return 0; return 0;
@ -1036,8 +1036,8 @@ ODM_RAInfo_Init_all(
u1Byte u1Byte
ODM_RA_GetShortGI_8188E( ODM_RA_GetShortGI_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u1Byte MacID IN u1Byte MacID
) )
{ {
return 0; return 0;
@ -1045,16 +1045,16 @@ ODM_RA_GetShortGI_8188E(
u1Byte u1Byte
ODM_RA_GetDecisionRate_8188E( ODM_RA_GetDecisionRate_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u1Byte MacID IN u1Byte MacID
) )
{ {
return 0; return 0;
} }
u1Byte u1Byte
ODM_RA_GetHwPwrStatus_8188E( ODM_RA_GetHwPwrStatus_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u1Byte MacID IN u1Byte MacID
) )
{ {
return 0; return 0;
@ -1074,9 +1074,9 @@ ODM_RA_UpdateRateInfo_8188E(
VOID VOID
ODM_RA_SetRSSI_8188E( ODM_RA_SetRSSI_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u1Byte MacID, IN u1Byte MacID,
IN u1Byte Rssi IN u1Byte Rssi
) )
{ {
return; return;
@ -1085,7 +1085,7 @@ ODM_RA_SetRSSI_8188E(
VOID VOID
ODM_RA_Set_TxRPT_Time( ODM_RA_Set_TxRPT_Time(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u2Byte minRptTime IN u2Byte minRptTime
) )
{ {
return; return;
@ -1105,4 +1105,3 @@ ODM_RA_TxRPT2Handle_8188E(
#endif #endif

131
hal/HalHWImg8188E_BB.c
View file

@ -330,8 +330,8 @@ u4Byte Array_AGC_TAB_1T_8188E[] = {
HAL_STATUS HAL_STATUS
ODM_ReadAndConfig_AGC_TAB_1T_8188E( ODM_ReadAndConfig_AGC_TAB_1T_8188E(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0)
@ -370,64 +370,64 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
for (i = 0; i < ArrayLen; i += 2 ) for (i = 0; i < ArrayLen; i += 2 )
{ {
u4Byte v1 = Array[i]; u4Byte v1 = Array[i];
u4Byte v2 = Array[i+1]; u4Byte v2 = Array[i+1];
// This (offset, data) pair meets the condition. // This (offset, data) pair meets the condition.
if ( v1 < 0xCDCDCDCD ) if ( v1 < 0xCDCDCDCD )
{ {
#ifdef CONFIG_IOL_IOREG_CFG #ifdef CONFIG_IOL_IOREG_CFG
if(biol){ if(biol){
if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord); rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord);
} }
else else
#endif //#ifdef CONFIG_IOL_IOREG_CFG #endif //#ifdef CONFIG_IOL_IOREG_CFG
{ {
odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2);
} }
continue; continue;
} }
else else
{ // This line is the start line of branch. { // This line is the start line of branch.
if ( !CheckCondition(Array[i], hex) ) if ( !CheckCondition(Array[i], hex) )
{ // Discard the following (offset, data) pairs. { // Discard the following (offset, data) pairs.
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
while ( v2 != 0xDEAD && while ( v2 != 0xDEAD &&
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
i -= 2; // prevent from for-loop += 2 i -= 2; // prevent from for-loop += 2
} }
else // Configure matched pairs and skip to end of if-else. else // Configure matched pairs and skip to end of if-else.
{ {
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
while ( v2 != 0xDEAD && while ( v2 != 0xDEAD &&
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
#ifdef CONFIG_IOL_IOREG_CFG #ifdef CONFIG_IOL_IOREG_CFG
if(biol){ if(biol){
if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord); rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord);
} }
else else
#endif //#ifdef CONFIG_IOL_IOREG_CFG #endif //#ifdef CONFIG_IOL_IOREG_CFG
{ {
odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2);
} }
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
while (v2 != 0xDEAD && i < ArrayLen -2) while (v2 != 0xDEAD && i < ArrayLen -2)
{ {
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
} }
} }
} }
#ifdef CONFIG_IOL_IOREG_CFG #ifdef CONFIG_IOL_IOREG_CFG
@ -600,8 +600,8 @@ u4Byte Array_MP_8188E_AGC_TAB_1T_ICUT[] = {
void void
ODM_ReadAndConfig_AGC_TAB_1T_ICUT_8188E( ODM_ReadAndConfig_AGC_TAB_1T_ICUT_8188E(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0)
@ -632,7 +632,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_ICUT_8188E(
{ {
odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2);
continue; continue;
} }
else else
{ // This line is the start line of branch. { // This line is the start line of branch.
if ( !CheckCondition(Array[i], hex) ) if ( !CheckCondition(Array[i], hex) )
@ -653,7 +653,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_ICUT_8188E(
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2);
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
@ -892,8 +892,8 @@ u4Byte Array_PHY_REG_1T_8188E[] = {
HAL_STATUS HAL_STATUS
ODM_ReadAndConfig_PHY_REG_1T_8188E( ODM_ReadAndConfig_PHY_REG_1T_8188E(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0)
@ -942,8 +942,8 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
// This (offset, data) pair meets the condition. // This (offset, data) pair meets the condition.
if ( v1 < 0xCDCDCDCD ) if ( v1 < 0xCDCDCDCD )
{ {
#ifdef CONFIG_IOL_IOREG_CFG #ifdef CONFIG_IOL_IOREG_CFG
if(biol){ if(biol){
if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
@ -977,14 +977,14 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
cmpdata_idx++; cmpdata_idx++;
#endif #endif
} }
} }
else else
#endif //#ifdef CONFIG_IOL_IOREG_CFG #endif //#ifdef CONFIG_IOL_IOREG_CFG
{ {
odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2);
} }
continue; continue;
} }
else else
{ // This line is the start line of branch. { // This line is the start line of branch.
if ( !CheckCondition(Array[i], hex) ) if ( !CheckCondition(Array[i], hex) )
@ -1005,8 +1005,8 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
#ifdef CONFIG_IOL_IOREG_CFG #ifdef CONFIG_IOL_IOREG_CFG
if(biol){ if(biol){
if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
if (v1 == 0xfe){ if (v1 == 0xfe){
@ -1038,11 +1038,11 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
cmpdata_idx++; cmpdata_idx++;
#endif #endif
} }
} }
else else
#endif //#ifdef CONFIG_IOL_IOREG_CFG #endif //#ifdef CONFIG_IOL_IOREG_CFG
{ {
odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2);
} }
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
@ -1301,8 +1301,8 @@ u4Byte Array_MP_8188E_PHY_REG_1T_ICUT[] = {
void void
ODM_ReadAndConfig_PHY_REG_1T_ICUT_8188E( ODM_ReadAndConfig_PHY_REG_1T_ICUT_8188E(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0)
@ -1331,9 +1331,9 @@ ODM_ReadAndConfig_PHY_REG_1T_ICUT_8188E(
// This (offset, data) pair meets the condition. // This (offset, data) pair meets the condition.
if ( v1 < 0xCDCDCDCD ) if ( v1 < 0xCDCDCDCD )
{ {
odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2);
continue; continue;
} }
else else
{ // This line is the start line of branch. { // This line is the start line of branch.
if ( !CheckCondition(Array[i], hex) ) if ( !CheckCondition(Array[i], hex) )
@ -1354,7 +1354,7 @@ ODM_ReadAndConfig_PHY_REG_1T_ICUT_8188E(
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2);
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
@ -1386,8 +1386,8 @@ u4Byte Array_PHY_REG_PG_8188E[] = {
void void
ODM_ReadAndConfig_PHY_REG_PG_8188E( ODM_ReadAndConfig_PHY_REG_PG_8188E(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
u4Byte hex = 0; u4Byte hex = 0;
u4Byte i = 0; u4Byte i = 0;
@ -1417,9 +1417,9 @@ ODM_ReadAndConfig_PHY_REG_PG_8188E(
if ( v1 < 0xCDCDCDCD ) if ( v1 < 0xCDCDCDCD )
{ {
odm_ConfigBB_PHY_REG_PG_8188E(pDM_Odm, v1, v2, v3); odm_ConfigBB_PHY_REG_PG_8188E(pDM_Odm, v1, v2, v3);
continue; continue;
} }
else else
{ // this line is the start of branch { // this line is the start of branch
@ -1445,4 +1445,3 @@ ODM_ReadAndConfig_PHY_REG_PG_8188E(
#endif // end of HWIMG_SUPPORT #endif // end of HWIMG_SUPPORT

1
hal/HalHWImg8188E_FW.c
View file

@ -1031,4 +1031,3 @@ ODM_ReadFirmware_8188E_FW_WoWLAN(
#endif // end of HWIMG_SUPPORT #endif // end of HWIMG_SUPPORT

83
hal/HalHWImg8188E_MAC.c
View file

@ -158,8 +158,8 @@ u4Byte Array_MAC_REG_8188E[] = {
HAL_STATUS HAL_STATUS
ODM_ReadAndConfig_MAC_REG_8188E( ODM_ReadAndConfig_MAC_REG_8188E(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0)
@ -205,14 +205,14 @@ ODM_ReadAndConfig_MAC_REG_8188E(
for (i = 0; i < ArrayLen; i += 2 ) for (i = 0; i < ArrayLen; i += 2 )
{ {
u4Byte v1 = Array[i]; u4Byte v1 = Array[i];
u4Byte v2 = Array[i+1]; u4Byte v2 = Array[i+1];
// This (offset, data) pair meets the condition. // This (offset, data) pair meets the condition.
if ( v1 < 0xCDCDCDCD ) if ( v1 < 0xCDCDCDCD )
{ {
#ifdef CONFIG_IOL_IOREG_CFG #ifdef CONFIG_IOL_IOREG_CFG
if(biol){ if(biol){
if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
@ -222,36 +222,36 @@ ODM_ReadAndConfig_MAC_REG_8188E(
cmpdata[cmpdata_idx].value= v2; cmpdata[cmpdata_idx].value= v2;
cmpdata_idx++; cmpdata_idx++;
#endif #endif
} }
else else
#endif //endif CONFIG_IOL_IOREG_CFG #endif //endif CONFIG_IOL_IOREG_CFG
{ {
odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2); odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2);
} }
continue; continue;
} }
else else
{ // This line is the start line of branch. { // This line is the start line of branch.
if ( !CheckCondition(Array[i], hex) ) if ( !CheckCondition(Array[i], hex) )
{ // Discard the following (offset, data) pairs. { // Discard the following (offset, data) pairs.
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
while ( v2 != 0xDEAD && while ( v2 != 0xDEAD &&
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
i -= 2; // prevent from for-loop += 2 i -= 2; // prevent from for-loop += 2
} }
else // Configure matched pairs and skip to end of if-else. else // Configure matched pairs and skip to end of if-else.
{ {
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
while ( v2 != 0xDEAD && while ( v2 != 0xDEAD &&
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
#ifdef CONFIG_IOL_IOREG_CFG #ifdef CONFIG_IOL_IOREG_CFG
if(biol){ if(biol){
if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
rtw_IOL_append_WB_cmd(pxmit_frame,(u2Byte)v1, (u1Byte)v2,0xFF); rtw_IOL_append_WB_cmd(pxmit_frame,(u2Byte)v1, (u1Byte)v2,0xFF);
@ -260,22 +260,22 @@ ODM_ReadAndConfig_MAC_REG_8188E(
cmpdata[cmpdata_idx].value= v2; cmpdata[cmpdata_idx].value= v2;
cmpdata_idx++; cmpdata_idx++;
#endif #endif
} }
else else
#endif //#ifdef CONFIG_IOL_IOREG_CFG #endif //#ifdef CONFIG_IOL_IOREG_CFG
{ {
odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2); odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2);
} }
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
while (v2 != 0xDEAD && i < ArrayLen -2) while (v2 != 0xDEAD && i < ArrayLen -2)
{ {
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
} }
} }
} }
@ -430,8 +430,8 @@ u4Byte Array_MP_8188E_MAC_REG_ICUT[] = {
void void
ODM_ReadAndConfig_MAC_REG_ICUT_8188E( ODM_ReadAndConfig_MAC_REG_ICUT_8188E(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0)
@ -460,9 +460,9 @@ ODM_ReadAndConfig_MAC_REG_ICUT_8188E(
// This (offset, data) pair meets the condition. // This (offset, data) pair meets the condition.
if ( v1 < 0xCDCDCDCD ) if ( v1 < 0xCDCDCDCD )
{ {
odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2); odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2);
continue; continue;
} }
else else
{ // This line is the start line of branch. { // This line is the start line of branch.
if ( !CheckCondition(Array[i], hex) ) if ( !CheckCondition(Array[i], hex) )
@ -483,7 +483,7 @@ ODM_ReadAndConfig_MAC_REG_ICUT_8188E(
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2); odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2);
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
@ -499,4 +499,3 @@ ODM_ReadAndConfig_MAC_REG_ICUT_8188E(
} }
#endif // end of HWIMG_SUPPORT #endif // end of HWIMG_SUPPORT

31
hal/HalHWImg8188E_RF.c
View file

@ -179,8 +179,8 @@ u4Byte Array_RadioA_1T_8188E[] = {
HAL_STATUS HAL_STATUS
ODM_ReadAndConfig_RadioA_1T_8188E( ODM_ReadAndConfig_RadioA_1T_8188E(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0)
@ -229,8 +229,8 @@ ODM_ReadAndConfig_RadioA_1T_8188E(
// This (offset, data) pair meets the condition. // This (offset, data) pair meets the condition.
if ( v1 < 0xCDCDCDCD ) if ( v1 < 0xCDCDCDCD )
{ {
#ifdef CONFIG_IOL_IOREG_CFG #ifdef CONFIG_IOL_IOREG_CFG
if(biol){ if(biol){
if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
@ -262,14 +262,14 @@ ODM_ReadAndConfig_RadioA_1T_8188E(
#endif #endif
} }
} }
else else
#endif //#ifdef CONFIG_IOL_IOREG_CFG #endif //#ifdef CONFIG_IOL_IOREG_CFG
{ {
odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2); odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
} }
continue; continue;
} }
else else
{ // This line is the start line of branch. { // This line is the start line of branch.
if ( !CheckCondition(Array[i], hex) ) if ( !CheckCondition(Array[i], hex) )
@ -290,8 +290,8 @@ ODM_ReadAndConfig_RadioA_1T_8188E(
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
#ifdef CONFIG_IOL_IOREG_CFG #ifdef CONFIG_IOL_IOREG_CFG
if(biol){ if(biol){
if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
@ -324,11 +324,11 @@ ODM_ReadAndConfig_RadioA_1T_8188E(
} }
} }
else else
#endif //#ifdef CONFIG_IOL_IOREG_CFG #endif //#ifdef CONFIG_IOL_IOREG_CFG
{ {
odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2); odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
} }
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
@ -496,8 +496,8 @@ u4Byte Array_MP_8188E_RadioA_1T_ICUT[] = {
void void
ODM_ReadAndConfig_RadioA_1T_ICUT_8188E( ODM_ReadAndConfig_RadioA_1T_ICUT_8188E(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0)
@ -528,7 +528,7 @@ ODM_ReadAndConfig_RadioA_1T_ICUT_8188E(
{ {
odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2); odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
continue; continue;
} }
else else
{ // This line is the start line of branch. { // This line is the start line of branch.
if ( !CheckCondition(Array[i], hex) ) if ( !CheckCondition(Array[i], hex) )
@ -549,7 +549,7 @@ ODM_ReadAndConfig_RadioA_1T_ICUT_8188E(
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2); odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
} }
@ -566,4 +566,3 @@ ODM_ReadAndConfig_RadioA_1T_ICUT_8188E(
#endif // end of HWIMG_SUPPORT #endif // end of HWIMG_SUPPORT

127
hal/HalPhyRf.c
View file

@ -179,7 +179,7 @@ phy_PathB_IQK_8192C(
VOID VOID
phy_PathAFillIQKMatrix( phy_PathAFillIQKMatrix(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN bIQKOK, IN BOOLEAN bIQKOK,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte final_candidate, IN u1Byte final_candidate,
IN BOOLEAN bTxOnly IN BOOLEAN bTxOnly
@ -246,7 +246,7 @@ phy_PathAFillIQKMatrix(
VOID VOID
phy_PathBFillIQKMatrix( phy_PathBFillIQKMatrix(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN bIQKOK, IN BOOLEAN bIQKOK,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte final_candidate, IN u1Byte final_candidate,
IN BOOLEAN bTxOnly //do Tx only IN BOOLEAN bTxOnly //do Tx only
@ -272,7 +272,7 @@ phy_PathBFillIQKMatrix(
RTPRINT(FINIT, INIT_IQK, ("X = 0x%x, TX1_A = 0x%x\n", X, TX1_A)); RTPRINT(FINIT, INIT_IQK, ("X = 0x%x, TX1_A = 0x%x\n", X, TX1_A));
PHY_SetBBReg(pAdapter, rOFDM0_XBTxIQImbalance, 0x3FF, TX1_A); PHY_SetBBReg(pAdapter, rOFDM0_XBTxIQImbalance, 0x3FF, TX1_A);
if(IS_HARDWARE_TYPE_8192D(pAdapter)) if(IS_HARDWARE_TYPE_8192D(pAdapter))
PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT28, ((X* Oldval_1>>7) & 0x1)); PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT28, ((X* Oldval_1>>7) & 0x1));
else else
PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(27), ((X* Oldval_1>>7) & 0x1)); PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(27), ((X* Oldval_1>>7) & 0x1));
@ -308,7 +308,7 @@ phy_PathBFillIQKMatrix(
BOOLEAN BOOLEAN
phy_SimularityCompare_92C( phy_SimularityCompare_92C(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte c1, IN u1Byte c1,
IN u1Byte c2 IN u1Byte c2
) )
@ -380,7 +380,7 @@ return FALSE => do IQK again
BOOLEAN BOOLEAN
phy_SimularityCompare( phy_SimularityCompare(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte c1, IN u1Byte c1,
IN u1Byte c2 IN u1Byte c2
) )
@ -395,7 +395,7 @@ phy_SimularityCompare(
VOID VOID
phy_IQCalibrate_8192C( phy_IQCalibrate_8192C(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte t, IN u1Byte t,
IN BOOLEAN is2T IN BOOLEAN is2T
) )
@ -404,21 +404,21 @@ phy_IQCalibrate_8192C(
u4Byte i; u4Byte i;
u1Byte PathAOK, PathBOK; u1Byte PathAOK, PathBOK;
u4Byte ADDA_REG[IQK_ADDA_REG_NUM] = { u4Byte ADDA_REG[IQK_ADDA_REG_NUM] = {
rFPGA0_XCD_SwitchControl, rBlue_Tooth, rFPGA0_XCD_SwitchControl, rBlue_Tooth,
rRx_Wait_CCA, rTx_CCK_RFON, rRx_Wait_CCA, rTx_CCK_RFON,
rTx_CCK_BBON, rTx_OFDM_RFON, rTx_CCK_BBON, rTx_OFDM_RFON,
rTx_OFDM_BBON, rTx_To_Rx, rTx_OFDM_BBON, rTx_To_Rx,
rTx_To_Tx, rRx_CCK, rTx_To_Tx, rRx_CCK,
rRx_OFDM, rRx_Wait_RIFS, rRx_OFDM, rRx_Wait_RIFS,
rRx_TO_Rx, rStandby, rRx_TO_Rx, rStandby,
rSleep, rPMPD_ANAEN }; rSleep, rPMPD_ANAEN };
u4Byte IQK_MAC_REG[IQK_MAC_REG_NUM] = { u4Byte IQK_MAC_REG[IQK_MAC_REG_NUM] = {
REG_TXPAUSE, REG_BCN_CTRL, REG_TXPAUSE, REG_BCN_CTRL,
REG_BCN_CTRL_1, REG_GPIO_MUXCFG}; REG_BCN_CTRL_1, REG_GPIO_MUXCFG};
//since 92C & 92D have the different define in IQK_BB_REG //since 92C & 92D have the different define in IQK_BB_REG
u4Byte IQK_BB_REG_92C[IQK_BB_REG_NUM] = { u4Byte IQK_BB_REG_92C[IQK_BB_REG_NUM] = {
rOFDM0_TRxPathEnable, rOFDM0_TRMuxPar, rOFDM0_TRxPathEnable, rOFDM0_TRMuxPar,
rFPGA0_XCD_RFInterfaceSW, rConfig_AntA, rConfig_AntB, rFPGA0_XCD_RFInterfaceSW, rConfig_AntA, rConfig_AntB,
rFPGA0_XAB_RFInterfaceSW, rFPGA0_XA_RFInterfaceOE, rFPGA0_XAB_RFInterfaceSW, rFPGA0_XA_RFInterfaceOE,
rFPGA0_XB_RFInterfaceOE, rFPGA0_RFMOD rFPGA0_XB_RFInterfaceOE, rFPGA0_RFMOD
@ -445,34 +445,34 @@ phy_IQCalibrate_8192C(
u1Byte rfPathSwitch=0x0; u1Byte rfPathSwitch=0x0;
// Note: IQ calibration must be performed after loading // Note: IQ calibration must be performed after loading
// PHY_REG.txt , and radio_a, radio_b.txt // PHY_REG.txt , and radio_a, radio_b.txt
u4Byte bbvalue; u4Byte bbvalue;
if(t==0) if(t==0)
{ {
bbvalue = PHY_QueryBBReg(pAdapter, rFPGA0_RFMOD, bMaskDWord); bbvalue = PHY_QueryBBReg(pAdapter, rFPGA0_RFMOD, bMaskDWord);
RTPRINT(FINIT, INIT_IQK, ("phy_IQCalibrate_8192C()==>0x%08x\n",bbvalue)); RTPRINT(FINIT, INIT_IQK, ("phy_IQCalibrate_8192C()==>0x%08x\n",bbvalue));
RTPRINT(FINIT, INIT_IQK, ("IQ Calibration for %s\n", (is2T ? "2T2R" : "1T1R"))); RTPRINT(FINIT, INIT_IQK, ("IQ Calibration for %s\n", (is2T ? "2T2R" : "1T1R")));
// Save ADDA parameters, turn Path A ADDA on // Save ADDA parameters, turn Path A ADDA on
phy_SaveADDARegisters(pAdapter, ADDA_REG, pHalData->ADDA_backup, IQK_ADDA_REG_NUM); phy_SaveADDARegisters(pAdapter, ADDA_REG, pHalData->ADDA_backup, IQK_ADDA_REG_NUM);
phy_SaveMACRegisters(pAdapter, IQK_MAC_REG, pHalData->IQK_MAC_backup); phy_SaveMACRegisters(pAdapter, IQK_MAC_REG, pHalData->IQK_MAC_backup);
if(IS_HARDWARE_TYPE_8192D(pAdapter)) if(IS_HARDWARE_TYPE_8192D(pAdapter))
phy_SaveADDARegisters(pAdapter, IQK_BB_REG_92D, pHalData->IQK_BB_backup, IQK_BB_REG_NUM_92D); phy_SaveADDARegisters(pAdapter, IQK_BB_REG_92D, pHalData->IQK_BB_backup, IQK_BB_REG_NUM_92D);
else else
phy_SaveADDARegisters(pAdapter, IQK_BB_REG_92C, pHalData->IQK_BB_backup, IQK_BB_REG_NUM); phy_SaveADDARegisters(pAdapter, IQK_BB_REG_92C, pHalData->IQK_BB_backup, IQK_BB_REG_NUM);
} }
phy_PathADDAOn(pAdapter, ADDA_REG, TRUE, is2T); phy_PathADDAOn(pAdapter, ADDA_REG, TRUE, is2T);
if(IS_HARDWARE_TYPE_8192D(pAdapter)){ if(IS_HARDWARE_TYPE_8192D(pAdapter)){
//============================== //==============================
//3 Path Diversity //3 Path Diversity
////Neil Chen--2011--05--20 ////Neil Chen--2011--05--20
rfPathSwitch =(u1Byte) (PHY_QueryBBReg(pAdapter, 0xB30, bMaskDWord)>>27); rfPathSwitch =(u1Byte) (PHY_QueryBBReg(pAdapter, 0xB30, bMaskDWord)>>27);
//rfPathSwitch = (u1Byte) DataB30; //rfPathSwitch = (u1Byte) DataB30;
rfPathSwitch = rfPathSwitch&(0x01); rfPathSwitch = rfPathSwitch&(0x01);
@ -484,7 +484,7 @@ phy_IQCalibrate_8192C(
} }
else else
{ {
phy_PathADDAOn(pAdapter, ADDA_REG, FALSE, is2T); phy_PathADDAOn(pAdapter, ADDA_REG, FALSE, is2T);
} }
//3 end //3 end
//===================================== //=====================================
@ -613,22 +613,22 @@ phy_IQCalibrate_8192C(
phy_PIModeSwitch(pAdapter, FALSE); phy_PIModeSwitch(pAdapter, FALSE);
} }
// Reload ADDA power saving parameters // Reload ADDA power saving parameters
phy_ReloadADDARegisters(pAdapter, ADDA_REG, pHalData->ADDA_backup, IQK_ADDA_REG_NUM); phy_ReloadADDARegisters(pAdapter, ADDA_REG, pHalData->ADDA_backup, IQK_ADDA_REG_NUM);
// Reload MAC parameters // Reload MAC parameters
phy_ReloadMACRegisters(pAdapter, IQK_MAC_REG, pHalData->IQK_MAC_backup); phy_ReloadMACRegisters(pAdapter, IQK_MAC_REG, pHalData->IQK_MAC_backup);
// Reload BB parameters // Reload BB parameters
if(IS_HARDWARE_TYPE_8192D(pAdapter)) if(IS_HARDWARE_TYPE_8192D(pAdapter))
{ {
if(is2T) if(is2T)
phy_ReloadADDARegisters(pAdapter, IQK_BB_REG_92D, pHalData->IQK_BB_backup, IQK_BB_REG_NUM_92D); phy_ReloadADDARegisters(pAdapter, IQK_BB_REG_92D, pHalData->IQK_BB_backup, IQK_BB_REG_NUM_92D);
else else
phy_ReloadADDARegisters(pAdapter, IQK_BB_REG_92D, pHalData->IQK_BB_backup, IQK_BB_REG_NUM_92D -1); phy_ReloadADDARegisters(pAdapter, IQK_BB_REG_92D, pHalData->IQK_BB_backup, IQK_BB_REG_NUM_92D -1);
} }
else else
phy_ReloadADDARegisters(pAdapter, IQK_BB_REG_92C, pHalData->IQK_BB_backup, IQK_BB_REG_NUM); phy_ReloadADDARegisters(pAdapter, IQK_BB_REG_92C, pHalData->IQK_BB_backup, IQK_BB_REG_NUM);
if(!IS_HARDWARE_TYPE_8192D(pAdapter)) if(!IS_HARDWARE_TYPE_8192D(pAdapter))
{ {
@ -742,21 +742,21 @@ phy_LCCalibrate(
VOID VOID
phy_APCalibrate_8192C( phy_APCalibrate_8192C(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN s1Byte delta, IN s1Byte delta,
IN BOOLEAN is2T IN BOOLEAN is2T
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
u4Byte regD[PATH_NUM]; u4Byte regD[PATH_NUM];
u4Byte tmpReg, index, offset, i, apkbound; u4Byte tmpReg, index, offset, i, apkbound;
u1Byte path, pathbound = PATH_NUM; u1Byte path, pathbound = PATH_NUM;
u4Byte BB_backup[APK_BB_REG_NUM]; u4Byte BB_backup[APK_BB_REG_NUM];
u4Byte BB_REG[APK_BB_REG_NUM] = { u4Byte BB_REG[APK_BB_REG_NUM] = {
rFPGA1_TxBlock, rOFDM0_TRxPathEnable, rFPGA1_TxBlock, rOFDM0_TRxPathEnable,
rFPGA0_RFMOD, rOFDM0_TRMuxPar, rFPGA0_RFMOD, rOFDM0_TRMuxPar,
rFPGA0_XCD_RFInterfaceSW, rFPGA0_XAB_RFInterfaceSW, rFPGA0_XCD_RFInterfaceSW, rFPGA0_XAB_RFInterfaceSW,
rFPGA0_XA_RFInterfaceOE, rFPGA0_XB_RFInterfaceOE }; rFPGA0_XA_RFInterfaceOE, rFPGA0_XB_RFInterfaceOE };
u4Byte BB_AP_MODE[APK_BB_REG_NUM] = { u4Byte BB_AP_MODE[APK_BB_REG_NUM] = {
0x00000020, 0x00a05430, 0x02040000, 0x00000020, 0x00a05430, 0x02040000,
0x000800e4, 0x00204000 }; 0x000800e4, 0x00204000 };
@ -766,18 +766,18 @@ phy_APCalibrate_8192C(
u4Byte AFE_backup[IQK_ADDA_REG_NUM]; u4Byte AFE_backup[IQK_ADDA_REG_NUM];
u4Byte AFE_REG[IQK_ADDA_REG_NUM] = { u4Byte AFE_REG[IQK_ADDA_REG_NUM] = {
rFPGA0_XCD_SwitchControl, rBlue_Tooth, rFPGA0_XCD_SwitchControl, rBlue_Tooth,
rRx_Wait_CCA, rTx_CCK_RFON, rRx_Wait_CCA, rTx_CCK_RFON,
rTx_CCK_BBON, rTx_OFDM_RFON, rTx_CCK_BBON, rTx_OFDM_RFON,
rTx_OFDM_BBON, rTx_To_Rx, rTx_OFDM_BBON, rTx_To_Rx,
rTx_To_Tx, rRx_CCK, rTx_To_Tx, rRx_CCK,
rRx_OFDM, rRx_Wait_RIFS, rRx_OFDM, rRx_Wait_RIFS,
rRx_TO_Rx, rStandby, rRx_TO_Rx, rStandby,
rSleep, rPMPD_ANAEN }; rSleep, rPMPD_ANAEN };
u4Byte MAC_backup[IQK_MAC_REG_NUM]; u4Byte MAC_backup[IQK_MAC_REG_NUM];
u4Byte MAC_REG[IQK_MAC_REG_NUM] = { u4Byte MAC_REG[IQK_MAC_REG_NUM] = {
REG_TXPAUSE, REG_BCN_CTRL, REG_TXPAUSE, REG_BCN_CTRL,
REG_BCN_CTRL_1, REG_GPIO_MUXCFG}; REG_BCN_CTRL_1, REG_GPIO_MUXCFG};
u4Byte APK_RF_init_value[PATH_NUM][APK_BB_REG_NUM] = { u4Byte APK_RF_init_value[PATH_NUM][APK_BB_REG_NUM] = {
@ -1187,7 +1187,7 @@ if (pAdapter->registrypriv.mp_mode == 1)
VOID VOID
PHY_IQCalibrate_8192C( PHY_IQCalibrate_8192C(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN bReCovery IN BOOLEAN bReCovery
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
@ -1196,12 +1196,12 @@ PHY_IQCalibrate_8192C(
BOOLEAN bPathAOK, bPathBOK; BOOLEAN bPathAOK, bPathBOK;
s4Byte RegE94, RegE9C, RegEA4, RegEAC, RegEB4, RegEBC, RegEC4, RegECC, RegTmp = 0; s4Byte RegE94, RegE9C, RegEA4, RegEAC, RegEB4, RegEBC, RegEC4, RegECC, RegTmp = 0;
BOOLEAN is12simular, is13simular, is23simular; BOOLEAN is12simular, is13simular, is23simular;
BOOLEAN bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE; BOOLEAN bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE;
u4Byte IQK_BB_REG_92C[IQK_BB_REG_NUM] = { u4Byte IQK_BB_REG_92C[IQK_BB_REG_NUM] = {
rOFDM0_XARxIQImbalance, rOFDM0_XBRxIQImbalance, rOFDM0_XARxIQImbalance, rOFDM0_XBRxIQImbalance,
rOFDM0_ECCAThreshold, rOFDM0_AGCRSSITable, rOFDM0_ECCAThreshold, rOFDM0_AGCRSSITable,
rOFDM0_XATxIQImbalance, rOFDM0_XBTxIQImbalance, rOFDM0_XATxIQImbalance, rOFDM0_XBTxIQImbalance,
rOFDM0_XCTxAFE, rOFDM0_XDTxAFE, rOFDM0_XCTxAFE, rOFDM0_XDTxAFE,
rOFDM0_RxIQExtAnta}; rOFDM0_RxIQExtAnta};
if (ODM_CheckPowerStatus(pAdapter) == FALSE) if (ODM_CheckPowerStatus(pAdapter) == FALSE)
@ -1260,15 +1260,15 @@ if (pAdapter->registrypriv.mp_mode == 1)
// if(IS_HARDWARE_TYPE_8192C(pAdapter) || IS_HARDWARE_TYPE_8723A(pAdapter)) // if(IS_HARDWARE_TYPE_8192C(pAdapter) || IS_HARDWARE_TYPE_8723A(pAdapter))
if(!IS_HARDWARE_TYPE_8192D(pAdapter)) if(!IS_HARDWARE_TYPE_8192D(pAdapter))
{ {
if(IS_92C_SERIAL( pHalData->VersionID)) if(IS_92C_SERIAL( pHalData->VersionID))
{ {
phy_IQCalibrate_8192C(pAdapter, result, i, TRUE); phy_IQCalibrate_8192C(pAdapter, result, i, TRUE);
} }
else else
{ {
// For 88C 1T1R // For 88C 1T1R
phy_IQCalibrate_8192C(pAdapter, result, i, FALSE); phy_IQCalibrate_8192C(pAdapter, result, i, FALSE);
} }
} }
else/* if(IS_HARDWARE_TYPE_8192D(pAdapter))*/ else/* if(IS_HARDWARE_TYPE_8192D(pAdapter))*/
{ {
@ -1400,7 +1400,7 @@ PHY_LCCalibrate_8192C(
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
BOOLEAN bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE; BOOLEAN bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE;
PMGNT_INFO pMgntInfo=&pAdapter->MgntInfo; PMGNT_INFO pMgntInfo=&pAdapter->MgntInfo;
PMGNT_INFO pMgntInfoBuddyAdapter; PMGNT_INFO pMgntInfoBuddyAdapter;
u4Byte timeout = 2000, timecount = 0; u4Byte timeout = 2000, timecount = 0;
@ -1465,7 +1465,7 @@ if (pAdapter->registrypriv.mp_mode == 1)
VOID VOID
PHY_APCalibrate_8192C( PHY_APCalibrate_8192C(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN s1Byte delta IN s1Byte delta
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
@ -1558,4 +1558,3 @@ u1Byte ODM_GetRightChnlPlaceforIQK(u1Byte chnl)
} }
#endif #endif

180
hal/HalPhyRf_8188e.c
View file

@ -27,7 +27,7 @@
// 2010/04/25 MH Define the max tx power tracking tx agc power. // 2010/04/25 MH Define the max tx power tracking tx agc power.
#define ODM_TXPWRTRACK_MAX_IDX_88E 6 #define ODM_TXPWRTRACK_MAX_IDX_88E 6
#define CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _deltaThermal) \ #define CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _deltaThermal) \
do {\ do {\
for(_offset = 0; _offset < _size; _offset++)\ for(_offset = 0; _offset < _size; _offset++)\
{\ {\
@ -47,10 +47,10 @@
//3============================================================ //3============================================================
void setIqkMatrix( void setIqkMatrix(
PDM_ODM_T pDM_Odm, PDM_ODM_T pDM_Odm,
u1Byte OFDM_index, u1Byte OFDM_index,
u1Byte RFPath, u1Byte RFPath,
s4Byte IqkResult_X, s4Byte IqkResult_X,
s4Byte IqkResult_Y s4Byte IqkResult_Y
) )
{ {
s4Byte ele_A=0, ele_D, ele_C=0, TempCCk, value32; s4Byte ele_A=0, ele_D, ele_C=0, TempCCk, value32;
@ -133,9 +133,9 @@ void setIqkMatrix(
void doIQK( void doIQK(
PDM_ODM_T pDM_Odm, PDM_ODM_T pDM_Odm,
u1Byte DeltaThermalIndex, u1Byte DeltaThermalIndex,
u1Byte ThermalValue, u1Byte ThermalValue,
u1Byte Threshold u1Byte Threshold
) )
{ {
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
@ -214,13 +214,13 @@ ODM_TxPwrTrackAdjust88E(
//printk("BbSwingIdxOfdm = %d BbSwingFlagOfdm=%d\n", pDM_Odm->BbSwingIdxOfdm, pDM_Odm->BbSwingFlagOfdm); //printk("BbSwingIdxOfdm = %d BbSwingFlagOfdm=%d\n", pDM_Odm->BbSwingIdxOfdm, pDM_Odm->BbSwingFlagOfdm);
if (pDM_Odm->BbSwingIdxOfdm <= pDM_Odm->BbSwingIdxOfdmBase) if (pDM_Odm->BbSwingIdxOfdm <= pDM_Odm->BbSwingIdxOfdmBase)
{ {
*pDirection = 1; *pDirection = 1;
pwr_value = (pDM_Odm->BbSwingIdxOfdmBase - pDM_Odm->BbSwingIdxOfdm); pwr_value = (pDM_Odm->BbSwingIdxOfdmBase - pDM_Odm->BbSwingIdxOfdm);
} }
else else
{ {
*pDirection = 2; *pDirection = 2;
pwr_value = (pDM_Odm->BbSwingIdxOfdm - pDM_Odm->BbSwingIdxOfdmBase); pwr_value = (pDM_Odm->BbSwingIdxOfdm - pDM_Odm->BbSwingIdxOfdmBase);
} }
ODM_RT_TRACE(pDM_Odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ODM_RT_TRACE(pDM_Odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD,
@ -236,13 +236,13 @@ ODM_TxPwrTrackAdjust88E(
//printk("pDM_Odm->BbSwingIdxCck = %d pDM_Odm->BbSwingIdxCckBase = %d\n", pDM_Odm->BbSwingIdxCck, pDM_Odm->BbSwingIdxCckBase); //printk("pDM_Odm->BbSwingIdxCck = %d pDM_Odm->BbSwingIdxCckBase = %d\n", pDM_Odm->BbSwingIdxCck, pDM_Odm->BbSwingIdxCckBase);
if (pDM_Odm->BbSwingIdxCck <= pDM_Odm->BbSwingIdxCckBase) if (pDM_Odm->BbSwingIdxCck <= pDM_Odm->BbSwingIdxCckBase)
{ {
*pDirection = 1; *pDirection = 1;
pwr_value = (pDM_Odm->BbSwingIdxCckBase - pDM_Odm->BbSwingIdxCck); pwr_value = (pDM_Odm->BbSwingIdxCckBase - pDM_Odm->BbSwingIdxCck);
} }
else else
{ {
*pDirection = 2; *pDirection = 2;
pwr_value = (pDM_Odm->BbSwingIdxCck - pDM_Odm->BbSwingIdxCckBase); pwr_value = (pDM_Odm->BbSwingIdxCck - pDM_Odm->BbSwingIdxCckBase);
} }
//printk("pDM_Odm->BbSwingIdxCck = %d pDM_Odm->BbSwingIdxCckBase = %d pwr_value:%d\n", pDM_Odm->BbSwingIdxCck, pDM_Odm->BbSwingIdxCckBase,pwr_value); //printk("pDM_Odm->BbSwingIdxCck = %d pDM_Odm->BbSwingIdxCckBase = %d pwr_value:%d\n", pDM_Odm->BbSwingIdxCck, pDM_Odm->BbSwingIdxCckBase,pwr_value);
} }
@ -279,9 +279,9 @@ ODM_TxPwrTrackAdjust88E(
VOID VOID
odm_TxPwrTrackSetPwr88E( odm_TxPwrTrackSetPwr88E(
PDM_ODM_T pDM_Odm, PDM_ODM_T pDM_Odm,
PWRTRACK_METHOD Method, PWRTRACK_METHOD Method,
u1Byte RFPath, u1Byte RFPath,
u1Byte ChannelMappedIndex u1Byte ChannelMappedIndex
) )
{ {
if (Method == TXAGC) if (Method == TXAGC)
@ -289,7 +289,7 @@ odm_TxPwrTrackSetPwr88E(
u1Byte cckPowerLevel[MAX_TX_COUNT], ofdmPowerLevel[MAX_TX_COUNT]; u1Byte cckPowerLevel[MAX_TX_COUNT], ofdmPowerLevel[MAX_TX_COUNT];
u1Byte BW20PowerLevel[MAX_TX_COUNT], BW40PowerLevel[MAX_TX_COUNT]; u1Byte BW20PowerLevel[MAX_TX_COUNT], BW40PowerLevel[MAX_TX_COUNT];
u1Byte rf = 0; u1Byte rf = 0;
u4Byte pwr = 0, TxAGC = 0; u4Byte pwr = 0, TxAGC = 0;
struct adapter *Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
//printk("odm_TxPwrTrackSetPwr88E CH=%d, modify TXAGC \n", *(pDM_Odm->pChannel)); //printk("odm_TxPwrTrackSetPwr88E CH=%d, modify TXAGC \n", *(pDM_Odm->pChannel));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("odm_TxPwrTrackSetPwr88E CH=%d\n", *(pDM_Odm->pChannel))); ODM_RT_TRACE(pDM_Odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("odm_TxPwrTrackSetPwr88E CH=%d\n", *(pDM_Odm->pChannel)));
@ -303,21 +303,21 @@ odm_TxPwrTrackSetPwr88E(
//#else //#else
{ {
pwr = PHY_QueryBBReg(Adapter, rTxAGC_A_Rate18_06, 0xFF); pwr = PHY_QueryBBReg(Adapter, rTxAGC_A_Rate18_06, 0xFF);
pwr += (pDM_Odm->BbSwingIdxCck - pDM_Odm->BbSwingIdxCckBase); pwr += (pDM_Odm->BbSwingIdxCck - pDM_Odm->BbSwingIdxCckBase);
PHY_SetBBReg(Adapter, rTxAGC_A_CCK1_Mcs32, bMaskByte1, pwr); PHY_SetBBReg(Adapter, rTxAGC_A_CCK1_Mcs32, bMaskByte1, pwr);
TxAGC = (pwr<<16)|(pwr<<8)|(pwr); TxAGC = (pwr<<16)|(pwr<<8)|(pwr);
PHY_SetBBReg(Adapter, rTxAGC_B_CCK11_A_CCK2_11, 0xffffff00, TxAGC); PHY_SetBBReg(Adapter, rTxAGC_B_CCK11_A_CCK2_11, 0xffffff00, TxAGC);
DBG_871X("ODM_TxPwrTrackSetPwr88E: CCK Tx-rf(A) Power = 0x%x\n", TxAGC); DBG_871X("ODM_TxPwrTrackSetPwr88E: CCK Tx-rf(A) Power = 0x%x\n", TxAGC);
pwr = PHY_QueryBBReg(Adapter, rTxAGC_A_Rate18_06, 0xFF); pwr = PHY_QueryBBReg(Adapter, rTxAGC_A_Rate18_06, 0xFF);
pwr += (pDM_Odm->BbSwingIdxOfdm - pDM_Odm->BbSwingIdxOfdmBase); pwr += (pDM_Odm->BbSwingIdxOfdm - pDM_Odm->BbSwingIdxOfdmBase);
TxAGC |= ((pwr<<24)|(pwr<<16)|(pwr<<8)|pwr); TxAGC |= ((pwr<<24)|(pwr<<16)|(pwr<<8)|pwr);
PHY_SetBBReg(Adapter, rTxAGC_A_Rate18_06, bMaskDWord, TxAGC); PHY_SetBBReg(Adapter, rTxAGC_A_Rate18_06, bMaskDWord, TxAGC);
PHY_SetBBReg(Adapter, rTxAGC_A_Rate54_24, bMaskDWord, TxAGC); PHY_SetBBReg(Adapter, rTxAGC_A_Rate54_24, bMaskDWord, TxAGC);
PHY_SetBBReg(Adapter, rTxAGC_A_Mcs03_Mcs00, bMaskDWord, TxAGC); PHY_SetBBReg(Adapter, rTxAGC_A_Mcs03_Mcs00, bMaskDWord, TxAGC);
PHY_SetBBReg(Adapter, rTxAGC_A_Mcs07_Mcs04, bMaskDWord, TxAGC); PHY_SetBBReg(Adapter, rTxAGC_A_Mcs07_Mcs04, bMaskDWord, TxAGC);
PHY_SetBBReg(Adapter, rTxAGC_A_Mcs11_Mcs08, bMaskDWord, TxAGC); PHY_SetBBReg(Adapter, rTxAGC_A_Mcs11_Mcs08, bMaskDWord, TxAGC);
PHY_SetBBReg(Adapter, rTxAGC_A_Mcs15_Mcs12, bMaskDWord, TxAGC); PHY_SetBBReg(Adapter, rTxAGC_A_Mcs15_Mcs12, bMaskDWord, TxAGC);
DBG_871X("ODM_TxPwrTrackSetPwr88E: OFDM Tx-rf(A) Power = 0x%x\n", TxAGC); DBG_871X("ODM_TxPwrTrackSetPwr88E: OFDM Tx-rf(A) Power = 0x%x\n", TxAGC);
} }
//#endif //#endif
@ -391,7 +391,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
//PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; //PMGNT_INFO pMgntInfo = &Adapter->MgntInfo;
#endif #endif
u1Byte ThermalValue = 0, delta, delta_LCK, delta_IQK, offset; u1Byte ThermalValue = 0, delta, delta_LCK, delta_IQK, offset;
@ -402,8 +402,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
s1Byte OFDM_index[2], CCK_index=0, OFDM_index_old[2]={0,0}, CCK_index_old=0, index; s1Byte OFDM_index[2], CCK_index=0, OFDM_index_old[2]={0,0}, CCK_index_old=0, index;
s1Byte deltaPowerIndex = 0; s1Byte deltaPowerIndex = 0;
u4Byte i = 0, j = 0; u4Byte i = 0, j = 0;
BOOLEAN is2T = FALSE; BOOLEAN is2T = FALSE;
BOOLEAN bInteralPA = FALSE; BOOLEAN bInteralPA = FALSE;
u1Byte OFDM_min_index = 6, rf = (is2T) ? 2 : 1; //OFDM BB Swing should be less than +3.0dB, which is required by Arthur u1Byte OFDM_min_index = 6, rf = (is2T) ? 2 : 1; //OFDM BB Swing should be less than +3.0dB, which is required by Arthur
u1Byte Indexforchannel = 0;/*GetRightChnlPlaceforIQK(pHalData->CurrentChannel)*/ u1Byte Indexforchannel = 0;/*GetRightChnlPlaceforIQK(pHalData->CurrentChannel)*/
@ -481,7 +481,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
//4 5. Calculate delta, delta_LCK, delta_IQK. //4 5. Calculate delta, delta_LCK, delta_IQK.
delta = (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue)?(ThermalValue - pDM_Odm->RFCalibrateInfo.ThermalValue):(pDM_Odm->RFCalibrateInfo.ThermalValue - ThermalValue); delta = (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue)?(ThermalValue - pDM_Odm->RFCalibrateInfo.ThermalValue):(pDM_Odm->RFCalibrateInfo.ThermalValue - ThermalValue);
delta_LCK = (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue_LCK)?(ThermalValue - pDM_Odm->RFCalibrateInfo.ThermalValue_LCK):(pDM_Odm->RFCalibrateInfo.ThermalValue_LCK - ThermalValue); delta_LCK = (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue_LCK)?(ThermalValue - pDM_Odm->RFCalibrateInfo.ThermalValue_LCK):(pDM_Odm->RFCalibrateInfo.ThermalValue_LCK - ThermalValue);
delta_IQK = (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue_IQK)?(ThermalValue - pDM_Odm->RFCalibrateInfo.ThermalValue_IQK):(pDM_Odm->RFCalibrateInfo.ThermalValue_IQK - ThermalValue); delta_IQK = (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue_IQK)?(ThermalValue - pDM_Odm->RFCalibrateInfo.ThermalValue_IQK):(pDM_Odm->RFCalibrateInfo.ThermalValue_IQK - ThermalValue);
@ -533,7 +533,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
pDM_Odm->RFCalibrateInfo.PowerIndexOffset = pDM_Odm->RFCalibrateInfo.DeltaPowerIndex - pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast; pDM_Odm->RFCalibrateInfo.PowerIndexOffset = pDM_Odm->RFCalibrateInfo.DeltaPowerIndex - pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast;
for(i = 0; i < rf; i++) for(i = 0; i < rf; i++)
pDM_Odm->RFCalibrateInfo.OFDM_index[i] = pDM_Odm->BbSwingIdxOfdmBase + pDM_Odm->RFCalibrateInfo.PowerIndexOffset; pDM_Odm->RFCalibrateInfo.OFDM_index[i] = pDM_Odm->BbSwingIdxOfdmBase + pDM_Odm->RFCalibrateInfo.PowerIndexOffset;
pDM_Odm->RFCalibrateInfo.CCK_index = pDM_Odm->BbSwingIdxCckBase + pDM_Odm->RFCalibrateInfo.PowerIndexOffset; pDM_Odm->RFCalibrateInfo.CCK_index = pDM_Odm->BbSwingIdxCckBase + pDM_Odm->RFCalibrateInfo.PowerIndexOffset;
pDM_Odm->BbSwingIdxCck = pDM_Odm->RFCalibrateInfo.CCK_index; pDM_Odm->BbSwingIdxCck = pDM_Odm->RFCalibrateInfo.CCK_index;
@ -945,7 +945,7 @@ _PHY_PathAFillIQKMatrix(
#else #else
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN bIQKOK, IN BOOLEAN bIQKOK,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte final_candidate, IN u1Byte final_candidate,
IN BOOLEAN bTxOnly IN BOOLEAN bTxOnly
@ -1020,7 +1020,7 @@ _PHY_PathBFillIQKMatrix(
#else #else
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN bIQKOK, IN BOOLEAN bIQKOK,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte final_candidate, IN u1Byte final_candidate,
IN BOOLEAN bTxOnly //do Tx only IN BOOLEAN bTxOnly //do Tx only
@ -1092,7 +1092,7 @@ ODM_CheckPowerStatus(
/* /*
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc;
RT_RF_POWER_STATE rtState; RT_RF_POWER_STATE rtState;
PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo);
// 2011/07/27 MH We are not testing ready~~!! We may fail to get correct value when init sequence. // 2011/07/27 MH We are not testing ready~~!! We may fail to get correct value when init sequence.
@ -1370,7 +1370,7 @@ phy_SimularityCompare_8188E(
#else #else
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte c1, IN u1Byte c1,
IN u1Byte c2 IN u1Byte c2
) )
@ -1505,7 +1505,7 @@ phy_IQCalibrate_8188E(
#else #else
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte t, IN u1Byte t,
IN BOOLEAN is2T IN BOOLEAN is2T
) )
@ -1522,21 +1522,21 @@ phy_IQCalibrate_8188E(
u4Byte i; u4Byte i;
u1Byte PathAOK, PathBOK; u1Byte PathAOK, PathBOK;
u4Byte ADDA_REG[IQK_ADDA_REG_NUM] = { u4Byte ADDA_REG[IQK_ADDA_REG_NUM] = {
rFPGA0_XCD_SwitchControl, rBlue_Tooth, rFPGA0_XCD_SwitchControl, rBlue_Tooth,
rRx_Wait_CCA, rTx_CCK_RFON, rRx_Wait_CCA, rTx_CCK_RFON,
rTx_CCK_BBON, rTx_OFDM_RFON, rTx_CCK_BBON, rTx_OFDM_RFON,
rTx_OFDM_BBON, rTx_To_Rx, rTx_OFDM_BBON, rTx_To_Rx,
rTx_To_Tx, rRx_CCK, rTx_To_Tx, rRx_CCK,
rRx_OFDM, rRx_Wait_RIFS, rRx_OFDM, rRx_Wait_RIFS,
rRx_TO_Rx, rStandby, rRx_TO_Rx, rStandby,
rSleep, rPMPD_ANAEN }; rSleep, rPMPD_ANAEN };
u4Byte IQK_MAC_REG[IQK_MAC_REG_NUM] = { u4Byte IQK_MAC_REG[IQK_MAC_REG_NUM] = {
REG_TXPAUSE, REG_BCN_CTRL, REG_TXPAUSE, REG_BCN_CTRL,
REG_BCN_CTRL_1, REG_GPIO_MUXCFG}; REG_BCN_CTRL_1, REG_GPIO_MUXCFG};
//since 92C & 92D have the different define in IQK_BB_REG //since 92C & 92D have the different define in IQK_BB_REG
u4Byte IQK_BB_REG_92C[IQK_BB_REG_NUM] = { u4Byte IQK_BB_REG_92C[IQK_BB_REG_NUM] = {
rOFDM0_TRxPathEnable, rOFDM0_TRMuxPar, rOFDM0_TRxPathEnable, rOFDM0_TRMuxPar,
rFPGA0_XCD_RFInterfaceSW, rConfig_AntA, rConfig_AntB, rFPGA0_XCD_RFInterfaceSW, rConfig_AntA, rConfig_AntB,
rFPGA0_XAB_RFInterfaceSW, rFPGA0_XA_RFInterfaceOE, rFPGA0_XAB_RFInterfaceSW, rFPGA0_XA_RFInterfaceOE,
rFPGA0_XB_RFInterfaceOE, rFPGA0_RFMOD rFPGA0_XB_RFInterfaceOE, rFPGA0_RFMOD
@ -1556,7 +1556,7 @@ if ( *(pDM_Odm->mp_mode) == 1)
else else
retryCount = 2; retryCount = 2;
// Note: IQ calibration must be performed after loading // Note: IQ calibration must be performed after loading
// PHY_REG.txt , and radio_a, radio_b.txt // PHY_REG.txt , and radio_a, radio_b.txt
//u4Byte bbvalue; //u4Byte bbvalue;
@ -1570,29 +1570,29 @@ else
if(t==0) if(t==0)
{ {
// bbvalue = ODM_GetBBReg(pDM_Odm, rFPGA0_RFMOD, bMaskDWord); // bbvalue = ODM_GetBBReg(pDM_Odm, rFPGA0_RFMOD, bMaskDWord);
// RTPRINT(FINIT, INIT_IQK, ("phy_IQCalibrate_8188E()==>0x%08x\n",bbvalue)); // RTPRINT(FINIT, INIT_IQK, ("phy_IQCalibrate_8188E()==>0x%08x\n",bbvalue));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("IQ Calibration for %s for %d times\n", (is2T ? "2T2R" : "1T1R"), t)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("IQ Calibration for %s for %d times\n", (is2T ? "2T2R" : "1T1R"), t));
// Save ADDA parameters, turn Path A ADDA on // Save ADDA parameters, turn Path A ADDA on
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
_PHY_SaveADDARegisters(pAdapter, ADDA_REG, pDM_Odm->RFCalibrateInfo.ADDA_backup, IQK_ADDA_REG_NUM); _PHY_SaveADDARegisters(pAdapter, ADDA_REG, pDM_Odm->RFCalibrateInfo.ADDA_backup, IQK_ADDA_REG_NUM);
_PHY_SaveMACRegisters(pAdapter, IQK_MAC_REG, pDM_Odm->RFCalibrateInfo.IQK_MAC_backup); _PHY_SaveMACRegisters(pAdapter, IQK_MAC_REG, pDM_Odm->RFCalibrateInfo.IQK_MAC_backup);
_PHY_SaveADDARegisters(pAdapter, IQK_BB_REG_92C, pDM_Odm->RFCalibrateInfo.IQK_BB_backup, IQK_BB_REG_NUM); _PHY_SaveADDARegisters(pAdapter, IQK_BB_REG_92C, pDM_Odm->RFCalibrateInfo.IQK_BB_backup, IQK_BB_REG_NUM);
#else #else
_PHY_SaveADDARegisters(pDM_Odm, ADDA_REG, pDM_Odm->RFCalibrateInfo.ADDA_backup, IQK_ADDA_REG_NUM); _PHY_SaveADDARegisters(pDM_Odm, ADDA_REG, pDM_Odm->RFCalibrateInfo.ADDA_backup, IQK_ADDA_REG_NUM);
_PHY_SaveMACRegisters(pDM_Odm, IQK_MAC_REG, pDM_Odm->RFCalibrateInfo.IQK_MAC_backup); _PHY_SaveMACRegisters(pDM_Odm, IQK_MAC_REG, pDM_Odm->RFCalibrateInfo.IQK_MAC_backup);
_PHY_SaveADDARegisters(pDM_Odm, IQK_BB_REG_92C, pDM_Odm->RFCalibrateInfo.IQK_BB_backup, IQK_BB_REG_NUM); _PHY_SaveADDARegisters(pDM_Odm, IQK_BB_REG_92C, pDM_Odm->RFCalibrateInfo.IQK_BB_backup, IQK_BB_REG_NUM);
#endif #endif
} }
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("IQ Calibration for %s for %d times\n", (is2T ? "2T2R" : "1T1R"), t)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("IQ Calibration for %s for %d times\n", (is2T ? "2T2R" : "1T1R"), t));
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
_PHY_PathADDAOn(pAdapter, ADDA_REG, TRUE, is2T); _PHY_PathADDAOn(pAdapter, ADDA_REG, TRUE, is2T);
#else #else
_PHY_PathADDAOn(pDM_Odm, ADDA_REG, TRUE, is2T); _PHY_PathADDAOn(pDM_Odm, ADDA_REG, TRUE, is2T);
#endif #endif
@ -1756,21 +1756,21 @@ else
} }
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
// Reload ADDA power saving parameters // Reload ADDA power saving parameters
_PHY_ReloadADDARegisters(pAdapter, ADDA_REG, pDM_Odm->RFCalibrateInfo.ADDA_backup, IQK_ADDA_REG_NUM); _PHY_ReloadADDARegisters(pAdapter, ADDA_REG, pDM_Odm->RFCalibrateInfo.ADDA_backup, IQK_ADDA_REG_NUM);
// Reload MAC parameters // Reload MAC parameters
_PHY_ReloadMACRegisters(pAdapter, IQK_MAC_REG, pDM_Odm->RFCalibrateInfo.IQK_MAC_backup); _PHY_ReloadMACRegisters(pAdapter, IQK_MAC_REG, pDM_Odm->RFCalibrateInfo.IQK_MAC_backup);
_PHY_ReloadADDARegisters(pAdapter, IQK_BB_REG_92C, pDM_Odm->RFCalibrateInfo.IQK_BB_backup, IQK_BB_REG_NUM); _PHY_ReloadADDARegisters(pAdapter, IQK_BB_REG_92C, pDM_Odm->RFCalibrateInfo.IQK_BB_backup, IQK_BB_REG_NUM);
#else #else
// Reload ADDA power saving parameters // Reload ADDA power saving parameters
_PHY_ReloadADDARegisters(pDM_Odm, ADDA_REG, pDM_Odm->RFCalibrateInfo.ADDA_backup, IQK_ADDA_REG_NUM); _PHY_ReloadADDARegisters(pDM_Odm, ADDA_REG, pDM_Odm->RFCalibrateInfo.ADDA_backup, IQK_ADDA_REG_NUM);
// Reload MAC parameters // Reload MAC parameters
_PHY_ReloadMACRegisters(pDM_Odm, IQK_MAC_REG, pDM_Odm->RFCalibrateInfo.IQK_MAC_backup); _PHY_ReloadMACRegisters(pDM_Odm, IQK_MAC_REG, pDM_Odm->RFCalibrateInfo.IQK_MAC_backup);
_PHY_ReloadADDARegisters(pDM_Odm, IQK_BB_REG_92C, pDM_Odm->RFCalibrateInfo.IQK_BB_backup, IQK_BB_REG_NUM); _PHY_ReloadADDARegisters(pDM_Odm, IQK_BB_REG_92C, pDM_Odm->RFCalibrateInfo.IQK_BB_backup, IQK_BB_REG_NUM);
#endif #endif
@ -1889,7 +1889,7 @@ phy_APCalibrate_8188E(
#else #else
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN s1Byte delta, IN s1Byte delta,
IN BOOLEAN is2T IN BOOLEAN is2T
) )
{ {
@ -1902,15 +1902,15 @@ phy_APCalibrate_8188E(
PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc;
#endif #endif
#endif #endif
u4Byte regD[PATH_NUM]; u4Byte regD[PATH_NUM];
u4Byte tmpReg, index, offset, apkbound; u4Byte tmpReg, index, offset, apkbound;
u1Byte path, i, pathbound = PATH_NUM; u1Byte path, i, pathbound = PATH_NUM;
u4Byte BB_backup[APK_BB_REG_NUM]; u4Byte BB_backup[APK_BB_REG_NUM];
u4Byte BB_REG[APK_BB_REG_NUM] = { u4Byte BB_REG[APK_BB_REG_NUM] = {
rFPGA1_TxBlock, rOFDM0_TRxPathEnable, rFPGA1_TxBlock, rOFDM0_TRxPathEnable,
rFPGA0_RFMOD, rOFDM0_TRMuxPar, rFPGA0_RFMOD, rOFDM0_TRMuxPar,
rFPGA0_XCD_RFInterfaceSW, rFPGA0_XAB_RFInterfaceSW, rFPGA0_XCD_RFInterfaceSW, rFPGA0_XAB_RFInterfaceSW,
rFPGA0_XA_RFInterfaceOE, rFPGA0_XB_RFInterfaceOE }; rFPGA0_XA_RFInterfaceOE, rFPGA0_XB_RFInterfaceOE };
u4Byte BB_AP_MODE[APK_BB_REG_NUM] = { u4Byte BB_AP_MODE[APK_BB_REG_NUM] = {
0x00000020, 0x00a05430, 0x02040000, 0x00000020, 0x00a05430, 0x02040000,
0x000800e4, 0x00204000 }; 0x000800e4, 0x00204000 };
@ -1920,18 +1920,18 @@ phy_APCalibrate_8188E(
u4Byte AFE_backup[IQK_ADDA_REG_NUM]; u4Byte AFE_backup[IQK_ADDA_REG_NUM];
u4Byte AFE_REG[IQK_ADDA_REG_NUM] = { u4Byte AFE_REG[IQK_ADDA_REG_NUM] = {
rFPGA0_XCD_SwitchControl, rBlue_Tooth, rFPGA0_XCD_SwitchControl, rBlue_Tooth,
rRx_Wait_CCA, rTx_CCK_RFON, rRx_Wait_CCA, rTx_CCK_RFON,
rTx_CCK_BBON, rTx_OFDM_RFON, rTx_CCK_BBON, rTx_OFDM_RFON,
rTx_OFDM_BBON, rTx_To_Rx, rTx_OFDM_BBON, rTx_To_Rx,
rTx_To_Tx, rRx_CCK, rTx_To_Tx, rRx_CCK,
rRx_OFDM, rRx_Wait_RIFS, rRx_OFDM, rRx_Wait_RIFS,
rRx_TO_Rx, rStandby, rRx_TO_Rx, rStandby,
rSleep, rPMPD_ANAEN }; rSleep, rPMPD_ANAEN };
u4Byte MAC_backup[IQK_MAC_REG_NUM]; u4Byte MAC_backup[IQK_MAC_REG_NUM];
u4Byte MAC_REG[IQK_MAC_REG_NUM] = { u4Byte MAC_REG[IQK_MAC_REG_NUM] = {
REG_TXPAUSE, REG_BCN_CTRL, REG_TXPAUSE, REG_BCN_CTRL,
REG_BCN_CTRL_1, REG_GPIO_MUXCFG}; REG_BCN_CTRL_1, REG_GPIO_MUXCFG};
u4Byte APK_RF_init_value[PATH_NUM][APK_BB_REG_NUM] = { u4Byte APK_RF_init_value[PATH_NUM][APK_BB_REG_NUM] = {
@ -2382,7 +2382,7 @@ PHY_IQCalibrate_8188E(
#else #else
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN bReCovery IN BOOLEAN bReCovery
) )
{ {
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
@ -2405,16 +2405,16 @@ PHY_IQCalibrate_8188E(
s4Byte result[4][8]; //last is final result s4Byte result[4][8]; //last is final result
u1Byte i, final_candidate, Indexforchannel; u1Byte i, final_candidate, Indexforchannel;
u1Byte channelToIQK = 7; u1Byte channelToIQK = 7;
BOOLEAN bPathAOK, bPathBOK; BOOLEAN bPathAOK, bPathBOK;
s4Byte RegE94, RegE9C, RegEA4, RegEAC, RegEB4, RegEBC, RegEC4, RegECC, RegTmp = 0; s4Byte RegE94, RegE9C, RegEA4, RegEAC, RegEB4, RegEBC, RegEC4, RegECC, RegTmp = 0;
BOOLEAN is12simular, is13simular, is23simular; BOOLEAN is12simular, is13simular, is23simular;
BOOLEAN bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE; BOOLEAN bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE;
u4Byte IQK_BB_REG_92C[IQK_BB_REG_NUM] = { u4Byte IQK_BB_REG_92C[IQK_BB_REG_NUM] = {
rOFDM0_XARxIQImbalance, rOFDM0_XBRxIQImbalance, rOFDM0_XARxIQImbalance, rOFDM0_XBRxIQImbalance,
rOFDM0_ECCAThreshold, rOFDM0_AGCRSSITable, rOFDM0_ECCAThreshold, rOFDM0_AGCRSSITable,
rOFDM0_XATxIQImbalance, rOFDM0_XBTxIQImbalance, rOFDM0_XATxIQImbalance, rOFDM0_XBTxIQImbalance,
rOFDM0_XCTxAFE, rOFDM0_XDTxAFE, rOFDM0_XCTxAFE, rOFDM0_XDTxAFE,
rOFDM0_RxIQExtAnta}; rOFDM0_RxIQExtAnta};
BOOLEAN is2T; BOOLEAN is2T;
@ -2486,7 +2486,7 @@ if (*(pDM_Odm->mp_mode) == 1)
originChannel = *(pDM_Odm->pChannel); originChannel = *(pDM_Odm->pChannel);
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
pAdapter->HalFunc.SwChnlByTimerHandler(pAdapter, channelToIQK); pAdapter->HalFunc.SwChnlByTimerHandler(pAdapter, channelToIQK);
#elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
pAdapter->HalFunc.set_channel_handler(pAdapter, channelToIQK); pAdapter->HalFunc.set_channel_handler(pAdapter, channelToIQK);
#endif #endif
@ -2517,9 +2517,9 @@ if (*(pDM_Odm->mp_mode) == 1)
{ {
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
phy_IQCalibrate_8188E(pAdapter, result, i, is2T); phy_IQCalibrate_8188E(pAdapter, result, i, is2T);
#else #else
phy_IQCalibrate_8188E(pDM_Odm, result, i, is2T); phy_IQCalibrate_8188E(pDM_Odm, result, i, is2T);
#endif #endif
@ -2679,7 +2679,7 @@ PHY_LCCalibrate_8188E(
#endif #endif
) )
{ {
BOOLEAN bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE; BOOLEAN bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE;
u4Byte timeout = 2000, timecount = 0; u4Byte timeout = 2000, timecount = 0;
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
@ -2766,7 +2766,7 @@ PHY_APCalibrate_8188E(
#else #else
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN s1Byte delta IN s1Byte delta
) )
{ {
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)

4
hal/HalPwrSeqCmd.c
View file

@ -56,7 +56,7 @@ u8 HalPwrSeqCmdParsing(
u8 InterfaceType, u8 InterfaceType,
WLAN_PWR_CFG PwrSeqCmd[]) WLAN_PWR_CFG PwrSeqCmd[])
{ {
WLAN_PWR_CFG PwrCfgCmd = {0}; WLAN_PWR_CFG PwrCfgCmd = {0};
u8 bPollingBit = _FALSE; u8 bPollingBit = _FALSE;
u32 AryIdx = 0; u32 AryIdx = 0;
u8 value = 0; u8 value = 0;
@ -183,5 +183,3 @@ u8 HalPwrSeqCmdParsing(
return _TRUE; return _TRUE;
} }

25
hal/hal_com.c
View file

@ -194,15 +194,15 @@ _OneOutPipeMapping(
static VOID static VOID
_TwoOutPipeMapping( _TwoOutPipeMapping(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN bWIFICfg IN BOOLEAN bWIFICfg
) )
{ {
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter);
if(bWIFICfg){ //WMM if(bWIFICfg){ //WMM
// BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA // BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA
//{ 0, 1, 0, 1, 0, 0, 0, 0, 0 }; //{ 0, 1, 0, 1, 0, 0, 0, 0, 0 };
//0:H, 1:L //0:H, 1:L
pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[1];//VO pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[1];//VO
@ -219,8 +219,8 @@ _TwoOutPipeMapping(
else{//typical setting else{//typical setting
//BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA //BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA
//{ 1, 1, 0, 0, 0, 0, 0, 0, 0 }; //{ 1, 1, 0, 0, 0, 0, 0, 0, 0 };
//0:H, 1:L //0:H, 1:L
pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];//VO pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];//VO
@ -239,15 +239,15 @@ _TwoOutPipeMapping(
static VOID _ThreeOutPipeMapping( static VOID _ThreeOutPipeMapping(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN bWIFICfg IN BOOLEAN bWIFICfg
) )
{ {
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter);
if(bWIFICfg){//for WMM if(bWIFICfg){//for WMM
// BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA // BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA
//{ 1, 2, 1, 0, 0, 0, 0, 0, 0 }; //{ 1, 2, 1, 0, 0, 0, 0, 0, 0 };
//0:H, 1:N, 2:L //0:H, 1:N, 2:L
pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];//VO pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];//VO
@ -264,8 +264,8 @@ static VOID _ThreeOutPipeMapping(
else{//typical setting else{//typical setting
// BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA // BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA
//{ 2, 2, 1, 0, 0, 0, 0, 0, 0 }; //{ 2, 2, 1, 0, 0, 0, 0, 0, 0 };
//0:H, 1:N, 2:L //0:H, 1:N, 2:L
pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];//VO pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];//VO
@ -324,8 +324,8 @@ void hal_init_macaddr(struct adapter *adapter)
/* /*
* C2H event format: * C2H event format:
* Field TRIGGER CONTENT CMD_SEQ CMD_LEN CMD_ID * Field TRIGGER CONTENT CMD_SEQ CMD_LEN CMD_ID
* BITS [127:120] [119:16] [15:8] [7:4] [3:0] * BITS [127:120] [119:16] [15:8] [7:4] [3:0]
*/ */
void c2h_evt_clear(struct adapter *adapter) void c2h_evt_clear(struct adapter *adapter)
@ -439,4 +439,3 @@ GetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value)
return bResult; return bResult;
} }

5
hal/hal_intf.c
View file

@ -125,12 +125,12 @@ uint rtw_hal_init(struct adapter *padapter)
} }
else else
{ {
status = padapter->HalFunc.hal_init(padapter->pbuddy_adapter); status = padapter->HalFunc.hal_init(padapter->pbuddy_adapter);
if(status == _SUCCESS){ if(status == _SUCCESS){
padapter->pbuddy_adapter->hw_init_completed = _TRUE; padapter->pbuddy_adapter->hw_init_completed = _TRUE;
} }
else{ else{
padapter->pbuddy_adapter->hw_init_completed = _FALSE; padapter->pbuddy_adapter->hw_init_completed = _FALSE;
RT_TRACE(_module_hal_init_c_,_drv_err_,("rtw_hal_init: hal__init fail(pbuddy_adapter)\n")); RT_TRACE(_module_hal_init_c_,_drv_err_,("rtw_hal_init: hal__init fail(pbuddy_adapter)\n"));
DBG_871X("rtw_hal_init: hal__init fail(pbuddy_adapter)\n"); DBG_871X("rtw_hal_init: hal__init fail(pbuddy_adapter)\n");
return status; return status;
@ -588,4 +588,3 @@ c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter)
{ {
return adapter->HalFunc.c2h_id_filter_ccx; return adapter->HalFunc.c2h_id_filter_ccx;
} }

495
hal/odm.c
View file

File diff suppressed because it is too large Load diff

41
hal/odm_HWConfig.c
View file

@ -27,7 +27,7 @@
#if (RTL8188E_FOR_TEST_CHIP > 1) #if (RTL8188E_FOR_TEST_CHIP > 1)
#define READ_AND_CONFIG(ic, txt) do {\ #define READ_AND_CONFIG(ic, txt) do {\
if (pDM_Odm->bIsMPChip)\ if (pDM_Odm->bIsMPChip)\
READ_AND_CONFIG_MP(ic,txt);\ READ_AND_CONFIG_MP(ic,txt);\
else\ else\
READ_AND_CONFIG_TC(ic,txt);\ READ_AND_CONFIG_TC(ic,txt);\
} while(0) } while(0)
@ -303,10 +303,10 @@ odm_SignalScaleMapping(
//pMgntInfo->CustomerID == RT_CID_819x_Lenovo //pMgntInfo->CustomerID == RT_CID_819x_Lenovo
static u1Byte odm_SQ_process_patch_RT_CID_819x_Lenovo( static u1Byte odm_SQ_process_patch_RT_CID_819x_Lenovo(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u1Byte isCCKrate, IN u1Byte isCCKrate,
IN u1Byte PWDB_ALL, IN u1Byte PWDB_ALL,
IN u1Byte path, IN u1Byte path,
IN u1Byte RSSI IN u1Byte RSSI
) )
{ {
u1Byte SQ; u1Byte SQ;
@ -381,7 +381,7 @@ VOID
odm_RxPhyStatus92CSeries_Parsing( odm_RxPhyStatus92CSeries_Parsing(
IN OUT PDM_ODM_T pDM_Odm, IN OUT PDM_ODM_T pDM_Odm,
OUT PODM_PHY_INFO_T pPhyInfo, OUT PODM_PHY_INFO_T pPhyInfo,
IN pu1Byte pPhyStatus, IN pu1Byte pPhyStatus,
IN PODM_PACKET_INFO_T pPktinfo IN PODM_PACKET_INFO_T pPktinfo
) )
{ {
@ -549,7 +549,7 @@ odm_RxPhyStatus92CSeries_Parsing(
else//Modification for int-LNA board else//Modification for int-LNA board
{ {
if(PWDB_ALL > 99) if(PWDB_ALL > 99)
PWDB_ALL -= 8; PWDB_ALL -= 8;
else if(PWDB_ALL > 50 && PWDB_ALL <= 68) else if(PWDB_ALL > 50 && PWDB_ALL <= 68)
PWDB_ALL += 4; PWDB_ALL += 4;
} }
@ -599,7 +599,7 @@ odm_RxPhyStatus92CSeries_Parsing(
// (1)Get RSSI for HT rate // (1)Get RSSI for HT rate
// //
for(i = ODM_RF_PATH_A; i < ODM_RF_PATH_MAX; i++) for(i = ODM_RF_PATH_A; i < ODM_RF_PATH_MAX; i++)
{ {
// 2008/01/30 MH we will judge RF RX path now. // 2008/01/30 MH we will judge RF RX path now.
if (pDM_Odm->RFPathRxEnable & BIT(i)) if (pDM_Odm->RFPathRxEnable & BIT(i))
@ -760,7 +760,7 @@ odm_Process_RSSIForDM(
u4Byte OFDM_pkt=0; u4Byte OFDM_pkt=0;
u4Byte Weighting=0; u4Byte Weighting=0;
PSTA_INFO_T pEntry; PSTA_INFO_T pEntry;
if(pPktinfo->StationID == 0xFF) if(pPktinfo->StationID == 0xFF)
return; return;
@ -781,7 +781,7 @@ odm_Process_RSSIForDM(
} }
isCCKrate = ((pPktinfo->Rate >= DESC92C_RATE1M ) && (pPktinfo->Rate <= DESC92C_RATE11M ))?TRUE :FALSE; isCCKrate = ((pPktinfo->Rate >= DESC92C_RATE1M ) && (pPktinfo->Rate <= DESC92C_RATE11M ))?TRUE :FALSE;
if(pPktinfo->bPacketBeacon) if(pPktinfo->bPacketBeacon)
pDM_Odm->PhyDbgInfo.NumQryBeaconPkt++; pDM_Odm->PhyDbgInfo.NumQryBeaconPkt++;
pDM_Odm->RxRate = pPktinfo->Rate; pDM_Odm->RxRate = pPktinfo->Rate;
@ -979,7 +979,7 @@ VOID
ODM_PhyStatusQuery_92CSeries( ODM_PhyStatusQuery_92CSeries(
IN OUT PDM_ODM_T pDM_Odm, IN OUT PDM_ODM_T pDM_Odm,
OUT PODM_PHY_INFO_T pPhyInfo, OUT PODM_PHY_INFO_T pPhyInfo,
IN pu1Byte pPhyStatus, IN pu1Byte pPhyStatus,
IN PODM_PACKET_INFO_T pPktinfo IN PODM_PACKET_INFO_T pPktinfo
) )
{ {
@ -1027,7 +1027,7 @@ VOID
ODM_PhyStatusQuery_JaguarSeries( ODM_PhyStatusQuery_JaguarSeries(
IN OUT PDM_ODM_T pDM_Odm, IN OUT PDM_ODM_T pDM_Odm,
OUT PODM_PHY_INFO_T pPhyInfo, OUT PODM_PHY_INFO_T pPhyInfo,
IN pu1Byte pPhyStatus, IN pu1Byte pPhyStatus,
IN PODM_PACKET_INFO_T pPktinfo IN PODM_PACKET_INFO_T pPktinfo
) )
{ {
@ -1039,7 +1039,7 @@ VOID
ODM_PhyStatusQuery( ODM_PhyStatusQuery(
IN OUT PDM_ODM_T pDM_Odm, IN OUT PDM_ODM_T pDM_Odm,
OUT PODM_PHY_INFO_T pPhyInfo, OUT PODM_PHY_INFO_T pPhyInfo,
IN pu1Byte pPhyStatus, IN pu1Byte pPhyStatus,
IN PODM_PACKET_INFO_T pPktinfo IN PODM_PACKET_INFO_T pPktinfo
) )
{ {
@ -1059,7 +1059,7 @@ ODM_PhyStatusQuery(
VOID VOID
ODM_MacStatusQuery( ODM_MacStatusQuery(
IN OUT PDM_ODM_T pDM_Odm, IN OUT PDM_ODM_T pDM_Odm,
IN pu1Byte pMacStatus, IN pu1Byte pMacStatus,
IN u1Byte MacID, IN u1Byte MacID,
IN BOOLEAN bPacketMatchBSSID, IN BOOLEAN bPacketMatchBSSID,
IN BOOLEAN bPacketToSelf, IN BOOLEAN bPacketToSelf,
@ -1074,9 +1074,9 @@ ODM_MacStatusQuery(
HAL_STATUS HAL_STATUS
ODM_ConfigRFWithHeaderFile( ODM_ConfigRFWithHeaderFile(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN ODM_RF_RADIO_PATH_E Content, IN ODM_RF_RADIO_PATH_E Content,
IN ODM_RF_RADIO_PATH_E eRFPath IN ODM_RF_RADIO_PATH_E eRFPath
) )
{ {
//RT_STATUS rtStatus = RT_STATUS_SUCCESS; //RT_STATUS rtStatus = RT_STATUS_SUCCESS;
@ -1118,8 +1118,8 @@ ODM_ConfigRFWithHeaderFile(
HAL_STATUS HAL_STATUS
ODM_ConfigBBWithHeaderFile( ODM_ConfigBBWithHeaderFile(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN ODM_BB_Config_Type ConfigType IN ODM_BB_Config_Type ConfigType
) )
{ {
#if (RTL8723A_SUPPORT == 1) #if (RTL8723A_SUPPORT == 1)
@ -1170,7 +1170,7 @@ ODM_ConfigBBWithHeaderFile(
HAL_STATUS HAL_STATUS
ODM_ConfigMACWithHeaderFile( ODM_ConfigMACWithHeaderFile(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
u1Byte result = HAL_STATUS_SUCCESS; u1Byte result = HAL_STATUS_SUCCESS;
@ -1195,4 +1195,3 @@ ODM_ConfigMACWithHeaderFile(
#endif // end of (#if DM_ODM_SUPPORT_TYPE) #endif // end of (#if DM_ODM_SUPPORT_TYPE)

89
hal/odm_RTL8188E.c
View file

@ -54,10 +54,10 @@ odm_RX_HWAntDivInit(
struct adapter * Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
#if (MP_DRIVER == 1) #if (MP_DRIVER == 1)
if (*(pDM_Odm->mp_mode) == 1) if (*(pDM_Odm->mp_mode) == 1)
{ {
pDM_Odm->AntDivType = CGCS_RX_SW_ANTDIV; pDM_Odm->AntDivType = CGCS_RX_SW_ANTDIV;
ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N , BIT7, 0); // disable HW AntDiv ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N , BIT7, 0); // disable HW AntDiv
ODM_SetBBReg(pDM_Odm, ODM_REG_LNA_SWITCH_11N , BIT31, 1); // 1:CG, 0:CS ODM_SetBBReg(pDM_Odm, ODM_REG_LNA_SWITCH_11N , BIT31, 1); // 1:CG, 0:CS
return; return;
} }
#endif #endif
@ -67,9 +67,9 @@ odm_RX_HWAntDivInit(
value32 = ODM_GetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord); value32 = ODM_GetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
ODM_SetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord, value32|(BIT23|BIT25)); //Reg4C[25]=1, Reg4C[23]=1 for pin output ODM_SetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord, value32|(BIT23|BIT25)); //Reg4C[25]=1, Reg4C[23]=1 for pin output
//Pin Settings //Pin Settings
ODM_SetBBReg(pDM_Odm, ODM_REG_PIN_CTRL_11N , BIT9|BIT8, 0);//Reg870[8]=1'b0, Reg870[9]=1'b0 //antsel antselb by HW ODM_SetBBReg(pDM_Odm, ODM_REG_PIN_CTRL_11N , BIT9|BIT8, 0);//Reg870[8]=1'b0, Reg870[9]=1'b0 //antsel antselb by HW
ODM_SetBBReg(pDM_Odm, ODM_REG_RX_ANT_CTRL_11N , BIT10, 0); //Reg864[10]=1'b0 //antsel2 by HW ODM_SetBBReg(pDM_Odm, ODM_REG_RX_ANT_CTRL_11N , BIT10, 0); //Reg864[10]=1'b0 //antsel2 by HW
ODM_SetBBReg(pDM_Odm, ODM_REG_LNA_SWITCH_11N , BIT22, 1); //Regb2c[22]=1'b0 //disable CS/CG switch ODM_SetBBReg(pDM_Odm, ODM_REG_LNA_SWITCH_11N , BIT22, 1); //Regb2c[22]=1'b0 //disable CS/CG switch
ODM_SetBBReg(pDM_Odm, ODM_REG_LNA_SWITCH_11N , BIT31, 1); //Regb2c[31]=1'b1 //output at CG only ODM_SetBBReg(pDM_Odm, ODM_REG_LNA_SWITCH_11N , BIT31, 1); //Regb2c[31]=1'b1 //output at CG only
//OFDM Settings //OFDM Settings
ODM_SetBBReg(pDM_Odm, ODM_REG_ANTDIV_PARA1_11N , bMaskDWord, 0x000000a0); ODM_SetBBReg(pDM_Odm, ODM_REG_ANTDIV_PARA1_11N , bMaskDWord, 0x000000a0);
@ -94,11 +94,11 @@ odm_TRX_HWAntDivInit(
#if (MP_DRIVER == 1) #if (MP_DRIVER == 1)
if (*(pDM_Odm->mp_mode) == 1) if (*(pDM_Odm->mp_mode) == 1)
{ {
pDM_Odm->AntDivType = CGCS_RX_SW_ANTDIV; pDM_Odm->AntDivType = CGCS_RX_SW_ANTDIV;
ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N , BIT7, 0); // disable HW AntDiv ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N , BIT7, 0); // disable HW AntDiv
ODM_SetBBReg(pDM_Odm, ODM_REG_RX_ANT_CTRL_11N , BIT5|BIT4|BIT3, 0); //Default RX (0/1) ODM_SetBBReg(pDM_Odm, ODM_REG_RX_ANT_CTRL_11N , BIT5|BIT4|BIT3, 0); //Default RX (0/1)
return; return;
} }
#endif #endif
@ -108,9 +108,9 @@ odm_TRX_HWAntDivInit(
value32 = ODM_GetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord); value32 = ODM_GetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
ODM_SetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord, value32|(BIT23|BIT25)); //Reg4C[25]=1, Reg4C[23]=1 for pin output ODM_SetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord, value32|(BIT23|BIT25)); //Reg4C[25]=1, Reg4C[23]=1 for pin output
//Pin Settings //Pin Settings
ODM_SetBBReg(pDM_Odm, ODM_REG_PIN_CTRL_11N , BIT9|BIT8, 0);//Reg870[8]=1'b0, Reg870[9]=1'b0 //antsel antselb by HW ODM_SetBBReg(pDM_Odm, ODM_REG_PIN_CTRL_11N , BIT9|BIT8, 0);//Reg870[8]=1'b0, Reg870[9]=1'b0 //antsel antselb by HW
ODM_SetBBReg(pDM_Odm, ODM_REG_RX_ANT_CTRL_11N , BIT10, 0); //Reg864[10]=1'b0 //antsel2 by HW ODM_SetBBReg(pDM_Odm, ODM_REG_RX_ANT_CTRL_11N , BIT10, 0); //Reg864[10]=1'b0 //antsel2 by HW
ODM_SetBBReg(pDM_Odm, ODM_REG_LNA_SWITCH_11N , BIT22, 0); //Regb2c[22]=1'b0 //disable CS/CG switch ODM_SetBBReg(pDM_Odm, ODM_REG_LNA_SWITCH_11N , BIT22, 0); //Regb2c[22]=1'b0 //disable CS/CG switch
ODM_SetBBReg(pDM_Odm, ODM_REG_LNA_SWITCH_11N , BIT31, 1); //Regb2c[31]=1'b1 //output at CG only ODM_SetBBReg(pDM_Odm, ODM_REG_LNA_SWITCH_11N , BIT31, 1); //Regb2c[31]=1'b1 //output at CG only
//OFDM Settings //OFDM Settings
ODM_SetBBReg(pDM_Odm, ODM_REG_ANTDIV_PARA1_11N , bMaskDWord, 0x000000a0); ODM_SetBBReg(pDM_Odm, ODM_REG_ANTDIV_PARA1_11N , bMaskDWord, 0x000000a0);
@ -147,9 +147,9 @@ odm_FastAntTrainingInit(
#if (MP_DRIVER == 1) #if (MP_DRIVER == 1)
if (*(pDM_Odm->mp_mode) == 1) if (*(pDM_Odm->mp_mode) == 1)
{ {
ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("pDM_Odm->AntDivType: %d\n", pDM_Odm->AntDivType)); ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("pDM_Odm->AntDivType: %d\n", pDM_Odm->AntDivType));
return; return;
} }
#endif #endif
@ -175,9 +175,9 @@ odm_FastAntTrainingInit(
ODM_SetMACReg(pDM_Odm, 0x7b4, 0xFFFF, 0); ODM_SetMACReg(pDM_Odm, 0x7b4, 0xFFFF, 0);
ODM_SetMACReg(pDM_Odm, 0x7b0, bMaskDWord, 0); ODM_SetMACReg(pDM_Odm, 0x7b0, bMaskDWord, 0);
ODM_SetBBReg(pDM_Odm, 0x870 , BIT9|BIT8, 0);//Reg870[8]=1'b0, Reg870[9]=1'b0 //antsel antselb by HW ODM_SetBBReg(pDM_Odm, 0x870 , BIT9|BIT8, 0);//Reg870[8]=1'b0, Reg870[9]=1'b0 //antsel antselb by HW
ODM_SetBBReg(pDM_Odm, 0x864 , BIT10, 0); //Reg864[10]=1'b0 //antsel2 by HW ODM_SetBBReg(pDM_Odm, 0x864 , BIT10, 0); //Reg864[10]=1'b0 //antsel2 by HW
ODM_SetBBReg(pDM_Odm, 0xb2c , BIT22, 0); //Regb2c[22]=1'b0 //disable CS/CG switch ODM_SetBBReg(pDM_Odm, 0xb2c , BIT22, 0); //Regb2c[22]=1'b0 //disable CS/CG switch
ODM_SetBBReg(pDM_Odm, 0xb2c , BIT31, 1); //Regb2c[31]=1'b1 //output at CG only ODM_SetBBReg(pDM_Odm, 0xb2c , BIT31, 1); //Regb2c[31]=1'b1 //output at CG only
ODM_SetBBReg(pDM_Odm, 0xca4 , bMaskDWord, 0x000000a0); ODM_SetBBReg(pDM_Odm, 0xca4 , bMaskDWord, 0x000000a0);
@ -233,7 +233,7 @@ odm_FastAntTrainingInit(
//ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 0); //RegC50[7]=1'b0 //disable HW AntDiv //ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 0); //RegC50[7]=1'b0 //disable HW AntDiv
//ODM_SetBBReg(pDM_Odm, 0xe08 , BIT16, 0); //RegE08[16]=1'b0 //disable fast training //ODM_SetBBReg(pDM_Odm, 0xe08 , BIT16, 0); //RegE08[16]=1'b0 //disable fast training
//ODM_SetBBReg(pDM_Odm, 0xe08 , BIT16, 1); //RegE08[16]=1'b1 //enable fast training //ODM_SetBBReg(pDM_Odm, 0xe08 , BIT16, 1); //RegE08[16]=1'b1 //enable fast training
ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 1); //RegC50[7]=1'b1 //enable HW AntDiv ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 1); //RegC50[7]=1'b1 //enable HW AntDiv
//SW Control //SW Control
@ -419,7 +419,7 @@ odm_HWAntDiv(
pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;
BOOLEAN bMatchBSSID; BOOLEAN bMatchBSSID;
BOOLEAN bPktFilterMacth = FALSE; BOOLEAN bPktFilterMacth = FALSE;
PSTA_INFO_T pEntry; PSTA_INFO_T pEntry;
for (i=0; i<ODM_ASSOCIATE_ENTRY_NUM; i++) for (i=0; i<ODM_ASSOCIATE_ENTRY_NUM; i++)
{ {
@ -482,7 +482,7 @@ odm_SetNextMACAddrTarget(
) )
{ {
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
PSTA_INFO_T pEntry; PSTA_INFO_T pEntry;
//u1Byte Bssid[6]; //u1Byte Bssid[6];
u4Byte value32, i; u4Byte value32, i;
@ -582,7 +582,7 @@ odm_FastAntTraining(
u1Byte TargetAnt=2; u1Byte TargetAnt=2;
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
BOOLEAN bPktFilterMacth = FALSE; BOOLEAN bPktFilterMacth = FALSE;
PSTA_INFO_T pEntry; PSTA_INFO_T pEntry;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("==>odm_FastAntTraining()\n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("==>odm_FastAntTraining()\n"));
@ -617,14 +617,14 @@ odm_FastAntTraining(
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("None Packet is matched\n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("None Packet is matched\n"));
ODM_SetBBReg(pDM_Odm, 0xe08 , BIT16, 0); //RegE08[16]=1'b0 //disable fast training ODM_SetBBReg(pDM_Odm, 0xe08 , BIT16, 0); //RegE08[16]=1'b0 //disable fast training
ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 0); //RegC50[7]=1'b0 //disable HW AntDiv ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 0); //RegC50[7]=1'b0 //disable HW AntDiv
} }
else else
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("TargetAnt=%d, MaxRSSI=%d\n",TargetAnt,MaxRSSI)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("TargetAnt=%d, MaxRSSI=%d\n",TargetAnt,MaxRSSI));
ODM_SetBBReg(pDM_Odm, 0xe08 , BIT16, 0); //RegE08[16]=1'b0 //disable fast training ODM_SetBBReg(pDM_Odm, 0xe08 , BIT16, 0); //RegE08[16]=1'b0 //disable fast training
//ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 0); //RegC50[7]=1'b0 //disable HW AntDiv //ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 0); //RegC50[7]=1'b0 //disable HW AntDiv
ODM_SetBBReg(pDM_Odm, 0x864 , BIT8|BIT7|BIT6, TargetAnt); //Default RX is Omni, Optional RX is the best decision by FAT ODM_SetBBReg(pDM_Odm, 0x864 , BIT8|BIT7|BIT6, TargetAnt); //Default RX is Omni, Optional RX is the best decision by FAT
//ODM_SetBBReg(pDM_Odm, 0x860 , BIT14|BIT13|BIT12, TargetAnt); //Default TX //ODM_SetBBReg(pDM_Odm, 0x860 , BIT14|BIT13|BIT12, TargetAnt); //Default TX
ODM_SetBBReg(pDM_Odm, 0x80c , BIT21, 1); //Reg80c[21]=1'b1 //from TX Info ODM_SetBBReg(pDM_Odm, 0x80c , BIT21, 1); //Reg80c[21]=1'b1 //from TX Info
@ -646,7 +646,7 @@ odm_FastAntTraining(
if(TargetAnt == 0) if(TargetAnt == 0)
ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 0); //RegC50[7]=1'b0 //disable HW AntDiv ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 0); //RegC50[7]=1'b0 //disable HW AntDiv
} }
@ -681,7 +681,7 @@ odm_FastAntTraining(
//2 Prepare Training //2 Prepare Training
pDM_FatTable->FAT_State = FAT_TRAINING_STATE; pDM_FatTable->FAT_State = FAT_TRAINING_STATE;
ODM_SetBBReg(pDM_Odm, 0xe08 , BIT16, 1); //RegE08[16]=1'b1 //enable fast training ODM_SetBBReg(pDM_Odm, 0xe08 , BIT16, 1); //RegE08[16]=1'b1 //enable fast training
ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 1); //RegC50[7]=1'b1 //enable HW AntDiv ODM_SetBBReg(pDM_Odm, 0xc50 , BIT7, 1); //RegC50[7]=1'b1 //enable HW AntDiv
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Start FAT_TRAINING_STATE\n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Start FAT_TRAINING_STATE\n"));
ODM_SetTimer(pDM_Odm,&pDM_Odm->FastAntTrainingTimer, 500 ); //ms ODM_SetTimer(pDM_Odm,&pDM_Odm->FastAntTrainingTimer, 500 ); //ms
@ -768,7 +768,7 @@ ODM_AntennaDiversity_88E(
if(pDM_FatTable->bBecomeLinked == TRUE) if(pDM_FatTable->bBecomeLinked == TRUE)
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Need to Turn off HW AntDiv\n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Need to Turn off HW AntDiv\n"));
ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N , BIT7, 0); //RegC50[7]=1'b1 //enable HW AntDiv ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N , BIT7, 0); //RegC50[7]=1'b1 //enable HW AntDiv
ODM_SetBBReg(pDM_Odm, ODM_REG_CCK_ANTDIV_PARA1_11N , BIT15, 0); //Enable CCK AntDiv ODM_SetBBReg(pDM_Odm, ODM_REG_CCK_ANTDIV_PARA1_11N , BIT15, 0); //Enable CCK AntDiv
if(pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV) if(pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)
ODM_SetBBReg(pDM_Odm, ODM_REG_TX_ANT_CTRL_11N , BIT21, 0); //Reg80c[21]=1'b0 //from TX Reg ODM_SetBBReg(pDM_Odm, ODM_REG_TX_ANT_CTRL_11N , BIT21, 0); //Reg80c[21]=1'b0 //from TX Reg
@ -782,7 +782,7 @@ ODM_AntennaDiversity_88E(
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Need to Turn on HW AntDiv\n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Need to Turn on HW AntDiv\n"));
//Because HW AntDiv is disabled before Link, we enable HW AntDiv after link //Because HW AntDiv is disabled before Link, we enable HW AntDiv after link
ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N , BIT7, 1); //RegC50[7]=1'b1 //enable HW AntDiv ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N , BIT7, 1); //RegC50[7]=1'b1 //enable HW AntDiv
ODM_SetBBReg(pDM_Odm, ODM_REG_CCK_ANTDIV_PARA1_11N , BIT15, 1); //Enable CCK AntDiv ODM_SetBBReg(pDM_Odm, ODM_REG_CCK_ANTDIV_PARA1_11N , BIT15, 1); //Enable CCK AntDiv
//ODM_SetMACReg(pDM_Odm, 0x7B4 , BIT18, 1); //Response Tx by current HW antdiv //ODM_SetMACReg(pDM_Odm, 0x7B4 , BIT18, 1); //Response Tx by current HW antdiv
if(pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV) if(pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)
@ -1079,7 +1079,7 @@ odm_DynamicPrimaryCCA(
//1 Dynamic Primary CCA Main Function //1 Dynamic Primary CCA Main Function
if(PrimaryCCA->Monitor_flag == 0) if(PrimaryCCA->Monitor_flag == 0)
{ {
if(Is40MHz) // if RFBW==40M mode which require to process primary cca if(Is40MHz) // if RFBW==40M mode which require to process primary cca
{ {
//2 STA is NOT Connected //2 STA is NOT Connected
if(!bConnected) if(!bConnected)
@ -1100,9 +1100,9 @@ odm_DynamicPrimaryCCA(
{ {
PrimaryCCA->intf_flag = 1; // secondary channel interference is detected!!! PrimaryCCA->intf_flag = 1; // secondary channel interference is detected!!!
if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1) if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1)
PrimaryCCA->intf_type = 1; // interference is shift PrimaryCCA->intf_type = 1; // interference is shift
else else
PrimaryCCA->intf_type = 2; // interference is in-band PrimaryCCA->intf_type = 2; // interference is in-band
} }
else else
{ {
@ -1116,9 +1116,9 @@ odm_DynamicPrimaryCCA(
{ {
PrimaryCCA->intf_flag = 1; // secondary channel interference is detected!!! PrimaryCCA->intf_flag = 1; // secondary channel interference is detected!!!
if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1) if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1)
PrimaryCCA->intf_type = 1; // interference is shift PrimaryCCA->intf_type = 1; // interference is shift
else else
PrimaryCCA->intf_type = 2; // interference is in-band PrimaryCCA->intf_type = 2; // interference is in-band
} }
else else
{ {
@ -1175,9 +1175,9 @@ odm_DynamicPrimaryCCA(
{ {
PrimaryCCA->intf_flag = 1; PrimaryCCA->intf_flag = 1;
if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1) if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1)
PrimaryCCA->intf_type = 1; // interference is shift PrimaryCCA->intf_type = 1; // interference is shift
else else
PrimaryCCA->intf_type = 2; // interference is in-band PrimaryCCA->intf_type = 2; // interference is in-band
} }
} }
else if(SecCHOffset == 2) else if(SecCHOffset == 2)
@ -1186,9 +1186,9 @@ odm_DynamicPrimaryCCA(
{ {
PrimaryCCA->intf_flag = 1; PrimaryCCA->intf_flag = 1;
if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1) if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1)
PrimaryCCA->intf_type = 1; // interference is shift PrimaryCCA->intf_type = 1; // interference is shift
else else
PrimaryCCA->intf_type = 2; // interference is in-band PrimaryCCA->intf_type = 2; // interference is in-band
} }
} }
@ -1203,9 +1203,9 @@ odm_DynamicPrimaryCCA(
{ {
PrimaryCCA->intf_flag = 1; PrimaryCCA->intf_flag = 1;
if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1) if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1)
PrimaryCCA->intf_type = 1; // interference is shift PrimaryCCA->intf_type = 1; // interference is shift
else else
PrimaryCCA->intf_type = 2; // interference is in-band PrimaryCCA->intf_type = 2; // interference is in-band
Delay = 1; Delay = 1;
} }
else else
@ -1220,9 +1220,9 @@ odm_DynamicPrimaryCCA(
{ {
PrimaryCCA->intf_flag = 1; PrimaryCCA->intf_flag = 1;
if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1) if(FalseAlmCnt->Cnt_Ofdm_fail > FalseAlmCnt->Cnt_OFDM_CCA>>1)
PrimaryCCA->intf_type = 1; // interference is shift PrimaryCCA->intf_type = 1; // interference is shift
else else
PrimaryCCA->intf_type = 2; // interference is in-band PrimaryCCA->intf_type = 2; // interference is in-band
Delay = 1; Delay = 1;
} }
else else
@ -1287,4 +1287,3 @@ ODM_DynamicPrimaryCCA_DupRTS(
return FALSE; return FALSE;
} }
#endif //#if (RTL8188E_SUPPORT == 1) #endif //#if (RTL8188E_SUPPORT == 1)

53
hal/odm_RegConfig8188E.c
View file

@ -24,9 +24,9 @@
void void
odm_ConfigRFReg_8188E( odm_ConfigRFReg_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte Addr, IN u4Byte Addr,
IN u4Byte Data, IN u4Byte Data,
IN ODM_RF_RADIO_PATH_E RF_PATH, IN ODM_RF_RADIO_PATH_E RF_PATH,
IN u4Byte RegAddr IN u4Byte RegAddr
) )
@ -70,9 +70,9 @@ odm_ConfigRFReg_8188E(
void void
odm_ConfigRF_RadioA_8188E( odm_ConfigRF_RadioA_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte Addr, IN u4Byte Addr,
IN u4Byte Data IN u4Byte Data
) )
{ {
u4Byte content = 0x1000; // RF_Content: radioa_txt u4Byte content = 0x1000; // RF_Content: radioa_txt
@ -85,9 +85,9 @@ odm_ConfigRF_RadioA_8188E(
void void
odm_ConfigRF_RadioB_8188E( odm_ConfigRF_RadioB_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte Addr, IN u4Byte Addr,
IN u4Byte Data IN u4Byte Data
) )
{ {
u4Byte content = 0x1001; // RF_Content: radiob_txt u4Byte content = 0x1001; // RF_Content: radiob_txt
@ -101,10 +101,10 @@ odm_ConfigRF_RadioB_8188E(
void void
odm_ConfigMAC_8188E( odm_ConfigMAC_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte Addr, IN u4Byte Addr,
IN u1Byte Data IN u1Byte Data
) )
{ {
ODM_Write1Byte(pDM_Odm, Addr, Data); ODM_Write1Byte(pDM_Odm, Addr, Data);
ODM_RT_TRACE(pDM_Odm,ODM_COMP_INIT, ODM_DBG_TRACE, ("===> ODM_ConfigMACWithHeaderFile: [MAC_REG] %08X %08X\n", Addr, Data)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_INIT, ODM_DBG_TRACE, ("===> ODM_ConfigMACWithHeaderFile: [MAC_REG] %08X %08X\n", Addr, Data));
@ -112,10 +112,10 @@ odm_ConfigMAC_8188E(
void void
odm_ConfigBB_AGC_8188E( odm_ConfigBB_AGC_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte Addr, IN u4Byte Addr,
IN u4Byte Bitmask, IN u4Byte Bitmask,
IN u4Byte Data IN u4Byte Data
) )
{ {
ODM_SetBBReg(pDM_Odm, Addr, Bitmask, Data); ODM_SetBBReg(pDM_Odm, Addr, Bitmask, Data);
@ -127,10 +127,10 @@ odm_ConfigBB_AGC_8188E(
void void
odm_ConfigBB_PHY_REG_PG_8188E( odm_ConfigBB_PHY_REG_PG_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte Addr, IN u4Byte Addr,
IN u4Byte Bitmask, IN u4Byte Bitmask,
IN u4Byte Data IN u4Byte Data
) )
{ {
if (Addr == 0xfe){ if (Addr == 0xfe){
@ -167,10 +167,10 @@ odm_ConfigBB_PHY_REG_PG_8188E(
void void
odm_ConfigBB_PHY_8188E( odm_ConfigBB_PHY_8188E(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte Addr, IN u4Byte Addr,
IN u4Byte Bitmask, IN u4Byte Bitmask,
IN u4Byte Data IN u4Byte Data
) )
{ {
if (Addr == 0xfe){ if (Addr == 0xfe){
@ -202,8 +202,7 @@ odm_ConfigBB_PHY_8188E(
// Add 1us delay between BB/RF register setting. // Add 1us delay between BB/RF register setting.
ODM_delay_us(1); ODM_delay_us(1);
ODM_RT_TRACE(pDM_Odm,ODM_COMP_INIT, ODM_DBG_TRACE, ("===> ODM_ConfigBBWithHeaderFile: [PHY_REG] %08X %08X\n", Addr, Data)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_INIT, ODM_DBG_TRACE, ("===> ODM_ConfigBBWithHeaderFile: [PHY_REG] %08X %08X\n", Addr, Data));
} }
} }
#endif #endif

267
hal/odm_debug.c
View file

@ -29,7 +29,7 @@ ODM_InitDebugSetting(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
pDM_Odm->DebugLevel = ODM_DBG_TRACE; pDM_Odm->DebugLevel = ODM_DBG_TRACE;
pDM_Odm->DebugComponents = pDM_Odm->DebugComponents =
\ \
@ -94,7 +94,7 @@ extern void ODM_DBGP_Flag_Init(void)
for (i = 0; i < ODM_DBGP_TYPE_MAX; i++) for (i = 0; i < ODM_DBGP_TYPE_MAX; i++)
{ {
ODM_DBGP_Type[i] = 0; ODM_DBGP_Type[i] = 0;
} }
#ifndef ADSL_AP_BUILD_WORKAROUND #ifndef ADSL_AP_BUILD_WORKAROUND
@ -118,7 +118,7 @@ extern void ODM_DBGP_Flag_Init(void)
// DM_BT30 | // DM_BT30 |
0; 0;
ODM_DBGP_Type[FIOCTL] = \ ODM_DBGP_Type[FIOCTL] = \
// IOCTL_IRP | // IOCTL_IRP |
// IOCTL_IRP_DETAIL | // IOCTL_IRP_DETAIL |
// IOCTL_IRP_STATISTICS | // IOCTL_IRP_STATISTICS |
@ -140,7 +140,7 @@ extern void ODM_DBGP_Flag_Init(void)
// IOCTL_PARSE_BT_PKT | // IOCTL_PARSE_BT_PKT |
0; 0;
ODM_DBGP_Type[FBT] = \ ODM_DBGP_Type[FBT] = \
// BT_TRACE | // BT_TRACE |
0; 0;
@ -152,14 +152,14 @@ extern void ODM_DBGP_Flag_Init(void)
// EFUSE_PG_DETAIL | // EFUSE_PG_DETAIL |
0; 0;
ODM_DBGP_Type[FDBG_CTRL] = \ ODM_DBGP_Type[FDBG_CTRL] = \
// DBG_CTRL_TRACE | // DBG_CTRL_TRACE |
// DBG_CTRL_INBAND_NOISE | // DBG_CTRL_INBAND_NOISE |
0; 0;
// 2011/07/20 MH Add for short cut // 2011/07/20 MH Add for short cut
ODM_DBGP_Type[FSHORT_CUT] = \ ODM_DBGP_Type[FSHORT_CUT] = \
// SHCUT_TX | // SHCUT_TX |
// SHCUT_RX | // SHCUT_RX |
0; 0;
@ -181,12 +181,12 @@ extern void ODM_DBGP_Flag_Init(void)
#if 0 #if 0
u4Byte GlobalDebugLevel = DBG_LOUD; u4Byte GlobalDebugLevel = DBG_LOUD;
// //
// 2009/06/22 MH Allow Fre build to print none debug info at init time. // 2009/06/22 MH Allow Fre build to print none debug info at init time.
// //
#if DBG #if DBG
u8Byte GlobalDebugComponents = \ u8Byte GlobalDebugComponents = \
// COMP_TRACE | // COMP_TRACE |
// COMP_DBG | // COMP_DBG |
// COMP_INIT | // COMP_INIT |
@ -229,18 +229,18 @@ u8Byte GlobalDebugComponents = \
//1!!!!!!!!!!!!!!!!!!!!!!!!!!! //1!!!!!!!!!!!!!!!!!!!!!!!!!!!
// COMP_HT | // COMP_HT |
// COMP_POWER_TRACKING | // COMP_POWER_TRACKING |
// COMP_RX_REORDER | // COMP_RX_REORDER |
// COMP_AMSDU | // COMP_AMSDU |
// COMP_WPS | // COMP_WPS |
// COMP_RATR | // COMP_RATR |
// COMP_RESET | // COMP_RESET |
// COMP_CMD | // COMP_CMD |
// COMP_EFUSE | // COMP_EFUSE |
// COMP_MESH_INTERWORKING | // COMP_MESH_INTERWORKING |
// COMP_CCX | // COMP_CCX |
// COMP_IOCTL | // COMP_IOCTL |
// COMP_GP | // COMP_GP |
// COMP_TXAGG | // COMP_TXAGG |
// COMP_BB_POWERSAVING | // COMP_BB_POWERSAVING |
// COMP_SWAS | // COMP_SWAS |
@ -296,7 +296,7 @@ extern void DBGP_Flag_Init(void)
for (i = 0; i < DBGP_TYPE_MAX; i++) for (i = 0; i < DBGP_TYPE_MAX; i++)
{ {
DBGP_Type[i] = 0; DBGP_Type[i] = 0;
} }
#if DBG #if DBG
@ -319,7 +319,7 @@ extern void DBGP_Flag_Init(void)
// DM_BT30 | // DM_BT30 |
0; 0;
DBGP_Type[FIOCTL] = \ DBGP_Type[FIOCTL] = \
// IOCTL_IRP | // IOCTL_IRP |
// IOCTL_IRP_DETAIL | // IOCTL_IRP_DETAIL |
// IOCTL_IRP_STATISTICS | // IOCTL_IRP_STATISTICS |
@ -341,7 +341,7 @@ extern void DBGP_Flag_Init(void)
// IOCTL_PARSE_BT_PKT | // IOCTL_PARSE_BT_PKT |
0; 0;
DBGP_Type[FBT] = \ DBGP_Type[FBT] = \
// BT_TRACE | // BT_TRACE |
0; 0;
@ -353,14 +353,14 @@ extern void DBGP_Flag_Init(void)
// EFUSE_PG_DETAIL | // EFUSE_PG_DETAIL |
0; 0;
DBGP_Type[FDBG_CTRL] = \ DBGP_Type[FDBG_CTRL] = \
// DBG_CTRL_TRACE | // DBG_CTRL_TRACE |
// DBG_CTRL_INBAND_NOISE | // DBG_CTRL_INBAND_NOISE |
0; 0;
// 2011/07/20 MH Add for short cut // 2011/07/20 MH Add for short cut
DBGP_Type[FSHORT_CUT] = \ DBGP_Type[FSHORT_CUT] = \
// SHCUT_TX | // SHCUT_TX |
// SHCUT_RX | // SHCUT_RX |
0; 0;
@ -396,22 +396,22 @@ extern void DBGP_Flag_Init(void)
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
extern void DBG_PrintAllFlag(void) extern void DBG_PrintAllFlag(void)
{ {
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 0 FQoS\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 0 FQoS\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 1 FTX\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 1 FTX\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 2 FRX\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 2 FRX\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 3 FSEC\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 3 FSEC\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 4 FMGNT\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 4 FMGNT\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 5 FMLME\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 5 FMLME\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 6 FRESOURCE\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 6 FRESOURCE\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 7 FBEACON\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 7 FBEACON\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 8 FISR\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 8 FISR\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 9 FPHY\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 9 FPHY\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 11 FMP\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 11 FMP\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 12 FPWR\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 12 FPWR\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 13 FDM\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 13 FDM\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 14 FDBG_CTRL\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 14 FDBG_CTRL\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 15 FC2H\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 15 FC2H\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 16 FBT\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("DBGFLAG 16 FBT\n"));
} // DBG_PrintAllFlag } // DBG_PrintAllFlag
@ -419,63 +419,63 @@ extern void DBG_PrintAllComp(void)
{ {
u1Byte i; u1Byte i;
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("GlobalDebugComponents Definition\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("GlobalDebugComponents Definition\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT0 COMP_TRACE\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT0 COMP_TRACE\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT1 COMP_DBG\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT1 COMP_DBG\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT2 COMP_INIT\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT2 COMP_INIT\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT3 COMP_OID_QUERY\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT3 COMP_OID_QUERY\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT4 COMP_OID_SET\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT4 COMP_OID_SET\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT5 COMP_RECV\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT5 COMP_RECV\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT6 COMP_SEND\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT6 COMP_SEND\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT7 COMP_IO\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT7 COMP_IO\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT8 COMP_POWER\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT8 COMP_POWER\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT9 COMP_MLME\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT9 COMP_MLME\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT10 COMP_SCAN\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT10 COMP_SCAN\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT11 COMP_SYSTEM\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT11 COMP_SYSTEM\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT12 COMP_SEC\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT12 COMP_SEC\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT13 COMP_AP\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT13 COMP_AP\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT14 COMP_TURBO\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT14 COMP_TURBO\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT15 COMP_QOS\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT15 COMP_QOS\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT16 COMP_AUTHENTICATOR\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT16 COMP_AUTHENTICATOR\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT17 COMP_BEACON\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT17 COMP_BEACON\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT18 COMP_BEACON\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT18 COMP_BEACON\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT19 COMP_RATE\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT19 COMP_RATE\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT20 COMP_EVENTS\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT20 COMP_EVENTS\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT21 COMP_FPGA\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT21 COMP_FPGA\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT22 COMP_RM\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT22 COMP_RM\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT23 COMP_MP\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT23 COMP_MP\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT24 COMP_RXDESC\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT24 COMP_RXDESC\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT25 COMP_CKIP\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT25 COMP_CKIP\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT26 COMP_DIG\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT26 COMP_DIG\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT27 COMP_TXAGC\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT27 COMP_TXAGC\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT28 COMP_HIPWR\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT28 COMP_HIPWR\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT29 COMP_HALDM\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT29 COMP_HALDM\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT30 COMP_RSNA\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT30 COMP_RSNA\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT31 COMP_INDIC\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT31 COMP_INDIC\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT32 COMP_LED\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT32 COMP_LED\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT33 COMP_RF\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT33 COMP_RF\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT34 COMP_HT\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT34 COMP_HT\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT35 COMP_POWER_TRACKING\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT35 COMP_POWER_TRACKING\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT36 COMP_POWER_TRACKING\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT36 COMP_POWER_TRACKING\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT37 COMP_AMSDU\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT37 COMP_AMSDU\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT38 COMP_WPS\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT38 COMP_WPS\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT39 COMP_RATR\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT39 COMP_RATR\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT40 COMP_RESET\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT40 COMP_RESET\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT41 COMP_CMD\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT41 COMP_CMD\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT42 COMP_EFUSE\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT42 COMP_EFUSE\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT43 COMP_MESH_INTERWORKING\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT43 COMP_MESH_INTERWORKING\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT43 COMP_CCX\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT43 COMP_CCX\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("GlobalDebugComponents = %"i64fmt"x\n", GlobalDebugComponents)); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("GlobalDebugComponents = %"i64fmt"x\n", GlobalDebugComponents));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("Enable DBG COMP =")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("Enable DBG COMP ="));
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
{ {
if (GlobalDebugComponents & ((u8Byte)0x1 << i) ) if (GlobalDebugComponents & ((u8Byte)0x1 << i) )
{ {
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT%02d |\n", i)); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT%02d |\n", i));
} }
} }
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("\n"));
} // DBG_PrintAllComp } // DBG_PrintAllComp
@ -501,102 +501,102 @@ extern void DBG_PrintFlagEvent(u1Byte DbgFlag)
switch(DbgFlag) switch(DbgFlag)
{ {
case FQoS: case FQoS:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 QoS_INIT\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 QoS_INIT\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 QoS_VISTA\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 QoS_VISTA\n"));
break; break;
case FTX: case FTX:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 TX_DESC\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 TX_DESC\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 TX_DESC_TID\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 TX_DESC_TID\n"));
break; break;
case FRX: case FRX:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 RX_DATA\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 RX_DATA\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 RX_PHY_STS\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 RX_PHY_STS\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 2 RX_PHY_SS\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 2 RX_PHY_SS\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 3 RX_PHY_SQ\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 3 RX_PHY_SQ\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 4 RX_PHY_ASTS\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 4 RX_PHY_ASTS\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 5 RX_ERR_LEN\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 5 RX_ERR_LEN\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 6 RX_DEFRAG\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 6 RX_DEFRAG\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 7 RX_ERR_RATE\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 7 RX_ERR_RATE\n"));
break; break;
case FSEC: case FSEC:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("NA\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("NA\n"));
break; break;
case FMGNT: case FMGNT:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("NA\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("NA\n"));
break; break;
case FMLME: case FMLME:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 MEDIA_STS\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 MEDIA_STS\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 LINK_STS\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 LINK_STS\n"));
break; break;
case FRESOURCE: case FRESOURCE:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 OS_CHK\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 OS_CHK\n"));
break; break;
case FBEACON: case FBEACON:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 BCN_SHOW\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 BCN_SHOW\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 BCN_PEER\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 BCN_PEER\n"));
break; break;
case FISR: case FISR:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 ISR_CHK\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 ISR_CHK\n"));
break; break;
case FPHY: case FPHY:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 PHY_BBR\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 PHY_BBR\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 PHY_BBW\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 PHY_BBW\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 2 PHY_RFR\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 2 PHY_RFR\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 3 PHY_RFW\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 3 PHY_RFW\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 4 PHY_MACR\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 4 PHY_MACR\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 5 PHY_MACW\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 5 PHY_MACW\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 6 PHY_ALLR\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 6 PHY_ALLR\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 7 PHY_ALLW\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 7 PHY_ALLW\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 8 PHY_TXPWR\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 8 PHY_TXPWR\n"));
break; break;
case FMP: case FMP:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 MP_RX\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 MP_RX\n"));
break; break;
case FEEPROM: case FEEPROM:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 EEPROM_W\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 EEPROM_W\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 EFUSE_PG\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 EFUSE_PG\n"));
break; break;
case FPWR: case FPWR:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 LPS\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 LPS\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 IPS\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 IPS\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 2 PWRSW\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 2 PWRSW\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 3 PWRHW\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 3 PWRHW\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 4 PWRHAL\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 4 PWRHAL\n"));
break; break;
case FDM: case FDM:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 WA_IOT\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 WA_IOT\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 DM_PWDB\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 DM_PWDB\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 2 DM_Monitor\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 2 DM_Monitor\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 3 DM_DIG\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 3 DM_DIG\n"));
break; break;
case FDBG_CTRL: case FDBG_CTRL:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 DBG_CTRL_TRACE\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 DBG_CTRL_TRACE\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 DBG_CTRL_INBAND_NOISE\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 DBG_CTRL_INBAND_NOISE\n"));
break; break;
case FC2H: case FC2H:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 C2H_Summary\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 C2H_Summary\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 C2H_PacketData\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 C2H_PacketData\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 2 C2H_ContentData\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 2 C2H_ContentData\n"));
break; break;
case FBT: case FBT:
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 BT_TRACE\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 0 BT_TRACE\n"));
ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 BT_RFPoll\n")); ODM_RT_TRACE(pDM_Odm,COMP_CMD, DBG_LOUD, ("BIT 1 BT_RFPoll\n"));
break; break;
default: default:
@ -624,4 +624,3 @@ extern void DBG_DumpMem(const u1Byte DbgComp,
#endif #endif

59
hal/odm_interface.c
View file

@ -29,7 +29,7 @@
u1Byte u1Byte
ODM_Read1Byte( ODM_Read1Byte(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr IN u4Byte RegAddr
) )
{ {
@ -49,7 +49,7 @@ ODM_Read1Byte(
u2Byte u2Byte
ODM_Read2Byte( ODM_Read2Byte(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr IN u4Byte RegAddr
) )
{ {
@ -69,7 +69,7 @@ ODM_Read2Byte(
u4Byte u4Byte
ODM_Read4Byte( ODM_Read4Byte(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr IN u4Byte RegAddr
) )
{ {
@ -89,7 +89,7 @@ ODM_Read4Byte(
VOID VOID
ODM_Write1Byte( ODM_Write1Byte(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr, IN u4Byte RegAddr,
IN u1Byte Data IN u1Byte Data
) )
@ -110,7 +110,7 @@ ODM_Write1Byte(
VOID VOID
ODM_Write2Byte( ODM_Write2Byte(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr, IN u4Byte RegAddr,
IN u2Byte Data IN u2Byte Data
) )
@ -131,7 +131,7 @@ ODM_Write2Byte(
VOID VOID
ODM_Write4Byte( ODM_Write4Byte(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr, IN u4Byte RegAddr,
IN u4Byte Data IN u4Byte Data
) )
@ -152,7 +152,7 @@ ODM_Write4Byte(
VOID VOID
ODM_SetMACReg( ODM_SetMACReg(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr, IN u4Byte RegAddr,
IN u4Byte BitMask, IN u4Byte BitMask,
IN u4Byte Data IN u4Byte Data
@ -169,7 +169,7 @@ ODM_SetMACReg(
u4Byte u4Byte
ODM_GetMACReg( ODM_GetMACReg(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr, IN u4Byte RegAddr,
IN u4Byte BitMask IN u4Byte BitMask
) )
@ -185,7 +185,7 @@ ODM_GetMACReg(
VOID VOID
ODM_SetBBReg( ODM_SetBBReg(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr, IN u4Byte RegAddr,
IN u4Byte BitMask, IN u4Byte BitMask,
IN u4Byte Data IN u4Byte Data
@ -202,7 +202,7 @@ ODM_SetBBReg(
u4Byte u4Byte
ODM_GetBBReg( ODM_GetBBReg(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr, IN u4Byte RegAddr,
IN u4Byte BitMask IN u4Byte BitMask
) )
@ -218,7 +218,7 @@ ODM_GetBBReg(
VOID VOID
ODM_SetRFReg( ODM_SetRFReg(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN ODM_RF_RADIO_PATH_E eRFPath, IN ODM_RF_RADIO_PATH_E eRFPath,
IN u4Byte RegAddr, IN u4Byte RegAddr,
IN u4Byte BitMask, IN u4Byte BitMask,
@ -236,7 +236,7 @@ ODM_SetRFReg(
u4Byte u4Byte
ODM_GetRFReg( ODM_GetRFReg(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN ODM_RF_RADIO_PATH_E eRFPath, IN ODM_RF_RADIO_PATH_E eRFPath,
IN u4Byte RegAddr, IN u4Byte RegAddr,
IN u4Byte BitMask IN u4Byte BitMask
@ -258,7 +258,7 @@ ODM_GetRFReg(
// //
VOID VOID
ODM_AllocateMemory( ODM_AllocateMemory(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
OUT PVOID *pPtr, OUT PVOID *pPtr,
IN u4Byte length IN u4Byte length
) )
@ -276,7 +276,7 @@ ODM_AllocateMemory(
// length could be ignored, used to detect memory leakage. // length could be ignored, used to detect memory leakage.
VOID VOID
ODM_FreeMemory( ODM_FreeMemory(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
OUT PVOID pPtr, OUT PVOID pPtr,
IN u4Byte length IN u4Byte length
) )
@ -291,7 +291,7 @@ ODM_FreeMemory(
#endif #endif
} }
s4Byte ODM_CompareMemory( s4Byte ODM_CompareMemory(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN PVOID pBuf1, IN PVOID pBuf1,
IN PVOID pBuf2, IN PVOID pBuf2,
IN u4Byte length IN u4Byte length
@ -313,7 +313,7 @@ s4Byte ODM_CompareMemory(
// //
VOID VOID
ODM_AcquireSpinLock( ODM_AcquireSpinLock(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN RT_SPINLOCK_TYPE type IN RT_SPINLOCK_TYPE type
) )
{ {
@ -328,7 +328,7 @@ ODM_AcquireSpinLock(
} }
VOID VOID
ODM_ReleaseSpinLock( ODM_ReleaseSpinLock(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN RT_SPINLOCK_TYPE type IN RT_SPINLOCK_TYPE type
) )
{ {
@ -347,7 +347,7 @@ ODM_ReleaseSpinLock(
// //
VOID VOID
ODM_InitializeWorkItem( ODM_InitializeWorkItem(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN PRT_WORK_ITEM pRtWorkItem, IN PRT_WORK_ITEM pRtWorkItem,
IN RT_WORKITEM_CALL_BACK RtWorkItemCallback, IN RT_WORKITEM_CALL_BACK RtWorkItemCallback,
IN PVOID pContext, IN PVOID pContext,
@ -506,9 +506,9 @@ ODM_sleep_us(IN u4Byte us)
VOID VOID
ODM_SetTimer( ODM_SetTimer(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN PRT_TIMER pTimer, IN PRT_TIMER pTimer,
IN u4Byte msDelay IN u4Byte msDelay
) )
{ {
#if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
@ -524,8 +524,8 @@ ODM_SetTimer(
VOID VOID
ODM_InitializeTimer( ODM_InitializeTimer(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN PRT_TIMER pTimer, IN PRT_TIMER pTimer,
IN RT_TIMER_CALL_BACK CallBackFunc, IN RT_TIMER_CALL_BACK CallBackFunc,
IN PVOID pContext, IN PVOID pContext,
IN const char* szID IN const char* szID
@ -547,7 +547,7 @@ ODM_InitializeTimer(
VOID VOID
ODM_CancelTimer( ODM_CancelTimer(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN PRT_TIMER pTimer IN PRT_TIMER pTimer
) )
{ {
@ -564,7 +564,7 @@ ODM_CancelTimer(
VOID VOID
ODM_ReleaseTimer( ODM_ReleaseTimer(
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
IN PRT_TIMER pTimer IN PRT_TIMER pTimer
) )
{ {
@ -596,8 +596,8 @@ ODM_ReleaseTimer(
VOID VOID
ODM_FillH2CCmd( ODM_FillH2CCmd(
IN struct adapter * Adapter, IN struct adapter * Adapter,
IN u1Byte ElementID, IN u1Byte ElementID,
IN u4Byte CmdLen, IN u4Byte CmdLen,
IN pu1Byte pCmdBuffer IN pu1Byte pCmdBuffer
) )
{ {
@ -659,8 +659,3 @@ ODM_FillH2CCmd(
return TRUE; return TRUE;
} }
#endif #endif

28
hal/rtl8188e_cmd.c
View file

@ -42,7 +42,7 @@
static u8 _is_fw_read_cmd_down(struct adapter* padapter, u8 msgbox_num) static u8 _is_fw_read_cmd_down(struct adapter* padapter, u8 msgbox_num)
{ {
u8 read_down = _FALSE; u8 read_down = _FALSE;
int retry_cnts = 100; int retry_cnts = 100;
u8 valid; u8 valid;
@ -66,8 +66,8 @@ static u8 _is_fw_read_cmd_down(struct adapter* padapter, u8 msgbox_num)
/***************************************** /*****************************************
* H2C Msg format : * H2C Msg format :
* 0x1DF - 0x1D0 * 0x1DF - 0x1D0
*| 31 - 8 | 7-5 4 - 0 | *| 31 - 8 | 7-5 4 - 0 |
*| h2c_msg |Class_ID CMD_ID | *| h2c_msg |Class_ID CMD_ID |
* *
* Extend 0x1FF - 0x1F0 * Extend 0x1FF - 0x1F0
*|31 - 0 | *|31 - 0 |
@ -153,7 +153,7 @@ _func_enter_;
bcmd_down = _TRUE; bcmd_down = _TRUE;
// DBG_8192C("MSG_BOX:%d,CmdLen(%d), reg:0x%x =>h2c_cmd:0x%x, reg:0x%x =>h2c_cmd_ex:0x%x ..\n" // DBG_8192C("MSG_BOX:%d,CmdLen(%d), reg:0x%x =>h2c_cmd:0x%x, reg:0x%x =>h2c_cmd_ex:0x%x ..\n"
// ,pHalData->LastHMEBoxNum ,CmdLen,msgbox_addr,h2c_cmd,msgbox_ex_addr,h2c_cmd_ex); // ,pHalData->LastHMEBoxNum ,CmdLen,msgbox_addr,h2c_cmd,msgbox_ex_addr,h2c_cmd_ex);
pHalData->LastHMEBoxNum = (h2c_box_num+1) % RTL88E_MAX_H2C_BOX_NUMS; pHalData->LastHMEBoxNum = (h2c_box_num+1) % RTL88E_MAX_H2C_BOX_NUMS;
@ -395,7 +395,7 @@ void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)
u32 rate_len, pktlen; u32 rate_len, pktlen;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@ -601,7 +601,7 @@ void ConstructProbeRsp(struct adapter *padapter, u8 *pframe, u32 *pLength, u8 *S
u32 pktlen; u32 pktlen;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
//DBG_871X("%s\n", __FUNCTION__); //DBG_871X("%s\n", __FUNCTION__);
@ -650,7 +650,7 @@ static void ConstructARPResponse(
struct wlan_network *cur_network = &pmlmepriv->cur_network; struct wlan_network *cur_network = &pmlmepriv->cur_network;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
static u8 ARPLLCHeader[8] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00, 0x08, 0x06}; static u8 ARPLLCHeader[8] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00, 0x08, 0x06};
u16 *fctrl; u16 *fctrl;
@ -728,7 +728,7 @@ static void ConstructARPResponse(
if(EncryptionHeadOverhead > 0) if(EncryptionHeadOverhead > 0)
{ {
_rtw_memset(&(pframe[*pLength]), 0,EncryptionHeadOverhead); _rtw_memset(&(pframe[*pLength]), 0,EncryptionHeadOverhead);
*pLength += EncryptionHeadOverhead; *pLength += EncryptionHeadOverhead;
//SET_80211_HDR_WEP(pARPRspPkt, 1); //Suggested by CCW. //SET_80211_HDR_WEP(pARPRspPkt, 1); //Suggested by CCW.
SetPrivacy(fctrl); SetPrivacy(fctrl);
} }
@ -835,14 +835,14 @@ CheckFwRsvdPageContent(
HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter);
u32 MaxBcnPageNum; u32 MaxBcnPageNum;
if(pHalData->FwRsvdPageStartOffset != 0) if(pHalData->FwRsvdPageStartOffset != 0)
{ {
/*MaxBcnPageNum = PageNum_128(pMgntInfo->MaxBeaconSize); /*MaxBcnPageNum = PageNum_128(pMgntInfo->MaxBeaconSize);
RT_ASSERT((MaxBcnPageNum <= pHalData->FwRsvdPageStartOffset), RT_ASSERT((MaxBcnPageNum <= pHalData->FwRsvdPageStartOffset),
("CheckFwRsvdPageContent(): The reserved page content has been"\ ("CheckFwRsvdPageContent(): The reserved page content has been"\
"destroyed by beacon!!! MaxBcnPageNum(%d) FwRsvdPageStartOffset(%d)\n!", "destroyed by beacon!!! MaxBcnPageNum(%d) FwRsvdPageStartOffset(%d)\n!",
MaxBcnPageNum, pHalData->FwRsvdPageStartOffset));*/ MaxBcnPageNum, pHalData->FwRsvdPageStartOffset));*/
} }
} }
// //
@ -851,7 +851,7 @@ CheckFwRsvdPageContent(
// (1)Beacon, (2)Ps-poll, (3)Null data, (4)ProbeRsp. // (1)Beacon, (2)Ps-poll, (3)Null data, (4)ProbeRsp.
// Input: // Input:
// bDLFinished - FALSE: At the first time we will send all the packets as a large packet to Hw, // bDLFinished - FALSE: At the first time we will send all the packets as a large packet to Hw,
// so we need to set the packet length to total lengh. // so we need to set the packet length to total lengh.
// TRUE: At the second time, we should send the first packet (default:beacon) // TRUE: At the second time, we should send the first packet (default:beacon)
// to Hw again and set the lengh in descriptor to the real beacon lengh. // to Hw again and set the lengh in descriptor to the real beacon lengh.
// 2009.10.15 by tynli. // 2009.10.15 by tynli.
@ -960,7 +960,7 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished)
); );
rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], ARPLegnth, _FALSE, _FALSE); rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], ARPLegnth, _FALSE, _FALSE);
switch (psecuritypriv->dot11PrivacyAlgrthm) switch (psecuritypriv->dot11PrivacyAlgrthm)
{ {
case _WEP40_: case _WEP40_:
case _WEP104_: case _WEP104_:

9
hal/rtl8188e_dm.c
View file

@ -325,7 +325,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_RF_TYPE,ODM_1T2R); ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_RF_TYPE,ODM_1T2R);
} }
ODM_CmnInfoInit(pDM_Odm, ODM_CMNINFO_RF_ANTENNA_TYPE, pHalData->TRxAntDivType); ODM_CmnInfoInit(pDM_Odm, ODM_CMNINFO_RF_ANTENNA_TYPE, pHalData->TRxAntDivType);
#ifdef CONFIG_DISABLE_ODM #ifdef CONFIG_DISABLE_ODM
pdmpriv->InitODMFlag = 0; pdmpriv->InitODMFlag = 0;
@ -558,7 +558,7 @@ void rtl8188e_init_dm_priv(IN struct adapter *Adapter)
{ {
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T podmpriv = &pHalData->odmpriv; PDM_ODM_T podmpriv = &pHalData->odmpriv;
_rtw_memset(pdmpriv, 0, sizeof(struct dm_priv)); _rtw_memset(pdmpriv, 0, sizeof(struct dm_priv));
//_rtw_spinlock_init(&(pHalData->odm_stainfo_lock)); //_rtw_spinlock_init(&(pHalData->odm_stainfo_lock));
Init_ODM_ComInfo_88E(Adapter); Init_ODM_ComInfo_88E(Adapter);
@ -573,7 +573,7 @@ void rtl8188e_deinit_dm_priv(IN struct adapter *Adapter)
{ {
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T podmpriv = &pHalData->odmpriv; PDM_ODM_T podmpriv = &pHalData->odmpriv;
//_rtw_spinlock_free(&pHalData->odm_stainfo_lock); //_rtw_spinlock_free(&pHalData->odm_stainfo_lock);
#ifdef CONFIG_SW_ANTENNA_DIVERSITY #ifdef CONFIG_SW_ANTENNA_DIVERSITY
//_cancel_timer_ex(&pdmpriv->SwAntennaSwitchTimer); //_cancel_timer_ex(&pdmpriv->SwAntennaSwitchTimer);
@ -609,7 +609,7 @@ u8 AntDivBeforeLink8188E(struct adapter *Adapter )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
PDM_ODM_T pDM_Odm =&pHalData->odmpriv; PDM_ODM_T pDM_Odm =&pHalData->odmpriv;
SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
@ -644,4 +644,3 @@ u8 AntDivBeforeLink8188E(struct adapter *Adapter )
} }
#endif #endif

59
hal/rtl8188e_hal_init.c
View file

@ -756,8 +756,8 @@ _WriteFW(
// Since we need dynamic decide method of dwonload fw, so we call this function to get chip version. // Since we need dynamic decide method of dwonload fw, so we call this function to get chip version.
// We can remove _ReadChipVersion from ReadpadapterInfo8192C later. // We can remove _ReadChipVersion from ReadpadapterInfo8192C later.
int ret = _SUCCESS; int ret = _SUCCESS;
u32 pageNums,remainSize ; u32 pageNums,remainSize ;
u32 page, offset; u32 page, offset;
u8 *bufferPtr = (u8*)buffer; u8 *bufferPtr = (u8*)buffer;
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
@ -824,7 +824,7 @@ static s32 _FWFreeToGo(struct adapter *padapter)
{ {
u32 counter = 0; u32 counter = 0;
u32 value32; u32 value32;
u8 value8; u8 value8;
// polling CheckSum report // polling CheckSum report
do { do {
@ -1258,8 +1258,8 @@ static VOID
Hal_EfuseReadEFuse88E( Hal_EfuseReadEFuse88E(
struct adapter * Adapter, struct adapter * Adapter,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
u8 *pbuf, u8 *pbuf,
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
{ {
@ -1506,8 +1506,8 @@ ReadEFuseByIC(
struct adapter *Adapter, struct adapter *Adapter,
u8 efuseType, u8 efuseType,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
u8 *pbuf, u8 *pbuf,
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
{ {
@ -1565,8 +1565,8 @@ ReadEFuse_Pseudo(
struct adapter *Adapter, struct adapter *Adapter,
u8 efuseType, u8 efuseType,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
u8 *pbuf, u8 *pbuf,
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
{ {
@ -1578,8 +1578,8 @@ rtl8188e_ReadEFuse(
struct adapter *Adapter, struct adapter *Adapter,
u8 efuseType, u8 efuseType,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
u8 *pbuf, u8 *pbuf,
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
{ {
@ -2576,7 +2576,7 @@ hal_EfusePgCheckAvailableAddr(
static VOID static VOID
hal_EfuseConstructPGPkt( hal_EfuseConstructPGPkt(
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *pData, IN u8 *pData,
IN PPGPKT_STRUCT pTargetPkt IN PPGPKT_STRUCT pTargetPkt
@ -2595,13 +2595,13 @@ hal_EfuseConstructPGPkt(
static BOOLEAN static BOOLEAN
hal_EfusePgPacketWrite_BT( hal_EfusePgPacketWrite_BT(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *pData, IN u8 *pData,
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
{ {
PGPKT_STRUCT targetPkt; PGPKT_STRUCT targetPkt;
u16 startAddr=0; u16 startAddr=0;
u8 efuseType=EFUSE_BT; u8 efuseType=EFUSE_BT;
@ -2625,13 +2625,13 @@ hal_EfusePgPacketWrite_BT(
static BOOLEAN static BOOLEAN
hal_EfusePgPacketWrite_8188e( hal_EfusePgPacketWrite_8188e(
IN struct adapter * pAdapter, IN struct adapter * pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *pData, IN u8 *pData,
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
{ {
PGPKT_STRUCT targetPkt; PGPKT_STRUCT targetPkt;
u16 startAddr=0; u16 startAddr=0;
u8 efuseType=EFUSE_WIFI; u8 efuseType=EFUSE_WIFI;
@ -2655,7 +2655,7 @@ hal_EfusePgPacketWrite_8188e(
static int static int
Hal_EfusePgPacketWrite_Pseudo(IN struct adapter *pAdapter, Hal_EfusePgPacketWrite_Pseudo(IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -2669,7 +2669,7 @@ Hal_EfusePgPacketWrite_Pseudo(IN struct adapter *pAdapter,
static int static int
Hal_EfusePgPacketWrite(IN struct adapter *pAdapter, Hal_EfusePgPacketWrite(IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -2683,7 +2683,7 @@ Hal_EfusePgPacketWrite(IN struct adapter *pAdapter,
static int static int
rtl8188e_Efuse_PgPacketWrite(IN struct adapter *pAdapter, rtl8188e_Efuse_PgPacketWrite(IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -2993,10 +2993,10 @@ void Read_LLT_Tab(struct adapter *padapter)
printk("############### %s ###################\n",__FUNCTION__); printk("############### %s ###################\n",__FUNCTION__);
for(addr=0;addr<176;addr++) for(addr=0;addr<176;addr++)
{ {
next_addr = _LLTRead(padapter,addr); next_addr = _LLTRead(padapter,addr);
printk("%d->",next_addr); printk("%d->",next_addr);
if(((addr+1) %8) ==0) if(((addr+1) %8) ==0)
printk("\n"); printk("\n");
} }
printk("\n##################################\n"); printk("\n##################################\n");
@ -3222,7 +3222,7 @@ Hal_ReadPowerValueFromPROM_8188E(
else else
{ {
pwrInfo24G->BW20_Diff[rfPath][TxCount] = (PROMContent[eeAddr]&0xf0)>>4; pwrInfo24G->BW20_Diff[rfPath][TxCount] = (PROMContent[eeAddr]&0xf0)>>4;
if(pwrInfo24G->BW20_Diff[rfPath][TxCount] & BIT3) //4bit sign number to 8 bit sign number if(pwrInfo24G->BW20_Diff[rfPath][TxCount] & BIT3) //4bit sign number to 8 bit sign number
pwrInfo24G->BW20_Diff[rfPath][TxCount] |= 0xF0; pwrInfo24G->BW20_Diff[rfPath][TxCount] |= 0xF0;
} }
@ -3302,7 +3302,7 @@ Hal_GetChnlGroup(
} }
static u8 static u8
Hal_GetChnlGroup88E( Hal_GetChnlGroup88E(
IN u8 chnl, IN u8 chnl,
OUT u8* pGroup OUT u8* pGroup
) )
{ {
@ -3620,9 +3620,9 @@ Hal_ReadAntennaDiversity88E(
if(registry_par->antdiv_type == 0)// If TRxAntDivType is AUTO in advanced setting, use EFUSE value instead. if(registry_par->antdiv_type == 0)// If TRxAntDivType is AUTO in advanced setting, use EFUSE value instead.
{ {
pHalData->TRxAntDivType = PROMContent[EEPROM_RF_ANTENNA_OPT_88E]; pHalData->TRxAntDivType = PROMContent[EEPROM_RF_ANTENNA_OPT_88E];
if (pHalData->TRxAntDivType == 0xFF) if (pHalData->TRxAntDivType == 0xFF)
pHalData->TRxAntDivType = CG_TRX_HW_ANTDIV; // For 88EE, 1Tx and 1RxCG are fixed.(1Ant, Tx and RxCG are both on aux port) pHalData->TRxAntDivType = CG_TRX_HW_ANTDIV; // For 88EE, 1Tx and 1RxCG are fixed.(1Ant, Tx and RxCG are both on aux port)
} }
else{ else{
pHalData->TRxAntDivType = registry_par->antdiv_type ; pHalData->TRxAntDivType = registry_par->antdiv_type ;
@ -3634,7 +3634,7 @@ Hal_ReadAntennaDiversity88E(
else else
{ {
pHalData->AntDivCfg = 0; pHalData->AntDivCfg = 0;
pHalData->TRxAntDivType = pHalData->TRxAntDivType; // The value in the driver setting of device manager. pHalData->TRxAntDivType = pHalData->TRxAntDivType; // The value in the driver setting of device manager.
} }
DBG_871X("EEPROM : AntDivCfg = %x, TRxAntDivType = %x\n",pHalData->AntDivCfg, pHalData->TRxAntDivType); DBG_871X("EEPROM : AntDivCfg = %x, TRxAntDivType = %x\n",pHalData->AntDivCfg, pHalData->TRxAntDivType);
@ -3645,8 +3645,8 @@ Hal_ReadAntennaDiversity88E(
void void
Hal_ReadThermalMeter_88E( Hal_ReadThermalMeter_88E(
IN struct adapter *Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -3797,4 +3797,3 @@ void SetBcnCtrlReg(
rtw_write8(padapter, REG_BCN_CTRL, (u8)pHalData->RegBcnCtrlVal); rtw_write8(padapter, REG_BCN_CTRL, (u8)pHalData->RegBcnCtrlVal);
} }

67
hal/rtl8188e_phycfg.c
View file

@ -380,7 +380,7 @@ rtl8188e_PHY_QueryBBReg(
IN u32 BitMask IN u32 BitMask
) )
{ {
u32 ReturnValue = 0, OriginalValue, BitShift; u32 ReturnValue = 0, OriginalValue, BitShift;
u16 BBWaitCounter = 0; u16 BBWaitCounter = 0;
#if (DISABLE_BB_RF == 1) #if (DISABLE_BB_RF == 1)
@ -493,7 +493,7 @@ phy_RFSerialRead(
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
BB_REGISTER_DEFINITION_T *pPhyReg = &pHalData->PHYRegDef[eRFPath]; BB_REGISTER_DEFINITION_T *pPhyReg = &pHalData->PHYRegDef[eRFPath];
u32 NewOffset; u32 NewOffset;
u32 tmplong,tmplong2; u32 tmplong,tmplong2;
u8 RfPiEnable=0; u8 RfPiEnable=0;
#if 0 #if 0
if(pHalData->RFChipID == RF_8225 && Offset > 0x24) //36 valid regs if(pHalData->RFChipID == RF_8225 && Offset > 0x24) //36 valid regs
@ -582,7 +582,7 @@ phy_RFSerialRead(
* serial write. Driver need to implement (1) and (2). * serial write. Driver need to implement (1) and (2).
* This function is equal to the combination of RF_ReadReg() and RFLSSIRead() * This function is equal to the combination of RF_ReadReg() and RFLSSIRead()
* *
* Note: For RF8256 only * Note: For RF8256 only
* The total count of RTL8256(Zebra4) register is around 36 bit it only employs * The total count of RTL8256(Zebra4) register is around 36 bit it only employs
* 4-bit RF address. RTL8256 uses "register mode control bit" (Reg00[12], Reg00[10]) * 4-bit RF address. RTL8256 uses "register mode control bit" (Reg00[12], Reg00[10])
* to access register address bigger than 0xf. See "Appendix-4 in PHY Configuration * to access register address bigger than 0xf. See "Appendix-4 in PHY Configuration
@ -804,20 +804,20 @@ rtl8188e_PHY_SetRFReg(
* Overview: This function read BB parameters from general file format, and do register * Overview: This function read BB parameters from general file format, and do register
* Read/Write * Read/Write
* *
* Input: struct adapter * Adapter * Input: struct adapter * Adapter
* ps1Byte pFileName * ps1Byte pFileName
* *
* Output: NONE * Output: NONE
* *
* Return: RT_STATUS_SUCCESS: configuration file exist * Return: RT_STATUS_SUCCESS: configuration file exist
* *
* Note: The format of MACPHY_REG.txt is different from PHY and RF. * Note: The format of MACPHY_REG.txt is different from PHY and RF.
* [Register][Mask][Value] * [Register][Mask][Value]
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static int static int
phy_ConfigMACWithParaFile( phy_ConfigMACWithParaFile(
IN struct adapter * Adapter, IN struct adapter * Adapter,
IN u8* pFileName IN u8* pFileName
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -833,14 +833,14 @@ phy_ConfigMACWithParaFile(
* Overview: This function read BB parameters from Header file we gen, and do register * Overview: This function read BB parameters from Header file we gen, and do register
* Read/Write * Read/Write
* *
* Input: struct adapter * Adapter * Input: struct adapter * Adapter
* ps1Byte pFileName * ps1Byte pFileName
* *
* Output: NONE * Output: NONE
* *
* Return: RT_STATUS_SUCCESS: configuration file exist * Return: RT_STATUS_SUCCESS: configuration file exist
* *
* Note: The format of MACPHY_REG.txt is different from PHY and RF. * Note: The format of MACPHY_REG.txt is different from PHY and RF.
* [Register][Mask][Value] * [Register][Mask][Value]
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#ifndef CONFIG_PHY_SETTING_WITH_ODM #ifndef CONFIG_PHY_SETTING_WITH_ODM
@ -1060,8 +1060,8 @@ phy_InitBBRFRegisterDefinition(
* Overview: This function read BB parameters from general file format, and do register * Overview: This function read BB parameters from general file format, and do register
* Read/Write * Read/Write
* *
* Input: struct adapter * Adapter * Input: struct adapter * Adapter
* ps1Byte pFileName * ps1Byte pFileName
* *
* Output: NONE * Output: NONE
* *
@ -1073,7 +1073,7 @@ phy_InitBBRFRegisterDefinition(
static int static int
phy_ConfigBBWithParaFile( phy_ConfigBBWithParaFile(
IN struct adapter * Adapter, IN struct adapter * Adapter,
IN u8* pFileName IN u8* pFileName
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -1124,8 +1124,8 @@ phy_ConfigBBExternalPA(
* Overview: This function read BB parameters from general file format, and do register * Overview: This function read BB parameters from general file format, and do register
* Read/Write * Read/Write
* *
* Input: struct adapter * Adapter * Input: struct adapter * Adapter
* u1Byte ConfigType 0 => PHY_CONFIG * u1Byte ConfigType 0 => PHY_CONFIG
* 1 =>AGC_TAB * 1 =>AGC_TAB
* *
* Output: NONE * Output: NONE
@ -1137,7 +1137,7 @@ phy_ConfigBBExternalPA(
static int static int
phy_ConfigBBWithHeaderFile( phy_ConfigBBWithHeaderFile(
IN struct adapter * Adapter, IN struct adapter * Adapter,
IN u8 ConfigType IN u8 ConfigType
) )
{ {
int i; int i;
@ -1145,7 +1145,7 @@ phy_ConfigBBWithHeaderFile(
u32* Rtl819XAGCTAB_Array_Table; u32* Rtl819XAGCTAB_Array_Table;
u16 PHY_REGArrayLen, AGCTAB_ArrayLen; u16 PHY_REGArrayLen, AGCTAB_ArrayLen;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
DM_ODM_T *podmpriv = &pHalData->odmpriv; DM_ODM_T *podmpriv = &pHalData->odmpriv;
int ret = _SUCCESS; int ret = _SUCCESS;
@ -1394,13 +1394,13 @@ storePwrIndexDiffRateOffset(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/06/2008 MHC Create Version 0. * 11/06/2008 MHC Create Version 0.
* 2009/07/29 tynli (porting from 92SE branch)2009/03/11 Add copy parameter file to buffer for silent reset * 2009/07/29 tynli (porting from 92SE branch)2009/03/11 Add copy parameter file to buffer for silent reset
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static int static int
phy_ConfigBBWithPgParaFile( phy_ConfigBBWithPgParaFile(
IN struct adapter * Adapter, IN struct adapter * Adapter,
IN u8* pFileName) IN u8* pFileName)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -1425,13 +1425,13 @@ phy_ConfigBBWithPgParaFile(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/06/2008 MHC Add later!!!!!!.. Please modify for new files!!!! * 11/06/2008 MHC Add later!!!!!!.. Please modify for new files!!!!
* 11/10/2008 tynli Modify to mew files. * 11/10/2008 tynli Modify to mew files.
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static int static int
phy_ConfigBBWithPgHeaderFile( phy_ConfigBBWithPgHeaderFile(
IN struct adapter * Adapter, IN struct adapter * Adapter,
IN u8 ConfigType) IN u8 ConfigType)
{ {
int i; int i;
u32* Rtl819XPHY_REGArray_Table_PG; u32* Rtl819XPHY_REGArray_Table_PG;
@ -1749,8 +1749,8 @@ PHY_RFConfig8188E(
* *
* Overview: This function read RF parameters from general file format, and do RF 3-wire * Overview: This function read RF parameters from general file format, and do RF 3-wire
* *
* Input: struct adapter * Adapter * Input: struct adapter * Adapter
* ps1Byte pFileName * ps1Byte pFileName
* RF_RADIO_PATH_E eRFPath * RF_RADIO_PATH_E eRFPath
* *
* Output: NONE * Output: NONE
@ -1762,7 +1762,7 @@ PHY_RFConfig8188E(
int int
rtl8188e_PHY_ConfigRFWithParaFile( rtl8188e_PHY_ConfigRFWithParaFile(
IN struct adapter * Adapter, IN struct adapter * Adapter,
IN u8* pFileName, IN u8* pFileName,
RF_RADIO_PATH_E eRFPath RF_RADIO_PATH_E eRFPath
) )
{ {
@ -1830,8 +1830,8 @@ PHY_ConfigRFExternalPA(
* *
* Overview: This function read RF parameters from general file format, and do RF 3-wire * Overview: This function read RF parameters from general file format, and do RF 3-wire
* *
* Input: struct adapter * Adapter * Input: struct adapter * Adapter
* ps1Byte pFileName * ps1Byte pFileName
* RF_RADIO_PATH_E eRFPath * RF_RADIO_PATH_E eRFPath
* *
* Output: NONE * Output: NONE
@ -2024,7 +2024,7 @@ exit:
* Overview: This function is write register and then readback to make sure whether * Overview: This function is write register and then readback to make sure whether
* BB[PHY0, PHY1], RF[Patha, path b, path c, path d] is Ok * BB[PHY0, PHY1], RF[Patha, path b, path c, path d] is Ok
* *
* Input: struct adapter * Adapter * Input: struct adapter * Adapter
* HW90_BLOCK_E CheckBlock * HW90_BLOCK_E CheckBlock
* RF_RADIO_PATH_E eRFPath // it is used only when CheckBlock is HW90_BLOCK_RF * RF_RADIO_PATH_E eRFPath // it is used only when CheckBlock is HW90_BLOCK_RF
* *
@ -2249,7 +2249,7 @@ phy_TxPwrIdxToDbm(
VOID VOID
PHY_GetTxPowerLevel8188E( PHY_GetTxPowerLevel8188E(
IN struct adapter * Adapter, IN struct adapter * Adapter,
OUT u32* powerlevel OUT u32* powerlevel
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -2697,7 +2697,7 @@ PHY_ScanOperationBackup8188E(
* *
* Overview: Timer callback function for SetSetBWMode * Overview: Timer callback function for SetSetBWMode
* *
* Input: PRT_TIMER pTimer * Input: PRT_TIMER pTimer
* *
* Output: NONE * Output: NONE
* *
@ -2861,7 +2861,7 @@ _PHY_SetBWMode92C(
* *
* Overview: This function is export to "HalCommon" moudule * Overview: This function is export to "HalCommon" moudule
* *
* Input: struct adapter * Adapter * Input: struct adapter * Adapter
* HT_CHANNEL_WIDTH Bandwidth //20M or 40M * HT_CHANNEL_WIDTH Bandwidth //20M or 40M
* *
* Output: NONE * Output: NONE
@ -2878,7 +2878,7 @@ PHY_SetBWMode8188E(
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
HT_CHANNEL_WIDTH tmpBW= pHalData->CurrentChannelBW; HT_CHANNEL_WIDTH tmpBW= pHalData->CurrentChannelBW;
// Modified it for 20/40 mhz switch by guangan 070531 // Modified it for 20/40 mhz switch by guangan 070531
//PMGNT_INFO pMgntInfo=&Adapter->MgntInfo; //PMGNT_INFO pMgntInfo=&Adapter->MgntInfo;
@ -2997,7 +2997,7 @@ PHY_SwChnl8188E( // Call after initialization
if(pHalData->rf_chip == RF_PSEUDO_11N) if(pHalData->rf_chip == RF_PSEUDO_11N)
{ {
//pHalData->SwChnlInProgress=FALSE; //pHalData->SwChnlInProgress=FALSE;
return; //return immediately if it is peudo-phy return; //return immediately if it is peudo-phy
} }
//if(pHalData->SwChnlInProgress) //if(pHalData->SwChnlInProgress)
@ -3509,7 +3509,7 @@ _PHY_DumpRFReg(IN struct adapter *pAdapter)
// //
// Description: // Description:
// To dump all Tx FIFO LLT related link-list table. // To dump all Tx FIFO LLT related link-list table.
// Added by Roger, 2009.03.10. // Added by Roger, 2009.03.10.
// //
VOID VOID
@ -3549,4 +3549,3 @@ DumpBBDbgPort_92CU(
} }
#endif #endif

21
hal/rtl8188e_rf6052.c
View file

@ -34,7 +34,7 @@
* Data Who Remark * Data Who Remark
* *
* 09/25/2008 MHC Create initial version. * 09/25/2008 MHC Create initial version.
* 11/05/2008 MHC Add API for tw power setting. * 11/05/2008 MHC Add API for tw power setting.
* *
* *
******************************************************************************/ ******************************************************************************/
@ -89,7 +89,7 @@ static RF_SHADOW_T RF_Shadow[RF6052_MAX_PATH][RF6052_MAX_REG];
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 09/25/2008 MHC Create Version 0. * 09/25/2008 MHC Create Version 0.
* Firmwaer support the utility later. * Firmwaer support the utility later.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
@ -198,7 +198,7 @@ rtl8188e_PHY_RF6052SetBandwidth(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/05/2008 MHC Simulate 8192series.. * 11/05/2008 MHC Simulate 8192series..
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
@ -210,7 +210,7 @@ rtl8188e_PHY_RF6052SetCckTxPower(
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
//PMGNT_INFO pMgntInfo=&Adapter->MgntInfo; //PMGNT_INFO pMgntInfo=&Adapter->MgntInfo;
u32 TxAGC[2]={0, 0}, tmpval=0,pwrtrac_value; u32 TxAGC[2]={0, 0}, tmpval=0,pwrtrac_value;
BOOLEAN TurboScanOff = _FALSE; BOOLEAN TurboScanOff = _FALSE;
@ -433,7 +433,7 @@ static void getTxPowerWriteValByRegulatory(
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
u8 i, chnlGroup, pwr_diff_limit[4]; u8 i, chnlGroup, pwr_diff_limit[4];
u32 writeVal, customer_limit, rf; u32 writeVal, customer_limit, rf;
// //
// Index 0 & 1= legacy OFDM, 2-5=HT_MCS rate // Index 0 & 1= legacy OFDM, 2-5=HT_MCS rate
@ -567,7 +567,7 @@ void getTxPowerWriteValByRegulatory88E(
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
u1Byte i, chnlGroup=0, pwr_diff_limit[4], customer_pwr_limit; u1Byte i, chnlGroup=0, pwr_diff_limit[4], customer_pwr_limit;
s1Byte pwr_diff=0; s1Byte pwr_diff=0;
u4Byte writeVal, customer_limit, rf; u4Byte writeVal, customer_limit, rf;
u1Byte Regulatory = pHalData->EEPROMRegulatory; u1Byte Regulatory = pHalData->EEPROMRegulatory;
// //
@ -736,7 +736,7 @@ void getTxPowerWriteValByRegulatory88E(
static void writeOFDMPowerReg88E( static void writeOFDMPowerReg88E(
IN struct adapter *Adapter, IN struct adapter *Adapter,
IN u8 index, IN u8 index,
IN u32* pValue IN u32* pValue
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -808,7 +808,7 @@ static void writeOFDMPowerReg88E(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/05/2008 MHC Simulate 8192 series method. * 11/05/2008 MHC Simulate 8192 series method.
* 01/06/2009 MHC 1. Prevent Path B tx power overflow or underflow dure to * 01/06/2009 MHC 1. Prevent Path B tx power overflow or underflow dure to
* A/B pwr difference or legacy/HT pwr diff. * A/B pwr difference or legacy/HT pwr diff.
* 2. We concern with path B legacy/HT OFDM difference. * 2. We concern with path B legacy/HT OFDM difference.
@ -927,7 +927,7 @@ phy_RF6052_Config_ParaFile(
rtw_udelay_os(1);//PlatformStallExecution(1); rtw_udelay_os(1);//PlatformStallExecution(1);
/* Set bit number of Address and Data for RF register */ /* Set bit number of Address and Data for RF register */
PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, b3WireAddressLength, 0x0); // Set 1 to 4 bits for 8255 PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, b3WireAddressLength, 0x0); // Set 1 to 4 bits for 8255
rtw_udelay_os(1);//PlatformStallExecution(1); rtw_udelay_os(1);//PlatformStallExecution(1);
PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, b3WireDataLength, 0x0); // Set 0 to 12 bits for 8255 PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, b3WireDataLength, 0x0); // Set 0 to 12 bits for 8255
@ -1066,7 +1066,7 @@ PHY_RF6052_Config8188E(
* *
* Revised History: * Revised History:
* When Who Remark * When Who Remark
* 11/20/2008 MHC Create Version 0. * 11/20/2008 MHC Create Version 0.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
u32 u32
@ -1269,4 +1269,3 @@ PHY_RFShadowRefresh(
} /* PHY_RFShadowRead */ } /* PHY_RFShadowRead */
/* End of HalRf6052.c */ /* End of HalRf6052.c */

5
hal/rtl8188e_rxdesc.c
View file

@ -96,7 +96,7 @@ static void process_rssi(struct adapter *padapter,union recv_frame *prframe)
static void process_link_qual(struct adapter *padapter,union recv_frame *prframe) static void process_link_qual(struct adapter *padapter,union recv_frame *prframe)
{ {
u32 last_evm=0, tmpVal; u32 last_evm=0, tmpVal;
struct rx_pkt_attrib *pattrib; struct rx_pkt_attrib *pattrib;
#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
struct signal_stat * signal_stat; struct signal_stat * signal_stat;
#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS #endif //CONFIG_NEW_SIGNAL_STAT_PROCESS
@ -270,7 +270,7 @@ void update_recvframe_phyinfo_88e(
struct adapter * padapter = precvframe->u.hdr.adapter; struct adapter * padapter = precvframe->u.hdr.adapter;
struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
PODM_PHY_INFO_T pPHYInfo = (PODM_PHY_INFO_T)(&pattrib->phy_info); PODM_PHY_INFO_T pPHYInfo = (PODM_PHY_INFO_T)(&pattrib->phy_info);
u8 *wlanhdr; u8 *wlanhdr;
ODM_PACKET_INFO_T pkt_info; ODM_PACKET_INFO_T pkt_info;
u8 *sa; u8 *sa;
@ -347,4 +347,3 @@ void update_recvframe_phyinfo_88e(
rtl8188e_process_phy_info(padapter, precvframe); rtl8188e_process_phy_info(padapter, precvframe);
} }
} }

1
hal/rtl8188e_sreset.c
View file

@ -122,4 +122,3 @@ void rtl8188e_sreset_linked_status_check(struct adapter *padapter)
} }
} }
#endif #endif

6
hal/rtl8188e_xmit.c
View file

@ -122,7 +122,7 @@ void _dbg_dump_tx_info(struct adapter *padapter,int frame_tag,struct tx_desc *pt
struct EMInfo{ struct EMInfo{
u8 EMPktNum; u8 EMPktNum;
u16 EMPktLen[EARLY_MODE_MAX_PKT_NUM]; u16 EMPktLen[EARLY_MODE_MAX_PKT_NUM];
}; };
@ -229,7 +229,7 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmit
#ifdef DBG_EMINFO #ifdef DBG_EMINFO
DBG_8192C("\n%s ==> agg_num:%d\n",__FUNCTION__, pframe->agg_num); DBG_8192C("\n%s ==> agg_num:%d\n",__FUNCTION__, pframe->agg_num);
for(index=0;index<pframe->agg_num;index++){ for(index=0;index<pframe->agg_num;index++){
offset = pxmitpriv->agg_pkt[index].offset; offset = pxmitpriv->agg_pkt[index].offset;
pktlen = pxmitpriv->agg_pkt[index].pkt_len; pktlen = pxmitpriv->agg_pkt[index].pkt_len;
DBG_8192C("%s ==> agg_pkt[%d].offset=%d\n",__FUNCTION__,index,offset); DBG_8192C("%s ==> agg_pkt[%d].offset=%d\n",__FUNCTION__,index,offset);
DBG_8192C("%s ==> agg_pkt[%d].pkt_len=%d\n",__FUNCTION__,index,pktlen); DBG_8192C("%s ==> agg_pkt[%d].pkt_len=%d\n",__FUNCTION__,index,pktlen);
@ -288,5 +288,3 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmit
} }
#endif #endif

1
hal/rtl8188eu_led.c
View file

@ -167,4 +167,3 @@ rtl8188eu_DeInitSwLeds(
DeInitLed871x( &(ledpriv->SwLed0) ); DeInitLed871x( &(ledpriv->SwLed0) );
DeInitLed871x( &(ledpriv->SwLed1) ); DeInitLed871x( &(ledpriv->SwLed1) );
} }

2
hal/rtl8188eu_recv.c
View file

@ -208,5 +208,3 @@ void rtl8188eu_free_recv_priv (struct adapter *padapter)
#endif #endif
} }

7
hal/rtl8188eu_xmit.c
View file

@ -361,7 +361,7 @@ if (padapter->registrypriv.mp_mode == 0)
data_rate =ODM_RA_GetDecisionRate_8188E(&pHalData->odmpriv,pattrib->mac_id); data_rate =ODM_RA_GetDecisionRate_8188E(&pHalData->odmpriv,pattrib->mac_id);
//for debug //for debug
#if 1 #if 1
if(padapter->fix_rate!= 0xFF){ if(padapter->fix_rate!= 0xFF){
data_rate = padapter->fix_rate; data_rate = padapter->fix_rate;
@ -500,7 +500,7 @@ if (padapter->registrypriv.mp_mode == 0)
//ptxdesc->txdw3 |= cpu_to_le32((8 <<28)); //set bit3 to 1. Suugested by TimChen. 2009.12.29. //ptxdesc->txdw3 |= cpu_to_le32((8 <<28)); //set bit3 to 1. Suugested by TimChen. 2009.12.29.
ptxdesc->txdw3 |= cpu_to_le32(EN_HWSEQ); // Hw set sequence number ptxdesc->txdw3 |= cpu_to_le32(EN_HWSEQ); // Hw set sequence number
ptxdesc->txdw4 |= cpu_to_le32(HW_SSN); // Hw set sequence number ptxdesc->txdw4 |= cpu_to_le32(HW_SSN); // Hw set sequence number
} }
@ -1178,7 +1178,7 @@ s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe)
s32 rtl8188eu_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe) s32 rtl8188eu_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
s32 err; s32 err;
if ((err=rtw_xmitframe_enqueue(padapter, pxmitframe)) != _SUCCESS) if ((err=rtw_xmitframe_enqueue(padapter, pxmitframe)) != _SUCCESS)
@ -1324,4 +1324,3 @@ _exit:
} }
#endif #endif

95
hal/usb_halinit.c
View file

@ -66,15 +66,15 @@ _ConfigNormalChipOutEP_8188E(
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
switch(NumOutPipe){ switch(NumOutPipe){
case 3: case 3:
pHalData->OutEpQueueSel=TX_SELE_HQ| TX_SELE_LQ|TX_SELE_NQ; pHalData->OutEpQueueSel=TX_SELE_HQ| TX_SELE_LQ|TX_SELE_NQ;
pHalData->OutEpNumber=3; pHalData->OutEpNumber=3;
break; break;
case 2: case 2:
pHalData->OutEpQueueSel=TX_SELE_HQ| TX_SELE_NQ; pHalData->OutEpQueueSel=TX_SELE_HQ| TX_SELE_NQ;
pHalData->OutEpNumber=2; pHalData->OutEpNumber=2;
break; break;
case 1: case 1:
pHalData->OutEpQueueSel=TX_SELE_HQ; pHalData->OutEpQueueSel=TX_SELE_HQ;
pHalData->OutEpNumber=1; pHalData->OutEpNumber=1;
break; break;
@ -482,8 +482,8 @@ _InitNormalChipRegPriority(
{ {
u16 value16 = (rtw_read16(Adapter, REG_TRXDMA_CTRL) & 0x7); u16 value16 = (rtw_read16(Adapter, REG_TRXDMA_CTRL) & 0x7);
value16 |= _TXDMA_BEQ_MAP(beQ) | _TXDMA_BKQ_MAP(bkQ) | value16 |= _TXDMA_BEQ_MAP(beQ) | _TXDMA_BKQ_MAP(bkQ) |
_TXDMA_VIQ_MAP(viQ) | _TXDMA_VOQ_MAP(voQ) | _TXDMA_VIQ_MAP(viQ) | _TXDMA_VOQ_MAP(voQ) |
_TXDMA_MGQ_MAP(mgtQ)| _TXDMA_HIQ_MAP(hiQ); _TXDMA_MGQ_MAP(mgtQ)| _TXDMA_HIQ_MAP(hiQ);
rtw_write16(Adapter, REG_TRXDMA_CTRL, value16); rtw_write16(Adapter, REG_TRXDMA_CTRL, value16);
@ -587,19 +587,19 @@ _InitNormalChipThreeOutEpPriority(
if(!pregistrypriv->wifi_spec ){// typical setting if(!pregistrypriv->wifi_spec ){// typical setting
beQ = QUEUE_LOW; beQ = QUEUE_LOW;
bkQ = QUEUE_LOW; bkQ = QUEUE_LOW;
viQ = QUEUE_NORMAL; viQ = QUEUE_NORMAL;
voQ = QUEUE_HIGH; voQ = QUEUE_HIGH;
mgtQ = QUEUE_HIGH; mgtQ = QUEUE_HIGH;
hiQ = QUEUE_HIGH; hiQ = QUEUE_HIGH;
} }
else{// for WMM else{// for WMM
beQ = QUEUE_LOW; beQ = QUEUE_LOW;
bkQ = QUEUE_NORMAL; bkQ = QUEUE_NORMAL;
viQ = QUEUE_NORMAL; viQ = QUEUE_NORMAL;
voQ = QUEUE_HIGH; voQ = QUEUE_HIGH;
mgtQ = QUEUE_HIGH; mgtQ = QUEUE_HIGH;
hiQ = QUEUE_HIGH; hiQ = QUEUE_HIGH;
} }
_InitNormalChipRegPriority(Adapter,beQ,bkQ,viQ,voQ,mgtQ,hiQ); _InitNormalChipRegPriority(Adapter,beQ,bkQ,viQ,voQ,mgtQ,hiQ);
} }
@ -1287,7 +1287,7 @@ HwSuspendModeEnable_88eu(
IN u8 Type IN u8 Type
) )
{ {
//PRT_USB_DEVICE pDevice = GET_RT_USB_DEVICE(pAdapter); //PRT_USB_DEVICE pDevice = GET_RT_USB_DEVICE(pAdapter);
u16 reg = rtw_read16(pAdapter, REG_GPIO_MUXCFG); u16 reg = rtw_read16(pAdapter, REG_GPIO_MUXCFG);
//if (!pDevice->RegUsbSS) //if (!pDevice->RegUsbSS)
@ -1965,7 +1965,7 @@ VOID hal_poweroff_rtl8188eu(
) )
{ {
// PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); // PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo);
u8 val8; u8 val8;
u16 val16; u16 val16;
u32 val32; u32 val32;
u8 bMacPwrCtrlOn=_FALSE; u8 bMacPwrCtrlOn=_FALSE;
@ -2059,7 +2059,7 @@ u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
{ {
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter); struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter);
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
DBG_8192C("==> %s \n",__FUNCTION__); DBG_8192C("==> %s \n",__FUNCTION__);
#ifdef CONFIG_SUPPORT_USB_INT #ifdef CONFIG_SUPPORT_USB_INT
rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E); rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E);
@ -2067,13 +2067,13 @@ u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
#endif #endif
#ifdef SUPPORT_HW_RFOFF_DETECTED #ifdef SUPPORT_HW_RFOFF_DETECTED
DBG_8192C("bkeepfwalive(%x)\n", pwrctl->bkeepfwalive); DBG_8192C("bkeepfwalive(%x)\n", pwrctl->bkeepfwalive);
if(pwrctl->bkeepfwalive) if(pwrctl->bkeepfwalive)
{ {
_ps_close_RF(Adapter); _ps_close_RF(Adapter);
if((pwrctl->bHWPwrPindetect) && (pwrctl->bHWPowerdown)) if((pwrctl->bHWPwrPindetect) && (pwrctl->bHWPowerdown))
rtl8188eu_hw_power_down(Adapter); rtl8188eu_hw_power_down(Adapter);
} }
else else
#endif #endif
{ {
@ -2251,7 +2251,7 @@ _GetChannelGroup(
{ {
//RT_ASSERT((channel < 14), ("Channel %d no is supported!\n")); //RT_ASSERT((channel < 14), ("Channel %d no is supported!\n"));
if(channel < 3){ // Channel 1~3 if(channel < 3){ // Channel 1~3
return 0; return 0;
} }
else if(channel < 9){ // Channel 4~9 else if(channel < 9){ // Channel 4~9
@ -2489,8 +2489,8 @@ _ReadLEDSetting(
static VOID static VOID
_ReadThermalMeter( _ReadThermalMeter(
IN struct adapter *Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
{ {
#if 0 #if 0
@ -2525,8 +2525,8 @@ _ReadThermalMeter(
static VOID static VOID
_ReadRFSetting( _ReadRFSetting(
IN struct adapter *Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
{ {
} }
@ -2534,8 +2534,8 @@ _ReadRFSetting(
static void static void
_ReadPROMVersion( _ReadPROMVersion(
IN struct adapter *Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
{ {
#if 0 #if 0
@ -2648,8 +2648,8 @@ Hal_EfuseParsePIDVID_8188EU(
} }
else else
{ {
pHalData->EEPROMVID = EEPROM_Default_VID; pHalData->EEPROMVID = EEPROM_Default_VID;
pHalData->EEPROMPID = EEPROM_Default_PID; pHalData->EEPROMPID = EEPROM_Default_PID;
// Customer ID, 0x00 and 0xff are reserved for Realtek. // Customer ID, 0x00 and 0xff are reserved for Realtek.
pHalData->EEPROMCustomerID = EEPROM_Default_CustomerID; pHalData->EEPROMCustomerID = EEPROM_Default_CustomerID;
@ -3188,7 +3188,7 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val)
//BIT4 - If set 0, hw will clr bcnq when tx becon ok/fail or port 1 //BIT4 - If set 0, hw will clr bcnq when tx becon ok/fail or port 1
rtw_write8(Adapter, REG_MBID_NUM, rtw_read8(Adapter, REG_MBID_NUM)|BIT(3)|BIT(4)); rtw_write8(Adapter, REG_MBID_NUM, rtw_read8(Adapter, REG_MBID_NUM)|BIT(3)|BIT(4));
//enable BCN1 Function for if2 //enable BCN1 Function for if2
//don't enable update TSF1 for if2 (due to TSF update when beacon/probe rsp are received) //don't enable update TSF1 for if2 (due to TSF update when beacon/probe rsp are received)
rtw_write8(Adapter, REG_BCN_CTRL_1, (DIS_TSF_UDT0_NORMAL_CHIP|EN_BCN_FUNCTION | EN_TXBCN_RPT|BIT(1))); rtw_write8(Adapter, REG_BCN_CTRL_1, (DIS_TSF_UDT0_NORMAL_CHIP|EN_BCN_FUNCTION | EN_TXBCN_RPT|BIT(1)));
@ -3675,7 +3675,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
DM_ODM_T *podmpriv = &pHalData->odmpriv; DM_ODM_T *podmpriv = &pHalData->odmpriv;
_func_enter_; _func_enter_;
switch(variable) switch(variable)
@ -3946,7 +3946,7 @@ _func_enter_;
{ {
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u16 bcn_interval = *((u16 *)val); u16 bcn_interval = *((u16 *)val);
if((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE){ if((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE){
DBG_8192C("%s==> bcn_interval:%d, eraly_int:%d \n",__FUNCTION__,bcn_interval,bcn_interval>>1); DBG_8192C("%s==> bcn_interval:%d, eraly_int:%d \n",__FUNCTION__,bcn_interval,bcn_interval>>1);
rtw_write8(Adapter, REG_DRVERLYINT, bcn_interval>>1);// 50ms for sdio rtw_write8(Adapter, REG_DRVERLYINT, bcn_interval>>1);// 50ms for sdio
@ -4047,7 +4047,7 @@ _func_enter_;
case HW_VAR_DM_FUNC_SET: case HW_VAR_DM_FUNC_SET:
if(*((u32 *)val) == DYNAMIC_ALL_FUNC_ENABLE){ if(*((u32 *)val) == DYNAMIC_ALL_FUNC_ENABLE){
pdmpriv->DMFlag = pdmpriv->InitDMFlag; pdmpriv->DMFlag = pdmpriv->InitDMFlag;
podmpriv->SupportAbility = pdmpriv->InitODMFlag; podmpriv->SupportAbility = pdmpriv->InitODMFlag;
} }
else{ else{
podmpriv->SupportAbility |= *((u32 *)val); podmpriv->SupportAbility |= *((u32 *)val);
@ -4296,7 +4296,7 @@ _func_enter_;
case HW_VAR_INITIAL_GAIN: case HW_VAR_INITIAL_GAIN:
{ {
DIG_T *pDigTable = &podmpriv->DM_DigTable; DIG_T *pDigTable = &podmpriv->DM_DigTable;
u32 rx_gain = ((u32 *)(val))[0]; u32 rx_gain = ((u32 *)(val))[0];
if(rx_gain == 0xff){//restore rx gain if(rx_gain == 0xff){//restore rx gain
ODM_Write_DIG(podmpriv,pDigTable->BackupIGValue); ODM_Write_DIG(podmpriv,pDigTable->BackupIGValue);
@ -4343,7 +4343,7 @@ _func_enter_;
case HW_VAR_ANTENNA_DIVERSITY_SELECT: case HW_VAR_ANTENNA_DIVERSITY_SELECT:
{ {
u8 Optimum_antenna = (*(u8 *)val); u8 Optimum_antenna = (*(u8 *)val);
u8 Ant ; u8 Ant ;
//switch antenna to Optimum_antenna //switch antenna to Optimum_antenna
//DBG_8192C("==> HW_VAR_ANTENNA_DIVERSITY_SELECT , Ant_(%s)\n",(Optimum_antenna==2)?"A":"B"); //DBG_8192C("==> HW_VAR_ANTENNA_DIVERSITY_SELECT , Ant_(%s)\n",(Optimum_antenna==2)?"A":"B");
if(pHalData->CurAntenna != Optimum_antenna) if(pHalData->CurAntenna != Optimum_antenna)
@ -4548,7 +4548,7 @@ _func_exit_;
void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
DM_ODM_T *podmpriv = &pHalData->odmpriv; DM_ODM_T *podmpriv = &pHalData->odmpriv;
_func_enter_; _func_enter_;
switch(variable) switch(variable)
@ -4643,7 +4643,7 @@ GetHalDefVar8188EUsb(
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
DM_ODM_T *podmpriv = &pHalData->odmpriv; DM_ODM_T *podmpriv = &pHalData->odmpriv;
u8 bResult = _SUCCESS; u8 bResult = _SUCCESS;
switch(eVariable) switch(eVariable)
@ -4723,7 +4723,7 @@ GetHalDefVar8188EUsb(
{ {
u8 entry_id = *((u8*)pValue); u8 entry_id = *((u8*)pValue);
u8 i; u8 i;
u8 bLinked = _FALSE; u8 bLinked = _FALSE;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter; struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter;
#endif //CONFIG_CONCURRENT_MODE #endif //CONFIG_CONCURRENT_MODE
@ -4790,7 +4790,7 @@ SetHalDefVar8188EUsb(
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
DM_ODM_T *podmpriv = &pHalData->odmpriv; DM_ODM_T *podmpriv = &pHalData->odmpriv;
u8 bResult = _SUCCESS; u8 bResult = _SUCCESS;
switch(eVariable) switch(eVariable)
@ -4903,7 +4903,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level
//struct dm_priv *pdmpriv = &pHalData->dmpriv; //struct dm_priv *pdmpriv = &pHalData->dmpriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
if (mac_id >= NUM_STA) //CAM_SIZE if (mac_id >= NUM_STA) //CAM_SIZE
{ {
@ -5039,7 +5039,7 @@ void SetBeaconRelatedRegisters8188EUsb(struct adapter *padapter)
//HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u32 bcn_ctrl_reg = REG_BCN_CTRL; u32 bcn_ctrl_reg = REG_BCN_CTRL;
//reset TSF, enable update TSF, correcting TSF On Beacon //reset TSF, enable update TSF, correcting TSF On Beacon
//REG_BCN_INTERVAL //REG_BCN_INTERVAL
@ -5054,9 +5054,9 @@ void SetBeaconRelatedRegisters8188EUsb(struct adapter *padapter)
//BCN interval //BCN interval
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if (padapter->iface_type == IFACE_PORT1){ if (padapter->iface_type == IFACE_PORT1){
bcn_ctrl_reg = REG_BCN_CTRL_1; bcn_ctrl_reg = REG_BCN_CTRL_1;
} }
#endif #endif
rtw_write16(padapter, REG_BCN_INTERVAL, pmlmeinfo->bcn_interval); rtw_write16(padapter, REG_BCN_INTERVAL, pmlmeinfo->bcn_interval);
rtw_write8(padapter, REG_ATIMWND, 0x02);// 2ms rtw_write8(padapter, REG_ATIMWND, 0x02);// 2ms
@ -5195,8 +5195,8 @@ _func_enter_;
pHalFunc->SetHwRegHandler = &SetHwReg8188EU; pHalFunc->SetHwRegHandler = &SetHwReg8188EU;
pHalFunc->GetHwRegHandler = &GetHwReg8188EU; pHalFunc->GetHwRegHandler = &GetHwReg8188EU;
pHalFunc->GetHalDefVarHandler = &GetHalDefVar8188EUsb; pHalFunc->GetHalDefVarHandler = &GetHalDefVar8188EUsb;
pHalFunc->SetHalDefVarHandler = &SetHalDefVar8188EUsb; pHalFunc->SetHalDefVarHandler = &SetHalDefVar8188EUsb;
pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb; pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb;
pHalFunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8188EUsb; pHalFunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8188EUsb;
@ -5217,4 +5217,3 @@ _func_enter_;
_func_exit_; _func_exit_;
} }

31
hal/usb_ops_linux.c
View file

@ -561,10 +561,10 @@ _func_enter_;
usb_fill_int_urb(precvpriv->int_in_urb, pusbd, pipe, usb_fill_int_urb(precvpriv->int_in_urb, pusbd, pipe,
precvpriv->int_in_buf, precvpriv->int_in_buf,
INTERRUPT_MSG_FORMAT_LEN, INTERRUPT_MSG_FORMAT_LEN,
usb_read_interrupt_complete, usb_read_interrupt_complete,
adapter, adapter,
1); 1);
err = usb_submit_urb(precvpriv->int_in_urb, GFP_ATOMIC); err = usb_submit_urb(precvpriv->int_in_urb, GFP_ATOMIC);
if((err) && (err != (-EPERM))) if((err) && (err != (-EPERM)))
@ -1028,7 +1028,7 @@ void rtl8188eu_recv_tasklet(void *priv)
static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
{ {
struct recv_buf *precvbuf = (struct recv_buf *)purb->context; struct recv_buf *precvbuf = (struct recv_buf *)purb->context;
struct adapter *padapter =(struct adapter *)precvbuf->adapter; struct adapter *padapter =(struct adapter *)precvbuf->adapter;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n"));
@ -1147,9 +1147,9 @@ _func_enter_;
usb_fill_bulk_urb(purb, pusbd, pipe, usb_fill_bulk_urb(purb, pusbd, pipe,
precvbuf->pbuf, precvbuf->pbuf,
MAX_RECVBUF_SZ, MAX_RECVBUF_SZ,
usb_read_port_complete, usb_read_port_complete,
precvbuf);//context is precvbuf precvbuf);//context is precvbuf
purb->transfer_dma = precvbuf->dma_transfer_addr; purb->transfer_dma = precvbuf->dma_transfer_addr;
purb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; purb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
@ -1446,7 +1446,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
_irqL irqL; _irqL irqL;
uint isevt, *pbuf; uint isevt, *pbuf;
struct recv_buf *precvbuf = (struct recv_buf *)purb->context; struct recv_buf *precvbuf = (struct recv_buf *)purb->context;
struct adapter *padapter =(struct adapter *)precvbuf->adapter; struct adapter *padapter =(struct adapter *)precvbuf->adapter;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n"));
@ -1608,11 +1608,11 @@ _func_enter_;
} }
tmpaddr = (SIZE_PTR)precvbuf->pskb->data; tmpaddr = (SIZE_PTR)precvbuf->pskb->data;
alignment = tmpaddr & (RECVBUFF_ALIGN_SZ-1); alignment = tmpaddr & (RECVBUFF_ALIGN_SZ-1);
skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment));
precvbuf->phead = precvbuf->pskb->head; precvbuf->phead = precvbuf->pskb->head;
precvbuf->pdata = precvbuf->pskb->data; precvbuf->pdata = precvbuf->pskb->data;
precvbuf->ptail = skb_tail_pointer(precvbuf->pskb); precvbuf->ptail = skb_tail_pointer(precvbuf->pskb);
precvbuf->pend = skb_end_pointer(precvbuf->pskb); precvbuf->pend = skb_end_pointer(precvbuf->pskb);
precvbuf->pbuf = precvbuf->pskb->data; precvbuf->pbuf = precvbuf->pskb->data;
@ -1623,7 +1623,7 @@ _func_enter_;
precvbuf->pdata = precvbuf->pskb->data; precvbuf->pdata = precvbuf->pskb->data;
precvbuf->ptail = skb_tail_pointer(precvbuf->pskb); precvbuf->ptail = skb_tail_pointer(precvbuf->pskb);
precvbuf->pend = skb_end_pointer(precvbuf->pskb); precvbuf->pend = skb_end_pointer(precvbuf->pskb);
precvbuf->pbuf = precvbuf->pskb->data; precvbuf->pbuf = precvbuf->pskb->data;
precvbuf->reuse = _FALSE; precvbuf->reuse = _FALSE;
} }
@ -1642,9 +1642,9 @@ _func_enter_;
usb_fill_bulk_urb(purb, pusbd, pipe, usb_fill_bulk_urb(purb, pusbd, pipe,
precvbuf->pbuf, precvbuf->pbuf,
MAX_RECVBUF_SZ, MAX_RECVBUF_SZ,
usb_read_port_complete, usb_read_port_complete,
precvbuf);//context is precvbuf precvbuf);//context is precvbuf
err = usb_submit_urb(purb, GFP_ATOMIC); err = usb_submit_urb(purb, GFP_ATOMIC);
if((err) && (err != (-EPERM))) if((err) && (err != (-EPERM)))
@ -1734,4 +1734,3 @@ void rtl8188eu_set_hw_type(struct adapter *padapter)
padapter->HardwareType = HARDWARE_TYPE_RTL8188EU; padapter->HardwareType = HARDWARE_TYPE_RTL8188EU;
DBG_871X("CHIP TYPE: RTL8188E\n"); DBG_871X("CHIP TYPE: RTL8188E\n");
} }

41
include/Hal8188EPhyCfg.h
View file

@ -82,22 +82,22 @@ typedef enum _RF_RADIO_PATH{
#define MAX_PG_GROUP 13 #define MAX_PG_GROUP 13
#define RF_PATH_MAX 2 #define RF_PATH_MAX 2
#define MAX_RF_PATH RF_PATH_MAX #define MAX_RF_PATH RF_PATH_MAX
#define MAX_TX_COUNT_88E 1 #define MAX_TX_COUNT_88E 1
#define MAX_TX_COUNT MAX_TX_COUNT_88E // 4 //path numbers #define MAX_TX_COUNT MAX_TX_COUNT_88E // 4 //path numbers
#define CHANNEL_MAX_NUMBER 14 // 14 is the max channel number #define CHANNEL_MAX_NUMBER 14 // 14 is the max channel number
#define MAX_CHNL_GROUP_24G 6 // ch1~2, ch3~5, ch6~8,ch9~11,ch12~13,CH 14 total six groups #define MAX_CHNL_GROUP_24G 6 // ch1~2, ch3~5, ch6~8,ch9~11,ch12~13,CH 14 total six groups
#define CHANNEL_GROUP_MAX_88E 6 #define CHANNEL_GROUP_MAX_88E 6
typedef enum _WIRELESS_MODE { typedef enum _WIRELESS_MODE {
WIRELESS_MODE_UNKNOWN = 0x00, WIRELESS_MODE_UNKNOWN = 0x00,
WIRELESS_MODE_A = BIT2, WIRELESS_MODE_A = BIT2,
WIRELESS_MODE_B = BIT0, WIRELESS_MODE_B = BIT0,
WIRELESS_MODE_G = BIT1, WIRELESS_MODE_G = BIT1,
WIRELESS_MODE_AUTO = BIT5, WIRELESS_MODE_AUTO = BIT5,
WIRELESS_MODE_N_24G = BIT3, WIRELESS_MODE_N_24G = BIT3,
WIRELESS_MODE_N_5G = BIT4, WIRELESS_MODE_N_5G = BIT4,
WIRELESS_MODE_AC = BIT6 WIRELESS_MODE_AC = BIT6
} WIRELESS_MODE; } WIRELESS_MODE;
@ -133,10 +133,10 @@ typedef struct _BB_REGISTER_DEFINITION{
u32 rfintfi; // readback data: u32 rfintfi; // readback data:
// 0x8e0~0x8e7[8 bytes] // 0x8e0~0x8e7[8 bytes]
u32 rfintfo; // output data: u32 rfintfo; // output data:
// 0x860~0x86f [16 bytes] // 0x860~0x86f [16 bytes]
u32 rfintfe; // output enable: u32 rfintfe; // output enable:
// 0x860~0x86f [16 bytes] // 0x860~0x86f [16 bytes]
u32 rf3wireOffset; // LSSI data: u32 rf3wireOffset; // LSSI data:
@ -148,37 +148,37 @@ typedef struct _BB_REGISTER_DEFINITION{
u32 rfTxGainStage; // Tx gain stage: u32 rfTxGainStage; // Tx gain stage:
// 0x80c~0x80f [4 bytes] // 0x80c~0x80f [4 bytes]
u32 rfHSSIPara1; // wire parameter control1 : u32 rfHSSIPara1; // wire parameter control1 :
// 0x820~0x823,0x828~0x82b, 0x830~0x833, 0x838~0x83b [16 bytes] // 0x820~0x823,0x828~0x82b, 0x830~0x833, 0x838~0x83b [16 bytes]
u32 rfHSSIPara2; // wire parameter control2 : u32 rfHSSIPara2; // wire parameter control2 :
// 0x824~0x827,0x82c~0x82f, 0x834~0x837, 0x83c~0x83f [16 bytes] // 0x824~0x827,0x82c~0x82f, 0x834~0x837, 0x83c~0x83f [16 bytes]
u32 rfSwitchControl; //Tx Rx antenna control : u32 rfSwitchControl; //Tx Rx antenna control :
// 0x858~0x85f [16 bytes] // 0x858~0x85f [16 bytes]
u32 rfAGCControl1; //AGC parameter control1 : u32 rfAGCControl1; //AGC parameter control1 :
// 0xc50~0xc53,0xc58~0xc5b, 0xc60~0xc63, 0xc68~0xc6b [16 bytes] // 0xc50~0xc53,0xc58~0xc5b, 0xc60~0xc63, 0xc68~0xc6b [16 bytes]
u32 rfAGCControl2; //AGC parameter control2 : u32 rfAGCControl2; //AGC parameter control2 :
// 0xc54~0xc57,0xc5c~0xc5f, 0xc64~0xc67, 0xc6c~0xc6f [16 bytes] // 0xc54~0xc57,0xc5c~0xc5f, 0xc64~0xc67, 0xc6c~0xc6f [16 bytes]
u32 rfRxIQImbalance; //OFDM Rx IQ imbalance matrix : u32 rfRxIQImbalance; //OFDM Rx IQ imbalance matrix :
// 0xc14~0xc17,0xc1c~0xc1f, 0xc24~0xc27, 0xc2c~0xc2f [16 bytes] // 0xc14~0xc17,0xc1c~0xc1f, 0xc24~0xc27, 0xc2c~0xc2f [16 bytes]
u32 rfRxAFE; //Rx IQ DC ofset and Rx digital filter, Rx DC notch filter : u32 rfRxAFE; //Rx IQ DC ofset and Rx digital filter, Rx DC notch filter :
// 0xc10~0xc13,0xc18~0xc1b, 0xc20~0xc23, 0xc28~0xc2b [16 bytes] // 0xc10~0xc13,0xc18~0xc1b, 0xc20~0xc23, 0xc28~0xc2b [16 bytes]
u32 rfTxIQImbalance; //OFDM Tx IQ imbalance matrix u32 rfTxIQImbalance; //OFDM Tx IQ imbalance matrix
// 0xc80~0xc83,0xc88~0xc8b, 0xc90~0xc93, 0xc98~0xc9b [16 bytes] // 0xc80~0xc83,0xc88~0xc8b, 0xc90~0xc93, 0xc98~0xc9b [16 bytes]
u32 rfTxAFE; //Tx IQ DC Offset and Tx DFIR type u32 rfTxAFE; //Tx IQ DC Offset and Tx DFIR type
// 0xc84~0xc87,0xc8c~0xc8f, 0xc94~0xc97, 0xc9c~0xc9f [16 bytes] // 0xc84~0xc87,0xc8c~0xc8f, 0xc94~0xc97, 0xc9c~0xc9f [16 bytes]
u32 rfLSSIReadBack; //LSSI RF readback data SI mode u32 rfLSSIReadBack; //LSSI RF readback data SI mode
// 0x8a0~0x8af [16 bytes] // 0x8a0~0x8af [16 bytes]
u32 rfLSSIReadBackPi; //LSSI RF readback data PI mode 0x8b8-8bc for Path A and B u32 rfLSSIReadBackPi; //LSSI RF readback data PI mode 0x8b8-8bc for Path A and B
}BB_REGISTER_DEFINITION_T, *PBB_REGISTER_DEFINITION_T; }BB_REGISTER_DEFINITION_T, *PBB_REGISTER_DEFINITION_T;
@ -258,7 +258,7 @@ void rtl8192c_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter );
// BB TX Power R/W // BB TX Power R/W
// //
void PHY_GetTxPowerLevel8188E( IN struct adapter * Adapter, void PHY_GetTxPowerLevel8188E( IN struct adapter * Adapter,
OUT u32* powerlevel ); OUT u32* powerlevel );
void PHY_SetTxPowerLevel8188E( IN struct adapter * Adapter, void PHY_SetTxPowerLevel8188E( IN struct adapter * Adapter,
IN u8 channel ); IN u8 channel );
BOOLEAN PHY_UpdateTxPowerDbm8188E( IN struct adapter *Adapter, BOOLEAN PHY_UpdateTxPowerDbm8188E( IN struct adapter *Adapter,
@ -426,4 +426,3 @@ VOID SIC_Init(IN struct adapter *Adapter);
#endif // __INC_HAL8192CPHYCFG_H #endif // __INC_HAL8192CPHYCFG_H

1091
include/Hal8188EPhyReg.h
View file

File diff suppressed because it is too large Load diff

3
include/Hal8188EPwrSeq.h
View file

@ -58,7 +58,7 @@
#define RTL8188E_TRANS_END_STEPS 1 #define RTL8188E_TRANS_END_STEPS 1
#define RTL8188E_TRANS_CARDEMU_TO_ACT \ #define RTL8188E_TRANS_CARDEMU_TO_ACT \
/* format */ \ /* format */ \
/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, // comments here*/ \ /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, // comments here*/ \
{0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_POLLING, BIT1, BIT1},/* wait till 0x04[17] = 1 power ready*/ \ {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_POLLING, BIT1, BIT1},/* wait till 0x04[17] = 1 power ready*/ \
@ -174,4 +174,3 @@ extern WLAN_PWR_CFG rtl8188E_enter_lps_flow[RTL8188E_TRANS_ACT_TO_LPS_STEPS+RTL8
extern WLAN_PWR_CFG rtl8188E_leave_lps_flow[RTL8188E_TRANS_LPS_TO_ACT_STEPS+RTL8188E_TRANS_END_STEPS]; extern WLAN_PWR_CFG rtl8188E_leave_lps_flow[RTL8188E_TRANS_LPS_TO_ACT_STEPS+RTL8188E_TRANS_END_STEPS];
#endif //__HAL8188EPWRSEQ_H__ #endif //__HAL8188EPWRSEQ_H__

39
include/Hal8192CPhyCfg.h
View file

@ -30,7 +30,7 @@
* *
* History: * History:
* Data Who Remark * Data Who Remark
* 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h. * 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h.
* 2. Reorganize code architecture. * 2. Reorganize code architecture.
* *
*****************************************************************************/ *****************************************************************************/
@ -122,12 +122,12 @@ typedef enum _RF_RADIO_PATH{
typedef enum _WIRELESS_MODE { typedef enum _WIRELESS_MODE {
WIRELESS_MODE_UNKNOWN = 0x00, WIRELESS_MODE_UNKNOWN = 0x00,
WIRELESS_MODE_A = BIT2, WIRELESS_MODE_A = BIT2,
WIRELESS_MODE_B = BIT0, WIRELESS_MODE_B = BIT0,
WIRELESS_MODE_G = BIT1, WIRELESS_MODE_G = BIT1,
WIRELESS_MODE_AUTO = BIT5, WIRELESS_MODE_AUTO = BIT5,
WIRELESS_MODE_N_24G = BIT3, WIRELESS_MODE_N_24G = BIT3,
WIRELESS_MODE_N_5G = BIT4, WIRELESS_MODE_N_5G = BIT4,
WIRELESS_MODE_AC = BIT6 WIRELESS_MODE_AC = BIT6
} WIRELESS_MODE; } WIRELESS_MODE;
@ -168,10 +168,10 @@ typedef struct _BB_REGISTER_DEFINITION{
u32 rfintfi; // readback data: u32 rfintfi; // readback data:
// 0x8e0~0x8e7[8 bytes] // 0x8e0~0x8e7[8 bytes]
u32 rfintfo; // output data: u32 rfintfo; // output data:
// 0x860~0x86f [16 bytes] // 0x860~0x86f [16 bytes]
u32 rfintfe; // output enable: u32 rfintfe; // output enable:
// 0x860~0x86f [16 bytes] // 0x860~0x86f [16 bytes]
u32 rf3wireOffset; // LSSI data: u32 rf3wireOffset; // LSSI data:
@ -183,37 +183,37 @@ typedef struct _BB_REGISTER_DEFINITION{
u32 rfTxGainStage; // Tx gain stage: u32 rfTxGainStage; // Tx gain stage:
// 0x80c~0x80f [4 bytes] // 0x80c~0x80f [4 bytes]
u32 rfHSSIPara1; // wire parameter control1 : u32 rfHSSIPara1; // wire parameter control1 :
// 0x820~0x823,0x828~0x82b, 0x830~0x833, 0x838~0x83b [16 bytes] // 0x820~0x823,0x828~0x82b, 0x830~0x833, 0x838~0x83b [16 bytes]
u32 rfHSSIPara2; // wire parameter control2 : u32 rfHSSIPara2; // wire parameter control2 :
// 0x824~0x827,0x82c~0x82f, 0x834~0x837, 0x83c~0x83f [16 bytes] // 0x824~0x827,0x82c~0x82f, 0x834~0x837, 0x83c~0x83f [16 bytes]
u32 rfSwitchControl; //Tx Rx antenna control : u32 rfSwitchControl; //Tx Rx antenna control :
// 0x858~0x85f [16 bytes] // 0x858~0x85f [16 bytes]
u32 rfAGCControl1; //AGC parameter control1 : u32 rfAGCControl1; //AGC parameter control1 :
// 0xc50~0xc53,0xc58~0xc5b, 0xc60~0xc63, 0xc68~0xc6b [16 bytes] // 0xc50~0xc53,0xc58~0xc5b, 0xc60~0xc63, 0xc68~0xc6b [16 bytes]
u32 rfAGCControl2; //AGC parameter control2 : u32 rfAGCControl2; //AGC parameter control2 :
// 0xc54~0xc57,0xc5c~0xc5f, 0xc64~0xc67, 0xc6c~0xc6f [16 bytes] // 0xc54~0xc57,0xc5c~0xc5f, 0xc64~0xc67, 0xc6c~0xc6f [16 bytes]
u32 rfRxIQImbalance; //OFDM Rx IQ imbalance matrix : u32 rfRxIQImbalance; //OFDM Rx IQ imbalance matrix :
// 0xc14~0xc17,0xc1c~0xc1f, 0xc24~0xc27, 0xc2c~0xc2f [16 bytes] // 0xc14~0xc17,0xc1c~0xc1f, 0xc24~0xc27, 0xc2c~0xc2f [16 bytes]
u32 rfRxAFE; //Rx IQ DC ofset and Rx digital filter, Rx DC notch filter : u32 rfRxAFE; //Rx IQ DC ofset and Rx digital filter, Rx DC notch filter :
// 0xc10~0xc13,0xc18~0xc1b, 0xc20~0xc23, 0xc28~0xc2b [16 bytes] // 0xc10~0xc13,0xc18~0xc1b, 0xc20~0xc23, 0xc28~0xc2b [16 bytes]
u32 rfTxIQImbalance; //OFDM Tx IQ imbalance matrix u32 rfTxIQImbalance; //OFDM Tx IQ imbalance matrix
// 0xc80~0xc83,0xc88~0xc8b, 0xc90~0xc93, 0xc98~0xc9b [16 bytes] // 0xc80~0xc83,0xc88~0xc8b, 0xc90~0xc93, 0xc98~0xc9b [16 bytes]
u32 rfTxAFE; //Tx IQ DC Offset and Tx DFIR type u32 rfTxAFE; //Tx IQ DC Offset and Tx DFIR type
// 0xc84~0xc87,0xc8c~0xc8f, 0xc94~0xc97, 0xc9c~0xc9f [16 bytes] // 0xc84~0xc87,0xc8c~0xc8f, 0xc94~0xc97, 0xc9c~0xc9f [16 bytes]
u32 rfLSSIReadBack; //LSSI RF readback data SI mode u32 rfLSSIReadBack; //LSSI RF readback data SI mode
// 0x8a0~0x8af [16 bytes] // 0x8a0~0x8af [16 bytes]
u32 rfLSSIReadBackPi; //LSSI RF readback data PI mode 0x8b8-8bc for Path A and B u32 rfLSSIReadBackPi; //LSSI RF readback data PI mode 0x8b8-8bc for Path A and B
}BB_REGISTER_DEFINITION_T, *PBB_REGISTER_DEFINITION_T; }BB_REGISTER_DEFINITION_T, *PBB_REGISTER_DEFINITION_T;
@ -276,7 +276,7 @@ int PHY_BBConfig8192C( IN struct adapter *Adapter );
int PHY_RFConfig8192C( IN struct adapter *Adapter ); int PHY_RFConfig8192C( IN struct adapter *Adapter );
/* RF config */ /* RF config */
int rtl8192c_PHY_ConfigRFWithParaFile( IN struct adapter *Adapter, int rtl8192c_PHY_ConfigRFWithParaFile( IN struct adapter *Adapter,
IN u8* pFileName, IN u8* pFileName,
IN RF_RADIO_PATH_E eRFPath); IN RF_RADIO_PATH_E eRFPath);
int rtl8192c_PHY_ConfigRFWithHeaderFile( IN struct adapter * Adapter, int rtl8192c_PHY_ConfigRFWithHeaderFile( IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath); IN RF_RADIO_PATH_E eRFPath);
@ -298,7 +298,7 @@ void rtl8192c_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter );
// BB TX Power R/W // BB TX Power R/W
// //
void PHY_GetTxPowerLevel8192C( IN struct adapter * Adapter, void PHY_GetTxPowerLevel8192C( IN struct adapter * Adapter,
OUT u32* powerlevel ); OUT u32* powerlevel );
void PHY_SetTxPowerLevel8192C( IN struct adapter * Adapter, void PHY_SetTxPowerLevel8192C( IN struct adapter * Adapter,
IN u8 channel ); IN u8 channel );
BOOLEAN PHY_UpdateTxPowerDbm8192C( IN struct adapter *Adapter, BOOLEAN PHY_UpdateTxPowerDbm8192C( IN struct adapter *Adapter,
@ -393,4 +393,3 @@ extern void PHY_Reconfig_To_1T1R(struct adapter *padapter);
#define PHY_QueryMacReg PHY_QueryBBReg #define PHY_QueryMacReg PHY_QueryBBReg
#endif // __INC_HAL8192CPHYCFG_H #endif // __INC_HAL8192CPHYCFG_H

331
include/Hal8192CPhyReg.h
View file

@ -35,7 +35,7 @@
* *
* History: * History:
* Data Who Remark * Data Who Remark
* 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h. * 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h.
* 2. Reorganize code architecture. * 2. Reorganize code architecture.
* 09/25/2008 MH 1. Add RL6052 register definition * 09/25/2008 MH 1. Add RL6052 register definition
* *
@ -179,8 +179,8 @@
#define rCCK0_AFESetting 0xa04 // Disable init gain now // Select RX path by RSSI #define rCCK0_AFESetting 0xa04 // Disable init gain now // Select RX path by RSSI
#define rCCK0_CCA 0xa08 // Disable init gain now // Init gain #define rCCK0_CCA 0xa08 // Disable init gain now // Init gain
#define rCCK0_RxAGC1 0xa0c //AGC default value, saturation level // Antenna Diversity, RX AGC, LNA Threshold, RX LNA Threshold useless now. Not the same as 90 series #define rCCK0_RxAGC1 0xa0c //AGC default value, saturation level // Antenna Diversity, RX AGC, LNA Threshold, RX LNA Threshold useless now. Not the same as 90 series
#define rCCK0_RxAGC2 0xa10 //AGC & DAGC #define rCCK0_RxAGC2 0xa10 //AGC & DAGC
#define rCCK0_RxHP 0xa14 #define rCCK0_RxHP 0xa14
@ -191,20 +191,20 @@
#define rCCK0_TxFilter2 0xa24 #define rCCK0_TxFilter2 0xa24
#define rCCK0_DebugPort 0xa28 //debug port and Tx filter3 #define rCCK0_DebugPort 0xa28 //debug port and Tx filter3
#define rCCK0_FalseAlarmReport 0xa2c //0xa2d useless now 0xa30-a4f channel report #define rCCK0_FalseAlarmReport 0xa2c //0xa2d useless now 0xa30-a4f channel report
#define rCCK0_TRSSIReport 0xa50 #define rCCK0_TRSSIReport 0xa50
#define rCCK0_RxReport 0xa54 //0xa57 #define rCCK0_RxReport 0xa54 //0xa57
#define rCCK0_FACounterLower 0xa5c //0xa5b #define rCCK0_FACounterLower 0xa5c //0xa5b
#define rCCK0_FACounterUpper 0xa58 //0xa5c #define rCCK0_FACounterUpper 0xa58 //0xa5c
// //
// PageB(0xB00) // PageB(0xB00)
// //
#define rPdp_AntA 0xb00 #define rPdp_AntA 0xb00
#define rPdp_AntA_4 0xb04 #define rPdp_AntA_4 0xb04
#define rConfig_Pmpd_AntA 0xb28 #define rConfig_Pmpd_AntA 0xb28
#define rConfig_AntA 0xb68 #define rConfig_AntA 0xb68
#define rConfig_AntB 0xb6c #define rConfig_AntB 0xb6c
#define rPdp_AntB 0xb70 #define rPdp_AntB 0xb70
#define rPdp_AntB_4 0xb74 #define rPdp_AntB_4 0xb74
#define rConfig_Pmpd_AntB 0xb98 #define rConfig_Pmpd_AntB 0xb98
#define rAPK 0xbd8 #define rAPK 0xbd8
@ -218,13 +218,13 @@
#define rOFDM0_TRSWIsolation 0xc0c #define rOFDM0_TRSWIsolation 0xc0c
#define rOFDM0_XARxAFE 0xc10 //RxIQ DC offset, Rx digital filter, DC notch filter #define rOFDM0_XARxAFE 0xc10 //RxIQ DC offset, Rx digital filter, DC notch filter
#define rOFDM0_XARxIQImbalance 0xc14 //RxIQ imblance matrix #define rOFDM0_XARxIQImbalance 0xc14 //RxIQ imblance matrix
#define rOFDM0_XBRxAFE 0xc18 #define rOFDM0_XBRxAFE 0xc18
#define rOFDM0_XBRxIQImbalance 0xc1c #define rOFDM0_XBRxIQImbalance 0xc1c
#define rOFDM0_XCRxAFE 0xc20 #define rOFDM0_XCRxAFE 0xc20
#define rOFDM0_XCRxIQImbalance 0xc24 #define rOFDM0_XCRxIQImbalance 0xc24
#define rOFDM0_XDRxAFE 0xc28 #define rOFDM0_XDRxAFE 0xc28
#define rOFDM0_XDRxIQImbalance 0xc2c #define rOFDM0_XDRxIQImbalance 0xc2c
#define rOFDM0_RxDetector1 0xc30 //PD,BW & SBD // DM tune init gain #define rOFDM0_RxDetector1 0xc30 //PD,BW & SBD // DM tune init gain
#define rOFDM0_RxDetector2 0xc34 //SBD & Fame Sync. #define rOFDM0_RxDetector2 0xc34 //SBD & Fame Sync.
@ -255,7 +255,7 @@
#define rOFDM0_XBTxIQImbalance 0xc88 #define rOFDM0_XBTxIQImbalance 0xc88
#define rOFDM0_XBTxAFE 0xc8c #define rOFDM0_XBTxAFE 0xc8c
#define rOFDM0_XCTxIQImbalance 0xc90 #define rOFDM0_XCTxIQImbalance 0xc90
#define rOFDM0_XCTxAFE 0xc94 #define rOFDM0_XCTxAFE 0xc94
#define rOFDM0_XDTxIQImbalance 0xc98 #define rOFDM0_XDTxIQImbalance 0xc98
#define rOFDM0_XDTxAFE 0xc9c #define rOFDM0_XDTxAFE 0xc9c
@ -298,8 +298,8 @@
#define rOFDM_LongCFOCD 0xdb8 #define rOFDM_LongCFOCD 0xdb8
#define rOFDM_TailCFOAB 0xdbc #define rOFDM_TailCFOAB 0xdbc
#define rOFDM_TailCFOCD 0xdc0 #define rOFDM_TailCFOCD 0xdc0
#define rOFDM_PWMeasure1 0xdc4 #define rOFDM_PWMeasure1 0xdc4
#define rOFDM_PWMeasure2 0xdc8 #define rOFDM_PWMeasure2 0xdc8
#define rOFDM_BWReport 0xdcc #define rOFDM_BWReport 0xdcc
#define rOFDM_AGCReport 0xdd0 #define rOFDM_AGCReport 0xdd0
#define rOFDM_RxSNR 0xdd4 #define rOFDM_RxSNR 0xdd4
@ -324,7 +324,7 @@
#define rTx_IQK_PI_A 0xe38 #define rTx_IQK_PI_A 0xe38
#define rRx_IQK_PI_A 0xe3c #define rRx_IQK_PI_A 0xe3c
#define rTx_IQK 0xe40 #define rTx_IQK 0xe40
#define rRx_IQK 0xe44 #define rRx_IQK 0xe44
#define rIQK_AGC_Pts 0xe48 #define rIQK_AGC_Pts 0xe48
#define rIQK_AGC_Rsp 0xe4c #define rIQK_AGC_Rsp 0xe4c
@ -361,10 +361,10 @@
#define rRx_Power_After_IQK_B_2 0xecc #define rRx_Power_After_IQK_B_2 0xecc
#define rRx_OFDM 0xed0 #define rRx_OFDM 0xed0
#define rRx_Wait_RIFS 0xed4 #define rRx_Wait_RIFS 0xed4
#define rRx_TO_Rx 0xed8 #define rRx_TO_Rx 0xed8
#define rStandby 0xedc #define rStandby 0xedc
#define rSleep 0xee0 #define rSleep 0xee0
#define rPMPD_ANAEN 0xeec #define rPMPD_ANAEN 0xeec
// //
@ -513,7 +513,7 @@
#define bCCKTxStatus 0x1 #define bCCKTxStatus 0x1
#define bOFDMTxStatus 0x2 #define bOFDMTxStatus 0x2
#define IS_BB_REG_OFFSET_92S(_Offset) ((_Offset >= 0x800) && (_Offset <= 0xfff)) #define IS_BB_REG_OFFSET_92S(_Offset) ((_Offset >= 0x800) && (_Offset <= 0xfff))
// 2. Page8(0x800) // 2. Page8(0x800)
#define bRFMOD 0x1 // Reg 0x800 rFPGA0_RFMOD #define bRFMOD 0x1 // Reg 0x800 rFPGA0_RFMOD
@ -522,157 +522,157 @@
#define bCCKEn 0x1000000 #define bCCKEn 0x1000000
#define bOFDMEn 0x2000000 #define bOFDMEn 0x2000000
#define bOFDMRxADCPhase 0x10000 // Useless now #define bOFDMRxADCPhase 0x10000 // Useless now
#define bOFDMTxDACPhase 0x40000 #define bOFDMTxDACPhase 0x40000
#define bXATxAGC 0x3f #define bXATxAGC 0x3f
#define bAntennaSelect 0x0300 #define bAntennaSelect 0x0300
#define bXBTxAGC 0xf00 // Reg 80c rFPGA0_TxGainStage #define bXBTxAGC 0xf00 // Reg 80c rFPGA0_TxGainStage
#define bXCTxAGC 0xf000 #define bXCTxAGC 0xf000
#define bXDTxAGC 0xf0000 #define bXDTxAGC 0xf0000
#define bPAStart 0xf0000000 // Useless now #define bPAStart 0xf0000000 // Useless now
#define bTRStart 0x00f00000 #define bTRStart 0x00f00000
#define bRFStart 0x0000f000 #define bRFStart 0x0000f000
#define bBBStart 0x000000f0 #define bBBStart 0x000000f0
#define bBBCCKStart 0x0000000f #define bBBCCKStart 0x0000000f
#define bPAEnd 0xf //Reg0x814 #define bPAEnd 0xf //Reg0x814
#define bTREnd 0x0f000000 #define bTREnd 0x0f000000
#define bRFEnd 0x000f0000 #define bRFEnd 0x000f0000
#define bCCAMask 0x000000f0 //T2R #define bCCAMask 0x000000f0 //T2R
#define bR2RCCAMask 0x00000f00 #define bR2RCCAMask 0x00000f00
#define bHSSI_R2TDelay 0xf8000000 #define bHSSI_R2TDelay 0xf8000000
#define bHSSI_T2RDelay 0xf80000 #define bHSSI_T2RDelay 0xf80000
#define bContTxHSSI 0x400 //chane gain at continue Tx #define bContTxHSSI 0x400 //chane gain at continue Tx
#define bIGFromCCK 0x200 #define bIGFromCCK 0x200
#define bAGCAddress 0x3f #define bAGCAddress 0x3f
#define bRxHPTx 0x7000 #define bRxHPTx 0x7000
#define bRxHPT2R 0x38000 #define bRxHPT2R 0x38000
#define bRxHPCCKIni 0xc0000 #define bRxHPCCKIni 0xc0000
#define bAGCTxCode 0xc00000 #define bAGCTxCode 0xc00000
#define bAGCRxCode 0x300000 #define bAGCRxCode 0x300000
#define b3WireDataLength 0x800 // Reg 0x820~84f rFPGA0_XA_HSSIParameter1 #define b3WireDataLength 0x800 // Reg 0x820~84f rFPGA0_XA_HSSIParameter1
#define b3WireAddressLength 0x400 #define b3WireAddressLength 0x400
#define b3WireRFPowerDown 0x1 // Useless now #define b3WireRFPowerDown 0x1 // Useless now
//#define bHWSISelect 0x8 //#define bHWSISelect 0x8
#define b5GPAPEPolarity 0x40000000 #define b5GPAPEPolarity 0x40000000
#define b2GPAPEPolarity 0x80000000 #define b2GPAPEPolarity 0x80000000
#define bRFSW_TxDefaultAnt 0x3 #define bRFSW_TxDefaultAnt 0x3
#define bRFSW_TxOptionAnt 0x30 #define bRFSW_TxOptionAnt 0x30
#define bRFSW_RxDefaultAnt 0x300 #define bRFSW_RxDefaultAnt 0x300
#define bRFSW_RxOptionAnt 0x3000 #define bRFSW_RxOptionAnt 0x3000
#define bRFSI_3WireData 0x1 #define bRFSI_3WireData 0x1
#define bRFSI_3WireClock 0x2 #define bRFSI_3WireClock 0x2
#define bRFSI_3WireLoad 0x4 #define bRFSI_3WireLoad 0x4
#define bRFSI_3WireRW 0x8 #define bRFSI_3WireRW 0x8
#define bRFSI_3Wire 0xf #define bRFSI_3Wire 0xf
#define bRFSI_RFENV 0x10 // Reg 0x870 rFPGA0_XAB_RFInterfaceSW #define bRFSI_RFENV 0x10 // Reg 0x870 rFPGA0_XAB_RFInterfaceSW
#define bRFSI_TRSW 0x20 // Useless now #define bRFSI_TRSW 0x20 // Useless now
#define bRFSI_TRSWB 0x40 #define bRFSI_TRSWB 0x40
#define bRFSI_ANTSW 0x100 #define bRFSI_ANTSW 0x100
#define bRFSI_ANTSWB 0x200 #define bRFSI_ANTSWB 0x200
#define bRFSI_PAPE 0x400 #define bRFSI_PAPE 0x400
#define bRFSI_PAPE5G 0x800 #define bRFSI_PAPE5G 0x800
#define bBandSelect 0x1 #define bBandSelect 0x1
#define bHTSIG2_GI 0x80 #define bHTSIG2_GI 0x80
#define bHTSIG2_Smoothing 0x01 #define bHTSIG2_Smoothing 0x01
#define bHTSIG2_Sounding 0x02 #define bHTSIG2_Sounding 0x02
#define bHTSIG2_Aggreaton 0x08 #define bHTSIG2_Aggreaton 0x08
#define bHTSIG2_STBC 0x30 #define bHTSIG2_STBC 0x30
#define bHTSIG2_AdvCoding 0x40 #define bHTSIG2_AdvCoding 0x40
#define bHTSIG2_NumOfHTLTF 0x300 #define bHTSIG2_NumOfHTLTF 0x300
#define bHTSIG2_CRC8 0x3fc #define bHTSIG2_CRC8 0x3fc
#define bHTSIG1_MCS 0x7f #define bHTSIG1_MCS 0x7f
#define bHTSIG1_BandWidth 0x80 #define bHTSIG1_BandWidth 0x80
#define bHTSIG1_HTLength 0xffff #define bHTSIG1_HTLength 0xffff
#define bLSIG_Rate 0xf #define bLSIG_Rate 0xf
#define bLSIG_Reserved 0x10 #define bLSIG_Reserved 0x10
#define bLSIG_Length 0x1fffe #define bLSIG_Length 0x1fffe
#define bLSIG_Parity 0x20 #define bLSIG_Parity 0x20
#define bCCKRxPhase 0x4 #define bCCKRxPhase 0x4
#define bLSSIReadAddress 0x7f800000 // T65 RF #define bLSSIReadAddress 0x7f800000 // T65 RF
#define bLSSIReadEdge 0x80000000 //LSSI "Read" edge signal #define bLSSIReadEdge 0x80000000 //LSSI "Read" edge signal
#define bLSSIReadBackData 0xfffff // T65 RF #define bLSSIReadBackData 0xfffff // T65 RF
#define bLSSIReadOKFlag 0x1000 // Useless now #define bLSSIReadOKFlag 0x1000 // Useless now
#define bCCKSampleRate 0x8 //0: 44MHz, 1:88MHz #define bCCKSampleRate 0x8 //0: 44MHz, 1:88MHz
#define bRegulator0Standby 0x1 #define bRegulator0Standby 0x1
#define bRegulatorPLLStandby 0x2 #define bRegulatorPLLStandby 0x2
#define bRegulator1Standby 0x4 #define bRegulator1Standby 0x4
#define bPLLPowerUp 0x8 #define bPLLPowerUp 0x8
#define bDPLLPowerUp 0x10 #define bDPLLPowerUp 0x10
#define bDA10PowerUp 0x20 #define bDA10PowerUp 0x20
#define bAD7PowerUp 0x200 #define bAD7PowerUp 0x200
#define bDA6PowerUp 0x2000 #define bDA6PowerUp 0x2000
#define bXtalPowerUp 0x4000 #define bXtalPowerUp 0x4000
#define b40MDClkPowerUP 0x8000 #define b40MDClkPowerUP 0x8000
#define bDA6DebugMode 0x20000 #define bDA6DebugMode 0x20000
#define bDA6Swing 0x380000 #define bDA6Swing 0x380000
#define bADClkPhase 0x4000000 // Reg 0x880 rFPGA0_AnalogParameter1 20/40 CCK support switch 40/80 BB MHZ #define bADClkPhase 0x4000000 // Reg 0x880 rFPGA0_AnalogParameter1 20/40 CCK support switch 40/80 BB MHZ
#define b80MClkDelay 0x18000000 // Useless #define b80MClkDelay 0x18000000 // Useless
#define bAFEWatchDogEnable 0x20000000 #define bAFEWatchDogEnable 0x20000000
#define bXtalCap01 0xc0000000 // Reg 0x884 rFPGA0_AnalogParameter2 Crystal cap #define bXtalCap01 0xc0000000 // Reg 0x884 rFPGA0_AnalogParameter2 Crystal cap
#define bXtalCap23 0x3 #define bXtalCap23 0x3
#define bXtalCap92x 0x0f000000 #define bXtalCap92x 0x0f000000
#define bXtalCap 0x0f000000 #define bXtalCap 0x0f000000
#define bIntDifClkEnable 0x400 // Useless #define bIntDifClkEnable 0x400 // Useless
#define bExtSigClkEnable 0x800 #define bExtSigClkEnable 0x800
#define bBandgapMbiasPowerUp 0x10000 #define bBandgapMbiasPowerUp 0x10000
#define bAD11SHGain 0xc0000 #define bAD11SHGain 0xc0000
#define bAD11InputRange 0x700000 #define bAD11InputRange 0x700000
#define bAD11OPCurrent 0x3800000 #define bAD11OPCurrent 0x3800000
#define bIPathLoopback 0x4000000 #define bIPathLoopback 0x4000000
#define bQPathLoopback 0x8000000 #define bQPathLoopback 0x8000000
#define bAFELoopback 0x10000000 #define bAFELoopback 0x10000000
#define bDA10Swing 0x7e0 #define bDA10Swing 0x7e0
#define bDA10Reverse 0x800 #define bDA10Reverse 0x800
#define bDAClkSource 0x1000 #define bDAClkSource 0x1000
#define bAD7InputRange 0x6000 #define bAD7InputRange 0x6000
#define bAD7Gain 0x38000 #define bAD7Gain 0x38000
#define bAD7OutputCMMode 0x40000 #define bAD7OutputCMMode 0x40000
#define bAD7InputCMMode 0x380000 #define bAD7InputCMMode 0x380000
#define bAD7Current 0xc00000 #define bAD7Current 0xc00000
#define bRegulatorAdjust 0x7000000 #define bRegulatorAdjust 0x7000000
#define bAD11PowerUpAtTx 0x1 #define bAD11PowerUpAtTx 0x1
#define bDA10PSAtTx 0x10 #define bDA10PSAtTx 0x10
#define bAD11PowerUpAtRx 0x100 #define bAD11PowerUpAtRx 0x100
#define bDA10PSAtRx 0x1000 #define bDA10PSAtRx 0x1000
#define bCCKRxAGCFormat 0x200 #define bCCKRxAGCFormat 0x200
#define bPSDFFTSamplepPoint 0xc000 #define bPSDFFTSamplepPoint 0xc000
#define bPSDAverageNum 0x3000 #define bPSDAverageNum 0x3000
#define bIQPathControl 0xc00 #define bIQPathControl 0xc00
#define bPSDFreq 0x3ff #define bPSDFreq 0x3ff
#define bPSDAntennaPath 0x30 #define bPSDAntennaPath 0x30
#define bPSDIQSwitch 0x40 #define bPSDIQSwitch 0x40
#define bPSDRxTrigger 0x400000 #define bPSDRxTrigger 0x400000
#define bPSDTxTrigger 0x80000000 #define bPSDTxTrigger 0x80000000
#define bPSDSineToneScale 0x7f000000 #define bPSDSineToneScale 0x7f000000
#define bPSDReport 0xffff #define bPSDReport 0xffff
// 3. Page9(0x900) // 3. Page9(0x900)
#define bOFDMTxSC 0x30000000 // Useless #define bOFDMTxSC 0x30000000 // Useless
#define bCCKTxOn 0x1 #define bCCKTxOn 0x1
#define bOFDMTxOn 0x2 #define bOFDMTxOn 0x2
#define bDebugPage 0xfff //reset debug page and also HWord, LWord #define bDebugPage 0xfff //reset debug page and also HWord, LWord
#define bDebugItem 0xff //reset debug page and LWord #define bDebugItem 0xff //reset debug page and LWord
#define bAntL 0x10 #define bAntL 0x10
#define bAntNonHT 0x100 #define bAntNonHT 0x100
#define bAntHT1 0x1000 #define bAntHT1 0x1000
#define bAntHT2 0x10000 #define bAntHT2 0x10000
#define bAntHT1S1 0x100000 #define bAntHT1S1 0x100000
#define bAntNonHTS1 0x1000000 #define bAntNonHTS1 0x1000000
// 4. PageA(0xA00) // 4. PageA(0xA00)
#define bCCKBBMode 0x3 // Useless #define bCCKBBMode 0x3 // Useless
@ -716,7 +716,7 @@
#define bCCKRxAGCSatCount 0xe0 #define bCCKRxAGCSatCount 0xe0
#define bCCKRxRFSettle 0x1f //AGCsamp_dly #define bCCKRxRFSettle 0x1f //AGCsamp_dly
#define bCCKFixedRxAGC 0x8000 #define bCCKFixedRxAGC 0x8000
//#define bCCKRxAGCFormat 0x4000 //remove to HSSI register 0x824 //#define bCCKRxAGCFormat 0x4000 //remove to HSSI register 0x824
#define bCCKAntennaPolarity 0x2000 #define bCCKAntennaPolarity 0x2000
#define bCCKTxFilterType 0x0c00 #define bCCKTxFilterType 0x0c00
#define bCCKRxAGCReportType 0x0300 #define bCCKRxAGCReportType 0x0300
@ -1077,7 +1077,7 @@
//for PutRFRegsetting & GetRFRegSetting BitMask //for PutRFRegsetting & GetRFRegSetting BitMask
//#define bMask12Bits 0xfffff // RF Reg mask bits //#define bMask12Bits 0xfffff // RF Reg mask bits
//#define bMask20Bits 0xfffff // RF Reg mask bits T65 RF //#define bMask20Bits 0xfffff // RF Reg mask bits T65 RF
#define bRFRegOffsetMask 0xfffff #define bRFRegOffsetMask 0xfffff
#define bEnable 0x1 // Useless #define bEnable 0x1 // Useless
#define bDisable 0x0 #define bDisable 0x0
@ -1120,4 +1120,3 @@
#endif //__INC_HAL8192SPHYREG_H #endif //__INC_HAL8192SPHYREG_H

31
include/Hal8192DPhyCfg.h
View file

@ -31,7 +31,7 @@
* *
* History: * History:
* Data Who Remark * Data Who Remark
* 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h. * 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h.
* 2. Reorganize code architecture. * 2. Reorganize code architecture.
* *
*****************************************************************************/ *****************************************************************************/
@ -180,7 +180,7 @@ typedef enum _MACPHY_MODE_CHANGE_ACTION{
}MACPHY_MODE_CHANGE_ACTION,*PMACPHY_MODE_CHANGE_ACTION; }MACPHY_MODE_CHANGE_ACTION,*PMACPHY_MODE_CHANGE_ACTION;
typedef enum _BAND_TYPE{ typedef enum _BAND_TYPE{
BAND_ON_2_4G = 1, BAND_ON_2_4G = 1,
BAND_ON_5G = 2, BAND_ON_5G = 2,
BAND_ON_BOTH, BAND_ON_BOTH,
BANDMAX BANDMAX
@ -218,10 +218,10 @@ typedef struct _BB_REGISTER_DEFINITION{
u32 rfintfi; // readback data: u32 rfintfi; // readback data:
// 0x8e0~0x8e7[8 bytes] // 0x8e0~0x8e7[8 bytes]
u32 rfintfo; // output data: u32 rfintfo; // output data:
// 0x860~0x86f [16 bytes] // 0x860~0x86f [16 bytes]
u32 rfintfe; // output enable: u32 rfintfe; // output enable:
// 0x860~0x86f [16 bytes] // 0x860~0x86f [16 bytes]
u32 rf3wireOffset; // LSSI data: u32 rf3wireOffset; // LSSI data:
@ -233,37 +233,37 @@ typedef struct _BB_REGISTER_DEFINITION{
u32 rfTxGainStage; // Tx gain stage: u32 rfTxGainStage; // Tx gain stage:
// 0x80c~0x80f [4 bytes] // 0x80c~0x80f [4 bytes]
u32 rfHSSIPara1; // wire parameter control1 : u32 rfHSSIPara1; // wire parameter control1 :
// 0x820~0x823,0x828~0x82b, 0x830~0x833, 0x838~0x83b [16 bytes] // 0x820~0x823,0x828~0x82b, 0x830~0x833, 0x838~0x83b [16 bytes]
u32 rfHSSIPara2; // wire parameter control2 : u32 rfHSSIPara2; // wire parameter control2 :
// 0x824~0x827,0x82c~0x82f, 0x834~0x837, 0x83c~0x83f [16 bytes] // 0x824~0x827,0x82c~0x82f, 0x834~0x837, 0x83c~0x83f [16 bytes]
u32 rfSwitchControl; //Tx Rx antenna control : u32 rfSwitchControl; //Tx Rx antenna control :
// 0x858~0x85f [16 bytes] // 0x858~0x85f [16 bytes]
u32 rfAGCControl1; //AGC parameter control1 : u32 rfAGCControl1; //AGC parameter control1 :
// 0xc50~0xc53,0xc58~0xc5b, 0xc60~0xc63, 0xc68~0xc6b [16 bytes] // 0xc50~0xc53,0xc58~0xc5b, 0xc60~0xc63, 0xc68~0xc6b [16 bytes]
u32 rfAGCControl2; //AGC parameter control2 : u32 rfAGCControl2; //AGC parameter control2 :
// 0xc54~0xc57,0xc5c~0xc5f, 0xc64~0xc67, 0xc6c~0xc6f [16 bytes] // 0xc54~0xc57,0xc5c~0xc5f, 0xc64~0xc67, 0xc6c~0xc6f [16 bytes]
u32 rfRxIQImbalance; //OFDM Rx IQ imbalance matrix : u32 rfRxIQImbalance; //OFDM Rx IQ imbalance matrix :
// 0xc14~0xc17,0xc1c~0xc1f, 0xc24~0xc27, 0xc2c~0xc2f [16 bytes] // 0xc14~0xc17,0xc1c~0xc1f, 0xc24~0xc27, 0xc2c~0xc2f [16 bytes]
u32 rfRxAFE; //Rx IQ DC ofset and Rx digital filter, Rx DC notch filter : u32 rfRxAFE; //Rx IQ DC ofset and Rx digital filter, Rx DC notch filter :
// 0xc10~0xc13,0xc18~0xc1b, 0xc20~0xc23, 0xc28~0xc2b [16 bytes] // 0xc10~0xc13,0xc18~0xc1b, 0xc20~0xc23, 0xc28~0xc2b [16 bytes]
u32 rfTxIQImbalance; //OFDM Tx IQ imbalance matrix u32 rfTxIQImbalance; //OFDM Tx IQ imbalance matrix
// 0xc80~0xc83,0xc88~0xc8b, 0xc90~0xc93, 0xc98~0xc9b [16 bytes] // 0xc80~0xc83,0xc88~0xc8b, 0xc90~0xc93, 0xc98~0xc9b [16 bytes]
u32 rfTxAFE; //Tx IQ DC Offset and Tx DFIR type u32 rfTxAFE; //Tx IQ DC Offset and Tx DFIR type
// 0xc84~0xc87,0xc8c~0xc8f, 0xc94~0xc97, 0xc9c~0xc9f [16 bytes] // 0xc84~0xc87,0xc8c~0xc8f, 0xc94~0xc97, 0xc9c~0xc9f [16 bytes]
u32 rfLSSIReadBack; //LSSI RF readback data SI mode u32 rfLSSIReadBack; //LSSI RF readback data SI mode
// 0x8a0~0x8af [16 bytes] // 0x8a0~0x8af [16 bytes]
u32 rfLSSIReadBackPi; //LSSI RF readback data PI mode 0x8b8-8bc for Path A and B u32 rfLSSIReadBackPi; //LSSI RF readback data PI mode 0x8b8-8bc for Path A and B
}BB_REGISTER_DEFINITION_T, *PBB_REGISTER_DEFINITION_T; }BB_REGISTER_DEFINITION_T, *PBB_REGISTER_DEFINITION_T;
@ -329,7 +329,7 @@ extern int PHY_BBConfig8192D( IN struct adapter *Adapter );
extern int PHY_RFConfig8192D( IN struct adapter *Adapter ); extern int PHY_RFConfig8192D( IN struct adapter *Adapter );
/* RF config */ /* RF config */
int rtl8192d_PHY_ConfigRFWithParaFile( IN struct adapter *Adapter, int rtl8192d_PHY_ConfigRFWithParaFile( IN struct adapter *Adapter,
IN u8* pFileName, IN u8* pFileName,
IN RF_RADIO_PATH_E eRFPath); IN RF_RADIO_PATH_E eRFPath);
int rtl8192d_PHY_ConfigRFWithHeaderFile( IN struct adapter * Adapter, int rtl8192d_PHY_ConfigRFWithHeaderFile( IN struct adapter * Adapter,
IN RF_CONTENT Content, IN RF_CONTENT Content,
@ -351,7 +351,7 @@ void rtl8192d_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter );
// BB TX Power R/W // BB TX Power R/W
// //
void PHY_GetTxPowerLevel8192D( IN struct adapter * Adapter, void PHY_GetTxPowerLevel8192D( IN struct adapter * Adapter,
OUT u32* powerlevel ); OUT u32* powerlevel );
void PHY_SetTxPowerLevel8192D( IN struct adapter * Adapter, void PHY_SetTxPowerLevel8192D( IN struct adapter * Adapter,
IN u8 channel ); IN u8 channel );
BOOLEAN PHY_UpdateTxPowerDbm8192D( IN struct adapter *Adapter, BOOLEAN PHY_UpdateTxPowerDbm8192D( IN struct adapter *Adapter,
@ -439,7 +439,7 @@ PHY_UpdateBBRFConfiguration8192D(
VOID PHY_ReadMacPhyMode92D( VOID PHY_ReadMacPhyMode92D(
IN struct adapter *Adapter, IN struct adapter *Adapter,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
); );
VOID PHY_ConfigMacPhyMode92D( VOID PHY_ConfigMacPhyMode92D(
@ -484,4 +484,3 @@ PHY_InitPABias92D(IN struct adapter *Adapter);
#define PHY_QueryMacReg PHY_QueryBBReg #define PHY_QueryMacReg PHY_QueryBBReg
#endif // __INC_HAL8192SPHYCFG_H #endif // __INC_HAL8192SPHYCFG_H

369
include/Hal8192DPhyReg.h
View file

@ -35,7 +35,7 @@
* *
* History: * History:
* Data Who Remark * Data Who Remark
* 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h. * 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h.
* 2. Reorganize code architecture. * 2. Reorganize code architecture.
* 09/25/2008 MH 1. Add RL6052 register definition * 09/25/2008 MH 1. Add RL6052 register definition
* *
@ -170,8 +170,8 @@
#define rCCK0_AFESetting 0xa04 // Disable init gain now // Select RX path by RSSI #define rCCK0_AFESetting 0xa04 // Disable init gain now // Select RX path by RSSI
#define rCCK0_CCA 0xa08 // Disable init gain now // Init gain #define rCCK0_CCA 0xa08 // Disable init gain now // Init gain
#define rCCK0_RxAGC1 0xa0c //AGC default value, saturation level // Antenna Diversity, RX AGC, LNA Threshold, RX LNA Threshold useless now. Not the same as 90 series #define rCCK0_RxAGC1 0xa0c //AGC default value, saturation level // Antenna Diversity, RX AGC, LNA Threshold, RX LNA Threshold useless now. Not the same as 90 series
#define rCCK0_RxAGC2 0xa10 //AGC & DAGC #define rCCK0_RxAGC2 0xa10 //AGC & DAGC
#define rCCK0_RxHP 0xa14 #define rCCK0_RxHP 0xa14
@ -182,44 +182,44 @@
#define rCCK0_TxFilter2 0xa24 #define rCCK0_TxFilter2 0xa24
#define rCCK0_DebugPort 0xa28 //debug port and Tx filter3 #define rCCK0_DebugPort 0xa28 //debug port and Tx filter3
#define rCCK0_FalseAlarmReport 0xa2c //0xa2d useless now 0xa30-a4f channel report #define rCCK0_FalseAlarmReport 0xa2c //0xa2d useless now 0xa30-a4f channel report
#define rCCK0_TRSSIReport 0xa50 #define rCCK0_TRSSIReport 0xa50
#define rCCK0_RxReport 0xa54 //0xa57 #define rCCK0_RxReport 0xa54 //0xa57
#define rCCK0_FACounterLower 0xa5c //0xa5b #define rCCK0_FACounterLower 0xa5c //0xa5b
#define rCCK0_FACounterUpper 0xa58 //0xa5c #define rCCK0_FACounterUpper 0xa58 //0xa5c
// //
// PageB(0xB00) // PageB(0xB00)
// //
#define rPdp_AntA 0xb00 #define rPdp_AntA 0xb00
#define rPdp_AntA_4 0xb04 #define rPdp_AntA_4 0xb04
#define rPdp_AntA_8 0xb08 #define rPdp_AntA_8 0xb08
#define rPdp_AntA_C 0xb0c #define rPdp_AntA_C 0xb0c
#define rPdp_AntA_10 0xb10 #define rPdp_AntA_10 0xb10
#define rPdp_AntA_14 0xb14 #define rPdp_AntA_14 0xb14
#define rPdp_AntA_18 0xb18 #define rPdp_AntA_18 0xb18
#define rPdp_AntA_1C 0xb1c #define rPdp_AntA_1C 0xb1c
#define rPdp_AntA_20 0xb20 #define rPdp_AntA_20 0xb20
#define rPdp_AntA_24 0xb24 #define rPdp_AntA_24 0xb24
#define rConfig_Pmpd_AntA 0xb28 #define rConfig_Pmpd_AntA 0xb28
#define rConfig_ram64x16 0xb2c #define rConfig_ram64x16 0xb2c
#define rBndA 0xb30 #define rBndA 0xb30
#define rHssiPar 0xb34 #define rHssiPar 0xb34
#define rConfig_AntA 0xb68 #define rConfig_AntA 0xb68
#define rConfig_AntB 0xb6c #define rConfig_AntB 0xb6c
#define rPdp_AntB 0xb70 #define rPdp_AntB 0xb70
#define rPdp_AntB_4 0xb74 #define rPdp_AntB_4 0xb74
#define rPdp_AntB_8 0xb78 #define rPdp_AntB_8 0xb78
#define rPdp_AntB_C 0xb7c #define rPdp_AntB_C 0xb7c
#define rPdp_AntB_10 0xb80 #define rPdp_AntB_10 0xb80
#define rPdp_AntB_14 0xb84 #define rPdp_AntB_14 0xb84
#define rPdp_AntB_18 0xb88 #define rPdp_AntB_18 0xb88
#define rPdp_AntB_1C 0xb8c #define rPdp_AntB_1C 0xb8c
#define rPdp_AntB_20 0xb90 #define rPdp_AntB_20 0xb90
#define rPdp_AntB_24 0xb94 #define rPdp_AntB_24 0xb94
#define rConfig_Pmpd_AntB 0xb98 #define rConfig_Pmpd_AntB 0xb98
@ -245,13 +245,13 @@
#define rOFDM0_TRSWIsolation 0xc0c #define rOFDM0_TRSWIsolation 0xc0c
#define rOFDM0_XARxAFE 0xc10 //RxIQ DC offset, Rx digital filter, DC notch filter #define rOFDM0_XARxAFE 0xc10 //RxIQ DC offset, Rx digital filter, DC notch filter
#define rOFDM0_XARxIQImbalance 0xc14 //RxIQ imblance matrix #define rOFDM0_XARxIQImbalance 0xc14 //RxIQ imblance matrix
#define rOFDM0_XBRxAFE 0xc18 #define rOFDM0_XBRxAFE 0xc18
#define rOFDM0_XBRxIQImbalance 0xc1c #define rOFDM0_XBRxIQImbalance 0xc1c
#define rOFDM0_XCRxAFE 0xc20 #define rOFDM0_XCRxAFE 0xc20
#define rOFDM0_XCRxIQImbalance 0xc24 #define rOFDM0_XCRxIQImbalance 0xc24
#define rOFDM0_XDRxAFE 0xc28 #define rOFDM0_XDRxAFE 0xc28
#define rOFDM0_XDRxIQImbalance 0xc2c #define rOFDM0_XDRxIQImbalance 0xc2c
#define rOFDM0_RxDetector1 0xc30 //PD,BW & SBD // DM tune init gain #define rOFDM0_RxDetector1 0xc30 //PD,BW & SBD // DM tune init gain
#define rOFDM0_RxDetector2 0xc34 //SBD & Fame Sync. #define rOFDM0_RxDetector2 0xc34 //SBD & Fame Sync.
@ -282,7 +282,7 @@
#define rOFDM0_XBTxIQImbalance 0xc88 #define rOFDM0_XBTxIQImbalance 0xc88
#define rOFDM0_XBTxAFE 0xc8c #define rOFDM0_XBTxAFE 0xc8c
#define rOFDM0_XCTxIQImbalance 0xc90 #define rOFDM0_XCTxIQImbalance 0xc90
#define rOFDM0_XCTxAFE 0xc94 #define rOFDM0_XCTxAFE 0xc94
#define rOFDM0_XDTxIQImbalance 0xc98 #define rOFDM0_XDTxIQImbalance 0xc98
#define rOFDM0_XDTxAFE 0xc9c #define rOFDM0_XDTxAFE 0xc9c
@ -325,8 +325,8 @@
#define rOFDM_LongCFOCD 0xdb8 #define rOFDM_LongCFOCD 0xdb8
#define rOFDM_TailCFOAB 0xdbc #define rOFDM_TailCFOAB 0xdbc
#define rOFDM_TailCFOCD 0xdc0 #define rOFDM_TailCFOCD 0xdc0
#define rOFDM_PWMeasure1 0xdc4 #define rOFDM_PWMeasure1 0xdc4
#define rOFDM_PWMeasure2 0xdc8 #define rOFDM_PWMeasure2 0xdc8
#define rOFDM_BWReport 0xdcc #define rOFDM_BWReport 0xdcc
#define rOFDM_AGCReport 0xdd0 #define rOFDM_AGCReport 0xdd0
#define rOFDM_RxSNR 0xdd4 #define rOFDM_RxSNR 0xdd4
@ -360,7 +360,7 @@
#define rTx_IQK_PI_A 0xe38 #define rTx_IQK_PI_A 0xe38
#define rRx_IQK_PI_A 0xe3c #define rRx_IQK_PI_A 0xe3c
#define rTx_IQK 0xe40 #define rTx_IQK 0xe40
#define rRx_IQK 0xe44 #define rRx_IQK 0xe44
#define rIQK_AGC_Pts 0xe48 #define rIQK_AGC_Pts 0xe48
#define rIQK_AGC_Rsp 0xe4c #define rIQK_AGC_Rsp 0xe4c
@ -397,10 +397,10 @@
#define rRx_Power_After_IQK_B_2 0xecc #define rRx_Power_After_IQK_B_2 0xecc
#define rRx_OFDM 0xed0 #define rRx_OFDM 0xed0
#define rRx_Wait_RIFS 0xed4 #define rRx_Wait_RIFS 0xed4
#define rRx_TO_Rx 0xed8 #define rRx_TO_Rx 0xed8
#define rStandby 0xedc #define rStandby 0xedc
#define rSleep 0xee0 #define rSleep 0xee0
#define rPMPD_ANAEN 0xeec #define rPMPD_ANAEN 0xeec
// //
@ -556,7 +556,7 @@
#define bCCKTxStatus 0x1 #define bCCKTxStatus 0x1
#define bOFDMTxStatus 0x2 #define bOFDMTxStatus 0x2
#define IS_BB_REG_OFFSET_92S(_Offset) ((_Offset >= 0x800) && (_Offset <= 0xfff)) #define IS_BB_REG_OFFSET_92S(_Offset) ((_Offset >= 0x800) && (_Offset <= 0xfff))
// 2. Page8(0x800) // 2. Page8(0x800)
#define bRFMOD 0x1 // Reg 0x800 rFPGA0_RFMOD #define bRFMOD 0x1 // Reg 0x800 rFPGA0_RFMOD
@ -565,157 +565,157 @@
#define bCCKEn 0x1000000 #define bCCKEn 0x1000000
#define bOFDMEn 0x2000000 #define bOFDMEn 0x2000000
#define bOFDMRxADCPhase 0x10000 // Useless now #define bOFDMRxADCPhase 0x10000 // Useless now
#define bOFDMTxDACPhase 0x40000 #define bOFDMTxDACPhase 0x40000
#define bXATxAGC 0x3f #define bXATxAGC 0x3f
#define bAntennaSelect 0x0300 #define bAntennaSelect 0x0300
#define bXBTxAGC 0xf00 // Reg 80c rFPGA0_TxGainStage #define bXBTxAGC 0xf00 // Reg 80c rFPGA0_TxGainStage
#define bXCTxAGC 0xf000 #define bXCTxAGC 0xf000
#define bXDTxAGC 0xf0000 #define bXDTxAGC 0xf0000
#define bPAStart 0xf0000000 // Useless now #define bPAStart 0xf0000000 // Useless now
#define bTRStart 0x00f00000 #define bTRStart 0x00f00000
#define bRFStart 0x0000f000 #define bRFStart 0x0000f000
#define bBBStart 0x000000f0 #define bBBStart 0x000000f0
#define bBBCCKStart 0x0000000f #define bBBCCKStart 0x0000000f
#define bPAEnd 0xf //Reg0x814 #define bPAEnd 0xf //Reg0x814
#define bTREnd 0x0f000000 #define bTREnd 0x0f000000
#define bRFEnd 0x000f0000 #define bRFEnd 0x000f0000
#define bCCAMask 0x000000f0 //T2R #define bCCAMask 0x000000f0 //T2R
#define bR2RCCAMask 0x00000f00 #define bR2RCCAMask 0x00000f00
#define bHSSI_R2TDelay 0xf8000000 #define bHSSI_R2TDelay 0xf8000000
#define bHSSI_T2RDelay 0xf80000 #define bHSSI_T2RDelay 0xf80000
#define bContTxHSSI 0x400 //chane gain at continue Tx #define bContTxHSSI 0x400 //chane gain at continue Tx
#define bIGFromCCK 0x200 #define bIGFromCCK 0x200
#define bAGCAddress 0x3f #define bAGCAddress 0x3f
#define bRxHPTx 0x7000 #define bRxHPTx 0x7000
#define bRxHPT2R 0x38000 #define bRxHPT2R 0x38000
#define bRxHPCCKIni 0xc0000 #define bRxHPCCKIni 0xc0000
#define bAGCTxCode 0xc00000 #define bAGCTxCode 0xc00000
#define bAGCRxCode 0x300000 #define bAGCRxCode 0x300000
#define b3WireDataLength 0x800 // Reg 0x820~84f rFPGA0_XA_HSSIParameter1 #define b3WireDataLength 0x800 // Reg 0x820~84f rFPGA0_XA_HSSIParameter1
#define b3WireAddressLength 0x400 #define b3WireAddressLength 0x400
#define b3WireRFPowerDown 0x1 // Useless now #define b3WireRFPowerDown 0x1 // Useless now
//#define bHWSISelect 0x8 //#define bHWSISelect 0x8
#define b5GPAPEPolarity 0x40000000 #define b5GPAPEPolarity 0x40000000
#define b2GPAPEPolarity 0x80000000 #define b2GPAPEPolarity 0x80000000
#define bRFSW_TxDefaultAnt 0x3 #define bRFSW_TxDefaultAnt 0x3
#define bRFSW_TxOptionAnt 0x30 #define bRFSW_TxOptionAnt 0x30
#define bRFSW_RxDefaultAnt 0x300 #define bRFSW_RxDefaultAnt 0x300
#define bRFSW_RxOptionAnt 0x3000 #define bRFSW_RxOptionAnt 0x3000
#define bRFSI_3WireData 0x1 #define bRFSI_3WireData 0x1
#define bRFSI_3WireClock 0x2 #define bRFSI_3WireClock 0x2
#define bRFSI_3WireLoad 0x4 #define bRFSI_3WireLoad 0x4
#define bRFSI_3WireRW 0x8 #define bRFSI_3WireRW 0x8
#define bRFSI_3Wire 0xf #define bRFSI_3Wire 0xf
#define bRFSI_RFENV 0x10 // Reg 0x870 rFPGA0_XAB_RFInterfaceSW #define bRFSI_RFENV 0x10 // Reg 0x870 rFPGA0_XAB_RFInterfaceSW
#define bRFSI_TRSW 0x20 // Useless now #define bRFSI_TRSW 0x20 // Useless now
#define bRFSI_TRSWB 0x40 #define bRFSI_TRSWB 0x40
#define bRFSI_ANTSW 0x100 #define bRFSI_ANTSW 0x100
#define bRFSI_ANTSWB 0x200 #define bRFSI_ANTSWB 0x200
#define bRFSI_PAPE 0x400 #define bRFSI_PAPE 0x400
#define bRFSI_PAPE5G 0x800 #define bRFSI_PAPE5G 0x800
#define bBandSelect 0x1 #define bBandSelect 0x1
#define bHTSIG2_GI 0x80 #define bHTSIG2_GI 0x80
#define bHTSIG2_Smoothing 0x01 #define bHTSIG2_Smoothing 0x01
#define bHTSIG2_Sounding 0x02 #define bHTSIG2_Sounding 0x02
#define bHTSIG2_Aggreaton 0x08 #define bHTSIG2_Aggreaton 0x08
#define bHTSIG2_STBC 0x30 #define bHTSIG2_STBC 0x30
#define bHTSIG2_AdvCoding 0x40 #define bHTSIG2_AdvCoding 0x40
#define bHTSIG2_NumOfHTLTF 0x300 #define bHTSIG2_NumOfHTLTF 0x300
#define bHTSIG2_CRC8 0x3fc #define bHTSIG2_CRC8 0x3fc
#define bHTSIG1_MCS 0x7f #define bHTSIG1_MCS 0x7f
#define bHTSIG1_BandWidth 0x80 #define bHTSIG1_BandWidth 0x80
#define bHTSIG1_HTLength 0xffff #define bHTSIG1_HTLength 0xffff
#define bLSIG_Rate 0xf #define bLSIG_Rate 0xf
#define bLSIG_Reserved 0x10 #define bLSIG_Reserved 0x10
#define bLSIG_Length 0x1fffe #define bLSIG_Length 0x1fffe
#define bLSIG_Parity 0x20 #define bLSIG_Parity 0x20
#define bCCKRxPhase 0x4 #define bCCKRxPhase 0x4
#define bLSSIReadAddress 0x7f800000 // T65 RF #define bLSSIReadAddress 0x7f800000 // T65 RF
#define bLSSIReadEdge 0x80000000 //LSSI "Read" edge signal #define bLSSIReadEdge 0x80000000 //LSSI "Read" edge signal
#define bLSSIReadBackData 0xfffff // T65 RF #define bLSSIReadBackData 0xfffff // T65 RF
#define bLSSIReadOKFlag 0x1000 // Useless now #define bLSSIReadOKFlag 0x1000 // Useless now
#define bCCKSampleRate 0x8 //0: 44MHz, 1:88MHz #define bCCKSampleRate 0x8 //0: 44MHz, 1:88MHz
#define bRegulator0Standby 0x1 #define bRegulator0Standby 0x1
#define bRegulatorPLLStandby 0x2 #define bRegulatorPLLStandby 0x2
#define bRegulator1Standby 0x4 #define bRegulator1Standby 0x4
#define bPLLPowerUp 0x8 #define bPLLPowerUp 0x8
#define bDPLLPowerUp 0x10 #define bDPLLPowerUp 0x10
#define bDA10PowerUp 0x20 #define bDA10PowerUp 0x20
#define bAD7PowerUp 0x200 #define bAD7PowerUp 0x200
#define bDA6PowerUp 0x2000 #define bDA6PowerUp 0x2000
#define bXtalPowerUp 0x4000 #define bXtalPowerUp 0x4000
#define b40MDClkPowerUP 0x8000 #define b40MDClkPowerUP 0x8000
#define bDA6DebugMode 0x20000 #define bDA6DebugMode 0x20000
#define bDA6Swing 0x380000 #define bDA6Swing 0x380000
#define bADClkPhase 0x4000000 // Reg 0x880 rFPGA0_AnalogParameter1 20/40 CCK support switch 40/80 BB MHZ #define bADClkPhase 0x4000000 // Reg 0x880 rFPGA0_AnalogParameter1 20/40 CCK support switch 40/80 BB MHZ
#define b80MClkDelay 0x18000000 // Useless #define b80MClkDelay 0x18000000 // Useless
#define bAFEWatchDogEnable 0x20000000 #define bAFEWatchDogEnable 0x20000000
#define bXtalCap01 0xc0000000 // Reg 0x884 rFPGA0_AnalogParameter2 Crystal cap #define bXtalCap01 0xc0000000 // Reg 0x884 rFPGA0_AnalogParameter2 Crystal cap
#define bXtalCap23 0x3 #define bXtalCap23 0x3
#define bXtalCap92x 0x0f000000 #define bXtalCap92x 0x0f000000
#define bXtalCap 0x0f000000 #define bXtalCap 0x0f000000
#define bIntDifClkEnable 0x400 // Useless #define bIntDifClkEnable 0x400 // Useless
#define bExtSigClkEnable 0x800 #define bExtSigClkEnable 0x800
#define bBandgapMbiasPowerUp 0x10000 #define bBandgapMbiasPowerUp 0x10000
#define bAD11SHGain 0xc0000 #define bAD11SHGain 0xc0000
#define bAD11InputRange 0x700000 #define bAD11InputRange 0x700000
#define bAD11OPCurrent 0x3800000 #define bAD11OPCurrent 0x3800000
#define bIPathLoopback 0x4000000 #define bIPathLoopback 0x4000000
#define bQPathLoopback 0x8000000 #define bQPathLoopback 0x8000000
#define bAFELoopback 0x10000000 #define bAFELoopback 0x10000000
#define bDA10Swing 0x7e0 #define bDA10Swing 0x7e0
#define bDA10Reverse 0x800 #define bDA10Reverse 0x800
#define bDAClkSource 0x1000 #define bDAClkSource 0x1000
#define bAD7InputRange 0x6000 #define bAD7InputRange 0x6000
#define bAD7Gain 0x38000 #define bAD7Gain 0x38000
#define bAD7OutputCMMode 0x40000 #define bAD7OutputCMMode 0x40000
#define bAD7InputCMMode 0x380000 #define bAD7InputCMMode 0x380000
#define bAD7Current 0xc00000 #define bAD7Current 0xc00000
#define bRegulatorAdjust 0x7000000 #define bRegulatorAdjust 0x7000000
#define bAD11PowerUpAtTx 0x1 #define bAD11PowerUpAtTx 0x1
#define bDA10PSAtTx 0x10 #define bDA10PSAtTx 0x10
#define bAD11PowerUpAtRx 0x100 #define bAD11PowerUpAtRx 0x100
#define bDA10PSAtRx 0x1000 #define bDA10PSAtRx 0x1000
#define bCCKRxAGCFormat 0x200 #define bCCKRxAGCFormat 0x200
#define bPSDFFTSamplepPoint 0xc000 #define bPSDFFTSamplepPoint 0xc000
#define bPSDAverageNum 0x3000 #define bPSDAverageNum 0x3000
#define bIQPathControl 0xc00 #define bIQPathControl 0xc00
#define bPSDFreq 0x3ff #define bPSDFreq 0x3ff
#define bPSDAntennaPath 0x30 #define bPSDAntennaPath 0x30
#define bPSDIQSwitch 0x40 #define bPSDIQSwitch 0x40
#define bPSDRxTrigger 0x400000 #define bPSDRxTrigger 0x400000
#define bPSDTxTrigger 0x80000000 #define bPSDTxTrigger 0x80000000
#define bPSDSineToneScale 0x7f000000 #define bPSDSineToneScale 0x7f000000
#define bPSDReport 0xffff #define bPSDReport 0xffff
// 3. Page9(0x900) // 3. Page9(0x900)
#define bOFDMTxSC 0x30000000 // Useless #define bOFDMTxSC 0x30000000 // Useless
#define bCCKTxOn 0x1 #define bCCKTxOn 0x1
#define bOFDMTxOn 0x2 #define bOFDMTxOn 0x2
#define bDebugPage 0xfff //reset debug page and also HWord, LWord #define bDebugPage 0xfff //reset debug page and also HWord, LWord
#define bDebugItem 0xff //reset debug page and LWord #define bDebugItem 0xff //reset debug page and LWord
#define bAntL 0x10 #define bAntL 0x10
#define bAntNonHT 0x100 #define bAntNonHT 0x100
#define bAntHT1 0x1000 #define bAntHT1 0x1000
#define bAntHT2 0x10000 #define bAntHT2 0x10000
#define bAntHT1S1 0x100000 #define bAntHT1S1 0x100000
#define bAntNonHTS1 0x1000000 #define bAntNonHTS1 0x1000000
// 4. PageA(0xA00) // 4. PageA(0xA00)
#define bCCKBBMode 0x3 // Useless #define bCCKBBMode 0x3 // Useless
@ -759,7 +759,7 @@
#define bCCKRxAGCSatCount 0xe0 #define bCCKRxAGCSatCount 0xe0
#define bCCKRxRFSettle 0x1f //AGCsamp_dly #define bCCKRxRFSettle 0x1f //AGCsamp_dly
#define bCCKFixedRxAGC 0x8000 #define bCCKFixedRxAGC 0x8000
//#define bCCKRxAGCFormat 0x4000 //remove to HSSI register 0x824 //#define bCCKRxAGCFormat 0x4000 //remove to HSSI register 0x824
#define bCCKAntennaPolarity 0x2000 #define bCCKAntennaPolarity 0x2000
#define bCCKTxFilterType 0x0c00 #define bCCKTxFilterType 0x0c00
#define bCCKRxAGCReportType 0x0300 #define bCCKRxAGCReportType 0x0300
@ -1118,10 +1118,10 @@
#define bMaskCCK 0x3f3f3f3f #define bMaskCCK 0x3f3f3f3f
//for PutRFRegsetting & GetRFRegSetting BitMask //for PutRFRegsetting & GetRFRegSetting BitMask
//#define bMask12Bits 0xfffff // RF Reg mask bits //#define bMask12Bits 0xfffff // RF Reg mask bits
//#define bMask20Bits 0xfffff // RF Reg mask bits T65 RF //#define bMask20Bits 0xfffff // RF Reg mask bits T65 RF
#define bRFRegOffsetMask 0xfffff #define bRFRegOffsetMask 0xfffff
//#define bRFRegOffsetMask 0xfff //#define bRFRegOffsetMask 0xfff
//MAC0 will wirte PHY1 //MAC0 will wirte PHY1
#define MAC0_ACCESS_PHY1 0x4000 #define MAC0_ACCESS_PHY1 0x4000
@ -1169,4 +1169,3 @@
#endif //__INC_HAL8192SPHYREG_H #endif //__INC_HAL8192SPHYREG_H

1
include/Hal8723APhyCfg.h
View file

@ -27,4 +27,3 @@ int PHY_RFConfig8723A( IN struct adapter *Adapter );
s32 PHY_MACConfig8723A(struct adapter *padapter); s32 PHY_MACConfig8723A(struct adapter *padapter);
#endif #endif

3
include/Hal8723APhyReg.h
View file

@ -36,7 +36,7 @@
#define rPdp_AntA_20 0xb20 #define rPdp_AntA_20 0xb20
#define rPdp_AntA_24 0xb24 #define rPdp_AntA_24 0xb24
#define rConfig_Pmpd_AntA 0xb28 #define rConfig_Pmpd_AntA 0xb28
#define rConfig_ram64x16 0xb2c #define rConfig_ram64x16 0xb2c
#define rBndA 0xb30 #define rBndA 0xb30
@ -71,4 +71,3 @@
#define rPm_Rx3_AntB 0xbf8 #define rPm_Rx3_AntB 0xbf8
#endif #endif

3
include/Hal8723PwrSeq.h
View file

@ -35,7 +35,7 @@
#define RTL8723A_TRANS_END_STEPS 1 #define RTL8723A_TRANS_END_STEPS 1
#define RTL8723A_TRANS_CARDEMU_TO_ACT \ #define RTL8723A_TRANS_CARDEMU_TO_ACT \
/* format */ \ /* format */ \
/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, // comments here*/ \ /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, // comments here*/ \
{0x0020, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT0, BIT0}, /*0x20[0] = 1b'1 enable LDOA12 MACRO block for all interface*/ \ {0x0020, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT0, BIT0}, /*0x20[0] = 1b'1 enable LDOA12 MACRO block for all interface*/ \
@ -168,4 +168,3 @@ extern WLAN_PWR_CFG rtl8723A_enter_lps_flow[RTL8723A_TRANS_ACT_TO_LPS_STEPS+RTL8
extern WLAN_PWR_CFG rtl8723A_leave_lps_flow[RTL8723A_TRANS_LPS_TO_ACT_STEPS+RTL8723A_TRANS_END_STEPS]; extern WLAN_PWR_CFG rtl8723A_leave_lps_flow[RTL8723A_TRANS_LPS_TO_ACT_STEPS+RTL8723A_TRANS_END_STEPS];
#endif #endif

1
include/HalPwrSeqCmd.h
View file

@ -135,4 +135,3 @@ u8 HalPwrSeqCmdParsing(
WLAN_PWR_CFG PwrCfgCmd[]); WLAN_PWR_CFG PwrCfgCmd[]);
#endif #endif

61
include/HalVerDef.h
View file

@ -20,60 +20,60 @@
#ifndef __HAL_VERSION_DEF_H__ #ifndef __HAL_VERSION_DEF_H__
#define __HAL_VERSION_DEF_H__ #define __HAL_VERSION_DEF_H__
#define TRUE _TRUE #define TRUE _TRUE
#define FALSE _FALSE #define FALSE _FALSE
// HAL_IC_TYPE_E // HAL_IC_TYPE_E
typedef enum tag_HAL_IC_Type_Definition typedef enum tag_HAL_IC_Type_Definition
{ {
CHIP_8192S = 0, CHIP_8192S = 0,
CHIP_8188C = 1, CHIP_8188C = 1,
CHIP_8192C = 2, CHIP_8192C = 2,
CHIP_8192D = 3, CHIP_8192D = 3,
CHIP_8723A = 4, CHIP_8723A = 4,
CHIP_8188E = 5, CHIP_8188E = 5,
CHIP_8881A = 6, CHIP_8881A = 6,
CHIP_8812A = 7, CHIP_8812A = 7,
CHIP_8821A = 8, CHIP_8821A = 8,
CHIP_8723B = 9, CHIP_8723B = 9,
CHIP_8192E = 10, CHIP_8192E = 10,
}HAL_IC_TYPE_E; }HAL_IC_TYPE_E;
//HAL_CHIP_TYPE_E //HAL_CHIP_TYPE_E
typedef enum tag_HAL_CHIP_Type_Definition typedef enum tag_HAL_CHIP_Type_Definition
{ {
TEST_CHIP = 0, TEST_CHIP = 0,
NORMAL_CHIP = 1, NORMAL_CHIP = 1,
FPGA = 2, FPGA = 2,
}HAL_CHIP_TYPE_E; }HAL_CHIP_TYPE_E;
//HAL_CUT_VERSION_E //HAL_CUT_VERSION_E
typedef enum tag_HAL_Cut_Version_Definition typedef enum tag_HAL_Cut_Version_Definition
{ {
A_CUT_VERSION = 0, A_CUT_VERSION = 0,
B_CUT_VERSION = 1, B_CUT_VERSION = 1,
C_CUT_VERSION = 2, C_CUT_VERSION = 2,
D_CUT_VERSION = 3, D_CUT_VERSION = 3,
E_CUT_VERSION = 4, E_CUT_VERSION = 4,
F_CUT_VERSION = 5, F_CUT_VERSION = 5,
G_CUT_VERSION = 6, G_CUT_VERSION = 6,
H_CUT_VERSION = 7, H_CUT_VERSION = 7,
I_CUT_VERSION = 8, I_CUT_VERSION = 8,
J_CUT_VERSION = 9, J_CUT_VERSION = 9,
K_CUT_VERSION = 10, K_CUT_VERSION = 10,
}HAL_CUT_VERSION_E; }HAL_CUT_VERSION_E;
// HAL_Manufacturer // HAL_Manufacturer
typedef enum tag_HAL_Manufacturer_Version_Definition typedef enum tag_HAL_Manufacturer_Version_Definition
{ {
CHIP_VENDOR_TSMC = 0, CHIP_VENDOR_TSMC = 0,
CHIP_VENDOR_UMC = 1, CHIP_VENDOR_UMC = 1,
}HAL_VENDOR_E; }HAL_VENDOR_E;
typedef enum tag_HAL_RF_Type_Definition typedef enum tag_HAL_RF_Type_Definition
{ {
RF_TYPE_1T1R = 0, RF_TYPE_1T1R = 0,
RF_TYPE_1T2R = 1, RF_TYPE_1T2R = 1,
RF_TYPE_2T2R = 2, RF_TYPE_2T2R = 2,
RF_TYPE_2T3R = 3, RF_TYPE_2T3R = 3,
RF_TYPE_2T4R = 4, RF_TYPE_2T4R = 4,
@ -145,7 +145,7 @@ typedef struct tag_HAL_VERSION
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
#define IS_81XXC_TEST_CHIP(version) ((IS_81XXC(version) && (!IS_NORMAL_CHIP(version)))? TRUE: FALSE) #define IS_81XXC_TEST_CHIP(version) ((IS_81XXC(version) && (!IS_NORMAL_CHIP(version)))? TRUE: FALSE)
#define IS_92C_SERIAL(version) ((IS_81XXC(version) && IS_2T2R(version)) ? TRUE : FALSE) #define IS_92C_SERIAL(version) ((IS_81XXC(version) && IS_2T2R(version)) ? TRUE : FALSE)
#define IS_81xxC_VENDOR_UMC_A_CUT(version) (IS_81XXC(version)?(IS_CHIP_VENDOR_UMC(version) ? (IS_A_CUT(version) ? TRUE : FALSE) : FALSE): FALSE) #define IS_81xxC_VENDOR_UMC_A_CUT(version) (IS_81XXC(version)?(IS_CHIP_VENDOR_UMC(version) ? (IS_A_CUT(version) ? TRUE : FALSE) : FALSE): FALSE)
#define IS_81xxC_VENDOR_UMC_B_CUT(version) (IS_81XXC(version)?(IS_CHIP_VENDOR_UMC(version) ? (IS_B_CUT(version) ? TRUE : FALSE) : FALSE): FALSE) #define IS_81xxC_VENDOR_UMC_B_CUT(version) (IS_81XXC(version)?(IS_CHIP_VENDOR_UMC(version) ? (IS_B_CUT(version) ? TRUE : FALSE) : FALSE): FALSE)
#define IS_81xxC_VENDOR_UMC_C_CUT(version) (IS_81XXC(version)?(IS_CHIP_VENDOR_UMC(version) ? (IS_C_CUT(version) ? TRUE : FALSE) : FALSE): FALSE) #define IS_81xxC_VENDOR_UMC_C_CUT(version) (IS_81XXC(version)?(IS_CHIP_VENDOR_UMC(version) ? (IS_C_CUT(version) ? TRUE : FALSE) : FALSE): FALSE)
@ -161,4 +161,3 @@ typedef struct tag_HAL_VERSION
#define IS_8723A_B_CUT(version) ((IS_8723_SERIES(version)) ? ( IS_B_CUT(version)?TRUE : FALSE) : FALSE) #define IS_8723A_B_CUT(version) ((IS_8723_SERIES(version)) ? ( IS_B_CUT(version)?TRUE : FALSE) : FALSE)
#endif #endif

35
include/autoconf.h
View file

@ -110,7 +110,7 @@
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
//#define CONFIG_HWPORT_SWAP //Port0->Sec , Port1 -> Pri //#define CONFIG_HWPORT_SWAP //Port0->Sec , Port1 -> Pri
//#define CONFIG_STA_MODE_SCAN_UNDER_AP_MODE //#define CONFIG_STA_MODE_SCAN_UNDER_AP_MODE
#define CONFIG_TSF_RESET_OFFLOAD // For 2 PORT TSF SYNC. #define CONFIG_TSF_RESET_OFFLOAD // For 2 PORT TSF SYNC.
#endif #endif
#define CONFIG_IOL #define CONFIG_IOL
@ -201,7 +201,7 @@
#endif // CONFIG_BR_EXT #endif // CONFIG_BR_EXT
#define CONFIG_TX_MCAST2UNI // Support IP multicast->unicast #define CONFIG_TX_MCAST2UNI // Support IP multicast->unicast
//#define CONFIG_CHECK_AC_LIFETIME // Check packet lifetime of 4 ACs. //#define CONFIG_CHECK_AC_LIFETIME // Check packet lifetime of 4 ACs.
/* /*
* Interface Related Config * Interface Related Config
@ -219,8 +219,8 @@
/* /*
* CONFIG_USE_USB_BUFFER_ALLOC_XX uses Linux USB Buffer alloc API and is for Linux platform only now! * CONFIG_USE_USB_BUFFER_ALLOC_XX uses Linux USB Buffer alloc API and is for Linux platform only now!
*/ */
//#define CONFIG_USE_USB_BUFFER_ALLOC_TX // Trade-off: For TX path, improve stability on some platforms, but may cause performance degrade on other platforms. //#define CONFIG_USE_USB_BUFFER_ALLOC_TX // Trade-off: For TX path, improve stability on some platforms, but may cause performance degrade on other platforms.
//#define CONFIG_USE_USB_BUFFER_ALLOC_RX // For RX path //#define CONFIG_USE_USB_BUFFER_ALLOC_RX // For RX path
#ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX #ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX
#undef CONFIG_PREALLOC_RECV_SKB #undef CONFIG_PREALLOC_RECV_SKB
#endif #endif
@ -305,20 +305,20 @@
* Outsource Related Config * Outsource Related Config
*/ */
#define RTL8192CE_SUPPORT 0 #define RTL8192CE_SUPPORT 0
#define RTL8192CU_SUPPORT 0 #define RTL8192CU_SUPPORT 0
#define RTL8192C_SUPPORT (RTL8192CE_SUPPORT|RTL8192CU_SUPPORT) #define RTL8192C_SUPPORT (RTL8192CE_SUPPORT|RTL8192CU_SUPPORT)
#define RTL8192DE_SUPPORT 0 #define RTL8192DE_SUPPORT 0
#define RTL8192DU_SUPPORT 0 #define RTL8192DU_SUPPORT 0
#define RTL8192D_SUPPORT (RTL8192DE_SUPPORT|RTL8192DU_SUPPORT) #define RTL8192D_SUPPORT (RTL8192DE_SUPPORT|RTL8192DU_SUPPORT)
#define RTL8723AU_SUPPORT 0 #define RTL8723AU_SUPPORT 0
#define RTL8723AS_SUPPORT 0 #define RTL8723AS_SUPPORT 0
#define RTL8723AE_SUPPORT 0 #define RTL8723AE_SUPPORT 0
#define RTL8723A_SUPPORT (RTL8723AU_SUPPORT|RTL8723AS_SUPPORT|RTL8723AE_SUPPORT) #define RTL8723A_SUPPORT (RTL8723AU_SUPPORT|RTL8723AS_SUPPORT|RTL8723AE_SUPPORT)
#define RTL8723_FPGA_VERIFICATION 0 #define RTL8723_FPGA_VERIFICATION 0
#define RTL8188EE_SUPPORT 0 #define RTL8188EE_SUPPORT 0
#define RTL8188EU_SUPPORT 1 #define RTL8188EU_SUPPORT 1
@ -326,13 +326,13 @@
#define RTL8188E_SUPPORT (RTL8188EE_SUPPORT|RTL8188EU_SUPPORT|RTL8188ES_SUPPORT) #define RTL8188E_SUPPORT (RTL8188EE_SUPPORT|RTL8188EU_SUPPORT|RTL8188ES_SUPPORT)
#define RTL8188E_FOR_TEST_CHIP 0 #define RTL8188E_FOR_TEST_CHIP 0
//#if (RTL8188E_SUPPORT==1) //#if (RTL8188E_SUPPORT==1)
#define RATE_ADAPTIVE_SUPPORT 1 #define RATE_ADAPTIVE_SUPPORT 1
#define POWER_TRAINING_ACTIVE 1 #define POWER_TRAINING_ACTIVE 1
//#endif //#endif
#ifdef CONFIG_USB_TX_AGGREGATION #ifdef CONFIG_USB_TX_AGGREGATION
//#define CONFIG_TX_EARLY_MODE //#define CONFIG_TX_EARLY_MODE
#endif #endif
#ifdef CONFIG_TX_EARLY_MODE #ifdef CONFIG_TX_EARLY_MODE
@ -387,4 +387,3 @@
//#define CONFIG_SINGLE_XMIT_BUF //#define CONFIG_SINGLE_XMIT_BUF
//RX use 1 urb //RX use 1 urb
//#define CONFIG_SINGLE_RECV_BUF //#define CONFIG_SINGLE_RECV_BUF

5
include/basic_types.h
View file

@ -59,7 +59,7 @@
typedef void (*proc_t)(void*); typedef void (*proc_t)(void*);
typedef __kernel_size_t SIZE_T; typedef __kernel_size_t SIZE_T;
typedef __kernel_ssize_t SSIZE_T; typedef __kernel_ssize_t SSIZE_T;
#define FIELD_OFFSET(s,field) ((SSIZE_T)&((s*)(0))->field) #define FIELD_OFFSET(s,field) ((SSIZE_T)&((s*)(0))->field)
@ -84,7 +84,7 @@
// Byte Swapping routine. // Byte Swapping routine.
// //
#define EF1Byte #define EF1Byte
#define EF2Byte le16_to_cpu #define EF2Byte le16_to_cpu
#define EF4Byte le32_to_cpu #define EF4Byte le32_to_cpu
// //
@ -248,4 +248,3 @@
typedef unsigned char BOOLEAN,*PBOOLEAN; typedef unsigned char BOOLEAN,*PBOOLEAN;
#endif //__BASIC_TYPES_H__ #endif //__BASIC_TYPES_H__

1
include/circ_buf.h
View file

@ -25,4 +25,3 @@
#define CIRC_SPACE(head,tail,size) CIRC_CNT((tail),((head)+1),(size)) #define CIRC_SPACE(head,tail,size) CIRC_CNT((tail),((head)+1),(size))
#endif //_CIRC_BUF_H_ #endif //_CIRC_BUF_H_

1
include/cmd_osdep.h
View file

@ -33,4 +33,3 @@ extern sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj);
extern struct cmd_obj *_rtw_dequeue_cmd(_queue *queue); extern struct cmd_obj *_rtw_dequeue_cmd(_queue *queue);
#endif #endif

1
include/drv_conf.h
View file

@ -69,4 +69,3 @@
//#include <rtl871x_byteorder.h> //#include <rtl871x_byteorder.h>
#endif // __DRV_CONF_H__ #endif // __DRV_CONF_H__

17
include/drv_types.h
View file

@ -112,7 +112,7 @@ struct registry_priv
u8 network_mode; //infra, ad-hoc, auto u8 network_mode; //infra, ad-hoc, auto
u8 channel;//ad-hoc support requirement u8 channel;//ad-hoc support requirement
u8 wireless_mode;//A, B, G, auto u8 wireless_mode;//A, B, G, auto
u8 scan_mode;//active, passive u8 scan_mode;//active, passive
u8 radio_enable; u8 radio_enable;
u8 preamble;//long, short, auto u8 preamble;//long, short, auto
u8 vrtl_carrier_sense;//Enable, Disable, Auto u8 vrtl_carrier_sense;//Enable, Disable, Auto
@ -150,7 +150,7 @@ struct registry_priv
u8 ht_enable; u8 ht_enable;
u8 cbw40_enable; u8 cbw40_enable;
u8 ampdu_enable;//for tx u8 ampdu_enable;//for tx
u8 rx_stbc; u8 rx_stbc;
u8 ampdu_amsdu;//A-MPDU Supports A-MSDU is permitted u8 ampdu_amsdu;//A-MPDU Supports A-MSDU is permitted
#endif #endif
u8 lowrate_two_xmit; u8 lowrate_two_xmit;
@ -343,10 +343,10 @@ struct dvobj_priv
u8 const_hwsw_rfoff_d3; u8 const_hwsw_rfoff_d3;
u8 const_support_pciaspm; u8 const_support_pciaspm;
// pci-e bridge */ // pci-e bridge */
u8 const_hostpci_aspm_setting; u8 const_hostpci_aspm_setting;
// pci-e device */ // pci-e device */
u8 const_devicepci_aspm_setting; u8 const_devicepci_aspm_setting;
u8 b_support_aspm; // If it supports ASPM, Offset[560h] = 0x40, otherwise Offset[560h] = 0x00. u8 b_support_aspm; // If it supports ASPM, Offset[560h] = 0x40, otherwise Offset[560h] = 0x00.
u8 b_support_backdoor; u8 b_support_backdoor;
u8 bdma64; u8 bdma64;
@ -425,7 +425,7 @@ struct adapter {
int DriverState;// for disable driver using module, use dongle to replace module. int DriverState;// for disable driver using module, use dongle to replace module.
int pid[3];//process id from UI, 0:wps, 1:hostapd, 2:dhcpcd int pid[3];//process id from UI, 0:wps, 1:hostapd, 2:dhcpcd
int bDongle;//build-in module or external dongle int bDongle;//build-in module or external dongle
u16 chip_type; u16 chip_type;
u16 HardwareType; u16 HardwareType;
u16 interface_type;//USB,SDIO,SPI,PCI u16 interface_type;//USB,SDIO,SPI,PCI
@ -435,14 +435,14 @@ struct adapter {
struct cmd_priv cmdpriv; struct cmd_priv cmdpriv;
struct evt_priv evtpriv; struct evt_priv evtpriv;
//struct io_queue *pio_queue; //struct io_queue *pio_queue;
struct io_priv iopriv; struct io_priv iopriv;
struct xmit_priv xmitpriv; struct xmit_priv xmitpriv;
struct recv_priv recvpriv; struct recv_priv recvpriv;
struct sta_priv stapriv; struct sta_priv stapriv;
struct security_priv securitypriv; struct security_priv securitypriv;
_lock security_key_mutex; // add for CONFIG_IEEE80211W, none 11w also can use _lock security_key_mutex; // add for CONFIG_IEEE80211W, none 11w also can use
struct registry_priv registrypriv; struct registry_priv registrypriv;
struct eeprom_priv eeprompriv; struct eeprom_priv eeprompriv;
struct led_priv ledpriv; struct led_priv ledpriv;
#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST) #if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
//Check BT status for BT Hung. //Check BT status for BT Hung.
@ -611,4 +611,3 @@ __inline static u8 *myid(struct eeprom_priv *peepriv)
#endif //__DRV_TYPES_H__ #endif //__DRV_TYPES_H__

3
include/drv_types_ce.h
View file

@ -64,7 +64,7 @@ typedef struct _MP_REG_ENTRY
typedef struct _USB_EXTENSION { typedef struct _USB_EXTENSION {
LPCUSB_FUNCS _lpUsbFuncs; LPCUSB_FUNCS _lpUsbFuncs;
USB_HANDLE _hDevice; USB_HANDLE _hDevice;
PVOID pAdapter; PVOID pAdapter;
#if 0 #if 0
USB_ENDPOINT_DESCRIPTOR _endpACLIn; USB_ENDPOINT_DESCRIPTOR _endpACLIn;
@ -90,4 +90,3 @@ typedef struct _OCTET_STRING{
#endif #endif

1
include/drv_types_gspi.h
View file

@ -42,4 +42,3 @@ typedef struct gspi_data
} GSPI_DATA, *PGSPI_DATA; } GSPI_DATA, *PGSPI_DATA;
#endif // #ifndef __DRV_TYPES_GSPI_H__ #endif // #ifndef __DRV_TYPES_GSPI_H__

1
include/drv_types_linux.h
View file

@ -22,4 +22,3 @@
#endif #endif

1
include/drv_types_sdio.h
View file

@ -39,4 +39,3 @@ typedef struct sdio_data
} SDIO_DATA, *PSDIO_DATA; } SDIO_DATA, *PSDIO_DATA;
#endif #endif

1
include/drv_types_xp.h
View file

@ -92,4 +92,3 @@ typedef struct _OCTET_STRING{
#endif #endif

3
include/ethernet.h
View file

@ -30,7 +30,7 @@
#define RT_ETH_IS_MULTICAST(_pAddr) ((((UCHAR *)(_pAddr))[0]&0x01)!=0) //!< Is Multicast Address? #define RT_ETH_IS_MULTICAST(_pAddr) ((((UCHAR *)(_pAddr))[0]&0x01)!=0) //!< Is Multicast Address?
#define RT_ETH_IS_BROADCAST(_pAddr) ( \ #define RT_ETH_IS_BROADCAST(_pAddr) ( \
((UCHAR *)(_pAddr))[0]==0xff && \ ((UCHAR *)(_pAddr))[0]==0xff && \
((UCHAR *)(_pAddr))[1]==0xff && \ ((UCHAR *)(_pAddr))[1]==0xff && \
((UCHAR *)(_pAddr))[2]==0xff && \ ((UCHAR *)(_pAddr))[2]==0xff && \
((UCHAR *)(_pAddr))[3]==0xff && \ ((UCHAR *)(_pAddr))[3]==0xff && \
@ -39,4 +39,3 @@
#endif // #ifndef __INC_ETHERNET_H #endif // #ifndef __INC_ETHERNET_H

1
include/gspi_hal.h
View file

@ -26,4 +26,3 @@ void rtl8188es_set_hal_ops(struct adapter *padapter);
#define hal_set_hal_ops rtl8188es_set_hal_ops #define hal_set_hal_ops rtl8188es_set_hal_ops
#endif //__GSPI_HAL_H__ #endif //__GSPI_HAL_H__

66
include/gspi_ops.h
View file

@ -25,28 +25,28 @@
* suppose that it will be the same * suppose that it will be the same
* for diff chips of GSPI, if not * for diff chips of GSPI, if not
* we should move it to HAL folder */ * we should move it to HAL folder */
#define SPI_LOCAL_DOMAIN 0x0 #define SPI_LOCAL_DOMAIN 0x0
#define WLAN_IOREG_DOMAIN 0x8 #define WLAN_IOREG_DOMAIN 0x8
#define FW_FIFO_DOMAIN 0x4 #define FW_FIFO_DOMAIN 0x4
#define TX_HIQ_DOMAIN 0xc #define TX_HIQ_DOMAIN 0xc
#define TX_MIQ_DOMAIN 0xd #define TX_MIQ_DOMAIN 0xd
#define TX_LOQ_DOMAIN 0xe #define TX_LOQ_DOMAIN 0xe
#define RX_RXFIFO_DOMAIN 0x1f #define RX_RXFIFO_DOMAIN 0x1f
//IO Bus domain address mapping //IO Bus domain address mapping
#define DEFUALT_OFFSET 0x0 #define DEFUALT_OFFSET 0x0
#define SPI_LOCAL_OFFSET 0x10250000 #define SPI_LOCAL_OFFSET 0x10250000
#define WLAN_IOREG_OFFSET 0x10260000 #define WLAN_IOREG_OFFSET 0x10260000
#define FW_FIFO_OFFSET 0x10270000 #define FW_FIFO_OFFSET 0x10270000
#define TX_HIQ_OFFSET 0x10310000 #define TX_HIQ_OFFSET 0x10310000
#define TX_MIQ_OFFSET 0x1032000 #define TX_MIQ_OFFSET 0x1032000
#define TX_LOQ_OFFSET 0x10330000 #define TX_LOQ_OFFSET 0x10330000
#define RX_RXOFF_OFFSET 0x10340000 #define RX_RXOFF_OFFSET 0x10340000
//SPI Local registers //SPI Local registers
#define SPI_REG_TX_CTRL 0x0000 // SPI Tx Control #define SPI_REG_TX_CTRL 0x0000 // SPI Tx Control
#define SPI_REG_STATUS_RECOVERY 0x0004 #define SPI_REG_STATUS_RECOVERY 0x0004
#define SPI_REG_INT_TIMEOUT 0x0006 #define SPI_REG_INT_TIMEOUT 0x0006
#define SPI_REG_HIMR 0x0014 // SPI Host Interrupt Mask #define SPI_REG_HIMR 0x0014 // SPI Host Interrupt Mask
#define SPI_REG_HISR 0x0018 // SPI Host Interrupt Service Routine #define SPI_REG_HISR 0x0018 // SPI Host Interrupt Service Routine
#define SPI_REG_RX0_REQ_LEN 0x001C // RXDMA Request Length #define SPI_REG_RX0_REQ_LEN 0x001C // RXDMA Request Length
@ -62,18 +62,18 @@
#define SPI_REG_HISR_ON 0x0091 //SPI Host Extension Interrupt Status Always #define SPI_REG_HISR_ON 0x0091 //SPI Host Extension Interrupt Status Always
#define SPI_REG_CFG 0x00F0 //SPI Configuration Register #define SPI_REG_CFG 0x00F0 //SPI Configuration Register
#define SPI_TX_CTRL (SPI_REG_TX_CTRL |SPI_LOCAL_OFFSET) #define SPI_TX_CTRL (SPI_REG_TX_CTRL |SPI_LOCAL_OFFSET)
#define SPI_STATUS_RECOVERY (SPI_REG_STATUS_RECOVERY |SPI_LOCAL_OFFSET) #define SPI_STATUS_RECOVERY (SPI_REG_STATUS_RECOVERY |SPI_LOCAL_OFFSET)
#define SPI_INT_TIMEOUT (SPI_REG_INT_TIMEOUT |SPI_LOCAL_OFFSET) #define SPI_INT_TIMEOUT (SPI_REG_INT_TIMEOUT |SPI_LOCAL_OFFSET)
#define SPI_HIMR (SPI_REG_HIMR |SPI_LOCAL_OFFSET) #define SPI_HIMR (SPI_REG_HIMR |SPI_LOCAL_OFFSET)
#define SPI_HISR (SPI_REG_HISR |SPI_LOCAL_OFFSET) #define SPI_HISR (SPI_REG_HISR |SPI_LOCAL_OFFSET)
#define SPI_RX0_REQ_LEN_1_BYTE (SPI_REG_RX0_REQ_LEN |SPI_LOCAL_OFFSET) #define SPI_RX0_REQ_LEN_1_BYTE (SPI_REG_RX0_REQ_LEN |SPI_LOCAL_OFFSET)
#define SPI_FREE_TXPG (SPI_REG_FREE_TXPG |SPI_LOCAL_OFFSET) #define SPI_FREE_TXPG (SPI_REG_FREE_TXPG |SPI_LOCAL_OFFSET)
#define SPI_HIMR_DISABLED 0 #define SPI_HIMR_DISABLED 0
//SPI HIMR MASK diff with SDIO //SPI HIMR MASK diff with SDIO
#define SPI_HISR_RX_REQUEST BIT(0) #define SPI_HISR_RX_REQUEST BIT(0)
#define SPI_HISR_AVAL BIT(1) #define SPI_HISR_AVAL BIT(1)
#define SPI_HISR_TXERR BIT(2) #define SPI_HISR_TXERR BIT(2)
#define SPI_HISR_RXERR BIT(3) #define SPI_HISR_RXERR BIT(3)
@ -110,17 +110,17 @@
SPI_HISR_PSTIMEOUT |\ SPI_HISR_PSTIMEOUT |\
SPI_HISR_OCPINT) SPI_HISR_OCPINT)
#define REG_LEN_FORMAT(pcmd, x) SET_BITS_TO_LE_4BYTE(pcmd, 0, 8, x)//(x<<(unsigned int)24) #define REG_LEN_FORMAT(pcmd, x) SET_BITS_TO_LE_4BYTE(pcmd, 0, 8, x)//(x<<(unsigned int)24)
#define REG_ADDR_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 8, 16, x)//(x<<(unsigned int)16) #define REG_ADDR_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 8, 16, x)//(x<<(unsigned int)16)
#define REG_DOMAIN_ID_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 24, 5, x)//(x<<(unsigned int)0) #define REG_DOMAIN_ID_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 24, 5, x)//(x<<(unsigned int)0)
#define REG_FUN_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 29, 2, x)//(x<<(unsigned int)5) #define REG_FUN_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 29, 2, x)//(x<<(unsigned int)5)
#define REG_RW_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 31, 1, x)//(x<<(unsigned int)7) #define REG_RW_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 31, 1, x)//(x<<(unsigned int)7)
#define FIFO_LEN_FORMAT(pcmd, x) SET_BITS_TO_LE_4BYTE(pcmd, 0, 16, x)//(x<<(unsigned int)24) #define FIFO_LEN_FORMAT(pcmd, x) SET_BITS_TO_LE_4BYTE(pcmd, 0, 16, x)//(x<<(unsigned int)24)
//#define FIFO_ADDR_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 8, 16, x)//(x<<(unsigned int)16) //#define FIFO_ADDR_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 8, 16, x)//(x<<(unsigned int)16)
#define FIFO_DOMAIN_ID_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 24, 5, x)//(x<<(unsigned int)0) #define FIFO_DOMAIN_ID_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 24, 5, x)//(x<<(unsigned int)0)
#define FIFO_FUN_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 29, 2, x)//(x<<(unsigned int)5) #define FIFO_FUN_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 29, 2, x)//(x<<(unsigned int)5)
#define FIFO_RW_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 31, 1, x)//(x<<(unsigned int)7) #define FIFO_RW_FORMAT(pcmd,x) SET_BITS_TO_LE_4BYTE(pcmd, 31, 1, x)//(x<<(unsigned int)7)
//get status dword0 //get status dword0
@ -133,8 +133,8 @@
//get status dword1 //get status dword1
#define GET_STATUS_HISR_MID8BIT(status) LE_BITS_TO_4BYTE(status + 4, 24, 8) #define GET_STATUS_HISR_MID8BIT(status) LE_BITS_TO_4BYTE(status + 4, 24, 8)
#define GET_STATUS_HISR_LOW8BIT(status) LE_BITS_TO_4BYTE(status + 4, 16, 8) #define GET_STATUS_HISR_LOW8BIT(status) LE_BITS_TO_4BYTE(status + 4, 16, 8)
#define GET_STATUS_ERROR(status) LE_BITS_TO_4BYTE(status + 4, 17, 1) #define GET_STATUS_ERROR(status) LE_BITS_TO_4BYTE(status + 4, 17, 1)
#define GET_STATUS_INT(status) LE_BITS_TO_4BYTE(status + 4, 16, 1) #define GET_STATUS_INT(status) LE_BITS_TO_4BYTE(status + 4, 16, 1)
#define GET_STATUS_RX_LENGTH(status) LE_BITS_TO_4BYTE(status + 4, 0, 16) #define GET_STATUS_RX_LENGTH(status) LE_BITS_TO_4BYTE(status + 4, 0, 16)

1
include/gspi_ops_linux.h
View file

@ -21,4 +21,3 @@
#define __SDIO_OPS_LINUX_H__ #define __SDIO_OPS_LINUX_H__
#endif #endif

1
include/gspi_osintf.h
View file

@ -32,4 +32,3 @@ extern void sd_setup_irs(struct adapter *padapter);
#endif #endif
#endif #endif

1
include/h2clbk.h
View file

@ -33,4 +33,3 @@ void _lbk_rsp(struct adapter *Adapter);
void _lbk_evt(IN struct adapter *Adapter); void _lbk_evt(IN struct adapter *Adapter);
void h2c_event_callback(unsigned char *dev, unsigned char *pbuf); void h2c_event_callback(unsigned char *dev, unsigned char *pbuf);

1
include/hal_com.h
View file

@ -182,4 +182,3 @@ u8 SetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value)
u8 GetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value); u8 GetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value);
#endif //__HAL_COMMON_H__ #endif //__HAL_COMMON_H__

17
include/hal_intf.h
View file

@ -31,8 +31,8 @@
enum RTL871X_HCI_TYPE { enum RTL871X_HCI_TYPE {
RTW_PCIE = BIT0, RTW_PCIE = BIT0,
RTW_USB = BIT1, RTW_USB = BIT1,
RTW_SDIO = BIT2, RTW_SDIO = BIT2,
RTW_GSPI = BIT3, RTW_GSPI = BIT3,
}; };
@ -243,8 +243,8 @@ struct hal_ops {
void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, BOOLEAN bPseudoTest); void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, BOOLEAN bPseudoTest);
void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest); void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest);
u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, BOOLEAN bPseudoTest); u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, BOOLEAN bPseudoTest);
int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, BOOLEAN bPseudoTest);
int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest);
u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest);
BOOLEAN (*Efuse_PgPacketWrite_BT)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); BOOLEAN (*Efuse_PgPacketWrite_BT)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest);
@ -286,10 +286,10 @@ typedef enum _RT_EEPROM_TYPE{
#define RF_CHANGE_BY_INIT 0 #define RF_CHANGE_BY_INIT 0
#define RF_CHANGE_BY_IPS BIT28 #define RF_CHANGE_BY_IPS BIT28
#define RF_CHANGE_BY_PS BIT29 #define RF_CHANGE_BY_PS BIT29
#define RF_CHANGE_BY_HW BIT30 #define RF_CHANGE_BY_HW BIT30
#define RF_CHANGE_BY_SW BIT31 #define RF_CHANGE_BY_SW BIT31
typedef enum _HARDWARE_TYPE{ typedef enum _HARDWARE_TYPE{
HARDWARE_TYPE_RTL8180, HARDWARE_TYPE_RTL8180,
@ -484,4 +484,3 @@ s32 rtw_hal_c2h_handler(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt);
c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter); c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter);
#endif //__HAL_INTF_H__ #endif //__HAL_INTF_H__

21
include/ieee80211.h
View file

@ -115,11 +115,11 @@ enum {
#define IEEE_CRYPT_ALG_NAME_LEN 16 #define IEEE_CRYPT_ALG_NAME_LEN 16
#define WPA_CIPHER_NONE BIT(0) #define WPA_CIPHER_NONE BIT(0)
#define WPA_CIPHER_WEP40 BIT(1) #define WPA_CIPHER_WEP40 BIT(1)
#define WPA_CIPHER_WEP104 BIT(2) #define WPA_CIPHER_WEP104 BIT(2)
#define WPA_CIPHER_TKIP BIT(3) #define WPA_CIPHER_TKIP BIT(3)
#define WPA_CIPHER_CCMP BIT(4) #define WPA_CIPHER_CCMP BIT(4)
@ -171,8 +171,8 @@ enum NETWORK_TYPE
WIRELESS_11A = BIT(2), // tx: ofdm only, rx: ofdm only, hw: ofdm only WIRELESS_11A = BIT(2), // tx: ofdm only, rx: ofdm only, hw: ofdm only
WIRELESS_11_24N = BIT(3), // tx: MCS only, rx: MCS & cck, hw: MCS & cck WIRELESS_11_24N = BIT(3), // tx: MCS only, rx: MCS & cck, hw: MCS & cck
WIRELESS_11_5N = BIT(4), // tx: MCS only, rx: MCS & ofdm, hw: ofdm only WIRELESS_11_5N = BIT(4), // tx: MCS only, rx: MCS & ofdm, hw: ofdm only
//WIRELESS_AUTO = BIT(5), //WIRELESS_AUTO = BIT(5),
WIRELESS_AC = BIT(6), WIRELESS_AC = BIT(6),
//Combination //Combination
WIRELESS_11BG = (WIRELESS_11B|WIRELESS_11G), // tx: cck & ofdm, rx: cck & ofdm & MCS, hw: cck & ofdm WIRELESS_11BG = (WIRELESS_11B|WIRELESS_11G), // tx: cck & ofdm, rx: cck & ofdm & MCS, hw: cck & ofdm
@ -216,7 +216,7 @@ typedef struct ieee_param {
} wpa_ie; } wpa_ie;
struct{ struct{
int command; int command;
int reason_code; int reason_code;
} mlme; } mlme;
struct { struct {
u8 alg[IEEE_CRYPT_ALG_NAME_LEN]; u8 alg[IEEE_CRYPT_ALG_NAME_LEN];
@ -388,7 +388,7 @@ enum eap_type {
/* management */ /* management */
#define RTW_IEEE80211_STYPE_ASSOC_REQ 0x0000 #define RTW_IEEE80211_STYPE_ASSOC_REQ 0x0000
#define RTW_IEEE80211_STYPE_ASSOC_RESP 0x0010 #define RTW_IEEE80211_STYPE_ASSOC_RESP 0x0010
#define RTW_IEEE80211_STYPE_REASSOC_REQ 0x0020 #define RTW_IEEE80211_STYPE_REASSOC_REQ 0x0020
#define RTW_IEEE80211_STYPE_REASSOC_RESP 0x0030 #define RTW_IEEE80211_STYPE_REASSOC_RESP 0x0030
#define RTW_IEEE80211_STYPE_PROBE_REQ 0x0040 #define RTW_IEEE80211_STYPE_PROBE_REQ 0x0040
@ -581,7 +581,7 @@ struct ieee80211_snap_hdr {
#define IEEE80211_24GHZ_BAND (1<<0) #define IEEE80211_24GHZ_BAND (1<<0)
#define IEEE80211_52GHZ_BAND (1<<1) #define IEEE80211_52GHZ_BAND (1<<1)
#define IEEE80211_CCK_RATE_LEN 4 #define IEEE80211_CCK_RATE_LEN 4
#define IEEE80211_NUM_OFDM_RATESLEN 8 #define IEEE80211_NUM_OFDM_RATESLEN 8
@ -589,7 +589,7 @@ struct ieee80211_snap_hdr {
#define IEEE80211_CCK_RATE_2MB 0x04 #define IEEE80211_CCK_RATE_2MB 0x04
#define IEEE80211_CCK_RATE_5MB 0x0B #define IEEE80211_CCK_RATE_5MB 0x0B
#define IEEE80211_CCK_RATE_11MB 0x16 #define IEEE80211_CCK_RATE_11MB 0x16
#define IEEE80211_OFDM_RATE_LEN 8 #define IEEE80211_OFDM_RATE_LEN 8
#define IEEE80211_OFDM_RATE_6MB 0x0C #define IEEE80211_OFDM_RATE_6MB 0x0C
#define IEEE80211_OFDM_RATE_9MB 0x12 #define IEEE80211_OFDM_RATE_9MB 0x12
#define IEEE80211_OFDM_RATE_12MB 0x18 #define IEEE80211_OFDM_RATE_12MB 0x18
@ -1389,4 +1389,3 @@ int rtw_action_frame_parse(const u8 *frame, u32 frame_len, u8* category, u8 *act
const char *action_public_str(u8 action); const char *action_public_str(u8 action);
#endif /* IEEE80211_H */ #endif /* IEEE80211_H */

23
include/ieee80211_ext.h
View file

@ -64,24 +64,24 @@ struct rsn_ie_hdr {
struct wme_ac_parameter { struct wme_ac_parameter {
#if defined(CONFIG_LITTLE_ENDIAN) #if defined(CONFIG_LITTLE_ENDIAN)
/* byte 1 */ /* byte 1 */
u8 aifsn:4, u8 aifsn:4,
acm:1, acm:1,
aci:2, aci:2,
reserved:1; reserved:1;
/* byte 2 */ /* byte 2 */
u8 eCWmin:4, u8 eCWmin:4,
eCWmax:4; eCWmax:4;
#elif defined(CONFIG_BIG_ENDIAN) #elif defined(CONFIG_BIG_ENDIAN)
/* byte 1 */ /* byte 1 */
u8 reserved:1, u8 reserved:1,
aci:2, aci:2,
acm:1, acm:1,
aifsn:4; aifsn:4;
/* byte 2 */ /* byte 2 */
u8 eCWmax:4, u8 eCWmax:4,
eCWmin:4; eCWmin:4;
#else #else
#error "Please fix <endian.h>" #error "Please fix <endian.h>"
#endif #endif
@ -308,4 +308,3 @@ struct ieee80211_mgmt {
#endif #endif

7
include/if_ether.h
View file

@ -73,14 +73,14 @@
#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */ #define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */
#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */ #define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */
#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */ #define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */
#define ETH_P_802_2 0x0004 /* 802.2 frames */ #define ETH_P_802_2 0x0004 /* 802.2 frames */
#define ETH_P_SNAP 0x0005 /* Internal only */ #define ETH_P_SNAP 0x0005 /* Internal only */
#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */ #define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */
#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ #define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/
#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ #define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */
#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ #define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */
#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ #define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/
#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ #define ETH_P_TR_802_2 0x0011 /* 802.2 frames */
#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */ #define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */
#define ETH_P_CONTROL 0x0016 /* Card specific control frames */ #define ETH_P_CONTROL 0x0016 /* Card specific control frames */
#define ETH_P_IRDA 0x0017 /* Linux-IrDA */ #define ETH_P_IRDA 0x0017 /* Linux-IrDA */
@ -110,4 +110,3 @@ struct _vlan {
#endif /* _LINUX_IF_ETHER_H */ #endif /* _LINUX_IF_ETHER_H */

1
include/ioctl_cfg80211.h
View file

@ -173,4 +173,3 @@ bool rtw_cfg80211_pwr_mgmt(struct adapter *adapter);
#endif #endif
#endif //__IOCTL_CFG80211_H__ #endif //__IOCTL_CFG80211_H__

3
include/ip.h
View file

@ -119,7 +119,7 @@ struct iphdr {
version:4; version:4;
#elif defined (__BIG_ENDIAN_BITFIELD) #elif defined (__BIG_ENDIAN_BITFIELD)
__u8 version:4, __u8 version:4,
ihl:4; ihl:4;
#else #else
#error "Please fix <asm/byteorder.h>" #error "Please fix <asm/byteorder.h>"
#endif #endif
@ -136,4 +136,3 @@ struct iphdr {
}; };
#endif /* _LINUX_IP_H */ #endif /* _LINUX_IP_H */

1
include/mlme_osdep.h
View file

@ -37,4 +37,3 @@ extern void rtw_report_sec_ie(struct adapter *adapter,u8 authmode,u8 *sec_ie);
void rtw_reset_securitypriv( struct adapter *adapter ); void rtw_reset_securitypriv( struct adapter *adapter );
#endif //_MLME_OSDEP_H_ #endif //_MLME_OSDEP_H_

21
include/mp_custom_oid.h
View file

@ -38,7 +38,7 @@
#define OID_RT_PRO_RESET_DUT 0xFF818000 #define OID_RT_PRO_RESET_DUT 0xFF818000
#define OID_RT_PRO_SET_DATA_RATE 0xFF818001 #define OID_RT_PRO_SET_DATA_RATE 0xFF818001
#define OID_RT_PRO_START_TEST 0xFF818002 #define OID_RT_PRO_START_TEST 0xFF818002
#define OID_RT_PRO_STOP_TEST 0xFF818003 #define OID_RT_PRO_STOP_TEST 0xFF818003
#define OID_RT_PRO_SET_PREAMBLE 0xFF818004 #define OID_RT_PRO_SET_PREAMBLE 0xFF818004
#define OID_RT_PRO_SET_SCRAMBLER 0xFF818005 #define OID_RT_PRO_SET_SCRAMBLER 0xFF818005
#define OID_RT_PRO_SET_FILTER_BB 0xFF818006 #define OID_RT_PRO_SET_FILTER_BB 0xFF818006
@ -114,14 +114,14 @@
#define OID_RT_WIRELESS_MODE_STARTING_ADHOC 0xFF818503 #define OID_RT_WIRELESS_MODE_STARTING_ADHOC 0xFF818503
// //
#define OID_RT_GET_CONNECT_STATE 0xFF030001 #define OID_RT_GET_CONNECT_STATE 0xFF030001
#define OID_RT_RESCAN 0xFF030002 #define OID_RT_RESCAN 0xFF030002
#define OID_RT_SET_KEY_LENGTH 0xFF030003 #define OID_RT_SET_KEY_LENGTH 0xFF030003
#define OID_RT_SET_DEFAULT_KEY_ID 0xFF030004 #define OID_RT_SET_DEFAULT_KEY_ID 0xFF030004
#define OID_RT_SET_CHANNEL 0xFF010182 #define OID_RT_SET_CHANNEL 0xFF010182
#define OID_RT_SET_SNIFFER_MODE 0xFF010183 #define OID_RT_SET_SNIFFER_MODE 0xFF010183
#define OID_RT_GET_SIGNAL_QUALITY 0xFF010184 #define OID_RT_GET_SIGNAL_QUALITY 0xFF010184
#define OID_RT_GET_SMALL_PACKET_CRC 0xFF010185 #define OID_RT_GET_SMALL_PACKET_CRC 0xFF010185
#define OID_RT_GET_MIDDLE_PACKET_CRC 0xFF010186 #define OID_RT_GET_MIDDLE_PACKET_CRC 0xFF010186
#define OID_RT_GET_LARGE_PACKET_CRC 0xFF010187 #define OID_RT_GET_LARGE_PACKET_CRC 0xFF010187
@ -240,7 +240,7 @@
#define OID_RT_PRO_WRITE_REGISTER 0xFF871102 //S #define OID_RT_PRO_WRITE_REGISTER 0xFF871102 //S
#define OID_RT_PRO_BURST_READ_REGISTER 0xFF871103 //Q #define OID_RT_PRO_BURST_READ_REGISTER 0xFF871103 //Q
#define OID_RT_PRO_BURST_WRITE_REGISTER 0xFF871104 //S #define OID_RT_PRO_BURST_WRITE_REGISTER 0xFF871104 //S
#define OID_RT_PRO_WRITE_TXCMD 0xFF871105 //S #define OID_RT_PRO_WRITE_TXCMD 0xFF871105 //S
@ -299,7 +299,7 @@
//For SDIO INTERFACE only //For SDIO INTERFACE only
#define OID_RT_PRO_SYNCPAGERW_SRAM 0xFF8711A0 //Q, S #define OID_RT_PRO_SYNCPAGERW_SRAM 0xFF8711A0 //Q, S
#define OID_RT_PRO_871X_DRV_EXT 0xFF8711A1 #define OID_RT_PRO_871X_DRV_EXT 0xFF8711A1
//For USB INTERFACE only //For USB INTERFACE only
#define OID_RT_PRO_USB_VENDOR_REQ 0xFF8711B0 //Q, S #define OID_RT_PRO_USB_VENDOR_REQ 0xFF8711B0 //Q, S
@ -314,8 +314,8 @@
#define OID_RT_PRO_ENCRYPTION_CTRL 0xFF871200 //Q, S #define OID_RT_PRO_ENCRYPTION_CTRL 0xFF871200 //Q, S
#define OID_RT_PRO_ADD_STA_INFO 0xFF871201 //S #define OID_RT_PRO_ADD_STA_INFO 0xFF871201 //S
#define OID_RT_PRO_DELE_STA_INFO 0xFF871202 //S #define OID_RT_PRO_DELE_STA_INFO 0xFF871202 //S
#define OID_RT_PRO_QUERY_DR_VARIABLE 0xFF871203 //Q #define OID_RT_PRO_QUERY_DR_VARIABLE 0xFF871203 //Q
#define OID_RT_PRO_RX_PACKET_TYPE 0xFF871204 //Q, S #define OID_RT_PRO_RX_PACKET_TYPE 0xFF871204 //Q, S
@ -327,7 +327,7 @@
#define OID_RT_SET_BANDWIDTH 0xFF871209 //S #define OID_RT_SET_BANDWIDTH 0xFF871209 //S
#define OID_RT_SET_CRYSTAL_CAP 0xFF87120A //S #define OID_RT_SET_CRYSTAL_CAP 0xFF87120A //S
#define OID_RT_SET_RX_PACKET_TYPE 0xFF87120B //S #define OID_RT_SET_RX_PACKET_TYPE 0xFF87120B //S
#define OID_RT_GET_EFUSE_MAX_SIZE 0xFF87120C //Q #define OID_RT_GET_EFUSE_MAX_SIZE 0xFF87120C //Q
@ -351,4 +351,3 @@
#define OID_RT_PRO_EFUSE_MAP 0xFF871217 //Q, S #define OID_RT_PRO_EFUSE_MAP 0xFF871217 //Q, S
#endif //#ifndef __CUSTOM_OID_H #endif //#ifndef __CUSTOM_OID_H

1
include/nic_spec.h
View file

@ -44,4 +44,3 @@
#endif // __RTL8711_SPEC_H__ #endif // __RTL8711_SPEC_H__

6
include/odm.h
View file

@ -452,7 +452,7 @@ enum odm_ability_def {
ODM_RF_CALIBRATION = BIT26, ODM_RF_CALIBRATION = BIT26,
}; };
/* ODM_CMNINFO_INTERFACE */ /* ODM_CMNINFO_INTERFACE */
enum odm_interface_def { enum odm_interface_def {
ODM_ITRF_PCIE = 0x1, ODM_ITRF_PCIE = 0x1,
ODM_ITRF_USB = 0x2, ODM_ITRF_USB = 0x2,
@ -578,7 +578,7 @@ enum odm_security {
ODM_SEC_RESERVE = 3, ODM_SEC_RESERVE = 3,
ODM_SEC_AESCCMP = 4, ODM_SEC_AESCCMP = 4,
ODM_SEC_WEP104 = 5, ODM_SEC_WEP104 = 5,
ODM_WEP_WPA_MIXED = 6, /* WEP + WPA */ ODM_WEP_WPA_MIXED = 6, /* WEP + WPA */
ODM_SEC_SMS4 = 7, ODM_SEC_SMS4 = 7,
}; };
@ -758,7 +758,7 @@ enum ant_div_type {
/* Copy from SD4 defined structure. We use to support PHY DM integration. */ /* Copy from SD4 defined structure. We use to support PHY DM integration. */
struct odm_dm_struct { struct odm_dm_struct {
/* Add for different team use temporarily */ /* Add for different team use temporarily */
struct adapter *Adapter; /* For CE/NIC team */ struct adapter *Adapter; /* For CE/NIC team */
struct rtl8192cd_priv *priv; /* For AP/ADSL team */ struct rtl8192cd_priv *priv; /* For AP/ADSL team */
/* WHen you use above pointers, they must be initialized. */ /* WHen you use above pointers, they must be initialized. */

9
include/osdep_ce_service.h
View file

@ -33,13 +33,13 @@
#include <usbdi.h> #include <usbdi.h>
#endif #endif
typedef HANDLE _sema; typedef HANDLE _sema;
typedef LIST_ENTRY _list; typedef LIST_ENTRY _list;
typedef NDIS_STATUS _OS_STATUS; typedef NDIS_STATUS _OS_STATUS;
typedef NDIS_SPIN_LOCK _lock; typedef NDIS_SPIN_LOCK _lock;
typedef HANDLE _rwlock; //Mutex typedef HANDLE _rwlock; //Mutex
typedef u32 _irqL; typedef u32 _irqL;
@ -57,7 +57,7 @@ typedef NDIS_PACKET _pkt;
typedef NDIS_BUFFER _buffer; typedef NDIS_BUFFER _buffer;
typedef struct __queue _queue; typedef struct __queue _queue;
typedef HANDLE _thread_hdl_; typedef HANDLE _thread_hdl_;
typedef DWORD thread_return; typedef DWORD thread_return;
typedef void* thread_context; typedef void* thread_context;
typedef NDIS_WORK_ITEM _workitem; typedef NDIS_WORK_ITEM _workitem;
@ -129,7 +129,7 @@ __inline static void _init_timer(_timer *ptimer,_nic_hdl nic_hdl,void *pfunc,PVO
__inline static void _set_timer(_timer *ptimer,u32 delay_time) __inline static void _set_timer(_timer *ptimer,u32 delay_time)
{ {
NdisMSetTimer(ptimer,delay_time); NdisMSetTimer(ptimer,delay_time);
} }
__inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled)
@ -168,4 +168,3 @@ __inline static void _set_workitem(_workitem *pwork)
NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \ NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \
} }
#endif #endif

5
include/osdep_intf.h
View file

@ -28,7 +28,7 @@
struct intf_priv { struct intf_priv {
u8 *intf_dev; u8 *intf_dev;
u32 max_iosz; //USB2.0: 128, USB1.1: 64, SDIO:64 u32 max_iosz; //USB2.0: 128, USB1.1: 64, SDIO:64
u32 max_xmitsz; //USB2.0: unlimited, SDIO:512 u32 max_xmitsz; //USB2.0: unlimited, SDIO:512
u32 max_recvsz; //USB2.0: unlimited, SDIO:512 u32 max_recvsz; //USB2.0: unlimited, SDIO:512
@ -53,7 +53,7 @@ The protection mechanism is through the pending queue.
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
// when in USB, IO is through interrupt in/out endpoints // when in USB, IO is through interrupt in/out endpoints
struct usb_device *udev; struct usb_device *udev;
PURB piorw_urb; PURB piorw_urb;
u8 io_irp_cnt; u8 io_irp_cnt;
u8 bio_irp_pending; u8 bio_irp_pending;
@ -126,4 +126,3 @@ int rtw_gw_addr_query(struct adapter *padapter);
#endif #endif
#endif //_OSDEP_INTF_H_ #endif //_OSDEP_INTF_H_

Some files were not shown because too many files have changed in this diff Show more