mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-08 14:33:05 +00:00
rtl8188eu: Remove DBG_CONFIG_ERROR_DETECT
This symbol is defined. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
15018af1a2
commit
2339d6c52a
20 changed files with 31 additions and 119 deletions
|
@ -49,18 +49,21 @@ void rtw_hal_def_value_init(struct adapter *padapter)
|
|||
if(padapter->HalFunc.init_default_value)
|
||||
padapter->HalFunc.init_default_value(padapter);
|
||||
}
|
||||
|
||||
void rtw_hal_free_data(struct adapter *padapter)
|
||||
{
|
||||
if (is_primary_adapter(padapter))
|
||||
if(padapter->HalFunc.free_hal_data)
|
||||
padapter->HalFunc.free_hal_data(padapter);
|
||||
}
|
||||
|
||||
void rtw_hal_dm_init(struct adapter *padapter)
|
||||
{
|
||||
if (is_primary_adapter(padapter))
|
||||
if(padapter->HalFunc.dm_init)
|
||||
padapter->HalFunc.dm_init(padapter);
|
||||
}
|
||||
|
||||
void rtw_hal_dm_deinit(struct adapter *padapter)
|
||||
{
|
||||
/* cancel dm timer */
|
||||
|
@ -68,6 +71,7 @@ void rtw_hal_dm_deinit(struct adapter *padapter)
|
|||
if(padapter->HalFunc.dm_deinit)
|
||||
padapter->HalFunc.dm_deinit(padapter);
|
||||
}
|
||||
|
||||
void rtw_hal_sw_led_init(struct adapter *padapter)
|
||||
{
|
||||
if(padapter->HalFunc.InitSwLeds)
|
||||
|
@ -86,13 +90,13 @@ u32 rtw_hal_power_on(struct adapter *padapter)
|
|||
return padapter->HalFunc.hal_power_on(padapter);
|
||||
return _FAIL;
|
||||
}
|
||||
|
||||
void rtw_hal_power_off(struct adapter *padapter)
|
||||
{
|
||||
if(padapter->HalFunc.hal_power_off)
|
||||
padapter->HalFunc.hal_power_off(padapter);
|
||||
}
|
||||
|
||||
|
||||
uint rtw_hal_init(struct adapter *padapter)
|
||||
{
|
||||
uint status = _SUCCESS;
|
||||
|
@ -153,9 +157,6 @@ uint rtw_hal_deinit(struct adapter *padapter)
|
|||
{
|
||||
DBG_871X("\n rtw_hal_deinit: hal_init fail\n");
|
||||
}
|
||||
|
||||
;
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
|
@ -177,6 +178,7 @@ u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, voi
|
|||
return padapter->HalFunc.SetHalDefVarHandler(padapter,eVariable,pValue);
|
||||
return _FAIL;
|
||||
}
|
||||
|
||||
u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue)
|
||||
{
|
||||
if(padapter->HalFunc.GetHalDefVarHandler)
|
||||
|
@ -189,6 +191,7 @@ void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, v
|
|||
if(padapter->HalFunc.SetHalODMVarHandler)
|
||||
padapter->HalFunc.SetHalODMVarHandler(padapter,eVariable,pValue1,bSet);
|
||||
}
|
||||
|
||||
void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet)
|
||||
{
|
||||
if(padapter->HalFunc.GetHalODMVarHandler)
|
||||
|
@ -208,6 +211,7 @@ void rtw_hal_enable_interrupt(struct adapter *padapter)
|
|||
DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __FUNCTION__);
|
||||
|
||||
}
|
||||
|
||||
void rtw_hal_disable_interrupt(struct adapter *padapter)
|
||||
{
|
||||
if (!is_primary_adapter(padapter)){
|
||||
|
@ -222,7 +226,6 @@ void rtw_hal_disable_interrupt(struct adapter *padapter)
|
|||
|
||||
}
|
||||
|
||||
|
||||
u32 rtw_hal_inirp_init(struct adapter *padapter)
|
||||
{
|
||||
u32 rst = _FAIL;
|
||||
|
@ -304,6 +307,7 @@ s32 rtw_hal_init_xmit_priv(struct adapter *padapter)
|
|||
return padapter->HalFunc.init_xmit_priv(padapter);
|
||||
return _FAIL;
|
||||
}
|
||||
|
||||
void rtw_hal_free_xmit_priv(struct adapter *padapter)
|
||||
{
|
||||
if(padapter->HalFunc.free_xmit_priv != NULL)
|
||||
|
@ -317,6 +321,7 @@ s32 rtw_hal_init_recv_priv(struct adapter *padapter)
|
|||
|
||||
return _FAIL;
|
||||
}
|
||||
|
||||
void rtw_hal_free_recv_priv(struct adapter *padapter)
|
||||
{
|
||||
if(padapter->HalFunc.free_recv_priv)
|
||||
|
@ -372,6 +377,7 @@ u32 rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask)
|
|||
data = padapter->HalFunc.read_bbreg(padapter, RegAddr, BitMask);
|
||||
return data;
|
||||
}
|
||||
|
||||
void rtw_hal_write_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data)
|
||||
{
|
||||
if(padapter->HalFunc.write_bbreg)
|
||||
|
@ -385,6 +391,7 @@ u32 rtw_hal_read_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 B
|
|||
data = padapter->HalFunc.read_rfreg(padapter, eRFPath, RegAddr, BitMask);
|
||||
return data;
|
||||
}
|
||||
|
||||
void rtw_hal_write_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data)
|
||||
{
|
||||
if(padapter->HalFunc.write_rfreg)
|
||||
|
@ -422,13 +429,13 @@ void rtw_hal_bcn_related_reg_setting(struct adapter *padapter)
|
|||
padapter->HalFunc.SetBeaconRelatedRegistersHandler(padapter);
|
||||
}
|
||||
|
||||
|
||||
u8 rtw_hal_antdiv_before_linked(struct adapter *padapter)
|
||||
{
|
||||
if(padapter->HalFunc.AntDivBeforeLinkHandler)
|
||||
return padapter->HalFunc.AntDivBeforeLinkHandler(padapter);
|
||||
return false;
|
||||
}
|
||||
|
||||
void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src)
|
||||
{
|
||||
if(padapter->HalFunc.AntDivCompareHandler)
|
||||
|
@ -444,7 +451,6 @@ s32 rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt)
|
|||
}
|
||||
#endif /* CONFIG_HOSTAPD_MLME */
|
||||
|
||||
#ifdef DBG_CONFIG_ERROR_DETECT
|
||||
void rtw_hal_sreset_init(struct adapter *padapter)
|
||||
{
|
||||
if(padapter->HalFunc.sreset_init_value)
|
||||
|
@ -472,6 +478,7 @@ void rtw_hal_sreset_xmit_status_check(struct adapter *padapter)
|
|||
if(padapter->HalFunc.sreset_xmit_status_check)
|
||||
padapter->HalFunc.sreset_xmit_status_check(padapter);
|
||||
}
|
||||
|
||||
void rtw_hal_sreset_linked_status_check(struct adapter *padapter)
|
||||
{
|
||||
if (!is_primary_adapter(padapter))
|
||||
|
@ -480,6 +487,7 @@ void rtw_hal_sreset_linked_status_check(struct adapter *padapter)
|
|||
if(padapter->HalFunc.sreset_linked_status_check)
|
||||
padapter->HalFunc.sreset_linked_status_check(padapter);
|
||||
}
|
||||
|
||||
u8 rtw_hal_sreset_get_wifi_status(struct adapter *padapter)
|
||||
{
|
||||
u8 status = 0;
|
||||
|
@ -498,7 +506,6 @@ bool rtw_hal_sreset_inprogress(struct adapter *padapter)
|
|||
inprogress = padapter->HalFunc.sreset_inprogress(padapter);
|
||||
return inprogress;
|
||||
}
|
||||
#endif /* DBG_CONFIG_ERROR_DETECT */
|
||||
|
||||
int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)
|
||||
{
|
||||
|
|
|
@ -2666,8 +2666,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
|
|||
pHalFunc->Efuse_PgPacketRead = &rtl8188e_Efuse_PgPacketRead;
|
||||
pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite;
|
||||
pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite;
|
||||
|
||||
#ifdef DBG_CONFIG_ERROR_DETECT
|
||||
pHalFunc->sreset_init_value = &sreset_init_value;
|
||||
pHalFunc->sreset_reset_value = &sreset_reset_value;
|
||||
pHalFunc->silentreset = &sreset_reset;
|
||||
|
@ -2675,7 +2673,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
|
|||
pHalFunc->sreset_linked_status_check = &rtl8188e_sreset_linked_status_check;
|
||||
pHalFunc->sreset_get_wifi_status = &sreset_get_wifi_status;
|
||||
pHalFunc->sreset_inprogress= &sreset_inprogress;
|
||||
#endif /* DBG_CONFIG_ERROR_DETECT */
|
||||
|
||||
pHalFunc->GetHalODMVarHandler = &rtl8188e_GetHalODMVar;
|
||||
pHalFunc->SetHalODMVarHandler = &rtl8188e_SetHalODMVar;
|
||||
|
|
|
@ -22,8 +22,6 @@
|
|||
#include <rtl8188e_sreset.h>
|
||||
#include <rtl8188e_hal.h>
|
||||
|
||||
#ifdef DBG_CONFIG_ERROR_DETECT
|
||||
|
||||
void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
|
||||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
|
@ -38,9 +36,6 @@ void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
|
|||
DBG_871X("%s REG_TXDMA_STATUS:0x%08x\n", __FUNCTION__, txdma_status);
|
||||
rtw_hal_sreset_reset(padapter);
|
||||
}
|
||||
/* total xmit irp = 4 */
|
||||
/* DBG_8192C("==>%s free_xmitbuf_cnt(%d),txirp_cnt(%d)\n",__FUNCTION__,pxmitpriv->free_xmitbuf_cnt,pxmitpriv->txirp_cnt); */
|
||||
/* if(pxmitpriv->txirp_cnt == NR_XMITBUFF+1) */
|
||||
current_time = rtw_get_current_time();
|
||||
|
||||
if(0 == pxmitpriv->free_xmitbuf_cnt || 0 == pxmitpriv->free_xmit_extbuf_cnt) {
|
||||
|
@ -56,7 +51,6 @@ void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
|
|||
if (diff_time > 4000) {
|
||||
u32 ability;
|
||||
|
||||
/* padapter->Wifi_Error_Status = WIFI_TX_HANG; */
|
||||
rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &ability);
|
||||
|
||||
DBG_871X("%s tx hang %s\n", __FUNCTION__,
|
||||
|
@ -101,4 +95,3 @@ void rtl8188e_sreset_linked_status_check(struct adapter *padapter)
|
|||
return;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -98,12 +98,8 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
|
|||
{
|
||||
padapter->bSurpriseRemoved = true;
|
||||
} else {
|
||||
#ifdef DBG_CONFIG_ERROR_DETECT
|
||||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
pHalData->srestpriv.Wifi_Error_Status = USB_VEN_REQ_CMD_FAIL;
|
||||
}
|
||||
#endif
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
pHalData->srestpriv.Wifi_Error_Status = USB_VEN_REQ_CMD_FAIL;
|
||||
}
|
||||
}
|
||||
else /* status != len && status >= 0 */
|
||||
|
@ -304,7 +300,6 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb
|
|||
memcpy(&(pHalData->IntArray[0]), &(pbuf[USB_INTR_CONTENT_HISR_OFFSET]), 4);
|
||||
memcpy(&(pHalData->IntArray[1]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET]), 4);
|
||||
|
||||
#ifdef DBG_CONFIG_ERROR_DETECT_INT
|
||||
if ( pHalData->IntArray[1] & IMR_TXERR_88E )
|
||||
DBG_871X("===> %s Tx Error Flag Interrupt Status \n",__FUNCTION__);
|
||||
if ( pHalData->IntArray[1] & IMR_RXERR_88E )
|
||||
|
@ -313,7 +308,6 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb
|
|||
DBG_871X("===> %s Transmit FIFO Overflow \n",__FUNCTION__);
|
||||
if ( pHalData->IntArray[1] & IMR_RXFOVW_88E )
|
||||
DBG_871X("===> %s Receive FIFO Overflow \n",__FUNCTION__);
|
||||
#endif/* DBG_CONFIG_ERROR_DETECT_INT */
|
||||
|
||||
/* C2H Event */
|
||||
if (pbuf[0]!= 0){
|
||||
|
@ -730,12 +724,10 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
|
|||
case -ETIME:
|
||||
case -ECOMM:
|
||||
case -EOVERFLOW:
|
||||
#ifdef DBG_CONFIG_ERROR_DETECT
|
||||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
pHalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL;
|
||||
}
|
||||
#endif
|
||||
precvbuf->reuse = true;
|
||||
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue