staging: rtl8188eu: Cleanup firmware initialization code
PATCH 1/22 staging: rtl8188eu: Cleanup firmware initialization code
Using rtl8188ee's (drivers/net/wireless/rtlwifi/rtl8188ee/fw.c) neat and clean firmware initialization code to replace rtl8188eu's messy firmware initialization code.
--- drivers/staging/rtl8188eu/Makefile | 1 + drivers/staging/rtl8188eu/hal/fw.c | 236 ++++++++++++++++ drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 298 --------------------- drivers/staging/rtl8188eu/hal/usb_halinit.c | 6 +- drivers/staging/rtl8188eu/include/drv_types.h | 7 - drivers/staging/rtl8188eu/include/fw.h | 59 ++++ drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 47 +--- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 7 +- 8 files changed, 309 insertions(+), 352 deletions(-) create mode 100644 drivers/staging/rtl8188eu/hal/fw.c create mode 100644 drivers/staging/rtl8188eu/include/fw.h
drivers/staging/rtl8188eu/Makefile +1 -0
@@ -17,6 +17,7 @@ r8188eu-y := \ core/rtw_sta_mgt.o \ core/rtw_wlan_util.o \ core/rtw_xmit.o \ + hal/fw.o \ hal/HalHWImg8188E_MAC.o \ hal/HalHWImg8188E_BB.o \ hal/HalHWImg8188E_RF.o \
drivers/staging/rtl8188eu/hal/fw.c new file +236 -0
236 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -298
312 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/usb_halinit.c +3 -3
@@ -22,7 +22,7 @@#include <osdep_service.h> #include <drv_types.h> #include <rtw_efuse.h> - +#include <fw.h> #include <rtl8188e_hal.h> #include <rtl8188e_led.h> #include <rtw_iol.h>
@@ -744,9 +744,9 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter) Adapter->bFWReady = false; haldata->fw_ractrl = false; }else { - status =rtl8188e_FirmwareDownload (Adapter); + status =rtl88e_download_fw (Adapter); -if (status != _SUCCESS) { +if (status) {DBG_88E ("%s: Download Firmware failed!!\n" , __func__); Adapter->bFWReady = false; haldata->fw_ractrl = false;
drivers/staging/rtl8188eu/include/drv_types.h +0 -7
@@ -141,15 +141,8 @@ struct registry_priv {#define MAX_CONTINUAL_URB_ERR 4 -struct rt_firmware { -u8 *szFwBuffer; -u32 ulFwLength; -}; -struct dvobj_priv {struct adapter *if1; -struct rt_firmware firmware; -/* For 92D, DMDP have 2 interface. */ u8 InterfaceNumber;u8 NumInterfaces;
drivers/staging/rtl8188eu/include/fw.h new file +59 -0
59 lines not on this page · raw message
drivers/staging/rtl8188eu/include/rtl8188e_hal.h +6 -41
65 lines not on this page · raw message
drivers/staging/rtl8188eu/os_dep/os_intfs.c +4 -3
@@ -26,6 +26,7 @@#include <recv_osdep.h> #include <hal_intf.h> #include <rtw_ioctl.h> +#include <rtl8188e_hal.h> #include <usb_hal.h>
@@ -1121,7 +1122,7 @@ int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)int netdev_close (struct net_device *pnetdev) {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (pnetdev); -struct dvobj_priv *dvobj =adapter_to_dvobj (padapter); +struct hal_data_8188e *rtlhal =GET_HAL_DATA (padapter);RT_TRACE (_module_os_intfs_c_, _drv_info_, ("+88eu_drv - drv_close\n" ));
@@ -1154,8 +1155,8 @@ int netdev_close(struct net_device *pnetdev)rtw_led_control (padapter,LED_CTL_POWER_OFF ); } -kfree (dvobj->firmware.szFwBuffer); - dvobj->firmware.szFwBuffer =NULL ; +kfree (rtlhal->pfirmware); + rtlhal->pfirmware =NULL ;RT_TRACE (_module_os_intfs_c_, _drv_info_, ("-88eu_drv - drv_close\n" ));DBG_88E ("-88eu_drv - drv_close, bup =%d\n" , padapter->bup);
Signature · 1 line
1.7.10.4
PATCH 2/22 staging: rtl8188eu: Cleanup and simplify MAC configuration code
--- drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c | 120 ++------------------ drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 7 -- drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 37 ------ drivers/staging/rtl8188eu/hal/usb_halinit.c | 15 +-- drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 1 - .../staging/rtl8188eu/include/HalHWImg8188E_MAC.h | 30 ----- drivers/staging/rtl8188eu/include/odm_HWConfig.h | 2 - drivers/staging/rtl8188eu/include/odm_precomp.h | 1 - drivers/staging/rtl8188eu/include/phy.h | 1 + 9 files changed, 15 insertions(+), 199 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_MAC.h create mode 100644 drivers/staging/rtl8188eu/include/phy.h
drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c +11 -109
@@ -21,36 +21,7 @@#include "odm_precomp.h" #include <rtw_iol.h> -static bool Checkcondition (const u32 condition,const u32 hex) -{ -u32 _board = (hex &0x000000FF ); -u32 _interface = (hex &0x0000FF00 ) >>8 ; -u32 _platform = (hex &0x00FF0000 ) >>16 ; -u32 cond = condition; - -if (condition ==0xCDCDCDCD ) -return true; - - cond = condition &0x000000FF ; -if ((_board == cond) && cond !=0x00 ) -return false; - - cond = condition &0x0000FF00 ; - cond = cond >>8 ; -if ((_interface & cond) ==0 && cond !=0x07 ) -return false; - - cond = condition &0x00FF0000 ; - cond = cond >>16 ; -if ((_platform & cond) ==0 && cond !=0x0F ) -return false; -return true; -} - - -/****************************************************************************** -* MAC_REG.TXT -******************************************************************************/ +/* MAC_REG.TXT */ static u32 array_MAC_REG_8188E[] = {0x026 ,0x00000041 ,
@@ -145,87 +116,18 @@ static u32 array_MAC_REG_8188E[] = { 0x70B, 0x00000087, }; -enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E (struct odm_dm_struct *dm_odm) +bool rtl88e_phy_mac_config (struct adapter *adapt) { -#define READ_NEXT_PAIR (v1, v2, i) do { i += 2; v1 = array[i]; v2 = array[i+1]; } while (0) - -u32 hex =0 ; -u32 i; -u8 platform = dm_odm->SupportPlatform; -u8 interface_val = dm_odm->SupportInterface; -u8 board = dm_odm->BoardType; -u32 array_len =sizeof (array_MAC_REG_8188E)/sizeof (u32); -u32 *array = array_MAC_REG_8188E; -bool biol = false; +u32 i; +u32 arraylength; +u32 *ptrarray; -struct adapter *adapt = dm_odm->Adapter; -struct xmit_frame *pxmit_frame =NULL ; -u8 bndy_cnt =1 ; -enum HAL_STATUS rst =HAL_STATUS_SUCCESS ; - hex += board; - hex += interface_val <<8 ; - hex += platform <<16 ; - hex +=0xFF000000 ; + arraylength =sizeof (array_MAC_REG_8188E)/sizeof (u32); + ptrarray = array_MAC_REG_8188E; - biol =rtw_IOL_applied (adapt); +for (i =0 ; i < arraylength; i = i +2 ) +usb_write8 (adapt, ptrarray[i], (u8 ) ptrarray[i +1 ]); -if (biol) { - pxmit_frame =rtw_IOL_accquire_xmit_frame (adapt); -if (pxmit_frame ==NULL ) { -pr_info ("rtw_IOL_accquire_xmit_frame failed\n" ); -return HAL_STATUS_FAILURE ; - } - } - -for (i =0 ; i < array_len; i +=2 ) { -u32 v1 = array[i]; -u32 v2 = array[i+1 ]; - -/* This (offset, data) pair meets the condition. */ -if (v1 <0xCDCDCDCD ) { -if (biol) { -if (rtw_IOL_cmd_boundary_handle (pxmit_frame)) - bndy_cnt++; -rtw_IOL_append_WB_cmd (pxmit_frame, (u16 )v1, (u8 )v2,0xFF ); - }else { -odm_ConfigMAC_8188E (dm_odm, v1, (u8 )v2); - } -continue ; - }else {/* This line is the start line of branch. */ -if (!Checkcondition (array[i], hex)) { -/* Discard the following (offset, data) pairs. */ -READ_NEXT_PAIR (v1, v2, i); -while (v2 !=0xDEAD && - v2 !=0xCDEF && - v2 !=0xCDCD && i < array_len -2 ) { -READ_NEXT_PAIR (v1, v2, i); - } - i -=2 ;/* prevent from for-loop += 2 */ - }else {/* Configure matched pairs and skip to end of if-else. */ -READ_NEXT_PAIR (v1, v2, i); -while (v2 !=0xDEAD && - v2 !=0xCDEF && - v2 !=0xCDCD && i < array_len -2 ) { -if (biol) { -if (rtw_IOL_cmd_boundary_handle (pxmit_frame)) - bndy_cnt++; -rtw_IOL_append_WB_cmd (pxmit_frame, (u16 )v1, (u8 )v2,0xFF ); - }else { -odm_ConfigMAC_8188E (dm_odm, v1, (u8 )v2); - } - -READ_NEXT_PAIR (v1, v2, i); - } -while (v2 !=0xDEAD && i < array_len -2 ) -READ_NEXT_PAIR (v1, v2, i); - } - } - } -if (biol) { -if (!rtw_IOL_exec_cmds_sync (dm_odm->Adapter, pxmit_frame,1000 , bndy_cnt)) { -pr_info ("~~~ MAC IOL_exec_cmds Failed !!!\n" ); - rst =HAL_STATUS_FAILURE ; - } - } -return rst; +usb_write8 (adapt,REG_MAX_AGGR_NUM ,MAX_AGGR_NUM ); +return true; }
drivers/staging/rtl8188eu/hal/odm_HWConfig.c +0 -7
@@ -460,10 +460,3 @@ enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *dm_odm, }return HAL_STATUS_SUCCESS ; } - -enum HAL_STATUS ODM_ConfigMACWithHeaderFile (struct odm_dm_struct *dm_odm) -{ -u8 result =HAL_STATUS_SUCCESS ; - result =READ_AND_CONFIG (8188E , _MAC_REG_); -return result; -}
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c +0 -37
@@ -354,43 +354,6 @@ rtl8188e_PHY_SetRFReg(phy_RFSerialWrite (Adapter, eRFPath, RegAddr, Data); } -/* */ -/* 3. Initial MAC/BB/RF config by reading MAC/BB/RF txt. */ -/* */ - -/*----------------------------------------------------------------------------- -* Function: PHY_MACConfig8192C -* -* Overview: Condig MAC by header file or parameter file. -* -* Input: NONE -* -* Output: NONE -* -* Return: NONE -* -* Revised History: -* When Who Remark -* 08/12/2008 MHC Create Version 0. -* -*---------------------------------------------------------------------------*/ -s32 PHY_MACConfig8188E (struct adapter *Adapter) -{ -struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter); -int rtStatus = _SUCCESS; - -/* */ -/* Config MAC */ -/* */ -if (HAL_STATUS_FAILURE ==ODM_ConfigMACWithHeaderFile (&pHalData->odmpriv)) - rtStatus = _FAIL; - -/* 2010.07.13 AMPDU aggregation number B */ -usb_write16 (Adapter,REG_MAX_AGGR_NUM ,MAX_AGGR_NUM ); - -return rtStatus; -} -/** * Function: phy_InitBBRFRegisterDefinition *
drivers/staging/rtl8188eu/hal/usb_halinit.c +3 -12
@@ -27,8 +27,8 @@#include <rtl8188e_led.h> #include <rtw_iol.h> #include <usb_hal.h> +#include <phy.h> -#define HAL_MAC_ENABLE 1#define HAL_BB_ENABLE 1#define HAL_RF_ENABLE 1
@@ -759,18 +759,9 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter) }rtl8188e_InitializeFirmwareVars (Adapter); -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_MAC ); -#if (HAL_MAC_ENABLE ==1 ) - status =PHY_MACConfig8188E (Adapter); -if (status == _FAIL) { -DBG_88E (" ### Failed to init MAC ......\n " ); - goto exit; - } -#endif +rtl88e_phy_mac_config (Adapter); -/* */ -/* d. Initialize BB related configurations. */ -/* */ +/* d. Initialize BB related configurations. */ HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_BB );#if (HAL_BB_ENABLE ==1 ) status =PHY_BBConfig8188E (Adapter);
drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h +0 -1
@@ -208,7 +208,6 @@ void rtl8188e_PHY_SetRFReg(struct adapter *adapter, enum rf_radio_path rfpath,/* Initialization related function */ /* MAC/BB/RF HAL config */ -int PHY_MACConfig8188E (struct adapter *adapter);int PHY_BBConfig8188E (struct adapter *adapter);int PHY_RFConfig8188E (struct adapter *adapter);
drivers/staging/rtl8188eu/include/HalHWImg8188E_MAC.h deleted +0 -30
@@ -1,30 +0,0 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -* -* -******************************************************************************/ - -#ifndef __INC_MAC_8188E_HW_IMG_H -#define __INC_MAC_8188E_HW_IMG_H - -/****************************************************************************** -* MAC_REG.TXT -******************************************************************************/ - -enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E (struct odm_dm_struct *pDM_Odm); - -#endif /* end of HWIMG_SUPPORT */
drivers/staging/rtl8188eu/include/odm_HWConfig.h +0 -2
@@ -127,6 +127,4 @@ enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *pDM_Odm,enum HAL_STATUS ODM_ConfigBBWithHeaderFile (struct odm_dm_struct *pDM_Odm,enum odm_bb_config_type ConfigType); -enum HAL_STATUS ODM_ConfigMACWithHeaderFile (struct odm_dm_struct *pDM_Odm); -#endif
drivers/staging/rtl8188eu/include/odm_precomp.h +0 -1
@@ -46,7 +46,6 @@#include "odm_reg.h" -#include "HalHWImg8188E_MAC.h" #include "HalHWImg8188E_RF.h" #include "HalHWImg8188E_BB.h"
drivers/staging/rtl8188eu/include/phy.h new file +1 -0
@@ -0,0 +1 @@ +bool rtl88e_phy_mac_config (struct adapter *adapt);
Signature · 1 line
1.7.10.4
PATCH 3/22 staging: rtl8188eu: Cleanup and simplify RF configuration code
In reply to navin patidarCleanup and consolidate RF configuration related code in HalHWImg8188E_RF.c file.
--- drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c | 269 ++++++++++++-------- drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 14 - drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 9 - drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 96 ------- drivers/staging/rtl8188eu/hal/usb_halinit.c | 10 +- .../staging/rtl8188eu/include/HalHWImg8188E_RF.h | 30 --- drivers/staging/rtl8188eu/include/odm_HWConfig.h | 4 - drivers/staging/rtl8188eu/include/odm_precomp.h | 1 - drivers/staging/rtl8188eu/include/phy.h | 1 + drivers/staging/rtl8188eu/include/rtl8188e_rf.h | 1 - 10 files changed, 161 insertions(+), 274 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_RF.h
drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c +159 -110
@@ -20,38 +20,36 @@#include "odm_precomp.h" -#include <rtw_iol.h> +#include <phy.h> -static bool CheckCondition (const u32 Condition,const u32 Hex) +static bool check_condition (struct adapter *adapt,const u32 condition) { -u32 _board = (Hex &0x000000FF ); -u32 _interface = (Hex &0x0000FF00 ) >>8 ; -u32 _platform = (Hex &0x00FF0000 ) >>16 ; -u32 cond = Condition; +struct odm_dm_struct *odm = &GET_HAL_DATA (adapt)->odmpriv; +u32 _board = odm->BoardType; +u32 _platform = odm->SupportPlatform; +u32 _interface = odm->SupportInterface; +u32 cond = condition; -if (Condition ==0xCDCDCDCD ) +if (condition ==0xCDCDCDCD )return true; - cond = Condition &0x000000FF ; + cond = condition &0x000000FF ;if ((_board == cond) && cond !=0x00 )return false; - cond = Condition &0x0000FF00 ; + cond = condition &0x0000FF00 ; cond = cond >>8 ;if ((_interface & cond) ==0 && cond !=0x07 )return false; - cond = Condition &0x00FF0000 ; + cond = condition &0x00FF0000 ; cond = cond >>16 ;if ((_platform & cond) ==0 && cond !=0x0F )return false;return true; } - -/****************************************************************************** -* RadioA_1T.TXT -******************************************************************************/ +/* RadioA_1T.TXT */ static u32 Array_RadioA_1T_8188E[] = {0x000 ,0x00030000 ,
@@ -155,115 +153,166 @@ static u32 Array_RadioA_1T_8188E[] = { 0x000, 0x00033E60, }; -enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E (struct odm_dm_struct *pDM_Odm) +#define READ_NEXT_PAIR (v1, v2, i) \ +do { \ + i += 2; v1 = array[i]; \ + v2 = array[i+1]; \ +} while (0) + +#define RFREG_OFFSET_MASK 0xfffff +#define B3WIREADDREAALENGTH 0x400 +#define B3WIREDATALENGTH 0x800 +#define BRFSI_RFENV 0x10 + +static void rtl_rfreg_delay (struct adapter *adapt,enum rf_radio_path rfpath,u32 addr,u32 mask,u32 data) { -#define READ_NEXT_PAIR (v1, v2, i) do \ - { i += 2; v1 = Array[i]; \ - v2 = Array[i+1]; } while (0) - -u32 hex =0 ; -u32 i =0 ; -u8 platform = pDM_Odm->SupportPlatform; -u8 interfaceValue = pDM_Odm->SupportInterface; -u8 board = pDM_Odm->BoardType; -u32 ArrayLen =sizeof (Array_RadioA_1T_8188E)/sizeof (u32); -u32 *Array = Array_RadioA_1T_8188E; -bool biol = false; -struct adapter *Adapter = pDM_Odm->Adapter; -struct xmit_frame *pxmit_frame =NULL ; -u8 bndy_cnt =1 ; -enum HAL_STATUS rst =HAL_STATUS_SUCCESS ; - - hex += board; - hex += interfaceValue <<8 ; - hex += platform <<16 ; - hex +=0xFF000000 ; - biol =rtw_IOL_applied (Adapter); - -if (biol) { - pxmit_frame =rtw_IOL_accquire_xmit_frame (Adapter); -if (pxmit_frame ==NULL ) { -pr_info ("rtw_IOL_accquire_xmit_frame failed\n" ); -return HAL_STATUS_FAILURE ; - } +if (addr ==0xfe ) { +mdelay (50 ); + }else if (addr ==0xfd ) { +mdelay (5 ); + }else if (addr ==0xfc ) { +mdelay (1 ); + }else if (addr ==0xfb ) { +udelay (50 ); + }else if (addr ==0xfa ) { +udelay (5 ); + }else if (addr ==0xf9 ) { +udelay (1 ); + }else { +rtl8188e_PHY_SetRFReg (adapt, rfpath, addr, mask, data); +udelay (1 ); } +} -for (i =0 ; i < ArrayLen; i +=2 ) { -u32 v1 = Array[i]; -u32 v2 = Array[i+1 ]; +static void rtl8188e_config_rf_reg (struct adapter *adapt, +u32 addr,u32 data) +{ +u32 content =0x1000 ;/*RF Content: radio_a_txt*/ +u32 maskforphyset = (u32)(content &0xE000 ); + +rtl_rfreg_delay (adapt,RF90_PATH_A , addr| maskforphyset, +RFREG_OFFSET_MASK , + data); +} + +static bool rtl88e_phy_config_rf_with_headerfile (struct adapter *adapt) +{ +u32 i; +u32 array_len =sizeof (Array_RadioA_1T_8188E)/sizeof (u32); +u32 *array = Array_RadioA_1T_8188E; + +for (i =0 ; i < array_len; i +=2 ) { +u32 v1 = array[i]; +u32 v2 = array[i+1 ]; -/* This (offset, data) pair meets the condition. */ if (v1 <0xCDCDCDCD ) { -if (biol) { -if (rtw_IOL_cmd_boundary_handle (pxmit_frame)) - bndy_cnt++; - -if (v1 ==0xffe ) -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,50 ); -else if (v1 ==0xfd ) -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,5 ); -else if (v1 ==0xfc ) -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,1 ); -else if (v1 ==0xfb ) -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,50 ); -else if (v1 ==0xfa ) -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,5 ); -else if (v1 ==0xf9 ) -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,1 ); -else -rtw_IOL_append_WRF_cmd (pxmit_frame,RF_PATH_A , (u16 )v1, v2, bRFRegOffsetMask); - }else { -odm_ConfigRF_RadioA_8188E (pDM_Odm, v1, v2); - } -continue ; - }else {/* This line is the start line of branch. */ -if (!CheckCondition (Array[i], hex)) { -/* Discard the following (offset, data) pairs. */ +rtl8188e_config_rf_reg (adapt, v1, v2); +continue ; + }else { +if (!check_condition (adapt, array[i])) {READ_NEXT_PAIR (v1, v2, i); -while (v2 !=0xDEAD && - v2 !=0xCDEF && - v2 !=0xCDCD && i < ArrayLen -2 ) -READ_NEXT_PAIR (v1, v2, i); - i -=2 ;/* prevent from for-loop += 2 */ - }else {/* Configure matched pairs and skip to end of if-else. */ -READ_NEXT_PAIR (v1, v2, i); -while (v2 !=0xDEAD && - v2 !=0xCDEF && - v2 !=0xCDCD && i < ArrayLen -2 ) { -if (biol) { -if (rtw_IOL_cmd_boundary_handle (pxmit_frame)) - bndy_cnt++; - -if (v1 ==0xffe ) -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,50 ); -else if (v1 ==0xfd ) -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,5 ); -else if (v1 ==0xfc ) -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,1 ); -else if (v1 ==0xfb ) -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,50 ); -else if (v1 ==0xfa ) -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,5 ); -else if (v1 ==0xf9 ) -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,1 ); -else -rtw_IOL_append_WRF_cmd (pxmit_frame,RF_PATH_A , (u16 )v1, v2, bRFRegOffsetMask); - }else { -odm_ConfigRF_RadioA_8188E (pDM_Odm, v1, v2); - } +while (v2 !=0xDEAD && v2 !=0xCDEF && + v2 !=0xCDCD && i < array_len -2 )READ_NEXT_PAIR (v1, v2, i); + i -=2 ; + }else { +READ_NEXT_PAIR (v1, v2, i); +while (v2 !=0xDEAD && v2 !=0xCDEF && + v2 !=0xCDCD && i < array_len -2 ) { +rtl8188e_config_rf_reg (adapt, v1, v2); +READ_NEXT_PAIR (v1, v2, i); } -while (v2 !=0xDEAD && i < ArrayLen -2 ) +while (v2 !=0xDEAD && i < array_len -2 )READ_NEXT_PAIR (v1, v2, i); } } } -if (biol) { -if (!rtw_IOL_exec_cmds_sync (pDM_Odm->Adapter, pxmit_frame,1000 , bndy_cnt)) { - rst =HAL_STATUS_FAILURE ; -pr_info ("~~~ IOL Config %s Failed !!!\n" , __func__); +return true; +} + +static bool rf6052_conf_para (struct adapter *adapt) +{ +struct hal_data_8188e *hal_data =GET_HAL_DATA (adapt); +u32 u4val =0 ; +u8 rfpath; +bool rtstatus = true; +struct bb_reg_def *pphyreg; + +for (rfpath =0 ; rfpath < hal_data->NumTotalRFPath; rfpath++) { + pphyreg = &hal_data->PHYRegDef[rfpath]; + +switch (rfpath) { +case RF90_PATH_A : +case RF90_PATH_C : + u4val =PHY_QueryBBReg (adapt, pphyreg->rfintfs, +BRFSI_RFENV ); +break ; +case RF90_PATH_B : +case RF90_PATH_D : + u4val =PHY_QueryBBReg (adapt, pphyreg->rfintfs, +BRFSI_RFENV <<16 ); +break ; + } + +PHY_SetBBReg (adapt, pphyreg->rfintfe,BRFSI_RFENV <<16 ,0x1 ); +udelay (1 ); + +PHY_SetBBReg (adapt, pphyreg->rfintfo,BRFSI_RFENV ,0x1 ); +udelay (1 ); + +PHY_SetBBReg (adapt, pphyreg->rfHSSIPara2, +B3WIREADDREAALENGTH ,0x0 ); +udelay (1 ); + +PHY_SetBBReg (adapt, pphyreg->rfHSSIPara2,B3WIREDATALENGTH ,0x0 ); +udelay (1 ); + +switch (rfpath) { +case RF90_PATH_A : + rtstatus =rtl88e_phy_config_rf_with_headerfile (adapt); +break ; +case RF90_PATH_B : + rtstatus =rtl88e_phy_config_rf_with_headerfile (adapt); +break ; +case RF90_PATH_C : +break ; +case RF90_PATH_D : +break ; + } + +switch (rfpath) { +case RF90_PATH_A : +case RF90_PATH_C : +PHY_SetBBReg (adapt, pphyreg->rfintfs,BRFSI_RFENV , u4val); +break ; +case RF90_PATH_B : +case RF90_PATH_D : +PHY_SetBBReg (adapt, pphyreg->rfintfs,BRFSI_RFENV <<16 , + u4val); +break ; } + +if (rtstatus != true) +return false; } -return rst; + +return rtstatus; +} + +static bool rtl88e_phy_rf6052_config (struct adapter *adapt) +{ +struct hal_data_8188e *hal_data =GET_HAL_DATA (adapt); + +if (hal_data->rf_type ==RF_1T1R ) + hal_data->NumTotalRFPath =1 ; +else + hal_data->NumTotalRFPath =2 ; + +return rf6052_conf_para (adapt); +} + +bool rtl88e_phy_rf_config (struct adapter *adapt) +{ +return rtl88e_phy_rf6052_config (adapt); }
drivers/staging/rtl8188eu/hal/odm_HWConfig.c +0 -14
@@ -432,20 +432,6 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm,ODM_PhyStatusQuery_92CSeries (dm_odm, pPhyInfo, pPhyStatus, pPktinfo); } -enum HAL_STATUS ODM_ConfigRFWithHeaderFile (struct odm_dm_struct *dm_odm, -enum rf_radio_path content, -enum rf_radio_path rfpath) -{ -ODM_RT_TRACE (dm_odm,ODM_COMP_INIT ,ODM_DBG_LOUD , ("===>ODM_ConfigRFWithHeaderFile\n" )); -if (rfpath ==RF_PATH_A ) -READ_AND_CONFIG (8188E , _RadioA_1T_); -ODM_RT_TRACE (dm_odm,ODM_COMP_INIT ,ODM_DBG_LOUD , (" ===> ODM_ConfigRFWithHeaderFile() Radio_A:Rtl8188ERadioA_1TArray\n" )); -ODM_RT_TRACE (dm_odm,ODM_COMP_INIT ,ODM_DBG_LOUD , (" ===> ODM_ConfigRFWithHeaderFile() Radio_B:Rtl8188ERadioB_1TArray\n" )); - -ODM_RT_TRACE (dm_odm,ODM_COMP_INIT ,ODM_DBG_TRACE , ("ODM_ConfigRFWithHeaderFile: Radio No %x\n" , rfpath)); -return HAL_STATUS_SUCCESS ; -} -enum HAL_STATUS ODM_ConfigBBWithHeaderFile (struct odm_dm_struct *dm_odm,enum odm_bb_config_type config_tp) {
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c +0 -9
@@ -585,15 +585,6 @@ PHY_BBConfig8188E(return rtStatus; } -int PHY_RFConfig8188E (struct adapter *Adapter) -{ -int rtStatus = _SUCCESS; - -/* RF config */ - rtStatus =PHY_RF6052_Config8188E (Adapter); -return rtStatus; -} -static void getTxPowerIndex88E (struct adapter *Adapter,u8 channel,u8 *cckPowerLevel,u8 *ofdmPowerLevel,u8 *BW20PowerLevel,u8 *BW40PowerLevel)
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c +0 -96
99 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/usb_halinit.c +1 -9
@@ -30,7 +30,6 @@#include <phy.h> #define HAL_BB_ENABLE 1 -#define HAL_RF_ENABLE 1static void _ConfigNormalChipOutEP_8188E (struct adapter *adapt,u8 NumOutPipe) {
@@ -771,14 +770,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter) }#endif -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_RF ); -#if (HAL_RF_ENABLE ==1 ) - status =PHY_RFConfig8188E (Adapter); -if (status == _FAIL) { -DBG_88E (" ### Failed to init RF ......\n " ); - goto exit; - } -#endif +rtl88e_phy_rf_config (Adapter);HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_EFUSE_PATCH ); status =rtl8188e_iol_efuse_patch (Adapter);
drivers/staging/rtl8188eu/include/HalHWImg8188E_RF.h deleted +0 -30
@@ -1,30 +0,0 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -* -* -******************************************************************************/ - -#ifndef __INC_RF_8188E_HW_IMG_H -#define __INC_RF_8188E_HW_IMG_H - -/****************************************************************************** -* RadioA_1T.TXT -******************************************************************************/ - -enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E (struct odm_dm_struct *odm); - -#endif /* end of HWIMG_SUPPORT */
drivers/staging/rtl8188eu/include/odm_HWConfig.h +0 -4
@@ -120,10 +120,6 @@ void ODM_MacStatusQuery(struct odm_dm_struct *pDM_Odm,bool bPacketToSelf, bool bPacketBeacon); -enum HAL_STATUS ODM_ConfigRFWithHeaderFile (struct odm_dm_struct *pDM_Odm, -enum rf_radio_path Content, -enum rf_radio_path eRFPath); -enum HAL_STATUS ODM_ConfigBBWithHeaderFile (struct odm_dm_struct *pDM_Odm,enum odm_bb_config_type ConfigType);
drivers/staging/rtl8188eu/include/odm_precomp.h +0 -1
@@ -46,7 +46,6 @@#include "odm_reg.h" -#include "HalHWImg8188E_RF.h" #include "HalHWImg8188E_BB.h" #include "odm_RegConfig8188E.h"
drivers/staging/rtl8188eu/include/phy.h +1 -0
@@ -1 +1,2 @@bool rtl88e_phy_mac_config (struct adapter *adapt); +bool rtl88e_phy_rf_config (struct adapter *adapt);
drivers/staging/rtl8188eu/include/rtl8188e_rf.h +0 -1
@@ -25,7 +25,6 @@#define RF6052_MAX_PATH 2 -int PHY_RF6052_Config8188E (struct adapter *Adapter);void rtl8188e_RF_ChangeTxPath (struct adapter *Adapter,u16 DataRate);void rtl8188e_PHY_RF6052SetBandwidth (struct adapter *Adapter,enum ht_channel_width Bandwidth);
Signature · 1 line
1.7.10.4
PATCH 4/22 staging: rtl8188eu: Remove unused functions odm_ConfigRF_Radio[A,B]_8188E()
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 19 ------------------- .../staging/rtl8188eu/include/odm_RegConfig8188E.h | 6 ------ 2 files changed, 25 deletions(-)
drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c +0 -19
@@ -45,25 +45,6 @@ void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, } } -void odm_ConfigRF_RadioA_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u32 Data) -{ -u32 content =0x1000 ;/* RF_Content: radioa_txt */ -u32 maskforPhySet = (u32)(content&0xE000 ); - -odm_ConfigRFReg_8188E (pDM_Odm, Addr, Data,RF_PATH_A , Addr|maskforPhySet); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_INIT ,ODM_DBG_TRACE , ("===> ODM_ConfigRFWithHeaderFile: [RadioA] %08X %08X\n" , Addr, Data)); -} - -void odm_ConfigRF_RadioB_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u32 Data) -{ -u32 content =0x1001 ;/* RF_Content: radiob_txt */ -u32 maskforPhySet = (u32)(content&0xE000 ); - -odm_ConfigRFReg_8188E (pDM_Odm, Addr, Data,RF_PATH_B , Addr|maskforPhySet); - -ODM_RT_TRACE (pDM_Odm,ODM_COMP_INIT ,ODM_DBG_TRACE , ("===> ODM_ConfigRFWithHeaderFile: [RadioB] %08X %08X\n" , Addr, Data)); -} -void odm_ConfigMAC_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u8 Data) {struct adapter *adapt = pDM_Odm->Adapter;
drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h +0 -6
@@ -23,12 +23,6 @@void odm_ConfigRFReg_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u32 Data,enum rf_radio_path RF_PATH ,u32 RegAddr); -void odm_ConfigRF_RadioA_8188E (struct odm_dm_struct *pDM_Odm, -u32 Addr,u32 Data); - -void odm_ConfigRF_RadioB_8188E (struct odm_dm_struct *pDM_Odm, -u32 Addr,u32 Data); -void odm_ConfigMAC_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u8 Data); void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr,
Signature · 1 line
1.7.10.4
PATCH 5/22 staging: rtl8188eu: Remove unused function odm_ConfigRFReg_8188E()
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 25 -------------------- .../staging/rtl8188eu/include/odm_RegConfig8188E.h | 3 --- 2 files changed, 28 deletions(-)
drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c +0 -25
@@ -20,31 +20,6 @@#include "odm_precomp.h" -void odm_ConfigRFReg_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr, -u32 Data,enum rf_radio_path RF_PATH , -u32 RegAddr) -{ -struct adapter *adapter = pDM_Odm->Adapter; - -if (Addr ==0xffe ) { -msleep (50 ); - }else if (Addr ==0xfd ) { -mdelay (5 ); - }else if (Addr ==0xfc ) { -mdelay (1 ); - }else if (Addr ==0xfb ) { -udelay (50 ); - }else if (Addr ==0xfa ) { -udelay (5 ); - }else if (Addr ==0xf9 ) { -udelay (1 ); - }else { -PHY_SetRFReg (adapter,RF_PATH , RegAddr, bRFRegOffsetMask, Data); -/* Add 1us delay between BB/RF register setting. */ -udelay (1 ); - } -} -void odm_ConfigMAC_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u8 Data) {struct adapter *adapt = pDM_Odm->Adapter;
drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h +0 -3
@@ -20,9 +20,6 @@#ifndef __INC_ODM_REGCONFIG_H_8188E#define __INC_ODM_REGCONFIG_H_8188E -void odm_ConfigRFReg_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u32 Data, -enum rf_radio_path RF_PATH ,u32 RegAddr); -void odm_ConfigMAC_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u8 Data); void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr,
Signature · 1 line
1.7.10.4
PATCH 6/22 staging: rtl8188eu: Remove unused function odm_ConfigMAC_8188E()
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 8 -------- drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h | 2 -- 2 files changed, 10 deletions(-)
drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c +0 -8
@@ -20,14 +20,6 @@#include "odm_precomp.h" -void odm_ConfigMAC_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u8 Data) -{ -struct adapter *adapt = pDM_Odm->Adapter; - -usb_write8 (adapt, Addr, Data); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_INIT ,ODM_DBG_TRACE , ("===> ODM_ConfigMACWithHeaderFile: [MAC_REG] %08X %08X\n" , Addr, Data)); -} -void odm_ConfigBB_AGC_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u32 Bitmask,u32 Data) {struct adapter *adapter = pDM_Odm->Adapter;
drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h +0 -2
@@ -20,8 +20,6 @@#ifndef __INC_ODM_REGCONFIG_H_8188E#define __INC_ODM_REGCONFIG_H_8188E -void odm_ConfigMAC_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u8 Data); -void odm_ConfigBB_AGC_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u32 Bitmask,u32 Data);
Signature · 1 line
1.7.10.4
PATCH 7/22 staging: rtl8188eu: Cleanup and simplify Baseband configuration code
In reply to navin patidarCleanup and consolidate Baseband configuration related code in HalHWImg8188E_BB.c file.
--- drivers/staging/rtl8188eu/hal/HalHWImg8188E_BB.c | 474 ++++++++++---------- drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 15 - drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 187 -------- drivers/staging/rtl8188eu/hal/usb_halinit.c | 10 +- .../staging/rtl8188eu/include/HalHWImg8188E_BB.h | 44 -- drivers/staging/rtl8188eu/include/odm_precomp.h | 2 - drivers/staging/rtl8188eu/include/phy.h | 1 + 7 files changed, 236 insertions(+), 497 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_BB.h
drivers/staging/rtl8188eu/hal/HalHWImg8188E_BB.c +234 -240
@@ -20,7 +20,7 @@#include "odm_precomp.h" -#include <rtw_iol.h> +#include <phy.h> #define read_next_pair (array, v1, v2, i) \ do { \
@@ -29,36 +29,8 @@ v2 = array[i+1 ]; \ }while (0 ) -static bool CheckCondition(const u32 condition, const u32 hex) -{ -u32 _board = (hex &0x000000FF ); -u32 _interface = (hex &0x0000FF00 ) >>8 ; -u32 _platform = (hex &0x00FF0000 ) >>16 ; -u32 cond = condition; - -if (condition ==0xCDCDCDCD ) -return true; - - cond = condition &0x000000FF ; -if ((_board == cond) && cond !=0x00 ) -return false; - - cond = condition &0x0000FF00 ; - cond = cond >>8 ; -if ((_interface & cond) ==0 && cond !=0x07 ) -return false; - - cond = condition &0x00FF0000 ; - cond = cond >>16 ; -if ((_platform & cond) ==0 && cond !=0x0F ) -return false; -return true; -} - -/****************************************************************************** -* AGC_TAB_1T.TXT -******************************************************************************/ +/* AGC_TAB_1T.TXT */ static u32 array_agc_tab_1t_8188e[] = {0xC78 ,0xFB000001 ,
@@ -191,91 +163,25 @@ static u32 array_agc_tab_1t_8188e[] = { 0xC78, 0x407F0001, }; -enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E (struct odm_dm_struct *dm_odm) +static bool set_baseband_agc_config (struct adapter *adapt) { -u32 hex =0 ; -u32 i =0 ; -u8 platform = dm_odm->SupportPlatform; -u8 interfaceValue = dm_odm->SupportInterface; -u8 board = dm_odm->BoardType; -u32 arraylen =sizeof (array_agc_tab_1t_8188e)/sizeof (u32); -u32 *array = array_agc_tab_1t_8188e; -bool biol = false; -struct adapter *adapter = dm_odm->Adapter; -struct xmit_frame *pxmit_frame =NULL ; -u8 bndy_cnt =1 ; -enum HAL_STATUS rst =HAL_STATUS_SUCCESS ; - - hex += board; - hex += interfaceValue <<8 ; - hex += platform <<16 ; - hex +=0xFF000000 ; - biol =rtw_IOL_applied (adapter); - -if (biol) { - pxmit_frame =rtw_IOL_accquire_xmit_frame (adapter); -if (pxmit_frame ==NULL ) { -pr_info ("rtw_IOL_accquire_xmit_frame failed\n" ); -return HAL_STATUS_FAILURE ; - } - } +u32 i; +u32 arraylen =sizeof (array_agc_tab_1t_8188e)/sizeof (u32); +u32 *array = array_agc_tab_1t_8188e;for (i =0 ; i < arraylen; i +=2 ) {u32 v1 = array[i];u32 v2 = array[i+1 ]; -/* This (offset, data) pair meets the condition. */ -if (v1 <0xCDCDCDCD ) { -if (biol) { -if (rtw_IOL_cmd_boundary_handle (pxmit_frame)) - bndy_cnt++; -rtw_IOL_append_WD_cmd (pxmit_frame, (u16 )v1, v2, bMaskDWord); - }else { -odm_ConfigBB_AGC_8188E (dm_odm, v1, bMaskDWord, v2); - } -continue ; - }else { -/* This line is the start line of branch. */ -if (!CheckCondition (array[i], hex)) { -/* Discard the following (offset, data) pairs. */ -read_next_pair (array, v1, v2, i); -while (v2 !=0xDEAD && - v2 !=0xCDEF && - v2 !=0xCDCD && i < arraylen -2 ) -read_next_pair (array, v1, v2, i); - i -=2 ;/* prevent from for-loop += 2 */ - }else {/* Configure matched pairs and skip to end of if-else. */ -read_next_pair (array, v1, v2, i); -while (v2 !=0xDEAD && - v2 !=0xCDEF && - v2 !=0xCDCD && i < arraylen -2 ) { -if (biol) { -if (rtw_IOL_cmd_boundary_handle (pxmit_frame)) - bndy_cnt++; -rtw_IOL_append_WD_cmd (pxmit_frame, (u16 )v1, v2, bMaskDWord); - }else { -odm_ConfigBB_AGC_8188E (dm_odm, v1, bMaskDWord, v2); - } -read_next_pair (array, v1, v2, i); - } - -while (v2 !=0xDEAD && i < arraylen -2 ) -read_next_pair (array, v1, v2, i); - } - } - } -if (biol) { -if (!rtw_IOL_exec_cmds_sync (dm_odm->Adapter, pxmit_frame,1000 , bndy_cnt)) { -printk ("~~~ %s IOL_exec_cmds Failed !!!\n" , __func__); - rst =HAL_STATUS_FAILURE ; +if (v1 <0xCDCDCDCD ){ +PHY_SetBBReg (adapt, v1, bMaskDWord, v2); +udelay (1 ); } } -return rst; +return true; } -/****************************************************************************** -* PHY_REG_1T.TXT -******************************************************************************/ +/* PHY_REG_1T.TXT */ static u32 array_phy_reg_1t_8188e[] = {0x800 ,0x80040000 ,
@@ -471,122 +377,44 @@ static u32 array_phy_reg_1t_8188e[] = { 0xF00, 0x00000300, }; -enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E (struct odm_dm_struct *dm_odm) +static void rtl_bb_delay (struct adapter *adapt,u32 addr,u32 data) { -u32 hex =0 ; -u32 i =0 ; -u8 platform = dm_odm->SupportPlatform; -u8 interfaceValue = dm_odm->SupportInterface; -u8 board = dm_odm->BoardType; -u32 arraylen =sizeof (array_phy_reg_1t_8188e)/sizeof (u32); -u32 *array = array_phy_reg_1t_8188e; -bool biol = false; -struct adapter *adapter = dm_odm->Adapter; -struct xmit_frame *pxmit_frame =NULL ; -u8 bndy_cnt =1 ; -enum HAL_STATUS rst =HAL_STATUS_SUCCESS ; - hex += board; - hex += interfaceValue <<8 ; - hex += platform <<16 ; - hex +=0xFF000000 ; - biol =rtw_IOL_applied (adapter); - -if (biol) { - pxmit_frame =rtw_IOL_accquire_xmit_frame (adapter); -if (pxmit_frame ==NULL ) { -pr_info ("rtw_IOL_accquire_xmit_frame failed\n" ); -return HAL_STATUS_FAILURE ; - } +if (addr ==0xfe ) { +msleep (50 ); + }else if (addr ==0xfd ) { +mdelay (5 ); + }else if (addr ==0xfc ) { +mdelay (1 ); + }else if (addr ==0xfb ) { +udelay (50 ); + }else if (addr ==0xfa ) { +udelay (5 ); + }else if (addr ==0xf9 ) { +udelay (1 ); + }else { +PHY_SetBBReg (adapt, addr, bMaskDWord, data); +/* Add 1us delay between BB/RF register setting. */ +udelay (1 ); } +} + +static bool set_baseband_phy_config (struct adapter *adapt) +{ +u32 i; +u32 arraylen =sizeof (array_phy_reg_1t_8188e)/sizeof (u32); +u32 *array = array_phy_reg_1t_8188e;for (i =0 ; i < arraylen; i +=2 ) {u32 v1 = array[i];u32 v2 = array[i+1 ]; -/* This (offset, data) pair meets the condition. */ -if (v1 <0xCDCDCDCD ) { -if (biol) { -if (rtw_IOL_cmd_boundary_handle (pxmit_frame)) - bndy_cnt++; -if (v1 ==0xfe ) { -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,50 ); - }else if (v1 ==0xfd ) { -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,5 ); - }else if (v1 ==0xfc ) { -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,1 ); - }else if (v1 ==0xfb ) { -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,50 ); - }else if (v1 ==0xfa ) { -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,5 ); - }else if (v1 ==0xf9 ) { -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,1 ); - }else { -if (v1 ==0xa24 ) - dm_odm->RFCalibrateInfo.RegA24 = v2; -rtw_IOL_append_WD_cmd (pxmit_frame, (u16 )v1, v2, bMaskDWord); - } - }else { -odm_ConfigBB_PHY_8188E (dm_odm, v1, bMaskDWord, v2); - } -continue ; - }else {/* This line is the start line of branch. */ -if (!CheckCondition (array[i], hex)) { -/* Discard the following (offset, data) pairs. */ -read_next_pair (array, v1, v2, i); -while (v2 !=0xDEAD && - v2 !=0xCDEF && - v2 !=0xCDCD && i < arraylen -2 ) -read_next_pair (array, v1, v2, i); - i -=2 ;/* prevent from for-loop += 2 */ - }else {/* Configure matched pairs and skip to end of if-else. */ -read_next_pair (array, v1, v2, i); -while (v2 !=0xDEAD && - v2 !=0xCDEF && - v2 !=0xCDCD && i < arraylen -2 ) { -if (biol) { -if (rtw_IOL_cmd_boundary_handle (pxmit_frame)) - bndy_cnt++; -if (v1 ==0xfe ) { -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,50 ); - }else if (v1 ==0xfd ) { -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,5 ); - }else if (v1 ==0xfc ) { -rtw_IOL_append_DELAY_MS_cmd (pxmit_frame,1 ); - }else if (v1 ==0xfb ) { -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,50 ); - }else if (v1 ==0xfa ) { -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,5 ); - }else if (v1 ==0xf9 ) { -rtw_IOL_append_DELAY_US_cmd (pxmit_frame,1 ); - }else { -if (v1 ==0xa24 ) - dm_odm->RFCalibrateInfo.RegA24 = v2; - -rtw_IOL_append_WD_cmd (pxmit_frame, (u16 )v1, v2, bMaskDWord); - } - }else { -odm_ConfigBB_PHY_8188E (dm_odm, v1, bMaskDWord, v2); - } -read_next_pair (array, v1, v2, i); - } - -while (v2 !=0xDEAD && i < arraylen -2 ) -read_next_pair (array, v1, v2, i); - } - } +if (v1 <0xCDCDCDCD ) +rtl_bb_delay (adapt, v1, v2); } -if (biol) { -if (!rtw_IOL_exec_cmds_sync (dm_odm->Adapter, pxmit_frame,1000 , bndy_cnt)) { - rst =HAL_STATUS_FAILURE ; -pr_info ("~~~ IOL Config %s Failed !!!\n" , __func__); - } - } -return rst; +return true; } -/****************************************************************************** -* PHY_REG_PG.TXT -******************************************************************************/ +/* PHY_REG_PG.TXT */ static u32 array_phy_reg_pg_8188e[] = {0xE00 ,0xFFFFFFFF ,0x06070809 ,
@@ -680,42 +508,208 @@ static u32 array_phy_reg_pg_8188e[] = { }; -void ODM_ReadAndConfig_PHY_REG_PG_8188E (struct odm_dm_struct *dm_odm) +static void store_pwrindex_offset (struct adapter *Adapter,u32 regaddr,u32 bitmask,u32 data) { -u32 hex; -u32 i =0 ; -u8 platform = dm_odm->SupportPlatform; -u8 interfaceValue = dm_odm->SupportInterface; -u8 board = dm_odm->BoardType; -u32 arraylen =sizeof (array_phy_reg_pg_8188e) /sizeof (u32); -u32 *array = array_phy_reg_pg_8188e; +struct hal_data_8188e *hal_data =GET_HAL_DATA (Adapter); + +if (regaddr == rTxAGC_A_Rate18_06) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][0 ] = data; +if (regaddr == rTxAGC_A_Rate54_24) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][1 ] = data; +if (regaddr == rTxAGC_A_CCK1_Mcs32) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][6 ] = data; +if (regaddr == rTxAGC_B_CCK11_A_CCK2_11 && bitmask ==0xffffff00 ) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][7 ] = data; +if (regaddr == rTxAGC_A_Mcs03_Mcs00) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][2 ] = data; +if (regaddr == rTxAGC_A_Mcs07_Mcs04) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][3 ] = data; +if (regaddr == rTxAGC_A_Mcs11_Mcs08) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][4 ] = data; +if (regaddr == rTxAGC_A_Mcs15_Mcs12) { + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][5 ] = data; +if (hal_data->rf_type ==RF_1T1R ) + hal_data->pwrGroupCnt++; + } +if (regaddr == rTxAGC_B_Rate18_06) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][8 ] = data; +if (regaddr == rTxAGC_B_Rate54_24) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][9 ] = data; +if (regaddr == rTxAGC_B_CCK1_55_Mcs32) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][14 ] = data; +if (regaddr == rTxAGC_B_CCK11_A_CCK2_11 && bitmask ==0x000000ff ) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][15 ] = data; +if (regaddr == rTxAGC_B_Mcs03_Mcs00) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][10 ] = data; +if (regaddr == rTxAGC_B_Mcs07_Mcs04) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][11 ] = data; +if (regaddr == rTxAGC_B_Mcs11_Mcs08) + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][12 ] = data; +if (regaddr == rTxAGC_B_Mcs15_Mcs12) { + hal_data->MCSTxPowerLevelOriginalOffset[hal_data->pwrGroupCnt][13 ] = data; +if (hal_data->rf_type !=RF_1T1R ) + hal_data->pwrGroupCnt++; + } +} - hex = board + (interfaceValue <<8 ); - hex += (platform <<16 ) +0xFF000000 ; +static void rtl_addr_delay (struct adapter *adapt,u32 addr,u32 bit_mask ,u32 data) +{ +if (addr ==0xfe ) { +msleep (50 ); + }else if (addr ==0xfd ) { +mdelay (5 ); + }else if (addr ==0xfc ) { +mdelay (1 ); + }else if (addr ==0xfb ) { +udelay (50 ); + }else if (addr ==0xfa ) { +udelay (5 ); + }else if (addr ==0xf9 ) { +udelay (1 ); + }else { +store_pwrindex_offset (adapt, addr, bit_mask, data); + } +} + +static bool config_bb_with_pgheader (struct adapter *adapt) +{ +u32 i =0 ; +u32 arraylen =sizeof (array_phy_reg_pg_8188e) /sizeof (u32); +u32 *array = array_phy_reg_pg_8188e;for (i =0 ; i < arraylen; i +=3 ) {u32 v1 = array[i];u32 v2 = array[i+1 ];u32 v3 = array[i+2 ]; -/* this line is a line of pure_body */ -if (v1 <0xCDCDCDCD ) { -odm_ConfigBB_PHY_REG_PG_8188E (dm_odm, v1, v2, v3); -continue ; - }else {/* this line is the start of branch */ -if (!CheckCondition (array[i], hex)) { -/* don't need the hw_body */ - i +=2 ;/* skip the pair of expression */ - v1 = array[i]; - v2 = array[i+1 ]; - v3 = array[i+2 ]; -while (v2 !=0xDEAD ) { - i +=3 ; - v1 = array[i]; - v2 = array[i+1 ]; - v3 = array[i+1 ]; - } - } - } +if (v1 <0xCDCDCDCD ) +rtl_addr_delay (adapt, v1, v2, v3); + } +return true; +} + +static void rtl88e_phy_init_bb_rf_register_definition (struct adapter *Adapter) +{ +struct hal_data_8188e *hal_data =GET_HAL_DATA (Adapter); + + hal_data->PHYRegDef[RF_PATH_A ].rfintfs = rFPGA0_XAB_RFInterfaceSW; + hal_data->PHYRegDef[RF_PATH_B ].rfintfs = rFPGA0_XAB_RFInterfaceSW; + hal_data->PHYRegDef[RF_PATH_C ].rfintfs = rFPGA0_XCD_RFInterfaceSW; + hal_data->PHYRegDef[RF_PATH_D ].rfintfs = rFPGA0_XCD_RFInterfaceSW; + + hal_data->PHYRegDef[RF_PATH_A ].rfintfi = rFPGA0_XAB_RFInterfaceRB; + hal_data->PHYRegDef[RF_PATH_B ].rfintfi = rFPGA0_XAB_RFInterfaceRB; + hal_data->PHYRegDef[RF_PATH_C ].rfintfi = rFPGA0_XCD_RFInterfaceRB; + hal_data->PHYRegDef[RF_PATH_D ].rfintfi = rFPGA0_XCD_RFInterfaceRB; + + hal_data->PHYRegDef[RF_PATH_A ].rfintfo = rFPGA0_XA_RFInterfaceOE; + hal_data->PHYRegDef[RF_PATH_B ].rfintfo = rFPGA0_XB_RFInterfaceOE; + + hal_data->PHYRegDef[RF_PATH_A ].rfintfe = rFPGA0_XA_RFInterfaceOE; + hal_data->PHYRegDef[RF_PATH_B ].rfintfe = rFPGA0_XB_RFInterfaceOE; + + hal_data->PHYRegDef[RF_PATH_A ].rf3wireOffset = rFPGA0_XA_LSSIParameter; + hal_data->PHYRegDef[RF_PATH_B ].rf3wireOffset = rFPGA0_XB_LSSIParameter; + + hal_data->PHYRegDef[RF_PATH_A ].rfLSSI_Select = rFPGA0_XAB_RFParameter; + hal_data->PHYRegDef[RF_PATH_B ].rfLSSI_Select = rFPGA0_XAB_RFParameter; + hal_data->PHYRegDef[RF_PATH_C ].rfLSSI_Select = rFPGA0_XCD_RFParameter; + hal_data->PHYRegDef[RF_PATH_D ].rfLSSI_Select = rFPGA0_XCD_RFParameter; + + hal_data->PHYRegDef[RF_PATH_A ].rfTxGainStage = rFPGA0_TxGainStage; + hal_data->PHYRegDef[RF_PATH_B ].rfTxGainStage = rFPGA0_TxGainStage; + hal_data->PHYRegDef[RF_PATH_C ].rfTxGainStage = rFPGA0_TxGainStage; + hal_data->PHYRegDef[RF_PATH_D ].rfTxGainStage = rFPGA0_TxGainStage; + + hal_data->PHYRegDef[RF_PATH_A ].rfHSSIPara1 = rFPGA0_XA_HSSIParameter1; + hal_data->PHYRegDef[RF_PATH_B ].rfHSSIPara1 = rFPGA0_XB_HSSIParameter1; + + hal_data->PHYRegDef[RF_PATH_A ].rfHSSIPara2 = rFPGA0_XA_HSSIParameter2; + hal_data->PHYRegDef[RF_PATH_B ].rfHSSIPara2 = rFPGA0_XB_HSSIParameter2; + + hal_data->PHYRegDef[RF_PATH_A ].rfSwitchControl = rFPGA0_XAB_SwitchControl; + hal_data->PHYRegDef[RF_PATH_B ].rfSwitchControl = rFPGA0_XAB_SwitchControl; + hal_data->PHYRegDef[RF_PATH_C ].rfSwitchControl = rFPGA0_XCD_SwitchControl; + hal_data->PHYRegDef[RF_PATH_D ].rfSwitchControl = rFPGA0_XCD_SwitchControl; + + hal_data->PHYRegDef[RF_PATH_A ].rfAGCControl1 = rOFDM0_XAAGCCore1; + hal_data->PHYRegDef[RF_PATH_B ].rfAGCControl1 = rOFDM0_XBAGCCore1; + hal_data->PHYRegDef[RF_PATH_C ].rfAGCControl1 = rOFDM0_XCAGCCore1; + hal_data->PHYRegDef[RF_PATH_D ].rfAGCControl1 = rOFDM0_XDAGCCore1; + + hal_data->PHYRegDef[RF_PATH_A ].rfAGCControl2 = rOFDM0_XAAGCCore2; + hal_data->PHYRegDef[RF_PATH_B ].rfAGCControl2 = rOFDM0_XBAGCCore2; + hal_data->PHYRegDef[RF_PATH_C ].rfAGCControl2 = rOFDM0_XCAGCCore2; + hal_data->PHYRegDef[RF_PATH_D ].rfAGCControl2 = rOFDM0_XDAGCCore2; + + hal_data->PHYRegDef[RF_PATH_A ].rfRxIQImbalance = rOFDM0_XARxIQImbalance; + hal_data->PHYRegDef[RF_PATH_B ].rfRxIQImbalance = rOFDM0_XBRxIQImbalance; + hal_data->PHYRegDef[RF_PATH_C ].rfRxIQImbalance = rOFDM0_XCRxIQImbalance; + hal_data->PHYRegDef[RF_PATH_D ].rfRxIQImbalance = rOFDM0_XDRxIQImbalance; + + hal_data->PHYRegDef[RF_PATH_A ].rfRxAFE = rOFDM0_XARxAFE; + hal_data->PHYRegDef[RF_PATH_B ].rfRxAFE = rOFDM0_XBRxAFE; + hal_data->PHYRegDef[RF_PATH_C ].rfRxAFE = rOFDM0_XCRxAFE; + hal_data->PHYRegDef[RF_PATH_D ].rfRxAFE = rOFDM0_XDRxAFE; + + hal_data->PHYRegDef[RF_PATH_A ].rfTxIQImbalance = rOFDM0_XATxIQImbalance; + hal_data->PHYRegDef[RF_PATH_B ].rfTxIQImbalance = rOFDM0_XBTxIQImbalance; + hal_data->PHYRegDef[RF_PATH_C ].rfTxIQImbalance = rOFDM0_XCTxIQImbalance; + hal_data->PHYRegDef[RF_PATH_D ].rfTxIQImbalance = rOFDM0_XDTxIQImbalance; + + hal_data->PHYRegDef[RF_PATH_A ].rfTxAFE = rOFDM0_XATxAFE; + hal_data->PHYRegDef[RF_PATH_B ].rfTxAFE = rOFDM0_XBTxAFE; + hal_data->PHYRegDef[RF_PATH_C ].rfTxAFE = rOFDM0_XCTxAFE; + hal_data->PHYRegDef[RF_PATH_D ].rfTxAFE = rOFDM0_XDTxAFE; + + hal_data->PHYRegDef[RF_PATH_A ].rfLSSIReadBack = rFPGA0_XA_LSSIReadBack; + hal_data->PHYRegDef[RF_PATH_B ].rfLSSIReadBack = rFPGA0_XB_LSSIReadBack; + hal_data->PHYRegDef[RF_PATH_C ].rfLSSIReadBack = rFPGA0_XC_LSSIReadBack; + hal_data->PHYRegDef[RF_PATH_D ].rfLSSIReadBack = rFPGA0_XD_LSSIReadBack; + + hal_data->PHYRegDef[RF_PATH_A ].rfLSSIReadBackPi = TransceiverA_HSPI_Readback; + hal_data->PHYRegDef[RF_PATH_B ].rfLSSIReadBackPi = TransceiverB_HSPI_Readback; +} + +static bool config_parafile (struct adapter *adapt) +{ +struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (adapt); +struct hal_data_8188e *hal_data =GET_HAL_DATA (adapt); + +set_baseband_phy_config (adapt); + +/* If EEPROM or EFUSE autoload OK, We must config by PHY_REG_PG.txt */ +if (!pEEPROM->bautoload_fail_flag) { + hal_data->pwrGroupCnt =0 ; +config_bb_with_pgheader (adapt); } +set_baseband_agc_config (adapt); +return true; +} + +bool rtl88e_phy_bb_config (struct adapter *adapt) +{ +int rtstatus = true; +struct hal_data_8188e *hal_data =GET_HAL_DATA (adapt); +u32 regval; +u8 crystal_cap; + +rtl88e_phy_init_bb_rf_register_definition (adapt); + +/* Enable BB and RF */ + regval =usb_read16 (adapt,REG_SYS_FUNC_EN ); +usb_write16 (adapt,REG_SYS_FUNC_EN , (u16)(regval|BIT13 |BIT0 |BIT1 )); + +usb_write8 (adapt,REG_RF_CTRL ,RF_EN |RF_RSTB |RF_SDMRSTB ); + +usb_write8 (adapt,REG_SYS_FUNC_EN ,FEN_USBA |FEN_USBD | FEN_BB_GLB_RSTn |FEN_BBRSTB ); + +/* Config BB and AGC */ + rtstatus =config_parafile (adapt); + +/* write 0x24[16:11] = 0x24[22:17] = crystal_cap */ + crystal_cap = hal_data->CrystalCap &0x3F ; +PHY_SetBBReg (adapt,REG_AFE_XTAL_CTRL ,0x7ff800 , (crystal_cap | (crystal_cap <<6 ))); + +return rtstatus; }
drivers/staging/rtl8188eu/hal/odm_HWConfig.c +0 -15
@@ -431,18 +431,3 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm, {ODM_PhyStatusQuery_92CSeries (dm_odm, pPhyInfo, pPhyStatus, pPktinfo); } - -enum HAL_STATUS ODM_ConfigBBWithHeaderFile (struct odm_dm_struct *dm_odm, -enum odm_bb_config_type config_tp) -{ -if (config_tp ==CONFIG_BB_PHY_REG ) { -READ_AND_CONFIG (8188E , _PHY_REG_1T_); - }else if (config_tp ==CONFIG_BB_AGC_TAB ) { -READ_AND_CONFIG (8188E , _AGC_TAB_1T_); - }else if (config_tp ==CONFIG_BB_PHY_REG_PG ) { -READ_AND_CONFIG (8188E , _PHY_REG_PG_); -ODM_RT_TRACE (dm_odm,ODM_COMP_INIT ,ODM_DBG_LOUD , - (" ===> phy_ConfigBBWithHeaderFile() agc:Rtl8188EPHY_REG_PGArray\n" )); - } -return HAL_STATUS_SUCCESS ; -}
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c +0 -187
199 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/usb_halinit.c +1 -9
@@ -760,15 +760,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)rtl88e_phy_mac_config (Adapter); -/* d. Initialize BB related configurations. */ -HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_BB ); -#if (HAL_BB_ENABLE ==1 ) - status =PHY_BBConfig8188E (Adapter); -if (status == _FAIL) { -DBG_88E (" ### Failed to init BB ......\n " ); - goto exit; - } -#endif +rtl88e_phy_bb_config (Adapter);rtl88e_phy_rf_config (Adapter);
drivers/staging/rtl8188eu/include/HalHWImg8188E_BB.h deleted +0 -44
44 lines not on this page · raw message
drivers/staging/rtl8188eu/include/odm_precomp.h +0 -2
@@ -46,8 +46,6 @@#include "odm_reg.h" -#include "HalHWImg8188E_BB.h" -#include "odm_RegConfig8188E.h" #include "odm_RTL8188E.h"
drivers/staging/rtl8188eu/include/phy.h +1 -0
@@ -1,2 +1,3 @@bool rtl88e_phy_mac_config (struct adapter *adapt);bool rtl88e_phy_rf_config (struct adapter *adapt); +bool rtl88e_phy_bb_config (struct adapter *adapt);
Signature · 1 line
1.7.10.4
PATCH 8/22 staging: rtl8188eu: Remove odm_RegConfig8188E.[h,c] files
In reply to navin patidardriver doesn't require these files anymore.
--- drivers/staging/rtl8188eu/Makefile | 1 - drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 86 -------------------- .../staging/rtl8188eu/include/odm_RegConfig8188E.h | 32 -------- drivers/staging/rtl8188eu/include/odm_precomp.h | 1 - 4 files changed, 120 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c delete mode 100644 drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h
drivers/staging/rtl8188eu/Makefile +0 -1
@@ -30,7 +30,6 @@ r8188eu-y := \ hal/odm.o \ hal/odm_debug.o \ hal/odm_HWConfig.o \ - hal/odm_RegConfig8188E.o\ hal/odm_RTL8188E.o \ hal/rtl8188e_cmd.o \ hal/rtl8188e_dm.o \
drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c deleted +0 -86
86 lines not on this page · raw message
drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h deleted +0 -32
@@ -1,32 +0,0 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -* -* -******************************************************************************/ -#ifndef __INC_ODM_REGCONFIG_H_8188E -#define __INC_ODM_REGCONFIG_H_8188E - -void odm_ConfigBB_AGC_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr, -u32 Bitmask,u32 Data); - -void odm_ConfigBB_PHY_REG_PG_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr, -u32 Bitmask,u32 Data); - -void odm_ConfigBB_PHY_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr, -u32 Bitmask,u32 Data); - -#endif
drivers/staging/rtl8188eu/include/odm_precomp.h +0 -1
@@ -46,7 +46,6 @@#include "odm_reg.h" -#include "odm_RegConfig8188E.h" #include "odm_RTL8188E.h" void odm_CmnInfoHook_Debug (struct odm_dm_struct *pDM_Odm);
Signature · 1 line
1.7.10.4
PATCH 9/22 staging: rtl8188eu: Remove unused function storePwrIndexDiffRateOffset()
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 44 -------------------- drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 2 - 2 files changed, 46 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c +0 -44
@@ -354,50 +354,6 @@ rtl8188e_PHY_SetRFReg(phy_RFSerialWrite (Adapter, eRFPath, RegAddr, Data); } -void storePwrIndexDiffRateOffset (struct adapter *Adapter,u32 RegAddr,u32 BitMask,u32 Data) -{ -struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter); - -if (RegAddr == rTxAGC_A_Rate18_06) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][0 ] = Data; -if (RegAddr == rTxAGC_A_Rate54_24) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][1 ] = Data; -if (RegAddr == rTxAGC_A_CCK1_Mcs32) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][6 ] = Data; -if (RegAddr == rTxAGC_B_CCK11_A_CCK2_11 && BitMask ==0xffffff00 ) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][7 ] = Data; -if (RegAddr == rTxAGC_A_Mcs03_Mcs00) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][2 ] = Data; -if (RegAddr == rTxAGC_A_Mcs07_Mcs04) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][3 ] = Data; -if (RegAddr == rTxAGC_A_Mcs11_Mcs08) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][4 ] = Data; -if (RegAddr == rTxAGC_A_Mcs15_Mcs12) { - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][5 ] = Data; -if (pHalData->rf_type ==RF_1T1R ) - pHalData->pwrGroupCnt++; - } -if (RegAddr == rTxAGC_B_Rate18_06) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][8 ] = Data; -if (RegAddr == rTxAGC_B_Rate54_24) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][9 ] = Data; -if (RegAddr == rTxAGC_B_CCK1_55_Mcs32) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][14 ] = Data; -if (RegAddr == rTxAGC_B_CCK11_A_CCK2_11 && BitMask ==0x000000ff ) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][15 ] = Data; -if (RegAddr == rTxAGC_B_Mcs03_Mcs00) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][10 ] = Data; -if (RegAddr == rTxAGC_B_Mcs07_Mcs04) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][11 ] = Data; -if (RegAddr == rTxAGC_B_Mcs11_Mcs08) - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][12 ] = Data; -if (RegAddr == rTxAGC_B_Mcs15_Mcs12) { - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][13 ] = Data; -if (pHalData->rf_type !=RF_1T1R ) - pHalData->pwrGroupCnt++; - } -} -static void getTxPowerIndex88E (struct adapter *Adapter,u8 channel,u8 *cckPowerLevel,u8 *ofdmPowerLevel,u8 *BW20PowerLevel,u8 *BW40PowerLevel)
drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h +0 -2
@@ -244,8 +244,6 @@ void PHY_EnableHostClkReq(struct adapter *adapter);bool SetAntennaConfig92C (struct adapter *adapter,u8 defaultant); -void storePwrIndexDiffRateOffset (struct adapter *adapter,u32 regaddr, -u32 mask,u32 data);/*--------------------------Exported Function prototype---------------------*/ #define PHY_QueryBBReg (adapt, regaddr, mask) \
Signature · 1 line
1.7.10.4
PATCH 10/22 staging: rtl8188eu: Hal8188EPhyCfg.h: Remove unused function declaration
In reply to navin patidar--- drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 11 ----------- 1 file changed, 11 deletions(-)
drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h +0 -11
@@ -206,17 +206,6 @@ u32 rtl8188e_PHY_QueryRFReg(struct adapter *adapter, enum rf_radio_path rfpath,void rtl8188e_PHY_SetRFReg (struct adapter *adapter,enum rf_radio_path rfpath,u32 regaddr,u32 mask,u32 data); -/* Initialization related function */ -/* MAC/BB/RF HAL config */ -int PHY_BBConfig8188E (struct adapter *adapter); -int PHY_RFConfig8188E (struct adapter *adapter); - -/* RF config */ -int rtl8188e_PHY_ConfigRFWithParaFile (struct adapter *adapter,u8 *filename, -enum rf_radio_path rfpath); -int rtl8188e_PHY_ConfigRFWithHeaderFile (struct adapter *adapter, -enum rf_radio_path rfpath); -/* Read initi reg value for tx power setting. */ void rtl8192c_PHY_GetHWRegOriginalValue (struct adapter *adapter);
Signature · 1 line
1.7.10.4
PATCH 11/22 staging: rtl8188eu: Remove unused function rtw_IOL_accquire_xmit_frame()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_iol.c | 36 --------------------------- drivers/staging/rtl8188eu/include/rtw_iol.h | 1 - 2 files changed, 37 deletions(-)
drivers/staging/rtl8188eu/core/rtw_iol.c +0 -36
@@ -20,42 +20,6 @@#include <rtw_iol.h> -struct xmit_frame *rtw_IOL_accquire_xmit_frame (struct adapter *adapter) -{ -struct xmit_frame *xmit_frame; -struct xmit_buf *xmitbuf; -struct pkt_attrib *pattrib; -struct xmit_priv *pxmitpriv = &(adapter->xmitpriv); - - xmit_frame =rtw_alloc_xmitframe (pxmitpriv); -if (xmit_frame ==NULL ) { -DBG_88E ("%s rtw_alloc_xmitframe return null\n" , __func__); - goto exit; - } - - xmitbuf =rtw_alloc_xmitbuf (pxmitpriv); -if (xmitbuf ==NULL ) { -DBG_88E ("%s rtw_alloc_xmitbuf return null\n" , __func__); -rtw_free_xmitframe (pxmitpriv, xmit_frame); - xmit_frame =NULL ; - goto exit; - } - - xmit_frame->frame_tag =MGNT_FRAMETAG ; - xmit_frame->pxmitbuf = xmitbuf; - xmit_frame->buf_addr = xmitbuf->pbuf; - xmitbuf->priv_data = xmit_frame; - - pattrib = &xmit_frame->attrib; -update_mgntframe_attrib (adapter, pattrib); - pattrib->qsel =0x10 ;/* Beacon */ - pattrib->subtype =WIFI_BEACON ; - pattrib->pktlen =0 ; - pattrib->last_txcmdsz =0 ; -exit: -return xmit_frame; -} -int rtw_IOL_append_cmds (struct xmit_frame *xmit_frame,u8 *IOL_cmds,u32 cmd_len) {struct pkt_attrib *pattrib = &xmit_frame->attrib;
drivers/staging/rtl8188eu/include/rtw_iol.h +0 -1
@@ -46,7 +46,6 @@ enum ioreg_cmd { IOREG_CMD_END = 0xFF, }; -struct xmit_frame *rtw_IOL_accquire_xmit_frame (struct adapter *adapter);int rtw_IOL_append_cmds (struct xmit_frame *xmit_frame,u8 *IOL_cmds,u32 cmd_len);int rtw_IOL_append_LLT_cmd (struct xmit_frame *xmit_frame,u8 page_boundary);
Signature · 1 line
1.7.10.4
PATCH 12/22 staging: rtl8188eu: Remove unused function rtw_IOL_cmd_boundary_handle()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_iol.c | 13 ------------- drivers/staging/rtl8188eu/include/rtw_iol.h | 1 - 2 files changed, 14 deletions(-)
drivers/staging/rtl8188eu/core/rtw_iol.c +0 -13
@@ -128,19 +128,6 @@ int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame)return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd,4 ); } -u8 rtw_IOL_cmd_boundary_handle (struct xmit_frame *pxmit_frame) -{ -u8 is_cmd_bndy = false; -if (((pxmit_frame->attrib.pktlen+32 )%256 ) +8 >=256 ) { -rtw_IOL_append_END_cmd (pxmit_frame); - pxmit_frame->attrib.pktlen = ((((pxmit_frame->attrib.pktlen+32 )/256 )+1 )*256 ); - - pxmit_frame->attrib.last_txcmdsz = pxmit_frame->attrib.pktlen; - is_cmd_bndy = true; - } -return is_cmd_bndy; -} -void rtw_IOL_cmd_buf_dump (struct adapter *Adapter,int buf_len,u8 *pbuf) {int i;
drivers/staging/rtl8188eu/include/rtw_iol.h +0 -1
@@ -75,7 +75,6 @@ int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path,#define rtw_IOL_append_WRF_cmd (xmit_frame, rf_path, addr, value, mask) \ _rtw_IOL_append_WRF_cmd((xmit_frame), (rf_path), (addr), (value), (mask)) -u8 rtw_IOL_cmd_boundary_handle (struct xmit_frame *pxmit_frame);void rtw_IOL_cmd_buf_dump (struct adapter *Adapter,int buf_len,u8 *pbuf);#endif /* __RTW_IOL_H_ */
Signature · 1 line
1.7.10.4
PATCH 13/22 staging: rtl8188eu: Remove unused function rtw_IOL_append_WD_cmd()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_iol.c | 14 -------------- drivers/staging/rtl8188eu/include/rtw_iol.h | 4 ---- 2 files changed, 18 deletions(-)
drivers/staging/rtl8188eu/core/rtw_iol.c +0 -14
@@ -77,20 +77,6 @@ int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, u8return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd, cmd.length); } -int _rtw_IOL_append_WD_cmd (struct xmit_frame *xmit_frame,u16 addr,u32 value,u32 mask) -{ -struct ioreg_cfg cmd = {8 ,IOREG_CMD_WD_REG ,0x0 ,0x0 ,0x0 }; - - cmd.address =cpu_to_le16 (addr); - cmd.data =cpu_to_le32 (value); - -if (mask !=0xFFFFFFFF ) { - cmd.length =12 ; - cmd.mask =cpu_to_le32 (mask); - } -return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd, cmd.length); -} -int _rtw_IOL_append_WRF_cmd (struct xmit_frame *xmit_frame,u8 rf_path,u16 addr,u32 value,u32 mask) {struct ioreg_cfg cmd = {8 ,IOREG_CMD_W_RF ,0x0 ,0x0 ,0x0 };
drivers/staging/rtl8188eu/include/rtw_iol.h +0 -4
@@ -62,16 +62,12 @@ void read_efuse_from_txpktbuf(struct adapter *adapter, int bcnhead,int _rtw_IOL_append_WB_cmd (struct xmit_frame *xmit_frame,u16 addr,u8 value,u8 mask); -int _rtw_IOL_append_WD_cmd (struct xmit_frame *xmit_frame,u16 addr, -u32 value,u32 mask);int _rtw_IOL_append_WRF_cmd (struct xmit_frame *xmit_frame,u8 rf_path,u16 addr,u32 value,u32 mask);#define rtw_IOL_append_WB_cmd (xmit_frame, addr, value, mask) \ _rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value) , (mask))#define rtw_IOL_append_WW_cmd (xmit_frame, addr, value, mask) \ _rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value), (mask)) -#define rtw_IOL_append_WD_cmd (xmit_frame, addr, value, mask) \ - _rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value), (mask))#define rtw_IOL_append_WRF_cmd (xmit_frame, rf_path, addr, value, mask) \ _rtw_IOL_append_WRF_cmd((xmit_frame), (rf_path), (addr), (value), (mask))
Signature · 1 line
1.7.10.4
PATCH 14/22 staging: rtl8188eu: Remove unused function rtw_IOL_exec_cmds_sync()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_iol.c | 5 ----- drivers/staging/rtl8188eu/include/rtw_iol.h | 3 --- 2 files changed, 8 deletions(-)
drivers/staging/rtl8188eu/core/rtw_iol.c +0 -5
@@ -53,11 +53,6 @@ bool rtw_IOL_applied(struct adapter *adapter)return false; } -int rtw_IOL_exec_cmds_sync (struct adapter *adapter,struct xmit_frame *xmit_frame,u32 max_wating_ms,u32 bndy_cnt) -{ -return rtw_hal_iol_cmd (adapter, xmit_frame, max_wating_ms, bndy_cnt); -} -int rtw_IOL_append_LLT_cmd (struct xmit_frame *xmit_frame,u8 page_boundary) {return _SUCCESS;
drivers/staging/rtl8188eu/include/rtw_iol.h +0 -3
@@ -49,9 +49,6 @@ enum ioreg_cmd {int rtw_IOL_append_cmds (struct xmit_frame *xmit_frame,u8 *IOL_cmds,u32 cmd_len);int rtw_IOL_append_LLT_cmd (struct xmit_frame *xmit_frame,u8 page_boundary); -int rtw_IOL_exec_cmds_sync (struct adapter *adapter, -struct xmit_frame *xmit_frame,u32 max_wating_ms, -u32 bndy_cnt);bool rtw_IOL_applied (struct adapter *adapter);int rtw_IOL_append_DELAY_US_cmd (struct xmit_frame *xmit_frame,u16 us);int rtw_IOL_append_DELAY_MS_cmd (struct xmit_frame *xmit_frame,u16 ms);
Signature · 1 line
1.7.10.4
PATCH 15/22 staging: rtl8188eu: Remove unused functions rtw_IOL_append_DELAY_[US,MS]_cmd()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_iol.c | 16 ---------------- drivers/staging/rtl8188eu/include/rtw_iol.h | 2 -- 2 files changed, 18 deletions(-)
drivers/staging/rtl8188eu/core/rtw_iol.c +0 -16
@@ -86,22 +86,6 @@ int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path, u16 addr,return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd, cmd.length); } -int rtw_IOL_append_DELAY_US_cmd (struct xmit_frame *xmit_frame,u16 us) -{ -struct ioreg_cfg cmd = {4 ,IOREG_CMD_DELAY_US ,0x0 ,0x0 ,0x0 }; - cmd.address =cpu_to_le16 (us); - -return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd,4 ); -} - -int rtw_IOL_append_DELAY_MS_cmd (struct xmit_frame *xmit_frame,u16 ms) -{ -struct ioreg_cfg cmd = {4 ,IOREG_CMD_DELAY_US ,0x0 ,0x0 ,0x0 }; - - cmd.address =cpu_to_le16 (ms); -return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd,4 ); -} -int rtw_IOL_append_END_cmd (struct xmit_frame *xmit_frame) {struct ioreg_cfg cmd = {4 ,IOREG_CMD_END ,cpu_to_le16 (0xFFFF ),cpu_to_le32 (0xFF ),0x0 };
drivers/staging/rtl8188eu/include/rtw_iol.h +0 -2
@@ -50,8 +50,6 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len);int rtw_IOL_append_LLT_cmd (struct xmit_frame *xmit_frame,u8 page_boundary);bool rtw_IOL_applied (struct adapter *adapter); -int rtw_IOL_append_DELAY_US_cmd (struct xmit_frame *xmit_frame,u16 us); -int rtw_IOL_append_DELAY_MS_cmd (struct xmit_frame *xmit_frame,u16 ms);int rtw_IOL_append_END_cmd (struct xmit_frame *xmit_frame); void read_efuse_from_txpktbuf(struct adapter *adapter, int bcnhead,
Signature · 1 line
1.7.10.4
PATCH 16/22 staging: rtl8188eu: Remove unused function rtw_IOL_cmd_tx_pkt_buf_dump()
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 32 --------------------- drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 1 - 2 files changed, 33 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -32
@@ -138,38 +138,6 @@ exit:return ret; } -void rtw_IOL_cmd_tx_pkt_buf_dump (struct adapter *Adapter,int data_len) -{ -u32 fifo_data, reg_140; -u32 addr, rstatus, loop =0 ; -u16 data_cnts = (data_len/8 )+1 ; -u8 *pbuf =vzalloc (data_len+10 ); -DBG_88E ("###### %s ######\n" , __func__); - -usb_write8 (Adapter,REG_PKT_BUFF_ACCESS_CTRL ,TXPKT_BUF_SELECT ); -if (pbuf) { -for (addr =0 ; addr < data_cnts; addr++) { -usb_write32 (Adapter,0x140 , addr); -msleep (1 ); - loop =0 ; -do { - rstatus = (reg_140 =usb_read32 (Adapter,REG_PKTBUF_DBG_CTRL )&BIT24 ); -if (rstatus) { - fifo_data =usb_read32 (Adapter,REG_PKTBUF_DBG_DATA_L ); -memcpy (pbuf+(addr*8 ), &fifo_data,4 ); - - fifo_data =usb_read32 (Adapter,REG_PKTBUF_DBG_DATA_H ); -memcpy (pbuf+(addr*8 +4 ), &fifo_data,4 ); - } -msleep (1 ); - }while (!rstatus && (loop++ <10 )); - } -rtw_IOL_cmd_buf_dump (Adapter, data_len, pbuf); -vfree (pbuf); - } -DBG_88E ("###### %s ######\n" , __func__); -} -#define MAX_REG_BOLCK_SIZE 196void _8051Reset88E (struct adapter *padapter)
drivers/staging/rtl8188eu/include/rtl8188e_hal.h +0 -1
@@ -423,7 +423,6 @@ void SetBcnCtrlReg(struct adapter *padapter, u8 SetBits, u8 ClearBits);void rtl8188e_start_thread (struct adapter *padapter);void rtl8188e_stop_thread (struct adapter *padapter); -void rtw_IOL_cmd_tx_pkt_buf_dump (struct adapter *Adapter,int len);s32 iol_execute (struct adapter *padapter,u8 control);void iol_mode_enable (struct adapter *padapter,u8 enable);s32 rtl8188e_iol_efuse_patch (struct adapter *padapter);
Signature · 1 line
1.7.10.4
PATCH 17/22 staging: rtl8188eu: Remove unused function rtw_IOL_cmd_buf_dump()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_iol.c | 17 ----------------- drivers/staging/rtl8188eu/include/rtw_iol.h | 2 -- 2 files changed, 19 deletions(-)
drivers/staging/rtl8188eu/core/rtw_iol.c +0 -17
@@ -92,20 +92,3 @@ int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame)return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd,4 ); } - -void rtw_IOL_cmd_buf_dump (struct adapter *Adapter,int buf_len,u8 *pbuf) -{ -int i; -int j =1 ; - -pr_info ("###### %s ######\n" , __func__); -for (i =0 ; i < buf_len; i++) { -printk ("%02x-" , *(pbuf+i)); - -if (j%32 ==0 ) -printk ("\n" ); - j++; - } -printk ("\n" ); -pr_info ("=============ioreg_cmd len=%d===============\n" , buf_len); -}
drivers/staging/rtl8188eu/include/rtw_iol.h +0 -2
@@ -66,6 +66,4 @@ int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path,#define rtw_IOL_append_WRF_cmd (xmit_frame, rf_path, addr, value, mask) \ _rtw_IOL_append_WRF_cmd((xmit_frame), (rf_path), (addr), (value), (mask)) -void rtw_IOL_cmd_buf_dump (struct adapter *Adapter,int buf_len,u8 *pbuf); -#endif /* __RTW_IOL_H_ */
Signature · 1 line
1.7.10.4
PATCH 18/22 staging:rtl8188eu: Remove rtl8188e_IOL_exec_cmds_sync() and its wrapper function
In reply to navin patidarrtl8188e_IOL_exec_cmds_sync() is a unused function.
--- drivers/staging/rtl8188eu/hal/hal_intf.c | 10 ------- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 32 --------------------- drivers/staging/rtl8188eu/include/hal_intf.h | 7 ----- 3 files changed, 49 deletions(-)
drivers/staging/rtl8188eu/hal/hal_intf.c +0 -10
@@ -354,16 +354,6 @@ u8 rtw_hal_sreset_get_wifi_status(struct adapter *adapt)return status; } -int rtw_hal_iol_cmd (struct adapter *adapter,struct xmit_frame *xmit_frame, -u32 max_wating_ms,u32 bndy_cnt) -{ -if (adapter->HalFunc.IOL_exec_cmds_sync) -return adapter->HalFunc.IOL_exec_cmds_sync (adapter, xmit_frame, - max_wating_ms, - bndy_cnt); -return _FAIL; -} -void rtw_hal_notch_filter (struct adapter *adapter,bool enable) {if (adapter->HalFunc.hal_notch_filter)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -32
@@ -108,36 +108,6 @@ static s32 iol_ioconfig(struct adapter *padapter, u8 iocfg_bndy)return rst; } -static int rtl8188e_IOL_exec_cmds_sync (struct adapter *adapter,struct xmit_frame *xmit_frame,u32 max_wating_ms,u32 bndy_cnt) -{ -struct pkt_attrib *pattrib = &xmit_frame->attrib; -u8 i; -int ret = _FAIL; - -if (rtw_IOL_append_END_cmd (xmit_frame) != _SUCCESS) - goto exit; -if (rtw_usb_bulk_size_boundary (adapter,TXDESC_SIZE +pattrib->last_txcmdsz)) { -if (rtw_IOL_append_END_cmd (xmit_frame) != _SUCCESS) - goto exit; - } - -dump_mgntframe_and_wait (adapter, xmit_frame, max_wating_ms); - -iol_mode_enable (adapter,1 ); -for (i =0 ; i < bndy_cnt; i++) { -u8 page_no =0 ; - page_no = i*2 ; - ret =iol_ioconfig (adapter, page_no); -if (ret != _SUCCESS) -break ; - } -iol_mode_enable (adapter,0 ); -exit: -/* restore BCN_HEAD */ -usb_write8 (adapter,REG_TDECTRL +1 ,0 ); -return ret; -} -#define MAX_REG_BOLCK_SIZE 196void _8051Reset88E (struct adapter *padapter)
@@ -279,8 +249,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->SetHalODMVarHandler = &rtl8188e_SetHalODMVar; - pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync; - pHalFunc->hal_notch_filter = &hal_notch_filter_8188e; }
drivers/staging/rtl8188eu/include/hal_intf.h +0 -7
@@ -228,10 +228,6 @@ struct hal_ops {void (*sreset_init_value)(struct adapter *padapter);u8 (*sreset_get_wifi_status)(struct adapter *padapter); -int (*IOL_exec_cmds_sync)(struct adapter *padapter, -struct xmit_frame *frame,u32 max_wait, -u32 bndy_cnt); -void (*hal_notch_filter)(struct adapter *adapter,bool enable);void (*hal_reset_security_engine)(struct adapter *adapter); };
@@ -331,9 +327,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter,void rtw_hal_sreset_init (struct adapter *padapter);u8 rtw_hal_sreset_get_wifi_status (struct adapter *padapter); -int rtw_hal_iol_cmd (struct adapter *adapter,struct xmit_frame *xmit_frame, -u32 max_wating_ms,u32 bndy_cnt); -void rtw_hal_notch_filter (struct adapter *adapter,bool enable);void rtw_hal_reset_security_engine (struct adapter *adapter);
Signature · 1 line
1.7.10.4
PATCH 19/22 staging: rtl8188eu: Remove unused function iol_ioconfig()
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -9
@@ -99,15 +99,6 @@ s32 rtl8188e_iol_efuse_patch(struct adapter *padapter)return result; } -static s32 iol_ioconfig (struct adapter *padapter,u8 iocfg_bndy) -{ -s32 rst = _SUCCESS; - -usb_write8 (padapter,REG_TDECTRL +1 , iocfg_bndy); - rst =iol_execute (padapter,CMD_IOCONFIG ); -return rst; -} -#define MAX_REG_BOLCK_SIZE 196void _8051Reset88E (struct adapter *padapter)
Signature · 1 line
1.7.10.4
PATCH 20/22 staging: rtl8188eu: rtw_iol.c: Remove unused functions
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_iol.c | 63 --------------------------- drivers/staging/rtl8188eu/include/rtw_iol.h | 18 -------- 2 files changed, 81 deletions(-)
drivers/staging/rtl8188eu/core/rtw_iol.c +0 -63
@@ -20,29 +20,6 @@#include <rtw_iol.h> -int rtw_IOL_append_cmds (struct xmit_frame *xmit_frame,u8 *IOL_cmds,u32 cmd_len) -{ -struct pkt_attrib *pattrib = &xmit_frame->attrib; -u16 buf_offset; -u32 ori_len; - - buf_offset =TXDESC_OFFSET ; - ori_len = buf_offset+pattrib->pktlen; - -/* check if the io_buf can accommodate new cmds */ -if (ori_len + cmd_len +8 >MAX_XMITBUF_SZ ) { -DBG_88E ("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n" , - __func__ , ori_len + cmd_len +8 ,MAX_XMITBUF_SZ ); -return _FAIL; - } - -memcpy (xmit_frame->buf_addr + buf_offset + pattrib->pktlen, IOL_cmds, cmd_len); - pattrib->pktlen += cmd_len; - pattrib->last_txcmdsz += cmd_len; - -return _SUCCESS; -} -bool rtw_IOL_applied (struct adapter *adapter) {if (1 == adapter->registrypriv.fw_iol)
@@ -52,43 +29,3 @@ bool rtw_IOL_applied(struct adapter *adapter)return true;return false; } - -int rtw_IOL_append_LLT_cmd (struct xmit_frame *xmit_frame,u8 page_boundary) -{ -return _SUCCESS; -} - -int _rtw_IOL_append_WB_cmd (struct xmit_frame *xmit_frame,u16 addr,u8 value,u8 mask) -{ -struct ioreg_cfg cmd = {8 ,IOREG_CMD_WB_REG ,0x0 ,0x0 ,0x0 }; - - cmd.address =cpu_to_le16 (addr); - cmd.data =cpu_to_le32 (value); - -if (mask !=0xFF ) { - cmd.length =12 ; - cmd.mask =cpu_to_le32 (mask); - } -return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd, cmd.length); -} - -int _rtw_IOL_append_WRF_cmd (struct xmit_frame *xmit_frame,u8 rf_path,u16 addr,u32 value,u32 mask) -{ -struct ioreg_cfg cmd = {8 ,IOREG_CMD_W_RF ,0x0 ,0x0 ,0x0 }; - - cmd.address =cpu_to_le16 ((rf_path<<8 ) | ((addr) &0xFF )); - cmd.data =cpu_to_le32 (value); - -if (mask !=0x000FFFFF ) { - cmd.length =12 ; - cmd.mask =cpu_to_le32 (mask); - } -return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd, cmd.length); -} - -int rtw_IOL_append_END_cmd (struct xmit_frame *xmit_frame) -{ -struct ioreg_cfg cmd = {4 ,IOREG_CMD_END ,cpu_to_le16 (0xFFFF ),cpu_to_le32 (0xFF ),0x0 }; - -return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd,4 ); -}
drivers/staging/rtl8188eu/include/rtw_iol.h +0 -18
@@ -46,24 +46,6 @@ enum ioreg_cmd { IOREG_CMD_END = 0xFF, }; -int rtw_IOL_append_cmds (struct xmit_frame *xmit_frame,u8 *IOL_cmds, -u32 cmd_len); -int rtw_IOL_append_LLT_cmd (struct xmit_frame *xmit_frame,u8 page_boundary);bool rtw_IOL_applied (struct adapter *adapter); -int rtw_IOL_append_END_cmd (struct xmit_frame *xmit_frame); - -void read_efuse_from_txpktbuf (struct adapter *adapter,int bcnhead, -u8 *content,u16 *size); - -int _rtw_IOL_append_WB_cmd (struct xmit_frame *xmit_frame,u16 addr, -u8 value,u8 mask); -int _rtw_IOL_append_WRF_cmd (struct xmit_frame *xmit_frame,u8 rf_path, -u16 addr,u32 value,u32 mask); -#define rtw_IOL_append_WB_cmd (xmit_frame, addr, value, mask) \ - _rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value) , (mask)) -#define rtw_IOL_append_WW_cmd (xmit_frame, addr, value, mask) \ - _rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value), (mask)) -#define rtw_IOL_append_WRF_cmd (xmit_frame, rf_path, addr, value, mask) \ - _rtw_IOL_append_WRF_cmd((xmit_frame), (rf_path), (addr), (value), (mask))#endif /* __RTW_IOL_H_ */
Signature · 1 line
1.7.10.4
PATCH 21/22 staging: rtl8188eu: rtw_iol.h: Remove unused struct, enum and macro
In reply to navin patidar--- drivers/staging/rtl8188eu/include/rtw_iol.h | 23 ----------------------- 1 file changed, 23 deletions(-)
drivers/staging/rtl8188eu/include/rtw_iol.h +0 -23
@@ -23,29 +23,6 @@#include <osdep_service.h> #include <drv_types.h> -#define IOREG_CMD_END_LEN 4 - -struct ioreg_cfg { -u8 length; -u8 cmd_id; -__le16 address; -__le32 data; -__le32 mask; -}; - -enum ioreg_cmd { -IOREG_CMD_LLT =0x01 , -IOREG_CMD_REFUSE =0x02 , -IOREG_CMD_EFUSE_PATH =0x03 , -IOREG_CMD_WB_REG =0x04 , -IOREG_CMD_WW_REG =0x05 , -IOREG_CMD_WD_REG =0x06 , -IOREG_CMD_W_RF =0x07 , -IOREG_CMD_DELAY_US =0x10 , -IOREG_CMD_DELAY_MS =0x11 , -IOREG_CMD_END =0xFF , -}; -bool rtw_IOL_applied (struct adapter *adapter);#endif /* __RTW_IOL_H_ */
Signature · 1 line
1.7.10.4
PATCH 22/22 staging: rtl8188eu: Declare Efuse_GetCurrentSize() as a static function
In reply to navin patidar--- 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
@@ -440,7 +440,7 @@ u8 Efuse_WordEnableDataWrite(struct adapter *pAdapter, u16 efuse_addr, u8 word_ereturn badworden; } -u16 Efuse_GetCurrentSize (struct adapter *pAdapter) +static u16 Efuse_GetCurrentSize (struct adapter *pAdapter) {int bContinual = true;u16 efuse_addr =0 ;
drivers/staging/rtl8188eu/include/rtw_efuse.h +0 -1
@@ -99,7 +99,6 @@ struct efuse_hal {u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN ]; }; -u16 Efuse_GetCurrentSize (struct adapter *adapter);u8 Efuse_CalculateWordCnts (u8 word_en);void EFUSE_GetEfuseDefinition (struct adapter *adapt,u8 type,u8 type1,void *out);
Signature · 1 line
1.7.10.4