rtl8188eu: Convert some typedef statements from include/osdep_service.h

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-23 22:39:20 -05:00
parent a831dc1f7e
commit 41ad3e27c6
24 changed files with 147 additions and 150 deletions

View file

@ -49,7 +49,7 @@ The protection mechanism is through the pending queue.
_mutex ioctl_mutex;
// when in USB, IO is through interrupt in/out endpoints
struct usb_device *udev;
PURB piorw_urb;
struct urb * piorw_urb;
u8 io_irp_cnt;
u8 bio_irp_pending;
_sema io_retevt;

View file

@ -69,7 +69,6 @@
#include <linux/usb/ch9.h>
#endif
typedef struct urb * PURB;
typedef struct semaphore _sema;
typedef spinlock_t _lock;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
@ -90,8 +89,6 @@
typedef struct __queue _queue;
typedef struct list_head _list;
typedef int _OS_STATUS;
//typedef u32 _irqL;
typedef unsigned long _irqL;
typedef struct net_device * _nic_hdl;
typedef void* _thread_hdl_;
@ -146,37 +143,37 @@ __inline static _list *get_list_head(_queue *queue)
((type *)((char *)(ptr)-(SIZE_T)(&((type *)0)->member)))
__inline static void _enter_critical(_lock *plock, _irqL *pirqL)
__inline static void _enter_critical(_lock *plock, unsigned long *pirqL)
{
spin_lock_irqsave(plock, *pirqL);
}
__inline static void _exit_critical(_lock *plock, _irqL *pirqL)
__inline static void _exit_critical(_lock *plock, unsigned long *pirqL)
{
spin_unlock_irqrestore(plock, *pirqL);
}
__inline static void _enter_critical_ex(_lock *plock, _irqL *pirqL)
__inline static void _enter_critical_ex(_lock *plock, unsigned long *pirqL)
{
spin_lock_irqsave(plock, *pirqL);
}
__inline static void _exit_critical_ex(_lock *plock, _irqL *pirqL)
__inline static void _exit_critical_ex(_lock *plock, unsigned long *pirqL)
{
spin_unlock_irqrestore(plock, *pirqL);
}
__inline static void _enter_critical_bh(_lock *plock, _irqL *pirqL)
__inline static void _enter_critical_bh(_lock *plock, unsigned long *pirqL)
{
spin_lock_bh(plock);
}
__inline static void _exit_critical_bh(_lock *plock, _irqL *pirqL)
__inline static void _exit_critical_bh(_lock *plock, unsigned long *pirqL)
{
spin_unlock_bh(plock);
}
__inline static int _enter_critical_mutex(_mutex *pmutex, _irqL *pirqL)
__inline static int _enter_critical_mutex(_mutex *pmutex, unsigned long *pirqL)
{
int ret = 0;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
@ -188,7 +185,7 @@ __inline static int _enter_critical_mutex(_mutex *pmutex, _irqL *pirqL)
}
__inline static void _exit_critical_mutex(_mutex *pmutex, _irqL *pirqL)
__inline static void _exit_critical_mutex(_mutex *pmutex, unsigned long *pirqL)
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
mutex_unlock(pmutex);

View file

@ -502,7 +502,7 @@ __inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state)
*/
__inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state)
{
_irqL irqL;
unsigned long irqL;
_enter_critical_bh(&pmlmepriv->lock, &irqL);
if (check_fwstate(pmlmepriv, state) == true)
@ -512,7 +512,7 @@ __inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state)
__inline static void clr_fwstate_ex(struct mlme_priv *pmlmepriv, sint state)
{
_irqL irqL;
unsigned long irqL;
_enter_critical_bh(&pmlmepriv->lock, &irqL);
_clr_fwstate_(pmlmepriv, state);
@ -521,7 +521,7 @@ __inline static void clr_fwstate_ex(struct mlme_priv *pmlmepriv, sint state)
__inline static void up_scanned_network(struct mlme_priv *pmlmepriv)
{
_irqL irqL;
unsigned long irqL;
_enter_critical_bh(&pmlmepriv->lock, &irqL);
pmlmepriv->num_of_scanned++;
@ -530,7 +530,7 @@ __inline static void up_scanned_network(struct mlme_priv *pmlmepriv)
__inline static void down_scanned_network(struct mlme_priv *pmlmepriv)
{
_irqL irqL;
unsigned long irqL;
_enter_critical_bh(&pmlmepriv->lock, &irqL);
pmlmepriv->num_of_scanned--;
@ -539,7 +539,7 @@ __inline static void down_scanned_network(struct mlme_priv *pmlmepriv)
__inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val)
{
_irqL irqL;
unsigned long irqL;
_enter_critical_bh(&pmlmepriv->lock, &irqL);
pmlmepriv->num_of_scanned = val;

View file

@ -118,7 +118,7 @@ struct mp_xmit_frame
//insert urb, irp, and irpcnt info below...
u8 *mem_addr;
u32 sz[8];
PURB pxmit_urb[8];
struct urb * pxmit_urb[8];
u8 bpending[8];
sint ac_tag[8];
sint last[8];

View file

@ -277,7 +277,7 @@ struct recv_buf
u8 *pdata;
u8 *ptail;
u8 *pend;
PURB purb;
struct urb * purb;
dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */
u32 alloc_sz;

View file

@ -223,7 +223,7 @@ struct xmit_buf
u32 len;
struct submit_ctx *sctx;
u32 ff_hwaddr;
PURB pxmit_urb[8];
struct urb *pxmit_urb[8];
dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */
u8 bpending[8];
sint last[8];