skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Convert typedef statements from include/odm_HWConfig.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-26 17:56:14 -05:00
parent a4a1896f86
commit 476eaf9a4e
25 changed files with 170 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/basic_types.h
View file

@ -27,8 +27,6 @@
#define NDIS_OID uint
#define NDIS_STATUS uint
typedef signed int sint;
#define UCHAR u8
#define USHORT u16
#define UINT u32

6
include/cmd_osdep.h
View file

@ -23,11 +23,11 @@
#include <osdep_service.h>
#include <drv_types.h>
extern sint _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv);
extern sint _rtw_init_evt_priv(struct evt_priv *pevtpriv);
extern int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv);
extern int _rtw_init_evt_priv(struct evt_priv *pevtpriv);
extern void _rtw_free_evt_priv (struct evt_priv *pevtpriv);
extern void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv);
extern sint _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj);
extern int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj);
extern struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue);
#endif

4
include/ieee80211.h
View file

@ -1204,7 +1204,7 @@ enum parse_res rtw_ieee802_11_parse_elems(u8 *start, uint len,
int show_errors);
u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *source, unsigned int *frlen);
u8 *rtw_set_ie(u8 *pbuf, sint index, uint len, u8 *source, uint *frlen);
u8 *rtw_set_ie(u8 *pbuf, int index, uint len, u8 *source, uint *frlen);
enum secondary_ch_offset {
SCN = 0, /* no secondary channel */
@ -1217,7 +1217,7 @@ u8 *rtw_set_ie_ch_switch (u8 *buf, u32 *buf_len, u8 ch_switch_mode, u8 new_ch, u
u8 *rtw_set_ie_secondary_ch_offset(u8 *buf, u32 *buf_len, u8 secondary_ch_offset);
u8 *rtw_set_ie_mesh_ch_switch_parm(u8 *buf, u32 *buf_len, u8 ttl, u8 flags, u16 reason, u16 precedence);
u8 *rtw_get_ie(u8*pbuf, sint index, sint *len, sint limit);
u8 *rtw_get_ie(u8*pbuf, int index, int *len, int limit);
u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len, u8 eid, u8 *oui, u8 oui_len, u8 *ie, uint *ielen);
int rtw_ies_remove_ie(u8 *ies, uint *ies_len, uint offset, u8 eid, u8 *oui, u8 oui_len);

8
include/odm_HWConfig.h
View file

@ -114,8 +114,8 @@ struct phy_status_rpt {
#endif
};
typedef struct _Phy_Status_Rpt_8195
{
#if 0
struct phy_status_rpt_8195 {
struct phy_rx_agc_info path_agc[2];
u1Byte ch_num[2];
u1Byte cck_sig_qual_ofdm_pwdb_all;
@ -142,8 +142,8 @@ typedef struct _Phy_Status_Rpt_8195
u1Byte antidx_antb:3;
u1Byte antidx_anta:3;
#endif
} PHY_STATUS_RPT_8195_T,*pPHY_STATUS_RPT_8195_T;
};
#endif
void
odm_Init_RSSIForDM(

2
include/osdep_service.h
View file

@ -414,7 +414,7 @@ __inline static void flush_signals_thread(void)
flush_signals(current);
}
__inline static int res_to_status(sint res)
__inline static int res_to_status(int res)
{
return res;
}

2
include/recv_osdep.h
View file

@ -24,7 +24,7 @@
#include <drv_types.h>
extern sint _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter);
extern int _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter);
extern void _rtw_free_recv_priv (struct recv_priv *precvpriv);

3
include/rtw_cmd.h
View file

@ -237,8 +237,7 @@ Command-Event Mode
#define RTW_SSID_SCAN_AMOUNT 9 // for WEXT_CSCAN_AMOUNT 9
#define RTW_CHANNEL_SCAN_AMOUNT (14+37)
struct sitesurvey_parm {
sint scan_mode; //active: 1, passive: 0
/* sint bsslimit; // 1 ~ 48 */
int scan_mode; //active: 1, passive: 0
u8 ssid_num;
u8 ch_num;
struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];

26
include/rtw_mlme.h
View file

@ -112,7 +112,7 @@ SHALL not lock up more than one locks at a time!
struct sitesurvey_ctrl {
u64 last_tx_pkts;
uint last_rx_pkts;
sint traffic_busy;
int traffic_busy;
struct timer_list sitesurvey_ctrl_timer;
};
@ -290,7 +290,7 @@ struct tdls_info{
struct mlme_priv {
spinlock_t lock;
sint fw_state; //shall we protect this variable? maybe not necessarily...
int fw_state; //shall we protect this variable? maybe not necessarily...
u8 bScanInProcess;
u8 to_join; //flag
u8 to_roaming; // roaming trying times
@ -447,9 +447,9 @@ extern void _rtw_scan_timeout_handler(void* FunctionContext);
extern void rtw_free_network_queue(_adapter *adapter,u8 isfreeall);
extern int rtw_init_mlme_priv(_adapter *adapter);// (struct mlme_priv *pmlmepriv);
extern void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv);
extern sint rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv);
extern sint rtw_set_key(_adapter *adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx);
extern sint rtw_set_auth(_adapter *adapter,struct security_priv *psecuritypriv);
extern int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv);
extern int rtw_set_key(_adapter *adapter, struct security_priv *psecuritypriv, int keyid, u8 set_tx);
extern int rtw_set_auth(_adapter *adapter, struct security_priv *psecuritypriv);
__inline static u8 *get_bssid(struct mlme_priv *pmlmepriv)
{ //if sta_mode:pmlmepriv->cur_network.network.MacAddress=> bssid
@ -457,7 +457,7 @@ __inline static u8 *get_bssid(struct mlme_priv *pmlmepriv)
return pmlmepriv->cur_network.network.MacAddress;
}
__inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state)
__inline static int check_fwstate(struct mlme_priv *pmlmepriv, int state)
{
if (pmlmepriv->fw_state & state)
return true;
@ -465,7 +465,7 @@ __inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state)
return false;
}
__inline static sint get_fwstate(struct mlme_priv *pmlmepriv)
__inline static int get_fwstate(struct mlme_priv *pmlmepriv)
{
return pmlmepriv->fw_state;
}
@ -477,7 +477,7 @@ __inline static sint get_fwstate(struct mlme_priv *pmlmepriv)
* ### NOTE:#### (!!!!)
* MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock
*/
__inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state)
__inline static void set_fwstate(struct mlme_priv *pmlmepriv, int state)
{
pmlmepriv->fw_state |= state;
//FOR HW integration
@ -486,7 +486,7 @@ __inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state)
}
}
__inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state)
__inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, int state)
{
pmlmepriv->fw_state &= ~state;
//FOR HW integration
@ -499,7 +499,7 @@ __inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state)
* No Limit on the calling context,
* therefore set it to be the critical section...
*/
__inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state)
__inline static void clr_fwstate(struct mlme_priv *pmlmepriv, int state)
{
unsigned long irqL;
@ -509,7 +509,7 @@ __inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state)
_exit_critical_bh(&pmlmepriv->lock, &irqL);
}
__inline static void clr_fwstate_ex(struct mlme_priv *pmlmepriv, sint state)
__inline static void clr_fwstate_ex(struct mlme_priv *pmlmepriv, int state)
{
unsigned long irqL;
@ -536,7 +536,7 @@ __inline static void down_scanned_network(struct mlme_priv *pmlmepriv)
_exit_critical_bh(&pmlmepriv->lock, &irqL);
}
__inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val)
__inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, int val)
{
unsigned long irqL;
@ -597,7 +597,7 @@ extern struct wlan_network* _rtw_find_network(struct __queue *scanned_queue, u8
extern void _rtw_free_network_queue(_adapter* padapter, u8 isfreeall);
extern sint rtw_if_up(_adapter *padapter);
extern int rtw_if_up(_adapter *padapter);
u8 *rtw_get_capability_from_ie(u8 *ie);

4
include/rtw_mp.h
View file

@ -120,8 +120,8 @@ struct mp_xmit_frame
u32 sz[8];
struct urb * pxmit_urb[8];
u8 bpending[8];
sint ac_tag[8];
sint last[8];
int ac_tag[8];
int last[8];
uint irpcnt;
uint fragcnt;
uint mem[(MAX_MP_XMITBUF_SZ >> 2)];

16
include/rtw_recv.h
View file

@ -244,7 +244,7 @@ struct recv_priv
struct sta_recv_priv {
spinlock_t lock;
sint option;
int option;
struct __queue defrag_q; //keeping the fragment frame until defrag
struct stainfo_rxcache rxcache;
};
@ -348,8 +348,8 @@ extern int rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *q
extern void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfree_recv_queue);
u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter);
sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, struct __queue *queue);
sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue);
int rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, struct __queue *queue);
int rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue);
struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue);
void rtw_reordering_ctrl_timeout_handler(void *pcontext);
@ -381,7 +381,7 @@ __inline static u8 *get_recvframe_data(union recv_frame *precvframe)
}
__inline static u8 *recvframe_push(union recv_frame *precvframe, sint sz)
__inline static u8 *recvframe_push(union recv_frame *precvframe, int sz)
{
// append data before rx_data
@ -409,7 +409,7 @@ __inline static u8 *recvframe_push(union recv_frame *precvframe, sint sz)
}
__inline static u8 *recvframe_pull(union recv_frame *precvframe, sint sz)
__inline static u8 *recvframe_pull(union recv_frame *precvframe, int sz)
{
// rx_data += sz; move rx_data sz bytes hereafter
@ -434,7 +434,7 @@ __inline static u8 *recvframe_pull(union recv_frame *precvframe, sint sz)
}
__inline static u8 *recvframe_put(union recv_frame *precvframe, sint sz)
__inline static u8 *recvframe_put(union recv_frame *precvframe, int sz)
{
//used for append sz bytes from ptr to rx_tail, update rx_tail and return the updated rx_tail to the caller
//after putting, rx_tail must be still larger than rx_end.
@ -452,7 +452,7 @@ __inline static u8 *recvframe_put(union recv_frame *precvframe, sint sz)
return precvframe->u.hdr.rx_tail;
}
__inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz)
__inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, int sz)
{
// rmv data from rx_tail (by yitsen)
@ -529,7 +529,7 @@ __inline static u8 *pkt_to_recvdata(struct sk_buff *pkt)
}
__inline static sint get_recvframe_len(union recv_frame *precvframe)
__inline static int get_recvframe_len(union recv_frame *precvframe)
{
return precvframe->u.hdr.len;
}

26
include/rtw_xmit.h
View file

@ -222,7 +222,7 @@ struct xmit_buf
struct urb *pxmit_urb[8];
dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */
u8 bpending[8];
sint last[8];
int last[8];
};
struct xmit_frame
@ -250,8 +250,8 @@ struct tx_servq {
struct sta_xmit_priv
{
spinlock_t lock;
sint option;
sint apsd_setting; //When bit mask is on, the associated edca queue supports APSD.
int option;
int apsd_setting; //When bit mask is on, the associated edca queue supports APSD.
//struct tx_servq blk_q[MAX_NUMBLKS];
@ -267,14 +267,14 @@ struct sta_xmit_priv
struct hw_txqueue {
volatile sint head;
volatile sint tail;
volatile sint free_sz; //in units of 64 bytes
volatile sint free_cmdsz;
volatile sint txsz[8];
volatile int head;
volatile int tail;
volatile int free_sz; //in units of 64 bytes
volatile int free_cmdsz;
volatile int txsz[8];
uint ff_hwaddr;
uint cmd_hwaddr;
sint ac_tag;
int ac_tag;
};
struct agg_pkt_info{
@ -358,9 +358,9 @@ extern s32 rtw_put_snap(u8 *data, u16 h_proto);
extern struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv);
extern s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe);
extern void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue);
struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, sint up, u8 *ac);
struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, int up, u8 *ac);
extern s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe);
extern struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, sint entry);
extern struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, int entry);
extern s32 rtw_xmit_classifier(_adapter *padapter, struct xmit_frame *pxmitframe);
extern u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pkt_attrib *pattrib);
@ -372,7 +372,7 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv);
s32 rtw_txframes_pending(_adapter *padapter);
s32 rtw_txframes_sta_ac_pending(_adapter *padapter, struct pkt_attrib *pattrib);
void rtw_init_hwxmits(struct hw_xmit *phwxmit, sint entry);
void rtw_init_hwxmits(struct hw_xmit *phwxmit, int entry);
s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, _adapter *padapter);
@ -386,7 +386,7 @@ void rtw_free_hwxmits(_adapter *padapter);
s32 rtw_xmit(_adapter *padapter, struct sk_buff **pkt);
#if defined(CONFIG_AP_MODE)
sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe);
int xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe);
void stop_sta_xmit(_adapter *padapter, struct sta_info *psta);
void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta);
void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta);

2
include/xmit_osdep.h
View file

@ -58,7 +58,7 @@ extern void rtw_set_tx_chksum_offload(struct sk_buff *pkt, struct pkt_attrib *pa
extern uint rtw_remainder_len(struct pkt_file *pfile);
extern void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile);
extern uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen);
extern sint rtw_endofpktfile (struct pkt_file *pfile);
extern int rtw_endofpktfile (struct pkt_file *pfile);
extern void rtw_os_pkt_complete(_adapter *padapter, struct sk_buff *pkt);
extern void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe);