hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8723au: This gets rid of the last HW_VAR_BCN_VALID usage 

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-04-09 23:20:15 +02:00 committed by Greg Kroah-Hartman
parent 763b4247ca
commit ff5d82e457
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
View File

@ -7555,7 +7555,7 @@ unsigned int send_delba23a(struct rtw_adapter *padapter, u8 initiator, u8 *addr)
unsigned int send_beacon23a(struct rtw_adapter *padapter)
{
u8 bxmitok = false;
bool bxmitok;
int issue = 0;
int poll = 0;
unsigned long start = jiffies;
@ -7567,9 +7567,9 @@ unsigned int send_beacon23a(struct rtw_adapter *padapter)
issue++;
do {
yield();
rtw23a_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bxmitok));
bxmitok = rtl8723a_get_bcn_valid(padapter);
poll++;
} while ((poll%10)!= 0 && false == bxmitok &&
} while ((poll % 10) != 0 && bxmitok == false &&
!padapter->bSurpriseRemoved &&
!padapter->bDriverStopped);

9
drivers/staging/rtl8723au/hal/hal_com.c
View File

@ -752,6 +752,15 @@ void rtl8723a_bcn_valid(struct rtw_adapter *padapter)
rtw_read8(padapter, REG_TDECTRL + 2) | BIT0);
}
bool rtl8723a_get_bcn_valid(struct rtw_adapter *padapter)
{
bool retval;
retval = (rtw_read8(padapter, REG_TDECTRL + 2) & BIT0) ? true : false;
return retval;
}
void rtl8723a_set_tx_pause(struct rtw_adapter *padapter, u8 pause)
{
rtw_write8(padapter, REG_TXPAUSE, pause);

6
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
View File

@ -3305,12 +3305,6 @@ void GetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
*val = rtw_read8(padapter, REG_TXPAUSE);
break;
case HW_VAR_BCN_VALID:
/* BCN_VALID, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2 */
val[0] = (BIT0 & rtw_read8(padapter, REG_TDECTRL + 2)) ? true :
false;
break;
case HW_VAR_RF_TYPE:
*val = pHalData->rf_type;
break;

1
drivers/staging/rtl8723au/include/hal_com.h
View File

@ -189,6 +189,7 @@ void rtl8723a_cam_write(struct rtw_adapter *padapter, u32 val1, u32 val2);
void rtl8723a_fifo_cleanup(struct rtw_adapter *padapter);
void rtl8723a_set_apfm_on_mac(struct rtw_adapter *padapter, u8 val);
void rtl8723a_bcn_valid(struct rtw_adapter *padapter);
bool rtl8723a_get_bcn_valid(struct rtw_adapter *padapter);
void rtl8723a_set_tx_pause(struct rtw_adapter *padapter, u8 pause);
void rtl8723a_set_beacon_interval(struct rtw_adapter *padapter, u16 interval);
void rtl8723a_set_resp_sifs(struct rtw_adapter *padapter,

1
drivers/staging/rtl8723au/include/hal_intf.h
View File

@ -53,7 +53,6 @@ enum HW_VARIABLES {
HW_VAR_RESP_SIFS,
HW_VAR_ACK_PREAMBLE,
HW_VAR_SEC_CFG,
HW_VAR_BCN_VALID,
HW_VAR_RF_TYPE,
HW_VAR_DM_FLAG,
HW_VAR_DM_FUNC_OP,