skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-25 14:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove configuration variables CONFIG_IOL_XXX and associated dead code

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-14 11:21:05 -05:00
parent 927e984c73
commit 9ba4954378
16 changed files with 36 additions and 672 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
core/rtw_iol.c
View file

@ -20,7 +20,6 @@
#include<rtw_iol.h> #include<rtw_iol.h>
#ifdef CONFIG_IOL
struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter) struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter)
{ {
struct xmit_frame *xmit_frame; struct xmit_frame *xmit_frame;
@ -110,7 +109,6 @@ int rtw_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32
return rtw_hal_iol_cmd(adapter, xmit_frame, max_wating_ms,bndy_cnt); return rtw_hal_iol_cmd(adapter, xmit_frame, max_wating_ms,bndy_cnt);
} }
#ifdef CONFIG_IOL_NEW_GENERATION
int rtw_IOL_append_LLT_cmd(struct xmit_frame *xmit_frame, u8 page_boundary) int rtw_IOL_append_LLT_cmd(struct xmit_frame *xmit_frame, u8 page_boundary)
{ {
return _SUCCESS; return _SUCCESS;
@ -232,123 +230,3 @@ void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter,int buf_len,u8 *pbuf)
printk("\n"); printk("\n");
printk("============= ioreg_cmd len = %d ===============\n",buf_len); printk("============= ioreg_cmd len = %d ===============\n",buf_len);
} }
#else /* CONFIG_IOL_NEW_GENERATION */
int rtw_IOL_append_LLT_cmd(struct xmit_frame *xmit_frame, u8 page_boundary)
{
IOL_CMD cmd = {0x0, IOL_CMD_LLT, 0x0, 0x0};
RTW_PUT_BE32((u8*)&cmd.value, (u32)page_boundary);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8);
}
int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value)
{
IOL_CMD cmd = {0x0, IOL_CMD_WB_REG, 0x0, 0x0};
RTW_PUT_BE16((u8*)&cmd.address, (u16)addr);
RTW_PUT_BE32((u8*)&cmd.value, (u32)value);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8);
}
int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value)
{
IOL_CMD cmd = {0x0, IOL_CMD_WW_REG, 0x0, 0x0};
RTW_PUT_BE16((u8*)&cmd.address, (u16)addr);
RTW_PUT_BE32((u8*)&cmd.value, (u32)value);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8);
}
int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value)
{
IOL_CMD cmd = {0x0, IOL_CMD_WD_REG, 0x0, 0x0};
u8* pos = (u8 *)&cmd;
RTW_PUT_BE16((u8*)&cmd.address, (u16)addr);
RTW_PUT_BE32((u8*)&cmd.value, (u32)value);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8);
}
#ifdef DBG_IO
int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 1))
DBG_88E("DBG_IO %s:%d IOL_WB(0x%04x, 0x%02x)\n", caller, line, addr, value);
return _rtw_IOL_append_WB_cmd(xmit_frame, addr, value);
}
int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 2))
DBG_88E("DBG_IO %s:%d IOL_WW(0x%04x, 0x%04x)\n", caller, line, addr, value);
return _rtw_IOL_append_WW_cmd(xmit_frame, addr, value);
}
int dbg_rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 4))
DBG_88E("DBG_IO %s:%d IOL_WD(0x%04x, 0x%08x)\n", caller, line, addr, value);
return _rtw_IOL_append_WD_cmd(xmit_frame, addr, value);
}
#endif
int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us)
{
IOL_CMD cmd = {0x0, IOL_CMD_DELAY_US, 0x0, 0x0};
RTW_PUT_BE32((u8*)&cmd.value, (u32)us);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8);
}
int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms)
{
IOL_CMD cmd = {0x0, IOL_CMD_DELAY_MS, 0x0, 0x0};
RTW_PUT_BE32((u8*)&cmd.value, (u32)ms);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8);
}
int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame)
{
IOL_CMD end_cmd = {0x0, IOL_CMD_END, 0x0, 0x0};
return rtw_IOL_append_cmds(xmit_frame, (u8*)&end_cmd, 8);
}
int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms)
{
struct xmit_frame *xmit_frame;
if ((xmit_frame=rtw_IOL_accquire_xmit_frame(adapter)) == NULL)
return _FAIL;
if (rtw_IOL_append_cmds(xmit_frame, IOL_cmds, cmd_num<<3) == _FAIL)
return _FAIL;
return rtw_IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,0);
}
int rtw_IOL_exec_empty_cmds_sync(ADAPTER *adapter, u32 max_wating_ms)
{
IOL_CMD end_cmd = {0x0, IOL_CMD_END, 0x0, 0x0};
return rtw_IOL_exec_cmd_array_sync(adapter, (u8*)&end_cmd, 1, max_wating_ms);
}
#endif /* CONFIG_IOL_NEW_GENERATION */
#endif /* CONFIG_IOL */

87
hal/HalHWImg8188E_BB.c
View file

@ -20,9 +20,7 @@
#include "odm_precomp.h" #include "odm_precomp.h"
#ifdef CONFIG_IOL_IOREG_CFG
#include <rtw_iol.h> #include <rtw_iol.h>
#endif
#if (RTL8188E_SUPPORT == 1) #if (RTL8188E_SUPPORT == 1)
static bool static bool
@ -208,18 +206,15 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
u4Byte ArrayLen = sizeof(Array_AGC_TAB_1T_8188E)/sizeof(u4Byte); u4Byte ArrayLen = sizeof(Array_AGC_TAB_1T_8188E)/sizeof(u4Byte);
pu4Byte Array = Array_AGC_TAB_1T_8188E; pu4Byte Array = Array_AGC_TAB_1T_8188E;
bool biol = false; bool biol = false;
#ifdef CONFIG_IOL_IOREG_CFG
PADAPTER Adapter = pDM_Odm->Adapter; PADAPTER Adapter = pDM_Odm->Adapter;
struct xmit_frame *pxmit_frame; struct xmit_frame *pxmit_frame;
u8 bndy_cnt=1; u8 bndy_cnt=1;
#endif/* ifdef CONFIG_IOL_IOREG_CFG */
HAL_STATUS rst =HAL_STATUS_SUCCESS; HAL_STATUS rst =HAL_STATUS_SUCCESS;
hex += board; hex += board;
hex += interfaceValue << 8; hex += interfaceValue << 8;
hex += platform << 16; hex += platform << 16;
hex += 0xFF000000; hex += 0xFF000000;
#ifdef CONFIG_IOL_IOREG_CFG
biol = rtw_IOL_applied(Adapter); biol = rtw_IOL_applied(Adapter);
if (biol){ if (biol){
@ -228,7 +223,6 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
return HAL_STATUS_FAILURE; return HAL_STATUS_FAILURE;
} }
} }
#endif/* ifdef CONFIG_IOL_IOREG_CFG */
for (i = 0; i < ArrayLen; i += 2 ) for (i = 0; i < ArrayLen; i += 2 )
{ {
@ -238,14 +232,12 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
/* This (offset, data) pair meets the condition. */ /* This (offset, data) pair meets the condition. */
if ( v1 < 0xCDCDCDCD ) if ( v1 < 0xCDCDCDCD )
{ {
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
if (rtw_IOL_cmd_boundary_handle(pxmit_frame)) if (rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord); rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord);
} }
else else
#endif /* ifdef CONFIG_IOL_IOREG_CFG */
{ {
odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2);
} }
@ -271,14 +263,12 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
if (rtw_IOL_cmd_boundary_handle(pxmit_frame)) if (rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord); rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord);
} }
else else
#endif /* ifdef CONFIG_IOL_IOREG_CFG */
{ {
odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_AGC_8188E(pDM_Odm, v1, bMaskDWord, v2);
} }
@ -293,32 +283,12 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
} }
} }
} }
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) if (!rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) {
{
#ifdef CONFIG_IOL_IOREG_CFG_DBG
printk("~~~ %s Success !!!\n",__func__);
{
/* dump data from TX packet buffer */
rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32);
}
#endif /* CONFIG_IOL_IOREG_CFG_DBG */
}
else{
printk("~~~ %s IOL_exec_cmds Failed !!!\n",__func__); printk("~~~ %s IOL_exec_cmds Failed !!!\n",__func__);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
{
/* dump data from TX packet buffer */
rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32);
}
#endif /* CONFIG_IOL_IOREG_CFG_DBG */
rst = HAL_STATUS_FAILURE; rst = HAL_STATUS_FAILURE;
} }
} }
#endif /* ifdef CONFIG_IOL_IOREG_CFG */
return rst; return rst;
} }
@ -538,21 +508,14 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
u4Byte ArrayLen = sizeof(Array_PHY_REG_1T_8188E)/sizeof(u4Byte); u4Byte ArrayLen = sizeof(Array_PHY_REG_1T_8188E)/sizeof(u4Byte);
pu4Byte Array = Array_PHY_REG_1T_8188E; pu4Byte Array = Array_PHY_REG_1T_8188E;
bool biol = false; bool biol = false;
#ifdef CONFIG_IOL_IOREG_CFG
PADAPTER Adapter = pDM_Odm->Adapter; PADAPTER Adapter = pDM_Odm->Adapter;
struct xmit_frame *pxmit_frame; struct xmit_frame *pxmit_frame;
u8 bndy_cnt=1; u8 bndy_cnt=1;
#ifdef CONFIG_IOL_IOREG_CFG_DBG
struct cmd_cmp cmpdata[ArrayLen];
u4Byte cmpdata_idx=0;
#endif
#endif/* ifdef CONFIG_IOL_IOREG_CFG */
HAL_STATUS rst =HAL_STATUS_SUCCESS; HAL_STATUS rst =HAL_STATUS_SUCCESS;
hex += board; hex += board;
hex += interfaceValue << 8; hex += interfaceValue << 8;
hex += platform << 16; hex += platform << 16;
hex += 0xFF000000; hex += 0xFF000000;
#ifdef CONFIG_IOL_IOREG_CFG
biol = rtw_IOL_applied(Adapter); biol = rtw_IOL_applied(Adapter);
if (biol){ if (biol){
@ -562,7 +525,6 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
return HAL_STATUS_FAILURE; return HAL_STATUS_FAILURE;
} }
} }
#endif/* ifdef CONFIG_IOL_IOREG_CFG */
for (i = 0; i < ArrayLen; i += 2 ) for (i = 0; i < ArrayLen; i += 2 )
{ {
@ -573,7 +535,6 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
/* This (offset, data) pair meets the condition. */ /* This (offset, data) pair meets the condition. */
if ( v1 < 0xCDCDCDCD ) if ( v1 < 0xCDCDCDCD )
{ {
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
if (rtw_IOL_cmd_boundary_handle(pxmit_frame)) if (rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
@ -602,15 +563,9 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
pDM_Odm->RFCalibrateInfo.RegA24 = v2; pDM_Odm->RFCalibrateInfo.RegA24 = v2;
rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord); rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
cmpdata_idx++;
#endif
} }
} }
else else
#endif /* ifdef CONFIG_IOL_IOREG_CFG */
{ {
odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2);
} }
@ -636,7 +591,6 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
if (rtw_IOL_cmd_boundary_handle(pxmit_frame)) if (rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
@ -663,15 +617,9 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
pDM_Odm->RFCalibrateInfo.RegA24 = v2; pDM_Odm->RFCalibrateInfo.RegA24 = v2;
rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord); rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
cmpdata_idx++;
#endif
} }
} }
else else
#endif /* ifdef CONFIG_IOL_IOREG_CFG */
{ {
odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2); odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2);
} }
@ -686,44 +634,13 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
} }
} }
} }
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
/* printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__func__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); */ /* printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__func__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); */
if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) if (!rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) {
{
#ifdef CONFIG_IOL_IOREG_CFG_DBG
printk("~~~ %s IOL_exec_cmds Success !!!\n",__func__);
{
u4Byte idx;
u4Byte cdata;
printk(" %s data compare => array_len:%d\n",__func__,cmpdata_idx);
printk("### %s data compared !!###\n",__func__);
for (idx=0;idx< cmpdata_idx;idx++)
{
cdata = ODM_Read4Byte(pDM_Odm, cmpdata[idx].addr);
if (cdata != cmpdata[idx].value){
printk(" addr:0x%04x, data:(0x%02x : 0x%02x)\n",
cmpdata[idx].addr,cmpdata[idx].value,cdata);
rst = HAL_STATUS_FAILURE;
}
}
printk("### %s data compared !!###\n",__func__);
/* dump data from TX packet buffer */
rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32);
}
#endif /* CONFIG_IOL_IOREG_CFG_DBG */
} else {
rst = HAL_STATUS_FAILURE; rst = HAL_STATUS_FAILURE;
printk("~~~ IOL Config %s Failed !!!\n",__func__); printk("~~~ IOL Config %s Failed !!!\n",__func__);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
{
/* dump data from TX packet buffer */
rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32);
}
#endif /* CONFIG_IOL_IOREG_CFG_DBG */
} }
} }
#endif /* ifdef CONFIG_IOL_IOREG_CFG */
return rst; return rst;
} }

67
hal/HalHWImg8188E_MAC.c
View file

@ -19,9 +19,7 @@
******************************************************************************/ ******************************************************************************/
#include "odm_precomp.h" #include "odm_precomp.h"
#ifdef CONFIG_IOL_IOREG_CFG
#include <rtw_iol.h> #include <rtw_iol.h>
#endif
#if (RTL8188E_SUPPORT == 1) #if (RTL8188E_SUPPORT == 1)
static bool static bool
CheckCondition( CheckCondition(
@ -169,22 +167,15 @@ ODM_ReadAndConfig_MAC_REG_8188E(
pu4Byte Array = Array_MAC_REG_8188E; pu4Byte Array = Array_MAC_REG_8188E;
bool biol = false; bool biol = false;
#ifdef CONFIG_IOL_IOREG_CFG
PADAPTER Adapter = pDM_Odm->Adapter; PADAPTER Adapter = pDM_Odm->Adapter;
struct xmit_frame *pxmit_frame; struct xmit_frame *pxmit_frame;
u8 bndy_cnt = 1; u8 bndy_cnt = 1;
#ifdef CONFIG_IOL_IOREG_CFG_DBG
struct cmd_cmp cmpdata[ArrayLen];
u4Byte cmpdata_idx=0;
#endif
#endif /* CONFIG_IOL_IOREG_CFG */
HAL_STATUS rst =HAL_STATUS_SUCCESS; HAL_STATUS rst =HAL_STATUS_SUCCESS;
hex += board; hex += board;
hex += interfaceValue << 8; hex += interfaceValue << 8;
hex += platform << 16; hex += platform << 16;
hex += 0xFF000000; hex += 0xFF000000;
#ifdef CONFIG_IOL_IOREG_CFG
biol = rtw_IOL_applied(Adapter); biol = rtw_IOL_applied(Adapter);
if (biol){ if (biol){
@ -195,8 +186,6 @@ ODM_ReadAndConfig_MAC_REG_8188E(
} }
} }
#endif /* CONFIG_IOL_IOREG_CFG */
for (i = 0; i < ArrayLen; i += 2 ) for (i = 0; i < ArrayLen; i += 2 )
{ {
u4Byte v1 = Array[i]; u4Byte v1 = Array[i];
@ -205,21 +194,12 @@ ODM_ReadAndConfig_MAC_REG_8188E(
/* This (offset, data) pair meets the condition. */ /* This (offset, data) pair meets the condition. */
if ( v1 < 0xCDCDCDCD ) if ( v1 < 0xCDCDCDCD )
{ {
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
if (rtw_IOL_cmd_boundary_handle(pxmit_frame)) if (rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
rtw_IOL_append_WB_cmd(pxmit_frame,(u2Byte)v1, (u1Byte)v2,0xFF); rtw_IOL_append_WB_cmd(pxmit_frame,(u2Byte)v1, (u1Byte)v2,0xFF);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
cmpdata_idx++;
#endif
} }
else else
#endif /* endif CONFIG_IOL_IOREG_CFG */
{ {
odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2); odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2);
} }
@ -245,19 +225,12 @@ ODM_ReadAndConfig_MAC_REG_8188E(
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
if (rtw_IOL_cmd_boundary_handle(pxmit_frame)) if (rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
rtw_IOL_append_WB_cmd(pxmit_frame,(u2Byte)v1, (u1Byte)v2,0xFF); rtw_IOL_append_WB_cmd(pxmit_frame,(u2Byte)v1, (u1Byte)v2,0xFF);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
cmpdata_idx++;
#endif
} }
else else
#endif /* ifdef CONFIG_IOL_IOREG_CFG */
{ {
odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2); odm_ConfigMAC_8188E(pDM_Odm, v1, (u1Byte)v2);
} }
@ -274,51 +247,13 @@ ODM_ReadAndConfig_MAC_REG_8188E(
} }
} }
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) { if (!rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) {
#ifdef CONFIG_IOL_IOREG_CFG_DBG
printk("~~~ IOL Config MAC Success !!!\n");
/* compare written data */
{
u4Byte idx;
u1Byte cdata;
/* HAL_STATUS_FAILURE; */
printk(" MAC data compare => array_len:%d\n",cmpdata_idx);
for (idx=0;idx< cmpdata_idx;idx++)
{
cdata = ODM_Read1Byte(pDM_Odm, cmpdata[idx].addr);
if (cdata != cmpdata[idx].value){
printk("### MAC data compared failed !! addr:0x%04x, data:(0x%02x : 0x%02x) ###\n",
cmpdata[idx].addr,cmpdata[idx].value,cdata);
/* rst = HAL_STATUS_FAILURE; */
}
}
/* dump data from TX packet buffer */
/* if (rst == HAL_STATUS_FAILURE) */
{
rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32);
}
}
#endif /* CONFIG_IOL_IOREG_CFG_DBG */
}
else{
printk("~~~ MAC IOL_exec_cmds Failed !!!\n"); printk("~~~ MAC IOL_exec_cmds Failed !!!\n");
#ifdef CONFIG_IOL_IOREG_CFG_DBG
{
/* dump data from TX packet buffer */
rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32);
}
#endif /* CONFIG_IOL_IOREG_CFG_DBG */
rst = HAL_STATUS_FAILURE; rst = HAL_STATUS_FAILURE;
} }
} }
#endif /* ifdef CONFIG_IOL_IOREG_CFG */
return rst; return rst;
} }

66
hal/HalHWImg8188E_RF.c
View file

@ -20,9 +20,7 @@
#include "odm_precomp.h" #include "odm_precomp.h"
#ifdef CONFIG_IOL_IOREG_CFG
#include <rtw_iol.h> #include <rtw_iol.h>
#endif
#if (RTL8188E_SUPPORT == 1) #if (RTL8188E_SUPPORT == 1)
static bool static bool
@ -176,22 +174,15 @@ HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(PDM_ODM_T pDM_Odm)
u4Byte ArrayLen = sizeof(Array_RadioA_1T_8188E)/sizeof(u4Byte); u4Byte ArrayLen = sizeof(Array_RadioA_1T_8188E)/sizeof(u4Byte);
pu4Byte Array = Array_RadioA_1T_8188E; pu4Byte Array = Array_RadioA_1T_8188E;
bool biol = false; bool biol = false;
#ifdef CONFIG_IOL_IOREG_CFG
PADAPTER Adapter = pDM_Odm->Adapter; PADAPTER Adapter = pDM_Odm->Adapter;
struct xmit_frame *pxmit_frame; struct xmit_frame *pxmit_frame;
u8 bndy_cnt = 1; u8 bndy_cnt = 1;
#ifdef CONFIG_IOL_IOREG_CFG_DBG
struct cmd_cmp cmpdata[ArrayLen];
u4Byte cmpdata_idx=0;
#endif
#endif/* ifdef CONFIG_IOL_IOREG_CFG */
HAL_STATUS rst =HAL_STATUS_SUCCESS; HAL_STATUS rst =HAL_STATUS_SUCCESS;
hex += board; hex += board;
hex += interfaceValue << 8; hex += interfaceValue << 8;
hex += platform << 16; hex += platform << 16;
hex += 0xFF000000; hex += 0xFF000000;
#ifdef CONFIG_IOL_IOREG_CFG
biol = rtw_IOL_applied(Adapter); biol = rtw_IOL_applied(Adapter);
if (biol){ if (biol){
@ -201,7 +192,6 @@ HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(PDM_ODM_T pDM_Odm)
return HAL_STATUS_FAILURE; return HAL_STATUS_FAILURE;
} }
} }
#endif/* ifdef CONFIG_IOL_IOREG_CFG */
for (i = 0; i < ArrayLen; i += 2 ) for (i = 0; i < ArrayLen; i += 2 )
{ {
@ -211,7 +201,6 @@ HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(PDM_ODM_T pDM_Odm)
/* This (offset, data) pair meets the condition. */ /* This (offset, data) pair meets the condition. */
if ( v1 < 0xCDCDCDCD ) if ( v1 < 0xCDCDCDCD )
{ {
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
if (rtw_IOL_cmd_boundary_handle(pxmit_frame)) if (rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
@ -237,16 +226,10 @@ HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(PDM_ODM_T pDM_Odm)
} }
else{ else{
rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u2Byte)v1, v2,bRFRegOffsetMask) ; rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u2Byte)v1, v2,bRFRegOffsetMask) ;
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
cmpdata_idx++;
#endif
} }
} }
else else
#endif /* ifdef CONFIG_IOL_IOREG_CFG */
{ {
odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2); odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
} }
@ -272,7 +255,6 @@ HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(PDM_ODM_T pDM_Odm)
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen -2)
{ {
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
if (rtw_IOL_cmd_boundary_handle(pxmit_frame)) if (rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
@ -298,17 +280,10 @@ HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(PDM_ODM_T pDM_Odm)
} }
else{ else{
rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u2Byte)v1, v2,bRFRegOffsetMask) ; rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u2Byte)v1, v2,bRFRegOffsetMask) ;
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
cmpdata_idx++;
#endif
} }
} }
else else
#endif /* ifdef CONFIG_IOL_IOREG_CFG */
{ {
odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2); odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
} }
@ -316,55 +291,16 @@ HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(PDM_ODM_T pDM_Odm)
} }
while (v2 != 0xDEAD && i < ArrayLen -2) while (v2 != 0xDEAD && i < ArrayLen -2)
{
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
}
} }
} }
} }
#ifdef CONFIG_IOL_IOREG_CFG
if (biol){ if (biol){
if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) if (!rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) {
{
#ifdef CONFIG_IOL_IOREG_CFG_DBG
printk("~~~ %s Success !!!\n",__func__);
{
u4Byte idx;
u4Byte cdata;
printk(" %s data compare => array_len:%d\n",__func__,cmpdata_idx);
printk("### %s data compared !!###\n",__func__);
for (idx=0;idx< cmpdata_idx;idx++)
{
cdata = ODM_GetRFReg(pDM_Odm, ODM_RF_PATH_A,cmpdata[idx].addr,bRFRegOffsetMask);
if (cdata != cmpdata[idx].value){
printk("addr:0x%04x, data:(0x%02x : 0x%02x)\n",
cmpdata[idx].addr,cmpdata[idx].value,cdata);
rst = HAL_STATUS_FAILURE;
}
}
printk("### %s data compared !!###\n",__func__);
{/* dump data from TX packet buffer */
rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32);
}
}
#endif /* CONFIG_IOL_IOREG_CFG_DBG */
}
else{
rst = HAL_STATUS_FAILURE; rst = HAL_STATUS_FAILURE;
printk("~~~ IOL Config %s Failed !!!\n",__func__); printk("~~~ IOL Config %s Failed !!!\n",__func__);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
{
/* dump data from TX packet buffer */
rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32);
}
#endif /* CONFIG_IOL_IOREG_CFG_DBG */
} }
} }
#endif /* ifdef CONFIG_IOL_IOREG_CFG */
return rst; return rst;
} }

2
hal/hal_intf.c
View file

@ -404,14 +404,12 @@ u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter)
#endif /* DBG_CONFIG_ERROR_DETECT */ #endif /* DBG_CONFIG_ERROR_DETECT */
#ifdef CONFIG_IOL
int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt) int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)
{ {
if (adapter->HalFunc.IOL_exec_cmds_sync) if (adapter->HalFunc.IOL_exec_cmds_sync)
return adapter->HalFunc.IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,bndy_cnt); return adapter->HalFunc.IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,bndy_cnt);
return _FAIL; return _FAIL;
} }
#endif
#ifdef CONFIG_XMIT_THREAD_MODE #ifdef CONFIG_XMIT_THREAD_MODE
s32 rtw_hal_xmit_thread_handler(_adapter *padapter) s32 rtw_hal_xmit_thread_handler(_adapter *padapter)

15
hal/rtl8188e_hal_init.c
View file

@ -26,7 +26,6 @@
#include <rtw_iol.h> #include <rtw_iol.h>
#if defined(CONFIG_IOL)
#include <usb_ops.h> #include <usb_ops.h>
static void iol_mode_enable(PADAPTER padapter, u8 enable) static void iol_mode_enable(PADAPTER padapter, u8 enable)
@ -413,7 +412,6 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len)
} }
DBG_88E("###### %s ######\n",__func__); DBG_88E("###### %s ######\n",__func__);
} }
#endif /* defined(CONFIG_IOL) */
static void _FWDownloadEnable(PADAPTER padapter, bool enable) static void _FWDownloadEnable(PADAPTER padapter, bool enable)
{ {
@ -1250,7 +1248,6 @@ ReadEFuseByIC(
u8 logical_map[512]; u8 logical_map[512];
#endif #endif
#ifdef CONFIG_IOL_READ_EFUSE_MAP
if (!bPseudoTest )/* rtw_IOL_applied(Adapter)) */ if (!bPseudoTest )/* rtw_IOL_applied(Adapter)) */
{ {
int ret = _FAIL; int ret = _FAIL;
@ -1270,7 +1267,6 @@ ReadEFuseByIC(
goto exit; goto exit;
} }
} }
#endif
Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest); Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest);
exit: exit:
@ -2592,9 +2588,7 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->xmit_thread_handler = &hal_xmit_handler; pHalFunc->xmit_thread_handler = &hal_xmit_handler;
#endif #endif
#ifdef CONFIG_IOL
pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync; pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;
#endif
pHalFunc->hal_notch_filter = &hal_notch_filter_8188e; pHalFunc->hal_notch_filter = &hal_notch_filter_8188e;
@ -2653,14 +2647,9 @@ s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy)
u32 Last_Entry_Of_TxPktBuf = LAST_ENTRY_OF_TX_PKT_BUFFER;/* 176, 22k */ u32 Last_Entry_Of_TxPktBuf = LAST_ENTRY_OF_TX_PKT_BUFFER;/* 176, 22k */
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
#if defined(CONFIG_IOL_LLT) if (rtw_IOL_applied(padapter)) {
if (rtw_IOL_applied(padapter))
{
status = iol_InitLLTTable(padapter, txpktbuf_bndy); status = iol_InitLLTTable(padapter, txpktbuf_bndy);
} } else {
else
#endif
{
for (i = 0; i < (txpktbuf_bndy - 1); i++) { for (i = 0; i < (txpktbuf_bndy - 1); i++) {
status = _LLTWrite(padapter, i, i + 1); status = _LLTWrite(padapter, i, i + 1);
if (_SUCCESS != status) { if (_SUCCESS != status) {

149
hal/rtl8188e_phycfg.c
View file

@ -22,14 +22,9 @@
#include <drv_conf.h> #include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#ifdef CONFIG_IOL
#include <rtw_iol.h> #include <rtw_iol.h>
#endif
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
/*---------------------------Define Local Constant---------------------------*/ /*---------------------------Define Local Constant---------------------------*/
/* Channel switch:The size of command tables for switch channel*/ /* Channel switch:The size of command tables for switch channel*/
#define MAX_PRECMD_CNT 16 #define MAX_PRECMD_CNT 16
@ -638,26 +633,10 @@ phy_ConfigMACWithHeaderFile(
ArrayLength = Rtl8188E_MAC_ArrayLength; ArrayLength = Rtl8188E_MAC_ArrayLength;
ptrArray = (u32*)Rtl8188E_MAC_Array; ptrArray = (u32*)Rtl8188E_MAC_Array;
#ifdef CONFIG_IOL_MAC
{
struct xmit_frame *xmit_frame;
if ((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL)
return _FAIL;
for (i = 0 ;i < ArrayLength;i=i+2){ /* Add by tynli for 2 column */
rtw_IOL_append_WB_cmd(xmit_frame, ptrArray[i], (u8)ptrArray[i+1]);
}
return rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
}
#else
for (i = 0 ;i < ArrayLength;i=i+2){ /* Add by tynli for 2 column */ for (i = 0 ;i < ArrayLength;i=i+2){ /* Add by tynli for 2 column */
rtw_write8(Adapter, ptrArray[i], (u8)ptrArray[i+1]); rtw_write8(Adapter, ptrArray[i], (u8)ptrArray[i+1]);
} }
#endif
return _SUCCESS; return _SUCCESS;
} }
#endif /* ifndef CONFIG_PHY_SETTING_WITH_ODM */ #endif /* ifndef CONFIG_PHY_SETTING_WITH_ODM */
@ -913,41 +892,6 @@ phy_ConfigBBWithHeaderFile(
if (ConfigType == CONFIG_BB_PHY_REG) if (ConfigType == CONFIG_BB_PHY_REG)
{ {
#ifdef CONFIG_IOL_BB_PHY_REG
{
struct xmit_frame *xmit_frame;
u32 tmp_value;
if ((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) {
ret = _FAIL;
goto exit;
}
for (i=0;i<PHY_REGArrayLen;i=i+2)
{
tmp_value=Rtl819XPHY_REGArray_Table[i+1];
if (Rtl819XPHY_REGArray_Table[i] == 0xfe)
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 50);
else if (Rtl819XPHY_REGArray_Table[i] == 0xfd)
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 5);
else if (Rtl819XPHY_REGArray_Table[i] == 0xfc)
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 1);
else if (Rtl819XPHY_REGArray_Table[i] == 0xfb)
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 50);
else if (Rtl819XPHY_REGArray_Table[i] == 0xfa)
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 5);
else if (Rtl819XPHY_REGArray_Table[i] == 0xf9)
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 1);
else if (Rtl819XPHY_REGArray_Table[i] == 0xa24)
podmpriv->RFCalibrateInfo.RegA24 = Rtl819XPHY_REGArray_Table[i+1];
rtw_IOL_append_WD_cmd(xmit_frame, Rtl819XPHY_REGArray_Table[i], tmp_value);
}
ret = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
}
#else
for (i=0;i<PHY_REGArrayLen;i=i+2) for (i=0;i<PHY_REGArrayLen;i=i+2)
{ {
if (Rtl819XPHY_REGArray_Table[i] == 0xfe){ if (Rtl819XPHY_REGArray_Table[i] == 0xfe){
@ -971,29 +915,11 @@ phy_ConfigBBWithHeaderFile(
/* Add 1us delay between BB/RF register setting. */ /* Add 1us delay between BB/RF register setting. */
rtw_udelay_os(1); rtw_udelay_os(1);
} }
#endif
/* for External PA */ /* for External PA */
phy_ConfigBBExternalPA(Adapter); phy_ConfigBBExternalPA(Adapter);
} }
else if (ConfigType == CONFIG_BB_AGC_TAB) else if (ConfigType == CONFIG_BB_AGC_TAB)
{ {
#ifdef CONFIG_IOL_BB_AGC_TAB
{
struct xmit_frame *xmit_frame;
if ((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) {
ret = _FAIL;
goto exit;
}
for (i=0;i<AGCTAB_ArrayLen;i=i+2)
{
rtw_IOL_append_WD_cmd(xmit_frame, Rtl819XAGCTAB_Array_Table[i], Rtl819XAGCTAB_Array_Table[i+1]);
}
ret = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
}
#else
for (i=0;i<AGCTAB_ArrayLen;i=i+2) for (i=0;i<AGCTAB_ArrayLen;i=i+2)
{ {
PHY_SetBBReg(Adapter, Rtl819XAGCTAB_Array_Table[i], bMaskDWord, Rtl819XAGCTAB_Array_Table[i+1]); PHY_SetBBReg(Adapter, Rtl819XAGCTAB_Array_Table[i], bMaskDWord, Rtl819XAGCTAB_Array_Table[i+1]);
@ -1001,7 +927,6 @@ phy_ConfigBBWithHeaderFile(
/* Add 1us delay between BB/RF register setting. */ /* Add 1us delay between BB/RF register setting. */
rtw_udelay_os(1); rtw_udelay_os(1);
} }
#endif
} }
exit: exit:
@ -1391,42 +1316,6 @@ rtl8188e_PHY_ConfigRFWithHeaderFile(
switch (eRFPath) switch (eRFPath)
{ {
case RF_PATH_A: case RF_PATH_A:
#ifdef CONFIG_IOL_RF_RF_PATH_A
{
struct xmit_frame *xmit_frame;
if ((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) {
rtStatus = _FAIL;
goto exit;
}
for (i = 0;i<RadioA_ArrayLen; i=i+2)
{
if (Rtl819XRadioA_Array_Table[i] == 0xfe)
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 50);
else if (Rtl819XRadioA_Array_Table[i] == 0xfd)
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 5);
else if (Rtl819XRadioA_Array_Table[i] == 0xfc)
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 1);
else if (Rtl819XRadioA_Array_Table[i] == 0xfb)
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 50);
else if (Rtl819XRadioA_Array_Table[i] == 0xfa)
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 5);
else if (Rtl819XRadioA_Array_Table[i] == 0xf9)
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 1);
else
{
BB_REGISTER_DEFINITION_T *pPhyReg = &pHalData->PHYRegDef[eRFPath];
u32 NewOffset = 0;
u32 DataAndAddr = 0;
NewOffset = Rtl819XRadioA_Array_Table[i] & 0x3f;
DataAndAddr = ((NewOffset<<20) | (Rtl819XRadioA_Array_Table[i+1]&0x000fffff)) & 0x0fffffff; /* T65 RF */
rtw_IOL_append_WD_cmd(xmit_frame, pPhyReg->rf3wireOffset, DataAndAddr);
}
}
rtStatus = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
}
#else
for (i = 0;i<RadioA_ArrayLen; i=i+2) for (i = 0;i<RadioA_ArrayLen; i=i+2)
{ {
if (Rtl819XRadioA_Array_Table[i] == 0xfe) { if (Rtl819XRadioA_Array_Table[i] == 0xfe) {
@ -1449,47 +1338,10 @@ rtl8188e_PHY_ConfigRFWithHeaderFile(
rtw_udelay_os(1); rtw_udelay_os(1);
} }
} }
#endif
/* Add for High Power PA */ /* Add for High Power PA */
PHY_ConfigRFExternalPA(Adapter, eRFPath); PHY_ConfigRFExternalPA(Adapter, eRFPath);
break; break;
case RF_PATH_B: case RF_PATH_B:
#ifdef CONFIG_IOL_RF_RF_PATH_B
{
struct xmit_frame *xmit_frame;
if ((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) {
rtStatus = _FAIL;
goto exit;
}
for (i = 0;i<RadioB_ArrayLen; i=i+2)
{
if (Rtl819XRadioB_Array_Table[i] == 0xfe)
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 50);
else if (Rtl819XRadioB_Array_Table[i] == 0xfd)
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 5);
else if (Rtl819XRadioB_Array_Table[i] == 0xfc)
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 1);
else if (Rtl819XRadioB_Array_Table[i] == 0xfb)
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 50);
else if (Rtl819XRadioB_Array_Table[i] == 0xfa)
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 5);
else if (Rtl819XRadioB_Array_Table[i] == 0xf9)
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 1);
else
{
BB_REGISTER_DEFINITION_T *pPhyReg = &pHalData->PHYRegDef[eRFPath];
u32 NewOffset = 0;
u32 DataAndAddr = 0;
NewOffset = Rtl819XRadioB_Array_Table[i] & 0x3f;
DataAndAddr = ((NewOffset<<20) | (Rtl819XRadioB_Array_Table[i+1]&0x000fffff)) & 0x0fffffff; /* T65 RF */
rtw_IOL_append_WD_cmd(xmit_frame, pPhyReg->rf3wireOffset, DataAndAddr);
}
}
rtStatus = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
}
#else
for (i = 0;i<RadioB_ArrayLen; i=i+2) for (i = 0;i<RadioB_ArrayLen; i=i+2)
{ {
if (Rtl819XRadioB_Array_Table[i] == 0xfe) if (Rtl819XRadioB_Array_Table[i] == 0xfe)
@ -1513,7 +1365,6 @@ rtl8188e_PHY_ConfigRFWithHeaderFile(
rtw_udelay_os(1); rtw_udelay_os(1);
} }
} }
#endif
break; break;
case RF_PATH_C: case RF_PATH_C:
break; break;

6
hal/rtl8188eu_xmit.c
View file

@ -508,9 +508,6 @@ s32 rtl8188eu_xmit_buf_handler(PADAPTER padapter)
} }
#endif #endif
#ifdef CONFIG_IOL_IOREG_CFG_DBG
#include <rtw_iol.h>
#endif
/* for non-agg data frame or management frame */ /* for non-agg data frame or management frame */
static s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe) static s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe)
{ {
@ -568,9 +565,6 @@ static s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe)
{ {
w_sz = sz + TXDESC_SIZE + PACKET_OFFSET_SZ; w_sz = sz + TXDESC_SIZE + PACKET_OFFSET_SZ;
} }
#ifdef CONFIG_IOL_IOREG_CFG_DBG
rtw_IOL_cmd_buf_dump(padapter,w_sz,pxmitframe->buf_addr);
#endif
ff_hwaddr = rtw_get_ff_hwaddr(pxmitframe); ff_hwaddr = rtw_get_ff_hwaddr(pxmitframe);
#ifdef CONFIG_XMIT_THREAD_MODE #ifdef CONFIG_XMIT_THREAD_MODE

31
hal/usb_halinit.c
View file

@ -26,11 +26,7 @@
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
#include <rtl8188e_led.h> #include <rtl8188e_led.h>
#ifdef CONFIG_IOL
#include <rtw_iol.h> #include <rtw_iol.h>
#endif
#include <usb_ops.h> #include <usb_ops.h>
#include <usb_hal.h> #include <usb_hal.h>
#include <usb_osintf.h> #include <usb_osintf.h>
@ -1236,7 +1232,7 @@ static u32 rtl8188eu_hal_init(PADAPTER Adapter)
_func_enter_; _func_enter_;
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
@ -1288,8 +1284,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
goto exit; goto exit;
} }
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PW_ON);
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PW_ON);
status = rtl8188eu_InitPowerOn(Adapter); status = rtl8188eu_InitPowerOn(Adapter);
if (status == _FAIL){ if (status == _FAIL){
RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init power on!\n")); RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init power on!\n"));
@ -1315,19 +1310,15 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PW_ON);
txpktbuf_bndy = WMM_NORMAL_TX_PAGE_BOUNDARY_88E; txpktbuf_bndy = WMM_NORMAL_TX_PAGE_BOUNDARY_88E;
} }
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC01); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC01);
_InitQueueReservedPage(Adapter); _InitQueueReservedPage(Adapter);
_InitQueuePriority(Adapter); _InitQueuePriority(Adapter);
_InitPageBoundary(Adapter); _InitPageBoundary(Adapter);
_InitTransferPageSize(Adapter); _InitTransferPageSize(Adapter);
#ifdef CONFIG_IOL_IOREG_CFG
_InitTxBufferBoundary(Adapter, 0); _InitTxBufferBoundary(Adapter, 0);
#endif
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_DOWNLOAD_FW);
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_DOWNLOAD_FW);
#if (MP_DRIVER == 1) #if (MP_DRIVER == 1)
if (Adapter->registrypriv.mp_mode == 1) if (Adapter->registrypriv.mp_mode == 1)
{ {
@ -1357,7 +1348,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_DOWNLOAD_FW);
} }
rtl8188e_InitializeFirmwareVars(Adapter); rtl8188e_InitializeFirmwareVars(Adapter);
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MAC); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MAC);
#if (HAL_MAC_ENABLE == 1) #if (HAL_MAC_ENABLE == 1)
status = PHY_MACConfig8188E(Adapter); status = PHY_MACConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
@ -1370,7 +1361,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MAC);
/* */ /* */
/* d. Initialize BB related configurations. */ /* d. Initialize BB related configurations. */
/* */ /* */
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BB); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BB);
#if (HAL_BB_ENABLE == 1) #if (HAL_BB_ENABLE == 1)
status = PHY_BBConfig8188E(Adapter); status = PHY_BBConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
@ -1381,7 +1372,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BB);
#endif #endif
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_RF); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_RF);
#if (HAL_RF_ENABLE == 1) #if (HAL_RF_ENABLE == 1)
status = PHY_RFConfig8188E(Adapter); status = PHY_RFConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
@ -1391,25 +1382,23 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_RF);
} }
#endif #endif
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH);
#if defined(CONFIG_IOL_EFUSE_PATCH)
status = rtl8188e_iol_efuse_patch(Adapter); status = rtl8188e_iol_efuse_patch(Adapter);
if (status == _FAIL){ if (status == _FAIL){
DBG_88E("%s rtl8188e_iol_efuse_patch failed\n",__func__); DBG_88E("%s rtl8188e_iol_efuse_patch failed\n",__func__);
goto exit; goto exit;
} }
#endif
_InitTxBufferBoundary(Adapter, txpktbuf_bndy); _InitTxBufferBoundary(Adapter, txpktbuf_bndy);
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_LLTT); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_LLTT);
status = InitLLTTable(Adapter, txpktbuf_bndy); status = InitLLTTable(Adapter, txpktbuf_bndy);
if (status == _FAIL){ if (status == _FAIL){
RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init LLT table\n")); RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init LLT table\n"));
goto exit; goto exit;
} }
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC02); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC02);
/* Get Rx PHY status in order to report RSSI and others. */ /* Get Rx PHY status in order to report RSSI and others. */
_InitDriverInfoSize(Adapter, DRVINFO_SZ); _InitDriverInfoSize(Adapter, DRVINFO_SZ);

44
include/autoconf.h
View file

@ -63,30 +63,27 @@
#ifdef CONFIG_SUPPORT_USB_INT #ifdef CONFIG_SUPPORT_USB_INT
#endif #endif
#define CONFIG_IPS #define CONFIG_IPS
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
#endif #endif
#define SUPPORT_HW_RFOFF_DETECTED #define SUPPORT_HW_RFOFF_DETECTED
#define CONFIG_LPS #define CONFIG_LPS
#if defined(CONFIG_LPS) && defined(CONFIG_SUPPORT_USB_INT) #if defined(CONFIG_LPS) && defined(CONFIG_SUPPORT_USB_INT)
#endif #endif
#ifdef CONFIG_LPS_LCLK #ifdef CONFIG_LPS_LCLK
#define CONFIG_XMIT_THREAD_MODE #define CONFIG_XMIT_THREAD_MODE
#endif #endif
//befor link //befor link
#define CONFIG_ANTENNA_DIVERSITY #define CONFIG_ANTENNA_DIVERSITY
//after link //after link
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
#define CONFIG_HW_ANTENNA_DIVERSITY #define CONFIG_HW_ANTENNA_DIVERSITY
#endif #endif
#define CONFIG_IOL
#define CONFIG_AP_MODE #define CONFIG_AP_MODE
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
@ -115,15 +112,6 @@
#define CONFIG_SW_LED #define CONFIG_SW_LED
#endif // CONFIG_LED #endif // CONFIG_LED
#ifdef CONFIG_IOL
#define CONFIG_IOL_NEW_GENERATION
#define CONFIG_IOL_READ_EFUSE_MAP
#define CONFIG_IOL_LLT
#define CONFIG_IOL_EFUSE_PATCH
#define CONFIG_IOL_IOREG_CFG
#endif
#define USB_INTERFERENCE_ISSUE // this should be checked in all usb interface #define USB_INTERFERENCE_ISSUE // this should be checked in all usb interface
#define CONFIG_GLOBAL_UI_PID #define CONFIG_GLOBAL_UI_PID

2
include/drv_types.h
View file

@ -183,9 +183,7 @@ struct registry_priv
u8 max_roaming_times; // the max number driver will try to roaming u8 max_roaming_times; // the max number driver will try to roaming
#ifdef CONFIG_IOL
u8 fw_iol; //enable iol without other concern u8 fw_iol; //enable iol without other concern
#endif
#ifdef CONFIG_80211D #ifdef CONFIG_80211D
u8 enable80211d; u8 enable80211d;

4
include/hal_intf.h
View file

@ -236,9 +236,7 @@ struct hal_ops {
u8 (*sreset_get_wifi_status)(_adapter *padapter); u8 (*sreset_get_wifi_status)(_adapter *padapter);
#endif #endif
#ifdef CONFIG_IOL
int (*IOL_exec_cmds_sync)(_adapter *padapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); int (*IOL_exec_cmds_sync)(_adapter *padapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
#endif
#ifdef CONFIG_XMIT_THREAD_MODE #ifdef CONFIG_XMIT_THREAD_MODE
s32 (*xmit_thread_handler)(_adapter *padapter); s32 (*xmit_thread_handler)(_adapter *padapter);
@ -440,9 +438,7 @@ void rtw_hal_sreset_linked_status_check (_adapter *padapter);
u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter); u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter);
#endif #endif
#ifdef CONFIG_IOL
int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
#endif
#ifdef CONFIG_XMIT_THREAD_MODE #ifdef CONFIG_XMIT_THREAD_MODE
s32 rtw_hal_xmit_thread_handler(_adapter *padapter); s32 rtw_hal_xmit_thread_handler(_adapter *padapter);

2
include/rtl8188e_hal.h
View file

@ -564,8 +564,6 @@ void rtl8188e_start_thread(_adapter *padapter);
void rtl8188e_stop_thread(_adapter *padapter); void rtl8188e_stop_thread(_adapter *padapter);
void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len); void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len);
#ifdef CONFIG_IOL_EFUSE_PATCH
s32 rtl8188e_iol_efuse_patch(PADAPTER padapter); s32 rtl8188e_iol_efuse_patch(PADAPTER padapter);
#endif//CONFIG_IOL_EFUSE_PATCH
#endif //__RTL8188E_HAL_H__ #endif //__RTL8188E_HAL_H__

67
include/rtw_iol.h
View file

@ -33,7 +33,6 @@ 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); int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame);
#ifdef CONFIG_IOL_NEW_GENERATION
#define IOREG_CMD_END_LEN 4 #define IOREG_CMD_END_LEN 4
struct ioreg_cfg{ struct ioreg_cfg{
@ -69,70 +68,4 @@ int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path, u16 addr,
u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame); u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame);
void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter,int buf_len,u8 *pbuf); void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter,int buf_len,u8 *pbuf);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
struct cmd_cmp{
u16 addr;
u32 value;
};
#endif
#else //CONFIG_IOL_NEW_GENERATION
typedef struct _io_offload_cmd {
u8 rsvd0;
u8 cmd;
u16 address;
u32 value;
} IO_OFFLOAD_CMD, IOL_CMD;
#define IOL_CMD_LLT 0x00
//#define IOL_CMD_R_EFUSE 0x01
#define IOL_CMD_WB_REG 0x02
#define IOL_CMD_WW_REG 0x03
#define IOL_CMD_WD_REG 0x04
//#define IOL_CMD_W_RF 0x05
#define IOL_CMD_DELAY_US 0x80
#define IOL_CMD_DELAY_MS 0x81
//#define IOL_CMD_DELAY_S 0x82
#define IOL_CMD_END 0x83
/*****************************************************
CMD Address Value
(B1) (B2/B3:H/L addr) (B4:B7 : MSB:LSB)
******************************************************
IOL_CMD_LLT - B7: PGBNDY
//IOL_CMD_R_EFUSE - -
IOL_CMD_WB_REG 0x0~0xFFFF B7
IOL_CMD_WW_REG 0x0~0xFFFF B6~B7
IOL_CMD_WD_REG 0x0~0xFFFF B4~B7
//IOL_CMD_W_RF RF Reg B5~B7
IOL_CMD_DELAY_US - B6~B7
IOL_CMD_DELAY_MS - B6~B7
//IOL_CMD_DELAY_S - B6~B7
IOL_CMD_END - -
******************************************************/
int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value);
int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value);
int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value);
int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms);
int rtw_IOL_exec_empty_cmds_sync(ADAPTER *adapter, u32 max_wating_ms);
#ifdef DBG_IO
int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line);
int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, const char *caller, const int line);
int dbg_rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, const char *caller, const int line);
#define rtw_IOL_append_WB_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value), __func__, __LINE__)
#define rtw_IOL_append_WW_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value), __func__, __LINE__)
#define rtw_IOL_append_WD_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value), __func__, __LINE__)
#else
#define rtw_IOL_append_WB_cmd(xmit_frame, addr, value) _rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value))
#define rtw_IOL_append_WW_cmd(xmit_frame, addr, value) _rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value))
#define rtw_IOL_append_WD_cmd(xmit_frame, addr, value) _rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value))
#endif // DBG_IO
#endif // CONFIG_IOL_NEW_GENERATION
#endif //__RTW_IOL_H_ #endif //__RTW_IOL_H_

40
os_dep/ioctl_linux.c
View file

@ -40,6 +40,7 @@
#include <rtw_mp.h> #include <rtw_mp.h>
#endif //#ifdef CONFIG_MP_INCLUDED #endif //#ifdef CONFIG_MP_INCLUDED
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
#include <rtw_iol.h>
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
#define iwe_stream_add_event(a, b, c, d, e) iwe_stream_add_event(b, c, d, e) #define iwe_stream_add_event(a, b, c, d, e) iwe_stream_add_event(b, c, d, e)
@ -5732,9 +5733,6 @@ static void rf_reg_dump(_adapter *padapter)
} }
} }
#ifdef CONFIG_IOL
#include <rtw_iol.h>
#endif
static int rtw_dbg_port(struct net_device *dev, static int rtw_dbg_port(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
@ -5829,7 +5827,6 @@ static int rtw_dbg_port(struct net_device *dev,
case 0x78: //IOL test case 0x78: //IOL test
switch (minor_cmd) switch (minor_cmd)
{ {
#ifdef CONFIG_IOL
case 0x04: //LLT table initialization test case 0x04: //LLT table initialization test
{ {
u8 page_boundary = 0xf9; u8 page_boundary = 0xf9;
@ -5865,17 +5862,10 @@ static int rtw_dbg_port(struct net_device *dev,
} }
for (i=0;i<blink_num;i++){ for (i=0;i<blink_num;i++){
#ifdef CONFIG_IOL_NEW_GENERATION
rtw_IOL_append_WB_cmd(xmit_frame, reg, 0x00,0xff); rtw_IOL_append_WB_cmd(xmit_frame, reg, 0x00,0xff);
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, blink_delay_ms); rtw_IOL_append_DELAY_MS_cmd(xmit_frame, blink_delay_ms);
rtw_IOL_append_WB_cmd(xmit_frame, reg, 0x08,0xff); rtw_IOL_append_WB_cmd(xmit_frame, reg, 0x08,0xff);
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, blink_delay_ms); rtw_IOL_append_DELAY_MS_cmd(xmit_frame, blink_delay_ms);
#else
rtw_IOL_append_WB_cmd(xmit_frame, reg, 0x00);
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, blink_delay_ms);
rtw_IOL_append_WB_cmd(xmit_frame, reg, 0x08);
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, blink_delay_ms);
#endif
} }
if (_SUCCESS != rtw_IOL_exec_cmds_sync(padapter, xmit_frame, (blink_delay_ms*blink_num*2)+200,0)) if (_SUCCESS != rtw_IOL_exec_cmds_sync(padapter, xmit_frame, (blink_delay_ms*blink_num*2)+200,0))
ret = -EPERM; ret = -EPERM;
@ -5899,13 +5889,8 @@ static int rtw_dbg_port(struct net_device *dev,
break; break;
} }
for (i=0;i<write_num;i++){ for (i=0;i<write_num;i++)
#ifdef CONFIG_IOL_NEW_GENERATION
rtw_IOL_append_WB_cmd(xmit_frame, reg, i+start_value,0xFF); rtw_IOL_append_WB_cmd(xmit_frame, reg, i+start_value,0xFF);
#else
rtw_IOL_append_WB_cmd(xmit_frame, reg, i+start_value);
#endif
}
if (_SUCCESS != rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000,0)) if (_SUCCESS != rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000,0))
ret = -EPERM; ret = -EPERM;
} }
@ -5935,13 +5920,8 @@ static int rtw_dbg_port(struct net_device *dev,
break; break;
} }
for (i=0;i<write_num;i++){ for (i=0;i<write_num;i++)
#ifdef CONFIG_IOL_NEW_GENERATION
rtw_IOL_append_WW_cmd(xmit_frame, reg, i+start_value,0xFFFF); rtw_IOL_append_WW_cmd(xmit_frame, reg, i+start_value,0xFFFF);
#else
rtw_IOL_append_WW_cmd(xmit_frame, reg, i+start_value);
#endif
}
if (_SUCCESS !=rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000,0)) if (_SUCCESS !=rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000,0))
ret = -EPERM; ret = -EPERM;
} }
@ -5971,13 +5951,8 @@ static int rtw_dbg_port(struct net_device *dev,
break; break;
} }
for (i=0;i<write_num;i++){ for (i=0;i<write_num;i++)
#ifdef CONFIG_IOL_NEW_GENERATION
rtw_IOL_append_WD_cmd(xmit_frame, reg, i+start_value,0xFFFFFFFF); rtw_IOL_append_WD_cmd(xmit_frame, reg, i+start_value,0xFFFFFFFF);
#else
rtw_IOL_append_WD_cmd(xmit_frame, reg, i+start_value);
#endif
}
if (_SUCCESS !=rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000,0)) if (_SUCCESS !=rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000,0))
ret = -EPERM; ret = -EPERM;
@ -5990,7 +5965,6 @@ static int rtw_dbg_port(struct net_device *dev,
} }
} }
break; break;
#endif //CONFIG_IOL
} }
break; break;
case 0x79: case 0x79:
@ -7856,9 +7830,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
u16 i=0, j=0, mapLen=0, addr=0, cnts=0; u16 i=0, j=0, mapLen=0, addr=0, cnts=0;
u16 max_available_size=0, raw_cursize=0, raw_maxsize=0; u16 max_available_size=0, raw_cursize=0, raw_maxsize=0;
int err; int err;
#ifdef CONFIG_IOL
u8 org_fw_iol = padapter->registrypriv.fw_iol;// 0:Disable, 1:enable, 2:by usb speed u8 org_fw_iol = padapter->registrypriv.fw_iol;// 0:Disable, 1:enable, 2:by usb speed
#endif
wrqu = (struct iw_point*)wdata; wrqu = (struct iw_point*)wdata;
pwrctrlpriv = &padapter->pwrctrlpriv; pwrctrlpriv = &padapter->pwrctrlpriv;
@ -7904,9 +7876,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
tmp[i] = token; tmp[i] = token;
i++; i++;
} }
#ifdef CONFIG_IOL
padapter->registrypriv.fw_iol = 0;// 0:Disable, 1:enable, 2:by usb speed padapter->registrypriv.fw_iol = 0;// 0:Disable, 1:enable, 2:by usb speed
#endif
if (strcmp(tmp[0], "status") == 0){ if (strcmp(tmp[0], "status") == 0){
sprintf(extra, "Load File efuse=%s,Load File MAC=%s",(pEEPROM->bloadfile_fail_flag? "FAIL" : "OK"),(pEEPROM->bloadmac_fail_flag? "FAIL" : "OK")); sprintf(extra, "Load File efuse=%s,Load File MAC=%s",(pEEPROM->bloadfile_fail_flag? "FAIL" : "OK"),(pEEPROM->bloadmac_fail_flag? "FAIL" : "OK"));
@ -8311,9 +8281,7 @@ exit:
#ifdef CONFIG_LPS #ifdef CONFIG_LPS
rtw_pm_set_lps(padapter, lps_mode); rtw_pm_set_lps(padapter, lps_mode);
#endif #endif
#ifdef CONFIG_IOL
padapter->registrypriv.fw_iol = org_fw_iol;// 0:Disable, 1:enable, 2:by usb speed padapter->registrypriv.fw_iol = org_fw_iol;// 0:Disable, 1:enable, 2:by usb speed
#endif
return err; return err;
} }

4
os_dep/os_intfs.c
View file

@ -220,11 +220,9 @@ static uint rtw_max_roaming_times=2;
module_param(rtw_max_roaming_times, uint, 0644); module_param(rtw_max_roaming_times, uint, 0644);
MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try"); MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try");
#ifdef CONFIG_IOL
static int rtw_fw_iol=1;// 0:Disable, 1:enable, 2:by usb speed static int rtw_fw_iol=1;// 0:Disable, 1:enable, 2:by usb speed
module_param(rtw_fw_iol, int, 0644); module_param(rtw_fw_iol, int, 0644);
MODULE_PARM_DESC(rtw_fw_iol,"FW IOL"); MODULE_PARM_DESC(rtw_fw_iol,"FW IOL");
#endif //CONFIG_IOL
#ifdef CONFIG_FILE_FWIMG #ifdef CONFIG_FILE_FWIMG
char *rtw_fw_file_path= ""; char *rtw_fw_file_path= "";
@ -737,9 +735,7 @@ _func_enter_;
registry_par->max_roaming_times = (u8)rtw_max_roaming_times; registry_par->max_roaming_times = (u8)rtw_max_roaming_times;
#ifdef CONFIG_IOL
registry_par->fw_iol = rtw_fw_iol; registry_par->fw_iol = rtw_fw_iol;
#endif
#ifdef CONFIG_80211D #ifdef CONFIG_80211D
registry_par->enable80211d = (u8)rtw_80211d; registry_par->enable80211d = (u8)rtw_80211d;