diff --git a/hal/HalHWImg8188E_BB.c b/hal/HalHWImg8188E_BB.c index 557a694..eece9f2 100755 --- a/hal/HalHWImg8188E_BB.c +++ b/hal/HalHWImg8188E_BB.c @@ -434,24 +434,9 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E( /* 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)) { - #ifdef CONFIG_IOL_IOREG_CFG_DBG - printk("~~~ %s Success !!! \n",__FUNCTION__); - { - /* 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",__FUNCTION__); - #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; } } @@ -910,10 +895,6 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( PADAPTER Adapter = pDM_Odm->Adapter; struct xmit_frame *pxmit_frame; u8 bndy_cnt=1; - #ifdef CONFIG_IOL_IOREG_CFG_DBG - struct cmd_cmp cmpdata[ArrayLen]; - u32 cmpdata_idx=0; - #endif #endif/* ifdef CONFIG_IOL_IOREG_CFG */ HAL_STATUS rst =HAL_STATUS_SUCCESS; hex += board; @@ -970,11 +951,6 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( pDM_Odm->RFCalibrateInfo.RegA24 = v2; rtw_IOL_append_WD_cmd(pxmit_frame,(u16)v1, v2,bMaskDWord); - #ifdef CONFIG_IOL_IOREG_CFG_DBG - cmpdata[cmpdata_idx].addr = v1; - cmpdata[cmpdata_idx].value= v2; - cmpdata_idx++; - #endif } } else @@ -1031,11 +1007,6 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( pDM_Odm->RFCalibrateInfo.RegA24 = v2; rtw_IOL_append_WD_cmd(pxmit_frame,(u16)v1, v2,bMaskDWord); - #ifdef CONFIG_IOL_IOREG_CFG_DBG - cmpdata[cmpdata_idx].addr = v1; - cmpdata[cmpdata_idx].value= v2; - cmpdata_idx++; - #endif } } else @@ -1059,41 +1030,10 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( /* 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)) { - #ifdef CONFIG_IOL_IOREG_CFG_DBG - printk("~~~ %s IOL_exec_cmds Success !!! \n",__FUNCTION__); - { - u32 idx; - u32 cdata; - printk(" %s data compare => array_len:%d \n",__FUNCTION__,cmpdata_idx); - printk("### %s data compared !!###\n",__FUNCTION__); - 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",__FUNCTION__); - /* if(rst == HAL_STATUS_FAILURE) */ - {/* 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; printk("~~~ IOL Config %s Failed !!! \n",__FUNCTION__); - #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 */ diff --git a/hal/HalHWImg8188E_MAC.c b/hal/HalHWImg8188E_MAC.c index 749019c..dc1e97d 100755 --- a/hal/HalHWImg8188E_MAC.c +++ b/hal/HalHWImg8188E_MAC.c @@ -177,10 +177,6 @@ ODM_ReadAndConfig_MAC_REG_8188E( PADAPTER Adapter = pDM_Odm->Adapter; struct xmit_frame *pxmit_frame; u8 bndy_cnt = 1; - #ifdef CONFIG_IOL_IOREG_CFG_DBG - struct cmd_cmp cmpdata[ArrayLen]; - u32 cmpdata_idx=0; - #endif #endif /* CONFIG_IOL_IOREG_CFG */ HAL_STATUS rst =HAL_STATUS_SUCCESS; hex += board; @@ -216,11 +212,6 @@ ODM_ReadAndConfig_MAC_REG_8188E( if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) bndy_cnt++; rtw_IOL_append_WB_cmd(pxmit_frame,(u16)v1, (u8)v2,0xFF); - #ifdef CONFIG_IOL_IOREG_CFG_DBG - cmpdata[cmpdata_idx].addr = v1; - cmpdata[cmpdata_idx].value= v2; - cmpdata_idx++; - #endif } else #endif /* endif CONFIG_IOL_IOREG_CFG */ @@ -254,11 +245,6 @@ ODM_ReadAndConfig_MAC_REG_8188E( if(rtw_IOL_cmd_boundary_handle(pxmit_frame)) bndy_cnt++; rtw_IOL_append_WB_cmd(pxmit_frame,(u16)v1, (u8)v2,0xFF); - #ifdef CONFIG_IOL_IOREG_CFG_DBG - cmpdata[cmpdata_idx].addr = v1; - cmpdata[cmpdata_idx].value= v2; - cmpdata_idx++; - #endif } else #endif /* ifdef CONFIG_IOL_IOREG_CFG */ @@ -284,43 +270,9 @@ ODM_ReadAndConfig_MAC_REG_8188E( 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 writed data */ - { - u32 idx; - u8 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"); - #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; } diff --git a/hal/HalHWImg8188E_RF.c b/hal/HalHWImg8188E_RF.c index 7e7a4ee..fe31baa 100755 --- a/hal/HalHWImg8188E_RF.c +++ b/hal/HalHWImg8188E_RF.c @@ -197,10 +197,6 @@ ODM_ReadAndConfig_RadioA_1T_8188E( PADAPTER Adapter = pDM_Odm->Adapter; struct xmit_frame *pxmit_frame; u8 bndy_cnt = 1; - #ifdef CONFIG_IOL_IOREG_CFG_DBG - struct cmd_cmp cmpdata[ArrayLen]; - u32 cmpdata_idx=0; - #endif #endif/* ifdef CONFIG_IOL_IOREG_CFG */ HAL_STATUS rst =HAL_STATUS_SUCCESS; @@ -254,11 +250,6 @@ ODM_ReadAndConfig_RadioA_1T_8188E( } else{ rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u16)v1, v2,bRFRegOffsetMask) ; - #ifdef CONFIG_IOL_IOREG_CFG_DBG - cmpdata[cmpdata_idx].addr = v1; - cmpdata[cmpdata_idx].value= v2; - cmpdata_idx++; - #endif } } @@ -315,12 +306,6 @@ ODM_ReadAndConfig_RadioA_1T_8188E( } else{ rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u16)v1, v2,bRFRegOffsetMask) ; - #ifdef CONFIG_IOL_IOREG_CFG_DBG - cmpdata[cmpdata_idx].addr = v1; - cmpdata[cmpdata_idx].value= v2; - cmpdata_idx++; - #endif - } } @@ -345,40 +330,10 @@ ODM_ReadAndConfig_RadioA_1T_8188E( /* 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)) { - #ifdef CONFIG_IOL_IOREG_CFG_DBG - printk("~~~ %s Success !!! \n",__FUNCTION__); - { - u32 idx; - u32 cdata; - printk(" %s data compare => array_len:%d \n",__FUNCTION__,cmpdata_idx); - printk("### %s data compared !!###\n",__FUNCTION__); - 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",__FUNCTION__); - /* if(rst == HAL_STATUS_FAILURE) */ - {/* 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; printk("~~~ IOL Config %s Failed !!! \n",__FUNCTION__); - #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 */ } } diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index ad07fbf..3f7c5d6 100755 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -529,9 +529,6 @@ s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter) } #endif -#ifdef CONFIG_IOL_IOREG_CFG_DBG -#include -#endif /* for non-agg data frame or management frame */ static s32 rtw_dump_xframe(struct adapter *padapter, struct xmit_frame *pxmitframe) { @@ -586,9 +583,6 @@ static s32 rtw_dump_xframe(struct adapter *padapter, struct xmit_frame *pxmitfra { 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); #ifdef CONFIG_XMIT_THREAD_MODE diff --git a/include/rtw_iol.h b/include/rtw_iol.h index a1c5e05..9bd5ff6 100755 --- a/include/rtw_iol.h +++ b/include/rtw_iol.h @@ -68,11 +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); void rtw_IOL_cmd_buf_dump(struct adapter *Adapter,int buf_len,u8 *pbuf); -#ifdef CONFIG_IOL_IOREG_CFG_DBG - struct cmd_cmp{ - u16 addr; - u32 value; - }; -#endif - #endif //__RTW_IOL_H_