staging: rtl8188eu: handle errors from dev_alloc_name
Subsystems (2)
PATCH 1/13 staging: rtl8188eu: handle errors from dev_alloc_name
Fail the usb interface initialization if dev_alloc_name returns an error.
Other wlan drivers like natsemi or atmel use the same error handling.
--- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +4 -1
@@ -387,8 +387,11 @@ static int rtw_usb_if1_init(struct usb_interface *pusb_intf)pr_debug ("can't get autopm:\n" );/* alloc dev name after read efuse. */ -if (dev_alloc_name (pnetdev, padapter->registrypriv.ifname) <0 ) + err =dev_alloc_name (pnetdev, padapter->registrypriv.ifname); +if (err <0 ) {RT_TRACE (_module_os_intfs_c_, _drv_err_, ("dev_alloc_name, fail!\n" )); + goto free_hal_data; + }netif_carrier_off (pnetdev);
Signature · 1 line
2.20.1
PATCH 2/13 staging: rtl8188eu: remove RT_TRACE prints from usb_intf.c
Eventually, all driver-specific debug prints should be removed. Take another step in that direction.
--- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 28 +-------------------- 1 file changed, 1 insertion(+), 27 deletions(-)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -27
@@ -143,16 +143,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)void usb_intf_stop (struct adapter *padapter) { -RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("+%s\n" , __func__)); - -/* disable_hw_interrupt */ -if (!padapter->bSurpriseRemoved) { -/* device still exists, so driver can do i/o operation */ -/* TODO: */ -RT_TRACE (_module_hci_intfs_c_, _drv_err_, - ("SurpriseRemoved == false\n" )); - } -/* cancel in irp */ rtw_hal_inirp_deinit (padapter);
@@ -160,14 +150,10 @@ void usb_intf_stop(struct adapter *padapter)usb_write_port_cancel (padapter);/* todo:cancel other irps */ - -RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("-%s\n" , __func__)); }static void rtw_dev_unload (struct adapter *padapter) { -RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("+%s\n" , __func__)); -if (padapter->bup) {pr_debug ("===> %s\n" , __func__); padapter->bDriverStopped = true;
@@ -186,14 +172,9 @@ static void rtw_dev_unload(struct adapter *padapter) } padapter->bup = false; - }else { -RT_TRACE (_module_hci_intfs_c_, _drv_err_, - ("r871x_dev_unload():padapter->bup == false\n" )); }pr_debug ("<=== %s\n" , __func__); - -RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("-%s\n" , __func__)); }static int rtw_suspend (struct usb_interface *pusb_intf,pm_message_t message)
@@ -366,8 +347,6 @@ static int rtw_usb_if1_init(struct usb_interface *pusb_intf)/* step 5. */ if (rtw_init_drv_sw (padapter) == _FAIL) { -RT_TRACE (_module_hci_intfs_c_, _drv_err_, - ("Initialize driver software resource Failed!\n" )); err = -ENOMEM ; goto free_hal_data; }
@@ -388,10 +367,8 @@ static int rtw_usb_if1_init(struct usb_interface *pusb_intf)/* alloc dev name after read efuse. */ err =dev_alloc_name (pnetdev, padapter->registrypriv.ifname); -if (err <0 ) { -RT_TRACE (_module_os_intfs_c_, _drv_err_, ("dev_alloc_name, fail!\n" )); +if (err <0 ) goto free_hal_data; - }netif_carrier_off (pnetdev);
@@ -403,7 +380,6 @@ static int rtw_usb_if1_init(struct usb_interface *pusb_intf)/* step 6. Tell the network stack we exist */ err =register_netdev (pnetdev);if (err) { -RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("register_netdev() failed\n" )); goto free_hal_data; }
@@ -480,7 +456,6 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)struct adapter *padapter = dvobj->if1;pr_debug ("+%s\n" , __func__); -RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("+dev_remove()\n" ));if (!pusb_intf->unregistering) padapter->bSurpriseRemoved = true;
@@ -494,7 +469,6 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)usb_dvobj_deinit (pusb_intf); -RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("-dev_remove()\n" ));pr_debug ("-r871xu_dev_remove, done\n" ); }
Signature · 1 line
2.20.1
PATCH 3/13 staging: rtl8188eu: remove RT_TRACE prints from rtl8188e_hal_init.c
In reply to Martin KaiserEventually, all driver-specific debug prints should be removed. Take another step in that direction.
--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -5
@@ -181,7 +181,6 @@ static s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data)break ;if (count >POLLING_LLT_THRESHOLD ) { -RT_TRACE (_module_hal_init_c_, _drv_err_, ("Failed to polling write LLT done at address %d!\n" , address)); status = _FAIL;break ; }
@@ -239,7 +238,6 @@ void Hal_InitPGData88E(struct adapter *padapter)EFUSE_ShadowMapUpdate (padapter,EFUSE_WIFI ); } }else {/* autoload fail */ -RT_TRACE (_module_hci_hal_init_c_, _drv_notice_, ("AutoLoad Fail reported from CR9346!!\n" ));/* update to default value 0xFF */ if (!is_boot_from_eeprom (padapter))EFUSE_ShadowMapUpdate (padapter,EFUSE_WIFI );
@@ -465,9 +463,6 @@ void Hal_EfuseParseEEPROMVer88E(struct adapter *padapter, u8 *hwinfo, bool AutoL }else { pHalData->EEPROMVersion =1 ; } -RT_TRACE (_module_hci_hal_init_c_, _drv_info_, - ("Hal_EfuseParseEEPROMVer(), EEVer = %d\n" , - pHalData->EEPROMVersion)); }void rtl8188e_EfuseParseChnlPlan (struct adapter *padapter,u8 *hwinfo,bool AutoLoadFail)
Signature · 1 line
2.20.1
PATCH 4/13 staging: rtl8188eu: remove a couple of unused defines
In reply to Martin KaiserRemove some defines which are not used by this driver.
--- drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 13 ------------- 1 file changed, 13 deletions(-)
drivers/staging/rtl8188eu/include/rtl8188e_hal.h +0 -13
@@ -20,19 +20,6 @@#include "rtw_sreset.h" #include "odm_precomp.h" -/* Fw Array */ -#define Rtl8188E_FwImageArray Rtl8188EFwImgArray -#define Rtl8188E_FWImgArrayLength Rtl8188EFWImgArrayLength - -#define RTL8188E_FW_UMC_IMG "rtl8188E\\rtl8188efw.bin" -#define RTL8188E_PHY_REG "rtl8188E\\PHY_REG_1T.txt" -#define RTL8188E_PHY_RADIO_A "rtl8188E\\radio_a_1T.txt" -#define RTL8188E_PHY_RADIO_B "rtl8188E\\radio_b_1T.txt" -#define RTL8188E_AGC_TAB "rtl8188E\\AGC_TAB_1T.txt" -#define RTL8188E_PHY_MACREG "rtl8188E\\MAC_REG.txt" -#define RTL8188E_PHY_REG_PG "rtl8188E\\PHY_REG_PG.txt" -#define RTL8188E_PHY_REG_MP "rtl8188E\\PHY_REG_MP.txt" -/* RTL8188E Power Configuration CMDs for USB/SDIO interfaces */ #define Rtl8188E_NIC_PWR_ON_FLOW rtl8188E_power_on_flow#define Rtl8188E_NIC_RF_OFF_FLOW rtl8188E_radio_off_flow
Signature · 1 line
2.20.1
PATCH 5/13 staging: rtl8188eu: remove efuse type
In reply to Martin KaiserA number of efuse-related functions have an "efuse type" parameter. This type is not used and can be removed.
--- drivers/staging/rtl8188eu/core/rtw_efuse.c | 36 +++++++++---------- .../staging/rtl8188eu/hal/rtl8188e_hal_init.c | 4 +-- drivers/staging/rtl8188eu/include/rtw_efuse.h | 8 ++--- 3 files changed, 21 insertions(+), 27 deletions(-)
drivers/staging/rtl8188eu/core/rtw_efuse.c +17 -19
@@ -281,7 +281,7 @@ static s32 iol_read_efuse(struct adapter *padapter, u8 txpktbuf_bndy, u16 offsetreturn status; } -void efuse_ReadEFuse (struct adapter *Adapter,u8 efuseType,u16 _offset,u16 _size_byte,u8 *pbuf) +void efuse_ReadEFuse (struct adapter *Adapter,u16 _offset,u16 _size_byte,u8 *pbuf) {if (rtw_iol_applied (Adapter)) {rtw_hal_power_on (Adapter);
@@ -461,7 +461,7 @@ int Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data)return true; } -static bool hal_EfuseFixHeaderProcess (struct adapter *pAdapter,u8 efuseType,struct pgpkt *pFixPkt,u16 *pAddr) +static bool hal_EfuseFixHeaderProcess (struct adapter *pAdapter,struct pgpkt *pFixPkt,u16 *pAddr) {u8 originaldata[8 ], badworden =0 ;u16 efuse_addr = *pAddr;
@@ -490,7 +490,7 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, streturn true; } -static bool hal_EfusePgPacketWrite2ByteHeader (struct adapter *pAdapter,u8 efuseType,u16 *pAddr,struct pgpkt *pTargetPkt) +static bool hal_EfusePgPacketWrite2ByteHeader (struct adapter *pAdapter,u16 *pAddr,struct pgpkt *pTargetPkt) {bool ret = false;u16 efuse_addr = *pAddr;
@@ -541,7 +541,7 @@ static bool hal_EfusePgPacketWrite2ByteHeader(struct adapter *pAdapter, u8 efuse fixPkt.offset = ((pg_header_temp &0xE0 ) >>5 ) | ((tmp_header &0xF0 ) >>1 ); fixPkt.word_en = tmp_header &0x0F ; fixPkt.word_cnts =Efuse_CalculateWordCnts (fixPkt.word_en); -if (!hal_EfuseFixHeaderProcess (pAdapter, efuseType, &fixPkt, &efuse_addr)) +if (!hal_EfuseFixHeaderProcess (pAdapter, &fixPkt, &efuse_addr))return false; }else { ret = true;
@@ -557,7 +557,7 @@ static bool hal_EfusePgPacketWrite2ByteHeader(struct adapter *pAdapter, u8 efusereturn ret; } -static bool hal_EfusePgPacketWrite1ByteHeader (struct adapter *pAdapter,u8 efuseType,u16 *pAddr,struct pgpkt *pTargetPkt) +static bool hal_EfusePgPacketWrite1ByteHeader (struct adapter *pAdapter,u16 *pAddr,struct pgpkt *pTargetPkt) {bool ret = false;u8 pg_header =0 , tmp_header =0 ;
@@ -584,7 +584,7 @@ static bool hal_EfusePgPacketWrite1ByteHeader(struct adapter *pAdapter, u8 efuse fixPkt.offset = (tmp_header >>4 ) &0x0F ; fixPkt.word_en = tmp_header &0x0F ; fixPkt.word_cnts =Efuse_CalculateWordCnts (fixPkt.word_en); -if (!hal_EfuseFixHeaderProcess (pAdapter, efuseType, &fixPkt, &efuse_addr)) +if (!hal_EfuseFixHeaderProcess (pAdapter, &fixPkt, &efuse_addr))return false; }
@@ -592,7 +592,7 @@ static bool hal_EfusePgPacketWrite1ByteHeader(struct adapter *pAdapter, u8 efusereturn ret; } -static bool hal_EfusePgPacketWriteData (struct adapter *pAdapter,u8 efuseType,u16 *pAddr,struct pgpkt *pTargetPkt) +static bool hal_EfusePgPacketWriteData (struct adapter *pAdapter,u16 *pAddr,struct pgpkt *pTargetPkt) {u16 efuse_addr = *pAddr;u8 badworden;
@@ -614,16 +614,15 @@ static bool hal_EfusePgPacketWriteData(struct adapter *pAdapter, u8 efuseType, ustatic bool hal_EfusePgPacketWriteHeader (struct adapter *pAdapter, -u8 efuseType,u16 *pAddr,struct pgpkt *pTargetPkt) {bool ret = false;if (pTargetPkt->offset >=EFUSE_MAX_SECTION_BASE ) - ret =hal_EfusePgPacketWrite2ByteHeader (pAdapter, efuseType, pAddr, pTargetPkt); + ret =hal_EfusePgPacketWrite2ByteHeader (pAdapter, pAddr, pTargetPkt);else - ret =hal_EfusePgPacketWrite1ByteHeader (pAdapter, efuseType, pAddr, pTargetPkt); + ret =hal_EfusePgPacketWrite1ByteHeader (pAdapter, pAddr, pTargetPkt);return ret; }
@@ -667,7 +666,7 @@ static bool hal_EfuseCheckIfDatafollowed(struct adapter *pAdapter, u8 word_cnts,return ret; } -static bool hal_EfusePartialWriteCheck (struct adapter *pAdapter,u8 efuseType,u16 *pAddr,struct pgpkt *pTargetPkt) +static bool hal_EfusePartialWriteCheck (struct adapter *pAdapter,u16 *pAddr,struct pgpkt *pTargetPkt) {bool ret = false;u8 i, efuse_data =0 , cur_header =0 ;
@@ -754,20 +753,19 @@ bool Efuse_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en, u8 *pD {struct pgpkt targetPkt;u16 startAddr =0 ; -u8 efuseType =EFUSE_WIFI ;if (Efuse_GetCurrentSize (pAdapter) >=EFUSE_MAP_LEN_88E )return false;hal_EfuseConstructPGPkt (offset, word_en, pData, &targetPkt); -if (!hal_EfusePartialWriteCheck (pAdapter, efuseType, &startAddr, &targetPkt)) +if (!hal_EfusePartialWriteCheck (pAdapter, &startAddr, &targetPkt))return false; -if (!hal_EfusePgPacketWriteHeader (pAdapter, efuseType, &startAddr, &targetPkt)) +if (!hal_EfusePgPacketWriteHeader (pAdapter, &startAddr, &targetPkt))return false; -if (!hal_EfusePgPacketWriteData (pAdapter, efuseType, &startAddr, &targetPkt)) +if (!hal_EfusePgPacketWriteData (pAdapter, &startAddr, &targetPkt))return false;return true;
@@ -857,22 +855,22 @@ void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata) }/* Read All Efuse content */ -static void Efuse_ReadAllMap (struct adapter *pAdapter,u8 efuseType,u8 *Efuse) +static void Efuse_ReadAllMap (struct adapter *pAdapter,u8 *Efuse) {efuse_power_switch (pAdapter, false, true); -efuse_ReadEFuse (pAdapter, efuseType,0 ,EFUSE_MAP_LEN_88E , Efuse); +efuse_ReadEFuse (pAdapter,0 ,EFUSE_MAP_LEN_88E , Efuse);efuse_power_switch (pAdapter, false, false); }/* Transfer current EFUSE content to shadow init and modify map. */ -void EFUSE_ShadowMapUpdate (struct adapter *pAdapter,u8 efuseType) +void EFUSE_ShadowMapUpdate (struct adapter *pAdapter) {struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (pAdapter);if (pEEPROM->bautoload_fail_flag)memset (pEEPROM->efuse_eeprom_data,0xFF ,EFUSE_MAP_LEN_88E );else -Efuse_ReadAllMap (pAdapter, efuseType, pEEPROM->efuse_eeprom_data); +Efuse_ReadAllMap (pAdapter, pEEPROM->efuse_eeprom_data); }
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +2 -2
@@ -235,12 +235,12 @@ void Hal_InitPGData88E(struct adapter *padapter)if (!pEEPROM->bautoload_fail_flag) {/* autoload OK. */ if (!is_boot_from_eeprom (padapter)) {/* Read EFUSE real map to shadow. */ -EFUSE_ShadowMapUpdate (padapter,EFUSE_WIFI ); +EFUSE_ShadowMapUpdate (padapter); } }else {/* autoload fail */ /* update to default value 0xFF */ if (!is_boot_from_eeprom (padapter)) -EFUSE_ShadowMapUpdate (padapter,EFUSE_WIFI ); +EFUSE_ShadowMapUpdate (padapter); } }
drivers/staging/rtl8188eu/include/rtw_efuse.h +2 -6
@@ -23,9 +23,6 @@#define PGPKT_DATA_SIZE 8 -#define EFUSE_WIFI 0 -#define EFUSE_BT 1 -/* E-Fuse */ #define EFUSE_MAP_SIZE 512#define EFUSE_MAX_SIZE 256
@@ -60,13 +57,12 @@ u8 Efuse_CalculateWordCnts(u8 word_en);u8 efuse_OneByteRead (struct adapter *adapter,u16 addr,u8 *data);u8 efuse_OneByteWrite (struct adapter *adapter,u16 addr,u8 data); -void efuse_ReadEFuse (struct adapter *Adapter,u8 efuseType,u16 _offset, -u16 _size_byte,u8 *pbuf); +void efuse_ReadEFuse (struct adapter *Adapter,u16 _offset,u16 _size_byte,u8 *pbuf);int Efuse_PgPacketRead (struct adapter *adapt,u8 offset,u8 *data);bool Efuse_PgPacketWrite (struct adapter *adapter,u8 offset,u8 word,u8 *data);void efuse_WordEnableDataRead (u8 word_en,u8 *sourdata,u8 *targetdata);u8 Efuse_WordEnableDataWrite (struct adapter *adapter,u16 efuse_addr,u8 word_en,u8 *data); -void EFUSE_ShadowMapUpdate (struct adapter *adapter,u8 efusetype); +void EFUSE_ShadowMapUpdate (struct adapter *adapter);#endif
Signature · 1 line
2.20.1
PATCH 6/13 staging: rtl8188eu: remove unnecessary if clause
In reply to Martin Kaiserif and else do the same thing.
--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +2 -12
@@ -230,18 +230,8 @@ s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy)void Hal_InitPGData88E (struct adapter *padapter) { -struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (padapter); - -if (!pEEPROM->bautoload_fail_flag) {/* autoload OK. */ -if (!is_boot_from_eeprom (padapter)) { -/* Read EFUSE real map to shadow. */ -EFUSE_ShadowMapUpdate (padapter); - } - }else {/* autoload fail */ -/* update to default value 0xFF */ -if (!is_boot_from_eeprom (padapter)) -EFUSE_ShadowMapUpdate (padapter); - } +if (!is_boot_from_eeprom (padapter)) +EFUSE_ShadowMapUpdate (padapter); }void Hal_EfuseParseIDCode88E (struct adapter *padapter,u8 *hwinfo)
Signature · 1 line
2.20.1
PATCH 7/13 staging: rtl8188eu: remove RT_TRACE and MSG_88E prints from usb_halinit.c
In reply to Martin KaiserEventually, all driver-specific debug prints should be removed. Take another step in that direction.
--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 21 --------------------- 1 file changed, 21 deletions(-)
drivers/staging/rtl8188eu/hal/usb_halinit.c +0 -21
@@ -664,7 +664,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_INIT_PW_ON ); status =rtw_hal_power_on (Adapter);if (status == _FAIL) { -RT_TRACE (_module_hci_hal_init_c_, _drv_err_, ("Failed to init power on!\n" )); goto exit; }
@@ -704,7 +703,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) Adapter->bFWReady = false;return status; } -RT_TRACE (_module_hci_hal_init_c_, _drv_info_, ("Initializeadapt8192CSdio(): Download Firmware Success!!\n" )); Adapter->bFWReady = true; }rtl8188e_InitializeFirmwareVars (Adapter);
@@ -725,7 +723,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_INIT_LLTT ); status =InitLLTTable (Adapter, txpktbuf_bndy);if (status == _FAIL) { -RT_TRACE (_module_hci_hal_init_c_, _drv_err_, ("Failed to init LLT table\n" )); goto exit; }
@@ -861,8 +858,6 @@ static void CardDisableRTL8188EU(struct adapter *Adapter) {u8 val8; -RT_TRACE (_module_hci_hal_init_c_, _drv_info_, ("%s\n" , __func__)); -/* Stop Tx Report Timer. 0x4EC[Bit1]=b'0 */ val8 =usb_read8 (Adapter,REG_TX_RPT_CTRL );usb_write8 (Adapter,REG_TX_RPT_CTRL , val8 & (~BIT (1 )));
@@ -954,14 +949,10 @@ u32 rtw_hal_inirp_init(struct adapter *Adapter) status = _SUCCESS; -RT_TRACE (_module_hci_hal_init_c_, _drv_info_, - ("===> usb_inirp_init\n" )); -/* issue Rx irp to receive data */ precvbuf = precvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) {if (!usb_read_port (Adapter,RECV_BULK_IN_ADDR , precvbuf)) { -RT_TRACE (_module_hci_hal_init_c_, _drv_err_, ("usb_rx_init: usb_read_port error\n" )); status = _FAIL; goto exit; }
@@ -970,9 +961,6 @@ u32 rtw_hal_inirp_init(struct adapter *Adapter) } exit: - -RT_TRACE (_module_hci_hal_init_c_, _drv_info_, ("<=== usb_inirp_init\n" )); -return status; }
@@ -1016,8 +1004,6 @@ static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool/* Read Permanent MAC address */ memcpy (eeprom->mac_addr, &hwinfo[EEPROM_MAC_ADDR_88EU ],ETH_ALEN ); } -RT_TRACE (_module_hci_hal_init_c_, _drv_notice_, - ("%s: Permanent Address = %pM\n" , __func__, eeprom->mac_addr)); }static void readAdapterInfo_8188EU (struct adapter *adapt)
@@ -1056,14 +1042,7 @@ static void _ReadPROMContent(struct adapter *Adapter)void rtw_hal_read_chip_info (struct adapter *Adapter) { -unsigned long start = jiffies; - -MSG_88E ("====> %s\n" , __func__); -_ReadPROMContent (Adapter); - -MSG_88E ("<==== %s in %d ms\n" , __func__, -jiffies_to_msecs (jiffies - start)); }#define GPIO_DEBUG_PORT_NUM 0
Signature · 1 line
2.20.1
PATCH 8/13 staging: rtl8188eu: remove HAL_INIT_PROFILE_TAG
In reply to Martin KaiserRemove HAL_INIT_PROFILE_TAG, which is an empty loop already.
--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 20 -------------------- 1 file changed, 20 deletions(-)
drivers/staging/rtl8188eu/hal/usb_halinit.c +0 -20
@@ -643,10 +643,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv;struct registry_priv *pregistrypriv = &Adapter->registrypriv; -#define HAL_INIT_PROFILE_TAG (stage) do {} while (0) - -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_BEGIN ); -if (Adapter->pwrctrlpriv.bkeepfwalive) {if (haldata->odmpriv.RFCalibrateInfo.bIQKInitialized) {rtl88eu_phy_iq_calibrate (Adapter, true);
@@ -661,7 +657,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) goto exit; } -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_INIT_PW_ON ); status =rtw_hal_power_on (Adapter);if (status == _FAIL) { goto exit;
@@ -684,7 +679,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) txpktbuf_bndy =WMM_NORMAL_TX_PAGE_BOUNDARY_88E ; } -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_MISC01 );_InitQueueReservedPage (Adapter);_InitQueuePriority (Adapter);_InitPageBoundary (Adapter);
@@ -692,7 +686,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)_InitTxBufferBoundary (Adapter,0 ); -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_DOWNLOAD_FW );if (Adapter->registrypriv.mp_mode ==1 ) {_InitRxSetting (Adapter); Adapter->bFWReady = false;
@@ -713,20 +706,17 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)rtl88eu_phy_rf_config (Adapter); -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_EFUSE_PATCH ); status =rtl8188e_iol_efuse_patch (Adapter);if (status == _FAIL) goto exit;_InitTxBufferBoundary (Adapter, txpktbuf_bndy); -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_INIT_LLTT ); status =InitLLTTable (Adapter, txpktbuf_bndy);if (status == _FAIL) { goto exit; } -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_MISC02 );/* Get Rx PHY status in order to report RSSI and others. */ _InitDriverInfoSize (Adapter,DRVINFO_SZ );
@@ -768,13 +758,10 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) haldata->RfRegChnlVal[0 ] =rtw_hal_read_rfreg (Adapter, (enum rf_radio_path )0 ,RF_CHNLBW , bRFRegOffsetMask); haldata->RfRegChnlVal[1 ] =rtw_hal_read_rfreg (Adapter, (enum rf_radio_path )1 ,RF_CHNLBW , bRFRegOffsetMask); -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_TURN_ON_BLOCK );_BBTurnOnBlock (Adapter); -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_INIT_SECURITY );invalidate_cam_all (Adapter); -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_MISC11 );/* 2010/12/17 MH We need to set TX power according to EFUSE content at first. */ phy_set_tx_power_level (Adapter, haldata->CurrentChannel);
@@ -799,7 +786,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)/* Nav limit , suggest by scott */ usb_write8 (Adapter,0x652 ,0x0 ); -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_INIT_HAL_DM );rtl8188e_InitHalDm (Adapter);/* 2010/08/11 MH Merge from 8192SE for Minicard init. We need to confirm current radio status */
@@ -823,7 +809,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)/* enable tx DMA to drop the redundate data of packet */ usb_write16 (Adapter,REG_TXDMA_OFFSET_CHK , (usb_read16 (Adapter,REG_TXDMA_OFFSET_CHK ) |DROP_DATA_EN )); -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_IQK );/* 2010/08/26 MH Merge from 8192CE. */ if (pwrctrlpriv->rf_pwrstate == rf_on) {if (haldata->odmpriv.RFCalibrateInfo.bIQKInitialized) {
@@ -833,15 +818,11 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) haldata->odmpriv.RFCalibrateInfo.bIQKInitialized = true; } -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_PW_TRACK ); -ODM_TXPowerTrackingCheck (&haldata->odmpriv); -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_LCK );rtl88eu_phy_lc_calibrate (Adapter); } -/* HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PABIAS); */ /* _InitPABias(Adapter); */ usb_write8 (Adapter,REG_USB_HRPWM ,0 );
@@ -849,7 +830,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)usb_write32 (Adapter,REG_FWHW_TXQ_CTRL ,usb_read32 (Adapter,REG_FWHW_TXQ_CTRL ) |BIT (12 )); exit: -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_END );return status; }
Signature · 1 line
2.20.1
PATCH 9/13 staging: rtl8188eu: simplify rtl88eu_mon_init
In reply to Martin KaiserThe code looks a bit nicer without goto.
--- drivers/staging/rtl8188eu/os_dep/mon.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/os_dep/mon.c +5 -8
@@ -163,18 +163,15 @@ struct net_device *rtl88eu_mon_init(void) dev =alloc_netdev (0 ,"mon%d" ,NET_NAME_UNKNOWN , mon_setup);if (!dev) - goto fail; +return NULL ; err =register_netdev (dev); -if (err <0 ) - goto fail_free_dev; +if (err <0 ) { +free_netdev (dev); +return NULL ; + }return dev; - -fail_free_dev: -free_netdev (dev); -fail: -return NULL ; }void rtl88eu_mon_deinit (struct net_device *dev)
Signature · 1 line
2.20.1
PATCH 10/13 staging: rtl8188eu: remove RT_TRACE prints from pwrseqcmd.c
In reply to Martin KaiserEventually, all driver-specific debug prints should be removed. Take another step in that direction.
--- drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 24 ----------------------- 1 file changed, 24 deletions(-)
drivers/staging/rtl8188eu/hal/pwrseqcmd.c +0 -24
@@ -25,27 +25,12 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, do { pwrcfgcmd = pwrseqcmd[aryidx]; - RT_TRACE(_module_hal_init_c_, _drv_info_, - ("%s: offset(%#x) cut_msk(%#x)" - " cmd(%#x)" - "msk(%#x) value(%#x)\n", - __func__, - GET_PWR_CFG_OFFSET(pwrcfgcmd), - GET_PWR_CFG_CUT_MASK(pwrcfgcmd), - GET_PWR_CFG_CMD(pwrcfgcmd), - GET_PWR_CFG_MASK(pwrcfgcmd), - GET_PWR_CFG_VALUE(pwrcfgcmd))); - /* Only Handle the command whose CUT is matched */ if (GET_PWR_CFG_CUT_MASK(pwrcfgcmd) & cut_vers) { switch (GET_PWR_CFG_CMD(pwrcfgcmd)) { case PWR_CMD_READ: - RT_TRACE(_module_hal_init_c_, _drv_info_, - ("%s: PWR_CMD_READ\n", __func__)); break; case PWR_CMD_WRITE: - RT_TRACE(_module_hal_init_c_, _drv_info_, - ("%s: PWR_CMD_WRITE\n", __func__)); offset = GET_PWR_CFG_OFFSET(pwrcfgcmd); /* Read the value from system register */
@@ -59,9 +44,6 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers,usb_write8 (padapter, offset, value);break ;case PWR_CMD_POLLING : -RT_TRACE (_module_hal_init_c_, _drv_info_, - ("%s: PWR_CMD_POLLING\n" , __func__)); - poll_bit = false; offset =GET_PWR_CFG_OFFSET (pwrcfgcmd); do {
@@ -79,8 +61,6 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, }while (!poll_bit);break ;case PWR_CMD_DELAY : -RT_TRACE (_module_hal_init_c_, _drv_info_, - ("%s: PWR_CMD_DELAY\n" , __func__));if (GET_PWR_CFG_VALUE (pwrcfgcmd) ==PWRSEQ_DELAY_US )udelay (GET_PWR_CFG_OFFSET (pwrcfgcmd));else
@@ -88,12 +68,8 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers,break ;case PWR_CMD_END :/* When this command is parsed, end the process */ -RT_TRACE (_module_hal_init_c_, _drv_info_, - ("%s: PWR_CMD_END\n" , __func__));return true;default : -RT_TRACE (_module_hal_init_c_, _drv_err_, - ("%s: Unknown CMD!!\n" , __func__));break ; } }
Signature · 1 line
2.20.1
PATCH 11/13 staging: rtl8188eu: make efuse_ReadEFuse static
In reply to Martin KaiserThe function is used only inside rtw_efuse.c.
--- drivers/staging/rtl8188eu/core/rtw_efuse.c | 2 +- drivers/staging/rtl8188eu/include/rtw_efuse.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_efuse.c +1 -1
@@ -281,7 +281,7 @@ static s32 iol_read_efuse(struct adapter *padapter, u8 txpktbuf_bndy, u16 offsetreturn status; } -void efuse_ReadEFuse (struct adapter *Adapter,u16 _offset,u16 _size_byte,u8 *pbuf) +static void efuse_ReadEFuse (struct adapter *Adapter,u16 _offset,u16 _size_byte,u8 *pbuf) {if (rtw_iol_applied (Adapter)) {rtw_hal_power_on (Adapter);
drivers/staging/rtl8188eu/include/rtw_efuse.h +0 -1
@@ -57,7 +57,6 @@ u8 Efuse_CalculateWordCnts(u8 word_en);u8 efuse_OneByteRead (struct adapter *adapter,u16 addr,u8 *data);u8 efuse_OneByteWrite (struct adapter *adapter,u16 addr,u8 data); -void efuse_ReadEFuse (struct adapter *Adapter,u16 _offset,u16 _size_byte,u8 *pbuf);int Efuse_PgPacketRead (struct adapter *adapt,u8 offset,u8 *data);bool Efuse_PgPacketWrite (struct adapter *adapter,u8 offset,u8 word,u8 *data);void efuse_WordEnableDataRead (u8 word_en,u8 *sourdata,u8 *targetdata);
Signature · 1 line
2.20.1
PATCH 12/13 staging: rtl8188eu: remove sdio defines
In reply to Martin KaiserRemove sdio defines which are not used by this driver.
--- .../staging/rtl8188eu/include/rtl8188e_spec.h | 136 ------------------ 1 file changed, 136 deletions(-)
drivers/staging/rtl8188eu/include/rtl8188e_spec.h +0 -136
@@ -1089,142 +1089,6 @@ So the following defines for 92C is not entire!!!!!!#define SCR_TXBCUSEDK BIT(6)/* Force Tx Bcast pkt Use Default Key */ #define SCR_RXBCUSEDK BIT(7)/* Force Rx Bcast pkt Use Default Key */ -/* RTL8188E SDIO Configuration */ - -/* I/O bus domain address mapping */ -#define SDIO_LOCAL_BASE 0x10250000 -#define WLAN_IOREG_BASE 0x10260000 -#define FIRMWARE_FIFO_BASE 0x10270000 -#define TX_HIQ_BASE 0x10310000 -#define TX_MIQ_BASE 0x10320000 -#define TX_LOQ_BASE 0x10330000 -#define RX_RX0FF_BASE 0x10340000 - -/* SDIO host local register space mapping. */ -#define SDIO_LOCAL_MSK 0x0FFF -#define WLAN_IOREG_MSK 0x7FFF -#define WLAN_FIFO_MSK 0x1FFF/* Aggregation Length[12:0] */ -#define WLAN_RX0FF_MSK 0x0003 - -/* Without ref to the SDIO Device ID */ -#define SDIO_WITHOUT_REF_DEVICE_ID 0 -#define SDIO_LOCAL_DEVICE_ID 0/* 0b[16], 000b[15:13] */ -#define WLAN_TX_HIQ_DEVICE_ID 4/* 0b[16], 100b[15:13] */ -#define WLAN_TX_MIQ_DEVICE_ID 5/* 0b[16], 101b[15:13] */ -#define WLAN_TX_LOQ_DEVICE_ID 6/* 0b[16], 110b[15:13] */ -#define WLAN_RX0FF_DEVICE_ID 7/* 0b[16], 111b[15:13] */ -#define WLAN_IOREG_DEVICE_ID 8/* 1b[16] */ - -/* SDIO Tx Free Page Index */ -#define HI_QUEUE_IDX 0 -#define MID_QUEUE_IDX 1 -#define LOW_QUEUE_IDX 2 -#define PUBLIC_QUEUE_IDX 3 - -#define SDIO_MAX_TX_QUEUE 3/* HIQ, MIQ and LOQ */ -#define SDIO_MAX_RX_QUEUE 1 - -/* SDIO Tx Control */ -#define SDIO_REG_TX_CTRL 0x0000 -/* SDIO Host Interrupt Mask */ -#define SDIO_REG_HIMR 0x0014 -/* SDIO Host Interrupt Service Routine */ -#define SDIO_REG_HISR 0x0018 -/* HCI Current Power Mode */ -#define SDIO_REG_HCPWM 0x0019 -/* RXDMA Request Length */ -#define SDIO_REG_RX0_REQ_LEN 0x001C -/* Free Tx Buffer Page */ -#define SDIO_REG_FREE_TXPG 0x0020 -/* HCI Current Power Mode 1 */ -#define SDIO_REG_HCPWM1 0x0024 -/* HCI Current Power Mode 2 */ -#define SDIO_REG_HCPWM2 0x0026 -/* HTSF Informaion */ -#define SDIO_REG_HTSFR_INFO 0x0030 -/* HCI Request Power Mode 1 */ -#define SDIO_REG_HRPWM1 0x0080 -/* HCI Request Power Mode 2 */ -#define SDIO_REG_HRPWM2 0x0082 -/* HCI Power Save Clock */ -#define SDIO_REG_HPS_CLKR 0x0084 -/* SDIO HCI Suspend Control */ -#define SDIO_REG_HSUS_CTRL 0x0086 -/* SDIO Host Extension Interrupt Mask Always */ -#define SDIO_REG_HIMR_ON 0x0090 -/* SDIO Host Extension Interrupt Status Always */ -#define SDIO_REG_HISR_ON 0x0091 - -#define SDIO_HIMR_DISABLED 0 - -/* RTL8188E SDIO Host Interrupt Mask Register */ -#define SDIO_HIMR_RX_REQUEST_MSK BIT(0) -#define SDIO_HIMR_AVAL_MSK BIT(1) -#define SDIO_HIMR_TXERR_MSK BIT(2) -#define SDIO_HIMR_RXERR_MSK BIT(3) -#define SDIO_HIMR_TXFOVW_MSK BIT(4) -#define SDIO_HIMR_RXFOVW_MSK BIT(5) -#define SDIO_HIMR_TXBCNOK_MSK BIT(6) -#define SDIO_HIMR_TXBCNERR_MSK BIT(7) -#define SDIO_HIMR_BCNERLY_INT_MSK BIT(16) -#define SDIO_HIMR_C2HCMD_MSK BIT(17) -#define SDIO_HIMR_CPWM1_MSK BIT(18) -#define SDIO_HIMR_CPWM2_MSK BIT(19) -#define SDIO_HIMR_HSISR_IND_MSK BIT(20) -#define SDIO_HIMR_GTINT3_IND_MSK BIT(21) -#define SDIO_HIMR_GTINT4_IND_MSK BIT(22) -#define SDIO_HIMR_PSTIMEOUT_MSK BIT(23) -#define SDIO_HIMR_OCPINT_MSK BIT(24) -#define SDIO_HIMR_ATIMEND_MSK BIT(25) -#define SDIO_HIMR_ATIMEND_E_MSK BIT(26) -#define SDIO_HIMR_CTWEND_MSK BIT(27) - -/* RTL8188E SDIO Specific */ -#define SDIO_HIMR_MCU_ERR_MSK BIT(28) -#define SDIO_HIMR_TSF_BIT32_TOGGLE_MSK BIT(29) - -/* SDIO Host Interrupt Service Routine */ -#define SDIO_HISR_RX_REQUEST BIT(0) -#define SDIO_HISR_AVAL BIT(1) -#define SDIO_HISR_TXERR BIT(2) -#define SDIO_HISR_RXERR BIT(3) -#define SDIO_HISR_TXFOVW BIT(4) -#define SDIO_HISR_RXFOVW BIT(5) -#define SDIO_HISR_TXBCNOK BIT(6) -#define SDIO_HISR_TXBCNERR BIT(7) -#define SDIO_HISR_BCNERLY_INT BIT(16) -#define SDIO_HISR_C2HCMD BIT(17) -#define SDIO_HISR_CPWM1 BIT(18) -#define SDIO_HISR_CPWM2 BIT(19) -#define SDIO_HISR_HSISR_IND BIT(20) -#define SDIO_HISR_GTINT3_IND BIT(21) -#define SDIO_HISR_GTINT4_IND BIT(22) -#define SDIO_HISR_PSTIME BIT(23) -#define SDIO_HISR_OCPINT BIT(24) -#define SDIO_HISR_ATIMEND BIT(25) -#define SDIO_HISR_ATIMEND_E BIT(26) -#define SDIO_HISR_CTWEND BIT(27) - -/* RTL8188E SDIO Specific */ -#define SDIO_HISR_MCU_ERR BIT(28) -#define SDIO_HISR_TSF_BIT32_TOGGLE BIT(29) - -#define MASK_SDIO_HISR_CLEAR \ - (SDIO_HISR_TXERR | SDIO_HISR_RXERR | SDIO_HISR_TXFOVW |\ - SDIO_HISR_RXFOVW | SDIO_HISR_TXBCNOK | SDIO_HISR_TXBCNERR |\ - SDIO_HISR_C2HCMD | SDIO_HISR_CPWM1 | SDIO_HISR_CPWM2 |\ - SDIO_HISR_HSISR_IND | SDIO_HISR_GTINT3_IND | SDIO_HISR_GTINT4_IND |\ - SDIO_HISR_PSTIMEOUT | SDIO_HISR_OCPINT) - -/* SDIO HCI Suspend Control Register */ -#define HCI_RESUME_PWR_RDY BIT(1) -#define HCI_SUS_CTRL BIT(0) - -/* SDIO Tx FIFO related */ -/* The number of Tx FIFO free page */ -#define SDIO_TX_FREE_PG_QUEUE 4 -#define SDIO_TX_FIFO_PAGE_SZ 128 -/* 0xFE00h ~ 0xFE55h USB Configuration */ /* 2 USB Information (0xFE17) */
Signature · 1 line
2.20.1
PATCH 13/13 staging: rtl8188eu: remove more unused defines
In reply to Martin KaiserRemove some defines for register addresses and bits which obviously refer to chipsets other than rtl8188eu.
--- .../staging/rtl8188eu/include/rtl8188e_spec.h | 148 +----------------- 1 file changed, 1 insertion(+), 147 deletions(-)
drivers/staging/rtl8188eu/include/rtl8188e_spec.h +1 -147
@@ -7,15 +7,8 @@#ifndef __RTL8188E_SPEC_H__#define __RTL8188E_SPEC_H__ -/* 8192C Register offset definition */ - -#define HAL_PS_TIMER_INT_DELAY 50/* 50 microseconds */ -#define HAL_92C_NAV_UPPER_UNIT 128/* micro-second */ - -#define MAC_ADDR_LEN 6/* 8188E PKT_BUFF_ACCESS_CTRL value */ #define TXPKT_BUF_SELECT 0x69 -#define RXPKT_BUF_SELECT 0xA5#define DISABLE_TRXPKT_BUF_ACCESS 0x0/* 0x0000h ~ 0x00FFh System Configuration */
@@ -52,19 +45,7 @@#define REG_FSISR 0x0054#define REG_HSIMR 0x0058#define REG_HSISR 0x005c -#define REG_GPIO_PIN_CTRL_2 0x0060/* RTL8723 WIFI/BT/GPS -* Multi-Function GPIO Pin Control. -*/ -#define REG_GPIO_IO_SEL_2 0x0062/* RTL8723 WIFI/BT/GPS -* Multi-Function GPIO Select. -*/ #define REG_BB_PAD_CTRL 0x0064 -#define REG_MULTI_FUNC_CTRL 0x0068/* RTL8723 WIFI/BT/GPS -* Multi-Function control source. -*/ -#define REG_GPIO_OUTPUT 0x006c -#define REG_AFE_XTAL_CTRL_EXT 0x0078/* RTL8188E */ -#define REG_XCK_OUT_CTRL 0x007c/* RTL8188E */ #define REG_MCUFWDL 0x0080#define REG_WOL_EVENT 0x0081/* RTL8188E */ #define REG_MCUTSTCFG 0x0084
@@ -172,9 +153,6 @@#define REG_PCIE_HCPWM 0x0363/* PCIe CPWM */ #define REG_WATCH_DOG 0x0368 -/* RTL8723 series ------------------------------ */ -#define REG_PCIE_HISR 0x03A0 -/* spec version 11 */ /* 0x0400h ~ 0x047Fh Protocol Configuration */ #define REG_VOQ_INFORMATION 0x0400
@@ -459,34 +437,6 @@#define GPIO_IO_SEL (REG_GPIO_PIN_CTRL + 2)#define GPIO_MOD (REG_GPIO_PIN_CTRL + 3) -/* 8723/8188E Host System Interrupt Mask Register (offset 0x58, 32 byte) */ -#define HSIMR_GPIO12_0_INT_EN BIT(0) -#define HSIMR_SPS_OCP_INT_EN BIT(5) -#define HSIMR_RON_INT_EN BIT(6) -#define HSIMR_PDN_INT_EN BIT(7) -#define HSIMR_GPIO9_INT_EN BIT(25) - -/* 8723/8188E Host System Interrupt Status Register (offset 0x5C, 32 byte) */ -#define HSISR_GPIO12_0_INT BIT(0) -#define HSISR_SPS_OCP_INT BIT(5) -#define HSISR_RON_INT_EN BIT(6) -#define HSISR_PDNINT BIT(7) -#define HSISR_GPIO9_INT BIT(25) - -/* 8192C (MSR) Media Status Register (Offset 0x4C, 8 bits) */ -/* -* Network Type -* 00: No link -* 01: Link in ad hoc network -* 10: Link in infrastructure network -* 11: AP mode -* Default: 00b. -*/ -#define MSR_NOLINK 0x00 -#define MSR_ADHOC 0x01 -#define MSR_INFRA 0x02 -#define MSR_AP 0x03 -/* 88EU (MSR) Media Status Register (Offset 0x4C, 8 bits) */ #define USB_INTR_CONTENT_C2H_OFFSET 0#define USB_INTR_CONTENT_CPWM1_OFFSET 16
@@ -505,34 +455,6 @@#define CMD_EFUSE_PATCH_ERR BIT(6)#define CMD_IOCONFIG_ERR BIT(7) -/* 6. Adaptive Control Registers (Offset: 0x0160 - 0x01CF) */ -/* 8192C Response Rate Set Register (offset 0x181, 24bits) */ -#define RRSR_1M BIT(0) -#define RRSR_2M BIT(1) -#define RRSR_5_5M BIT(2) -#define RRSR_11M BIT(3) -#define RRSR_6M BIT(4) -#define RRSR_9M BIT(5) -#define RRSR_12M BIT(6) -#define RRSR_18M BIT(7) -#define RRSR_24M BIT(8) -#define RRSR_36M BIT(9) -#define RRSR_48M BIT(10) -#define RRSR_54M BIT(11) -#define RRSR_MCS0 BIT(12) -#define RRSR_MCS1 BIT(13) -#define RRSR_MCS2 BIT(14) -#define RRSR_MCS3 BIT(15) -#define RRSR_MCS4 BIT(16) -#define RRSR_MCS5 BIT(17) -#define RRSR_MCS6 BIT(18) -#define RRSR_MCS7 BIT(19) - -/* 8192C Response Rate Set Register (offset 0x1BF, 8bits) */ -/* WOL bit information */ -#define HAL92C_WOL_PTK_UPDATE_EVENT BIT(0) -#define HAL92C_WOL_GTK_UPDATE_EVENT BIT(1) -/* 8192C BW_OPMODE bits (Offset 0x203, 8bit) */ #define BW_OPMODE_20MHZ BIT(2)#define BW_OPMODE_5G BIT(1)
@@ -565,12 +487,6 @@#define SCR_TxSecEnable 0x02#define SCR_RxSecEnable 0x04 -/* 10. Power Save Control Registers (Offset: 0x0260 - 0x02DF) */ -#define WOW_PMEN BIT(0)/* Power management Enable. */ -#define WOW_WOMEN BIT(1)/* WoW function on or off. */ -#define WOW_MAGIC BIT(2)/* Magic packet */ -#define WOW_UWF BIT(3)/* Unicast Wakeup frame. */ -/* 12. Host Interrupt Status Registers (Offset: 0x0300 - 0x030F) */ /* 8188 IMR/ISR bits */ #define IMR_DISABLED_88E 0x0
@@ -648,21 +564,6 @@ So the following defines for 92C is not entire!!!!!!* 0x0600h ~ 0x07FFh WMAC Configuration (512 Bytes) * 0x2000h ~ 0x3FFFh 8051 FW Download Region (8196 Bytes) */ -/* 8192C (TXPAUSE) transmission pause (Offset 0x522, 8 bits) */ -/* Note: -* The bits of stopping AC(VO/VI/BE/BK) queue in datasheet -* RTL8192S/RTL8192C are wrong, -* the correct arragement is VO - Bit0, VI - Bit1, BE - Bit2, -* and BK - Bit3. -* 8723 and 88E may be not correct either in the earlier version. -*/ -#define StopBecon BIT(6) -#define StopHigh BIT(5) -#define StopMgt BIT(4) -#define StopBK BIT(3) -#define StopBE BIT(2) -#define StopVI BIT(1) -#define StopVO BIT(0)/* 8192C (RCR) Receive Configuration Register(Offset 0x608, 32 bits) */ #define RCR_APPFCS BIT(31)/* WMAC append FCS after payload */
@@ -695,14 +596,8 @@ So the following defines for 92C is not entire!!!!!!#define RCR_FIFO_OFFSET 13/* 0xFE00h ~ 0xFE55h USB Configuration */ -#define REG_USB_INFO 0xFE17 -#define REG_USB_SPECIAL_OPTION 0xFE55 -#define REG_USB_DMA_AGG_TO 0xFE5B -#define REG_USB_AGG_TO 0xFE5C -#define REG_USB_AGG_TH 0xFE5D -#define REG_USB_HRPWM 0xFE58 -#define REG_USB_HCPWM 0xFE57 +/* 8192C Register Bit and Content definition */ /* 0x0000h ~ 0x00FFh System Configuration */
@@ -1140,14 +1035,6 @@ So the following defines for 92C is not entire!!!!!!/* GPS function enable */ #define GPS_FUNC_EN BIT(22) -/* 3 REG_LIFECTRL_CTRL */ -#define HAL92C_EN_PKT_LIFE_TIME_BK BIT(3) -#define HAL92C_EN_PKT_LIFE_TIME_BE BIT(2) -#define HAL92C_EN_PKT_LIFE_TIME_VI BIT(1) -#define HAL92C_EN_PKT_LIFE_TIME_VO BIT(0) - -#define HAL92C_MSDU_LIFE_TIME_UNIT 128/* in us */ -/* General definitions */ #define LAST_ENTRY_OF_TX_PKT_BUFFER 176/* 22k 22528 bytes */
@@ -1173,48 +1060,15 @@ So the following defines for 92C is not entire!!!!!!#define EEPROM_CUSTOMERID_88E 0xC5#define EEPROM_RF_ANTENNA_OPT_88E 0xC9 -/* RTL88EE */ -#define EEPROM_MAC_ADDR_88EE 0xD0 -#define EEPROM_VID_88EE 0xD6 -#define EEPROM_DID_88EE 0xD8 -#define EEPROM_SVID_88EE 0xDA -#define EEPROM_SMID_88EE 0xDC -/* RTL88EU */ #define EEPROM_MAC_ADDR_88EU 0xD7#define EEPROM_VID_88EU 0xD0#define EEPROM_PID_88EU 0xD2#define EEPROM_USB_OPTIONAL_FUNCTION0 0xD4 -/* RTL88ES */ -#define EEPROM_MAC_ADDR_88ES 0x11A -/* EEPROM/Efuse Value Type */ #define EETYPE_TX_PWR 0x0 -/* Default Value for EEPROM or EFUSE!!! */ -#define EEPROM_Default_TSSI 0x0 -#define EEPROM_Default_TxPowerDiff 0x0 -#define EEPROM_Default_CrystalCap 0x5 -/* Default: 2X2, RTL8192CE(QFPN68) */ -#define EEPROM_Default_BoardType 0x02 -#define EEPROM_Default_TxPower 0x1010 -#define EEPROM_Default_HT2T_TxPwr 0x10 - -#define EEPROM_Default_LegacyHTTxPowerDiff 0x3 -#define EEPROM_Default_ThermalMeter 0x12 - -#define EEPROM_Default_AntTxPowerDiff 0x0 -#define EEPROM_Default_TxPwDiff_CrystalCap 0x5 -#define EEPROM_Default_TxPowerLevel 0x2A - -#define EEPROM_Default_HT40_2SDiff 0x0 -/* HT20<->40 default Tx Power Index Difference */ -#define EEPROM_Default_HT20_Diff 2 -#define EEPROM_Default_LegacyHTTxPowerDiff 0x3 -#define EEPROM_Default_HT40_PwrMaxOffset 0 -#define EEPROM_Default_HT20_PwrMaxOffset 0 -#define EEPROM_Default_CrystalCap_88E 0x20#define EEPROM_Default_ThermalMeter_88E 0x18
Signature · 1 line
2.20.1