skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-29 07:33:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove DBG_CONFIG_ERROR_DETECT

Browse source 
This variable is selected.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-19 17:05:40 -05:00
parent 46ae193f1d
commit f50db5cd2c
16 changed files with 9 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/rtw_cmd.c
View file

@ -1988,31 +1988,21 @@ void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
expire_timeout_chk(padapter); expire_timeout_chk(padapter);
#endif #endif
#ifdef DBG_CONFIG_ERROR_DETECT
rtw_hal_sreset_xmit_status_check(padapter); rtw_hal_sreset_xmit_status_check(padapter);
#endif
/* if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)==false) */
{
linked_status_chk(padapter); linked_status_chk(padapter);
traffic_status_watchdog(padapter); traffic_status_watchdog(padapter);
}
rtw_hal_dm_watchdog(padapter); rtw_hal_dm_watchdog(padapter);
/* check_hw_pbc(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size); */
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
/* */
/* BT-Coexist */ /* BT-Coexist */
/* */
BT_CoexistMechanism(padapter); BT_CoexistMechanism(padapter);
#endif #endif
} }
#ifdef CONFIG_LPS #ifdef CONFIG_LPS
void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type);
void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type) void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;

2
core/rtw_mlme.c
View file

@ -1103,14 +1103,12 @@ _func_enter_;
drvext_surveydone_callback(&adapter->drvextpriv); drvext_surveydone_callback(&adapter->drvextpriv);
#endif #endif
#ifdef DBG_CONFIG_ERROR_DETECT
{ {
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
if (pmlmeext->sitesurvey_res.bss_cnt == 0){ if (pmlmeext->sitesurvey_res.bss_cnt == 0){
rtw_hal_sreset_reset(adapter); rtw_hal_sreset_reset(adapter);
} }
} }
#endif
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
rtw_cfg80211_surveydone_event_callback(adapter); rtw_cfg80211_surveydone_event_callback(adapter);

5
core/rtw_mlme_ext.c
View file

@ -9283,12 +9283,9 @@ void linked_status_chk(_adapter *padapter)
if (padapter->bRxRSSIDisplay) if (padapter->bRxRSSIDisplay)
_linked_rx_signal_strehgth_display(padapter); _linked_rx_signal_strehgth_display(padapter);
#ifdef DBG_CONFIG_ERROR_DETECT
rtw_hal_sreset_linked_status_check(padapter); rtw_hal_sreset_linked_status_check(padapter);
#endif
if (is_client_associated_to_ap(padapter)) if (is_client_associated_to_ap(padapter)) {
{
/* linked infrastructure client mode */ /* linked infrastructure client mode */
int tx_chk = _SUCCESS, rx_chk = _SUCCESS; int tx_chk = _SUCCESS, rx_chk = _SUCCESS;

4
core/rtw_sreset.c
View file

@ -18,9 +18,8 @@
* *
******************************************************************************/ ******************************************************************************/
#include<rtw_sreset.h> #include <rtw_sreset.h>
#if defined(DBG_CONFIG_ERROR_DETECT)
void sreset_init_value(_adapter *padapter) void sreset_init_value(_adapter *padapter)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -82,4 +81,3 @@ void sreset_set_wifi_error_status(_adapter *padapter, u32 status)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
pHalData->srestpriv.Wifi_Error_Status = status; pHalData->srestpriv.Wifi_Error_Status = status;
} }
#endif /* defined(DBG_CONFIG_ERROR_DETECT) */

3
hal/hal_intf.c
View file

@ -364,7 +364,6 @@ void rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_B
padapter->HalFunc.AntDivCompareHandler(padapter, dst, src); padapter->HalFunc.AntDivCompareHandler(padapter, dst, src);
} }
#ifdef DBG_CONFIG_ERROR_DETECT
void rtw_hal_sreset_init(_adapter *padapter) void rtw_hal_sreset_init(_adapter *padapter)
{ {
if (padapter->HalFunc.sreset_init_value) if (padapter->HalFunc.sreset_init_value)
@ -400,8 +399,6 @@ u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter)
return status; return status;
} }
#endif /* DBG_CONFIG_ERROR_DETECT */
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)

2
hal/rtl8188e_hal_init.c
View file

@ -2569,14 +2569,12 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite; pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite;
pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite; pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite;
#ifdef DBG_CONFIG_ERROR_DETECT
pHalFunc->sreset_init_value = &sreset_init_value; pHalFunc->sreset_init_value = &sreset_init_value;
pHalFunc->sreset_reset_value = &sreset_reset_value; pHalFunc->sreset_reset_value = &sreset_reset_value;
pHalFunc->silentreset = &rtl8188e_silentreset_for_specific_platform; pHalFunc->silentreset = &rtl8188e_silentreset_for_specific_platform;
pHalFunc->sreset_xmit_status_check = &rtl8188e_sreset_xmit_status_check; pHalFunc->sreset_xmit_status_check = &rtl8188e_sreset_xmit_status_check;
pHalFunc->sreset_linked_status_check = &rtl8188e_sreset_linked_status_check; pHalFunc->sreset_linked_status_check = &rtl8188e_sreset_linked_status_check;
pHalFunc->sreset_get_wifi_status = &sreset_get_wifi_status; pHalFunc->sreset_get_wifi_status = &sreset_get_wifi_status;
#endif /* DBG_CONFIG_ERROR_DETECT */
pHalFunc->GetHalODMVarHandler = &rtl8188e_GetHalODMVar; pHalFunc->GetHalODMVarHandler = &rtl8188e_GetHalODMVar;
pHalFunc->SetHalODMVarHandler = &rtl8188e_SetHalODMVar; pHalFunc->SetHalODMVarHandler = &rtl8188e_SetHalODMVar;

2
hal/rtl8188e_sreset.c
View file

@ -22,7 +22,6 @@
#include <rtl8188e_sreset.h> #include <rtl8188e_sreset.h>
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
#ifdef DBG_CONFIG_ERROR_DETECT
extern void rtw_cancel_all_timer(_adapter *padapter); extern void rtw_cancel_all_timer(_adapter *padapter);
static void _restore_security_setting(_adapter *padapter) static void _restore_security_setting(_adapter *padapter)
{ {
@ -222,4 +221,3 @@ void rtl8188e_sreset_linked_status_check(_adapter *padapter)
DBG_88E("%s REG_FW_STATUS (0x%02x), Condition_No_Match !! \n",__func__,fw_status); DBG_88E("%s REG_FW_STATUS (0x%02x), Condition_No_Match !! \n",__func__,fw_status);
} }
} }
#endif

4
hal/usb_ops_linux.c
View file

@ -122,12 +122,10 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
{ {
padapter->bSurpriseRemoved = true; padapter->bSurpriseRemoved = true;
} else { } else {
#ifdef DBG_CONFIG_ERROR_DETECT
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
pHalData->srestpriv.Wifi_Error_Status = USB_VEN_REQ_CMD_FAIL; pHalData->srestpriv.Wifi_Error_Status = USB_VEN_REQ_CMD_FAIL;
} }
#endif
} }
} }
else /* status != len && status >= 0 */ else /* status != len && status >= 0 */
@ -817,12 +815,10 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
break; break;
case -EPROTO: case -EPROTO:
case -EOVERFLOW: case -EOVERFLOW:
#ifdef DBG_CONFIG_ERROR_DETECT
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
pHalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL; pHalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL;
} }
#endif
precvbuf->reuse = true; precvbuf->reuse = true;
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
break; break;

3
include/autoconf.h
View file

@ -168,6 +168,3 @@
#define DBG 1 #define DBG 1
#define CONFIG_PROC_DEBUG #define CONFIG_PROC_DEBUG
#define DBG_CONFIG_ERROR_DETECT

4
include/hal_intf.h
View file

@ -225,14 +225,12 @@ struct hal_ops {
u8 (*Efuse_WordEnableDataWrite)(_adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest); u8 (*Efuse_WordEnableDataWrite)(_adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
bool (*Efuse_PgPacketWrite_BT)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest); bool (*Efuse_PgPacketWrite_BT)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
#ifdef DBG_CONFIG_ERROR_DETECT
void (*sreset_init_value)(_adapter *padapter); void (*sreset_init_value)(_adapter *padapter);
void (*sreset_reset_value)(_adapter *padapter); void (*sreset_reset_value)(_adapter *padapter);
void (*silentreset)(_adapter *padapter); void (*silentreset)(_adapter *padapter);
void (*sreset_xmit_status_check)(_adapter *padapter); void (*sreset_xmit_status_check)(_adapter *padapter);
void (*sreset_linked_status_check) (_adapter *padapter); void (*sreset_linked_status_check) (_adapter *padapter);
u8 (*sreset_get_wifi_status)(_adapter *padapter); u8 (*sreset_get_wifi_status)(_adapter *padapter);
#endif
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);
@ -425,14 +423,12 @@ void rtw_hal_dm_watchdog(_adapter *padapter);
u8 rtw_hal_antdiv_before_linked(_adapter *padapter); u8 rtw_hal_antdiv_before_linked(_adapter *padapter);
void rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); void rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src);
#ifdef DBG_CONFIG_ERROR_DETECT
void rtw_hal_sreset_init(_adapter *padapter); void rtw_hal_sreset_init(_adapter *padapter);
void rtw_hal_sreset_reset(_adapter *padapter); void rtw_hal_sreset_reset(_adapter *padapter);
void rtw_hal_sreset_reset_value(_adapter *padapter); void rtw_hal_sreset_reset_value(_adapter *padapter);
void rtw_hal_sreset_xmit_status_check(_adapter *padapter); void rtw_hal_sreset_xmit_status_check(_adapter *padapter);
void rtw_hal_sreset_linked_status_check (_adapter *padapter); 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
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);

4
include/rtl8188e_hal.h
View file

@ -31,9 +31,7 @@
#include "rtl8188e_xmit.h" #include "rtl8188e_xmit.h"
#include "rtl8188e_cmd.h" #include "rtl8188e_cmd.h"
#include "Hal8188EPwrSeq.h" #include "Hal8188EPwrSeq.h"
#ifdef DBG_CONFIG_ERROR_DETECT
#include "rtl8188e_sreset.h" #include "rtl8188e_sreset.h"
#endif
#include "rtw_efuse.h" #include "rtw_efuse.h"
#include "odm_precomp.h" #include "odm_precomp.h"
@ -424,9 +422,7 @@ typedef struct hal_data_8188e
struct dm_priv dmpriv; struct dm_priv dmpriv;
DM_ODM_T odmpriv; DM_ODM_T odmpriv;
//_lock odm_stainfo_lock; //_lock odm_stainfo_lock;
#ifdef DBG_CONFIG_ERROR_DETECT
struct sreset_priv srestpriv; struct sreset_priv srestpriv;
#endif
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
struct btcoexist_priv bt_coexist; struct btcoexist_priv bt_coexist;

3
include/rtl8188e_sreset.h
View file

@ -25,9 +25,8 @@
#include <drv_types.h> #include <drv_types.h>
#include <rtw_sreset.h> #include <rtw_sreset.h>
#ifdef DBG_CONFIG_ERROR_DETECT
extern void rtl8188e_silentreset_for_specific_platform(_adapter *padapter); extern void rtl8188e_silentreset_for_specific_platform(_adapter *padapter);
extern void rtl8188e_sreset_xmit_status_check(_adapter *padapter); extern void rtl8188e_sreset_xmit_status_check(_adapter *padapter);
extern void rtl8188e_sreset_linked_status_check(_adapter *padapter); extern void rtl8188e_sreset_linked_status_check(_adapter *padapter);
#endif
#endif #endif

7
include/rtw_sreset.h
View file

@ -43,16 +43,9 @@ struct sreset_priv {
#define WIFI_RX_HANG BIT5 #define WIFI_RX_HANG BIT5
#define WIFI_IF_NOT_EXIST BIT6 #define WIFI_IF_NOT_EXIST BIT6
#if defined(DBG_CONFIG_ERROR_DETECT)
void sreset_init_value(_adapter *padapter); void sreset_init_value(_adapter *padapter);
void sreset_reset_value(_adapter *padapter); void sreset_reset_value(_adapter *padapter);
u8 sreset_get_wifi_status(_adapter *padapter); u8 sreset_get_wifi_status(_adapter *padapter);
void sreset_set_wifi_error_status(_adapter *padapter, u32 status); void sreset_set_wifi_error_status(_adapter *padapter, u32 status);
#else
static void sreset_init_value(_adapter *padapter){}
static void sreset_reset_value(_adapter *padapter){}
static u8 sreset_get_wifi_status(_adapter *padapter){return WIFI_STATUS_SUCCESS;}
static void sreset_set_wifi_error_status(_adapter *padapter, u32 status){}
#endif
#endif #endif

9
os_dep/ioctl_linux.c
View file

@ -3220,16 +3220,12 @@ static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len)
rtw_hal_set_hwreg(padapter, HW_VAR_BT_ISSUE_DELBA, pdata); rtw_hal_set_hwreg(padapter, HW_VAR_BT_ISSUE_DELBA, pdata);
break; break;
#endif #endif
#ifdef DBG_CONFIG_ERROR_DETECT
case GEN_MP_IOCTL_SUBCODE(GET_WIFI_STATUS): case GEN_MP_IOCTL_SUBCODE(GET_WIFI_STATUS):
*pdata = rtw_hal_sreset_get_wifi_status(padapter); *pdata = rtw_hal_sreset_get_wifi_status(padapter);
break; break;
#endif
default: default:
break; break;
} }
} }
static int rtw_mp_ioctl_hdl(struct net_device *dev, struct iw_request_info *info, static int rtw_mp_ioctl_hdl(struct net_device *dev, struct iw_request_info *info,
@ -6149,15 +6145,11 @@ static int rtw_dbg_port(struct net_device *dev,
} }
} }
break; break;
#ifdef DBG_CONFIG_ERROR_DETECT
case 0x0f: case 0x0f:
{
if (extra_arg == 0){ if (extra_arg == 0){
DBG_88E("###### silent reset test.......#####\n"); DBG_88E("###### silent reset test.......#####\n");
rtw_hal_sreset_reset(padapter); rtw_hal_sreset_reset(padapter);
} }
}
break; break;
case 0x15: case 0x15:
{ {
@ -6166,7 +6158,6 @@ static int rtw_dbg_port(struct net_device *dev,
} }
break; break;
#endif
case 0x10:// driver version display case 0x10:// driver version display
DBG_88E("rtw driver version=%s\n", DRIVERVERSION); DBG_88E("rtw driver version=%s\n", DRIVERVERSION);

4
os_dep/os_intfs.c
View file

@ -1097,9 +1097,7 @@ u8 rtw_reset_drv_sw(_adapter *padapter)
#endif #endif
#endif #endif
#ifdef DBG_CONFIG_ERROR_DETECT
rtw_hal_sreset_reset_value(padapter); rtw_hal_sreset_reset_value(padapter);
#endif
pwrctrlpriv->pwr_state_check_cnts = 0; pwrctrlpriv->pwr_state_check_cnts = 0;
//mlmeextpriv //mlmeextpriv
@ -1191,9 +1189,7 @@ _func_enter_;
rtw_hal_dm_init(padapter); rtw_hal_dm_init(padapter);
rtw_hal_sw_led_init(padapter); rtw_hal_sw_led_init(padapter);
#ifdef DBG_CONFIG_ERROR_DETECT
rtw_hal_sreset_init(padapter); rtw_hal_sreset_init(padapter);
#endif
_rtw_spinlock_init(&padapter->br_ext_lock); _rtw_spinlock_init(&padapter->br_ext_lock);

4
os_dep/usb_ops_linux.c
View file

@ -422,12 +422,10 @@ _func_enter_;
} }
} }
#ifdef DBG_CONFIG_ERROR_DETECT
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
pHalData->srestpriv.last_tx_complete_time = rtw_get_current_time(); pHalData->srestpriv.last_tx_complete_time = rtw_get_current_time();
} }
#endif
check_completion: check_completion:
rtw_sctx_done_err(&pxmitbuf->sctx, rtw_sctx_done_err(&pxmitbuf->sctx,
@ -527,12 +525,10 @@ _func_enter_;
status = usb_submit_urb(purb, GFP_ATOMIC); status = usb_submit_urb(purb, GFP_ATOMIC);
if (!status) { if (!status) {
#ifdef DBG_CONFIG_ERROR_DETECT
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
pHalData->srestpriv.last_tx_time = rtw_get_current_time(); pHalData->srestpriv.last_tx_time = rtw_get_current_time();
} }
#endif
} else { } else {
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR); rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR);
DBG_88E("usb_write_port, status=%d\n", status); DBG_88E("usb_write_port, status=%d\n", status);