Skip to content

fix compilation when not using 'DBG 0' #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aramirez wants to merge 1 commit into
base: rtl8189fs
Choose a base branch
from
Open

fix compilation when not using 'DBG 0' #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions hal/rtl8188f/sdio/sdio_halinit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,8 @@ static u32 rtl8188fs_hal_init(PADAPTER padapter)
PHAL_DATA_TYPE pHalData;
struct pwrctrl_priv *pwrctrlpriv;
struct registry_priv *pregistrypriv;
struct sreset_priv *psrtpriv;
bool is_sreset_inprogress;

struct dvobj_priv *psdpriv = padapter->dvobj;
struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;

Expand All @@ -639,7 +640,11 @@ static u32 rtl8188fs_hal_init(PADAPTER padapter)
u32 u4Tmp;

pHalData = GET_HAL_DATA(padapter);
psrtpriv = &pHalData->srestpriv;
#if defined(CONFIG_FWLPS_IN_IPS)
is_sreset_inprogress = &pHalData->srestpriv.silent_reset_inprogress;
#else
is_sreset_inprogress = _FALSE;
#endif
pwrctrlpriv = adapter_to_pwrctl(padapter);
pregistrypriv = &padapter->registrypriv;

Expand Down Expand Up @@ -674,8 +679,8 @@ static u32 rtl8188fs_hal_init(PADAPTER padapter)
return _SUCCESS;
}
#elif defined(CONFIG_FWLPS_IN_IPS)
if (adapter_to_pwrctl(padapter)->bips_processing == _TRUE && psrtpriv->silent_reset_inprogress == _FALSE
&& adapter_to_pwrctl(padapter)->pre_ips_type == 0) {
if (adapter_to_pwrctl(padapter)->bips_processing == _TRUE && is_sreset_inprogress == _FALSE
&& adapter_to_pwrctl(padapter)->pre_ips_type == 0) {
systime start_time;
u8 cpwm_orig, cpwm_now;
u8 val8, bMacPwrCtrlOn = _TRUE;
Expand Down Expand Up @@ -1050,10 +1055,15 @@ static void CardDisableRTL8188FSdio(PADAPTER padapter)
static u32 rtl8188fs_hal_deinit(PADAPTER padapter)
{
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv;
bool is_sreset_inprogress;
struct dvobj_priv *psdpriv = padapter->dvobj;
struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;

#if defined(CONFIG_FWLPS_IN_IPS)
is_sreset_inprogress = &pHalData->srestpriv.silent_reset_inprogress;
#else
is_sreset_inprogress = _FALSE;
#endif
#ifdef CONFIG_MP_INCLUDED
if (padapter->registrypriv.mp_mode == 1)
MPT_DeInitAdapter(padapter);
Expand Down Expand Up @@ -1082,7 +1092,7 @@ static u32 rtl8188fs_hal_deinit(PADAPTER padapter)
}
} else
#elif defined(CONFIG_FWLPS_IN_IPS)
if (adapter_to_pwrctl(padapter)->bips_processing == _TRUE && psrtpriv->silent_reset_inprogress == _FALSE) {
if (adapter_to_pwrctl(padapter)->bips_processing == _TRUE && is_sreset_in_progress == _FALSE) {
if (padapter->netif_up == _TRUE) {
int cnt = 0;
u8 val8 = 0;
Expand Down
Loading