diff --git a/hal/HalHWImg8188E_BB.c b/hal/HalHWImg8188E_BB.c index eece9f2..1e566a0 100755 --- a/hal/HalHWImg8188E_BB.c +++ b/hal/HalHWImg8188E_BB.c @@ -20,10 +20,6 @@ #include "odm_precomp.h" -#ifdef CONFIG_IOL_IOREG_CFG -#include -#endif - static BOOLEAN CheckCondition( const u32 Condition, @@ -344,47 +340,21 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E( u32 ArrayLen = sizeof(Array_AGC_TAB_1T_8188E)/sizeof(u32); u32 * Array = Array_AGC_TAB_1T_8188E; BOOLEAN biol = FALSE; -#ifdef CONFIG_IOL_IOREG_CFG - PADAPTER Adapter = pDM_Odm->Adapter; - struct xmit_frame *pxmit_frame; - u8 bndy_cnt=1; -#endif/* ifdef CONFIG_IOL_IOREG_CFG */ HAL_STATUS rst =HAL_STATUS_SUCCESS; hex += board; hex += interfaceValue << 8; hex += platform << 16; hex += 0xFF000000; -#ifdef CONFIG_IOL_IOREG_CFG - biol = rtw_IOL_applied(Adapter); - if(biol){ - if((pxmit_frame= rtw_IOL_accquire_xmit_frame(Adapter)) == NULL){ - printk("rtw_IOL_accquire_xmit_frame failed\n"); - return HAL_STATUS_FAILURE; - } - } -#endif/* ifdef CONFIG_IOL_IOREG_CFG */ - - for (i = 0; i < ArrayLen; i += 2 ) - { + 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 ) { - #ifdef CONFIG_IOL_IOREG_CFG - if(biol){ - if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) - bndy_cnt++; - rtw_IOL_append_WD_cmd(pxmit_frame,(u16)v1, v2,bMaskDWord); - } - 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); continue; } else @@ -407,17 +377,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E( v2 != 0xCDEF && v2 != 0xCDCD && i < ArrayLen -2) { - #ifdef CONFIG_IOL_IOREG_CFG - if(biol){ - if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) - bndy_cnt++; - rtw_IOL_append_WD_cmd(pxmit_frame,(u16)v1, v2,bMaskDWord); - } - 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); READ_NEXT_PAIR(v1, v2, i); } @@ -429,18 +389,6 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E( } } } -#ifdef CONFIG_IOL_IOREG_CFG - if(biol){ - /* printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__FUNCTION__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); */ - if(rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) - { - } - else{ - printk("~~~ %s IOL_exec_cmds Failed !!! \n",__FUNCTION__); - rst = HAL_STATUS_FAILURE; - } - } -#endif /* ifdef CONFIG_IOL_IOREG_CFG */ return rst; } @@ -891,70 +839,18 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( u32 ArrayLen = sizeof(Array_PHY_REG_1T_8188E)/sizeof(u32); u32 * Array = Array_PHY_REG_1T_8188E; BOOLEAN biol = FALSE; -#ifdef CONFIG_IOL_IOREG_CFG - PADAPTER Adapter = pDM_Odm->Adapter; - struct xmit_frame *pxmit_frame; - u8 bndy_cnt=1; -#endif/* ifdef CONFIG_IOL_IOREG_CFG */ HAL_STATUS rst =HAL_STATUS_SUCCESS; hex += board; hex += interfaceValue << 8; hex += platform << 16; hex += 0xFF000000; -#ifdef CONFIG_IOL_IOREG_CFG - biol = rtw_IOL_applied(Adapter); - - if(biol){ - if((pxmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) - { - printk("rtw_IOL_accquire_xmit_frame failed\n"); - return HAL_STATUS_FAILURE; - } - } -#endif/* ifdef CONFIG_IOL_IOREG_CFG */ - - for (i = 0; i < ArrayLen; i += 2 ) - { + 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 ) - { - #ifdef CONFIG_IOL_IOREG_CFG - 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) - pDM_Odm->RFCalibrateInfo.RegA24 = v2; - - rtw_IOL_append_WD_cmd(pxmit_frame,(u16)v1, v2,bMaskDWord); - } - } - else - #endif /* ifdef CONFIG_IOL_IOREG_CFG */ + if ( v1 < 0xCDCDCDCD ) { { odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2); } @@ -980,37 +876,6 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( v2 != 0xCDEF && v2 != 0xCDCD && i < ArrayLen -2) { - #ifdef CONFIG_IOL_IOREG_CFG - 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) - pDM_Odm->RFCalibrateInfo.RegA24 = v2; - - rtw_IOL_append_WD_cmd(pxmit_frame,(u16)v1, v2,bMaskDWord); - } - } - else - #endif /* ifdef CONFIG_IOL_IOREG_CFG */ { odm_ConfigBB_PHY_8188E(pDM_Odm, v1, bMaskDWord, v2); } @@ -1025,18 +890,6 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( } } } -#ifdef CONFIG_IOL_IOREG_CFG - if(biol){ - /* printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__FUNCTION__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); */ - if(rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) - { - } - else{ - rst = HAL_STATUS_FAILURE; - printk("~~~ IOL Config %s Failed !!! \n",__FUNCTION__); - } - } -#endif /* ifdef CONFIG_IOL_IOREG_CFG */ return rst; } /****************************************************************************** diff --git a/hal/HalHWImg8188E_MAC.c b/hal/HalHWImg8188E_MAC.c index dc1e97d..852ec02 100755 --- a/hal/HalHWImg8188E_MAC.c +++ b/hal/HalHWImg8188E_MAC.c @@ -19,9 +19,7 @@ ******************************************************************************/ #include "odm_precomp.h" -#ifdef CONFIG_IOL_IOREG_CFG -#include -#endif + static BOOLEAN CheckCondition( const u32 Condition, @@ -172,56 +170,22 @@ ODM_ReadAndConfig_MAC_REG_8188E( u32 ArrayLen = sizeof(Array_MAC_REG_8188E)/sizeof(u32); u32 * Array = Array_MAC_REG_8188E; BOOLEAN biol = FALSE; - -#ifdef CONFIG_IOL_IOREG_CFG - PADAPTER Adapter = pDM_Odm->Adapter; - struct xmit_frame *pxmit_frame; - u8 bndy_cnt = 1; -#endif /* CONFIG_IOL_IOREG_CFG */ HAL_STATUS rst =HAL_STATUS_SUCCESS; hex += board; hex += interfaceValue << 8; hex += platform << 16; hex += 0xFF000000; -#ifdef CONFIG_IOL_IOREG_CFG - biol = rtw_IOL_applied(Adapter); - - if(biol){ - if((pxmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) - { - printk("rtw_IOL_accquire_xmit_frame failed\n"); - return HAL_STATUS_FAILURE; - } - } - -#endif /* CONFIG_IOL_IOREG_CFG */ - - for (i = 0; i < ArrayLen; i += 2 ) - { + 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 ) { - #ifdef CONFIG_IOL_IOREG_CFG - - 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 - #endif /* endif CONFIG_IOL_IOREG_CFG */ - { - odm_ConfigMAC_8188E(pDM_Odm, v1, (u8)v2); - } - continue; - } - else - { /* This line is the start line of branch. */ + odm_ConfigMAC_8188E(pDM_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); @@ -236,48 +200,18 @@ ODM_ReadAndConfig_MAC_REG_8188E( 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) - { - #ifdef CONFIG_IOL_IOREG_CFG - 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 - #endif /* ifdef CONFIG_IOL_IOREG_CFG */ - { - odm_ConfigMAC_8188E(pDM_Odm, v1, (u8)v2); - } - + while (v2 != 0xDEAD && + v2 != 0xCDEF && + v2 != 0xCDCD && i < ArrayLen -2) { + odm_ConfigMAC_8188E(pDM_Odm, v1, (u8)v2); READ_NEXT_PAIR(v1, v2, i); } - while (v2 != 0xDEAD && i < ArrayLen -2) - { READ_NEXT_PAIR(v1, v2, i); - } - } } } -#ifdef CONFIG_IOL_IOREG_CFG - if(biol){ - /* printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__FUNCTION__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); */ - - if(rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) - { - } - else{ - printk("~~~ MAC IOL_exec_cmds Failed !!! \n"); - rst = HAL_STATUS_FAILURE; - } - - } -#endif /* ifdef CONFIG_IOL_IOREG_CFG */ return rst; } diff --git a/hal/HalHWImg8188E_RF.c b/hal/HalHWImg8188E_RF.c index fe31baa..5a71e3d 100755 --- a/hal/HalHWImg8188E_RF.c +++ b/hal/HalHWImg8188E_RF.c @@ -20,10 +20,6 @@ #include "odm_precomp.h" -#ifdef CONFIG_IOL_IOREG_CFG -#include -#endif - static BOOLEAN CheckCondition( const u32 Condition, @@ -193,75 +189,21 @@ ODM_ReadAndConfig_RadioA_1T_8188E( u32 ArrayLen = sizeof(Array_RadioA_1T_8188E)/sizeof(u32); u32 * Array = Array_RadioA_1T_8188E; BOOLEAN biol = FALSE; -#ifdef CONFIG_IOL_IOREG_CFG - PADAPTER Adapter = pDM_Odm->Adapter; - struct xmit_frame *pxmit_frame; - u8 bndy_cnt = 1; -#endif/* ifdef CONFIG_IOL_IOREG_CFG */ HAL_STATUS rst =HAL_STATUS_SUCCESS; hex += board; hex += interfaceValue << 8; hex += platform << 16; hex += 0xFF000000; -#ifdef CONFIG_IOL_IOREG_CFG - biol = rtw_IOL_applied(Adapter); + for (i = 0; i < ArrayLen; i += 2 ) { + u32 v1 = Array[i]; + u32 v2 = Array[i+1]; - if(biol){ - if((pxmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) - { - printk("rtw_IOL_accquire_xmit_frame failed\n"); - return HAL_STATUS_FAILURE; - } - } -#endif/* ifdef CONFIG_IOL_IOREG_CFG */ - - 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 ) - { - #ifdef CONFIG_IOL_IOREG_CFG - 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, ODM_RF_PATH_A,(u16)v1, v2,bRFRegOffsetMask) ; - } - - } - else - #endif /* ifdef CONFIG_IOL_IOREG_CFG */ - { - odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2); - } - continue; - } - else - { /* This line is the start line of branch. */ + /* This (offset, data) pair meets the condition. */ + if ( v1 < 0xCDCDCDCD ) { + 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. */ READ_NEXT_PAIR(v1, v2, i); @@ -280,41 +222,8 @@ ODM_ReadAndConfig_RadioA_1T_8188E( v2 != 0xCDEF && v2 != 0xCDCD && i < ArrayLen -2) { - #ifdef CONFIG_IOL_IOREG_CFG - 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, ODM_RF_PATH_A,(u16)v1, v2,bRFRegOffsetMask) ; - } - - } - else - #endif /* ifdef CONFIG_IOL_IOREG_CFG */ - { - odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2); - } - READ_NEXT_PAIR(v1, v2, i); + odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2); + READ_NEXT_PAIR(v1, v2, i); } while (v2 != 0xDEAD && i < ArrayLen -2) @@ -325,20 +234,6 @@ ODM_ReadAndConfig_RadioA_1T_8188E( } } } -#ifdef CONFIG_IOL_IOREG_CFG - if(biol){ - /* printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__FUNCTION__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); */ - if(rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) - { - } - else{ - rst = HAL_STATUS_FAILURE; - printk("~~~ IOL Config %s Failed !!! \n",__FUNCTION__); - } - } - - -#endif /* ifdef CONFIG_IOL_IOREG_CFG */ return rst; } /****************************************************************************** diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index c80e1f8..bc65a99 100755 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -1395,12 +1395,6 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC01); _InitPageBoundary(Adapter); _InitTransferPageSize(Adapter); -#ifdef CONFIG_IOL_IOREG_CFG - _InitTxBufferBoundary(Adapter, 0); -#endif - - - HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_DOWNLOAD_FW); #if (MP_DRIVER == 1) if (Adapter->registrypriv.mp_mode == 1)