skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-01-19 12:16:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Replace typedef for _timer with struct timer_list

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-24 15:10:50 -05:00
parent 7b01fe6191
commit 9c56f20d4c
10 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/osdep_intf.h
View file

@ -53,7 +53,7 @@ The protection mechanism is through the pending queue.
u8 io_irp_cnt;
u8 bio_irp_pending;
struct semaphore io_retevt;
_timer io_timer;
struct timer_list io_timer;
u8 bio_irp_timeout;
u8 bio_timer_cancel;
};

10
include/osdep_service.h
View file

@ -69,8 +69,6 @@
#include <linux/usb/ch9.h>
#endif
typedef struct timer_list _timer;
struct __queue {
struct list_head queue;
spinlock_t lock;
@ -187,19 +185,19 @@ __inline static void rtw_list_delete(_list *plist)
list_del_init(plist);
}
__inline static void _init_timer(_timer *ptimer,_nic_hdl nic_hdl,void *pfunc,void* cntx)
__inline static void _init_timer(struct timer_list *ptimer,_nic_hdl nic_hdl,void *pfunc,void* cntx)
{
ptimer->function = pfunc;
ptimer->data = (unsigned long)cntx;
init_timer(ptimer);
}
__inline static void _set_timer(_timer *ptimer,u32 delay_time)
__inline static void _set_timer(struct timer_list *ptimer,u32 delay_time)
{
mod_timer(ptimer , (jiffies+(delay_time*HZ/1000)));
}
__inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled)
__inline static void _cancel_timer(struct timer_list *ptimer,u8 *bcancelled)
{
del_timer_sync(ptimer);
*bcancelled= true;//true ==1; false==0
@ -408,7 +406,7 @@ extern void rtw_udelay_os(int us);
extern void rtw_yield_os(void);
__inline static unsigned char _cancel_timer_ex(_timer *ptimer)
__inline static unsigned char _cancel_timer_ex(struct timer_list *ptimer)
{
return del_timer_sync(ptimer);
}

2
include/rtw_led.h
View file

@ -116,7 +116,7 @@ struct LED_871x {
u32 BlinkTimes; // Number of times to toggle led state for blinking.
_timer BlinkTimer; // Timer object for led blinking.
struct timer_list BlinkTimer; // Timer object for led blinking.
u8 bSWLedCtrl;

18
include/rtw_mlme.h
View file

@ -114,7 +114,7 @@ struct sitesurvey_ctrl {
u64 last_tx_pkts;
uint last_rx_pkts;
sint traffic_busy;
_timer sitesurvey_ctrl_timer;
struct timer_list sitesurvey_ctrl_timer;
};
typedef struct _RT_LINK_DETECT_T{
@ -184,13 +184,13 @@ struct scan_limit_info{
struct wifidirect_info{
_adapter* padapter;
_timer find_phase_timer;
_timer restore_p2p_state_timer;
struct timer_list find_phase_timer;
struct timer_list restore_p2p_state_timer;
// Used to do the scanning. After confirming the peer is availalble, the driver transmits the P2P frame to peer.
_timer pre_tx_scan_timer;
_timer reset_ch_sitesurvey;
_timer reset_ch_sitesurvey2; // Just for resetting the scan limit function by using p2p nego
struct timer_list pre_tx_scan_timer;
struct timer_list reset_ch_sitesurvey;
struct timer_list reset_ch_sitesurvey2; // Just for resetting the scan limit function by using p2p nego
struct tx_provdisc_req_info tx_prov_disc_info;
struct rx_provdisc_req_info rx_prov_disc_info;
struct tx_invite_req_info invitereq_info;
@ -314,12 +314,12 @@ struct mlme_priv {
u32 scan_interval;
_timer assoc_timer;
struct timer_list assoc_timer;
uint assoc_by_bssid;
uint assoc_by_rssi;
_timer scan_to_timer; // driver itself handles scan_timeout status.
struct timer_list scan_to_timer; // driver itself handles scan_timeout status.
u32 scan_start_time; // used to evaluate the time spent in scanning
struct qos_priv qospriv;
@ -340,7 +340,7 @@ struct mlme_priv {
#endif
RT_LINK_DETECT_T LinkDetectInfo;
_timer dynamic_chk_timer; //dynamic/periodic check timer
struct timer_list dynamic_chk_timer; //dynamic/periodic check timer
u8 key_mask; //use for ips to set wep key after ips_leave
u8 acm_mask; // for wmm acm mask

9
include/rtw_mlme_ext.h
View file

@ -461,9 +461,8 @@ struct mlme_ext_priv
struct ss_res sitesurvey_res;
struct mlme_ext_info mlmext_info;//for sta/adhoc mode, including current scanning/connecting/connected related info.
//for ap mode, network includes ap's cap_info
_timer survey_timer;
_timer link_timer;
//_timer ADDBA_timer;
struct timer_list survey_timer;
struct timer_list link_timer;
u16 chan_scan_time;
u8 scan_abort;
@ -654,18 +653,14 @@ void linked_status_chk(_adapter *padapter);
void survey_timer_hdl (_adapter *padapter);
void link_timer_hdl (_adapter *padapter);
void addba_timer_hdl(struct sta_info *psta);
//void reauth_timer_hdl(_adapter *padapter);
//void reassoc_timer_hdl(_adapter *padapter);
#define set_survey_timer(mlmeext, ms) \
do { \
/*DBG_88E("%s set_survey_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \
_set_timer(&(mlmeext)->survey_timer, (ms)); \
} while (0)
#define set_link_timer(mlmeext, ms) \
do { \
/*DBG_88E("%s set_link_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \
_set_timer(&(mlmeext)->link_timer, (ms)); \
} while (0)

2
include/rtw_mp.h
View file

@ -200,7 +200,7 @@ typedef struct _MPT_CONTEXT
bool bMptDrvUnload;
struct semaphore MPh2c_Sema;
_timer MPh2c_timeout_timer;
struct timer_list MPh2c_timeout_timer;
// Event used to sync H2c for BT control
bool MptH2cRspEvent;

3
include/rtw_pwrctrl.h
View file

@ -231,7 +231,7 @@ struct pwrctrl_priv
u8 wowlan_wake_reason;
u32 wowlan_pattern_context[8][5];
#endif // CONFIG_WOWLAN
_timer pwr_state_check_timer;
struct timer_list pwr_state_check_timer;
int pwr_state_check_interval;
u8 pwr_state_check_cnts;
@ -259,7 +259,6 @@ struct pwrctrl_priv
#define _rtw_set_pwr_state_check_timer(pwrctrlpriv, ms) \
do { \
/*DBG_88E("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __func__, (pwrctrlpriv), (ms));*/ \
_set_timer(&(pwrctrlpriv)->pwr_state_check_timer, (ms)); \
} while (0)

4
include/rtw_recv.h
View file

@ -61,7 +61,7 @@ struct recv_reorder_ctrl
u16 wend_b;
u8 wsize_b;
_queue pending_recvframe_queue;
_timer reordering_ctrl_timer;
struct timer_list reordering_ctrl_timer;
};
struct stainfo_rxcache {
@ -234,7 +234,7 @@ struct recv_priv
s8 RxRssi[2];
int FalseAlmCnt_all;
_timer signal_stat_timer;
struct timer_list signal_stat_timer;
u32 signal_stat_sampling_interval;
struct signal_stat signal_qual_data;
struct signal_stat signal_strength_data;

3
include/rtw_security.h
View file

@ -144,12 +144,9 @@ struct security_priv
u8 binstallGrpkey;
u8 busetkipkey;
//_timer tkip_timer;
u8 bcheck_grpkey;
u8 bgrpkey_handshake;
//u8 packet_cnt;//unused, removed
s32 sw_encrypt;//from registry_priv
s32 sw_decrypt;//from registry_priv

2
include/sta_info.h
View file

@ -129,7 +129,7 @@ struct sta_info {
struct stainfo_stats sta_stats;
//for A-MPDU TX, ADDBA timeout check
_timer addba_retry_timer;
struct timer_list addba_retry_timer;
//for A-MPDU Rx reordering buffer control
struct recv_reorder_ctrl recvreorder_ctrl[16];