Staging: wlan-ng: Use standard kernel integer (u32/s32/etc) types.
authorSolomon Peachy <pizza@shaftnet.org>
Wed, 29 Oct 2008 14:42:53 +0000 (10:42 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 6 Jan 2009 21:51:56 +0000 (13:51 -0800)
wlan-ng needed to interact with userspace, and support very old kernels,
so it used to define its own types for integers to ensure consistency.

It's all rather irrelevant now.

Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
24 files changed:
drivers/staging/wlan-ng/hfa384x.h
drivers/staging/wlan-ng/hfa384x_usb.c
drivers/staging/wlan-ng/p80211conv.c
drivers/staging/wlan-ng/p80211conv.h
drivers/staging/wlan-ng/p80211hdr.h
drivers/staging/wlan-ng/p80211ioctl.h
drivers/staging/wlan-ng/p80211meta.h
drivers/staging/wlan-ng/p80211metamib.h
drivers/staging/wlan-ng/p80211metamsg.h
drivers/staging/wlan-ng/p80211metastruct.h
drivers/staging/wlan-ng/p80211mgmt.h
drivers/staging/wlan-ng/p80211msg.h
drivers/staging/wlan-ng/p80211netdev.c
drivers/staging/wlan-ng/p80211netdev.h
drivers/staging/wlan-ng/p80211req.c
drivers/staging/wlan-ng/p80211req.h
drivers/staging/wlan-ng/p80211types.h
drivers/staging/wlan-ng/p80211wep.c
drivers/staging/wlan-ng/p80211wext.c
drivers/staging/wlan-ng/prism2mgmt.c
drivers/staging/wlan-ng/prism2mgmt.h
drivers/staging/wlan-ng/prism2mib.c
drivers/staging/wlan-ng/prism2sta.c
drivers/staging/wlan-ng/wlan_compat.h

index 289ae0c7c8544a31ba8e1ada68e4e7fd347a250a..23d3d59f26b18187213ed102fae14ce79272572d 100644 (file)
 
 /*------ Constants --------------------------------------------*/
 /*--- Mins & Maxs -----------------------------------*/
-#define                HFA384x_CMD_ALLOC_LEN_MIN       ((UINT16)4)
-#define                HFA384x_CMD_ALLOC_LEN_MAX       ((UINT16)2400)
-#define                HFA384x_BAP_DATALEN_MAX         ((UINT16)4096)
-#define                HFA384x_BAP_OFFSET_MAX          ((UINT16)4096)
-#define                HFA384x_PORTID_MAX              ((UINT16)7)
-#define                HFA384x_NUMPORTS_MAX            ((UINT16)(HFA384x_PORTID_MAX+1))
-#define                HFA384x_PDR_LEN_MAX             ((UINT16)512)   /* in bytes, from EK */
-#define                HFA384x_PDA_RECS_MAX            ((UINT16)200)   /* a guess */
-#define                HFA384x_PDA_LEN_MAX             ((UINT16)1024)  /* in bytes, from EK */
-#define                HFA384x_SCANRESULT_MAX          ((UINT16)31)
-#define                HFA384x_HSCANRESULT_MAX         ((UINT16)31)
-#define                HFA384x_CHINFORESULT_MAX        ((UINT16)16)
+#define                HFA384x_CMD_ALLOC_LEN_MIN       ((u16)4)
+#define                HFA384x_CMD_ALLOC_LEN_MAX       ((u16)2400)
+#define                HFA384x_BAP_DATALEN_MAX         ((u16)4096)
+#define                HFA384x_BAP_OFFSET_MAX          ((u16)4096)
+#define                HFA384x_PORTID_MAX              ((u16)7)
+#define                HFA384x_NUMPORTS_MAX            ((u16)(HFA384x_PORTID_MAX+1))
+#define                HFA384x_PDR_LEN_MAX             ((u16)512)      /* in bytes, from EK */
+#define                HFA384x_PDA_RECS_MAX            ((u16)200)      /* a guess */
+#define                HFA384x_PDA_LEN_MAX             ((u16)1024)     /* in bytes, from EK */
+#define                HFA384x_SCANRESULT_MAX          ((u16)31)
+#define                HFA384x_HSCANRESULT_MAX         ((u16)31)
+#define                HFA384x_CHINFORESULT_MAX        ((u16)16)
 #define                HFA384x_DRVR_FIDSTACKLEN_MAX    (10)
 #define                HFA384x_DRVR_TXBUF_MAX          (sizeof(hfa384x_tx_frame_t) + \
                                                WLAN_DATA_MAXLEN - \
 #define                HFA384x_USB_RWMEM_MAXLEN        2048
 
 /*--- Support Constants -----------------------------*/
-#define                HFA384x_BAP_PROC                        ((UINT16)0)
-#define                HFA384x_BAP_INT                         ((UINT16)1)
-#define                HFA384x_PORTTYPE_IBSS                   ((UINT16)0)
-#define                HFA384x_PORTTYPE_BSS                    ((UINT16)1)
-#define                HFA384x_PORTTYPE_WDS                    ((UINT16)2)
-#define                HFA384x_PORTTYPE_PSUEDOIBSS             ((UINT16)3)
-#define                HFA384x_PORTTYPE_HOSTAP                 ((UINT16)6)
-#define                HFA384x_WEPFLAGS_PRIVINVOKED            ((UINT16)BIT0)
-#define                HFA384x_WEPFLAGS_EXCLUDE                ((UINT16)BIT1)
-#define                HFA384x_WEPFLAGS_DISABLE_TXCRYPT        ((UINT16)BIT4)
-#define                HFA384x_WEPFLAGS_DISABLE_RXCRYPT        ((UINT16)BIT7)
-#define                HFA384x_WEPFLAGS_DISALLOW_MIXED         ((UINT16)BIT11)
-#define                HFA384x_WEPFLAGS_IV_INTERVAL1           ((UINT16)0)
-#define                HFA384x_WEPFLAGS_IV_INTERVAL10          ((UINT16)BIT5)
-#define                HFA384x_WEPFLAGS_IV_INTERVAL50          ((UINT16)BIT6)
-#define                HFA384x_WEPFLAGS_IV_INTERVAL100         ((UINT16)(BIT5 | BIT6))
-#define                HFA384x_WEPFLAGS_FIRMWARE_WPA           ((UINT16)BIT8)
-#define                HFA384x_WEPFLAGS_HOST_MIC               ((UINT16)BIT9)
-#define        HFA384x_ROAMMODE_FWSCAN_FWROAM          ((UINT16)1)
-#define        HFA384x_ROAMMODE_FWSCAN_HOSTROAM        ((UINT16)2)
-#define        HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM      ((UINT16)3)
-#define        HFA384x_PORTSTATUS_DISABLED             ((UINT16)1)
-#define        HFA384x_PORTSTATUS_INITSRCH             ((UINT16)2)
-#define        HFA384x_PORTSTATUS_CONN_IBSS            ((UINT16)3)
-#define        HFA384x_PORTSTATUS_CONN_ESS             ((UINT16)4)
-#define        HFA384x_PORTSTATUS_OOR_ESS              ((UINT16)5)
-#define        HFA384x_PORTSTATUS_CONN_WDS             ((UINT16)6)
-#define        HFA384x_PORTSTATUS_HOSTAP               ((UINT16)8)
-#define                HFA384x_RATEBIT_1                       ((UINT16)1)
-#define                HFA384x_RATEBIT_2                       ((UINT16)2)
-#define                HFA384x_RATEBIT_5dot5                   ((UINT16)4)
-#define                HFA384x_RATEBIT_11                      ((UINT16)8)
+#define                HFA384x_BAP_PROC                        ((u16)0)
+#define                HFA384x_BAP_int                         ((u16)1)
+#define                HFA384x_PORTTYPE_IBSS                   ((u16)0)
+#define                HFA384x_PORTTYPE_BSS                    ((u16)1)
+#define                HFA384x_PORTTYPE_WDS                    ((u16)2)
+#define                HFA384x_PORTTYPE_PSUEDOIBSS             ((u16)3)
+#define                HFA384x_PORTTYPE_HOSTAP                 ((u16)6)
+#define                HFA384x_WEPFLAGS_PRIVINVOKED            ((u16)BIT0)
+#define                HFA384x_WEPFLAGS_EXCLUDE                ((u16)BIT1)
+#define                HFA384x_WEPFLAGS_DISABLE_TXCRYPT        ((u16)BIT4)
+#define                HFA384x_WEPFLAGS_DISABLE_RXCRYPT        ((u16)BIT7)
+#define                HFA384x_WEPFLAGS_DISALLOW_MIXED         ((u16)BIT11)
+#define                HFA384x_WEPFLAGS_IV_intERVAL1           ((u16)0)
+#define                HFA384x_WEPFLAGS_IV_intERVAL10          ((u16)BIT5)
+#define                HFA384x_WEPFLAGS_IV_intERVAL50          ((u16)BIT6)
+#define                HFA384x_WEPFLAGS_IV_intERVAL100         ((u16)(BIT5 | BIT6))
+#define                HFA384x_WEPFLAGS_FIRMWARE_WPA           ((u16)BIT8)
+#define                HFA384x_WEPFLAGS_HOST_MIC               ((u16)BIT9)
+#define        HFA384x_ROAMMODE_FWSCAN_FWROAM          ((u16)1)
+#define        HFA384x_ROAMMODE_FWSCAN_HOSTROAM        ((u16)2)
+#define        HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM      ((u16)3)
+#define        HFA384x_PORTSTATUS_DISABLED             ((u16)1)
+#define        HFA384x_PORTSTATUS_INITSRCH             ((u16)2)
+#define        HFA384x_PORTSTATUS_CONN_IBSS            ((u16)3)
+#define        HFA384x_PORTSTATUS_CONN_ESS             ((u16)4)
+#define        HFA384x_PORTSTATUS_OOR_ESS              ((u16)5)
+#define        HFA384x_PORTSTATUS_CONN_WDS             ((u16)6)
+#define        HFA384x_PORTSTATUS_HOSTAP               ((u16)8)
+#define                HFA384x_RATEBIT_1                       ((u16)1)
+#define                HFA384x_RATEBIT_2                       ((u16)2)
+#define                HFA384x_RATEBIT_5dot5                   ((u16)4)
+#define                HFA384x_RATEBIT_11                      ((u16)8)
 
 /*--- Just some symbolic names for legibility -------*/
-#define                HFA384x_TXCMD_NORECL            ((UINT16)0)
-#define                HFA384x_TXCMD_RECL              ((UINT16)1)
+#define                HFA384x_TXCMD_NORECL            ((u16)0)
+#define                HFA384x_TXCMD_RECL              ((u16)1)
 
 /*--- MAC Internal memory constants and macros ------*/
 /* masks and macros used to manipulate MAC internal memory addresses. */
  */
 
 /* Handy constant */
-#define                HFA384x_ADDR_AUX_OFF_MAX        ((UINT16)0x007f)
+#define                HFA384x_ADDR_AUX_OFF_MAX        ((u16)0x007f)
 
 /* Mask bits for discarding unwanted pieces in a flat address */
 #define                HFA384x_ADDR_FLAT_AUX_PAGE_MASK (0x007fff80)
 
 /* Make a 32-bit flat address from AUX format 16-bit page and offset */
 #define                HFA384x_ADDR_AUX_MKFLAT(p,o)    \
-               (((UINT32)(((UINT16)(p))&HFA384x_ADDR_AUX_PAGE_MASK)) <<7) | \
-               ((UINT32)(((UINT16)(o))&HFA384x_ADDR_AUX_OFF_MASK))
+               (((u32)(((u16)(p))&HFA384x_ADDR_AUX_PAGE_MASK)) <<7) | \
+               ((u32)(((u16)(o))&HFA384x_ADDR_AUX_OFF_MASK))
 
 /* Make a 32-bit flat address from CMD format 16-bit page and offset */
 #define                HFA384x_ADDR_CMD_MKFLAT(p,o)    \
-               (((UINT32)(((UINT16)(p))&HFA384x_ADDR_CMD_PAGE_MASK)) <<16) | \
-               ((UINT32)(((UINT16)(o))&HFA384x_ADDR_CMD_OFF_MASK))
+               (((u32)(((u16)(p))&HFA384x_ADDR_CMD_PAGE_MASK)) <<16) | \
+               ((u32)(((u16)(o))&HFA384x_ADDR_CMD_OFF_MASK))
 
 /* Make AUX format offset and page from a 32-bit flat address */
 #define                HFA384x_ADDR_AUX_MKPAGE(f) \
-               ((UINT16)((((UINT32)(f))&HFA384x_ADDR_FLAT_AUX_PAGE_MASK)>>7))
+               ((u16)((((u32)(f))&HFA384x_ADDR_FLAT_AUX_PAGE_MASK)>>7))
 #define                HFA384x_ADDR_AUX_MKOFF(f) \
-               ((UINT16)(((UINT32)(f))&HFA384x_ADDR_FLAT_AUX_OFF_MASK))
+               ((u16)(((u32)(f))&HFA384x_ADDR_FLAT_AUX_OFF_MASK))
 
 /* Make CMD format offset and page from a 32-bit flat address */
 #define                HFA384x_ADDR_CMD_MKPAGE(f) \
-               ((UINT16)((((UINT32)(f))&HFA384x_ADDR_FLAT_CMD_PAGE_MASK)>>16))
+               ((u16)((((u32)(f))&HFA384x_ADDR_FLAT_CMD_PAGE_MASK)>>16))
 #define                HFA384x_ADDR_CMD_MKOFF(f) \
-               ((UINT16)(((UINT32)(f))&HFA384x_ADDR_FLAT_CMD_OFF_MASK))
+               ((u16)(((u32)(f))&HFA384x_ADDR_FLAT_CMD_OFF_MASK))
 
 /*--- Aux register masks/tests ----------------------*/
 /* Some of the upper bits of the AUX offset register are used to */
 
 /* Make AUX register offset and page values from a flat address */
 #define                HFA384x_AUX_MKOFF(f, c) \
-       (HFA384x_ADDR_AUX_MKOFF(f) | (((UINT16)(c))<<12))
+       (HFA384x_ADDR_AUX_MKOFF(f) | (((u16)(c))<<12))
 #define                HFA384x_AUX_MKPAGE(f)   HFA384x_ADDR_AUX_MKPAGE(f)
 
 
 #define                HFA384x_OFFSET1_OFF             (0x3c)
 #define                HFA384x_DATA1_OFF               (0x70)
 #define                HFA384x_EVSTAT_OFF              (0x60)
-#define                HFA384x_INTEN_OFF               (0x64)
+#define                HFA384x_intEN_OFF               (0x64)
 #define                HFA384x_EVACK_OFF               (0x68)
 #define                HFA384x_CONTROL_OFF             (0x28)
 #define                HFA384x_SWSUPPORT0_OFF          (0x50)
 #define                HFA384x_PCI_M1_CTL_OFF          (0xac)
 
 /*--- Register Field Masks --------------------------*/
-#define                HFA384x_CMD_BUSY                ((UINT16)BIT15)
-#define                HFA384x_CMD_AINFO               ((UINT16)(BIT14 | BIT13 | BIT12 | BIT11 | BIT10 | BIT9 | BIT8))
-#define                HFA384x_CMD_MACPORT             ((UINT16)(BIT10 | BIT9 | BIT8))
-#define                HFA384x_CMD_RECL                ((UINT16)BIT8)
-#define                HFA384x_CMD_WRITE               ((UINT16)BIT8)
-#define                HFA384x_CMD_PROGMODE            ((UINT16)(BIT9 | BIT8))
-#define                HFA384x_CMD_CMDCODE             ((UINT16)(BIT5 | BIT4 | BIT3 | BIT2 | BIT1 | BIT0))
-
-#define                HFA384x_STATUS_RESULT           ((UINT16)(BIT14 | BIT13 | BIT12 | BIT11 | BIT10 | BIT9 | BIT8))
-#define                HFA384x_STATUS_CMDCODE          ((UINT16)(BIT5 | BIT4 | BIT3 | BIT2 | BIT1 | BIT0))
-
-#define                HFA384x_OFFSET_BUSY             ((UINT16)BIT15)
-#define                HFA384x_OFFSET_ERR              ((UINT16)BIT14)
-#define                HFA384x_OFFSET_DATAOFF          ((UINT16)(BIT11 | BIT10 | BIT9 | BIT8 | BIT7 | BIT6 | BIT5 | BIT4 | BIT3 | BIT2 | BIT1))
-
-#define                HFA384x_EVSTAT_TICK             ((UINT16)BIT15)
-#define                HFA384x_EVSTAT_WTERR            ((UINT16)BIT14)
-#define                HFA384x_EVSTAT_INFDROP          ((UINT16)BIT13)
-#define                HFA384x_EVSTAT_INFO             ((UINT16)BIT7)
-#define                HFA384x_EVSTAT_DTIM             ((UINT16)BIT5)
-#define                HFA384x_EVSTAT_CMD              ((UINT16)BIT4)
-#define                HFA384x_EVSTAT_ALLOC            ((UINT16)BIT3)
-#define                HFA384x_EVSTAT_TXEXC            ((UINT16)BIT2)
-#define                HFA384x_EVSTAT_TX               ((UINT16)BIT1)
-#define                HFA384x_EVSTAT_RX               ((UINT16)BIT0)
-
-#define         HFA384x_INT_BAP_OP           (HFA384x_EVSTAT_INFO|HFA384x_EVSTAT_RX|HFA384x_EVSTAT_TX|HFA384x_EVSTAT_TXEXC)
-
-#define         HFA384x_INT_NORMAL           (HFA384x_EVSTAT_INFO|HFA384x_EVSTAT_RX|HFA384x_EVSTAT_TX|HFA384x_EVSTAT_TXEXC|HFA384x_EVSTAT_INFDROP|HFA384x_EVSTAT_ALLOC|HFA384x_EVSTAT_DTIM)
-
-#define                HFA384x_INTEN_TICK              ((UINT16)BIT15)
-#define                HFA384x_INTEN_WTERR             ((UINT16)BIT14)
-#define                HFA384x_INTEN_INFDROP           ((UINT16)BIT13)
-#define                HFA384x_INTEN_INFO              ((UINT16)BIT7)
-#define                HFA384x_INTEN_DTIM              ((UINT16)BIT5)
-#define                HFA384x_INTEN_CMD               ((UINT16)BIT4)
-#define                HFA384x_INTEN_ALLOC             ((UINT16)BIT3)
-#define                HFA384x_INTEN_TXEXC             ((UINT16)BIT2)
-#define                HFA384x_INTEN_TX                ((UINT16)BIT1)
-#define                HFA384x_INTEN_RX                ((UINT16)BIT0)
-
-#define                HFA384x_EVACK_TICK              ((UINT16)BIT15)
-#define                HFA384x_EVACK_WTERR             ((UINT16)BIT14)
-#define                HFA384x_EVACK_INFDROP           ((UINT16)BIT13)
-#define                HFA384x_EVACK_INFO              ((UINT16)BIT7)
-#define                HFA384x_EVACK_DTIM              ((UINT16)BIT5)
-#define                HFA384x_EVACK_CMD               ((UINT16)BIT4)
-#define                HFA384x_EVACK_ALLOC             ((UINT16)BIT3)
-#define                HFA384x_EVACK_TXEXC             ((UINT16)BIT2)
-#define                HFA384x_EVACK_TX                ((UINT16)BIT1)
-#define                HFA384x_EVACK_RX                ((UINT16)BIT0)
-
-#define                HFA384x_CONTROL_AUXEN           ((UINT16)(BIT15 | BIT14))
+#define                HFA384x_CMD_BUSY                ((u16)BIT15)
+#define                HFA384x_CMD_AINFO               ((u16)(BIT14 | BIT13 | BIT12 | BIT11 | BIT10 | BIT9 | BIT8))
+#define                HFA384x_CMD_MACPORT             ((u16)(BIT10 | BIT9 | BIT8))
+#define                HFA384x_CMD_RECL                ((u16)BIT8)
+#define                HFA384x_CMD_WRITE               ((u16)BIT8)
+#define                HFA384x_CMD_PROGMODE            ((u16)(BIT9 | BIT8))
+#define                HFA384x_CMD_CMDCODE             ((u16)(BIT5 | BIT4 | BIT3 | BIT2 | BIT1 | BIT0))
+
+#define                HFA384x_STATUS_RESULT           ((u16)(BIT14 | BIT13 | BIT12 | BIT11 | BIT10 | BIT9 | BIT8))
+#define                HFA384x_STATUS_CMDCODE          ((u16)(BIT5 | BIT4 | BIT3 | BIT2 | BIT1 | BIT0))
+
+#define                HFA384x_OFFSET_BUSY             ((u16)BIT15)
+#define                HFA384x_OFFSET_ERR              ((u16)BIT14)
+#define                HFA384x_OFFSET_DATAOFF          ((u16)(BIT11 | BIT10 | BIT9 | BIT8 | BIT7 | BIT6 | BIT5 | BIT4 | BIT3 | BIT2 | BIT1))
+
+#define                HFA384x_EVSTAT_TICK             ((u16)BIT15)
+#define                HFA384x_EVSTAT_WTERR            ((u16)BIT14)
+#define                HFA384x_EVSTAT_INFDROP          ((u16)BIT13)
+#define                HFA384x_EVSTAT_INFO             ((u16)BIT7)
+#define                HFA384x_EVSTAT_DTIM             ((u16)BIT5)
+#define                HFA384x_EVSTAT_CMD              ((u16)BIT4)
+#define                HFA384x_EVSTAT_ALLOC            ((u16)BIT3)
+#define                HFA384x_EVSTAT_TXEXC            ((u16)BIT2)
+#define                HFA384x_EVSTAT_TX               ((u16)BIT1)
+#define                HFA384x_EVSTAT_RX               ((u16)BIT0)
+
+#define         HFA384x_int_BAP_OP           (HFA384x_EVSTAT_INFO|HFA384x_EVSTAT_RX|HFA384x_EVSTAT_TX|HFA384x_EVSTAT_TXEXC)
+
+#define         HFA384x_int_NORMAL           (HFA384x_EVSTAT_INFO|HFA384x_EVSTAT_RX|HFA384x_EVSTAT_TX|HFA384x_EVSTAT_TXEXC|HFA384x_EVSTAT_INFDROP|HFA384x_EVSTAT_ALLOC|HFA384x_EVSTAT_DTIM)
+
+#define                HFA384x_intEN_TICK              ((u16)BIT15)
+#define                HFA384x_intEN_WTERR             ((u16)BIT14)
+#define                HFA384x_intEN_INFDROP           ((u16)BIT13)
+#define                HFA384x_intEN_INFO              ((u16)BIT7)
+#define                HFA384x_intEN_DTIM              ((u16)BIT5)
+#define                HFA384x_intEN_CMD               ((u16)BIT4)
+#define                HFA384x_intEN_ALLOC             ((u16)BIT3)
+#define                HFA384x_intEN_TXEXC             ((u16)BIT2)
+#define                HFA384x_intEN_TX                ((u16)BIT1)
+#define                HFA384x_intEN_RX                ((u16)BIT0)
+
+#define                HFA384x_EVACK_TICK              ((u16)BIT15)
+#define                HFA384x_EVACK_WTERR             ((u16)BIT14)
+#define                HFA384x_EVACK_INFDROP           ((u16)BIT13)
+#define                HFA384x_EVACK_INFO              ((u16)BIT7)
+#define                HFA384x_EVACK_DTIM              ((u16)BIT5)
+#define                HFA384x_EVACK_CMD               ((u16)BIT4)
+#define                HFA384x_EVACK_ALLOC             ((u16)BIT3)
+#define                HFA384x_EVACK_TXEXC             ((u16)BIT2)
+#define                HFA384x_EVACK_TX                ((u16)BIT1)
+#define                HFA384x_EVACK_RX                ((u16)BIT0)
+
+#define                HFA384x_CONTROL_AUXEN           ((u16)(BIT15 | BIT14))
 
 
 /*--- Command Code Constants --------------------------*/
 /*--- Controller Commands --------------------------*/
-#define                HFA384x_CMDCODE_INIT            ((UINT16)0x00)
-#define                HFA384x_CMDCODE_ENABLE          ((UINT16)0x01)
-#define                HFA384x_CMDCODE_DISABLE         ((UINT16)0x02)
-#define                HFA384x_CMDCODE_DIAG            ((UINT16)0x03)
+#define                HFA384x_CMDCODE_INIT            ((u16)0x00)
+#define                HFA384x_CMDCODE_ENABLE          ((u16)0x01)
+#define                HFA384x_CMDCODE_DISABLE         ((u16)0x02)
+#define                HFA384x_CMDCODE_DIAG            ((u16)0x03)
 
 /*--- Buffer Mgmt Commands --------------------------*/
-#define                HFA384x_CMDCODE_ALLOC           ((UINT16)0x0A)
-#define                HFA384x_CMDCODE_TX              ((UINT16)0x0B)
-#define                HFA384x_CMDCODE_CLRPRST         ((UINT16)0x12)
+#define                HFA384x_CMDCODE_ALLOC           ((u16)0x0A)
+#define                HFA384x_CMDCODE_TX              ((u16)0x0B)
+#define                HFA384x_CMDCODE_CLRPRST         ((u16)0x12)
 
 /*--- Regulate Commands --------------------------*/
-#define                HFA384x_CMDCODE_NOTIFY          ((UINT16)0x10)
-#define                HFA384x_CMDCODE_INQ             ((UINT16)0x11)
+#define                HFA384x_CMDCODE_NOTIFY          ((u16)0x10)
+#define                HFA384x_CMDCODE_INQ             ((u16)0x11)
 
 /*--- Configure Commands --------------------------*/
-#define                HFA384x_CMDCODE_ACCESS          ((UINT16)0x21)
-#define                HFA384x_CMDCODE_DOWNLD          ((UINT16)0x22)
+#define                HFA384x_CMDCODE_ACCESS          ((u16)0x21)
+#define                HFA384x_CMDCODE_DOWNLD          ((u16)0x22)
 
 /*--- Debugging Commands -----------------------------*/
-#define        HFA384x_CMDCODE_MONITOR         ((UINT16)(0x38))
-#define                HFA384x_MONITOR_ENABLE          ((UINT16)(0x0b))
-#define                HFA384x_MONITOR_DISABLE         ((UINT16)(0x0f))
+#define        HFA384x_CMDCODE_MONITOR         ((u16)(0x38))
+#define                HFA384x_MONITOR_ENABLE          ((u16)(0x0b))
+#define                HFA384x_MONITOR_DISABLE         ((u16)(0x0f))
 
 /*--- Result Codes --------------------------*/
-#define                HFA384x_SUCCESS                 ((UINT16)(0x00))
-#define                HFA384x_CARD_FAIL               ((UINT16)(0x01))
-#define                HFA384x_NO_BUFF                 ((UINT16)(0x05))
-#define                HFA384x_CMD_ERR                 ((UINT16)(0x7F))
+#define                HFA384x_SUCCESS                 ((u16)(0x00))
+#define                HFA384x_CARD_FAIL               ((u16)(0x01))
+#define                HFA384x_NO_BUFF                 ((u16)(0x05))
+#define                HFA384x_CMD_ERR                 ((u16)(0x7F))
 
 /*--- Programming Modes --------------------------
        MODE 0: Disable programming
        MODE 2: Enable non-volatile memory programming
        MODE 3: Program non-volatile memory section
 --------------------------------------------------*/
-#define                HFA384x_PROGMODE_DISABLE        ((UINT16)0x00)
-#define                HFA384x_PROGMODE_RAM            ((UINT16)0x01)
-#define                HFA384x_PROGMODE_NV             ((UINT16)0x02)
-#define                HFA384x_PROGMODE_NVWRITE        ((UINT16)0x03)
+#define                HFA384x_PROGMODE_DISABLE        ((u16)0x00)
+#define                HFA384x_PROGMODE_RAM            ((u16)0x01)
+#define                HFA384x_PROGMODE_NV             ((u16)0x02)
+#define                HFA384x_PROGMODE_NVWRITE        ((u16)0x03)
 
 /*--- AUX register enable --------------------------*/
-#define                HFA384x_AUXPW0                  ((UINT16)0xfe01)
-#define                HFA384x_AUXPW1                  ((UINT16)0xdc23)
-#define                HFA384x_AUXPW2                  ((UINT16)0xba45)
+#define                HFA384x_AUXPW0                  ((u16)0xfe01)
+#define                HFA384x_AUXPW1                  ((u16)0xdc23)
+#define                HFA384x_AUXPW2                  ((u16)0xba45)
 
-#define                HFA384x_CONTROL_AUX_ISDISABLED  ((UINT16)0x0000)
-#define                HFA384x_CONTROL_AUX_ISENABLED   ((UINT16)0xc000)
-#define                HFA384x_CONTROL_AUX_DOENABLE    ((UINT16)0x8000)
-#define                HFA384x_CONTROL_AUX_DODISABLE   ((UINT16)0x4000)
+#define                HFA384x_CONTROL_AUX_ISDISABLED  ((u16)0x0000)
+#define                HFA384x_CONTROL_AUX_ISENABLED   ((u16)0xc000)
+#define                HFA384x_CONTROL_AUX_DOENABLE    ((u16)0x8000)
+#define                HFA384x_CONTROL_AUX_DODISABLE   ((u16)0x4000)
 
 /*--- Record ID Constants --------------------------*/
 /*--------------------------------------------------------------------
 Configuration RIDs: Network Parameters, Static Configuration Entities
 --------------------------------------------------------------------*/
-#define                HFA384x_RID_CNFPORTTYPE         ((UINT16)0xFC00)
-#define                HFA384x_RID_CNFOWNMACADDR       ((UINT16)0xFC01)
-#define                HFA384x_RID_CNFDESIREDSSID      ((UINT16)0xFC02)
-#define                HFA384x_RID_CNFOWNCHANNEL       ((UINT16)0xFC03)
-#define                HFA384x_RID_CNFOWNSSID          ((UINT16)0xFC04)
-#define                HFA384x_RID_CNFOWNATIMWIN       ((UINT16)0xFC05)
-#define                HFA384x_RID_CNFSYSSCALE         ((UINT16)0xFC06)
-#define                HFA384x_RID_CNFMAXDATALEN       ((UINT16)0xFC07)
-#define                HFA384x_RID_CNFWDSADDR          ((UINT16)0xFC08)
-#define                HFA384x_RID_CNFPMENABLED        ((UINT16)0xFC09)
-#define                HFA384x_RID_CNFPMEPS            ((UINT16)0xFC0A)
-#define                HFA384x_RID_CNFMULTICASTRX      ((UINT16)0xFC0B)
-#define                HFA384x_RID_CNFMAXSLEEPDUR      ((UINT16)0xFC0C)
-#define                HFA384x_RID_CNFPMHOLDDUR        ((UINT16)0xFC0D)
-#define                HFA384x_RID_CNFOWNNAME          ((UINT16)0xFC0E)
-#define                HFA384x_RID_CNFOWNDTIMPER       ((UINT16)0xFC10)
-#define                HFA384x_RID_CNFWDSADDR1         ((UINT16)0xFC11)
-#define                HFA384x_RID_CNFWDSADDR2         ((UINT16)0xFC12)
-#define                HFA384x_RID_CNFWDSADDR3         ((UINT16)0xFC13)
-#define                HFA384x_RID_CNFWDSADDR4         ((UINT16)0xFC14)
-#define                HFA384x_RID_CNFWDSADDR5         ((UINT16)0xFC15)
-#define                HFA384x_RID_CNFWDSADDR6         ((UINT16)0xFC16)
-#define                HFA384x_RID_CNFMCASTPMBUFF      ((UINT16)0xFC17)
+#define                HFA384x_RID_CNFPORTTYPE         ((u16)0xFC00)
+#define                HFA384x_RID_CNFOWNMACADDR       ((u16)0xFC01)
+#define                HFA384x_RID_CNFDESIREDSSID      ((u16)0xFC02)
+#define                HFA384x_RID_CNFOWNCHANNEL       ((u16)0xFC03)
+#define                HFA384x_RID_CNFOWNSSID          ((u16)0xFC04)
+#define                HFA384x_RID_CNFOWNATIMWIN       ((u16)0xFC05)
+#define                HFA384x_RID_CNFSYSSCALE         ((u16)0xFC06)
+#define                HFA384x_RID_CNFMAXDATALEN       ((u16)0xFC07)
+#define                HFA384x_RID_CNFWDSADDR          ((u16)0xFC08)
+#define                HFA384x_RID_CNFPMENABLED        ((u16)0xFC09)
+#define                HFA384x_RID_CNFPMEPS            ((u16)0xFC0A)
+#define                HFA384x_RID_CNFMULTICASTRX      ((u16)0xFC0B)
+#define                HFA384x_RID_CNFMAXSLEEPDUR      ((u16)0xFC0C)
+#define                HFA384x_RID_CNFPMHOLDDUR        ((u16)0xFC0D)
+#define                HFA384x_RID_CNFOWNNAME          ((u16)0xFC0E)
+#define                HFA384x_RID_CNFOWNDTIMPER       ((u16)0xFC10)
+#define                HFA384x_RID_CNFWDSADDR1         ((u16)0xFC11)
+#define                HFA384x_RID_CNFWDSADDR2         ((u16)0xFC12)
+#define                HFA384x_RID_CNFWDSADDR3         ((u16)0xFC13)
+#define                HFA384x_RID_CNFWDSADDR4         ((u16)0xFC14)
+#define                HFA384x_RID_CNFWDSADDR5         ((u16)0xFC15)
+#define                HFA384x_RID_CNFWDSADDR6         ((u16)0xFC16)
+#define                HFA384x_RID_CNFMCASTPMBUFF      ((u16)0xFC17)
 
 /*--------------------------------------------------------------------
 Configuration RID lengths: Network Params, Static Config Entities
@@ -387,62 +387,62 @@ Configuration RID lengths: Network Params, Static Config Entities
   include the len or code fields)
 --------------------------------------------------------------------*/
 /* TODO: fill in the rest of these */
-#define                HFA384x_RID_CNFPORTTYPE_LEN     ((UINT16)2)
-#define                HFA384x_RID_CNFOWNMACADDR_LEN   ((UINT16)6)
-#define                HFA384x_RID_CNFDESIREDSSID_LEN  ((UINT16)34)
-#define                HFA384x_RID_CNFOWNCHANNEL_LEN   ((UINT16)2)
-#define                HFA384x_RID_CNFOWNSSID_LEN      ((UINT16)34)
-#define                HFA384x_RID_CNFOWNATIMWIN_LEN   ((UINT16)2)
-#define                HFA384x_RID_CNFSYSSCALE_LEN     ((UINT16)0)
-#define                HFA384x_RID_CNFMAXDATALEN_LEN   ((UINT16)0)
-#define                HFA384x_RID_CNFWDSADDR_LEN      ((UINT16)6)
-#define                HFA384x_RID_CNFPMENABLED_LEN    ((UINT16)0)
-#define                HFA384x_RID_CNFPMEPS_LEN        ((UINT16)0)
-#define                HFA384x_RID_CNFMULTICASTRX_LEN  ((UINT16)0)
-#define                HFA384x_RID_CNFMAXSLEEPDUR_LEN  ((UINT16)0)
-#define                HFA384x_RID_CNFPMHOLDDUR_LEN    ((UINT16)0)
-#define                HFA384x_RID_CNFOWNNAME_LEN      ((UINT16)34)
-#define                HFA384x_RID_CNFOWNDTIMPER_LEN   ((UINT16)0)
-#define                HFA384x_RID_CNFWDSADDR1_LEN     ((UINT16)6)
-#define                HFA384x_RID_CNFWDSADDR2_LEN     ((UINT16)6)
-#define                HFA384x_RID_CNFWDSADDR3_LEN     ((UINT16)6)
-#define                HFA384x_RID_CNFWDSADDR4_LEN     ((UINT16)6)
-#define                HFA384x_RID_CNFWDSADDR5_LEN     ((UINT16)6)
-#define                HFA384x_RID_CNFWDSADDR6_LEN     ((UINT16)6)
-#define                HFA384x_RID_CNFMCASTPMBUFF_LEN  ((UINT16)0)
-#define                HFA384x_RID_CNFAUTHENTICATION_LEN ((UINT16)sizeof(UINT16))
-#define                HFA384x_RID_CNFMAXSLEEPDUR_LEN  ((UINT16)0)
+#define                HFA384x_RID_CNFPORTTYPE_LEN     ((u16)2)
+#define                HFA384x_RID_CNFOWNMACADDR_LEN   ((u16)6)
+#define                HFA384x_RID_CNFDESIREDSSID_LEN  ((u16)34)
+#define                HFA384x_RID_CNFOWNCHANNEL_LEN   ((u16)2)
+#define                HFA384x_RID_CNFOWNSSID_LEN      ((u16)34)
+#define                HFA384x_RID_CNFOWNATIMWIN_LEN   ((u16)2)
+#define                HFA384x_RID_CNFSYSSCALE_LEN     ((u16)0)
+#define                HFA384x_RID_CNFMAXDATALEN_LEN   ((u16)0)
+#define                HFA384x_RID_CNFWDSADDR_LEN      ((u16)6)
+#define                HFA384x_RID_CNFPMENABLED_LEN    ((u16)0)
+#define                HFA384x_RID_CNFPMEPS_LEN        ((u16)0)
+#define                HFA384x_RID_CNFMULTICASTRX_LEN  ((u16)0)
+#define                HFA384x_RID_CNFMAXSLEEPDUR_LEN  ((u16)0)
+#define                HFA384x_RID_CNFPMHOLDDUR_LEN    ((u16)0)
+#define                HFA384x_RID_CNFOWNNAME_LEN      ((u16)34)
+#define                HFA384x_RID_CNFOWNDTIMPER_LEN   ((u16)0)
+#define                HFA384x_RID_CNFWDSADDR1_LEN     ((u16)6)
+#define                HFA384x_RID_CNFWDSADDR2_LEN     ((u16)6)
+#define                HFA384x_RID_CNFWDSADDR3_LEN     ((u16)6)
+#define                HFA384x_RID_CNFWDSADDR4_LEN     ((u16)6)
+#define                HFA384x_RID_CNFWDSADDR5_LEN     ((u16)6)
+#define                HFA384x_RID_CNFWDSADDR6_LEN     ((u16)6)
+#define                HFA384x_RID_CNFMCASTPMBUFF_LEN  ((u16)0)
+#define                HFA384x_RID_CNFAUTHENTICATION_LEN ((u16)sizeof(u16))
+#define                HFA384x_RID_CNFMAXSLEEPDUR_LEN  ((u16)0)
 
 /*--------------------------------------------------------------------
 Configuration RIDs: Network Parameters, Dynamic Configuration Entities
 --------------------------------------------------------------------*/
-#define                HFA384x_RID_GROUPADDR           ((UINT16)0xFC80)
-#define                HFA384x_RID_CREATEIBSS          ((UINT16)0xFC81)
-#define                HFA384x_RID_FRAGTHRESH          ((UINT16)0xFC82)
-#define                HFA384x_RID_RTSTHRESH           ((UINT16)0xFC83)
-#define                HFA384x_RID_TXRATECNTL          ((UINT16)0xFC84)
-#define                HFA384x_RID_PROMISCMODE         ((UINT16)0xFC85)
-#define                HFA384x_RID_FRAGTHRESH0         ((UINT16)0xFC90)
-#define                HFA384x_RID_FRAGTHRESH1         ((UINT16)0xFC91)
-#define                HFA384x_RID_FRAGTHRESH2         ((UINT16)0xFC92)
-#define                HFA384x_RID_FRAGTHRESH3         ((UINT16)0xFC93)
-#define                HFA384x_RID_FRAGTHRESH4         ((UINT16)0xFC94)
-#define                HFA384x_RID_FRAGTHRESH5         ((UINT16)0xFC95)
-#define                HFA384x_RID_FRAGTHRESH6         ((UINT16)0xFC96)
-#define                HFA384x_RID_RTSTHRESH0          ((UINT16)0xFC97)
-#define                HFA384x_RID_RTSTHRESH1          ((UINT16)0xFC98)
-#define                HFA384x_RID_RTSTHRESH2          ((UINT16)0xFC99)
-#define                HFA384x_RID_RTSTHRESH3          ((UINT16)0xFC9A)
-#define                HFA384x_RID_RTSTHRESH4          ((UINT16)0xFC9B)
-#define                HFA384x_RID_RTSTHRESH5          ((UINT16)0xFC9C)
-#define                HFA384x_RID_RTSTHRESH6          ((UINT16)0xFC9D)
-#define                HFA384x_RID_TXRATECNTL0         ((UINT16)0xFC9E)
-#define                HFA384x_RID_TXRATECNTL1         ((UINT16)0xFC9F)
-#define                HFA384x_RID_TXRATECNTL2         ((UINT16)0xFCA0)
-#define                HFA384x_RID_TXRATECNTL3         ((UINT16)0xFCA1)
-#define                HFA384x_RID_TXRATECNTL4         ((UINT16)0xFCA2)
-#define                HFA384x_RID_TXRATECNTL5         ((UINT16)0xFCA3)
-#define                HFA384x_RID_TXRATECNTL6         ((UINT16)0xFCA4)
+#define                HFA384x_RID_GROUPADDR           ((u16)0xFC80)
+#define                HFA384x_RID_CREATEIBSS          ((u16)0xFC81)
+#define                HFA384x_RID_FRAGTHRESH          ((u16)0xFC82)
+#define                HFA384x_RID_RTSTHRESH           ((u16)0xFC83)
+#define                HFA384x_RID_TXRATECNTL          ((u16)0xFC84)
+#define                HFA384x_RID_PROMISCMODE         ((u16)0xFC85)
+#define                HFA384x_RID_FRAGTHRESH0         ((u16)0xFC90)
+#define                HFA384x_RID_FRAGTHRESH1         ((u16)0xFC91)
+#define                HFA384x_RID_FRAGTHRESH2         ((u16)0xFC92)
+#define                HFA384x_RID_FRAGTHRESH3         ((u16)0xFC93)
+#define                HFA384x_RID_FRAGTHRESH4         ((u16)0xFC94)
+#define                HFA384x_RID_FRAGTHRESH5         ((u16)0xFC95)
+#define                HFA384x_RID_FRAGTHRESH6         ((u16)0xFC96)
+#define                HFA384x_RID_RTSTHRESH0          ((u16)0xFC97)
+#define                HFA384x_RID_RTSTHRESH1          ((u16)0xFC98)
+#define                HFA384x_RID_RTSTHRESH2          ((u16)0xFC99)
+#define                HFA384x_RID_RTSTHRESH3          ((u16)0xFC9A)
+#define                HFA384x_RID_RTSTHRESH4          ((u16)0xFC9B)
+#define                HFA384x_RID_RTSTHRESH5          ((u16)0xFC9C)
+#define                HFA384x_RID_RTSTHRESH6          ((u16)0xFC9D)
+#define                HFA384x_RID_TXRATECNTL0         ((u16)0xFC9E)
+#define                HFA384x_RID_TXRATECNTL1         ((u16)0xFC9F)
+#define                HFA384x_RID_TXRATECNTL2         ((u16)0xFCA0)
+#define                HFA384x_RID_TXRATECNTL3         ((u16)0xFCA1)
+#define                HFA384x_RID_TXRATECNTL4         ((u16)0xFCA2)
+#define                HFA384x_RID_TXRATECNTL5         ((u16)0xFCA3)
+#define                HFA384x_RID_TXRATECNTL6         ((u16)0xFCA4)
 
 /*--------------------------------------------------------------------
 Configuration RID Lengths: Network Param, Dynamic Config Entities
@@ -450,296 +450,296 @@ Configuration RID Lengths: Network Param, Dynamic Config Entities
   include the len or code fields)
 --------------------------------------------------------------------*/
 /* TODO: fill in the rest of these */
-#define                HFA384x_RID_GROUPADDR_LEN       ((UINT16)16 * WLAN_ADDR_LEN)
-#define                HFA384x_RID_CREATEIBSS_LEN      ((UINT16)0)
-#define                HFA384x_RID_FRAGTHRESH_LEN      ((UINT16)0)
-#define                HFA384x_RID_RTSTHRESH_LEN       ((UINT16)0)
-#define                HFA384x_RID_TXRATECNTL_LEN      ((UINT16)4)
-#define                HFA384x_RID_PROMISCMODE_LEN     ((UINT16)2)
-#define                HFA384x_RID_FRAGTHRESH0_LEN     ((UINT16)0)
-#define                HFA384x_RID_FRAGTHRESH1_LEN     ((UINT16)0)
-#define                HFA384x_RID_FRAGTHRESH2_LEN     ((UINT16)0)
-#define                HFA384x_RID_FRAGTHRESH3_LEN     ((UINT16)0)
-#define                HFA384x_RID_FRAGTHRESH4_LEN     ((UINT16)0)
-#define                HFA384x_RID_FRAGTHRESH5_LEN     ((UINT16)0)
-#define                HFA384x_RID_FRAGTHRESH6_LEN     ((UINT16)0)
-#define                HFA384x_RID_RTSTHRESH0_LEN      ((UINT16)0)
-#define                HFA384x_RID_RTSTHRESH1_LEN      ((UINT16)0)
-#define                HFA384x_RID_RTSTHRESH2_LEN      ((UINT16)0)
-#define                HFA384x_RID_RTSTHRESH3_LEN      ((UINT16)0)
-#define                HFA384x_RID_RTSTHRESH4_LEN      ((UINT16)0)
-#define                HFA384x_RID_RTSTHRESH5_LEN      ((UINT16)0)
-#define                HFA384x_RID_RTSTHRESH6_LEN      ((UINT16)0)
-#define                HFA384x_RID_TXRATECNTL0_LEN     ((UINT16)0)
-#define                HFA384x_RID_TXRATECNTL1_LEN     ((UINT16)0)
-#define                HFA384x_RID_TXRATECNTL2_LEN     ((UINT16)0)
-#define                HFA384x_RID_TXRATECNTL3_LEN     ((UINT16)0)
-#define                HFA384x_RID_TXRATECNTL4_LEN     ((UINT16)0)
-#define                HFA384x_RID_TXRATECNTL5_LEN     ((UINT16)0)
-#define                HFA384x_RID_TXRATECNTL6_LEN     ((UINT16)0)
+#define                HFA384x_RID_GROUPADDR_LEN       ((u16)16 * WLAN_ADDR_LEN)
+#define                HFA384x_RID_CREATEIBSS_LEN      ((u16)0)
+#define                HFA384x_RID_FRAGTHRESH_LEN      ((u16)0)
+#define                HFA384x_RID_RTSTHRESH_LEN       ((u16)0)
+#define                HFA384x_RID_TXRATECNTL_LEN      ((u16)4)
+#define                HFA384x_RID_PROMISCMODE_LEN     ((u16)2)
+#define                HFA384x_RID_FRAGTHRESH0_LEN     ((u16)0)
+#define                HFA384x_RID_FRAGTHRESH1_LEN     ((u16)0)
+#define                HFA384x_RID_FRAGTHRESH2_LEN     ((u16)0)
+#define                HFA384x_RID_FRAGTHRESH3_LEN     ((u16)0)
+#define                HFA384x_RID_FRAGTHRESH4_LEN     ((u16)0)
+#define                HFA384x_RID_FRAGTHRESH5_LEN     ((u16)0)
+#define                HFA384x_RID_FRAGTHRESH6_LEN     ((u16)0)
+#define                HFA384x_RID_RTSTHRESH0_LEN      ((u16)0)
+#define                HFA384x_RID_RTSTHRESH1_LEN      ((u16)0)
+#define                HFA384x_RID_RTSTHRESH2_LEN      ((u16)0)
+#define                HFA384x_RID_RTSTHRESH3_LEN      ((u16)0)
+#define                HFA384x_RID_RTSTHRESH4_LEN      ((u16)0)
+#define                HFA384x_RID_RTSTHRESH5_LEN      ((u16)0)
+#define                HFA384x_RID_RTSTHRESH6_LEN      ((u16)0)
+#define                HFA384x_RID_TXRATECNTL0_LEN     ((u16)0)
+#define                HFA384x_RID_TXRATECNTL1_LEN     ((u16)0)
+#define                HFA384x_RID_TXRATECNTL2_LEN     ((u16)0)
+#define                HFA384x_RID_TXRATECNTL3_LEN     ((u16)0)
+#define                HFA384x_RID_TXRATECNTL4_LEN     ((u16)0)
+#define                HFA384x_RID_TXRATECNTL5_LEN     ((u16)0)
+#define                HFA384x_RID_TXRATECNTL6_LEN     ((u16)0)
 
 /*--------------------------------------------------------------------
 Configuration RIDs: Behavior Parameters
 --------------------------------------------------------------------*/
-#define                HFA384x_RID_ITICKTIME           ((UINT16)0xFCE0)
+#define                HFA384x_RID_ITICKTIME           ((u16)0xFCE0)
 
 /*--------------------------------------------------------------------
 Configuration RID Lengths: Behavior Parameters
   This is the length of JUST the DATA part of the RID (does not
   include the len or code fields)
 --------------------------------------------------------------------*/
-#define                HFA384x_RID_ITICKTIME_LEN       ((UINT16)2)
+#define                HFA384x_RID_ITICKTIME_LEN       ((u16)2)
 
 /*----------------------------------------------------------------------
 Information RIDs: NIC Information
 --------------------------------------------------------------------*/
-#define                HFA384x_RID_MAXLOADTIME         ((UINT16)0xFD00)
-#define                HFA384x_RID_DOWNLOADBUFFER      ((UINT16)0xFD01)
-#define                HFA384x_RID_PRIIDENTITY         ((UINT16)0xFD02)
-#define                HFA384x_RID_PRISUPRANGE         ((UINT16)0xFD03)
-#define                HFA384x_RID_PRI_CFIACTRANGES    ((UINT16)0xFD04)
-#define                HFA384x_RID_NICSERIALNUMBER     ((UINT16)0xFD0A)
-#define                HFA384x_RID_NICIDENTITY         ((UINT16)0xFD0B)
-#define                HFA384x_RID_MFISUPRANGE         ((UINT16)0xFD0C)
-#define                HFA384x_RID_CFISUPRANGE         ((UINT16)0xFD0D)
-#define                HFA384x_RID_CHANNELLIST         ((UINT16)0xFD10)
-#define                HFA384x_RID_REGULATORYDOMAINS   ((UINT16)0xFD11)
-#define                HFA384x_RID_TEMPTYPE            ((UINT16)0xFD12)
-#define                HFA384x_RID_CIS                 ((UINT16)0xFD13)
-#define                HFA384x_RID_STAIDENTITY         ((UINT16)0xFD20)
-#define                HFA384x_RID_STASUPRANGE         ((UINT16)0xFD21)
-#define                HFA384x_RID_STA_MFIACTRANGES    ((UINT16)0xFD22)
-#define                HFA384x_RID_STA_CFIACTRANGES    ((UINT16)0xFD23)
-#define                HFA384x_RID_BUILDSEQ            ((UINT16)0xFFFE)
-#define                HFA384x_RID_FWID                ((UINT16)0xFFFF)
+#define                HFA384x_RID_MAXLOADTIME         ((u16)0xFD00)
+#define                HFA384x_RID_DOWNLOADBUFFER      ((u16)0xFD01)
+#define                HFA384x_RID_PRIIDENTITY         ((u16)0xFD02)
+#define                HFA384x_RID_PRISUPRANGE         ((u16)0xFD03)
+#define                HFA384x_RID_PRI_CFIACTRANGES    ((u16)0xFD04)
+#define                HFA384x_RID_NICSERIALNUMBER     ((u16)0xFD0A)
+#define                HFA384x_RID_NICIDENTITY         ((u16)0xFD0B)
+#define                HFA384x_RID_MFISUPRANGE         ((u16)0xFD0C)
+#define                HFA384x_RID_CFISUPRANGE         ((u16)0xFD0D)
+#define                HFA384x_RID_CHANNELLIST         ((u16)0xFD10)
+#define                HFA384x_RID_REGULATORYDOMAINS   ((u16)0xFD11)
+#define                HFA384x_RID_TEMPTYPE            ((u16)0xFD12)
+#define                HFA384x_RID_CIS                 ((u16)0xFD13)
+#define                HFA384x_RID_STAIDENTITY         ((u16)0xFD20)
+#define                HFA384x_RID_STASUPRANGE         ((u16)0xFD21)
+#define                HFA384x_RID_STA_MFIACTRANGES    ((u16)0xFD22)
+#define                HFA384x_RID_STA_CFIACTRANGES    ((u16)0xFD23)
+#define                HFA384x_RID_BUILDSEQ            ((u16)0xFFFE)
+#define                HFA384x_RID_FWID                ((u16)0xFFFF)
 
 /*----------------------------------------------------------------------
 Information RID Lengths: NIC Information
   This is the length of JUST the DATA part of the RID (does not
   include the len or code fields)
 --------------------------------------------------------------------*/
-#define                HFA384x_RID_MAXLOADTIME_LEN             ((UINT16)0)
-#define                HFA384x_RID_DOWNLOADBUFFER_LEN          ((UINT16)sizeof(hfa384x_downloadbuffer_t))
-#define                HFA384x_RID_PRIIDENTITY_LEN             ((UINT16)8)
-#define                HFA384x_RID_PRISUPRANGE_LEN             ((UINT16)10)
-#define                HFA384x_RID_CFIACTRANGES_LEN            ((UINT16)10)
-#define                HFA384x_RID_NICSERIALNUMBER_LEN         ((UINT16)12)
-#define                HFA384x_RID_NICIDENTITY_LEN             ((UINT16)8)
-#define                HFA384x_RID_MFISUPRANGE_LEN             ((UINT16)10)
-#define                HFA384x_RID_CFISUPRANGE_LEN             ((UINT16)10)
-#define                HFA384x_RID_CHANNELLIST_LEN             ((UINT16)0)
-#define                HFA384x_RID_REGULATORYDOMAINS_LEN       ((UINT16)12)
-#define                HFA384x_RID_TEMPTYPE_LEN                ((UINT16)0)
-#define                HFA384x_RID_CIS_LEN                     ((UINT16)480)
-#define                HFA384x_RID_STAIDENTITY_LEN             ((UINT16)8)
-#define                HFA384x_RID_STASUPRANGE_LEN             ((UINT16)10)
-#define                HFA384x_RID_MFIACTRANGES_LEN            ((UINT16)10)
-#define                HFA384x_RID_CFIACTRANGES2_LEN           ((UINT16)10)
-#define                HFA384x_RID_BUILDSEQ_LEN                ((UINT16)sizeof(hfa384x_BuildSeq_t))
-#define                HFA384x_RID_FWID_LEN                    ((UINT16)sizeof(hfa384x_FWID_t))
+#define                HFA384x_RID_MAXLOADTIME_LEN             ((u16)0)
+#define                HFA384x_RID_DOWNLOADBUFFER_LEN          ((u16)sizeof(hfa384x_downloadbuffer_t))
+#define                HFA384x_RID_PRIIDENTITY_LEN             ((u16)8)
+#define                HFA384x_RID_PRISUPRANGE_LEN             ((u16)10)
+#define                HFA384x_RID_CFIACTRANGES_LEN            ((u16)10)
+#define                HFA384x_RID_NICSERIALNUMBER_LEN         ((u16)12)
+#define                HFA384x_RID_NICIDENTITY_LEN             ((u16)8)
+#define                HFA384x_RID_MFISUPRANGE_LEN             ((u16)10)
+#define                HFA384x_RID_CFISUPRANGE_LEN             ((u16)10)
+#define                HFA384x_RID_CHANNELLIST_LEN             ((u16)0)
+#define                HFA384x_RID_REGULATORYDOMAINS_LEN       ((u16)12)
+#define                HFA384x_RID_TEMPTYPE_LEN                ((u16)0)
+#define                HFA384x_RID_CIS_LEN                     ((u16)480)
+#define                HFA384x_RID_STAIDENTITY_LEN             ((u16)8)
+#define                HFA384x_RID_STASUPRANGE_LEN             ((u16)10)
+#define                HFA384x_RID_MFIACTRANGES_LEN            ((u16)10)
+#define                HFA384x_RID_CFIACTRANGES2_LEN           ((u16)10)
+#define                HFA384x_RID_BUILDSEQ_LEN                ((u16)sizeof(hfa384x_BuildSeq_t))
+#define                HFA384x_RID_FWID_LEN                    ((u16)sizeof(hfa384x_FWID_t))
 
 /*--------------------------------------------------------------------
 Information RIDs:  MAC Information
 --------------------------------------------------------------------*/
-#define                HFA384x_RID_PORTSTATUS          ((UINT16)0xFD40)
-#define                HFA384x_RID_CURRENTSSID         ((UINT16)0xFD41)
-#define                HFA384x_RID_CURRENTBSSID        ((UINT16)0xFD42)
-#define                HFA384x_RID_COMMSQUALITY        ((UINT16)0xFD43)
-#define                HFA384x_RID_CURRENTTXRATE       ((UINT16)0xFD44)
-#define                HFA384x_RID_CURRENTBCNINT       ((UINT16)0xFD45)
-#define                HFA384x_RID_CURRENTSCALETHRESH  ((UINT16)0xFD46)
-#define                HFA384x_RID_PROTOCOLRSPTIME     ((UINT16)0xFD47)
-#define                HFA384x_RID_SHORTRETRYLIMIT     ((UINT16)0xFD48)
-#define                HFA384x_RID_LONGRETRYLIMIT      ((UINT16)0xFD49)
-#define                HFA384x_RID_MAXTXLIFETIME       ((UINT16)0xFD4A)
-#define                HFA384x_RID_MAXRXLIFETIME       ((UINT16)0xFD4B)
-#define                HFA384x_RID_CFPOLLABLE          ((UINT16)0xFD4C)
-#define                HFA384x_RID_AUTHALGORITHMS      ((UINT16)0xFD4D)
-#define                HFA384x_RID_PRIVACYOPTIMP       ((UINT16)0xFD4F)
-#define                HFA384x_RID_DBMCOMMSQUALITY     ((UINT16)0xFD51)
-#define                HFA384x_RID_CURRENTTXRATE1      ((UINT16)0xFD80)
-#define                HFA384x_RID_CURRENTTXRATE2      ((UINT16)0xFD81)
-#define                HFA384x_RID_CURRENTTXRATE3      ((UINT16)0xFD82)
-#define                HFA384x_RID_CURRENTTXRATE4      ((UINT16)0xFD83)
-#define                HFA384x_RID_CURRENTTXRATE5      ((UINT16)0xFD84)
-#define                HFA384x_RID_CURRENTTXRATE6      ((UINT16)0xFD85)
-#define                HFA384x_RID_OWNMACADDRESS       ((UINT16)0xFD86)
-// #define     HFA384x_RID_PCFINFO             ((UINT16)0xFD87)
-#define                HFA384x_RID_SCANRESULTS         ((UINT16)0xFD88) // NEW
-#define                HFA384x_RID_HOSTSCANRESULTS     ((UINT16)0xFD89) // NEW
-#define                HFA384x_RID_AUTHENTICATIONUSED  ((UINT16)0xFD8A) // NEW
-#define                HFA384x_RID_ASSOCIATEFAILURE    ((UINT16)0xFD8D) // 1.8.0
+#define                HFA384x_RID_PORTSTATUS          ((u16)0xFD40)
+#define                HFA384x_RID_CURRENTSSID         ((u16)0xFD41)
+#define                HFA384x_RID_CURRENTBSSID        ((u16)0xFD42)
+#define                HFA384x_RID_COMMSQUALITY        ((u16)0xFD43)
+#define                HFA384x_RID_CURRENTTXRATE       ((u16)0xFD44)
+#define                HFA384x_RID_CURRENTBCNint       ((u16)0xFD45)
+#define                HFA384x_RID_CURRENTSCALETHRESH  ((u16)0xFD46)
+#define                HFA384x_RID_PROTOCOLRSPTIME     ((u16)0xFD47)
+#define                HFA384x_RID_SHORTRETRYLIMIT     ((u16)0xFD48)
+#define                HFA384x_RID_LONGRETRYLIMIT      ((u16)0xFD49)
+#define                HFA384x_RID_MAXTXLIFETIME       ((u16)0xFD4A)
+#define                HFA384x_RID_MAXRXLIFETIME       ((u16)0xFD4B)
+#define                HFA384x_RID_CFPOLLABLE          ((u16)0xFD4C)
+#define                HFA384x_RID_AUTHALGORITHMS      ((u16)0xFD4D)
+#define                HFA384x_RID_PRIVACYOPTIMP       ((u16)0xFD4F)
+#define                HFA384x_RID_DBMCOMMSQUALITY     ((u16)0xFD51)
+#define                HFA384x_RID_CURRENTTXRATE1      ((u16)0xFD80)
+#define                HFA384x_RID_CURRENTTXRATE2      ((u16)0xFD81)
+#define                HFA384x_RID_CURRENTTXRATE3      ((u16)0xFD82)
+#define                HFA384x_RID_CURRENTTXRATE4      ((u16)0xFD83)
+#define                HFA384x_RID_CURRENTTXRATE5      ((u16)0xFD84)
+#define                HFA384x_RID_CURRENTTXRATE6      ((u16)0xFD85)
+#define                HFA384x_RID_OWNMACADDRESS       ((u16)0xFD86)
+// #define     HFA384x_RID_PCFINFO             ((u16)0xFD87)
+#define                HFA384x_RID_SCANRESULTS         ((u16)0xFD88) // NEW
+#define                HFA384x_RID_HOSTSCANRESULTS     ((u16)0xFD89) // NEW
+#define                HFA384x_RID_AUTHENTICATIONUSED  ((u16)0xFD8A) // NEW
+#define                HFA384x_RID_ASSOCIATEFAILURE    ((u16)0xFD8D) // 1.8.0
 
 /*--------------------------------------------------------------------
 Information RID Lengths:  MAC Information
   This is the length of JUST the DATA part of the RID (does not
   include the len or code fields)
 --------------------------------------------------------------------*/
-#define                HFA384x_RID_PORTSTATUS_LEN              ((UINT16)0)
-#define                HFA384x_RID_CURRENTSSID_LEN             ((UINT16)34)
-#define                HFA384x_RID_CURRENTBSSID_LEN            ((UINT16)WLAN_BSSID_LEN)
-#define                HFA384x_RID_COMMSQUALITY_LEN            ((UINT16)sizeof(hfa384x_commsquality_t))
-#define                HFA384x_RID_DBMCOMMSQUALITY_LEN         ((UINT16)sizeof(hfa384x_dbmcommsquality_t))
-#define                HFA384x_RID_CURRENTTXRATE_LEN           ((UINT16)0)
-#define                HFA384x_RID_CURRENTBCNINT_LEN           ((UINT16)0)
-#define                HFA384x_RID_STACURSCALETHRESH_LEN       ((UINT16)12)
-#define                HFA384x_RID_APCURSCALETHRESH_LEN        ((UINT16)6)
-#define                HFA384x_RID_PROTOCOLRSPTIME_LEN         ((UINT16)0)
-#define                HFA384x_RID_SHORTRETRYLIMIT_LEN         ((UINT16)0)
-#define                HFA384x_RID_LONGRETRYLIMIT_LEN          ((UINT16)0)
-#define                HFA384x_RID_MAXTXLIFETIME_LEN           ((UINT16)0)
-#define                HFA384x_RID_MAXRXLIFETIME_LEN           ((UINT16)0)
-#define                HFA384x_RID_CFPOLLABLE_LEN              ((UINT16)0)
-#define                HFA384x_RID_AUTHALGORITHMS_LEN          ((UINT16)4)
-#define                HFA384x_RID_PRIVACYOPTIMP_LEN           ((UINT16)0)
-#define                HFA384x_RID_CURRENTTXRATE1_LEN          ((UINT16)0)
-#define                HFA384x_RID_CURRENTTXRATE2_LEN          ((UINT16)0)
-#define                HFA384x_RID_CURRENTTXRATE3_LEN          ((UINT16)0)
-#define                HFA384x_RID_CURRENTTXRATE4_LEN          ((UINT16)0)
-#define                HFA384x_RID_CURRENTTXRATE5_LEN          ((UINT16)0)
-#define                HFA384x_RID_CURRENTTXRATE6_LEN          ((UINT16)0)
-#define                HFA384x_RID_OWNMACADDRESS_LEN           ((UINT16)6)
-#define                HFA384x_RID_PCFINFO_LEN                 ((UINT16)6)
-#define                HFA384x_RID_CNFAPPCFINFO_LEN            ((UINT16)sizeof(hfa384x_PCFInfo_data_t))
-#define                HFA384x_RID_SCANREQUEST_LEN             ((UINT16)sizeof(hfa384x_ScanRequest_data_t))
-#define                HFA384x_RID_JOINREQUEST_LEN             ((UINT16)sizeof(hfa384x_JoinRequest_data_t))
-#define                HFA384x_RID_AUTHENTICATESTA_LEN         ((UINT16)sizeof(hfa384x_authenticateStation_data_t))
-#define                HFA384x_RID_CHANNELINFOREQUEST_LEN      ((UINT16)sizeof(hfa384x_ChannelInfoRequest_data_t))
+#define                HFA384x_RID_PORTSTATUS_LEN              ((u16)0)
+#define                HFA384x_RID_CURRENTSSID_LEN             ((u16)34)
+#define                HFA384x_RID_CURRENTBSSID_LEN            ((u16)WLAN_BSSID_LEN)
+#define                HFA384x_RID_COMMSQUALITY_LEN            ((u16)sizeof(hfa384x_commsquality_t))
+#define                HFA384x_RID_DBMCOMMSQUALITY_LEN         ((u16)sizeof(hfa384x_dbmcommsquality_t))
+#define                HFA384x_RID_CURRENTTXRATE_LEN           ((u16)0)
+#define                HFA384x_RID_CURRENTBCNint_LEN           ((u16)0)
+#define                HFA384x_RID_STACURSCALETHRESH_LEN       ((u16)12)
+#define                HFA384x_RID_APCURSCALETHRESH_LEN        ((u16)6)
+#define                HFA384x_RID_PROTOCOLRSPTIME_LEN         ((u16)0)
+#define                HFA384x_RID_SHORTRETRYLIMIT_LEN         ((u16)0)
+#define                HFA384x_RID_LONGRETRYLIMIT_LEN          ((u16)0)
+#define                HFA384x_RID_MAXTXLIFETIME_LEN           ((u16)0)
+#define                HFA384x_RID_MAXRXLIFETIME_LEN           ((u16)0)
+#define                HFA384x_RID_CFPOLLABLE_LEN              ((u16)0)
+#define                HFA384x_RID_AUTHALGORITHMS_LEN          ((u16)4)
+#define                HFA384x_RID_PRIVACYOPTIMP_LEN           ((u16)0)
+#define                HFA384x_RID_CURRENTTXRATE1_LEN          ((u16)0)
+#define                HFA384x_RID_CURRENTTXRATE2_LEN          ((u16)0)
+#define                HFA384x_RID_CURRENTTXRATE3_LEN          ((u16)0)
+#define                HFA384x_RID_CURRENTTXRATE4_LEN          ((u16)0)
+#define                HFA384x_RID_CURRENTTXRATE5_LEN          ((u16)0)
+#define                HFA384x_RID_CURRENTTXRATE6_LEN          ((u16)0)
+#define                HFA384x_RID_OWNMACADDRESS_LEN           ((u16)6)
+#define                HFA384x_RID_PCFINFO_LEN                 ((u16)6)
+#define                HFA384x_RID_CNFAPPCFINFO_LEN            ((u16)sizeof(hfa384x_PCFInfo_data_t))
+#define                HFA384x_RID_SCANREQUEST_LEN             ((u16)sizeof(hfa384x_ScanRequest_data_t))
+#define                HFA384x_RID_JOINREQUEST_LEN             ((u16)sizeof(hfa384x_JoinRequest_data_t))
+#define                HFA384x_RID_AUTHENTICATESTA_LEN         ((u16)sizeof(hfa384x_authenticateStation_data_t))
+#define                HFA384x_RID_CHANNELINFOREQUEST_LEN      ((u16)sizeof(hfa384x_ChannelInfoRequest_data_t))
 /*--------------------------------------------------------------------
 Information RIDs:  Modem Information
 --------------------------------------------------------------------*/
-#define                HFA384x_RID_PHYTYPE             ((UINT16)0xFDC0)
-#define                HFA384x_RID_CURRENTCHANNEL      ((UINT16)0xFDC1)
-#define                HFA384x_RID_CURRENTPOWERSTATE   ((UINT16)0xFDC2)
-#define                HFA384x_RID_CCAMODE             ((UINT16)0xFDC3)
-#define                HFA384x_RID_SUPPORTEDDATARATES  ((UINT16)0xFDC6)
-#define                HFA384x_RID_LFOSTATUS           ((UINT16)0xFDC7) // 1.7.1
+#define                HFA384x_RID_PHYTYPE             ((u16)0xFDC0)
+#define                HFA384x_RID_CURRENTCHANNEL      ((u16)0xFDC1)
+#define                HFA384x_RID_CURRENTPOWERSTATE   ((u16)0xFDC2)
+#define                HFA384x_RID_CCAMODE             ((u16)0xFDC3)
+#define                HFA384x_RID_SUPPORTEDDATARATES  ((u16)0xFDC6)
+#define                HFA384x_RID_LFOSTATUS           ((u16)0xFDC7) // 1.7.1
 
 /*--------------------------------------------------------------------
 Information RID Lengths:  Modem Information
   This is the length of JUST the DATA part of the RID (does not
   include the len or code fields)
 --------------------------------------------------------------------*/
-#define                HFA384x_RID_PHYTYPE_LEN                 ((UINT16)0)
-#define                HFA384x_RID_CURRENTCHANNEL_LEN          ((UINT16)0)
-#define                HFA384x_RID_CURRENTPOWERSTATE_LEN       ((UINT16)0)
-#define                HFA384x_RID_CCAMODE_LEN                 ((UINT16)0)
-#define                HFA384x_RID_SUPPORTEDDATARATES_LEN      ((UINT16)10)
+#define                HFA384x_RID_PHYTYPE_LEN                 ((u16)0)
+#define                HFA384x_RID_CURRENTCHANNEL_LEN          ((u16)0)
+#define                HFA384x_RID_CURRENTPOWERSTATE_LEN       ((u16)0)
+#define                HFA384x_RID_CCAMODE_LEN                 ((u16)0)
+#define                HFA384x_RID_SUPPORTEDDATARATES_LEN      ((u16)10)
 
 /*--------------------------------------------------------------------
 API ENHANCEMENTS (NOT ALREADY IMPLEMENTED)
 --------------------------------------------------------------------*/
-#define                HFA384x_RID_CNFWEPDEFAULTKEYID  ((UINT16)0xFC23)
-#define                HFA384x_RID_CNFWEPDEFAULTKEY0   ((UINT16)0xFC24)
-#define                HFA384x_RID_CNFWEPDEFAULTKEY1   ((UINT16)0xFC25)
-#define                HFA384x_RID_CNFWEPDEFAULTKEY2   ((UINT16)0xFC26)
-#define                HFA384x_RID_CNFWEPDEFAULTKEY3   ((UINT16)0xFC27)
-#define                HFA384x_RID_CNFWEPFLAGS         ((UINT16)0xFC28)
-#define                HFA384x_RID_CNFWEPKEYMAPTABLE   ((UINT16)0xFC29)
-#define                HFA384x_RID_CNFAUTHENTICATION   ((UINT16)0xFC2A)
-#define                HFA384x_RID_CNFMAXASSOCSTATIONS ((UINT16)0xFC2B)
-#define                HFA384x_RID_CNFTXCONTROL        ((UINT16)0xFC2C)
-#define                HFA384x_RID_CNFROAMINGMODE      ((UINT16)0xFC2D)
-#define                HFA384x_RID_CNFHOSTAUTHASSOC    ((UINT16)0xFC2E)
-#define                HFA384x_RID_CNFRCVCRCERROR      ((UINT16)0xFC30)
-// #define             HFA384x_RID_CNFMMLIFE           ((UINT16)0xFC31)
-#define                HFA384x_RID_CNFALTRETRYCNT      ((UINT16)0xFC32)
-#define                HFA384x_RID_CNFAPBCNINT         ((UINT16)0xFC33)
-#define                HFA384x_RID_CNFAPPCFINFO        ((UINT16)0xFC34)
-#define                HFA384x_RID_CNFSTAPCFINFO       ((UINT16)0xFC35)
-#define                HFA384x_RID_CNFPRIORITYQUSAGE   ((UINT16)0xFC37)
-#define                HFA384x_RID_CNFTIMCTRL          ((UINT16)0xFC40)
-#define                HFA384x_RID_CNFTHIRTY2TALLY     ((UINT16)0xFC42)
-#define                HFA384x_RID_CNFENHSECURITY      ((UINT16)0xFC43)
-#define                HFA384x_RID_CNFDBMADJUST        ((UINT16)0xFC46) // NEW
-#define                HFA384x_RID_CNFWPADATA          ((UINT16)0xFC48) // 1.7.0
-#define                HFA384x_RID_CNFPROPOGATIONDELAY ((UINT16)0xFC49) // 1.7.6
-#define                HFA384x_RID_CNFSHORTPREAMBLE    ((UINT16)0xFCB0)
-#define                HFA384x_RID_CNFEXCLONGPREAMBLE  ((UINT16)0xFCB1)
-#define                HFA384x_RID_CNFAUTHRSPTIMEOUT   ((UINT16)0xFCB2)
-#define                HFA384x_RID_CNFBASICRATES       ((UINT16)0xFCB3)
-#define                HFA384x_RID_CNFSUPPRATES        ((UINT16)0xFCB4)
-#define                HFA384x_RID_CNFFALLBACKCTRL     ((UINT16)0xFCB5) // NEW
-#define                HFA384x_RID_WEPKEYSTATUS        ((UINT16)0xFCB6) // NEW
-#define                HFA384x_RID_WEPKEYMAPINDEX      ((UINT16)0xFCB7) // NEW
-#define                HFA384x_RID_BROADCASTKEYID      ((UINT16)0xFCB8) // NEW
-#define                HFA384x_RID_ENTSECFLAGEYID      ((UINT16)0xFCB9) // NEW
-#define                HFA384x_RID_CNFPASSIVESCANCTRL  ((UINT16)0xFCBA) // NEW STA
-#define                HFA384x_RID_CNFWPAHANDLING      ((UINT16)0xFCBB) // 1.7.0
-#define                HFA384x_RID_MDCCONTROL          ((UINT16)0xFCBC) // 1.7.0/1.4.0
-#define                HFA384x_RID_MDCCOUNTRY          ((UINT16)0xFCBD) // 1.7.0/1.4.0
-#define                HFA384x_RID_TXPOWERMAX          ((UINT16)0xFCBE) // 1.7.0/1.4.0
-#define                HFA384x_RID_CNFLFOENBLED        ((UINT16)0xFCBF) // 1.6.3
-#define         HFA384x_RID_CAPINFO             ((UINT16)0xFCC0) // 1.7.0/1.3.7
-#define         HFA384x_RID_LISTENINTERVAL      ((UINT16)0xFCC1) // 1.7.0/1.3.7
-#define         HFA384x_RID_DIVERSITYENABLED    ((UINT16)0xFCC2) // 1.7.0/1.3.7
-#define         HFA384x_RID_LED_CONTROL         ((UINT16)0xFCC4) // 1.7.6
-#define         HFA384x_RID_HFO_DELAY           ((UINT16)0xFCC5) // 1.7.6
-#define         HFA384x_RID_DISSALOWEDBSSID     ((UINT16)0xFCC6) // 1.8.0
-#define                HFA384x_RID_SCANREQUEST         ((UINT16)0xFCE1)
-#define                HFA384x_RID_JOINREQUEST         ((UINT16)0xFCE2)
-#define                HFA384x_RID_AUTHENTICATESTA     ((UINT16)0xFCE3)
-#define                HFA384x_RID_CHANNELINFOREQUEST  ((UINT16)0xFCE4)
-#define                HFA384x_RID_HOSTSCAN            ((UINT16)0xFCE5) // NEW STA
-#define                HFA384x_RID_ASSOCIATESTA        ((UINT16)0xFCE6)
-
-#define                HFA384x_RID_CNFWEPDEFAULTKEY_LEN        ((UINT16)6)
-#define                HFA384x_RID_CNFWEP128DEFAULTKEY_LEN     ((UINT16)14)
-#define                HFA384x_RID_CNFPRIOQUSAGE_LEN           ((UINT16)4)
+#define                HFA384x_RID_CNFWEPDEFAULTKEYID  ((u16)0xFC23)
+#define                HFA384x_RID_CNFWEPDEFAULTKEY0   ((u16)0xFC24)
+#define                HFA384x_RID_CNFWEPDEFAULTKEY1   ((u16)0xFC25)
+#define                HFA384x_RID_CNFWEPDEFAULTKEY2   ((u16)0xFC26)
+#define                HFA384x_RID_CNFWEPDEFAULTKEY3   ((u16)0xFC27)
+#define                HFA384x_RID_CNFWEPFLAGS         ((u16)0xFC28)
+#define                HFA384x_RID_CNFWEPKEYMAPTABLE   ((u16)0xFC29)
+#define                HFA384x_RID_CNFAUTHENTICATION   ((u16)0xFC2A)
+#define                HFA384x_RID_CNFMAXASSOCSTATIONS ((u16)0xFC2B)
+#define                HFA384x_RID_CNFTXCONTROL        ((u16)0xFC2C)
+#define                HFA384x_RID_CNFROAMINGMODE      ((u16)0xFC2D)
+#define                HFA384x_RID_CNFHOSTAUTHASSOC    ((u16)0xFC2E)
+#define                HFA384x_RID_CNFRCVCRCERROR      ((u16)0xFC30)
+// #define             HFA384x_RID_CNFMMLIFE           ((u16)0xFC31)
+#define                HFA384x_RID_CNFALTRETRYCNT      ((u16)0xFC32)
+#define                HFA384x_RID_CNFAPBCNint         ((u16)0xFC33)
+#define                HFA384x_RID_CNFAPPCFINFO        ((u16)0xFC34)
+#define                HFA384x_RID_CNFSTAPCFINFO       ((u16)0xFC35)
+#define                HFA384x_RID_CNFPRIORITYQUSAGE   ((u16)0xFC37)
+#define                HFA384x_RID_CNFTIMCTRL          ((u16)0xFC40)
+#define                HFA384x_RID_CNFTHIRTY2TALLY     ((u16)0xFC42)
+#define                HFA384x_RID_CNFENHSECURITY      ((u16)0xFC43)
+#define                HFA384x_RID_CNFDBMADJUST        ((u16)0xFC46) // NEW
+#define                HFA384x_RID_CNFWPADATA          ((u16)0xFC48) // 1.7.0
+#define                HFA384x_RID_CNFPROPOGATIONDELAY ((u16)0xFC49) // 1.7.6
+#define                HFA384x_RID_CNFSHORTPREAMBLE    ((u16)0xFCB0)
+#define                HFA384x_RID_CNFEXCLONGPREAMBLE  ((u16)0xFCB1)
+#define                HFA384x_RID_CNFAUTHRSPTIMEOUT   ((u16)0xFCB2)
+#define                HFA384x_RID_CNFBASICRATES       ((u16)0xFCB3)
+#define                HFA384x_RID_CNFSUPPRATES        ((u16)0xFCB4)
+#define                HFA384x_RID_CNFFALLBACKCTRL     ((u16)0xFCB5) // NEW
+#define                HFA384x_RID_WEPKEYSTATUS        ((u16)0xFCB6) // NEW
+#define                HFA384x_RID_WEPKEYMAPINDEX      ((u16)0xFCB7) // NEW
+#define                HFA384x_RID_BROADCASTKEYID      ((u16)0xFCB8) // NEW
+#define                HFA384x_RID_ENTSECFLAGEYID      ((u16)0xFCB9) // NEW
+#define                HFA384x_RID_CNFPASSIVESCANCTRL  ((u16)0xFCBA) // NEW STA
+#define                HFA384x_RID_CNFWPAHANDLING      ((u16)0xFCBB) // 1.7.0
+#define                HFA384x_RID_MDCCONTROL          ((u16)0xFCBC) // 1.7.0/1.4.0
+#define                HFA384x_RID_MDCCOUNTRY          ((u16)0xFCBD) // 1.7.0/1.4.0
+#define                HFA384x_RID_TXPOWERMAX          ((u16)0xFCBE) // 1.7.0/1.4.0
+#define                HFA384x_RID_CNFLFOENBLED        ((u16)0xFCBF) // 1.6.3
+#define         HFA384x_RID_CAPINFO             ((u16)0xFCC0) // 1.7.0/1.3.7
+#define         HFA384x_RID_LISTENintERVAL      ((u16)0xFCC1) // 1.7.0/1.3.7
+#define         HFA384x_RID_DIVERSITYENABLED    ((u16)0xFCC2) // 1.7.0/1.3.7
+#define         HFA384x_RID_LED_CONTROL         ((u16)0xFCC4) // 1.7.6
+#define         HFA384x_RID_HFO_DELAY           ((u16)0xFCC5) // 1.7.6
+#define         HFA384x_RID_DISSALOWEDBSSID     ((u16)0xFCC6) // 1.8.0
+#define                HFA384x_RID_SCANREQUEST         ((u16)0xFCE1)
+#define                HFA384x_RID_JOINREQUEST         ((u16)0xFCE2)
+#define                HFA384x_RID_AUTHENTICATESTA     ((u16)0xFCE3)
+#define                HFA384x_RID_CHANNELINFOREQUEST  ((u16)0xFCE4)
+#define                HFA384x_RID_HOSTSCAN            ((u16)0xFCE5) // NEW STA
+#define                HFA384x_RID_ASSOCIATESTA        ((u16)0xFCE6)
+
+#define                HFA384x_RID_CNFWEPDEFAULTKEY_LEN        ((u16)6)
+#define                HFA384x_RID_CNFWEP128DEFAULTKEY_LEN     ((u16)14)
+#define                HFA384x_RID_CNFPRIOQUSAGE_LEN           ((u16)4)
 /*--------------------------------------------------------------------
 PD Record codes
 --------------------------------------------------------------------*/
-#define HFA384x_PDR_PCB_PARTNUM                ((UINT16)0x0001)
-#define HFA384x_PDR_PDAVER             ((UINT16)0x0002)
-#define HFA384x_PDR_NIC_SERIAL         ((UINT16)0x0003)
-#define HFA384x_PDR_MKK_MEASUREMENTS   ((UINT16)0x0004)
-#define HFA384x_PDR_NIC_RAMSIZE                ((UINT16)0x0005)
-#define HFA384x_PDR_MFISUPRANGE                ((UINT16)0x0006)
-#define HFA384x_PDR_CFISUPRANGE                ((UINT16)0x0007)
-#define HFA384x_PDR_NICID              ((UINT16)0x0008)
-//#define HFA384x_PDR_REFDAC_MEASUREMENTS      ((UINT16)0x0010)
-//#define HFA384x_PDR_VGDAC_MEASUREMENTS       ((UINT16)0x0020)
-//#define HFA384x_PDR_LEVEL_COMP_MEASUREMENTS  ((UINT16)0x0030)
-//#define HFA384x_PDR_MODEM_TRIMDAC_MEASUREMENTS       ((UINT16)0x0040)
-//#define HFA384x_PDR_COREGA_HACK              ((UINT16)0x00ff)
-#define HFA384x_PDR_MAC_ADDRESS                ((UINT16)0x0101)
-//#define HFA384x_PDR_MKK_CALLNAME     ((UINT16)0x0102)
-#define HFA384x_PDR_REGDOMAIN          ((UINT16)0x0103)
-#define HFA384x_PDR_ALLOWED_CHANNEL    ((UINT16)0x0104)
-#define HFA384x_PDR_DEFAULT_CHANNEL    ((UINT16)0x0105)
-//#define HFA384x_PDR_PRIVACY_OPTION   ((UINT16)0x0106)
-#define HFA384x_PDR_TEMPTYPE           ((UINT16)0x0107)
-//#define HFA384x_PDR_REFDAC_SETUP     ((UINT16)0x0110)
-//#define HFA384x_PDR_VGDAC_SETUP              ((UINT16)0x0120)
-//#define HFA384x_PDR_LEVEL_COMP_SETUP ((UINT16)0x0130)
-//#define HFA384x_PDR_TRIMDAC_SETUP    ((UINT16)0x0140)
-#define HFA384x_PDR_IFR_SETTING                ((UINT16)0x0200)
-#define HFA384x_PDR_RFR_SETTING                ((UINT16)0x0201)
-#define HFA384x_PDR_HFA3861_BASELINE   ((UINT16)0x0202)
-#define HFA384x_PDR_HFA3861_SHADOW     ((UINT16)0x0203)
-#define HFA384x_PDR_HFA3861_IFRF       ((UINT16)0x0204)
-#define HFA384x_PDR_HFA3861_CHCALSP    ((UINT16)0x0300)
-#define HFA384x_PDR_HFA3861_CHCALI     ((UINT16)0x0301)
-#define HFA384x_PDR_MAX_TX_POWER       ((UINT16)0x0302)
-#define HFA384x_PDR_MASTER_CHAN_LIST   ((UINT16)0x0303)
-#define HFA384x_PDR_3842_NIC_CONFIG    ((UINT16)0x0400)
-#define HFA384x_PDR_USB_ID             ((UINT16)0x0401)
-#define HFA384x_PDR_PCI_ID             ((UINT16)0x0402)
-#define HFA384x_PDR_PCI_IFCONF         ((UINT16)0x0403)
-#define HFA384x_PDR_PCI_PMCONF         ((UINT16)0x0404)
-#define HFA384x_PDR_RFENRGY            ((UINT16)0x0406)
-#define HFA384x_PDR_USB_POWER_TYPE      ((UINT16)0x0407)
-//#define HFA384x_PDR_UNKNOWN408               ((UINT16)0x0408)
-#define HFA384x_PDR_USB_MAX_POWER      ((UINT16)0x0409)
-#define HFA384x_PDR_USB_MANUFACTURER   ((UINT16)0x0410)
-#define HFA384x_PDR_USB_PRODUCT        ((UINT16)0x0411)
-#define HFA384x_PDR_ANT_DIVERSITY      ((UINT16)0x0412)
-#define HFA384x_PDR_HFO_DELAY          ((UINT16)0x0413)
-#define HFA384x_PDR_SCALE_THRESH       ((UINT16)0x0414)
-
-#define HFA384x_PDR_HFA3861_MANF_TESTSP        ((UINT16)0x0900)
-#define HFA384x_PDR_HFA3861_MANF_TESTI ((UINT16)0x0901)
-#define HFA384x_PDR_END_OF_PDA         ((UINT16)0x0000)
+#define HFA384x_PDR_PCB_PARTNUM                ((u16)0x0001)
+#define HFA384x_PDR_PDAVER             ((u16)0x0002)
+#define HFA384x_PDR_NIC_SERIAL         ((u16)0x0003)
+#define HFA384x_PDR_MKK_MEASUREMENTS   ((u16)0x0004)
+#define HFA384x_PDR_NIC_RAMSIZE                ((u16)0x0005)
+#define HFA384x_PDR_MFISUPRANGE                ((u16)0x0006)
+#define HFA384x_PDR_CFISUPRANGE                ((u16)0x0007)
+#define HFA384x_PDR_NICID              ((u16)0x0008)
+//#define HFA384x_PDR_REFDAC_MEASUREMENTS      ((u16)0x0010)
+//#define HFA384x_PDR_VGDAC_MEASUREMENTS       ((u16)0x0020)
+//#define HFA384x_PDR_LEVEL_COMP_MEASUREMENTS  ((u16)0x0030)
+//#define HFA384x_PDR_MODEM_TRIMDAC_MEASUREMENTS       ((u16)0x0040)
+//#define HFA384x_PDR_COREGA_HACK              ((u16)0x00ff)
+#define HFA384x_PDR_MAC_ADDRESS                ((u16)0x0101)
+//#define HFA384x_PDR_MKK_CALLNAME     ((u16)0x0102)
+#define HFA384x_PDR_REGDOMAIN          ((u16)0x0103)
+#define HFA384x_PDR_ALLOWED_CHANNEL    ((u16)0x0104)
+#define HFA384x_PDR_DEFAULT_CHANNEL    ((u16)0x0105)
+//#define HFA384x_PDR_PRIVACY_OPTION   ((u16)0x0106)
+#define HFA384x_PDR_TEMPTYPE           ((u16)0x0107)
+//#define HFA384x_PDR_REFDAC_SETUP     ((u16)0x0110)
+//#define HFA384x_PDR_VGDAC_SETUP              ((u16)0x0120)
+//#define HFA384x_PDR_LEVEL_COMP_SETUP ((u16)0x0130)
+//#define HFA384x_PDR_TRIMDAC_SETUP    ((u16)0x0140)
+#define HFA384x_PDR_IFR_SETTING                ((u16)0x0200)
+#define HFA384x_PDR_RFR_SETTING                ((u16)0x0201)
+#define HFA384x_PDR_HFA3861_BASELINE   ((u16)0x0202)
+#define HFA384x_PDR_HFA3861_SHADOW     ((u16)0x0203)
+#define HFA384x_PDR_HFA3861_IFRF       ((u16)0x0204)
+#define HFA384x_PDR_HFA3861_CHCALSP    ((u16)0x0300)
+#define HFA384x_PDR_HFA3861_CHCALI     ((u16)0x0301)
+#define HFA384x_PDR_MAX_TX_POWER       ((u16)0x0302)
+#define HFA384x_PDR_MASTER_CHAN_LIST   ((u16)0x0303)
+#define HFA384x_PDR_3842_NIC_CONFIG    ((u16)0x0400)
+#define HFA384x_PDR_USB_ID             ((u16)0x0401)
+#define HFA384x_PDR_PCI_ID             ((u16)0x0402)
+#define HFA384x_PDR_PCI_IFCONF         ((u16)0x0403)
+#define HFA384x_PDR_PCI_PMCONF         ((u16)0x0404)
+#define HFA384x_PDR_RFENRGY            ((u16)0x0406)
+#define HFA384x_PDR_USB_POWER_TYPE      ((u16)0x0407)
+//#define HFA384x_PDR_UNKNOWN408               ((u16)0x0408)
+#define HFA384x_PDR_USB_MAX_POWER      ((u16)0x0409)
+#define HFA384x_PDR_USB_MANUFACTURER   ((u16)0x0410)
+#define HFA384x_PDR_USB_PRODUCT        ((u16)0x0411)
+#define HFA384x_PDR_ANT_DIVERSITY      ((u16)0x0412)
+#define HFA384x_PDR_HFO_DELAY          ((u16)0x0413)
+#define HFA384x_PDR_SCALE_THRESH       ((u16)0x0414)
+
+#define HFA384x_PDR_HFA3861_MANF_TESTSP        ((u16)0x0900)
+#define HFA384x_PDR_HFA3861_MANF_TESTI ((u16)0x0901)
+#define HFA384x_PDR_END_OF_PDA         ((u16)0x0000)
 
 
 /*=============================================================*/
@@ -766,7 +766,7 @@ PD Record codes
 #define                HFA384x_OFFSET1         HFA384x_OFFSET1_OFF
 #define                HFA384x_DATA1           HFA384x_DATA1_OFF
 #define                HFA384x_EVSTAT          HFA384x_EVSTAT_OFF
-#define                HFA384x_INTEN           HFA384x_INTEN_OFF
+#define                HFA384x_intEN           HFA384x_INTEN_OFF
 #define                HFA384x_EVACK           HFA384x_EVACK_OFF
 #define                HFA384x_CONTROL         HFA384x_CONTROL_OFF
 #define                HFA384x_SWSUPPORT0      HFA384x_SWSUPPORT0_OFF
@@ -781,96 +781,96 @@ PD Record codes
 
 /*--- Register Test/Get/Set Field macros ------------------------*/
 
-#define                HFA384x_CMD_ISBUSY(value)               ((UINT16)(((UINT16)value) & HFA384x_CMD_BUSY))
-#define                HFA384x_CMD_AINFO_GET(value)            ((UINT16)(((UINT16)(value) & HFA384x_CMD_AINFO) >> 8))
-#define                HFA384x_CMD_AINFO_SET(value)            ((UINT16)((UINT16)(value) << 8))
-#define                HFA384x_CMD_MACPORT_GET(value)          ((UINT16)(HFA384x_CMD_AINFO_GET((UINT16)(value) & HFA384x_CMD_MACPORT)))
-#define                HFA384x_CMD_MACPORT_SET(value)          ((UINT16)HFA384x_CMD_AINFO_SET(value))
-#define                HFA384x_CMD_ISRECL(value)               ((UINT16)(HFA384x_CMD_AINFO_GET((UINT16)(value) & HFA384x_CMD_RECL)))
-#define                HFA384x_CMD_RECL_SET(value)             ((UINT16)HFA384x_CMD_AINFO_SET(value))
-#define                HFA384x_CMD_QOS_GET(value)              ((UINT16)((((UINT16)(value))&((UINT16)0x3000)) >> 12))
-#define                HFA384x_CMD_QOS_SET(value)              ((UINT16)((((UINT16)(value)) << 12) & 0x3000))
-#define                HFA384x_CMD_ISWRITE(value)              ((UINT16)(HFA384x_CMD_AINFO_GET((UINT16)(value) & HFA384x_CMD_WRITE)))
-#define                HFA384x_CMD_WRITE_SET(value)            ((UINT16)HFA384x_CMD_AINFO_SET((UINT16)value))
-#define                HFA384x_CMD_PROGMODE_GET(value)         ((UINT16)(HFA384x_CMD_AINFO_GET((UINT16)(value) & HFA384x_CMD_PROGMODE)))
-#define                HFA384x_CMD_PROGMODE_SET(value)         ((UINT16)HFA384x_CMD_AINFO_SET((UINT16)value))
-#define                HFA384x_CMD_CMDCODE_GET(value)          ((UINT16)(((UINT16)(value)) & HFA384x_CMD_CMDCODE))
-#define                HFA384x_CMD_CMDCODE_SET(value)          ((UINT16)(value))
-
-#define                HFA384x_STATUS_RESULT_GET(value)        ((UINT16)((((UINT16)(value)) & HFA384x_STATUS_RESULT) >> 8))
-#define                HFA384x_STATUS_RESULT_SET(value)        (((UINT16)(value)) << 8)
-#define                HFA384x_STATUS_CMDCODE_GET(value)       (((UINT16)(value)) & HFA384x_STATUS_CMDCODE)
-#define                HFA384x_STATUS_CMDCODE_SET(value)       ((UINT16)(value))
-
-#define                HFA384x_OFFSET_ISBUSY(value)            ((UINT16)(((UINT16)(value)) & HFA384x_OFFSET_BUSY))
-#define                HFA384x_OFFSET_ISERR(value)             ((UINT16)(((UINT16)(value)) & HFA384x_OFFSET_ERR))
-#define                HFA384x_OFFSET_DATAOFF_GET(value)       ((UINT16)(((UINT16)(value)) & HFA384x_OFFSET_DATAOFF))
-#define                HFA384x_OFFSET_DATAOFF_SET(value)       ((UINT16)(value))
-
-#define                HFA384x_EVSTAT_ISTICK(value)            ((UINT16)(((UINT16)(value)) & HFA384x_EVSTAT_TICK))
-#define                HFA384x_EVSTAT_ISWTERR(value)           ((UINT16)(((UINT16)(value)) & HFA384x_EVSTAT_WTERR))
-#define                HFA384x_EVSTAT_ISINFDROP(value)         ((UINT16)(((UINT16)(value)) & HFA384x_EVSTAT_INFDROP))
-#define                HFA384x_EVSTAT_ISINFO(value)            ((UINT16)(((UINT16)(value)) & HFA384x_EVSTAT_INFO))
-#define                HFA384x_EVSTAT_ISDTIM(value)            ((UINT16)(((UINT16)(value)) & HFA384x_EVSTAT_DTIM))
-#define                HFA384x_EVSTAT_ISCMD(value)             ((UINT16)(((UINT16)(value)) & HFA384x_EVSTAT_CMD))
-#define                HFA384x_EVSTAT_ISALLOC(value)           ((UINT16)(((UINT16)(value)) & HFA384x_EVSTAT_ALLOC))
-#define                HFA384x_EVSTAT_ISTXEXC(value)           ((UINT16)(((UINT16)(value)) & HFA384x_EVSTAT_TXEXC))
-#define                HFA384x_EVSTAT_ISTX(value)              ((UINT16)(((UINT16)(value)) & HFA384x_EVSTAT_TX))
-#define                HFA384x_EVSTAT_ISRX(value)              ((UINT16)(((UINT16)(value)) & HFA384x_EVSTAT_RX))
-
-#define                HFA384x_EVSTAT_ISBAP_OP(value)          ((UINT16)(((UINT16)(value)) & HFA384x_INT_BAP_OP))
-
-#define                HFA384x_INTEN_ISTICK(value)             ((UINT16)(((UINT16)(value)) & HFA384x_INTEN_TICK))
-#define                HFA384x_INTEN_TICK_SET(value)           ((UINT16)(((UINT16)(value)) << 15))
-#define                HFA384x_INTEN_ISWTERR(value)            ((UINT16)(((UINT16)(value)) & HFA384x_INTEN_WTERR))
-#define                HFA384x_INTEN_WTERR_SET(value)          ((UINT16)(((UINT16)(value)) << 14))
-#define                HFA384x_INTEN_ISINFDROP(value)          ((UINT16)(((UINT16)(value)) & HFA384x_INTEN_INFDROP))
-#define                HFA384x_INTEN_INFDROP_SET(value)        ((UINT16)(((UINT16)(value)) << 13))
-#define                HFA384x_INTEN_ISINFO(value)             ((UINT16)(((UINT16)(value)) & HFA384x_INTEN_INFO))
-#define                HFA384x_INTEN_INFO_SET(value)           ((UINT16)(((UINT16)(value)) << 7))
-#define                HFA384x_INTEN_ISDTIM(value)             ((UINT16)(((UINT16)(value)) & HFA384x_INTEN_DTIM))
-#define                HFA384x_INTEN_DTIM_SET(value)           ((UINT16)(((UINT16)(value)) << 5))
-#define                HFA384x_INTEN_ISCMD(value)              ((UINT16)(((UINT16)(value)) & HFA384x_INTEN_CMD))
-#define                HFA384x_INTEN_CMD_SET(value)            ((UINT16)(((UINT16)(value)) << 4))
-#define                HFA384x_INTEN_ISALLOC(value)            ((UINT16)(((UINT16)(value)) & HFA384x_INTEN_ALLOC))
-#define                HFA384x_INTEN_ALLOC_SET(value)          ((UINT16)(((UINT16)(value)) << 3))
-#define                HFA384x_INTEN_ISTXEXC(value)            ((UINT16)(((UINT16)(value)) & HFA384x_INTEN_TXEXC))
-#define                HFA384x_INTEN_TXEXC_SET(value)          ((UINT16)(((UINT16)(value)) << 2))
-#define                HFA384x_INTEN_ISTX(value)               ((UINT16)(((UINT16)(value)) & HFA384x_INTEN_TX))
-#define                HFA384x_INTEN_TX_SET(value)             ((UINT16)(((UINT16)(value)) << 1))
-#define                HFA384x_INTEN_ISRX(value)               ((UINT16)(((UINT16)(value)) & HFA384x_INTEN_RX))
-#define                HFA384x_INTEN_RX_SET(value)             ((UINT16)(((UINT16)(value)) << 0))
-
-#define                HFA384x_EVACK_ISTICK(value)             ((UINT16)(((UINT16)(value)) & HFA384x_EVACK_TICK))
-#define                HFA384x_EVACK_TICK_SET(value)           ((UINT16)(((UINT16)(value)) << 15))
-#define                HFA384x_EVACK_ISWTERR(value)            ((UINT16)(((UINT16)(value)) & HFA384x_EVACK_WTERR))
-#define                HFA384x_EVACK_WTERR_SET(value)          ((UINT16)(((UINT16)(value)) << 14))
-#define                HFA384x_EVACK_ISINFDROP(value)          ((UINT16)(((UINT16)(value)) & HFA384x_EVACK_INFDROP))
-#define                HFA384x_EVACK_INFDROP_SET(value)        ((UINT16)(((UINT16)(value)) << 13))
-#define                HFA384x_EVACK_ISINFO(value)             ((UINT16)(((UINT16)(value)) & HFA384x_EVACK_INFO))
-#define                HFA384x_EVACK_INFO_SET(value)           ((UINT16)(((UINT16)(value)) << 7))
-#define                HFA384x_EVACK_ISDTIM(value)             ((UINT16)(((UINT16)(value)) & HFA384x_EVACK_DTIM))
-#define                HFA384x_EVACK_DTIM_SET(value)           ((UINT16)(((UINT16)(value)) << 5))
-#define                HFA384x_EVACK_ISCMD(value)              ((UINT16)(((UINT16)(value)) & HFA384x_EVACK_CMD))
-#define                HFA384x_EVACK_CMD_SET(value)            ((UINT16)(((UINT16)(value)) << 4))
-#define                HFA384x_EVACK_ISALLOC(value)            ((UINT16)(((UINT16)(value)) & HFA384x_EVACK_ALLOC))
-#define                HFA384x_EVACK_ALLOC_SET(value)          ((UINT16)(((UINT16)(value)) << 3))
-#define                HFA384x_EVACK_ISTXEXC(value)            ((UINT16)(((UINT16)(value)) & HFA384x_EVACK_TXEXC))
-#define                HFA384x_EVACK_TXEXC_SET(value)          ((UINT16)(((UINT16)(value)) << 2))
-#define                HFA384x_EVACK_ISTX(value)               ((UINT16)(((UINT16)(value)) & HFA384x_EVACK_TX))
-#define                HFA384x_EVACK_TX_SET(value)             ((UINT16)(((UINT16)(value)) << 1))
-#define                HFA384x_EVACK_ISRX(value)               ((UINT16)(((UINT16)(value)) & HFA384x_EVACK_RX))
-#define                HFA384x_EVACK_RX_SET(value)             ((UINT16)(((UINT16)(value)) << 0))
-
-#define                HFA384x_CONTROL_AUXEN_SET(value)        ((UINT16)(((UINT16)(value)) << 14))
-#define                HFA384x_CONTROL_AUXEN_GET(value)        ((UINT16)(((UINT16)(value)) >> 14))
+#define                HFA384x_CMD_ISBUSY(value)               ((u16)(((u16)value) & HFA384x_CMD_BUSY))
+#define                HFA384x_CMD_AINFO_GET(value)            ((u16)(((u16)(value) & HFA384x_CMD_AINFO) >> 8))
+#define                HFA384x_CMD_AINFO_SET(value)            ((u16)((u16)(value) << 8))
+#define                HFA384x_CMD_MACPORT_GET(value)          ((u16)(HFA384x_CMD_AINFO_GET((u16)(value) & HFA384x_CMD_MACPORT)))
+#define                HFA384x_CMD_MACPORT_SET(value)          ((u16)HFA384x_CMD_AINFO_SET(value))
+#define                HFA384x_CMD_ISRECL(value)               ((u16)(HFA384x_CMD_AINFO_GET((u16)(value) & HFA384x_CMD_RECL)))
+#define                HFA384x_CMD_RECL_SET(value)             ((u16)HFA384x_CMD_AINFO_SET(value))
+#define                HFA384x_CMD_QOS_GET(value)              ((u16)((((u16)(value))&((u16)0x3000)) >> 12))
+#define                HFA384x_CMD_QOS_SET(value)              ((u16)((((u16)(value)) << 12) & 0x3000))
+#define                HFA384x_CMD_ISWRITE(value)              ((u16)(HFA384x_CMD_AINFO_GET((u16)(value) & HFA384x_CMD_WRITE)))
+#define                HFA384x_CMD_WRITE_SET(value)            ((u16)HFA384x_CMD_AINFO_SET((u16)value))
+#define                HFA384x_CMD_PROGMODE_GET(value)         ((u16)(HFA384x_CMD_AINFO_GET((u16)(value) & HFA384x_CMD_PROGMODE)))
+#define                HFA384x_CMD_PROGMODE_SET(value)         ((u16)HFA384x_CMD_AINFO_SET((u16)value))
+#define                HFA384x_CMD_CMDCODE_GET(value)          ((u16)(((u16)(value)) & HFA384x_CMD_CMDCODE))
+#define                HFA384x_CMD_CMDCODE_SET(value)          ((u16)(value))
+
+#define                HFA384x_STATUS_RESULT_GET(value)        ((u16)((((u16)(value)) & HFA384x_STATUS_RESULT) >> 8))
+#define                HFA384x_STATUS_RESULT_SET(value)        (((u16)(value)) << 8)
+#define                HFA384x_STATUS_CMDCODE_GET(value)       (((u16)(value)) & HFA384x_STATUS_CMDCODE)
+#define                HFA384x_STATUS_CMDCODE_SET(value)       ((u16)(value))
+
+#define                HFA384x_OFFSET_ISBUSY(value)            ((u16)(((u16)(value)) & HFA384x_OFFSET_BUSY))
+#define                HFA384x_OFFSET_ISERR(value)             ((u16)(((u16)(value)) & HFA384x_OFFSET_ERR))
+#define                HFA384x_OFFSET_DATAOFF_GET(value)       ((u16)(((u16)(value)) & HFA384x_OFFSET_DATAOFF))
+#define                HFA384x_OFFSET_DATAOFF_SET(value)       ((u16)(value))
+
+#define                HFA384x_EVSTAT_ISTICK(value)            ((u16)(((u16)(value)) & HFA384x_EVSTAT_TICK))
+#define                HFA384x_EVSTAT_ISWTERR(value)           ((u16)(((u16)(value)) & HFA384x_EVSTAT_WTERR))
+#define                HFA384x_EVSTAT_ISINFDROP(value)         ((u16)(((u16)(value)) & HFA384x_EVSTAT_INFDROP))
+#define                HFA384x_EVSTAT_ISINFO(value)            ((u16)(((u16)(value)) & HFA384x_EVSTAT_INFO))
+#define                HFA384x_EVSTAT_ISDTIM(value)            ((u16)(((u16)(value)) & HFA384x_EVSTAT_DTIM))
+#define                HFA384x_EVSTAT_ISCMD(value)             ((u16)(((u16)(value)) & HFA384x_EVSTAT_CMD))
+#define                HFA384x_EVSTAT_ISALLOC(value)           ((u16)(((u16)(value)) & HFA384x_EVSTAT_ALLOC))
+#define                HFA384x_EVSTAT_ISTXEXC(value)           ((u16)(((u16)(value)) & HFA384x_EVSTAT_TXEXC))
+#define                HFA384x_EVSTAT_ISTX(value)              ((u16)(((u16)(value)) & HFA384x_EVSTAT_TX))
+#define                HFA384x_EVSTAT_ISRX(value)              ((u16)(((u16)(value)) & HFA384x_EVSTAT_RX))
+
+#define                HFA384x_EVSTAT_ISBAP_OP(value)          ((u16)(((u16)(value)) & HFA384x_int_BAP_OP))
+
+#define                HFA384x_intEN_ISTICK(value)             ((u16)(((u16)(value)) & HFA384x_INTEN_TICK))
+#define                HFA384x_intEN_TICK_SET(value)           ((u16)(((u16)(value)) << 15))
+#define                HFA384x_intEN_ISWTERR(value)            ((u16)(((u16)(value)) & HFA384x_INTEN_WTERR))
+#define                HFA384x_intEN_WTERR_SET(value)          ((u16)(((u16)(value)) << 14))
+#define                HFA384x_intEN_ISINFDROP(value)          ((u16)(((u16)(value)) & HFA384x_INTEN_INFDROP))
+#define                HFA384x_intEN_INFDROP_SET(value)        ((u16)(((u16)(value)) << 13))
+#define                HFA384x_intEN_ISINFO(value)             ((u16)(((u16)(value)) & HFA384x_INTEN_INFO))
+#define                HFA384x_intEN_INFO_SET(value)           ((u16)(((u16)(value)) << 7))
+#define                HFA384x_intEN_ISDTIM(value)             ((u16)(((u16)(value)) & HFA384x_INTEN_DTIM))
+#define                HFA384x_intEN_DTIM_SET(value)           ((u16)(((u16)(value)) << 5))
+#define                HFA384x_intEN_ISCMD(value)              ((u16)(((u16)(value)) & HFA384x_INTEN_CMD))
+#define                HFA384x_intEN_CMD_SET(value)            ((u16)(((u16)(value)) << 4))
+#define                HFA384x_intEN_ISALLOC(value)            ((u16)(((u16)(value)) & HFA384x_INTEN_ALLOC))
+#define                HFA384x_intEN_ALLOC_SET(value)          ((u16)(((u16)(value)) << 3))
+#define                HFA384x_intEN_ISTXEXC(value)            ((u16)(((u16)(value)) & HFA384x_INTEN_TXEXC))
+#define                HFA384x_intEN_TXEXC_SET(value)          ((u16)(((u16)(value)) << 2))
+#define                HFA384x_intEN_ISTX(value)               ((u16)(((u16)(value)) & HFA384x_INTEN_TX))
+#define                HFA384x_intEN_TX_SET(value)             ((u16)(((u16)(value)) << 1))
+#define                HFA384x_intEN_ISRX(value)               ((u16)(((u16)(value)) & HFA384x_INTEN_RX))
+#define                HFA384x_intEN_RX_SET(value)             ((u16)(((u16)(value)) << 0))
+
+#define                HFA384x_EVACK_ISTICK(value)             ((u16)(((u16)(value)) & HFA384x_EVACK_TICK))
+#define                HFA384x_EVACK_TICK_SET(value)           ((u16)(((u16)(value)) << 15))
+#define                HFA384x_EVACK_ISWTERR(value)            ((u16)(((u16)(value)) & HFA384x_EVACK_WTERR))
+#define                HFA384x_EVACK_WTERR_SET(value)          ((u16)(((u16)(value)) << 14))
+#define                HFA384x_EVACK_ISINFDROP(value)          ((u16)(((u16)(value)) & HFA384x_EVACK_INFDROP))
+#define                HFA384x_EVACK_INFDROP_SET(value)        ((u16)(((u16)(value)) << 13))
+#define                HFA384x_EVACK_ISINFO(value)             ((u16)(((u16)(value)) & HFA384x_EVACK_INFO))
+#define                HFA384x_EVACK_INFO_SET(value)           ((u16)(((u16)(value)) << 7))
+#define                HFA384x_EVACK_ISDTIM(value)             ((u16)(((u16)(value)) & HFA384x_EVACK_DTIM))
+#define                HFA384x_EVACK_DTIM_SET(value)           ((u16)(((u16)(value)) << 5))
+#define                HFA384x_EVACK_ISCMD(value)              ((u16)(((u16)(value)) & HFA384x_EVACK_CMD))
+#define                HFA384x_EVACK_CMD_SET(value)            ((u16)(((u16)(value)) << 4))
+#define                HFA384x_EVACK_ISALLOC(value)            ((u16)(((u16)(value)) & HFA384x_EVACK_ALLOC))
+#define                HFA384x_EVACK_ALLOC_SET(value)          ((u16)(((u16)(value)) << 3))
+#define                HFA384x_EVACK_ISTXEXC(value)            ((u16)(((u16)(value)) & HFA384x_EVACK_TXEXC))
+#define                HFA384x_EVACK_TXEXC_SET(value)          ((u16)(((u16)(value)) << 2))
+#define                HFA384x_EVACK_ISTX(value)               ((u16)(((u16)(value)) & HFA384x_EVACK_TX))
+#define                HFA384x_EVACK_TX_SET(value)             ((u16)(((u16)(value)) << 1))
+#define                HFA384x_EVACK_ISRX(value)               ((u16)(((u16)(value)) & HFA384x_EVACK_RX))
+#define                HFA384x_EVACK_RX_SET(value)             ((u16)(((u16)(value)) << 0))
+
+#define                HFA384x_CONTROL_AUXEN_SET(value)        ((u16)(((u16)(value)) << 14))
+#define                HFA384x_CONTROL_AUXEN_GET(value)        ((u16)(((u16)(value)) >> 14))
 
 /* Byte Order */
 #ifdef __KERNEL__
-#define hfa384x2host_16(n)     (__le16_to_cpu((UINT16)(n)))
-#define hfa384x2host_32(n)     (__le32_to_cpu((UINT32)(n)))
-#define host2hfa384x_16(n)     (__cpu_to_le16((UINT16)(n)))
-#define host2hfa384x_32(n)     (__cpu_to_le32((UINT32)(n)))
+#define hfa384x2host_16(n)     (__le16_to_cpu((u16)(n)))
+#define hfa384x2host_32(n)     (__le32_to_cpu((u32)(n)))
+#define host2hfa384x_16(n)     (__cpu_to_le16((u16)(n)))
+#define host2hfa384x_32(n)     (__cpu_to_le32((u32)(n)))
 #endif
 
 /* Host Maintained State Info */
@@ -891,14 +891,14 @@ PD Record codes
 /* Commonly used basic types */
 typedef struct hfa384x_bytestr
 {
-       UINT16  len;
-       UINT8   data[0];
+       u16     len;
+       u8      data[0];
 } __WLAN_ATTRIB_PACK__ hfa384x_bytestr_t;
 
 typedef struct hfa384x_bytestr32
 {
-       UINT16  len;
-       UINT8   data[32];
+       u16     len;
+       u8      data[32];
 } __WLAN_ATTRIB_PACK__ hfa384x_bytestr32_t;
 
 /*--------------------------------------------------------------------
@@ -910,112 +910,112 @@ these members */
 
 typedef struct hfa384x_record
 {
-       UINT16  reclen;
-       UINT16  rid;
+       u16     reclen;
+       u16     rid;
 } __WLAN_ATTRIB_PACK__ hfa384x_rec_t;
 
 typedef struct hfa384x_record16
 {
-       UINT16  reclen;
-       UINT16  rid;
-       UINT16  val;
+       u16     reclen;
+       u16     rid;
+       u16     val;
 } __WLAN_ATTRIB_PACK__ hfa384x_rec16_t;
 
 typedef struct hfa384x_record32
 {
-       UINT16  reclen;
-       UINT16  rid;
-       UINT32  val;
+       u16     reclen;
+       u16     rid;
+       u32     val;
 } __WLAN_ATTRIB_PACK__ hfa384x_rec32;
 
 /*-- Hardware/Firmware Component Information ----------*/
 typedef struct hfa384x_compident
 {
-       UINT16  id;
-       UINT16  variant;
-       UINT16  major;
-       UINT16  minor;
+       u16     id;
+       u16     variant;
+       u16     major;
+       u16     minor;
 } __WLAN_ATTRIB_PACK__ hfa384x_compident_t;
 
 typedef struct hfa384x_caplevel
 {
-       UINT16  role;
-       UINT16  id;
-       UINT16  variant;
-       UINT16  bottom;
-       UINT16  top;
+       u16     role;
+       u16     id;
+       u16     variant;
+       u16     bottom;
+       u16     top;
 } __WLAN_ATTRIB_PACK__ hfa384x_caplevel_t;
 
 /*-- Configuration Record: cnfPortType --*/
 typedef struct hfa384x_cnfPortType
 {
-       UINT16  cnfPortType;
+       u16     cnfPortType;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfPortType_t;
 
 /*-- Configuration Record: cnfOwnMACAddress --*/
 typedef struct hfa384x_cnfOwnMACAddress
 {
-       UINT8   cnfOwnMACAddress[6];
+       u8      cnfOwnMACAddress[6];
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnMACAddress_t;
 
 /*-- Configuration Record: cnfDesiredSSID --*/
 typedef struct hfa384x_cnfDesiredSSID
 {
-       UINT8   cnfDesiredSSID[34];
+       u8      cnfDesiredSSID[34];
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfDesiredSSID_t;
 
 /*-- Configuration Record: cnfOwnChannel --*/
 typedef struct hfa384x_cnfOwnChannel
 {
-       UINT16  cnfOwnChannel;
+       u16     cnfOwnChannel;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnChannel_t;
 
 /*-- Configuration Record: cnfOwnSSID --*/
 typedef struct hfa384x_cnfOwnSSID
 {
-       UINT8   cnfOwnSSID[34];
+       u8      cnfOwnSSID[34];
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnSSID_t;
 
 /*-- Configuration Record: cnfOwnATIMWindow --*/
 typedef struct hfa384x_cnfOwnATIMWindow
 {
-       UINT16  cnfOwnATIMWindow;
+       u16     cnfOwnATIMWindow;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnATIMWindow_t;
 
 /*-- Configuration Record: cnfSystemScale --*/
 typedef struct hfa384x_cnfSystemScale
 {
-       UINT16  cnfSystemScale;
+       u16     cnfSystemScale;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfSystemScale_t;
 
 /*-- Configuration Record: cnfMaxDataLength --*/
 typedef struct hfa384x_cnfMaxDataLength
 {
-       UINT16  cnfMaxDataLength;
+       u16     cnfMaxDataLength;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfMaxDataLength_t;
 
 /*-- Configuration Record: cnfWDSAddress --*/
 typedef struct hfa384x_cnfWDSAddress
 {
-       UINT8   cnfWDSAddress[6];
+       u8      cnfWDSAddress[6];
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfWDSAddress_t;
 
 /*-- Configuration Record: cnfPMEnabled --*/
 typedef struct hfa384x_cnfPMEnabled
 {
-       UINT16  cnfPMEnabled;
+       u16     cnfPMEnabled;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfPMEnabled_t;
 
 /*-- Configuration Record: cnfPMEPS --*/
 typedef struct hfa384x_cnfPMEPS
 {
-       UINT16  cnfPMEPS;
+       u16     cnfPMEPS;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfPMEPS_t;
 
 /*-- Configuration Record: cnfMulticastReceive --*/
 typedef struct hfa384x_cnfMulticastReceive
 {
-       UINT16  cnfMulticastReceive;
+       u16     cnfMulticastReceive;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfMulticastReceive_t;
 
 /*-- Configuration Record: cnfAuthentication --*/
@@ -1026,37 +1026,37 @@ typedef struct hfa384x_cnfMulticastReceive
 /*-- Configuration Record: cnfMaxSleepDuration --*/
 typedef struct hfa384x_cnfMaxSleepDuration
 {
-       UINT16  cnfMaxSleepDuration;
+       u16     cnfMaxSleepDuration;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfMaxSleepDuration_t;
 
 /*-- Configuration Record: cnfPMHoldoverDuration --*/
 typedef struct hfa384x_cnfPMHoldoverDuration
 {
-       UINT16  cnfPMHoldoverDuration;
+       u16     cnfPMHoldoverDuration;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfPMHoldoverDuration_t;
 
 /*-- Configuration Record: cnfOwnName --*/
 typedef struct hfa384x_cnfOwnName
 {
-       UINT8   cnfOwnName[34];
+       u8      cnfOwnName[34];
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnName_t;
 
 /*-- Configuration Record: cnfOwnDTIMPeriod --*/
 typedef struct hfa384x_cnfOwnDTIMPeriod
 {
-       UINT16  cnfOwnDTIMPeriod;
+       u16     cnfOwnDTIMPeriod;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnDTIMPeriod_t;
 
 /*-- Configuration Record: cnfWDSAddress --*/
 typedef struct hfa384x_cnfWDSAddressN
 {
-       UINT8   cnfWDSAddress[6];
+       u8      cnfWDSAddress[6];
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfWDSAddressN_t;
 
 /*-- Configuration Record: cnfMulticastPMBuffering --*/
 typedef struct hfa384x_cnfMulticastPMBuffering
 {
-       UINT16  cnfMulticastPMBuffering;
+       u16     cnfMulticastPMBuffering;
 } __WLAN_ATTRIB_PACK__ hfa384x_cnfMulticastPMBuffering_t;
 
 /*--------------------------------------------------------------------
@@ -1067,13 +1067,13 @@ Configuration Record Structures:
 /*-- Configuration Record: GroupAddresses --*/
 typedef struct hfa384x_GroupAddresses
 {
-       UINT8   MACAddress[16][6];
+       u8      MACAddress[16][6];
 } __WLAN_ATTRIB_PACK__ hfa384x_GroupAddresses_t;
 
 /*-- Configuration Record: CreateIBSS --*/
 typedef struct hfa384x_CreateIBSS
 {
-       UINT16  CreateIBSS;
+       u16     CreateIBSS;
 } __WLAN_ATTRIB_PACK__ hfa384x_CreateIBSS_t;
 
 #define HFA384x_CREATEIBSS_JOINCREATEIBSS          0
@@ -1084,87 +1084,87 @@ typedef struct hfa384x_CreateIBSS
 /*-- Configuration Record: FragmentationThreshold --*/
 typedef struct hfa384x_FragmentationThreshold
 {
-       UINT16  FragmentationThreshold;
+       u16     FragmentationThreshold;
 } __WLAN_ATTRIB_PACK__ hfa384x_FragmentationThreshold_t;
 
 /*-- Configuration Record: RTSThreshold --*/
 typedef struct hfa384x_RTSThreshold
 {
-       UINT16  RTSThreshold;
+       u16     RTSThreshold;
 } __WLAN_ATTRIB_PACK__ hfa384x_RTSThreshold_t;
 
 /*-- Configuration Record: TxRateControl --*/
 typedef struct hfa384x_TxRateControl
 {
-       UINT16  TxRateControl;
+       u16     TxRateControl;
 } __WLAN_ATTRIB_PACK__ hfa384x_TxRateControl_t;
 
 /*-- Configuration Record: PromiscuousMode --*/
 typedef struct hfa384x_PromiscuousMode
 {
-       UINT16  PromiscuousMode;
+       u16     PromiscuousMode;
 } __WLAN_ATTRIB_PACK__ hfa384x_PromiscuousMode_t;
 
 /*-- Configuration Record: ScanRequest (data portion only) --*/
 typedef struct hfa384x_ScanRequest_data
 {
-       UINT16  channelList;
-       UINT16  txRate;
+       u16     channelList;
+       u16     txRate;
 } __WLAN_ATTRIB_PACK__ hfa384x_ScanRequest_data_t;
 
 /*-- Configuration Record: HostScanRequest (data portion only) --*/
 typedef struct hfa384x_HostScanRequest_data
 {
-       UINT16  channelList;
-       UINT16  txRate;
+       u16     channelList;
+       u16     txRate;
        hfa384x_bytestr32_t ssid;
 } __WLAN_ATTRIB_PACK__ hfa384x_HostScanRequest_data_t;
 
 /*-- Configuration Record: JoinRequest (data portion only) --*/
 typedef struct hfa384x_JoinRequest_data
 {
-       UINT8   bssid[WLAN_BSSID_LEN];
-       UINT16  channel;
+       u8      bssid[WLAN_BSSID_LEN];
+       u16     channel;
 } __WLAN_ATTRIB_PACK__ hfa384x_JoinRequest_data_t;
 
 /*-- Configuration Record: authenticateStation (data portion only) --*/
 typedef struct hfa384x_authenticateStation_data
 {
-       UINT8   address[WLAN_ADDR_LEN];
-       UINT16  status;
-       UINT16  algorithm;
+       u8      address[WLAN_ADDR_LEN];
+       u16     status;
+       u16     algorithm;
 } __WLAN_ATTRIB_PACK__ hfa384x_authenticateStation_data_t;
 
 /*-- Configuration Record: associateStation (data portion only) --*/
 typedef struct hfa384x_associateStation_data
 {
-       UINT8   address[WLAN_ADDR_LEN];
-       UINT16  status;
-       UINT16  type;
+       u8      address[WLAN_ADDR_LEN];
+       u16     status;
+       u16     type;
 } __WLAN_ATTRIB_PACK__ hfa384x_associateStation_data_t;
 
 /*-- Configuration Record: ChannelInfoRequest (data portion only) --*/
 typedef struct hfa384x_ChannelInfoRequest_data
 {
-       UINT16  channelList;
-       UINT16  channelDwellTime;
+       u16     channelList;
+       u16     channelDwellTime;
 } __WLAN_ATTRIB_PACK__ hfa384x_ChannelInfoRequest_data_t;
 
 /*-- Configuration Record: WEPKeyMapping (data portion only) --*/
 typedef struct hfa384x_WEPKeyMapping
 {
-       UINT8   address[WLAN_ADDR_LEN];
-       UINT16  key_index;
-       UINT8   key[16];
-       UINT8   mic_transmit_key[4];
-       UINT8   mic_receive_key[4];
+       u8      address[WLAN_ADDR_LEN];
+       u16     key_index;
+       u8      key[16];
+       u8      mic_transmit_key[4];
+       u8      mic_receive_key[4];
 } __WLAN_ATTRIB_PACK__ hfa384x_WEPKeyMapping_t;
 
 /*-- Configuration Record: WPAData       (data portion only) --*/
 typedef struct hfa384x_WPAData
 {
-       UINT16  datalen;
-        UINT8  data[0]; // max 80
+       u16     datalen;
+        u8     data[0]; // max 80
 } __WLAN_ATTRIB_PACK__ hfa384x_WPAData_t;
 
 /*--------------------------------------------------------------------
@@ -1174,7 +1174,7 @@ Configuration Record Structures: Behavior Parameters
 /*-- Configuration Record: TickTime --*/
 typedef struct hfa384x_TickTime
 {
-       UINT16  TickTime;
+       u16     TickTime;
 } __WLAN_ATTRIB_PACK__ hfa384x_TickTime_t;
 
 /*--------------------------------------------------------------------
@@ -1184,146 +1184,146 @@ Information Record Structures: NIC Information
 /*-- Information Record: MaxLoadTime --*/
 typedef struct hfa384x_MaxLoadTime
 {
-       UINT16  MaxLoadTime;
+       u16     MaxLoadTime;
 } __WLAN_ATTRIB_PACK__ hfa384x_MaxLoadTime_t;
 
 /*-- Information Record: DownLoadBuffer --*/
 /* NOTE: The page and offset are in AUX format */
 typedef struct hfa384x_downloadbuffer
 {
-       UINT16  page;
-       UINT16  offset;
-       UINT16  len;
+       u16     page;
+       u16     offset;
+       u16     len;
 } __WLAN_ATTRIB_PACK__ hfa384x_downloadbuffer_t;
 
 /*-- Information Record: PRIIdentity --*/
 typedef struct hfa384x_PRIIdentity
 {
-       UINT16  PRICompID;
-       UINT16  PRIVariant;
-       UINT16  PRIMajorVersion;
-       UINT16  PRIMinorVersion;
+       u16     PRICompID;
+       u16     PRIVariant;
+       u16     PRIMajorVersion;
+       u16     PRIMinorVersion;
 } __WLAN_ATTRIB_PACK__ hfa384x_PRIIdentity_t;
 
 /*-- Information Record: PRISupRange --*/
 typedef struct hfa384x_PRISupRange
 {
-       UINT16  PRIRole;
-       UINT16  PRIID;
-       UINT16  PRIVariant;
-       UINT16  PRIBottom;
-       UINT16  PRITop;
+       u16     PRIRole;
+       u16     PRIID;
+       u16     PRIVariant;
+       u16     PRIBottom;
+       u16     PRITop;
 } __WLAN_ATTRIB_PACK__ hfa384x_PRISupRange_t;
 
 /*-- Information Record: CFIActRanges --*/
 typedef struct hfa384x_CFIActRanges
 {
-       UINT16  CFIRole;
-       UINT16  CFIID;
-       UINT16  CFIVariant;
-       UINT16  CFIBottom;
-       UINT16  CFITop;
+       u16     CFIRole;
+       u16     CFIID;
+       u16     CFIVariant;
+       u16     CFIBottom;
+       u16     CFITop;
 } __WLAN_ATTRIB_PACK__ hfa384x_CFIActRanges_t;
 
 /*-- Information Record: NICSerialNumber --*/
 typedef struct hfa384x_NICSerialNumber
 {
-       UINT8   NICSerialNumber[12];
+       u8      NICSerialNumber[12];
 } __WLAN_ATTRIB_PACK__ hfa384x_NICSerialNumber_t;
 
 /*-- Information Record: NICIdentity --*/
 typedef struct hfa384x_NICIdentity
 {
-       UINT16  NICCompID;
-       UINT16  NICVariant;
-       UINT16  NICMajorVersion;
-       UINT16  NICMinorVersion;
+       u16     NICCompID;
+       u16     NICVariant;
+       u16     NICMajorVersion;
+       u16     NICMinorVersion;
 } __WLAN_ATTRIB_PACK__ hfa384x_NICIdentity_t;
 
 /*-- Information Record: MFISupRange --*/
 typedef struct hfa384x_MFISupRange
 {
-       UINT16  MFIRole;
-       UINT16  MFIID;
-       UINT16  MFIVariant;
-       UINT16  MFIBottom;
-       UINT16  MFITop;
+       u16     MFIRole;
+       u16     MFIID;
+       u16     MFIVariant;
+       u16     MFIBottom;
+       u16     MFITop;
 } __WLAN_ATTRIB_PACK__ hfa384x_MFISupRange_t;
 
 /*-- Information Record: CFISupRange --*/
 typedef struct hfa384x_CFISupRange
 {
-       UINT16  CFIRole;
-       UINT16  CFIID;
-       UINT16  CFIVariant;
-       UINT16  CFIBottom;
-       UINT16  CFITop;
+       u16     CFIRole;
+       u16     CFIID;
+       u16     CFIVariant;
+       u16     CFIBottom;
+       u16     CFITop;
 } __WLAN_ATTRIB_PACK__ hfa384x_CFISupRange_t;
 
 /*-- Information Record: BUILDSEQ:BuildSeq --*/
 typedef struct hfa384x_BuildSeq {
-       UINT16  primary;
-       UINT16  secondary;
+       u16     primary;
+       u16     secondary;
 } __WLAN_ATTRIB_PACK__ hfa384x_BuildSeq_t;
 
 /*-- Information Record: FWID --*/
 #define HFA384x_FWID_LEN       14
 typedef struct hfa384x_FWID {
-       UINT8   primary[HFA384x_FWID_LEN];
-       UINT8   secondary[HFA384x_FWID_LEN];
+       u8      primary[HFA384x_FWID_LEN];
+       u8      secondary[HFA384x_FWID_LEN];
 } __WLAN_ATTRIB_PACK__ hfa384x_FWID_t;
 
 /*-- Information Record: ChannelList --*/
 typedef struct hfa384x_ChannelList
 {
-       UINT16  ChannelList;
+       u16     ChannelList;
 } __WLAN_ATTRIB_PACK__ hfa384x_ChannelList_t;
 
 /*-- Information Record: RegulatoryDomains --*/
 typedef struct hfa384x_RegulatoryDomains
 {
-       UINT8   RegulatoryDomains[12];
+       u8      RegulatoryDomains[12];
 } __WLAN_ATTRIB_PACK__ hfa384x_RegulatoryDomains_t;
 
 /*-- Information Record: TempType --*/
 typedef struct hfa384x_TempType
 {
-       UINT16  TempType;
+       u16     TempType;
 } __WLAN_ATTRIB_PACK__ hfa384x_TempType_t;
 
 /*-- Information Record: CIS --*/
 typedef struct hfa384x_CIS
 {
-       UINT8   CIS[480];
+       u8      CIS[480];
 } __WLAN_ATTRIB_PACK__ hfa384x_CIS_t;
 
 /*-- Information Record: STAIdentity --*/
 typedef struct hfa384x_STAIdentity
 {
-       UINT16  STACompID;
-       UINT16  STAVariant;
-       UINT16  STAMajorVersion;
-       UINT16  STAMinorVersion;
+       u16     STACompID;
+       u16     STAVariant;
+       u16     STAMajorVersion;
+       u16     STAMinorVersion;
 } __WLAN_ATTRIB_PACK__ hfa384x_STAIdentity_t;
 
 /*-- Information Record: STASupRange --*/
 typedef struct hfa384x_STASupRange
 {
-       UINT16  STARole;
-       UINT16  STAID;
-       UINT16  STAVariant;
-       UINT16  STABottom;
-       UINT16  STATop;
+       u16     STARole;
+       u16     STAID;
+       u16     STAVariant;
+       u16     STABottom;
+       u16     STATop;
 } __WLAN_ATTRIB_PACK__ hfa384x_STASupRange_t;
 
 /*-- Information Record: MFIActRanges --*/
 typedef struct hfa384x_MFIActRanges
 {
-       UINT16  MFIRole;
-       UINT16  MFIID;
-       UINT16  MFIVariant;
-       UINT16  MFIBottom;
-       UINT16  MFITop;
+       u16     MFIRole;
+       u16     MFIID;
+       u16     MFIVariant;
+       u16     MFIBottom;
+       u16     MFITop;
 } __WLAN_ATTRIB_PACK__ hfa384x_MFIActRanges_t;
 
 /*--------------------------------------------------------------------
@@ -1333,145 +1333,145 @@ Information Record Structures: NIC Information
 /*-- Information Record: PortStatus --*/
 typedef struct hfa384x_PortStatus
 {
-       UINT16  PortStatus;
+       u16     PortStatus;
 } __WLAN_ATTRIB_PACK__ hfa384x_PortStatus_t;
 
-#define HFA384x_PSTATUS_DISABLED       ((UINT16)1)
-#define HFA384x_PSTATUS_SEARCHING      ((UINT16)2)
-#define HFA384x_PSTATUS_CONN_IBSS      ((UINT16)3)
-#define HFA384x_PSTATUS_CONN_ESS       ((UINT16)4)
-#define HFA384x_PSTATUS_OUTOFRANGE     ((UINT16)5)
-#define HFA384x_PSTATUS_CONN_WDS       ((UINT16)6)
+#define HFA384x_PSTATUS_DISABLED       ((u16)1)
+#define HFA384x_PSTATUS_SEARCHING      ((u16)2)
+#define HFA384x_PSTATUS_CONN_IBSS      ((u16)3)
+#define HFA384x_PSTATUS_CONN_ESS       ((u16)4)
+#define HFA384x_PSTATUS_OUTOFRANGE     ((u16)5)
+#define HFA384x_PSTATUS_CONN_WDS       ((u16)6)
 
 /*-- Information Record: CurrentSSID --*/
 typedef struct hfa384x_CurrentSSID
 {
-       UINT8   CurrentSSID[34];
+       u8      CurrentSSID[34];
 } __WLAN_ATTRIB_PACK__ hfa384x_CurrentSSID_t;
 
 /*-- Information Record: CurrentBSSID --*/
 typedef struct hfa384x_CurrentBSSID
 {
-       UINT8   CurrentBSSID[6];
+       u8      CurrentBSSID[6];
 } __WLAN_ATTRIB_PACK__ hfa384x_CurrentBSSID_t;
 
 /*-- Information Record: commsquality --*/
 typedef struct hfa384x_commsquality
 {
-       UINT16  CQ_currBSS;
-       UINT16  ASL_currBSS;
-       UINT16  ANL_currFC;
+       u16     CQ_currBSS;
+       u16     ASL_currBSS;
+       u16     ANL_currFC;
 } __WLAN_ATTRIB_PACK__ hfa384x_commsquality_t;
 
 /*-- Information Record: dmbcommsquality --*/
 typedef struct hfa384x_dbmcommsquality
 {
-       UINT16  CQdbm_currBSS;
-       UINT16  ASLdbm_currBSS;
-       UINT16  ANLdbm_currFC;
+       u16     CQdbm_currBSS;
+       u16     ASLdbm_currBSS;
+       u16     ANLdbm_currFC;
 } __WLAN_ATTRIB_PACK__ hfa384x_dbmcommsquality_t;
 
 /*-- Information Record: CurrentTxRate --*/
 typedef struct hfa384x_CurrentTxRate
 {
-       UINT16  CurrentTxRate;
+       u16     CurrentTxRate;
 } __WLAN_ATTRIB_PACK__ hfa384x_CurrentTxRate_t;
 
 /*-- Information Record: CurrentBeaconInterval --*/
 typedef struct hfa384x_CurrentBeaconInterval
 {
-       UINT16  CurrentBeaconInterval;
+       u16     CurrentBeaconInterval;
 } __WLAN_ATTRIB_PACK__ hfa384x_CurrentBeaconInterval_t;
 
 /*-- Information Record: CurrentScaleThresholds --*/
 typedef struct hfa384x_CurrentScaleThresholds
 {
-       UINT16  EnergyDetectThreshold;
-       UINT16  CarrierDetectThreshold;
-       UINT16  DeferDetectThreshold;
-       UINT16  CellSearchThreshold; /* Stations only */
-       UINT16  DeadSpotThreshold; /* Stations only */
+       u16     EnergyDetectThreshold;
+       u16     CarrierDetectThreshold;
+       u16     DeferDetectThreshold;
+       u16     CellSearchThreshold; /* Stations only */
+       u16     DeadSpotThreshold; /* Stations only */
 } __WLAN_ATTRIB_PACK__ hfa384x_CurrentScaleThresholds_t;
 
 /*-- Information Record: ProtocolRspTime --*/
 typedef struct hfa384x_ProtocolRspTime
 {
-       UINT16  ProtocolRspTime;
+       u16     ProtocolRspTime;
 } __WLAN_ATTRIB_PACK__ hfa384x_ProtocolRspTime_t;
 
 /*-- Information Record: ShortRetryLimit --*/
 typedef struct hfa384x_ShortRetryLimit
 {
-       UINT16  ShortRetryLimit;
+       u16     ShortRetryLimit;
 } __WLAN_ATTRIB_PACK__ hfa384x_ShortRetryLimit_t;
 
 /*-- Information Record: LongRetryLimit --*/
 typedef struct hfa384x_LongRetryLimit
 {
-       UINT16  LongRetryLimit;
+       u16     LongRetryLimit;
 } __WLAN_ATTRIB_PACK__ hfa384x_LongRetryLimit_t;
 
 /*-- Information Record: MaxTransmitLifetime --*/
 typedef struct hfa384x_MaxTransmitLifetime
 {
-       UINT16  MaxTransmitLifetime;
+       u16     MaxTransmitLifetime;
 } __WLAN_ATTRIB_PACK__ hfa384x_MaxTransmitLifetime_t;
 
 /*-- Information Record: MaxReceiveLifetime --*/
 typedef struct hfa384x_MaxReceiveLifetime
 {
-       UINT16  MaxReceiveLifetime;
+       u16     MaxReceiveLifetime;
 } __WLAN_ATTRIB_PACK__ hfa384x_MaxReceiveLifetime_t;
 
 /*-- Information Record: CFPollable --*/
 typedef struct hfa384x_CFPollable
 {
-       UINT16  CFPollable;
+       u16     CFPollable;
 } __WLAN_ATTRIB_PACK__ hfa384x_CFPollable_t;
 
 /*-- Information Record: AuthenticationAlgorithms --*/
 typedef struct hfa384x_AuthenticationAlgorithms
 {
-       UINT16  AuthenticationType;
-       UINT16  TypeEnabled;
+       u16     AuthenticationType;
+       u16     TypeEnabled;
 } __WLAN_ATTRIB_PACK__ hfa384x_AuthenticationAlgorithms_t;
 
 /*-- Information Record: AuthenticationAlgorithms
 (data only --*/
 typedef struct hfa384x_AuthenticationAlgorithms_data
 {
-       UINT16  AuthenticationType;
-       UINT16  TypeEnabled;
+       u16     AuthenticationType;
+       u16     TypeEnabled;
 } __WLAN_ATTRIB_PACK__ hfa384x_AuthenticationAlgorithms_data_t;
 
 /*-- Information Record: PrivacyOptionImplemented --*/
 typedef struct hfa384x_PrivacyOptionImplemented
 {
-       UINT16  PrivacyOptionImplemented;
+       u16     PrivacyOptionImplemented;
 } __WLAN_ATTRIB_PACK__ hfa384x_PrivacyOptionImplemented_t;
 
 /*-- Information Record: OwnMACAddress --*/
 typedef struct hfa384x_OwnMACAddress
 {
-       UINT8   OwnMACAddress[6];
+       u8      OwnMACAddress[6];
 } __WLAN_ATTRIB_PACK__ hfa384x_OwnMACAddress_t;
 
 /*-- Information Record: PCFInfo --*/
 typedef struct hfa384x_PCFInfo
 {
-       UINT16  MediumOccupancyLimit;
-       UINT16  CFPPeriod;
-       UINT16  CFPMaxDuration;
-       UINT16  CFPFlags;
+       u16     MediumOccupancyLimit;
+       u16     CFPPeriod;
+       u16     CFPMaxDuration;
+       u16     CFPFlags;
 } __WLAN_ATTRIB_PACK__ hfa384x_PCFInfo_t;
 
 /*-- Information Record: PCFInfo (data portion only) --*/
 typedef struct hfa384x_PCFInfo_data
 {
-       UINT16  MediumOccupancyLimit;
-       UINT16  CFPPeriod;
-       UINT16  CFPMaxDuration;
-       UINT16  CFPFlags;
+       u16     MediumOccupancyLimit;
+       u16     CFPPeriod;
+       u16     CFPMaxDuration;
+       u16     CFPFlags;
 } __WLAN_ATTRIB_PACK__ hfa384x_PCFInfo_data_t;
 
 /*--------------------------------------------------------------------
@@ -1481,39 +1481,39 @@ Information Record Structures: Modem Information Records
 /*-- Information Record: PHYType --*/
 typedef struct hfa384x_PHYType
 {
-       UINT16  PHYType;
+       u16     PHYType;
 } __WLAN_ATTRIB_PACK__ hfa384x_PHYType_t;
 
 /*-- Information Record: CurrentChannel --*/
 typedef struct hfa384x_CurrentChannel
 {
-       UINT16  CurrentChannel;
+       u16     CurrentChannel;
 } __WLAN_ATTRIB_PACK__ hfa384x_CurrentChannel_t;
 
 /*-- Information Record: CurrentPowerState --*/
 typedef struct hfa384x_CurrentPowerState
 {
-       UINT16  CurrentPowerState;
+       u16     CurrentPowerState;
 } __WLAN_ATTRIB_PACK__ hfa384x_CurrentPowerState_t;
 
 /*-- Information Record: CCAMode --*/
 typedef struct hfa384x_CCAMode
 {
-       UINT16  CCAMode;
+       u16     CCAMode;
 } __WLAN_ATTRIB_PACK__ hfa384x_CCAMode_t;
 
 /*-- Information Record: SupportedDataRates --*/
 typedef struct hfa384x_SupportedDataRates
 {
-       UINT8   SupportedDataRates[10];
+       u8      SupportedDataRates[10];
 } __WLAN_ATTRIB_PACK__ hfa384x_SupportedDataRates_t;
 
 /*-- Information Record: LFOStatus --*/
 typedef struct hfa384x_LFOStatus
 {
-       UINT16  TestResults;
-       UINT16  LFOResult;
-       UINT16  VRHFOResult;
+       u16  TestResults;
+       u16  LFOResult;
+       u16  VRHFOResult;
 } __WLAN_ATTRIB_PACK__ hfa384x_LFOStatus_t;
 
 #define HFA384x_TESTRESULT_ALLPASSED    BIT0
@@ -1525,11 +1525,11 @@ typedef struct hfa384x_LFOStatus
 /*-- Information Record: LEDControl --*/
 typedef struct hfa384x_LEDControl
 {
-       UINT16  searching_on;
-       UINT16  searching_off;
-       UINT16  assoc_on;
-       UINT16  assoc_off;
-       UINT16  activity;
+       u16  searching_on;
+       u16  searching_off;
+       u16  assoc_on;
+       u16  assoc_off;
+       u16  activity;
 } __WLAN_ATTRIB_PACK__ hfa384x_LEDControl_t;
 
 /*--------------------------------------------------------------------
@@ -1540,32 +1540,32 @@ FRAME DESCRIPTORS: Offsets
 ----------------------------------------------------------------------
 Control Info (offset 44-51)
 --------------------------------------------------------------------*/
-#define                HFA384x_FD_STATUS_OFF                   ((UINT16)0x44)
-#define                HFA384x_FD_TIME_OFF                     ((UINT16)0x46)
-#define                HFA384x_FD_SWSUPPORT_OFF                ((UINT16)0x4A)
-#define                HFA384x_FD_SILENCE_OFF                  ((UINT16)0x4A)
-#define                HFA384x_FD_SIGNAL_OFF                   ((UINT16)0x4B)
-#define                HFA384x_FD_RATE_OFF                     ((UINT16)0x4C)
-#define                HFA384x_FD_RXFLOW_OFF                   ((UINT16)0x4D)
-#define                HFA384x_FD_RESERVED_OFF                 ((UINT16)0x4E)
-#define                HFA384x_FD_TXCONTROL_OFF                ((UINT16)0x50)
+#define                HFA384x_FD_STATUS_OFF                   ((u16)0x44)
+#define                HFA384x_FD_TIME_OFF                     ((u16)0x46)
+#define                HFA384x_FD_SWSUPPORT_OFF                ((u16)0x4A)
+#define                HFA384x_FD_SILENCE_OFF                  ((u16)0x4A)
+#define                HFA384x_FD_SIGNAL_OFF                   ((u16)0x4B)
+#define                HFA384x_FD_RATE_OFF                     ((u16)0x4C)
+#define                HFA384x_FD_RXFLOW_OFF                   ((u16)0x4D)
+#define                HFA384x_FD_RESERVED_OFF                 ((u16)0x4E)
+#define                HFA384x_FD_TXCONTROL_OFF                ((u16)0x50)
 /*--------------------------------------------------------------------
 802.11 Header (offset 52-6B)
 --------------------------------------------------------------------*/
-#define                HFA384x_FD_FRAMECONTROL_OFF             ((UINT16)0x52)
-#define                HFA384x_FD_DURATIONID_OFF               ((UINT16)0x54)
-#define                HFA384x_FD_ADDRESS1_OFF                 ((UINT16)0x56)
-#define                HFA384x_FD_ADDRESS2_OFF                 ((UINT16)0x5C)
-#define                HFA384x_FD_ADDRESS3_OFF                 ((UINT16)0x62)
-#define                HFA384x_FD_SEQCONTROL_OFF               ((UINT16)0x68)
-#define                HFA384x_FD_ADDRESS4_OFF                 ((UINT16)0x6A)
-#define                HFA384x_FD_DATALEN_OFF                  ((UINT16)0x70)
+#define                HFA384x_FD_FRAMECONTROL_OFF             ((u16)0x52)
+#define                HFA384x_FD_DURATIONID_OFF               ((u16)0x54)
+#define                HFA384x_FD_ADDRESS1_OFF                 ((u16)0x56)
+#define                HFA384x_FD_ADDRESS2_OFF                 ((u16)0x5C)
+#define                HFA384x_FD_ADDRESS3_OFF                 ((u16)0x62)
+#define                HFA384x_FD_SEQCONTROL_OFF               ((u16)0x68)
+#define                HFA384x_FD_ADDRESS4_OFF                 ((u16)0x6A)
+#define                HFA384x_FD_DATALEN_OFF                  ((u16)0x70)
 /*--------------------------------------------------------------------
 802.3 Header (offset 72-7F)
 --------------------------------------------------------------------*/
-#define                HFA384x_FD_DESTADDRESS_OFF              ((UINT16)0x72)
-#define                HFA384x_FD_SRCADDRESS_OFF               ((UINT16)0x78)
-#define                HFA384x_FD_DATALENGTH_OFF               ((UINT16)0x7E)
+#define                HFA384x_FD_DESTADDRESS_OFF              ((u16)0x72)
+#define                HFA384x_FD_SRCADDRESS_OFF               ((u16)0x78)
+#define                HFA384x_FD_DATALENGTH_OFF               ((u16)0x7E)
 
 /*--------------------------------------------------------------------
 FRAME STRUCTURES: Communication Frames
@@ -1575,67 +1575,67 @@ Communication Frames: Transmit Frames
 /*-- Communication Frame: Transmit Frame Structure --*/
 typedef struct hfa384x_tx_frame
 {
-       UINT16  status;
-       UINT16  reserved1;
-       UINT16  reserved2;
-       UINT32  sw_support;
-       UINT8   tx_retrycount;
-       UINT8   tx_rate;
-       UINT16  tx_control;
+       u16     status;
+       u16     reserved1;
+       u16     reserved2;
+       u32     sw_support;
+       u8      tx_retrycount;
+       u8   tx_rate;
+       u16     tx_control;
 
        /*-- 802.11 Header Information --*/
 
-       UINT16  frame_control;
-       UINT16  duration_id;
-       UINT8   address1[6];
-       UINT8   address2[6];
-       UINT8   address3[6];
-       UINT16  sequence_control;
-       UINT8   address4[6];
-       UINT16  data_len; /* little endian format */
+       u16     frame_control;
+       u16     duration_id;
+       u8      address1[6];
+       u8      address2[6];
+       u8      address3[6];
+       u16     sequence_control;
+       u8      address4[6];
+       u16     data_len; /* little endian format */
 
        /*-- 802.3 Header Information --*/
 
-       UINT8   dest_addr[6];
-       UINT8   src_addr[6];
-       UINT16  data_length; /* big endian format */
+       u8      dest_addr[6];
+       u8      src_addr[6];
+       u16     data_length; /* big endian format */
 } __WLAN_ATTRIB_PACK__ hfa384x_tx_frame_t;
 /*--------------------------------------------------------------------
 Communication Frames: Field Masks for Transmit Frames
 --------------------------------------------------------------------*/
 /*-- Status Field --*/
-#define                HFA384x_TXSTATUS_ACKERR                 ((UINT16)BIT5)
-#define                HFA384x_TXSTATUS_FORMERR                ((UINT16)BIT3)
-#define                HFA384x_TXSTATUS_DISCON                 ((UINT16)BIT2)
-#define                HFA384x_TXSTATUS_AGEDERR                ((UINT16)BIT1)
-#define                HFA384x_TXSTATUS_RETRYERR               ((UINT16)BIT0)
+#define                HFA384x_TXSTATUS_ACKERR                 ((u16)BIT5)
+#define                HFA384x_TXSTATUS_FORMERR                ((u16)BIT3)
+#define                HFA384x_TXSTATUS_DISCON                 ((u16)BIT2)
+#define                HFA384x_TXSTATUS_AGEDERR                ((u16)BIT1)
+#define                HFA384x_TXSTATUS_RETRYERR               ((u16)BIT0)
 /*-- Transmit Control Field --*/
-#define                HFA384x_TX_CFPOLL                       ((UINT16)BIT12)
-#define                HFA384x_TX_PRST                         ((UINT16)BIT11)
-#define                HFA384x_TX_MACPORT                      ((UINT16)(BIT10 | BIT9 | BIT8))
-#define                HFA384x_TX_NOENCRYPT                    ((UINT16)BIT7)
-#define                HFA384x_TX_RETRYSTRAT                   ((UINT16)(BIT6 | BIT5))
-#define                HFA384x_TX_STRUCTYPE                    ((UINT16)(BIT4 | BIT3))
-#define                HFA384x_TX_TXEX                         ((UINT16)BIT2)
-#define                HFA384x_TX_TXOK                         ((UINT16)BIT1)
+#define                HFA384x_TX_CFPOLL                       ((u16)BIT12)
+#define                HFA384x_TX_PRST                         ((u16)BIT11)
+#define                HFA384x_TX_MACPORT                      ((u16)(BIT10 | BIT9 | BIT8))
+#define                HFA384x_TX_NOENCRYPT                    ((u16)BIT7)
+#define                HFA384x_TX_RETRYSTRAT                   ((u16)(BIT6 | BIT5))
+#define                HFA384x_TX_STRUCTYPE                    ((u16)(BIT4 | BIT3))
+#define                HFA384x_TX_TXEX                         ((u16)BIT2)
+#define                HFA384x_TX_TXOK                         ((u16)BIT1)
 /*--------------------------------------------------------------------
 Communication Frames: Test/Get/Set Field Values for Transmit Frames
 --------------------------------------------------------------------*/
 /*-- Status Field --*/
 #define HFA384x_TXSTATUS_ISERROR(v)    \
-       (((UINT16)(v))&\
+       (((u16)(v))&\
        (HFA384x_TXSTATUS_ACKERR|HFA384x_TXSTATUS_FORMERR|\
        HFA384x_TXSTATUS_DISCON|HFA384x_TXSTATUS_AGEDERR|\
        HFA384x_TXSTATUS_RETRYERR))
 
-#define        HFA384x_TXSTATUS_ISACKERR(v)    ((UINT16)(((UINT16)(v)) & HFA384x_TXSTATUS_ACKERR))
-#define        HFA384x_TXSTATUS_ISFORMERR(v)   ((UINT16)(((UINT16)(v)) & HFA384x_TXSTATUS_FORMERR))
-#define        HFA384x_TXSTATUS_ISDISCON(v)    ((UINT16)(((UINT16)(v)) & HFA384x_TXSTATUS_DISCON))
-#define        HFA384x_TXSTATUS_ISAGEDERR(v)   ((UINT16)(((UINT16)(v)) & HFA384x_TXSTATUS_AGEDERR))
-#define        HFA384x_TXSTATUS_ISRETRYERR(v)  ((UINT16)(((UINT16)(v)) & HFA384x_TXSTATUS_RETRYERR))
+#define        HFA384x_TXSTATUS_ISACKERR(v)    ((u16)(((u16)(v)) & HFA384x_TXSTATUS_ACKERR))
+#define        HFA384x_TXSTATUS_ISFORMERR(v)   ((u16)(((u16)(v)) & HFA384x_TXSTATUS_FORMERR))
+#define        HFA384x_TXSTATUS_ISDISCON(v)    ((u16)(((u16)(v)) & HFA384x_TXSTATUS_DISCON))
+#define        HFA384x_TXSTATUS_ISAGEDERR(v)   ((u16)(((u16)(v)) & HFA384x_TXSTATUS_AGEDERR))
+#define        HFA384x_TXSTATUS_ISRETRYERR(v)  ((u16)(((u16)(v)) & HFA384x_TXSTATUS_RETRYERR))
 
-#define        HFA384x_TX_GET(v,m,s)           ((((UINT16)(v))&((UINT16)(m)))>>((UINT16)(s)))
-#define        HFA384x_TX_SET(v,m,s)           ((((UINT16)(v))<<((UINT16)(s)))&((UINT16)(m)))
+#define        HFA384x_TX_GET(v,m,s)           ((((u16)(v))&((u16)(m)))>>((u16)(s)))
+#define        HFA384x_TX_SET(v,m,s)           ((((u16)(v))<<((u16)(s)))&((u16)(m)))
 
 #define        HFA384x_TX_CFPOLL_GET(v)        HFA384x_TX_GET(v, HFA384x_TX_CFPOLL,12)
 #define        HFA384x_TX_CFPOLL_SET(v)        HFA384x_TX_SET(v, HFA384x_TX_CFPOLL,12)
@@ -1660,70 +1660,70 @@ Communication Frames: Receive Frames
 typedef struct hfa384x_rx_frame
 {
        /*-- MAC rx descriptor (hfa384x byte order) --*/
-       UINT16  status;
-       UINT32  time;
-       UINT8   silence;
-       UINT8   signal;
-       UINT8   rate;
-       UINT8   rx_flow;
-       UINT16  reserved1;
-       UINT16  reserved2;
+       u16     status;
+       u32     time;
+       u8      silence;
+       u8      signal;
+       u8      rate;
+       u8      rx_flow;
+       u16     reserved1;
+       u16     reserved2;
 
        /*-- 802.11 Header Information (802.11 byte order) --*/
-       UINT16  frame_control;
-       UINT16  duration_id;
-       UINT8   address1[6];
-       UINT8   address2[6];
-       UINT8   address3[6];
-       UINT16  sequence_control;
-       UINT8   address4[6];
-       UINT16  data_len; /* hfa384x (little endian) format */
+       u16     frame_control;
+       u16     duration_id;
+       u8      address1[6];
+       u8      address2[6];
+       u8      address3[6];
+       u16     sequence_control;
+       u8      address4[6];
+       u16     data_len; /* hfa384x (little endian) format */
 
        /*-- 802.3 Header Information --*/
-       UINT8   dest_addr[6];
-       UINT8   src_addr[6];
-       UINT16  data_length; /* IEEE? (big endian) format */
+       u8      dest_addr[6];
+       u8      src_addr[6];
+       u16     data_length; /* IEEE? (big endian) format */
 } __WLAN_ATTRIB_PACK__ hfa384x_rx_frame_t;
 /*--------------------------------------------------------------------
 Communication Frames: Field Masks for Receive Frames
 --------------------------------------------------------------------*/
 /*-- Offsets --------*/
-#define                HFA384x_RX_DATA_LEN_OFF                 ((UINT16)44)
-#define                HFA384x_RX_80211HDR_OFF                 ((UINT16)14)
-#define                HFA384x_RX_DATA_OFF                     ((UINT16)60)
+#define                HFA384x_RX_DATA_LEN_OFF                 ((u16)44)
+#define                HFA384x_RX_80211HDR_OFF                 ((u16)14)
+#define                HFA384x_RX_DATA_OFF                     ((u16)60)
 
 /*-- Status Fields --*/
-#define                HFA384x_RXSTATUS_MSGTYPE                ((UINT16)(BIT15 | BIT14 | BIT13))
-#define                HFA384x_RXSTATUS_MACPORT                ((UINT16)(BIT10 | BIT9 | BIT8))
-#define                HFA384x_RXSTATUS_UNDECR                 ((UINT16)BIT1)
-#define                HFA384x_RXSTATUS_FCSERR                 ((UINT16)BIT0)
+#define                HFA384x_RXSTATUS_MSGTYPE                ((u16)(BIT15 | BIT14 | BIT13))
+#define                HFA384x_RXSTATUS_MACPORT                ((u16)(BIT10 | BIT9 | BIT8))
+#define                HFA384x_RXSTATUS_UNDECR                 ((u16)BIT1)
+#define                HFA384x_RXSTATUS_FCSERR                 ((u16)BIT0)
 /*--------------------------------------------------------------------
 Communication Frames: Test/Get/Set Field Values for Receive Frames
 --------------------------------------------------------------------*/
-#define                HFA384x_RXSTATUS_MSGTYPE_GET(value)     ((UINT16)((((UINT16)(value)) & HFA384x_RXSTATUS_MSGTYPE) >> 13))
-#define                HFA384x_RXSTATUS_MSGTYPE_SET(value)     ((UINT16)(((UINT16)(value)) << 13))
-#define                HFA384x_RXSTATUS_MACPORT_GET(value)     ((UINT16)((((UINT16)(value)) & HFA384x_RXSTATUS_MACPORT) >> 8))
-#define                HFA384x_RXSTATUS_MACPORT_SET(value)     ((UINT16)(((UINT16)(value)) << 8))
-#define                HFA384x_RXSTATUS_ISUNDECR(value)        ((UINT16)(((UINT16)(value)) & HFA384x_RXSTATUS_UNDECR))
-#define                HFA384x_RXSTATUS_ISFCSERR(value)        ((UINT16)(((UINT16)(value)) & HFA384x_RXSTATUS_FCSERR))
+#define                HFA384x_RXSTATUS_MSGTYPE_GET(value)     ((u16)((((u16)(value)) & HFA384x_RXSTATUS_MSGTYPE) >> 13))
+#define                HFA384x_RXSTATUS_MSGTYPE_SET(value)     ((u16)(((u16)(value)) << 13))
+#define                HFA384x_RXSTATUS_MACPORT_GET(value)     ((u16)((((u16)(value)) & HFA384x_RXSTATUS_MACPORT) >> 8))
+#define                HFA384x_RXSTATUS_MACPORT_SET(value)     ((u16)(((u16)(value)) << 8))
+#define                HFA384x_RXSTATUS_ISUNDECR(value)        ((u16)(((u16)(value)) & HFA384x_RXSTATUS_UNDECR))
+#define                HFA384x_RXSTATUS_ISFCSERR(value)        ((u16)(((u16)(value)) & HFA384x_RXSTATUS_FCSERR))
 /*--------------------------------------------------------------------
  FRAME STRUCTURES: Information Types and Information Frame Structures
 ----------------------------------------------------------------------
 Information Types
 --------------------------------------------------------------------*/
-#define                HFA384x_IT_HANDOVERADDR                 ((UINT16)0xF000UL)
-#define                HFA384x_IT_HANDOVERDEAUTHADDRESS        ((UINT16)0xF001UL)//AP 1.3.7
-#define                HFA384x_IT_COMMTALLIES                  ((UINT16)0xF100UL)
-#define                HFA384x_IT_SCANRESULTS                  ((UINT16)0xF101UL)
-#define                HFA384x_IT_CHINFORESULTS                ((UINT16)0xF102UL)
-#define                HFA384x_IT_HOSTSCANRESULTS              ((UINT16)0xF103UL)
-#define                HFA384x_IT_LINKSTATUS                   ((UINT16)0xF200UL)
-#define                HFA384x_IT_ASSOCSTATUS                  ((UINT16)0xF201UL)
-#define                HFA384x_IT_AUTHREQ                      ((UINT16)0xF202UL)
-#define                HFA384x_IT_PSUSERCNT                    ((UINT16)0xF203UL)
-#define                HFA384x_IT_KEYIDCHANGED                 ((UINT16)0xF204UL)
-#define                HFA384x_IT_ASSOCREQ                     ((UINT16)0xF205UL)
-#define                HFA384x_IT_MICFAILURE                   ((UINT16)0xF206UL)
+#define                HFA384x_IT_HANDOVERADDR                 ((u16)0xF000UL)
+#define                HFA384x_IT_HANDOVERDEAUTHADDRESS        ((u16)0xF001UL)//AP 1.3.7
+#define                HFA384x_IT_COMMTALLIES                  ((u16)0xF100UL)
+#define                HFA384x_IT_SCANRESULTS                  ((u16)0xF101UL)
+#define                HFA384x_IT_CHINFORESULTS                ((u16)0xF102UL)
+#define                HFA384x_IT_HOSTSCANRESULTS              ((u16)0xF103UL)
+#define                HFA384x_IT_LINKSTATUS                   ((u16)0xF200UL)
+#define                HFA384x_IT_ASSOCSTATUS                  ((u16)0xF201UL)
+#define                HFA384x_IT_AUTHREQ                      ((u16)0xF202UL)
+#define                HFA384x_IT_PSUSERCNT                    ((u16)0xF203UL)
+#define                HFA384x_IT_KEYIDCHANGED                 ((u16)0xF204UL)
+#define                HFA384x_IT_ASSOCREQ                     ((u16)0xF205UL)
+#define                HFA384x_IT_MICFAILURE                   ((u16)0xF206UL)
 
 /*--------------------------------------------------------------------
 Information Frames Structures
@@ -1733,80 +1733,80 @@ Information Frames: Notification Frame Structures
 /*--  Notification Frame,MAC Mgmt: Handover Address --*/
 typedef struct hfa384x_HandoverAddr
 {
-       UINT16  framelen;
-       UINT16  infotype;
-       UINT8   handover_addr[WLAN_BSSID_LEN];
+       u16     framelen;
+       u16     infotype;
+       u8      handover_addr[WLAN_BSSID_LEN];
 } __WLAN_ATTRIB_PACK__ hfa384x_HandoverAddr_t;
 
 /*--  Inquiry Frame, Diagnose: Communication Tallies --*/
 typedef struct hfa384x_CommTallies16
 {
-       UINT16  txunicastframes;
-       UINT16  txmulticastframes;
-       UINT16  txfragments;
-       UINT16  txunicastoctets;
-       UINT16  txmulticastoctets;
-       UINT16  txdeferredtrans;
-       UINT16  txsingleretryframes;
-       UINT16  txmultipleretryframes;
-       UINT16  txretrylimitexceeded;
-       UINT16  txdiscards;
-       UINT16  rxunicastframes;
-       UINT16  rxmulticastframes;
-       UINT16  rxfragments;
-       UINT16  rxunicastoctets;
-       UINT16  rxmulticastoctets;
-       UINT16  rxfcserrors;
-       UINT16  rxdiscardsnobuffer;
-       UINT16  txdiscardswrongsa;
-       UINT16  rxdiscardswepundecr;
-       UINT16  rxmsginmsgfrag;
-       UINT16  rxmsginbadmsgfrag;
+       u16     txunicastframes;
+       u16     txmulticastframes;
+       u16     txfragments;
+       u16     txunicastoctets;
+       u16     txmulticastoctets;
+       u16     txdeferredtrans;
+       u16     txsingleretryframes;
+       u16     txmultipleretryframes;
+       u16     txretrylimitexceeded;
+       u16     txdiscards;
+       u16     rxunicastframes;
+       u16     rxmulticastframes;
+       u16     rxfragments;
+       u16     rxunicastoctets;
+       u16     rxmulticastoctets;
+       u16     rxfcserrors;
+       u16     rxdiscardsnobuffer;
+       u16     txdiscardswrongsa;
+       u16     rxdiscardswepundecr;
+       u16     rxmsginmsgfrag;
+       u16     rxmsginbadmsgfrag;
 } __WLAN_ATTRIB_PACK__ hfa384x_CommTallies16_t;
 
 typedef struct hfa384x_CommTallies32
 {
-       UINT32  txunicastframes;
-       UINT32  txmulticastframes;
-       UINT32  txfragments;
-       UINT32  txunicastoctets;
-       UINT32  txmulticastoctets;
-       UINT32  txdeferredtrans;
-       UINT32  txsingleretryframes;
-       UINT32  txmultipleretryframes;
-       UINT32  txretrylimitexceeded;
-       UINT32  txdiscards;
-       UINT32  rxunicastframes;
-       UINT32  rxmulticastframes;
-       UINT32  rxfragments;
-       UINT32  rxunicastoctets;
-       UINT32  rxmulticastoctets;
-       UINT32  rxfcserrors;
-       UINT32  rxdiscardsnobuffer;
-       UINT32  txdiscardswrongsa;
-       UINT32  rxdiscardswepundecr;
-       UINT32  rxmsginmsgfrag;
-       UINT32  rxmsginbadmsgfrag;
+       u32     txunicastframes;
+       u32     txmulticastframes;
+       u32     txfragments;
+       u32     txunicastoctets;
+       u32     txmulticastoctets;
+       u32     txdeferredtrans;
+       u32     txsingleretryframes;
+       u32     txmultipleretryframes;
+       u32     txretrylimitexceeded;
+       u32     txdiscards;
+       u32     rxunicastframes;
+       u32     rxmulticastframes;
+       u32     rxfragments;
+       u32     rxunicastoctets;
+       u32     rxmulticastoctets;
+       u32     rxfcserrors;
+       u32     rxdiscardsnobuffer;
+       u32     txdiscardswrongsa;
+       u32     rxdiscardswepundecr;
+       u32     rxmsginmsgfrag;
+       u32     rxmsginbadmsgfrag;
 } __WLAN_ATTRIB_PACK__ hfa384x_CommTallies32_t;
 
 /*--  Inquiry Frame, Diagnose: Scan Results & Subfields--*/
 typedef struct hfa384x_ScanResultSub
 {
-       UINT16  chid;
-       UINT16  anl;
-       UINT16  sl;
-       UINT8   bssid[WLAN_BSSID_LEN];
-       UINT16  bcnint;
-       UINT16  capinfo;
+       u16     chid;
+       u16     anl;
+       u16     sl;
+       u8      bssid[WLAN_BSSID_LEN];
+       u16     bcnint;
+       u16     capinfo;
        hfa384x_bytestr32_t     ssid;
-       UINT8   supprates[10]; /* 802.11 info element */
-       UINT16  proberesp_rate;
+       u8      supprates[10]; /* 802.11 info element */
+       u16     proberesp_rate;
 } __WLAN_ATTRIB_PACK__ hfa384x_ScanResultSub_t;
 
 typedef struct hfa384x_ScanResult
 {
-       UINT16  rsvd;
-       UINT16  scanreason;
+       u16     rsvd;
+       u16     scanreason;
        hfa384x_ScanResultSub_t
                result[HFA384x_SCANRESULT_MAX];
 } __WLAN_ATTRIB_PACK__ hfa384x_ScanResult_t;
@@ -1814,10 +1814,10 @@ typedef struct hfa384x_ScanResult
 /*--  Inquiry Frame, Diagnose: ChInfo Results & Subfields--*/
 typedef struct hfa384x_ChInfoResultSub
 {
-       UINT16  chid;
-       UINT16  anl;
-       UINT16  pnl;
-       UINT16  active;
+       u16     chid;
+       u16     anl;
+       u16     pnl;
+       u16     active;
 } __WLAN_ATTRIB_PACK__ hfa384x_ChInfoResultSub_t;
 
 #define HFA384x_CHINFORESULT_BSSACTIVE BIT0
@@ -1825,7 +1825,7 @@ typedef struct hfa384x_ChInfoResultSub
 
 typedef struct hfa384x_ChInfoResult
 {
-       UINT16  scanchannels;
+       u16     scanchannels;
        hfa384x_ChInfoResultSub_t
                result[HFA384x_CHINFORESULT_MAX];
 } __WLAN_ATTRIB_PACK__ hfa384x_ChInfoResult_t;
@@ -1833,75 +1833,75 @@ typedef struct hfa384x_ChInfoResult
 /*--  Inquiry Frame, Diagnose: Host Scan Results & Subfields--*/
 typedef struct hfa384x_HScanResultSub
 {
-       UINT16  chid;
-       UINT16  anl;
-       UINT16  sl;
-       UINT8   bssid[WLAN_BSSID_LEN];
-       UINT16  bcnint;
-       UINT16  capinfo;
+       u16     chid;
+       u16     anl;
+       u16     sl;
+       u8      bssid[WLAN_BSSID_LEN];
+       u16     bcnint;
+       u16     capinfo;
        hfa384x_bytestr32_t     ssid;
-       UINT8   supprates[10]; /* 802.11 info element */
-       UINT16  proberesp_rate;
-       UINT16  atim;
+       u8      supprates[10]; /* 802.11 info element */
+       u16     proberesp_rate;
+       u16     atim;
 } __WLAN_ATTRIB_PACK__ hfa384x_HScanResultSub_t;
 
 typedef struct hfa384x_HScanResult
 {
-       UINT16  nresult;
-       UINT16  rsvd;
+       u16     nresult;
+       u16     rsvd;
        hfa384x_HScanResultSub_t
                result[HFA384x_HSCANRESULT_MAX];
 } __WLAN_ATTRIB_PACK__ hfa384x_HScanResult_t;
 
 /*--  Unsolicited Frame, MAC Mgmt: LinkStatus --*/
 
-#define HFA384x_LINK_NOTCONNECTED      ((UINT16)0)
-#define HFA384x_LINK_CONNECTED         ((UINT16)1)
-#define HFA384x_LINK_DISCONNECTED      ((UINT16)2)
-#define HFA384x_LINK_AP_CHANGE         ((UINT16)3)
-#define HFA384x_LINK_AP_OUTOFRANGE     ((UINT16)4)
-#define HFA384x_LINK_AP_INRANGE                ((UINT16)5)
-#define HFA384x_LINK_ASSOCFAIL         ((UINT16)6)
+#define HFA384x_LINK_NOTCONNECTED      ((u16)0)
+#define HFA384x_LINK_CONNECTED         ((u16)1)
+#define HFA384x_LINK_DISCONNECTED      ((u16)2)
+#define HFA384x_LINK_AP_CHANGE         ((u16)3)
+#define HFA384x_LINK_AP_OUTOFRANGE     ((u16)4)
+#define HFA384x_LINK_AP_INRANGE                ((u16)5)
+#define HFA384x_LINK_ASSOCFAIL         ((u16)6)
 
 typedef struct hfa384x_LinkStatus
 {
-       UINT16  linkstatus;
+       u16     linkstatus;
 } __WLAN_ATTRIB_PACK__ hfa384x_LinkStatus_t;
 
 
 /*--  Unsolicited Frame, MAC Mgmt: AssociationStatus (--*/
 
-#define HFA384x_ASSOCSTATUS_STAASSOC   ((UINT16)1)
-#define HFA384x_ASSOCSTATUS_REASSOC    ((UINT16)2)
-#define HFA384x_ASSOCSTATUS_DISASSOC   ((UINT16)3)
-#define HFA384x_ASSOCSTATUS_ASSOCFAIL  ((UINT16)4)
-#define HFA384x_ASSOCSTATUS_AUTHFAIL   ((UINT16)5)
+#define HFA384x_ASSOCSTATUS_STAASSOC   ((u16)1)
+#define HFA384x_ASSOCSTATUS_REASSOC    ((u16)2)
+#define HFA384x_ASSOCSTATUS_DISASSOC   ((u16)3)
+#define HFA384x_ASSOCSTATUS_ASSOCFAIL  ((u16)4)
+#define HFA384x_ASSOCSTATUS_AUTHFAIL   ((u16)5)
 
 typedef struct hfa384x_AssocStatus
 {
-       UINT16  assocstatus;
-       UINT8   sta_addr[WLAN_ADDR_LEN];
+       u16     assocstatus;
+       u8      sta_addr[WLAN_ADDR_LEN];
        /* old_ap_addr is only valid if assocstatus == 2 */
-       UINT8   old_ap_addr[WLAN_ADDR_LEN];
-       UINT16  reason;
-       UINT16  reserved;
+       u8      old_ap_addr[WLAN_ADDR_LEN];
+       u16     reason;
+       u16     reserved;
 } __WLAN_ATTRIB_PACK__ hfa384x_AssocStatus_t;
 
 /*--  Unsolicited Frame, MAC Mgmt: AuthRequest (AP Only) --*/
 
 typedef struct hfa384x_AuthRequest
 {
-       UINT8   sta_addr[WLAN_ADDR_LEN];
-       UINT16  algorithm;
+       u8      sta_addr[WLAN_ADDR_LEN];
+       u16     algorithm;
 } __WLAN_ATTRIB_PACK__ hfa384x_AuthReq_t;
 
 /*--  Unsolicited Frame, MAC Mgmt: AssocRequest (AP Only) --*/
 
 typedef struct hfa384x_AssocRequest
 {
-       UINT8   sta_addr[WLAN_ADDR_LEN];
-       UINT16  type;
-       UINT8   wpa_data[80];
+       u8      sta_addr[WLAN_ADDR_LEN];
+       u16     type;
+       u8   wpa_data[80];
 } __WLAN_ATTRIB_PACK__ hfa384x_AssocReq_t;
 
 
@@ -1912,21 +1912,21 @@ typedef struct hfa384x_AssocRequest
 
 typedef struct hfa384x_MicFailure
 {
-       UINT8   sender[WLAN_ADDR_LEN];
-       UINT8   dest[WLAN_ADDR_LEN];
+       u8      sender[WLAN_ADDR_LEN];
+       u8      dest[WLAN_ADDR_LEN];
 } __WLAN_ATTRIB_PACK__ hfa384x_MicFailure_t;
 
 /*--  Unsolicited Frame, MAC Mgmt: PSUserCount (AP Only) --*/
 
 typedef struct hfa384x_PSUserCount
 {
-       UINT16  usercnt;
+       u16     usercnt;
 } __WLAN_ATTRIB_PACK__ hfa384x_PSUserCount_t;
 
 typedef struct hfa384x_KeyIDChanged
 {
-       UINT8   sta_addr[WLAN_ADDR_LEN];
-       UINT16  keyid;
+       u8      sta_addr[WLAN_ADDR_LEN];
+       u16     keyid;
 } __WLAN_ATTRIB_PACK__ hfa384x_KeyIDChanged_t;
 
 /*--  Collection of all Inf frames ---------------*/
@@ -1945,8 +1945,8 @@ typedef union hfa384x_infodata {
 
 typedef struct hfa384x_InfFrame
 {
-       UINT16                  framelen;
-       UINT16                  infotype;
+       u16                     framelen;
+       u16                     infotype;
        hfa384x_infodata_t      info;
 } __WLAN_ATTRIB_PACK__ hfa384x_InfFrame_t;
 
@@ -1983,46 +1983,46 @@ USB Packet structures and constants.
 
 typedef struct hfa384x_usb_txfrm {
        hfa384x_tx_frame_t      desc;
-       UINT8                   data[WLAN_DATA_MAXLEN];
+       u8                      data[WLAN_DATA_MAXLEN];
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_txfrm_t;
 
 typedef struct hfa384x_usb_cmdreq {
-       UINT16          type;
-       UINT16          cmd;
-       UINT16          parm0;
-       UINT16          parm1;
-       UINT16          parm2;
-       UINT8           pad[54];
+       u16             type;
+       u16             cmd;
+       u16             parm0;
+       u16             parm1;
+       u16             parm2;
+       u8              pad[54];
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_cmdreq_t;
 
 typedef struct hfa384x_usb_wridreq {
-       UINT16          type;
-       UINT16          frmlen;
-       UINT16          rid;
-       UINT8           data[HFA384x_RIDDATA_MAXLEN];
+       u16             type;
+       u16             frmlen;
+       u16             rid;
+       u8              data[HFA384x_RIDDATA_MAXLEN];
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_wridreq_t;
 
 typedef struct hfa384x_usb_rridreq {
-       UINT16          type;
-       UINT16          frmlen;
-       UINT16          rid;
-       UINT8           pad[58];
+       u16             type;
+       u16             frmlen;
+       u16             rid;
+       u8              pad[58];
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_rridreq_t;
 
 typedef struct hfa384x_usb_wmemreq {
-       UINT16          type;
-       UINT16          frmlen;
-       UINT16          offset;
-       UINT16          page;
-       UINT8           data[HFA384x_USB_RWMEM_MAXLEN];
+       u16             type;
+       u16             frmlen;
+       u16             offset;
+       u16             page;
+       u8              data[HFA384x_USB_RWMEM_MAXLEN];
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_wmemreq_t;
 
 typedef struct hfa384x_usb_rmemreq {
-       UINT16          type;
-       UINT16          frmlen;
-       UINT16          offset;
-       UINT16          page;
-       UINT8           pad[56];
+       u16             type;
+       u16             frmlen;
+       u16             offset;
+       u16             page;
+       u8              pad[56];
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_rmemreq_t;
 
 /*------------------------------------*/
@@ -2030,54 +2030,54 @@ typedef struct hfa384x_usb_rmemreq {
 
 typedef struct hfa384x_usb_rxfrm {
        hfa384x_rx_frame_t      desc;
-       UINT8                   data[WLAN_DATA_MAXLEN];
+       u8                      data[WLAN_DATA_MAXLEN];
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_rxfrm_t;
 
 typedef struct hfa384x_usb_infofrm {
-       UINT16                  type;
+       u16                     type;
        hfa384x_InfFrame_t      info;
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_infofrm_t;
 
 typedef struct hfa384x_usb_statusresp {
-       UINT16          type;
-       UINT16          status;
-       UINT16          resp0;
-       UINT16          resp1;
-       UINT16          resp2;
+       u16             type;
+       u16             status;
+       u16             resp0;
+       u16             resp1;
+       u16             resp2;
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_cmdresp_t;
 
 typedef hfa384x_usb_cmdresp_t hfa384x_usb_wridresp_t;
 
 typedef struct hfa384x_usb_rridresp {
-       UINT16          type;
-       UINT16          frmlen;
-       UINT16          rid;
-       UINT8           data[HFA384x_RIDDATA_MAXLEN];
+       u16             type;
+       u16             frmlen;
+       u16             rid;
+       u8              data[HFA384x_RIDDATA_MAXLEN];
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_rridresp_t;
 
 typedef hfa384x_usb_cmdresp_t hfa384x_usb_wmemresp_t;
 
 typedef struct hfa384x_usb_rmemresp {
-       UINT16          type;
-       UINT16          frmlen;
-       UINT8           data[HFA384x_USB_RWMEM_MAXLEN];
+       u16             type;
+       u16             frmlen;
+       u8              data[HFA384x_USB_RWMEM_MAXLEN];
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_rmemresp_t;
 
 typedef struct hfa384x_usb_bufavail {
-       UINT16          type;
-       UINT16          frmlen;
+       u16             type;
+       u16             frmlen;
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_bufavail_t;
 
 typedef struct hfa384x_usb_error {
-       UINT16          type;
-       UINT16          errortype;
+       u16             type;
+       u16             errortype;
 } __WLAN_ATTRIB_PACK__ hfa384x_usb_error_t;
 
 /*----------------------------------------------------------*/
 /* Unions for packaging all the known packet types together */
 
 typedef union hfa384x_usbout {
-       UINT16                  type;
+       u16                     type;
        hfa384x_usb_txfrm_t     txfrm;
        hfa384x_usb_cmdreq_t    cmdreq;
        hfa384x_usb_wridreq_t   wridreq;
@@ -2087,7 +2087,7 @@ typedef union hfa384x_usbout {
 } __WLAN_ATTRIB_PACK__ hfa384x_usbout_t;
 
 typedef union hfa384x_usbin {
-       UINT16                  type;
+       u16                     type;
        hfa384x_usb_rxfrm_t     rxfrm;
        hfa384x_usb_txfrm_t     txfrm;
        hfa384x_usb_infofrm_t   infofrm;
@@ -2098,7 +2098,7 @@ typedef union hfa384x_usbin {
        hfa384x_usb_rmemresp_t  rmemresp;
        hfa384x_usb_bufavail_t  bufavail;
        hfa384x_usb_error_t     usberror;
-       UINT8                   boguspad[3000];
+       u8                      boguspad[3000];
 } __WLAN_ATTRIB_PACK__ hfa384x_usbin_t;
 
 /*--------------------------------------------------------------------
@@ -2107,17 +2107,17 @@ PD record structures.
 
 typedef struct hfa384x_pdr_pcb_partnum
 {
-       UINT8   num[8];
+       u8      num[8];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_pcb_partnum_t;
 
 typedef struct hfa384x_pdr_pcb_tracenum
 {
-       UINT8   num[8];
+       u8      num[8];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_pcb_tracenum_t;
 
 typedef struct hfa384x_pdr_nic_serial
 {
-       UINT8   num[12];
+       u8      num[12];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_nic_serial_t;
 
 typedef struct hfa384x_pdr_mkk_measurements
@@ -2141,170 +2141,170 @@ typedef struct hfa384x_pdr_mkk_measurements
 
 typedef struct hfa384x_pdr_nic_ramsize
 {
-       UINT8   size[12]; /* units of KB */
+       u8      size[12]; /* units of KB */
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_nic_ramsize_t;
 
 typedef struct hfa384x_pdr_mfisuprange
 {
-       UINT16  id;
-       UINT16  variant;
-       UINT16  bottom;
-       UINT16  top;
+       u16     id;
+       u16     variant;
+       u16     bottom;
+       u16     top;
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_mfisuprange_t;
 
 typedef struct hfa384x_pdr_cfisuprange
 {
-       UINT16  id;
-       UINT16  variant;
-       UINT16  bottom;
-       UINT16  top;
+       u16     id;
+       u16     variant;
+       u16     bottom;
+       u16     top;
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_cfisuprange_t;
 
 typedef struct hfa384x_pdr_nicid
 {
-       UINT16  id;
-       UINT16  variant;
-       UINT16  major;
-       UINT16  minor;
+       u16     id;
+       u16     variant;
+       u16     major;
+       u16     minor;
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_nicid_t;
 
 
 typedef struct hfa384x_pdr_refdac_measurements
 {
-       UINT16  value[0];
+       u16     value[0];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_refdac_measurements_t;
 
 typedef struct hfa384x_pdr_vgdac_measurements
 {
-       UINT16  value[0];
+       u16     value[0];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_vgdac_measurements_t;
 
 typedef struct hfa384x_pdr_level_comp_measurements
 {
-       UINT16  value[0];
+       u16     value[0];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_level_compc_measurements_t;
 
 typedef struct hfa384x_pdr_mac_address
 {
-       UINT8   addr[6];
+       u8      addr[6];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_mac_address_t;
 
 typedef struct hfa384x_pdr_mkk_callname
 {
-       UINT8   callname[8];
+       u8      callname[8];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_mkk_callname_t;
 
 typedef struct hfa384x_pdr_regdomain
 {
-       UINT16  numdomains;
-       UINT16  domain[5];
+       u16     numdomains;
+       u16     domain[5];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_regdomain_t;
 
 typedef struct hfa384x_pdr_allowed_channel
 {
-       UINT16  ch_bitmap;
+       u16     ch_bitmap;
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_allowed_channel_t;
 
 typedef struct hfa384x_pdr_default_channel
 {
-       UINT16  channel;
+       u16     channel;
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_default_channel_t;
 
 typedef struct hfa384x_pdr_privacy_option
 {
-       UINT16  available;
+       u16     available;
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_privacy_option_t;
 
 typedef struct hfa384x_pdr_temptype
 {
-       UINT16  type;
+       u16     type;
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_temptype_t;
 
 typedef struct hfa384x_pdr_refdac_setup
 {
-       UINT16  ch_value[14];
+       u16     ch_value[14];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_refdac_setup_t;
 
 typedef struct hfa384x_pdr_vgdac_setup
 {
-       UINT16  ch_value[14];
+       u16     ch_value[14];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_vgdac_setup_t;
 
 typedef struct hfa384x_pdr_level_comp_setup
 {
-       UINT16  ch_value[14];
+       u16     ch_value[14];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_level_comp_setup_t;
 
 typedef struct hfa384x_pdr_trimdac_setup
 {
-       UINT16  trimidac;
-       UINT16  trimqdac;
+       u16     trimidac;
+       u16     trimqdac;
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_trimdac_setup_t;
 
 typedef struct hfa384x_pdr_ifr_setting
 {
-       UINT16  value[3];
+       u16     value[3];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_ifr_setting_t;
 
 typedef struct hfa384x_pdr_rfr_setting
 {
-       UINT16  value[3];
+       u16     value[3];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_rfr_setting_t;
 
 typedef struct hfa384x_pdr_hfa3861_baseline
 {
-       UINT16  value[50];
+       u16     value[50];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_baseline_t;
 
 typedef struct hfa384x_pdr_hfa3861_shadow
 {
-       UINT32  value[32];
+       u32     value[32];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_shadow_t;
 
 typedef struct hfa384x_pdr_hfa3861_ifrf
 {
-       UINT32  value[20];
+       u32     value[20];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_ifrf_t;
 
 typedef struct hfa384x_pdr_hfa3861_chcalsp
 {
-       UINT16  value[14];
+       u16     value[14];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_chcalsp_t;
 
 typedef struct hfa384x_pdr_hfa3861_chcali
 {
-       UINT16  value[17];
+       u16     value[17];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_chcali_t;
 
 typedef struct hfa384x_pdr_hfa3861_nic_config
 {
-       UINT16  config_bitmap;
+       u16     config_bitmap;
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_nic_config_t;
 
 typedef struct hfa384x_pdr_hfo_delay
 {
-       UINT8   hfo_delay;
+       u8   hfo_delay;
 } __WLAN_ATTRIB_PACK__ hfa384x_hfo_delay_t;
 
 typedef struct hfa384x_pdr_hfa3861_manf_testsp
 {
-       UINT16  value[30];
+       u16     value[30];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_manf_testsp_t;
 
 typedef struct hfa384x_pdr_hfa3861_manf_testi
 {
-       UINT16  value[30];
+       u16     value[30];
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_manf_testi_t;
 
 typedef struct hfa384x_end_of_pda
 {
-       UINT16  crc;
+       u16     crc;
 } __WLAN_ATTRIB_PACK__ hfa384x_pdr_end_of_pda_t;
 
 typedef struct hfa384x_pdrec
 {
-       UINT16  len; /* in words */
-       UINT16  code;
+       u16     len; /* in words */
+       u16     code;
        union pdr {
        hfa384x_pdr_pcb_partnum_t       pcb_partnum;
        hfa384x_pdr_pcb_tracenum_t      pcb_tracenum;
@@ -2352,10 +2352,10 @@ typedef struct hfa384x_pdrec
 --------------------------------------------------------------------*/
 typedef struct hfa384x_statusresult
 {
-       UINT16  status;
-       UINT16  resp0;
-       UINT16  resp1;
-       UINT16  resp2;
+       u16     status;
+       u16     resp0;
+       u16     resp1;
+       u16     resp2;
 } hfa384x_cmdresult_t;
 
 /* USB Control Exchange (CTLX):
@@ -2370,9 +2370,9 @@ typedef hfa384x_cmdresult_t hfa384x_wmemresult_t;
 
 typedef struct hfa384x_rridresult
 {
-       UINT16          rid;
+       u16             rid;
        const void      *riddata;
-       UINT            riddata_len;
+       unsigned int            riddata_len;
 } hfa384x_rridresult_t;
 
 enum ctlx_state {
@@ -2429,11 +2429,11 @@ typedef struct hfa384x_usbctlxq
 
 typedef struct hfa484x_metacmd
 {
-       UINT16          cmd;
+       u16             cmd;
 
-       UINT16          parm0;
-       UINT16          parm1;
-       UINT16          parm2;
+       u16          parm0;
+       u16          parm1;
+       u16          parm2;
 
        hfa384x_cmdresult_t result;
 } hfa384x_metacmd_t;
@@ -2459,18 +2459,18 @@ typedef struct hfa484x_metacmd
 /* XXX These are going away ASAP */
 typedef struct prism2sta_authlist
 {
-       UINT    cnt;
-       UINT8   addr[WLAN_AUTH_MAX][WLAN_ADDR_LEN];
-       UINT8   assoc[WLAN_AUTH_MAX];
+       unsigned int    cnt;
+       u8      addr[WLAN_AUTH_MAX][WLAN_ADDR_LEN];
+       u8      assoc[WLAN_AUTH_MAX];
 } prism2sta_authlist_t;
 
 typedef struct prism2sta_accesslist
 {
-       UINT    modify;
-       UINT    cnt;
-       UINT8   addr[WLAN_ACCESS_MAX][WLAN_ADDR_LEN];
-       UINT    cnt1;
-       UINT8   addr1[WLAN_ACCESS_MAX][WLAN_ADDR_LEN];
+       unsigned int    modify;
+       unsigned int    cnt;
+       u8      addr[WLAN_ACCESS_MAX][WLAN_ADDR_LEN];
+       unsigned int    cnt1;
+       u8      addr1[WLAN_ACCESS_MAX][WLAN_ADDR_LEN];
 } prism2sta_accesslist_t;
 
 typedef struct hfa384x
@@ -2515,14 +2515,14 @@ typedef struct hfa384x
        wait_queue_head_t cmdq;         /* wait queue itself */
 
        /* Controller state */
-       UINT32          state;
-       UINT32          isap;
-       UINT8           port_enabled[HFA384x_NUMPORTS_MAX];
+       u32             state;
+       u32             isap;
+       u8              port_enabled[HFA384x_NUMPORTS_MAX];
 
        /* Download support */
-       UINT                            dlstate;
+       unsigned int                            dlstate;
        hfa384x_downloadbuffer_t        bufinfo;
-       UINT16                          dltimeout;
+       u16                             dltimeout;
 
        int                          scanflag;    /* to signal scan comlete */
        int                          join_ap;        /* are we joined to a specific ap */
@@ -2537,30 +2537,30 @@ typedef struct hfa384x
        hfa384x_commsquality_t  qual;
        struct timer_list       commsqual_timer;
 
-       UINT16 link_status;
-       UINT16 link_status_new;
+       u16 link_status;
+       u16 link_status_new;
        struct sk_buff_head        authq;
 
        /* And here we have stuff that used to be in priv */
 
        /* State variables */
-       UINT            presniff_port_type;
-       UINT16          presniff_wepflags;
-       UINT32          dot11_desired_bss_type;
+       unsigned int            presniff_port_type;
+       u16             presniff_wepflags;
+       u32             dot11_desired_bss_type;
 
        int             dbmadjust;
 
        /* Group Addresses - right now, there are up to a total
        of MAX_GRP_ADDR group addresses */
-       UINT8           dot11_grp_addr[MAX_GRP_ADDR][WLAN_ADDR_LEN];
-       UINT            dot11_grpcnt;
+       u8              dot11_grp_addr[MAX_GRP_ADDR][WLAN_ADDR_LEN];
+       unsigned int            dot11_grpcnt;
 
        /* Component Identities */
        hfa384x_compident_t     ident_nic;
        hfa384x_compident_t     ident_pri_fw;
        hfa384x_compident_t     ident_sta_fw;
        hfa384x_compident_t     ident_ap_fw;
-       UINT16                  mm_mods;
+       u16                     mm_mods;
 
        /* Supplier compatibility ranges */
        hfa384x_caplevel_t      cap_sup_mfi;
@@ -2576,14 +2576,14 @@ typedef struct hfa384x
        hfa384x_caplevel_t      cap_act_ap_cfi;  /* ap f/w to controller interface */
        hfa384x_caplevel_t      cap_act_ap_mfi;  /* ap f/w to modem interface */
 
-       UINT32                  psusercount;  /* Power save user count. */
+       u32                     psusercount;  /* Power save user count. */
        hfa384x_CommTallies32_t tallies;      /* Communication tallies. */
-       UINT8                   comment[WLAN_COMMENT_MAX+1]; /* User comment */
+       u8                      comment[WLAN_COMMENT_MAX+1]; /* User comment */
 
        /* Channel Info request results (AP only) */
        struct {
                atomic_t                done;
-               UINT8                   count;
+               u8                      count;
                hfa384x_ChInfoResult_t  results;
        } channel_info;
 
@@ -2591,7 +2591,7 @@ typedef struct hfa384x
 
 
         prism2sta_authlist_t   authlist;     /* Authenticated station list. */
-       UINT                    accessmode;   /* Access mode. */
+       unsigned int                    accessmode;   /* Access mode. */
         prism2sta_accesslist_t allow;        /* Allowed station list. */
         prism2sta_accesslist_t deny;         /* Denied station list. */
 
@@ -2616,105 +2616,105 @@ hfa384x_drvr_chinforesults( hfa384x_t *hw);
 int
 hfa384x_drvr_commtallies( hfa384x_t *hw);
 int
-hfa384x_drvr_disable(hfa384x_t *hw, UINT16 macport);
+hfa384x_drvr_disable(hfa384x_t *hw, u16 macport);
 int
-hfa384x_drvr_enable(hfa384x_t *hw, UINT16 macport);
+hfa384x_drvr_enable(hfa384x_t *hw, u16 macport);
 int
 hfa384x_drvr_flashdl_enable(hfa384x_t *hw);
 int
 hfa384x_drvr_flashdl_disable(hfa384x_t *hw);
 int
-hfa384x_drvr_flashdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len);
+hfa384x_drvr_flashdl_write(hfa384x_t *hw, u32 daddr, void* buf, u32 len);
 int
-hfa384x_drvr_getconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len);
+hfa384x_drvr_getconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len);
 int
-hfa384x_drvr_handover( hfa384x_t *hw, UINT8 *addr);
+hfa384x_drvr_handover( hfa384x_t *hw, u8 *addr);
 int
 hfa384x_drvr_hostscanresults( hfa384x_t *hw);
 int
 hfa384x_drvr_low_level(hfa384x_t *hw, hfa384x_metacmd_t *cmd);
 int
-hfa384x_drvr_mmi_read(hfa384x_t *hw, UINT32 address, UINT32 *result);
+hfa384x_drvr_mmi_read(hfa384x_t *hw, u32 address, u32 *result);
 int
-hfa384x_drvr_mmi_write(hfa384x_t *hw, UINT32 address, UINT32 data);
+hfa384x_drvr_mmi_write(hfa384x_t *hw, u32 address, u32 data);
 int
-hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr);
+hfa384x_drvr_ramdl_enable(hfa384x_t *hw, u32 exeaddr);
 int
 hfa384x_drvr_ramdl_disable(hfa384x_t *hw);
 int
-hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len);
+hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void* buf, u32 len);
 int
-hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len);
+hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, unsigned int len);
 int
 hfa384x_drvr_scanresults( hfa384x_t *hw);
 
 int
-hfa384x_drvr_setconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len);
+hfa384x_drvr_setconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len);
 
 static inline int
-hfa384x_drvr_getconfig16(hfa384x_t *hw, UINT16 rid, void *val)
+hfa384x_drvr_getconfig16(hfa384x_t *hw, u16 rid, void *val)
 {
        int             result = 0;
-       result = hfa384x_drvr_getconfig(hw, rid, val, sizeof(UINT16));
+       result = hfa384x_drvr_getconfig(hw, rid, val, sizeof(u16));
        if ( result == 0 ) {
-               *((UINT16*)val) = hfa384x2host_16(*((UINT16*)val));
+               *((u16*)val) = hfa384x2host_16(*((u16*)val));
        }
        return result;
 }
 
 static inline int
-hfa384x_drvr_getconfig32(hfa384x_t *hw, UINT16 rid, void *val)
+hfa384x_drvr_getconfig32(hfa384x_t *hw, u16 rid, void *val)
 {
        int             result = 0;
 
-       result = hfa384x_drvr_getconfig(hw, rid, val, sizeof(UINT32));
+       result = hfa384x_drvr_getconfig(hw, rid, val, sizeof(u32));
        if ( result == 0 ) {
-               *((UINT32*)val) = hfa384x2host_32(*((UINT32*)val));
+               *((u32*)val) = hfa384x2host_32(*((u32*)val));
        }
 
        return result;
 }
 
 static inline int
-hfa384x_drvr_setconfig16(hfa384x_t *hw, UINT16 rid, UINT16 val)
+hfa384x_drvr_setconfig16(hfa384x_t *hw, u16 rid, u16 val)
 {
-       UINT16 value = host2hfa384x_16(val);
+       u16 value = host2hfa384x_16(val);
        return hfa384x_drvr_setconfig(hw, rid, &value, sizeof(value));
 }
 
 static inline int
-hfa384x_drvr_setconfig32(hfa384x_t *hw, UINT16 rid, UINT32 val)
+hfa384x_drvr_setconfig32(hfa384x_t *hw, u16 rid, u32 val)
 {
-       UINT32 value = host2hfa384x_32(val);
+       u32 value = host2hfa384x_32(val);
        return hfa384x_drvr_setconfig(hw, rid, &value, sizeof(value));
 }
 
 int
 hfa384x_drvr_getconfig_async(hfa384x_t     *hw,
-                              UINT16        rid,
+                              u16        rid,
                               ctlx_usercb_t usercb,
                               void          *usercb_data);
 
 int
 hfa384x_drvr_setconfig_async(hfa384x_t *hw,
-                              UINT16 rid,
+                              u16 rid,
                               void *buf,
-                              UINT16 len,
+                              u16 len,
                               ctlx_usercb_t usercb,
                               void *usercb_data);
 
 static inline int
-hfa384x_drvr_setconfig16_async(hfa384x_t *hw, UINT16 rid, UINT16 val)
+hfa384x_drvr_setconfig16_async(hfa384x_t *hw, u16 rid, u16 val)
 {
-       UINT16 value = host2hfa384x_16(val);
+       u16 value = host2hfa384x_16(val);
        return hfa384x_drvr_setconfig_async(hw, rid, &value, sizeof(value),
                                            NULL , NULL);
 }
 
 static inline int
-hfa384x_drvr_setconfig32_async(hfa384x_t *hw, UINT16 rid, UINT32 val)
+hfa384x_drvr_setconfig32_async(hfa384x_t *hw, u16 rid, u32 val)
 {
-       UINT32 value = host2hfa384x_32(val);
+       u32 value = host2hfa384x_32(val);
        return hfa384x_drvr_setconfig_async(hw, rid, &value, sizeof(value),
                                            NULL , NULL);
 }
@@ -2732,32 +2732,32 @@ hfa384x_tx_timeout(wlandevice_t *wlandev);
 int
 hfa384x_cmd_initialize(hfa384x_t *hw);
 int
-hfa384x_cmd_enable(hfa384x_t *hw, UINT16 macport);
+hfa384x_cmd_enable(hfa384x_t *hw, u16 macport);
 int
-hfa384x_cmd_disable(hfa384x_t *hw, UINT16 macport);
+hfa384x_cmd_disable(hfa384x_t *hw, u16 macport);
 int
 hfa384x_cmd_diagnose(hfa384x_t *hw);
 int
-hfa384x_cmd_allocate(hfa384x_t *hw, UINT16 len);
+hfa384x_cmd_allocate(hfa384x_t *hw, u16 len);
 int
-hfa384x_cmd_transmit(hfa384x_t *hw, UINT16 reclaim, UINT16 qos, UINT16 fid);
+hfa384x_cmd_transmit(hfa384x_t *hw, u16 reclaim, u16 qos, u16 fid);
 int
-hfa384x_cmd_clearpersist(hfa384x_t *hw, UINT16 fid);
+hfa384x_cmd_clearpersist(hfa384x_t *hw, u16 fid);
 int
-hfa384x_cmd_notify(hfa384x_t *hw, UINT16 reclaim, UINT16 fid, void *buf, UINT16 len);
+hfa384x_cmd_notify(hfa384x_t *hw, u16 reclaim, u16 fid, void *buf, u16 len);
 int
-hfa384x_cmd_inquire(hfa384x_t *hw, UINT16 fid);
+hfa384x_cmd_inquire(hfa384x_t *hw, u16 fid);
 int
-hfa384x_cmd_access(hfa384x_t *hw, UINT16 write, UINT16 rid, void *buf, UINT16 len);
+hfa384x_cmd_access(hfa384x_t *hw, u16 write, u16 rid, void *buf, u16 len);
 int
-hfa384x_cmd_monitor(hfa384x_t *hw, UINT16 enable);
+hfa384x_cmd_monitor(hfa384x_t *hw, u16 enable);
 int
 hfa384x_cmd_download(
        hfa384x_t *hw,
-       UINT16 mode,
-       UINT16 lowaddr,
-       UINT16 highaddr,
-       UINT16 codelen);
+       u16 mode,
+       u16 lowaddr,
+       u16 highaddr,
+       u16 codelen);
 int
 hfa384x_cmd_aux_enable(hfa384x_t *hw, int force);
 int
@@ -2765,33 +2765,33 @@ hfa384x_cmd_aux_disable(hfa384x_t *hw);
 int
 hfa384x_copy_from_bap(
        hfa384x_t *hw,
-       UINT16  bap,
-       UINT16  id,
-       UINT16  offset,
+       u16     bap,
+       u16     id,
+       u16     offset,
        void    *buf,
-       UINT    len);
+       unsigned int    len);
 int
 hfa384x_copy_to_bap(
        hfa384x_t *hw,
-       UINT16  bap,
-       UINT16  id,
-       UINT16  offset,
+       u16     bap,
+       u16     id,
+       u16     offset,
        void    *buf,
-       UINT    len);
+       unsigned int    len);
 void
 hfa384x_copy_from_aux(
        hfa384x_t *hw,
-       UINT32  cardaddr,
-       UINT32  auxctl,
+       u32     cardaddr,
+       u32     auxctl,
        void    *buf,
-       UINT    len);
+       unsigned int    len);
 void
 hfa384x_copy_to_aux(
        hfa384x_t *hw,
-       UINT32  cardaddr,
-       UINT32  auxctl,
+       u32     cardaddr,
+       u32     auxctl,
        void    *buf,
-       UINT    len);
+       unsigned int    len);
 
 #endif /* __KERNEL__ */
 
index 53c547d36ed9b1a9e0a9d485c621828d7b61adc6..ccb4f152a9bf3e95c7c3865e0e2ccf856bbaf264 100644 (file)
@@ -299,9 +299,9 @@ static int
 hfa384x_dorrid(
        hfa384x_t *hw,
        CMD_MODE mode,
-       UINT16  rid,
+       u16     rid,
        void    *riddata,
-       UINT    riddatalen,
+       unsigned int    riddatalen,
        ctlx_cmdcb_t cmdcb,
        ctlx_usercb_t usercb,
        void    *usercb_data);
@@ -310,9 +310,9 @@ static int
 hfa384x_dowrid(
        hfa384x_t *hw,
        CMD_MODE mode,
-       UINT16  rid,
+       u16     rid,
        void    *riddata,
-       UINT    riddatalen,
+       unsigned int    riddatalen,
        ctlx_cmdcb_t cmdcb,
        ctlx_usercb_t usercb,
        void    *usercb_data);
@@ -321,10 +321,10 @@ static int
 hfa384x_dormem(
        hfa384x_t *hw,
        CMD_MODE mode,
-       UINT16  page,
-       UINT16  offset,
+       u16     page,
+       u16     offset,
        void    *data,
-       UINT    len,
+       unsigned int    len,
        ctlx_cmdcb_t cmdcb,
        ctlx_usercb_t usercb,
        void    *usercb_data);
@@ -333,16 +333,16 @@ static int
 hfa384x_dowmem(
        hfa384x_t *hw,
        CMD_MODE mode,
-       UINT16  page,
-       UINT16  offset,
+       u16     page,
+       u16     offset,
        void    *data,
-       UINT    len,
+       unsigned int    len,
        ctlx_cmdcb_t cmdcb,
        ctlx_usercb_t usercb,
        void    *usercb_data);
 
 static int
-hfa384x_isgood_pdrcode(UINT16 pdrcode);
+hfa384x_isgood_pdrcode(u16 pdrcode);
 
 /*================================================================*/
 /* Function Definitions */
@@ -376,17 +376,17 @@ dbprint_urb(struct urb* urb)
        WLAN_LOG_DEBUG(3,"urb->pipe=0x%08x\n", urb->pipe);
        WLAN_LOG_DEBUG(3,"urb->status=0x%08x\n", urb->status);
        WLAN_LOG_DEBUG(3,"urb->transfer_flags=0x%08x\n", urb->transfer_flags);
-       WLAN_LOG_DEBUG(3,"urb->transfer_buffer=0x%08x\n", (UINT)urb->transfer_buffer);
+       WLAN_LOG_DEBUG(3,"urb->transfer_buffer=0x%08x\n", (unsigned int)urb->transfer_buffer);
        WLAN_LOG_DEBUG(3,"urb->transfer_buffer_length=0x%08x\n", urb->transfer_buffer_length);
        WLAN_LOG_DEBUG(3,"urb->actual_length=0x%08x\n", urb->actual_length);
        WLAN_LOG_DEBUG(3,"urb->bandwidth=0x%08x\n", urb->bandwidth);
-       WLAN_LOG_DEBUG(3,"urb->setup_packet(ctl)=0x%08x\n", (UINT)urb->setup_packet);
+       WLAN_LOG_DEBUG(3,"urb->setup_packet(ctl)=0x%08x\n", (unsigned int)urb->setup_packet);
        WLAN_LOG_DEBUG(3,"urb->start_frame(iso/irq)=0x%08x\n", urb->start_frame);
        WLAN_LOG_DEBUG(3,"urb->interval(irq)=0x%08x\n", urb->interval);
        WLAN_LOG_DEBUG(3,"urb->error_count(iso)=0x%08x\n", urb->error_count);
        WLAN_LOG_DEBUG(3,"urb->timeout=0x%08x\n", urb->timeout);
-       WLAN_LOG_DEBUG(3,"urb->context=0x%08x\n", (UINT)urb->context);
-       WLAN_LOG_DEBUG(3,"urb->complete=0x%08x\n", (UINT)urb->complete);
+       WLAN_LOG_DEBUG(3,"urb->context=0x%08x\n", (unsigned int)urb->context);
+       WLAN_LOG_DEBUG(3,"urb->complete=0x%08x\n", (unsigned int)urb->complete);
 }
 #endif
 
@@ -829,7 +829,7 @@ struct usbctlx_rrid_completor
 
        const hfa384x_usb_rridresp_t    *rridresp;
        void                    *riddata;
-       UINT                    riddatalen;
+       unsigned int                    riddatalen;
 };
 typedef struct usbctlx_rrid_completor usbctlx_rrid_completor_t;
 
@@ -860,7 +860,7 @@ static inline usbctlx_completor_t*
 init_rrid_completor(usbctlx_rrid_completor_t *completor,
                     const hfa384x_usb_rridresp_t *rridresp,
                     void *riddata,
-                    UINT riddatalen)
+                    unsigned int riddatalen)
 {
        completor->head.complete = usbctlx_rrid_completor_fn;
        completor->rridresp = rridresp;
@@ -893,7 +893,7 @@ struct usbctlx_rmem_completor
 
         const hfa384x_usb_rmemresp_t  *rmemresp;
         void                          *data;
-        UINT                          len;
+        unsigned int                          len;
 };
 typedef struct usbctlx_rmem_completor usbctlx_rmem_completor_t;
 
@@ -910,7 +910,7 @@ static inline usbctlx_completor_t*
 init_rmem_completor(usbctlx_rmem_completor_t *completor,
                     hfa384x_usb_rmemresp_t *rmemresp,
                     void *data,
-                    UINT len)
+                    unsigned int len)
 {
        completor->head.complete = usbctlx_rmem_completor_fn;
        completor->rmemresp = rmemresp;
@@ -1021,7 +1021,7 @@ hfa384x_docmd_async(hfa384x_t *hw,
 }
 
 static inline int
-hfa384x_dorrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen)
+hfa384x_dorrid_wait(hfa384x_t *hw, u16 rid, void *riddata, unsigned int riddatalen)
 {
        return hfa384x_dorrid(hw, DOWAIT,
                              rid, riddata, riddatalen,
@@ -1030,7 +1030,7 @@ hfa384x_dorrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen)
 
 static inline int
 hfa384x_dorrid_async(hfa384x_t *hw,
-                     UINT16 rid, void *riddata, UINT riddatalen,
+                     u16 rid, void *riddata, unsigned int riddatalen,
                      ctlx_cmdcb_t cmdcb,
                      ctlx_usercb_t usercb,
                      void *usercb_data)
@@ -1041,7 +1041,7 @@ hfa384x_dorrid_async(hfa384x_t *hw,
 }
 
 static inline int
-hfa384x_dowrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen)
+hfa384x_dowrid_wait(hfa384x_t *hw, u16 rid, void *riddata, unsigned int riddatalen)
 {
        return hfa384x_dowrid(hw, DOWAIT,
                              rid, riddata, riddatalen,
@@ -1050,7 +1050,7 @@ hfa384x_dowrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen)
 
 static inline int
 hfa384x_dowrid_async(hfa384x_t *hw,
-                     UINT16 rid, void *riddata, UINT riddatalen,
+                     u16 rid, void *riddata, unsigned int riddatalen,
                      ctlx_cmdcb_t cmdcb,
                      ctlx_usercb_t usercb,
                      void *usercb_data)
@@ -1062,7 +1062,7 @@ hfa384x_dowrid_async(hfa384x_t *hw,
 
 static inline int
 hfa384x_dormem_wait(hfa384x_t *hw,
-                    UINT16 page, UINT16 offset, void *data, UINT len)
+                    u16 page, u16 offset, void *data, unsigned int len)
 {
        return hfa384x_dormem(hw, DOWAIT,
                              page, offset, data, len,
@@ -1071,7 +1071,7 @@ hfa384x_dormem_wait(hfa384x_t *hw,
 
 static inline int
 hfa384x_dormem_async(hfa384x_t *hw,
-                     UINT16 page, UINT16 offset, void *data, UINT len,
+                     u16 page, u16 offset, void *data, unsigned int len,
                      ctlx_cmdcb_t cmdcb,
                      ctlx_usercb_t usercb,
                      void *usercb_data)
@@ -1084,10 +1084,10 @@ hfa384x_dormem_async(hfa384x_t *hw,
 static inline int
 hfa384x_dowmem_wait(
         hfa384x_t *hw,
-        UINT16  page,
-        UINT16  offset,
+        u16  page,
+        u16  offset,
         void    *data,
-        UINT    len)
+        unsigned int    len)
 {
        return hfa384x_dowmem(hw, DOWAIT,
                                   page, offset, data, len,
@@ -1097,10 +1097,10 @@ hfa384x_dowmem_wait(
 static inline int
 hfa384x_dowmem_async(
         hfa384x_t *hw,
-        UINT16  page,
-        UINT16  offset,
+        u16  page,
+        u16  offset,
         void    *data,
-        UINT    len,
+        unsigned int    len,
         ctlx_cmdcb_t cmdcb,
         ctlx_usercb_t usercb,
         void    *usercb_data)
@@ -1187,7 +1187,7 @@ hfa384x_cmd_initialize(hfa384x_t *hw)
 * Call context:
 *      process
 ----------------------------------------------------------------*/
-int hfa384x_cmd_disable(hfa384x_t *hw, UINT16 macport)
+int hfa384x_cmd_disable(hfa384x_t *hw, u16 macport)
 {
        int     result = 0;
        hfa384x_metacmd_t cmd;
@@ -1227,7 +1227,7 @@ int hfa384x_cmd_disable(hfa384x_t *hw, UINT16 macport)
 * Call context:
 *      process
 ----------------------------------------------------------------*/
-int hfa384x_cmd_enable(hfa384x_t *hw, UINT16 macport)
+int hfa384x_cmd_enable(hfa384x_t *hw, u16 macport)
 {
        int     result = 0;
        hfa384x_metacmd_t cmd;
@@ -1276,12 +1276,12 @@ int hfa384x_cmd_enable(hfa384x_t *hw, UINT16 macport)
 * Call context:
 *      process
 ----------------------------------------------------------------*/
-int hfa384x_cmd_notify(hfa384x_t *hw, UINT16 reclaim, UINT16 fid,
-                      void *buf, UINT16 len)
+int hfa384x_cmd_notify(hfa384x_t *hw, u16 reclaim, u16 fid,
+                      void *buf, u16 len)
 {
 #if 0
        int     result = 0;
-       UINT16  cmd;
+       u16     cmd;
        DBFENTER;
        cmd =   HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_NOTIFY) |
                HFA384x_CMD_RECL_SET(reclaim);
@@ -1315,7 +1315,7 @@ return 0;
 * Call context:
 *      process
 ----------------------------------------------------------------*/
-int hfa384x_cmd_inquiry(hfa384x_t *hw, UINT16 fid)
+int hfa384x_cmd_inquiry(hfa384x_t *hw, u16 fid)
 {
        int     result = 0;
        hfa384x_metacmd_t cmd;
@@ -1364,7 +1364,7 @@ int hfa384x_cmd_inquiry(hfa384x_t *hw, UINT16 fid)
 * Call context:
 *      process
 ----------------------------------------------------------------*/
-int hfa384x_cmd_monitor(hfa384x_t *hw, UINT16 enable)
+int hfa384x_cmd_monitor(hfa384x_t *hw, u16 enable)
 {
        int     result = 0;
        hfa384x_metacmd_t cmd;
@@ -1422,8 +1422,8 @@ int hfa384x_cmd_monitor(hfa384x_t *hw, UINT16 enable)
 * Call context:
 *      process
 ----------------------------------------------------------------*/
-int hfa384x_cmd_download(hfa384x_t *hw, UINT16 mode, UINT16 lowaddr,
-                               UINT16 highaddr, UINT16 codelen)
+int hfa384x_cmd_download(hfa384x_t *hw, u16 mode, u16 lowaddr,
+                               u16 highaddr, u16 codelen)
 {
        int     result = 0;
        hfa384x_metacmd_t cmd;
@@ -1473,7 +1473,7 @@ int hfa384x_cmd_download(hfa384x_t *hw, UINT16 mode, UINT16 lowaddr,
 ----------------------------------------------------------------*/
 void
 hfa384x_copy_from_aux(
-       hfa384x_t *hw, UINT32 cardaddr, UINT32 auxctl, void *buf, UINT len)
+       hfa384x_t *hw, u32 cardaddr, u32 auxctl, void *buf, unsigned int len)
 {
        DBFENTER;
        WLAN_LOG_ERROR("not used in USB.\n");
@@ -1507,7 +1507,7 @@ hfa384x_copy_from_aux(
 ----------------------------------------------------------------*/
 void
 hfa384x_copy_to_aux(
-       hfa384x_t *hw, UINT32 cardaddr, UINT32 auxctl, void *buf, UINT len)
+       hfa384x_t *hw, u32 cardaddr, u32 auxctl, void *buf, unsigned int len)
 {
        DBFENTER;
        WLAN_LOG_ERROR("not used in USB.\n");
@@ -1798,9 +1798,9 @@ static int
 hfa384x_dorrid(
        hfa384x_t *hw,
        CMD_MODE mode,
-       UINT16  rid,
+       u16     rid,
        void    *riddata,
-       UINT    riddatalen,
+       unsigned int    riddatalen,
         ctlx_cmdcb_t cmdcb,
        ctlx_usercb_t usercb,
        void    *usercb_data)
@@ -1884,9 +1884,9 @@ static int
 hfa384x_dowrid(
        hfa384x_t *hw,
        CMD_MODE mode,
-       UINT16  rid,
+       u16     rid,
        void    *riddata,
-       UINT    riddatalen,
+       unsigned int    riddatalen,
        ctlx_cmdcb_t cmdcb,
        ctlx_usercb_t usercb,
        void    *usercb_data)
@@ -1977,10 +1977,10 @@ static int
 hfa384x_dormem(
        hfa384x_t *hw,
        CMD_MODE mode,
-       UINT16  page,
-       UINT16  offset,
+       u16     page,
+       u16     offset,
        void    *data,
-       UINT    len,
+       unsigned int    len,
        ctlx_cmdcb_t cmdcb,
        ctlx_usercb_t usercb,
        void    *usercb_data)
@@ -2078,10 +2078,10 @@ static int
 hfa384x_dowmem(
        hfa384x_t *hw,
        CMD_MODE mode,
-       UINT16  page,
-       UINT16  offset,
+       u16     page,
+       u16     offset,
        void    *data,
-       UINT    len,
+       unsigned int    len,
        ctlx_cmdcb_t cmdcb,
        ctlx_usercb_t usercb,
        void    *usercb_data)
@@ -2198,7 +2198,7 @@ int hfa384x_drvr_commtallies( hfa384x_t *hw )
 * Call context:
 *      process
 ----------------------------------------------------------------*/
-int hfa384x_drvr_disable(hfa384x_t *hw, UINT16 macport)
+int hfa384x_drvr_disable(hfa384x_t *hw, u16 macport)
 {
        int     result = 0;
 
@@ -2240,7 +2240,7 @@ int hfa384x_drvr_disable(hfa384x_t *hw, UINT16 macport)
 * Call context:
 *      process
 ----------------------------------------------------------------*/
-int hfa384x_drvr_enable(hfa384x_t *hw, UINT16 macport)
+int hfa384x_drvr_enable(hfa384x_t *hw, u16 macport)
 {
        int     result = 0;
 
@@ -2393,22 +2393,22 @@ int hfa384x_drvr_flashdl_disable(hfa384x_t *hw)
 int
 hfa384x_drvr_flashdl_write(
        hfa384x_t       *hw,
-       UINT32          daddr,
+       u32             daddr,
        void            *buf,
-       UINT32          len)
+       u32             len)
 {
        int             result = 0;
-       UINT32          dlbufaddr;
+       u32             dlbufaddr;
        int             nburns;
-       UINT32          burnlen;
-       UINT32          burndaddr;
-       UINT16          burnlo;
-       UINT16          burnhi;
+       u32             burnlen;
+       u32             burndaddr;
+       u16             burnlo;
+       u16             burnhi;
        int             nwrites;
-       UINT8           *writebuf;
-       UINT16          writepage;
-       UINT16          writeoffset;
-       UINT32          writelen;
+       u8              *writebuf;
+       u16             writepage;
+       u16             writeoffset;
+       u32             writelen;
        int             i;
        int             j;
 
@@ -2559,7 +2559,7 @@ exit_proc:
 * Call context:
 *      process
 ----------------------------------------------------------------*/
-int hfa384x_drvr_getconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len)
+int hfa384x_drvr_getconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len)
 {
        int                     result;
        DBFENTER;
@@ -2600,7 +2600,7 @@ int hfa384x_drvr_getconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len)
 int
 hfa384x_drvr_getconfig_async(
          hfa384x_t               *hw,
-         UINT16                  rid,
+         u16                  rid,
          ctlx_usercb_t           usercb,
          void                    *usercb_data)
 {
@@ -2634,9 +2634,9 @@ hfa384x_drvr_getconfig_async(
 int
 hfa384x_drvr_setconfig_async(
          hfa384x_t       *hw,
-         UINT16          rid,
+         u16          rid,
          void            *buf,
-         UINT16          len,
+         u16          len,
          ctlx_usercb_t   usercb,
          void            *usercb_data)
 {
@@ -2663,7 +2663,7 @@ hfa384x_drvr_setconfig_async(
 * Call context:
 *      process
 ----------------------------------------------------------------*/
-int hfa384x_drvr_handover( hfa384x_t *hw, UINT8 *addr)
+int hfa384x_drvr_handover( hfa384x_t *hw, u8 *addr)
 {
         DBFENTER;
        WLAN_LOG_ERROR("Not currently supported in USB!\n");
@@ -2716,12 +2716,12 @@ int hfa384x_drvr_low_level(hfa384x_t *hw, hfa384x_metacmd_t *cmd)
 * Call context:
 *       process
 ----------------------------------------------------------------*/
-int hfa384x_drvr_mmi_read(hfa384x_t *hw, UINT32 addr, UINT32 *resp)
+int hfa384x_drvr_mmi_read(hfa384x_t *hw, u32 addr, u32 *resp)
 {
 #if 0
         int             result = 0;
-        UINT16  cmd_code = (UINT16) 0x30;
-        UINT16 param = (UINT16) addr;
+        u16  cmd_code = (u16) 0x30;
+        u16 param = (u16) addr;
         DBFENTER;
 
         /* Do i need a host2hfa... conversion ? */
@@ -2756,13 +2756,13 @@ return 0;
 ----------------------------------------------------------------*/
 
 int
-hfa384x_drvr_mmi_write(hfa384x_t *hw, UINT32 addr, UINT32 data)
+hfa384x_drvr_mmi_write(hfa384x_t *hw, u32 addr, u32 data)
 {
 #if 0
         int             result = 0;
-        UINT16  cmd_code = (UINT16) 0x31;
-        UINT16 param0 = (UINT16) addr;
-        UINT16 param1 = (UINT16) data;
+        u16  cmd_code = (u16) 0x31;
+        u16 param0 = (u16) addr;
+        u16 param1 = (u16) data;
         DBFENTER;
 
         WLAN_LOG_DEBUG(1,"mmi write : addr = 0x%08lx\n", addr);
@@ -2842,11 +2842,11 @@ hfa384x_drvr_ramdl_disable(hfa384x_t *hw)
 *      process
 ----------------------------------------------------------------*/
 int
-hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr)
+hfa384x_drvr_ramdl_enable(hfa384x_t *hw, u32 exeaddr)
 {
        int             result = 0;
-       UINT16          lowaddr;
-       UINT16          hiaddr;
+       u16             lowaddr;
+       u16             hiaddr;
        int             i;
        DBFENTER;
        /* Check that a port isn't active */
@@ -2917,16 +2917,16 @@ hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr)
 *      process
 ----------------------------------------------------------------*/
 int
-hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len)
+hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void* buf, u32 len)
 {
        int             result = 0;
        int             nwrites;
-       UINT8           *data = buf;
+       u8              *data = buf;
        int             i;
-       UINT32          curraddr;
-       UINT16          currpage;
-       UINT16          curroffset;
-       UINT16          currlen;
+       u32             curraddr;
+       u16             currpage;
+       u16             curroffset;
+       u16             currlen;
        DBFENTER;
        /* Check that we're in the ram download state */
        if ( hw->dlstate != HFA384x_DLSTATE_RAMENABLED ) {
@@ -2998,21 +2998,21 @@ hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len)
 * Call context:
 *      process or non-card interrupt.
 ----------------------------------------------------------------*/
-int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len)
+int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, unsigned int len)
 {
        int             result = 0;
-       UINT16          *pda = buf;
+       u16             *pda = buf;
        int             pdaok = 0;
        int             morepdrs = 1;
        int             currpdr = 0;    /* word offset of the current pdr */
        size_t          i;
-       UINT16          pdrlen;         /* pdr length in bytes, host order */
-       UINT16          pdrcode;        /* pdr code, host order */
-       UINT16          currpage;
-       UINT16          curroffset;
+       u16             pdrlen;         /* pdr length in bytes, host order */
+       u16             pdrcode;        /* pdr code, host order */
+       u16             currpage;
+       u16             curroffset;
        struct pdaloc {
-               UINT32  cardaddr;
-               UINT16  auxctl;
+               u32     cardaddr;
+               u16     auxctl;
        } pdaloc[] =
        {
                { HFA3842_PDA_BASE,             0},
@@ -3116,7 +3116,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len)
 * Call context:
 *      process
 ----------------------------------------------------------------*/
-int hfa384x_drvr_setconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len)
+int hfa384x_drvr_setconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len)
 {
        return hfa384x_dowrid_wait(hw, rid, buf, len);
 }
@@ -3734,7 +3734,7 @@ static void hfa384x_usbin_callback(struct urb *urb, struct pt_regs *regs)
        struct sk_buff          *skb = NULL;
        int                     result;
        int                     urb_status;
-       UINT16                  type;
+       u16                     type;
 
        enum USBIN_ACTION {
                HANDLE,
@@ -3961,7 +3961,7 @@ retry:
                if (unlocked_usbctlx_cancel_async(hw, ctlx) == 0)
                        run_queue = 1;
        } else {
-               const UINT16 intype = (usbin->type&~host2hfa384x_16(0x8000));
+               const u16 intype = (usbin->type&~host2hfa384x_16(0x8000));
 
                /*
                 * Check that our message is what we're expecting ...
@@ -4041,7 +4041,7 @@ unlock:
 ----------------------------------------------------------------*/
 static void hfa384x_usbin_txcompl(wlandevice_t *wlandev, hfa384x_usbin_t *usbin)
 {
-       UINT16                  status;
+       u16                     status;
        DBFENTER;
 
        status = hfa384x2host_16(usbin->type); /* yeah I know it says type...*/
@@ -4081,8 +4081,8 @@ static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb)
        hfa384x_t               *hw = wlandev->priv;
        int                     hdrlen;
        p80211_rxmeta_t         *rxmeta;
-       UINT16                  data_len;
-       UINT16                  fc;
+       u16                  data_len;
+       u16                  fc;
 
        DBFENTER;
 
@@ -4188,12 +4188,12 @@ done:
 static void hfa384x_int_rxmonitor( wlandevice_t *wlandev, hfa384x_usb_rxfrm_t *rxfrm)
 {
        hfa384x_rx_frame_t              *rxdesc = &(rxfrm->desc);
-       UINT                            hdrlen = 0;
-       UINT                            datalen = 0;
-       UINT                            skblen = 0;
+       unsigned int                            hdrlen = 0;
+       unsigned int                            datalen = 0;
+       unsigned int                            skblen = 0;
        p80211msg_lnxind_wlansniffrm_t  *msg;
-       UINT8                           *datap;
-       UINT16                          fc;
+       u8                              *datap;
+       u16                             fc;
        struct sk_buff                  *skb;
        hfa384x_t                       *hw = wlandev->priv;
 
@@ -4842,7 +4842,7 @@ static void hfa384x_usbout_tx(wlandevice_t *wlandev, hfa384x_usbout_t *usbout)
 * Call context:
 ----------------------------------------------------------------*/
 static int
-hfa384x_isgood_pdrcode(UINT16 pdrcode)
+hfa384x_isgood_pdrcode(u16 pdrcode)
 {
        switch(pdrcode) {
        case HFA384x_PDR_END_OF_PDA:
index 749ea8d93207c1d50c1c05e5092cca9419621fa9..8996e52b51c23c1c2b2b400732c98c3d98e8ced6 100644 (file)
@@ -99,8 +99,8 @@
 /*================================================================*/
 /* Local Static Definitions */
 
-static UINT8   oui_rfc1042[] = {0x00, 0x00, 0x00};
-static UINT8   oui_8021h[] = {0x00, 0x00, 0xf8};
+static u8      oui_rfc1042[] = {0x00, 0x00, 0x00};
+static u8      oui_8021h[] = {0x00, 0x00, 0xf8};
 
 /*================================================================*/
 /* Local Function Declarations */
@@ -134,11 +134,11 @@ static UINT8      oui_8021h[] = {0x00, 0x00, 0xf8};
 * Call context:
 *      May be called in interrupt or non-interrupt context
 ----------------------------------------------------------------*/
-int skb_ether_to_p80211( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep)
+int skb_ether_to_p80211( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep)
 {
 
-       UINT16          fc;
-       UINT16          proto;
+       u16          fc;
+       u16          proto;
        wlan_ethhdr_t   e_hdr;
        wlan_llc_t      *e_llc;
        wlan_snap_t     *e_snap;
@@ -297,14 +297,14 @@ static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac,
 * Call context:
 *      May be called in interrupt or non-interrupt context
 ----------------------------------------------------------------*/
-int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *skb)
+int skb_p80211_to_ether( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb)
 {
        netdevice_t     *netdev = wlandev->netdev;
-       UINT16          fc;
-       UINT            payload_length;
-       UINT            payload_offset;
-       UINT8           daddr[WLAN_ETHADDR_LEN];
-       UINT8           saddr[WLAN_ETHADDR_LEN];
+       u16          fc;
+       unsigned int            payload_length;
+       unsigned int            payload_offset;
+       u8              daddr[WLAN_ETHADDR_LEN];
+       u8              saddr[WLAN_ETHADDR_LEN];
        p80211_hdr_t    *w_hdr;
        wlan_ethhdr_t   *e_hdr;
        wlan_llc_t      *e_llc;
@@ -488,7 +488,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *
 * Call context:
 *      May be called in interrupt or non-interrupt context
 ----------------------------------------------------------------*/
-int p80211_stt_findproto(UINT16 proto)
+int p80211_stt_findproto(u16 proto)
 {
        /* Always return found for now.  This is the behavior used by the */
        /*  Zoom Win95 driver when 802.1h mode is selected */
index 3f5ab57cd9a88ff5d56f388006244aa9a0df2f82..538e9bd1490235db7d09ece8e6fe82ab2f9ed315 100644 (file)
@@ -86,22 +86,22 @@ typedef struct p80211_rxmeta
 {
        struct wlandevice       *wlandev;
 
-       UINT64  mactime;        /* Hi-rez MAC-supplied time value */
-       UINT64  hosttime;       /* Best-rez host supplied time value */
+       u64     mactime;        /* Hi-rez MAC-supplied time value */
+       u64     hosttime;       /* Best-rez host supplied time value */
 
-       UINT    rxrate;         /* Receive data rate in 100kbps */
-       UINT    priority;       /* 0-15, 0=contention, 6=CF */
-       INT     signal;         /* An SSI, see p80211netdev.h */
-       INT     noise;          /* An SSI, see p80211netdev.h */
-       UINT    channel;        /* Receive channel (mostly for snifs) */
-       UINT    preamble;       /* P80211ENUM_preambletype_* */
-       UINT    encoding;       /* P80211ENUM_encoding_* */
+       unsigned int    rxrate;         /* Receive data rate in 100kbps */
+       unsigned int    priority;       /* 0-15, 0=contention, 6=CF */
+       int     signal;         /* An SSI, see p80211netdev.h */
+       int     noise;          /* An SSI, see p80211netdev.h */
+       unsigned int    channel;        /* Receive channel (mostly for snifs) */
+       unsigned int    preamble;       /* P80211ENUM_preambletype_* */
+       unsigned int    encoding;       /* P80211ENUM_encoding_* */
 
 } p80211_rxmeta_t;
 
 typedef struct p80211_frmmeta
 {
-       UINT                    magic;
+       unsigned int                    magic;
        p80211_rxmeta_t         *rx;
 } p80211_frmmeta_t;
 
@@ -117,20 +117,20 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb);
  */
 typedef struct p80211_caphdr
 {
-       UINT32          version;
-       UINT32          length;
-       UINT64          mactime;
-       UINT64          hosttime;
-       UINT32          phytype;
-       UINT32          channel;
-       UINT32          datarate;
-       UINT32          antenna;
-       UINT32          priority;
-       UINT32          ssi_type;
-       INT32           ssi_signal;
-       INT32           ssi_noise;
-       UINT32          preamble;
-       UINT32          encoding;
+       u32             version;
+       u32             length;
+       u64             mactime;
+       u64             hosttime;
+       u32             phytype;
+       u32             channel;
+       u32             datarate;
+       u32             antenna;
+       u32             priority;
+       u32             ssi_type;
+       s32             ssi_signal;
+       s32             ssi_noise;
+       u32             preamble;
+       u32             encoding;
 } p80211_caphdr_t;
 
 /* buffer free method pointer type */
@@ -138,31 +138,31 @@ typedef void (* freebuf_method_t)(void *buf, int size);
 
 typedef struct p80211_metawep {
        void  *data;
-       UINT8 iv[4];
-       UINT8 icv[4];
+       u8 iv[4];
+       u8 icv[4];
 } p80211_metawep_t;
 
 /* local ether header type */
 typedef struct wlan_ethhdr
 {
-       UINT8   daddr[WLAN_ETHADDR_LEN];
-       UINT8   saddr[WLAN_ETHADDR_LEN];
-       UINT16  type;
+       u8      daddr[WLAN_ETHADDR_LEN];
+       u8      saddr[WLAN_ETHADDR_LEN];
+       u16     type;
 } __WLAN_ATTRIB_PACK__ wlan_ethhdr_t;
 
 /* local llc header type */
 typedef struct wlan_llc
 {
-       UINT8   dsap;
-       UINT8   ssap;
-       UINT8   ctl;
+       u8      dsap;
+       u8      ssap;
+       u8      ctl;
 } __WLAN_ATTRIB_PACK__ wlan_llc_t;
 
 /* local snap header type */
 typedef struct wlan_snap
 {
-       UINT8   oui[WLAN_IEEE_OUI_LEN];
-       UINT16  type;
+       u8      oui[WLAN_IEEE_OUI_LEN];
+       u16     type;
 } __WLAN_ATTRIB_PACK__ wlan_snap_t;
 
 /* Circular include trick */
@@ -174,13 +174,13 @@ struct wlandevice;
 /*================================================================*/
 /*Function Declarations */
 
-int skb_p80211_to_ether( struct wlandevice *wlandev, UINT32 ethconv,
+int skb_p80211_to_ether( struct wlandevice *wlandev, u32 ethconv,
                         struct sk_buff *skb);
-int skb_ether_to_p80211( struct wlandevice *wlandev, UINT32 ethconv,
+int skb_ether_to_p80211( struct wlandevice *wlandev, u32 ethconv,
                         struct sk_buff *skb, p80211_hdr_t *p80211_hdr,
                         p80211_metawep_t *p80211_wep );
 
-int p80211_stt_findproto(UINT16 proto);
-int p80211_stt_addproto(UINT16 proto);
+int p80211_stt_findproto(u16 proto);
+int p80211_stt_addproto(u16 proto);
 
 #endif
index b7b0872fd8612cb6757a433e19d60af974f0f47a..72f12aff3900a0325ecc4092c8e1745ea0b1fec2 100644 (file)
 /*                        SET_FC_FSTYPE(WLAN_FSTYPE_RTS) );   */
 /*------------------------------------------------------------*/
 
-#define WLAN_GET_FC_PVER(n)     (((UINT16)(n)) & (BIT0 | BIT1))
-#define WLAN_GET_FC_FTYPE(n)   ((((UINT16)(n)) & (BIT2 | BIT3)) >> 2)
-#define WLAN_GET_FC_FSTYPE(n)  ((((UINT16)(n)) & (BIT4|BIT5|BIT6|BIT7)) >> 4)
-#define WLAN_GET_FC_TODS(n)    ((((UINT16)(n)) & (BIT8)) >> 8)
-#define WLAN_GET_FC_FROMDS(n)  ((((UINT16)(n)) & (BIT9)) >> 9)
-#define WLAN_GET_FC_MOREFRAG(n) ((((UINT16)(n)) & (BIT10)) >> 10)
-#define WLAN_GET_FC_RETRY(n)   ((((UINT16)(n)) & (BIT11)) >> 11)
-#define WLAN_GET_FC_PWRMGT(n)  ((((UINT16)(n)) & (BIT12)) >> 12)
-#define WLAN_GET_FC_MOREDATA(n) ((((UINT16)(n)) & (BIT13)) >> 13)
-#define WLAN_GET_FC_ISWEP(n)   ((((UINT16)(n)) & (BIT14)) >> 14)
-#define WLAN_GET_FC_ORDER(n)   ((((UINT16)(n)) & (BIT15)) >> 15)
-
-#define WLAN_SET_FC_PVER(n)    ((UINT16)(n))
-#define WLAN_SET_FC_FTYPE(n)   (((UINT16)(n)) << 2)
-#define WLAN_SET_FC_FSTYPE(n)  (((UINT16)(n)) << 4)
-#define WLAN_SET_FC_TODS(n)    (((UINT16)(n)) << 8)
-#define WLAN_SET_FC_FROMDS(n)  (((UINT16)(n)) << 9)
-#define WLAN_SET_FC_MOREFRAG(n) (((UINT16)(n)) << 10)
-#define WLAN_SET_FC_RETRY(n)   (((UINT16)(n)) << 11)
-#define WLAN_SET_FC_PWRMGT(n)  (((UINT16)(n)) << 12)
-#define WLAN_SET_FC_MOREDATA(n) (((UINT16)(n)) << 13)
-#define WLAN_SET_FC_ISWEP(n)   (((UINT16)(n)) << 14)
-#define WLAN_SET_FC_ORDER(n)   (((UINT16)(n)) << 15)
+#define WLAN_GET_FC_PVER(n)     (((u16)(n)) & (BIT0 | BIT1))
+#define WLAN_GET_FC_FTYPE(n)   ((((u16)(n)) & (BIT2 | BIT3)) >> 2)
+#define WLAN_GET_FC_FSTYPE(n)  ((((u16)(n)) & (BIT4|BIT5|BIT6|BIT7)) >> 4)
+#define WLAN_GET_FC_TODS(n)    ((((u16)(n)) & (BIT8)) >> 8)
+#define WLAN_GET_FC_FROMDS(n)  ((((u16)(n)) & (BIT9)) >> 9)
+#define WLAN_GET_FC_MOREFRAG(n) ((((u16)(n)) & (BIT10)) >> 10)
+#define WLAN_GET_FC_RETRY(n)   ((((u16)(n)) & (BIT11)) >> 11)
+#define WLAN_GET_FC_PWRMGT(n)  ((((u16)(n)) & (BIT12)) >> 12)
+#define WLAN_GET_FC_MOREDATA(n) ((((u16)(n)) & (BIT13)) >> 13)
+#define WLAN_GET_FC_ISWEP(n)   ((((u16)(n)) & (BIT14)) >> 14)
+#define WLAN_GET_FC_ORDER(n)   ((((u16)(n)) & (BIT15)) >> 15)
+
+#define WLAN_SET_FC_PVER(n)    ((u16)(n))
+#define WLAN_SET_FC_FTYPE(n)   (((u16)(n)) << 2)
+#define WLAN_SET_FC_FSTYPE(n)  (((u16)(n)) << 4)
+#define WLAN_SET_FC_TODS(n)    (((u16)(n)) << 8)
+#define WLAN_SET_FC_FROMDS(n)  (((u16)(n)) << 9)
+#define WLAN_SET_FC_MOREFRAG(n) (((u16)(n)) << 10)
+#define WLAN_SET_FC_RETRY(n)   (((u16)(n)) << 11)
+#define WLAN_SET_FC_PWRMGT(n)  (((u16)(n)) << 12)
+#define WLAN_SET_FC_MOREDATA(n) (((u16)(n)) << 13)
+#define WLAN_SET_FC_ISWEP(n)   (((u16)(n)) << 14)
+#define WLAN_SET_FC_ORDER(n)   (((u16)(n)) << 15)
 
 /*--- Duration Macros ----------------------------------------*/
 /* Macros to get/set the bitfields of the Duration Field      */
 /* Macros to get/set the bitfields of the Sequence Control    */
 /* Field.                                                     */
 /*------------------------------------------------------------*/
-#define WLAN_GET_SEQ_FRGNUM(n) (((UINT16)(n)) & (BIT0|BIT1|BIT2|BIT3))
-#define WLAN_GET_SEQ_SEQNUM(n) ((((UINT16)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)
+#define WLAN_GET_SEQ_FRGNUM(n) (((u16)(n)) & (BIT0|BIT1|BIT2|BIT3))
+#define WLAN_GET_SEQ_SEQNUM(n) ((((u16)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)
 
 /*--- Data ptr macro -----------------------------------------*/
-/* Creates a UINT8* to the data portion of a frame            */
+/* Creates a u8* to the data portion of a frame            */
 /* Assumes you're passing in a ptr to the beginning of the hdr*/
 /*------------------------------------------------------------*/
-#define WLAN_HDR_A3_DATAP(p) (((UINT8*)(p)) + WLAN_HDR_A3_LEN)
-#define WLAN_HDR_A4_DATAP(p) (((UINT8*)(p)) + WLAN_HDR_A4_LEN)
+#define WLAN_HDR_A3_DATAP(p) (((u8*)(p)) + WLAN_HDR_A3_LEN)
+#define WLAN_HDR_A4_DATAP(p) (((u8*)(p)) + WLAN_HDR_A4_LEN)
 
-#define DOT11_RATE5_ISBASIC_GET(r)     (((UINT8)(r)) & BIT7)
+#define DOT11_RATE5_ISBASIC_GET(r)     (((u8)(r)) & BIT7)
 
 /*================================================================*/
 /* Types */
 
 /* BSS Timestamp */
-typedef UINT8 wlan_bss_ts_t[WLAN_BSS_TS_LEN];
+typedef u8 wlan_bss_ts_t[WLAN_BSS_TS_LEN];
 
 /* Generic 802.11 Header types */
 
 typedef struct p80211_hdr_a3
 {
-       UINT16  fc;
-       UINT16  dur;
-       UINT8   a1[WLAN_ADDR_LEN];
-       UINT8   a2[WLAN_ADDR_LEN];
-       UINT8   a3[WLAN_ADDR_LEN];
-       UINT16  seq;
+       u16     fc;
+       u16     dur;
+       u8      a1[WLAN_ADDR_LEN];
+       u8      a2[WLAN_ADDR_LEN];
+       u8      a3[WLAN_ADDR_LEN];
+       u16     seq;
 } __WLAN_ATTRIB_PACK__ p80211_hdr_a3_t;
 
 typedef struct p80211_hdr_a4
 {
-       UINT16  fc;
-       UINT16  dur;
-       UINT8   a1[WLAN_ADDR_LEN];
-       UINT8   a2[WLAN_ADDR_LEN];
-       UINT8   a3[WLAN_ADDR_LEN];
-       UINT16  seq;
-       UINT8   a4[WLAN_ADDR_LEN];
+       u16     fc;
+       u16     dur;
+       u8      a1[WLAN_ADDR_LEN];
+       u8      a2[WLAN_ADDR_LEN];
+       u8      a3[WLAN_ADDR_LEN];
+       u16     seq;
+       u8      a4[WLAN_ADDR_LEN];
 } __WLAN_ATTRIB_PACK__ p80211_hdr_a4_t;
 
 typedef union p80211_hdr
@@ -271,9 +271,9 @@ typedef union p80211_hdr
 #define WLAN_FCS_LEN                   4
 
 /* ftcl in HOST order */
-inline static UINT16 p80211_headerlen(UINT16 fctl)
+inline static u16 p80211_headerlen(u16 fctl)
 {
-       UINT16 hdrlen = 0;
+       u16 hdrlen = 0;
 
        switch ( WLAN_GET_FC_FTYPE(fctl) ) {
        case WLAN_FTYPE_MGMT:
index 25b2ea8362273d9838b95d43d0b2d68d62938659..ad67b698fa43c798bc8dba48ecad20770759d7ce 100644 (file)
@@ -106,9 +106,9 @@ typedef struct p80211ioctl_req
 {
        char    name[WLAN_DEVNAMELEN_MAX];
        caddr_t data;
-       UINT32  magic;
-       UINT16  len;
-       UINT32  result;
+       u32     magic;
+       u16     len;
+       u32     result;
 } __WLAN_ATTRIB_PACK__ p80211ioctl_req_t;
 
 
index 5cb3f5ada4f58b4698d553c6453232f20b52ef15..8b61e5fc292bf74b4cfb43954681de5ef9db0ed7 100644 (file)
@@ -90,7 +90,7 @@
 #define MKMIBMETASIZE(name)            p80211meta_ ## mib ## _ ## name ## _ ## size
 #define MKGRPMETASIZE(name)            p80211meta_ ## grp ## _ ## name ## _ ## size
 
-#define GETMETASIZE(aptr)              (**((UINT32**)(aptr)))
+#define GETMETASIZE(aptr)              (**((u32**)(aptr)))
 
 /*----------------------------------------------------------------*/
 /* The following ifdef depends on the following defines: */
 typedef struct p80211meta
 {
        char                    *name;          /* data item name */
-       UINT32                  did;            /* partial did */
-       UINT32                  flags;          /* set of various flag bits */
-       UINT32                  min;            /* min value of a BOUNDEDINT */
-       UINT32                  max;            /* max value of a BOUNDEDINT */
-
-       UINT32                  maxlen;         /* maxlen of a OCTETSTR or DISPLAYSTR */
-       UINT32                  minlen;         /* minlen of a OCTETSTR or DISPLAYSTR */
-       p80211enum_t            *enumptr;       /* ptr to the enum type for ENUMINT */
+       u32                     did;            /* partial did */
+       u32                     flags;          /* set of various flag bits */
+       u32                     min;            /* min value of a BOUNDEDint */
+       u32                     max;            /* max value of a BOUNDEDint */
+
+       u32                     maxlen;         /* maxlen of a OCTETSTR or DISPLAYSTR */
+       u32                     minlen;         /* minlen of a OCTETSTR or DISPLAYSTR */
+       p80211enum_t            *enumptr;       /* ptr to the enum type for ENUMint */
        p80211_totext_t         totextptr;      /* ptr to totext conversion function */
        p80211_fromtext_t       fromtextptr;    /* ptr to totext conversion function */
        p80211_valid_t          validfunptr;    /* ptr to totext conversion function */
@@ -150,20 +150,20 @@ typedef struct catlistitem
 
 /*----------------------------------------------------------------*/
 /* */
-UINT32 p80211_text2did(catlistitem_t *catlist, char *catname, char *grpname, char *itemname);
-UINT32 p80211_text2catdid(catlistitem_t *list, char *name );
-UINT32 p80211_text2grpdid(grplistitem_t *list, char *name );
-UINT32 p80211_text2itemdid(p80211meta_t *list, char *name );
-UINT32 p80211_isvalid_did( catlistitem_t *catlist, UINT32 did );
-UINT32 p80211_isvalid_catdid( catlistitem_t *catlist, UINT32 did );
-UINT32 p80211_isvalid_grpdid( catlistitem_t *catlist, UINT32 did );
-UINT32 p80211_isvalid_itemdid( catlistitem_t *catlist, UINT32 did );
-catlistitem_t *p80211_did2cat( catlistitem_t *catlist, UINT32 did );
-grplistitem_t *p80211_did2grp( catlistitem_t *catlist, UINT32 did );
-p80211meta_t *p80211_did2item( catlistitem_t *catlist, UINT32 did );
-UINT32 p80211item_maxdatalen( struct catlistitem *metalist, UINT32 did );
-UINT32 p80211_metaname2did(struct catlistitem *metalist, char *itemname);
-UINT32 p80211item_getoffset( struct catlistitem *metalist, UINT32 did );
+u32 p80211_text2did(catlistitem_t *catlist, char *catname, char *grpname, char *itemname);
+u32 p80211_text2catdid(catlistitem_t *list, char *name );
+u32 p80211_text2grpdid(grplistitem_t *list, char *name );
+u32 p80211_text2itemdid(p80211meta_t *list, char *name );
+u32 p80211_isvalid_did( catlistitem_t *catlist, u32 did );
+u32 p80211_isvalid_catdid( catlistitem_t *catlist, u32 did );
+u32 p80211_isvalid_grpdid( catlistitem_t *catlist, u32 did );
+u32 p80211_isvalid_itemdid( catlistitem_t *catlist, u32 did );
+catlistitem_t *p80211_did2cat( catlistitem_t *catlist, u32 did );
+grplistitem_t *p80211_did2grp( catlistitem_t *catlist, u32 did );
+p80211meta_t *p80211_did2item( catlistitem_t *catlist, u32 did );
+u32 p80211item_maxdatalen( struct catlistitem *metalist, u32 did );
+u32 p80211_metaname2did(struct catlistitem *metalist, char *itemname);
+u32 p80211item_getoffset( struct catlistitem *metalist, u32 did );
 int p80211item_gettype(p80211meta_t *meta);
 
 #endif /* _P80211META_H */
index 19867fd314eb09e67d4ccea46e062a5802b3e20a..9cd72ede441c69f132ff5cd4f57621b348dc42ad 100644 (file)
@@ -93,7 +93,7 @@
 /* category metadata list */
 
 extern catlistitem_t mib_catlist[];
-extern UINT32 mib_catlist_size;
+extern u32 mib_catlist_size;
 
 
 /*================================================================*/
index 4d6dfcc79b86a7270d821d1f850b87f0482c1b3d..6e659eae8afc3f4420454321706cda91e5d9ebb1 100644 (file)
@@ -93,7 +93,7 @@
 /* category metadata list */
 
 extern catlistitem_t msg_catlist[];
-extern UINT32 msg_catlist_size;
+extern u32 msg_catlist_size;
 
 
 /*================================================================*/
index 5e163817340ea2276beb5561f4c5f41be34c881c..72b2a88fe28e359864c2fc0e884f63f61c4fe09f 100644 (file)
 
 typedef struct p80211msg_dot11req_mibget
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_unk392_t     mibattribute    ;
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibget_t;
 
 typedef struct p80211msg_dot11req_mibset
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_unk392_t     mibattribute    ;
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibset_t;
 
 typedef struct p80211msg_dot11req_scan
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     bsstype ;
        p80211item_pstr6_t      bssid   ;
-       UINT8   pad_0C[1]       ;
+       u8      pad_0C[1]       ;
        p80211item_pstr32_t     ssid    ;
-       UINT8   pad_1D[3]       ;
+       u8      pad_1D[3]       ;
        p80211item_uint32_t     scantype        ;
        p80211item_uint32_t     probedelay      ;
        p80211item_pstr14_t     channellist     ;
-       UINT8   pad_2C[1]       ;
+       u8      pad_2C[1]       ;
        p80211item_uint32_t     minchanneltime  ;
        p80211item_uint32_t     maxchanneltime  ;
        p80211item_uint32_t     resultcode      ;
@@ -89,17 +89,17 @@ typedef struct p80211msg_dot11req_scan
 
 typedef struct p80211msg_dot11req_scan_results
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     bssindex        ;
        p80211item_uint32_t     resultcode      ;
        p80211item_uint32_t     signal  ;
        p80211item_uint32_t     noise   ;
        p80211item_pstr6_t      bssid   ;
-       UINT8   pad_3C[1]       ;
+       u8      pad_3C[1]       ;
        p80211item_pstr32_t     ssid    ;
-       UINT8   pad_4D[3]       ;
+       u8      pad_4D[3]       ;
        p80211item_uint32_t     bsstype ;
        p80211item_uint32_t     beaconperiod    ;
        p80211item_uint32_t     dtimperiod      ;
@@ -138,11 +138,11 @@ typedef struct p80211msg_dot11req_scan_results
 
 typedef struct p80211msg_dot11req_associate
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_pstr6_t      peerstaaddress  ;
-       UINT8   pad_8C[1]       ;
+       u8      pad_8C[1]       ;
        p80211item_uint32_t     associatefailuretimeout ;
        p80211item_uint32_t     cfpollable      ;
        p80211item_uint32_t     cfpollreq       ;
@@ -154,22 +154,22 @@ typedef struct p80211msg_dot11req_associate
 
 typedef struct p80211msg_dot11req_reset
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     setdefaultmib   ;
        p80211item_pstr6_t      macaddress      ;
-       UINT8   pad_11C[1]      ;
+       u8      pad_11C[1]      ;
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_reset_t;
 
 typedef struct p80211msg_dot11req_start
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_pstr32_t     ssid    ;
-       UINT8   pad_12D[3]      ;
+       u8      pad_12D[3]      ;
        p80211item_uint32_t     bsstype ;
        p80211item_uint32_t     beaconperiod    ;
        p80211item_uint32_t     dtimperiod      ;
@@ -204,70 +204,70 @@ typedef struct p80211msg_dot11req_start
 
 typedef struct p80211msg_dot11ind_authenticate
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_pstr6_t      peerstaaddress  ;
-       UINT8   pad_13C[1]      ;
+       u8      pad_13C[1]      ;
        p80211item_uint32_t     authenticationtype      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_authenticate_t;
 
 typedef struct p80211msg_dot11ind_deauthenticate
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_pstr6_t      peerstaaddress  ;
-       UINT8   pad_14C[1]      ;
+       u8      pad_14C[1]      ;
        p80211item_uint32_t     reasoncode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_deauthenticate_t;
 
 typedef struct p80211msg_dot11ind_associate
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_pstr6_t      peerstaaddress  ;
-       UINT8   pad_15C[1]      ;
+       u8      pad_15C[1]      ;
        p80211item_uint32_t     aid     ;
 } __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_associate_t;
 
 typedef struct p80211msg_dot11ind_reassociate
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_pstr6_t      peerstaaddress  ;
-       UINT8   pad_16C[1]      ;
+       u8      pad_16C[1]      ;
        p80211item_uint32_t     aid     ;
        p80211item_pstr6_t      oldapaddress    ;
-       UINT8   pad_17C[1]      ;
+       u8      pad_17C[1]      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_reassociate_t;
 
 typedef struct p80211msg_dot11ind_disassociate
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_pstr6_t      peerstaaddress  ;
-       UINT8   pad_18C[1]      ;
+       u8      pad_18C[1]      ;
        p80211item_uint32_t     reasoncode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_disassociate_t;
 
 typedef struct p80211msg_lnxreq_ifstate
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     ifstate ;
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_ifstate_t;
 
 typedef struct p80211msg_lnxreq_wlansniff
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     enable  ;
        p80211item_uint32_t     channel ;
        p80211item_uint32_t     prismheader     ;
@@ -280,9 +280,9 @@ typedef struct p80211msg_lnxreq_wlansniff
 
 typedef struct p80211msg_lnxreq_hostwep
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     resultcode      ;
        p80211item_uint32_t     decrypt ;
        p80211item_uint32_t     encrypt ;
@@ -290,9 +290,9 @@ typedef struct p80211msg_lnxreq_hostwep
 
 typedef struct p80211msg_lnxreq_commsquality
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     resultcode      ;
        p80211item_uint32_t     dbm     ;
        p80211item_uint32_t     link    ;
@@ -302,20 +302,20 @@ typedef struct p80211msg_lnxreq_commsquality
 
 typedef struct p80211msg_lnxreq_autojoin
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_pstr32_t     ssid    ;
-       UINT8   pad_19D[3]      ;
+       u8      pad_19D[3]      ;
        p80211item_uint32_t     authtype        ;
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_autojoin_t;
 
 typedef struct p80211msg_lnxind_wlansniffrm
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     hosttime        ;
        p80211item_uint32_t     mactime ;
        p80211item_uint32_t     channel ;
@@ -330,19 +330,19 @@ typedef struct p80211msg_lnxind_wlansniffrm
 
 typedef struct p80211msg_lnxind_roam
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     reason  ;
 } __WLAN_ATTRIB_PACK__ p80211msg_lnxind_roam_t;
 
 typedef struct p80211msg_p2req_join
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_pstr6_t      bssid   ;
-       UINT8   pad_20C[1]      ;
+       u8      pad_20C[1]      ;
        p80211item_uint32_t     basicrate1      ;
        p80211item_uint32_t     basicrate2      ;
        p80211item_uint32_t     basicrate3      ;
@@ -360,7 +360,7 @@ typedef struct p80211msg_p2req_join
        p80211item_uint32_t     operationalrate7        ;
        p80211item_uint32_t     operationalrate8        ;
        p80211item_pstr32_t     ssid    ;
-       UINT8   pad_21D[3]      ;
+       u8      pad_21D[3]      ;
        p80211item_uint32_t     channel ;
        p80211item_uint32_t     authtype        ;
        p80211item_uint32_t     resultcode      ;
@@ -368,36 +368,36 @@ typedef struct p80211msg_p2req_join
 
 typedef struct p80211msg_p2req_readpda
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_unk1024_t    pda     ;
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_p2req_readpda_t;
 
 typedef struct p80211msg_p2req_readcis
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_unk1024_t    cis     ;
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_p2req_readcis_t;
 
 typedef struct p80211msg_p2req_auxport_state
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     enable  ;
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_p2req_auxport_state_t;
 
 typedef struct p80211msg_p2req_auxport_read
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     addr    ;
        p80211item_uint32_t     len     ;
        p80211item_unk1024_t    data    ;
@@ -406,9 +406,9 @@ typedef struct p80211msg_p2req_auxport_read
 
 typedef struct p80211msg_p2req_auxport_write
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     addr    ;
        p80211item_uint32_t     len     ;
        p80211item_unk1024_t    data    ;
@@ -417,9 +417,9 @@ typedef struct p80211msg_p2req_auxport_write
 
 typedef struct p80211msg_p2req_low_level
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     command ;
        p80211item_uint32_t     param0  ;
        p80211item_uint32_t     param1  ;
@@ -432,9 +432,9 @@ typedef struct p80211msg_p2req_low_level
 
 typedef struct p80211msg_p2req_test_command
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     testcode        ;
        p80211item_uint32_t     testparam       ;
        p80211item_uint32_t     resultcode      ;
@@ -446,9 +446,9 @@ typedef struct p80211msg_p2req_test_command
 
 typedef struct p80211msg_p2req_mmi_read
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     addr    ;
        p80211item_uint32_t     value   ;
        p80211item_uint32_t     resultcode      ;
@@ -456,9 +456,9 @@ typedef struct p80211msg_p2req_mmi_read
 
 typedef struct p80211msg_p2req_mmi_write
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     addr    ;
        p80211item_uint32_t     data    ;
        p80211item_uint32_t     resultcode      ;
@@ -466,9 +466,9 @@ typedef struct p80211msg_p2req_mmi_write
 
 typedef struct p80211msg_p2req_ramdl_state
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     enable  ;
        p80211item_uint32_t     exeaddr ;
        p80211item_uint32_t     resultcode      ;
@@ -476,9 +476,9 @@ typedef struct p80211msg_p2req_ramdl_state
 
 typedef struct p80211msg_p2req_ramdl_write
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     addr    ;
        p80211item_uint32_t     len     ;
        p80211item_unk4096_t    data    ;
@@ -487,18 +487,18 @@ typedef struct p80211msg_p2req_ramdl_write
 
 typedef struct p80211msg_p2req_flashdl_state
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     enable  ;
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_state_t;
 
 typedef struct p80211msg_p2req_flashdl_write
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     addr    ;
        p80211item_uint32_t     len     ;
        p80211item_unk4096_t    data    ;
@@ -507,18 +507,18 @@ typedef struct p80211msg_p2req_flashdl_write
 
 typedef struct p80211msg_p2req_mm_state
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     enable  ;
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_p2req_mm_state_t;
 
 typedef struct p80211msg_p2req_dump_state
 {
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
+       u32             msgcode ;
+       u32             msglen  ;
+       u8              devname[WLAN_DEVNAMELEN_MAX]    ;
        p80211item_uint32_t     level   ;
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_p2req_dump_state_t;
index bd4c1629eabfd1e970fc56d58fe58fb39bb80564..6cc16c3f8b15a1c3278dc8f87055d994bece78a6 100644 (file)
 /* Note: These offsets are from the start of the frame data       */
 
 #define WLAN_BEACON_OFF_TS                     0
-#define WLAN_BEACON_OFF_BCN_INT                        8
+#define WLAN_BEACON_OFF_BCN_int                        8
 #define WLAN_BEACON_OFF_CAPINFO                        10
 #define WLAN_BEACON_OFF_SSID                   12
 
 #define WLAN_DISASSOC_OFF_REASON               0
 
 #define WLAN_ASSOCREQ_OFF_CAP_INFO             0
-#define WLAN_ASSOCREQ_OFF_LISTEN_INT           2
+#define WLAN_ASSOCREQ_OFF_LISTEN_int           2
 #define WLAN_ASSOCREQ_OFF_SSID                 4
 
 #define WLAN_ASSOCRESP_OFF_CAP_INFO            0
 #define WLAN_ASSOCRESP_OFF_SUPP_RATES          6
 
 #define WLAN_REASSOCREQ_OFF_CAP_INFO           0
-#define WLAN_REASSOCREQ_OFF_LISTEN_INT         2
+#define WLAN_REASSOCREQ_OFF_LISTEN_int         2
 #define WLAN_REASSOCREQ_OFF_CURR_AP            4
 #define WLAN_REASSOCREQ_OFF_SSID               10
 
 #define WLAN_PROBEREQ_OFF_SSID                 0
 
 #define WLAN_PROBERESP_OFF_TS                  0
-#define WLAN_PROBERESP_OFF_BCN_INT             8
+#define WLAN_PROBERESP_OFF_BCN_int             8
 #define WLAN_PROBERESP_OFF_CAP_INFO            10
 #define WLAN_PROBERESP_OFF_SSID                        12
 
 
 typedef struct wlan_ie
 {
-       UINT8   eid;
-       UINT8   len;
+       u8      eid;
+       u8      len;
 } __WLAN_ATTRIB_PACK__ wlan_ie_t;
 
 /*-- Service Set Identity (SSID)  -----------------*/
 typedef struct wlan_ie_ssid
 {
-       UINT8   eid;
-       UINT8   len;
-       UINT8   ssid[1];  /* may be zero, ptrs may overlap */
+       u8      eid;
+       u8      len;
+       u8      ssid[1];  /* may be zero, ptrs may overlap */
 } __WLAN_ATTRIB_PACK__ wlan_ie_ssid_t;
 
 /*-- Supported Rates  -----------------------------*/
 typedef struct wlan_ie_supp_rates
 {
-       UINT8   eid;
-       UINT8   len;
-       UINT8   rates[1];  /* had better be at LEAST one! */
+       u8      eid;
+       u8      len;
+       u8      rates[1];  /* had better be at LEAST one! */
 } __WLAN_ATTRIB_PACK__ wlan_ie_supp_rates_t;
 
 /*-- FH Parameter Set  ----------------------------*/
 typedef struct wlan_ie_fh_parms
 {
-       UINT8   eid;
-       UINT8   len;
-       UINT16  dwell;
-       UINT8   hopset;
-       UINT8   hoppattern;
-       UINT8   hopindex;
+       u8      eid;
+       u8      len;
+       u16     dwell;
+       u8      hopset;
+       u8      hoppattern;
+       u8      hopindex;
 } __WLAN_ATTRIB_PACK__ wlan_ie_fh_parms_t;
 
 /*-- DS Parameter Set  ----------------------------*/
 typedef struct wlan_ie_ds_parms
 {
-       UINT8   eid;
-       UINT8   len;
-       UINT8   curr_ch;
+       u8      eid;
+       u8      len;
+       u8      curr_ch;
 } __WLAN_ATTRIB_PACK__ wlan_ie_ds_parms_t;
 
 /*-- CF Parameter Set  ----------------------------*/
 
 typedef struct wlan_ie_cf_parms
 {
-       UINT8   eid;
-       UINT8   len;
-       UINT8   cfp_cnt;
-       UINT8   cfp_period;
-       UINT16  cfp_maxdur;
-       UINT16  cfp_durremaining;
+       u8      eid;
+       u8      len;
+       u8      cfp_cnt;
+       u8      cfp_period;
+       u16     cfp_maxdur;
+       u16     cfp_durremaining;
 } __WLAN_ATTRIB_PACK__ wlan_ie_cf_parms_t;
 
 /*-- TIM ------------------------------------------*/
 typedef struct wlan_ie_tim
 {
-       UINT8   eid;
-       UINT8   len;
-       UINT8   dtim_cnt;
-       UINT8   dtim_period;
-       UINT8   bitmap_ctl;
-       UINT8   virt_bm[1];
+       u8      eid;
+       u8      len;
+       u8      dtim_cnt;
+       u8      dtim_period;
+       u8      bitmap_ctl;
+       u8      virt_bm[1];
 } __WLAN_ATTRIB_PACK__ wlan_ie_tim_t;
 
 /*-- IBSS Parameter Set ---------------------------*/
 typedef struct wlan_ie_ibss_parms
 {
-       UINT8   eid;
-       UINT8   len;
-       UINT16  atim_win;
+       u8      eid;
+       u8      len;
+       u16     atim_win;
 } __WLAN_ATTRIB_PACK__ wlan_ie_ibss_parms_t;
 
 /*-- Challenge Text  ------------------------------*/
 typedef struct wlan_ie_challenge
 {
-       UINT8   eid;
-       UINT8   len;
-       UINT8   challenge[1];
+       u8      eid;
+       u8      len;
+       u8      challenge[1];
 } __WLAN_ATTRIB_PACK__ wlan_ie_challenge_t;
 
 /*-------------------------------------------------*/
@@ -329,9 +329,9 @@ typedef struct wlan_ie_challenge
 /* prototype structure, all mgmt frame types will start with these members */
 typedef struct wlan_fr_mgmt
 {
-       UINT16                  type;
-       UINT16                  len;    /* DOES NOT include CRC !!!!*/
-       UINT8                   *buf;
+       u16                     type;
+       u16                     len;    /* DOES NOT include CRC !!!!*/
+       u8                      *buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
@@ -342,16 +342,16 @@ typedef struct wlan_fr_mgmt
 /*-- Beacon ---------------------------------------*/
 typedef struct wlan_fr_beacon
 {
-       UINT16                  type;
-       UINT16                  len;
-       UINT8                   *buf;
+       u16                     type;
+       u16                     len;
+       u8                      *buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
        /*-- fixed fields -----------*/
-       UINT64                  *ts;
-       UINT16                  *bcn_int;
-       UINT16                  *cap_info;
+       u64                     *ts;
+       u16                     *bcn_int;
+       u16                     *cap_info;
        /*-- info elements ----------*/
        wlan_ie_ssid_t          *ssid;
        wlan_ie_supp_rates_t    *supp_rates;
@@ -367,9 +367,9 @@ typedef struct wlan_fr_beacon
 /*-- IBSS ATIM ------------------------------------*/
 typedef struct wlan_fr_ibssatim
 {
-       UINT16                  type;
-       UINT16                  len;
-       UINT8*                  buf;
+       u16                     type;
+       u16                     len;
+       u8*                     buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
@@ -384,14 +384,14 @@ typedef struct wlan_fr_ibssatim
 /*-- Disassociation -------------------------------*/
 typedef struct wlan_fr_disassoc
 {
-       UINT16                  type;
-       UINT16                  len;
-       UINT8                   *buf;
+       u16                     type;
+       u16                     len;
+       u8                      *buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
        /*-- fixed fields -----------*/
-       UINT16                  *reason;
+       u16                     *reason;
 
        /*-- info elements ----------*/
 
@@ -400,15 +400,15 @@ typedef struct wlan_fr_disassoc
 /*-- Association Request --------------------------*/
 typedef struct wlan_fr_assocreq
 {
-       UINT16                  type;
-       UINT16                  len;
-       UINT8*                  buf;
+       u16                     type;
+       u16                     len;
+       u8*                     buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
        /*-- fixed fields -----------*/
-       UINT16                  *cap_info;
-       UINT16                  *listen_int;
+       u16                     *cap_info;
+       u16                     *listen_int;
        /*-- info elements ----------*/
        wlan_ie_ssid_t          *ssid;
        wlan_ie_supp_rates_t    *supp_rates;
@@ -418,16 +418,16 @@ typedef struct wlan_fr_assocreq
 /*-- Association Response -------------------------*/
 typedef struct wlan_fr_assocresp
 {
-       UINT16                  type;
-       UINT16                  len;
-       UINT8                   *buf;
+       u16                     type;
+       u16                     len;
+       u8                      *buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
        /*-- fixed fields -----------*/
-       UINT16                  *cap_info;
-       UINT16                  *status;
-       UINT16                  *aid;
+       u16                     *cap_info;
+       u16                     *status;
+       u16                     *aid;
        /*-- info elements ----------*/
        wlan_ie_supp_rates_t    *supp_rates;
 
@@ -436,16 +436,16 @@ typedef struct wlan_fr_assocresp
 /*-- Reassociation Request ------------------------*/
 typedef struct wlan_fr_reassocreq
 {
-       UINT16                  type;
-       UINT16                  len;
-       UINT8                   *buf;
+       u16                     type;
+       u16                     len;
+       u8                      *buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
        /*-- fixed fields -----------*/
-       UINT16                  *cap_info;
-       UINT16                  *listen_int;
-       UINT8                   *curr_ap;
+       u16                     *cap_info;
+       u16                     *listen_int;
+       u8                      *curr_ap;
        /*-- info elements ----------*/
        wlan_ie_ssid_t          *ssid;
        wlan_ie_supp_rates_t    *supp_rates;
@@ -455,16 +455,16 @@ typedef struct wlan_fr_reassocreq
 /*-- Reassociation Response -----------------------*/
 typedef struct wlan_fr_reassocresp
 {
-       UINT16                  type;
-       UINT16                  len;
-       UINT8                   *buf;
+       u16                     type;
+       u16                     len;
+       u8                      *buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
        /*-- fixed fields -----------*/
-       UINT16                  *cap_info;
-       UINT16                  *status;
-       UINT16                  *aid;
+       u16                     *cap_info;
+       u16                     *status;
+       u16                     *aid;
        /*-- info elements ----------*/
        wlan_ie_supp_rates_t    *supp_rates;
 
@@ -473,9 +473,9 @@ typedef struct wlan_fr_reassocresp
 /*-- Probe Request --------------------------------*/
 typedef struct wlan_fr_probereq
 {
-       UINT16                  type;
-       UINT16                  len;
-       UINT8                   *buf;
+       u16                     type;
+       u16                     len;
+       u8                      *buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
@@ -489,16 +489,16 @@ typedef struct wlan_fr_probereq
 /*-- Probe Response -------------------------------*/
 typedef struct wlan_fr_proberesp
 {
-       UINT16                  type;
-       UINT16                  len;
-       UINT8                   *buf;
+       u16                     type;
+       u16                     len;
+       u8                      *buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
        /*-- fixed fields -----------*/
-       UINT64                  *ts;
-       UINT16                  *bcn_int;
-       UINT16                  *cap_info;
+       u64                     *ts;
+       u16                     *bcn_int;
+       u16                     *cap_info;
        /*-- info elements ----------*/
        wlan_ie_ssid_t          *ssid;
        wlan_ie_supp_rates_t    *supp_rates;
@@ -511,16 +511,16 @@ typedef struct wlan_fr_proberesp
 /*-- Authentication -------------------------------*/
 typedef struct wlan_fr_authen
 {
-       UINT16                  type;
-       UINT16                  len;
-       UINT8                   *buf;
+       u16                     type;
+       u16                     len;
+       u8                      *buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
        /*-- fixed fields -----------*/
-       UINT16                  *auth_alg;
-       UINT16                  *auth_seq;
-       UINT16                  *status;
+       u16                     *auth_alg;
+       u16                     *auth_seq;
+       u16                     *status;
        /*-- info elements ----------*/
        wlan_ie_challenge_t     *challenge;
 
@@ -529,14 +529,14 @@ typedef struct wlan_fr_authen
 /*-- Deauthenication -----------------------------*/
 typedef struct wlan_fr_deauthen
 {
-       UINT16                  type;
-       UINT16                  len;
-       UINT8                   *buf;
+       u16                     type;
+       u16                     len;
+       u8                      *buf;
        p80211_hdr_t            *hdr;
        /* used for target specific data, skb in Linux */
        void                    *priv;
        /*-- fixed fields -----------*/
-       UINT16                  *reason;
+       u16                     *reason;
 
        /*-- info elements ----------*/
 
index c14e9fbbd687ac26e6955827588c91bc27a6897e..3a575d8cc99e1fd201449ec049f9aabce15e82fe 100644 (file)
 
 typedef struct p80211msg
 {
-       UINT32  msgcode;
-       UINT32  msglen;
-       UINT8   devname[WLAN_DEVNAMELEN_MAX];
+       u32     msgcode;
+       u32     msglen;
+       u8      devname[WLAN_DEVNAMELEN_MAX];
 } __WLAN_ATTRIB_PACK__ p80211msg_t;
 
 typedef struct p80211msgd
 {
-       UINT32  msgcode;
-       UINT32  msglen;
-       UINT8   devname[WLAN_DEVNAMELEN_MAX];
-       UINT8   args[0];
+       u32     msgcode;
+       u32     msglen;
+       u8      devname[WLAN_DEVNAMELEN_MAX];
+       u8      args[0];
 } __WLAN_ATTRIB_PACK__ p80211msgd_t;
 
 /*================================================================*/
index e948f5c3a9108c3a2defae6446f413f176013aef..98a72193e8d720137bddc587014e666a13485298 100644 (file)
@@ -128,7 +128,7 @@ static void p80211knetdev_set_multicast_list(netdevice_t *dev);
 static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd);
 static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr);
 static void p80211knetdev_tx_timeout(netdevice_t *netdev);
-static int p80211_rx_typedrop( wlandevice_t *wlandev, UINT16 fc);
+static int p80211_rx_typedrop( wlandevice_t *wlandev, u16 fc);
 
 
 /*================================================================*/
@@ -343,7 +343,7 @@ static void p80211netdev_rx_bh(unsigned long arg)
        struct sk_buff *skb = NULL;
        netdevice_t     *dev = wlandev->netdev;
        p80211_hdr_a3_t *hdr;
-       UINT16 fc;
+       u16 fc;
 
         DBFENTER;
 
@@ -571,7 +571,7 @@ static void p80211knetdev_set_multicast_list(netdevice_t *dev)
 
 static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr)
 {
-       UINT32 ethcmd;
+       u32 ethcmd;
        struct ethtool_drvinfo info;
        struct ethtool_value edata;
 
@@ -638,7 +638,7 @@ static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr)
 *              -EFAULT memory fault copying msg from user buffer
 *              -ENOMEM unable to allocate kernel msg buffer
 *              -ENOSYS bad magic, it the cmd really for us?
-*              -EINTR  sleeping on cmd, awakened by signal, cmd cancelled.
+*              -EintR  sleeping on cmd, awakened by signal, cmd cancelled.
 *
 * Call Context:
 *      Process thread (ioctl caller).  TODO: SMP support may require
@@ -649,7 +649,7 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)
        int                     result = 0;
        p80211ioctl_req_t       *req = (p80211ioctl_req_t*)ifr;
        wlandevice_t            *wlandev = dev->ml_priv;
-       UINT8                   *msgbuf;
+       u8                      *msgbuf;
        DBFENTER;
 
        WLAN_LOG_DEBUG(2, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len);
@@ -769,7 +769,7 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)
        resultcode->data = 0;
 
        /* now fire the request */
-       result = p80211req_dorequest(dev->ml_priv, (UINT8 *)&dot11req);
+       result = p80211req_dorequest(dev->ml_priv, (u8 *)&dot11req);
 
        /* If the request wasn't successful, report an error and don't
         * change the netdev address
@@ -1075,10 +1075,10 @@ void p80211netdev_hwremoved(wlandevice_t *wlandev)
 * Call context:
 *      interrupt
 ----------------------------------------------------------------*/
-static int p80211_rx_typedrop( wlandevice_t *wlandev, UINT16 fc)
+static int p80211_rx_typedrop( wlandevice_t *wlandev, u16 fc)
 {
-       UINT16  ftype;
-       UINT16  fstype;
+       u16     ftype;
+       u16     fstype;
        int     drop = 0;
        /* Classify frame, increment counter */
        ftype = WLAN_GET_FC_FTYPE(fc);
index 62fc2cbaf8afd7512b05d8d7bf722c001270646e..5e5d475210dbb3eac8e2f44ff87285c3a810355c 100644 (file)
 /* Received frame statistics */
 typedef struct p80211_frmrx_t
 {
-       UINT32  mgmt;
-       UINT32  assocreq;
-       UINT32  assocresp;
-       UINT32  reassocreq;
-       UINT32  reassocresp;
-       UINT32  probereq;
-       UINT32  proberesp;
-       UINT32  beacon;
-       UINT32  atim;
-       UINT32  disassoc;
-       UINT32  authen;
-       UINT32  deauthen;
-       UINT32  mgmt_unknown;
-       UINT32  ctl;
-       UINT32  pspoll;
-       UINT32  rts;
-       UINT32  cts;
-       UINT32  ack;
-       UINT32  cfend;
-       UINT32  cfendcfack;
-       UINT32  ctl_unknown;
-       UINT32  data;
-       UINT32  dataonly;
-       UINT32  data_cfack;
-       UINT32  data_cfpoll;
-       UINT32  data__cfack_cfpoll;
-       UINT32  null;
-       UINT32  cfack;
-       UINT32  cfpoll;
-       UINT32  cfack_cfpoll;
-       UINT32  data_unknown;
-       UINT32  decrypt;
-       UINT32  decrypt_err;
+       u32     mgmt;
+       u32     assocreq;
+       u32     assocresp;
+       u32     reassocreq;
+       u32     reassocresp;
+       u32     probereq;
+       u32     proberesp;
+       u32     beacon;
+       u32     atim;
+       u32     disassoc;
+       u32     authen;
+       u32     deauthen;
+       u32     mgmt_unknown;
+       u32     ctl;
+       u32     pspoll;
+       u32     rts;
+       u32     cts;
+       u32     ack;
+       u32     cfend;
+       u32     cfendcfack;
+       u32     ctl_unknown;
+       u32     data;
+       u32     dataonly;
+       u32     data_cfack;
+       u32     data_cfpoll;
+       u32     data__cfack_cfpoll;
+       u32     null;
+       u32     cfack;
+       u32     cfpoll;
+       u32     cfack_cfpoll;
+       u32     data_unknown;
+       u32  decrypt;
+       u32  decrypt_err;
 } p80211_frmrx_t;
 
 #ifdef WIRELESS_EXT
@@ -180,18 +180,18 @@ typedef struct wlandevice
        char            name[WLAN_DEVNAMELEN_MAX]; /* Dev name, from register_wlandev()*/
        char            *nsdname;
 
-       UINT32          state;          /* Device I/F state (open/closed) */
-       UINT32          msdstate;       /* state of underlying driver */
-       UINT32          hwremoved;      /* Has the hw been yanked out? */
+       u32          state;          /* Device I/F state (open/closed) */
+       u32             msdstate;       /* state of underlying driver */
+       u32             hwremoved;      /* Has the hw been yanked out? */
 
        /* Hardware config */
-       UINT            irq;
-       UINT            iobase;
-       UINT            membase;
-       UINT32          nsdcaps;  /* NSD Capabilities flags */
+       unsigned int            irq;
+       unsigned int            iobase;
+       unsigned int            membase;
+       u32          nsdcaps;  /* NSD Capabilities flags */
 
        /* Config vars */
-       UINT            ethconv;
+       unsigned int            ethconv;
 
        /* device methods (init by MSD, used by p80211 */
        int             (*open)(struct wlandevice *wlandev);
@@ -204,15 +204,15 @@ typedef struct wlandevice
        void            (*tx_timeout)(struct wlandevice *wlandev);
 
        /* 802.11 State */
-       UINT8           bssid[WLAN_BSSID_LEN];
+       u8              bssid[WLAN_BSSID_LEN];
        p80211pstr32_t  ssid;
-       UINT32          macmode;
+       u32             macmode;
        int             linkstatus;
        int             shortpreamble;  /* C bool */
 
        /* WEP State */
-       UINT8 wep_keys[NUM_WEPKEYS][MAX_KEYLEN];
-       UINT8 wep_keylens[NUM_WEPKEYS];
+       u8 wep_keys[NUM_WEPKEYS][MAX_KEYLEN];
+       u8 wep_keylens[NUM_WEPKEYS];
        int   hostwep;
 
        /* Request/Confirm i/f state (used by p80211) */
@@ -237,7 +237,7 @@ typedef struct wlandevice
        struct iw_statistics    wstats;
 
        /* jkriegl: iwspy fields */
-        UINT8                  spy_number;
+        u8                     spy_number;
         char                   spy_address[IW_MAX_SPY][ETH_ALEN];
         struct iw_quality       spy_stat[IW_MAX_SPY];
 
@@ -246,9 +246,9 @@ typedef struct wlandevice
 } wlandevice_t;
 
 /* WEP stuff */
-int wep_change_key(wlandevice_t *wlandev, int keynum, UINT8* key, int keylen);
-int wep_decrypt(wlandevice_t *wlandev, UINT8 *buf, UINT32 len, int key_override, UINT8 *iv, UINT8 *icv);
-int wep_encrypt(wlandevice_t *wlandev, UINT8 *buf, UINT8 *dst, UINT32 len, int keynum, UINT8 *iv, UINT8 *icv);
+int wep_change_key(wlandevice_t *wlandev, int keynum, u8* key, int keylen);
+int wep_decrypt(wlandevice_t *wlandev, u8 *buf, u32 len, int key_override, u8 *iv, u8 *icv);
+int wep_encrypt(wlandevice_t *wlandev, u8 *buf, u8 *dst, u32 len, int keynum, u8 *iv, u8 *icv);
 
 /*================================================================*/
 /* Externs */
index 83bd65b62488be8943e81d92c9362c5c73ac5328..310737b2927e3fc31e33c54f2743801c3efef23c 100644 (file)
@@ -125,7 +125,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, p80211msg_dot11req_mib
 *      Potentially blocks the caller, so it's a good idea to
 *      not call this function from an interrupt context.
 ----------------------------------------------------------------*/
-int p80211req_dorequest( wlandevice_t *wlandev, UINT8 *msgbuf)
+int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf)
 {
        int             result = 0;
        p80211msg_t     *msg = (p80211msg_t*)msgbuf;
@@ -223,13 +223,13 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
 {
        p80211itemd_t   *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data;
        p80211pstrd_t  *pstr = (p80211pstrd_t*) mibitem->data;
-       UINT8 *key = mibitem->data + sizeof(p80211pstrd_t);
+       u8 *key = mibitem->data + sizeof(p80211pstrd_t);
 
        DBFENTER;
 
        switch (mibitem->did) {
        case DIDmib_dot11smt_p80211Table_p80211_ifstate: {
-               UINT32 *data = (UINT32 *) mibitem->data;
+               u32 *data = (u32 *) mibitem->data;
                if (isget)
                        switch (wlandev->msdstate) {
                        case WLAN_MSD_HWPRESENT:
@@ -247,7 +247,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
                break;
        }
        case DIDmib_dot11phy_dot11PhyOperationTable_dot11ShortPreambleEnabled: {
-               UINT32 *data = (UINT32 *) mibitem->data;
+               u32 *data = (u32 *) mibitem->data;
 
                if (isget)
                        *data = wlandev->shortpreamble;
@@ -276,7 +276,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
                break;
        }
        case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID: {
-               UINT32 *data = (UINT32 *) mibitem->data;
+               u32 *data = (u32 *) mibitem->data;
 
                if (isget) {
                        *data = wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK;
@@ -288,7 +288,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
                break;
        }
        case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked: {
-               UINT32 *data = (UINT32 *) mibitem->data;
+               u32 *data = (u32 *) mibitem->data;
 
                if (isget) {
                        if (wlandev->hostwep & HOSTWEP_PRIVACYINVOKED)
@@ -303,7 +303,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
                break;
        }
        case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted: {
-               UINT32 *data = (UINT32 *) mibitem->data;
+               u32 *data = (u32 *) mibitem->data;
 
                if (isget) {
                        if (wlandev->hostwep & HOSTWEP_EXCLUDEUNENCRYPTED)
index 54abdceedc5d3a2b803e5969670d38c7c7dbb3f7..497a4d6eb59a7c7bcdb841ff7c6bd3c870814698 100644 (file)
@@ -63,6 +63,6 @@
 /*================================================================*/
 /* Function Declarations */
 
-int    p80211req_dorequest(wlandevice_t *wlandev, UINT8 *msgbuf);
+int    p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf);
 
 #endif
index 811b0ce39bf64f899ce2fed522251e57c3034331..5be6737e3e5d95ca0c294d3a10b9c9ecf67777c0 100644 (file)
 
 #define P80211_TYPE_OCTETSTR           1       /* pascal array of bytes */
 #define P80211_TYPE_DISPLAYSTR         2       /* pascal array of bytes containing ascii */
-#define P80211_TYPE_INT                        4       /* UINT32 min and max limited by 32 bits */
-#define P80211_TYPE_ENUMINT            5       /* UINT32 holding a numeric
+#define P80211_TYPE_int                        4       /* u32 min and max limited by 32 bits */
+#define P80211_TYPE_ENUMint            5       /* u32 holding a numeric
                                                   code that can be mapped
                                                   to a textual name */
 #define P80211_TYPE_UNKDATA            6       /* Data item containing an
                                                   unknown data type */
-#define P80211_TYPE_INTARRAY           7       /* Array of 32-bit integers. */
+#define P80211_TYPE_intARRAY           7       /* Array of 32-bit integers. */
 #define P80211_TYPE_BITARRAY           8       /* Array of bits. */
 #define P80211_TYPE_MACARRAY           9       /* Array of MAC addresses. */
 
                                        /* is a DID-LEN-DATA triple */
                                        /* with a max size of 4+4+384 */
 
-#define P80211_SET_INT(item, value) do { \
+#define P80211_SET_int(item, value) do { \
        (item).data   = (value); \
        (item).status = P80211ENUM_msgitem_status_data_ok; \
        } while(0)
 
 #define P80211ITEM_SETFLAGS(q, r, c)   ( q | r | c )
 
-#define P80211ITEM_ISREQUIRED(flags)   (((UINT32)(flags & ISREQUIRED)) >> 31 )
-#define P80211ITEM_ISREQUEST(flags)    (((UINT32)(flags & ISREQUEST)) >> 30 )
-#define P80211ITEM_ISCONFIRM(flags)    (((UINT32)(flags & ISCONFIRM)) >> 29 )
+#define P80211ITEM_ISREQUIRED(flags)   (((u32)(flags & ISREQUIRED)) >> 31 )
+#define P80211ITEM_ISREQUEST(flags)    (((u32)(flags & ISREQUEST)) >> 30 )
+#define P80211ITEM_ISCONFIRM(flags)    (((u32)(flags & ISCONFIRM)) >> 29 )
 
 /*----------------------------------------------------------------*/
 /* The following macro creates a name for an enum */
 #define P80211DID_MASK_ACCESS          (0x00000003UL)
 
 
-#define P80211DID_MK(a,m,l)    ((((UINT32)(a)) & (m)) << (l))
+#define P80211DID_MK(a,m,l)    ((((u32)(a)) & (m)) << (l))
 
 #define P80211DID_MKSECTION(a) P80211DID_MK(a, \
                                        P80211DID_MASK_SECTION, \
                                                (a) )
 
 
-#define P80211DID_GET(a,m,l)   ((((UINT32)(a)) >> (l)) & (m))
+#define P80211DID_GET(a,m,l)   ((((u32)(a)) >> (l)) & (m))
 
 #define P80211DID_SECTION(a)   P80211DID_GET(a, \
                                        P80211DID_MASK_SECTION, \
 
 /*----------------------------------------------------------------*/
 /* The following structure types are used for the represenation */
-/*  of ENUMINT type metadata. */
+/*  of ENUMint type metadata. */
 
 typedef struct p80211enumpair
 {
-       UINT32                  val;
+       u32                     val;
        char                    *name;
 } p80211enumpair_t;
 
 typedef struct p80211enum
 {
-       INT                     nitems;
+       int                     nitems;
        p80211enumpair_t        *list;
 } p80211enum_t;
 
@@ -394,137 +394,137 @@ typedef struct p80211enum
 /* Template pascal string */
 typedef struct p80211pstr
 {
-       UINT8           len;
+       u8              len;
 } __WLAN_ATTRIB_PACK__ p80211pstr_t;
 
 typedef struct p80211pstrd
 {
-       UINT8           len;
-       UINT8           data[0];
+       u8              len;
+       u8              data[0];
 } __WLAN_ATTRIB_PACK__ p80211pstrd_t;
 
 /* Maximum pascal string */
 typedef struct p80211pstr255
 {
-       UINT8           len;
-       UINT8           data[MAXLEN_PSTR255];
+       u8              len;
+       u8              data[MAXLEN_PSTR255];
 } __WLAN_ATTRIB_PACK__ p80211pstr255_t;
 
 /* pascal string for macaddress and bssid */
 typedef struct p80211pstr6
 {
-       UINT8           len;
-       UINT8           data[MAXLEN_PSTR6];
+       u8              len;
+       u8              data[MAXLEN_PSTR6];
 } __WLAN_ATTRIB_PACK__ p80211pstr6_t;
 
 /* pascal string for channel list */
 typedef struct p80211pstr14
 {
-       UINT8           len;
-       UINT8           data[MAXLEN_PSTR14];
+       u8              len;
+       u8              data[MAXLEN_PSTR14];
 } __WLAN_ATTRIB_PACK__ p80211pstr14_t;
 
 /* pascal string for ssid */
 typedef struct p80211pstr32
 {
-       UINT8           len;
-       UINT8           data[MAXLEN_PSTR32];
+       u8              len;
+       u8              data[MAXLEN_PSTR32];
 } __WLAN_ATTRIB_PACK__ p80211pstr32_t;
 
 /* MAC address array */
 typedef struct p80211macarray
 {
-       UINT32          cnt;
-       UINT8           data[1][MAXLEN_PSTR6];
+       u32             cnt;
+       u8              data[1][MAXLEN_PSTR6];
 } __WLAN_ATTRIB_PACK__ p80211macarray_t;
 
 /* prototype template */
 typedef struct p80211item
 {
-       UINT32          did;
-       UINT16          status;
-       UINT16          len;
+       u32             did;
+       u16             status;
+       u16             len;
 } __WLAN_ATTRIB_PACK__ p80211item_t;
 
 /* prototype template w/ data item */
 typedef struct p80211itemd
 {
-       UINT32          did;
-       UINT16          status;
-       UINT16          len;
-       UINT8           data[0];
+       u32             did;
+       u16             status;
+       u16             len;
+       u8              data[0];
 } __WLAN_ATTRIB_PACK__ p80211itemd_t;
 
-/* message data item for INT, BOUNDEDINT, ENUMINT */
+/* message data item for int, BOUNDEDINT, ENUMINT */
 typedef struct p80211item_uint32
 {
-       UINT32          did;
-       UINT16          status;
-       UINT16          len;
-       UINT32          data;
+       u32             did;
+       u16             status;
+       u16             len;
+       u32             data;
 } __WLAN_ATTRIB_PACK__ p80211item_uint32_t;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
 typedef struct p80211item_pstr6
 {
-       UINT32          did;
-       UINT16          status;
-       UINT16          len;
+       u32             did;
+       u16             status;
+       u16             len;
        p80211pstr6_t   data;
 } __WLAN_ATTRIB_PACK__ p80211item_pstr6_t;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
 typedef struct p80211item_pstr14
 {
-       UINT32                  did;
-       UINT16                  status;
-       UINT16                  len;
+       u32                     did;
+       u16                     status;
+       u16                     len;
        p80211pstr14_t          data;
 } __WLAN_ATTRIB_PACK__ p80211item_pstr14_t;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
 typedef struct p80211item_pstr32
 {
-       UINT32                  did;
-       UINT16                  status;
-       UINT16                  len;
+       u32                     did;
+       u16                     status;
+       u16                     len;
        p80211pstr32_t          data;
 } __WLAN_ATTRIB_PACK__ p80211item_pstr32_t;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
 typedef struct p80211item_pstr255
 {
-       UINT32                  did;
-       UINT16                  status;
-       UINT16                  len;
+       u32                     did;
+       u16                     status;
+       u16                     len;
        p80211pstr255_t         data;
 } __WLAN_ATTRIB_PACK__ p80211item_pstr255_t;
 
 /* message data item for UNK 392, namely mib items */
 typedef struct  p80211item_unk392
 {
-       UINT32          did;
-       UINT16          status;
-       UINT16          len;
-       UINT8           data[MAXLEN_MIBATTRIBUTE];
+       u32             did;
+       u16             status;
+       u16             len;
+       u8              data[MAXLEN_MIBATTRIBUTE];
 } __WLAN_ATTRIB_PACK__ p80211item_unk392_t;
 
 /* message data item for UNK 1025, namely p2 pdas */
 typedef struct  p80211item_unk1024
 {
-       UINT32          did;
-       UINT16          status;
-       UINT16          len;
-       UINT8           data[1024];
+       u32             did;
+       u16             status;
+       u16             len;
+       u8              data[1024];
 }  __WLAN_ATTRIB_PACK__ p80211item_unk1024_t;
 
 /* message data item for UNK 4096, namely p2 download chunks */
 typedef struct  p80211item_unk4096
 {
-       UINT32          did;
-       UINT16          status;
-       UINT16          len;
-       UINT8           data[4096];
+       u32             did;
+       u16             status;
+       u16             len;
+       u8              data[4096];
 }  __WLAN_ATTRIB_PACK__ p80211item_unk4096_t;
 
 struct catlistitem;
@@ -534,9 +534,9 @@ struct catlistitem;
 /*  metadata items.  Some components may choose to use more, */
 /*  less or different metadata items. */
 
-typedef void (*p80211_totext_t)( struct catlistitem *, UINT32 did, UINT8* itembuf, char *textbuf);
-typedef void (*p80211_fromtext_t)( struct catlistitem *, UINT32 did, UINT8* itembuf, char *textbuf);
-typedef UINT32 (*p80211_valid_t)( struct catlistitem *, UINT32 did, UINT8* itembuf);
+typedef void (*p80211_totext_t)( struct catlistitem *, u32 did, u8* itembuf, char *textbuf);
+typedef void (*p80211_fromtext_t)( struct catlistitem *, u32 did, u8* itembuf, char *textbuf);
+typedef u32 (*p80211_valid_t)( struct catlistitem *, u32 did, u8* itembuf);
 
 
 /*================================================================*/
@@ -575,8 +575,8 @@ extern p80211enum_t MKENUMNAME(p2preamble);
 /* The following declare some utility functions for use with the */
 /*  p80211enum_t type. */
 
-UINT32 p80211enum_text2int(p80211enum_t *ep, char *text);
-UINT32 p80211enum_int2text(p80211enum_t *ep, UINT32 val, char *text);
+u32 p80211enum_text2int(p80211enum_t *ep, char *text);
+u32 p80211enum_int2text(p80211enum_t *ep, u32 val, char *text);
 void p80211_error2text(int err_code, char *err_str);
 
 /*----------------------------------------------------------------*/
@@ -591,85 +591,85 @@ void p80211_error2text(int err_code, char *err_str);
 
 /*-- DISPLAYSTR ------------------------------------------------------*/
 /* pstr ==> cstr */
-void p80211_totext_displaystr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+void p80211_totext_displaystr( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
 /* cstr ==> pstr */
-void p80211_fromtext_displaystr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+void p80211_fromtext_displaystr( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
 /* function that checks validity of a displaystr binary value */
-UINT32 p80211_isvalid_displaystr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
+u32 p80211_isvalid_displaystr( struct catlistitem *metalist, u32 did, u8 *itembuf );
 
 /*-- OCTETSTR --------------------------------------------------------*/
 /* pstr ==> "xx:xx:...." */
-void p80211_totext_octetstr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+void p80211_totext_octetstr( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
 /* "xx:xx:...." ==> pstr */
-void p80211_fromtext_octetstr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+void p80211_fromtext_octetstr( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
 /* function that checks validity of an octetstr binary value */
-UINT32 p80211_isvalid_octetstr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
+u32 p80211_isvalid_octetstr( struct catlistitem *metalist, u32 did, u8 *itembuf );
 
-/*-- INT -------------------------------------------------------------*/
-/* UINT32 ==> %d */
-void p80211_totext_int( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+/*-- int -------------------------------------------------------------*/
+/* u32 ==> %d */
+void p80211_totext_int( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
-/* %d ==> UINT32 */
-void p80211_fromtext_int( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+/* %d ==> u32 */
+void p80211_fromtext_int( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
 /* function that checks validity of an int's binary value (always successful) */
-UINT32 p80211_isvalid_int( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
+u32 p80211_isvalid_int( struct catlistitem *metalist, u32 did, u8 *itembuf );
 
-/*-- ENUMINT ---------------------------------------------------------*/
-/* UINT32 ==> <valuename> */
-void p80211_totext_enumint( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+/*-- ENUMint ---------------------------------------------------------*/
+/* u32 ==> <valuename> */
+void p80211_totext_enumint( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
-/* <valuename> ==> UINT32 */
-void p80211_fromtext_enumint( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+/* <valuename> ==> u32 */
+void p80211_fromtext_enumint( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
 /* function that checks validity of an enum's binary value */
-UINT32 p80211_isvalid_enumint( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
+u32 p80211_isvalid_enumint( struct catlistitem *metalist, u32 did, u8 *itembuf );
 
-/*-- INTARRAY --------------------------------------------------------*/
-/* UINT32[] => %d,%d,%d,... */
-void p80211_totext_intarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+/*-- intARRAY --------------------------------------------------------*/
+/* u32[] => %d,%d,%d,... */
+void p80211_totext_intarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
-/* %d,%d,%d,... ==> UINT32[] */
-void p80211_fromtext_intarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+/* %d,%d,%d,... ==> u32[] */
+void p80211_fromtext_intarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
 /* function that checks validity of an integer array's value */
-UINT32 p80211_isvalid_intarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
+u32 p80211_isvalid_intarray( struct catlistitem *metalist, u32 did, u8 *itembuf );
 
 /*-- BITARRAY --------------------------------------------------------*/
-/* UINT32 ==> %d,%d,%d,... */
-void p80211_totext_bitarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+/* u32 ==> %d,%d,%d,... */
+void p80211_totext_bitarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
-/* %d,%d,%d,... ==> UINT32 */
-void p80211_fromtext_bitarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+/* %d,%d,%d,... ==> u32 */
+void p80211_fromtext_bitarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
 /* function that checks validity of a bit array's value */
-UINT32 p80211_isvalid_bitarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
+u32 p80211_isvalid_bitarray( struct catlistitem *metalist, u32 did, u8 *itembuf );
 
 /*-- MACARRAY --------------------------------------------------------*/
-void p80211_totext_macarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+void p80211_totext_macarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
-void p80211_fromtext_macarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+void p80211_fromtext_macarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
 /* function that checks validity of a MAC address array's value */
-UINT32 p80211_isvalid_macarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
+u32 p80211_isvalid_macarray( struct catlistitem *metalist, u32 did, u8 *itembuf );
 
 /*-- MIBATTRIUBTE ------------------------------------------------------*/
 /* <mibvalue> ==> <textual representation identified in MIB metadata> */
-void p80211_totext_getmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
-void p80211_totext_setmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+void p80211_totext_getmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
+void p80211_totext_setmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
 
 /* <textual representation identified in MIB metadata> ==> <mibvalue> */
-void p80211_fromtext_getmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
-void p80211_fromtext_setmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
+void p80211_fromtext_getmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
+void p80211_fromtext_setmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
 
 /* function that checks validity of a mibitem's binary value */
-UINT32 p80211_isvalid_getmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
-UINT32 p80211_isvalid_setmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
+u32 p80211_isvalid_getmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf );
+u32 p80211_isvalid_setmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf );
 
 #endif /* _P80211TYPES_H */
 
index 0ab0d077af9289e3ed003a5033b8d0d0882552d6..46a2a6b3bdca56d09dfea9c4587da5c4e72fb137 100644 (file)
@@ -72,7 +72,7 @@
 /*================================================================*/
 /* Local Constants */
 
-#define SSWAP(a,b) {UINT8 tmp = s[a]; s[a] = s[b]; s[b] = tmp;}
+#define SSWAP(a,b) {u8 tmp = s[a]; s[a] = s[b]; s[b] = tmp;}
 #define WEP_KEY(x)       (((x) & 0xC0) >> 6)
 
 /*================================================================*/
@@ -86,7 +86,7 @@
 /*================================================================*/
 /* Local Static Definitions */
 
-static const UINT32 wep_crc32_table[256] = {
+static const u32 wep_crc32_table[256] = {
         0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
         0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
         0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
@@ -149,7 +149,7 @@ static const UINT32 wep_crc32_table[256] = {
 
 /* keylen in bytes! */
 
-int wep_change_key(wlandevice_t *wlandev, int keynum, UINT8* key, int keylen)
+int wep_change_key(wlandevice_t *wlandev, int keynum, u8* key, int keylen)
 {
        if (keylen < 0)  return -1;
        if (keylen >= MAX_KEYLEN) return -1;
@@ -172,11 +172,11 @@ int wep_change_key(wlandevice_t *wlandev, int keynum, UINT8* key, int keylen)
   4-byte IV at start of buffer, 4-byte ICV at end of buffer.
   if successful, buf start is payload begin, length -= 8;
  */
-int wep_decrypt(wlandevice_t *wlandev, UINT8 *buf, UINT32 len, int key_override, UINT8 *iv, UINT8 *icv)
+int wep_decrypt(wlandevice_t *wlandev, u8 *buf, u32 len, int key_override, u8 *iv, u8 *icv)
 {
-       UINT32 i, j, k, crc, keylen;
-       UINT8 s[256], key[64], c_crc[4];
-       UINT8 keyidx;
+       u32 i, j, k, crc, keylen;
+       u8 s[256], key[64], c_crc[4];
+       u8 keyidx;
 
        /* Needs to be at least 8 bytes of payload */
        if (len <= 0) return -1;
@@ -244,10 +244,10 @@ int wep_decrypt(wlandevice_t *wlandev, UINT8 *buf, UINT32 len, int key_override,
 }
 
 /* encrypts in-place. */
-int wep_encrypt(wlandevice_t *wlandev, UINT8 *buf, UINT8 *dst, UINT32 len, int keynum, UINT8 *iv, UINT8 *icv)
+int wep_encrypt(wlandevice_t *wlandev, u8 *buf, u8 *dst, u32 len, int keynum, u8 *iv, u8 *icv)
 {
-       UINT32 i, j, k, crc, keylen;
-       UINT8 s[256], key[64];
+       u32 i, j, k, crc, keylen;
+       u8 s[256], key[64];
 
        /* no point in WEPping an empty frame */
        if (len <= 0) return -1;
index 4a690199973fc0f2a75366ec68f29cca78c8dbcc..82ec301b4313fd2360d0e1f82f61483720d7ba90 100644 (file)
@@ -78,7 +78,7 @@ static int p80211wext_giwessid(netdevice_t *dev,
 /* compatibility to wireless extensions */
 #ifdef WIRELESS_EXT
 
-static UINT8 p80211_mhz_to_channel(UINT16 mhz)
+static u8 p80211_mhz_to_channel(u16 mhz)
 {
        if (mhz >= 5000) {
                return ((mhz - 5000) / 5);
@@ -94,7 +94,7 @@ static UINT8 p80211_mhz_to_channel(UINT16 mhz)
        return 0;
 }
 
-static UINT16 p80211_channel_to_mhz(UINT8 ch, int dot11a)
+static u16 p80211_channel_to_mhz(u8 ch, int dot11a)
 {
 
        if (ch == 0)
@@ -144,7 +144,7 @@ static int qual_as_percent(int snr ) {
 
 
 
-static int p80211wext_dorequest(wlandevice_t *wlandev, UINT32 did, UINT32 data)
+static int p80211wext_dorequest(wlandevice_t *wlandev, u32 did, u32 data)
 {
        p80211msg_dot11req_mibset_t     msg;
        p80211item_uint32_t             mibitem;
@@ -156,7 +156,7 @@ static int p80211wext_dorequest(wlandevice_t *wlandev, UINT32 did, UINT32 data)
        mibitem.did = did;
        mibitem.data = data;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        DBFEXIT;
        return result;
@@ -197,7 +197,7 @@ static int p80211wext_autojoin(wlandevice_t *wlandev)
        memcpy(msg.ssid.data.data, ssid, data.length);
        msg.ssid.data.len = data.length;
 
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -303,7 +303,7 @@ static int p80211wext_giwfreq(netdevice_t *dev,
        msg.msgcode = DIDmsg_dot11req_mibget;
        mibitem.did = DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -353,7 +353,7 @@ static int p80211wext_siwfreq(netdevice_t *dev,
                mibitem.data = p80211_mhz_to_channel(freq->m);
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -436,14 +436,11 @@ static int p80211wext_siwmode(netdevice_t *dev,
        }
 
        /* Set Operation mode to the PORT TYPE RID */
-
-#warning "get rid of p2mib here"
-
        msg.msgcode = DIDmsg_dot11req_mibset;
        mibitem.did = DIDmib_p2_p2Static_p2CnfPortType;
        mibitem.data = (*mode == IW_MODE_ADHOC) ? 0 : 1;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result)
                err = -EFAULT;
@@ -671,7 +668,7 @@ static int p80211wext_siwencode(netdevice_t *dev,
 
                        msg.msgcode = DIDmsg_dot11req_mibset;
                        memcpy(&msg.mibattribute.data, &pstr, sizeof(pstr));
-                       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+                       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
                        if (result) {
                                err = -EFAULT;
@@ -779,7 +776,7 @@ static int p80211wext_siwessid(netdevice_t *dev,
        msg.ssid.data.len = length;
 
        WLAN_LOG_DEBUG(1,"autojoin_ssid for %s \n",essid);
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
         WLAN_LOG_DEBUG(1,"autojoin_ssid %d\n",result);
 
        if (result) {
@@ -831,7 +828,7 @@ static int p80211wext_giwrate(netdevice_t *dev,
        msg.msgcode = DIDmsg_dot11req_mibget;
        mibitem.did = DIDmib_p2_p2MAC_p2CurrentTxRate;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -844,10 +841,10 @@ static int p80211wext_giwrate(netdevice_t *dev,
        rrq->disabled = 0;
        rrq->value = 0;
 
-#define                HFA384x_RATEBIT_1                       ((UINT16)1)
-#define                HFA384x_RATEBIT_2                       ((UINT16)2)
-#define                HFA384x_RATEBIT_5dot5                   ((UINT16)4)
-#define                HFA384x_RATEBIT_11                      ((UINT16)8)
+#define                HFA384x_RATEBIT_1                       ((u16)1)
+#define                HFA384x_RATEBIT_2                       ((u16)2)
+#define                HFA384x_RATEBIT_5dot5                   ((u16)4)
+#define                HFA384x_RATEBIT_11                      ((u16)8)
 
        switch (mibitem.data) {
        case HFA384x_RATEBIT_1:
@@ -885,7 +882,7 @@ static int p80211wext_giwrts(netdevice_t *dev,
        msg.msgcode = DIDmsg_dot11req_mibget;
        mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -929,7 +926,7 @@ static int p80211wext_siwrts(netdevice_t *dev,
                mibitem.data = rts->value;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -956,7 +953,7 @@ static int p80211wext_giwfrag(netdevice_t *dev,
        msg.msgcode = DIDmsg_dot11req_mibget;
        mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -1000,7 +997,7 @@ static int p80211wext_siwfrag(netdevice_t *dev,
                mibitem.data = frag->value;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -1029,7 +1026,7 @@ static int p80211wext_giwretry(netdevice_t *dev,
        p80211msg_dot11req_mibset_t     msg;
        int result;
        int err = 0;
-       UINT16 shortretry, longretry, lifetime;
+       u16 shortretry, longretry, lifetime;
 
        DBFENTER;
 
@@ -1037,7 +1034,7 @@ static int p80211wext_giwretry(netdevice_t *dev,
        mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -1051,7 +1048,7 @@ static int p80211wext_giwretry(netdevice_t *dev,
        mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -1065,7 +1062,7 @@ static int p80211wext_giwretry(netdevice_t *dev,
        mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -1128,7 +1125,7 @@ static int p80211wext_siwretry(netdevice_t *dev,
                mibitem.data =  rrq->value /= 1024;
 
                memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-               result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+               result = p80211req_dorequest(wlandev, (u8*)&msg);
 
                if (result) {
                        err = -EFAULT;
@@ -1140,7 +1137,7 @@ static int p80211wext_siwretry(netdevice_t *dev,
                        mibitem.data = rrq->value;
 
                        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-                       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+                       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
                        if (result) {
                                err = -EFAULT;
@@ -1153,7 +1150,7 @@ static int p80211wext_siwretry(netdevice_t *dev,
                        mibitem.data = rrq->value;
 
                        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-                       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+                       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
                        if (result) {
                                err = -EFAULT;
@@ -1201,7 +1198,7 @@ static int p80211wext_siwtxpow(netdevice_t *dev,
        }
 
         memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-        result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+        result = p80211req_dorequest(wlandev, (u8*)&msg);
 
         if (result) {
                 err = -EFAULT;
@@ -1229,7 +1226,7 @@ static int p80211wext_giwtxpow(netdevice_t *dev,
        mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
 
        if (result) {
                err = -EFAULT;
@@ -1381,7 +1378,7 @@ static int p80211wext_siwscan(netdevice_t *dev,
        msg.maxchanneltime.data = 250;
        msg.minchanneltime.data = 200;
 
-       result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+       result = p80211req_dorequest(wlandev, (u8*)&msg);
        if (result)
                err = prism2_result2err (msg.resultcode.data);
 
@@ -1492,7 +1489,7 @@ static int p80211wext_giwscan(netdevice_t *dev,
                msg.msgcode = DIDmsg_dot11req_scan_results;
                msg.bssindex.data = i;
 
-               result = p80211req_dorequest(wlandev, (UINT8*)&msg);
+               result = p80211req_dorequest(wlandev, (u8*)&msg);
                if ((result != 0) ||
                    (msg.resultcode.data != P80211ENUM_resultcode_success)) {
                        break;
@@ -1585,7 +1582,7 @@ static int p80211wext_set_encodeext(struct net_device *dev,
       break;
     }
     msg.msgcode = DIDmsg_dot11req_mibset;
-    result = p80211req_dorequest(wlandev,(UINT8*)&msg);
+    result = p80211req_dorequest(wlandev,(u8*)&msg);
     WLAN_LOG_DEBUG(1,"result (%d)\n",result);
   }
   return result;
index c2f61ede0c61d802fc3398b1926a03e091b886d0..df5dc204893c02230f6d35e81047be3366af6e50 100644 (file)
@@ -129,7 +129,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
        int                     result = 0;
        hfa384x_t               *hw = wlandev->priv;
        p80211msg_dot11req_scan_t       *msg = msgp;
-        UINT16                  roamingmode, word;
+        u16                  roamingmode, word;
        int                     i, timeout;
        int                     istmpenable = 0;
 
@@ -197,7 +197,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
         /* set up the channel list */
         word = 0;
         for (i = 0; i < msg->channellist.data.len; i++) {
-                UINT8 channel = msg->channellist.data.data[i];
+                u8 channel = msg->channellist.data.data[i];
                 if (channel > 14) continue;
                 /* channel 1 is BIT0 ... channel 14 is BIT13 */
                 word |= (1 << (channel-1));
@@ -218,7 +218,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
                goto exit;
        }
        if (word == HFA384x_PORTSTATUS_DISABLED) {
-               UINT16 wordbuf[17];
+               u16 wordbuf[17];
 
                result = hfa384x_drvr_setconfig16(hw,
                        HFA384x_RID_CNFROAMINGMODE,
@@ -531,9 +531,9 @@ int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp)
        int                     result = 0;
        hfa384x_t               *hw = wlandev->priv;
        p80211msg_p2req_join_t  *msg = msgp;
-       UINT16                  reg;
+       u16                     reg;
        p80211pstrd_t           *pstr;
-       UINT8                   bytebuf[256];
+       u8                      bytebuf[256];
        hfa384x_bytestr_t       *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
         hfa384x_JoinRequest_data_t     joinreq;
        DBFENTER;
@@ -828,9 +828,9 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
        p80211msg_dot11req_start_t      *msg = msgp;
 
        p80211pstrd_t           *pstr;
-       UINT8                   bytebuf[80];
+       u8                      bytebuf[80];
        hfa384x_bytestr_t       *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
-       UINT16                  word;
+       u16                     word;
        DBFENTER;
 
        wlandev->macmode = WLAN_MACMODE_NONE;
@@ -876,7 +876,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
 
        /* beacon period */
        word = msg->beaconperiod.data;
-       result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAPBCNINT, word);
+       result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAPBCNint, word);
        if ( result ) {
                WLAN_LOG_ERROR("Failed to set beacon period=%d.\n", word);
                goto failed;
@@ -1214,16 +1214,16 @@ int prism2mgmt_low_level(wlandevice_t *wlandev, void *msgp)
         msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
 
         /* call some routine to execute the test command */
-       cmd.cmd = (UINT16) msg->command.data;
-       cmd.parm0 = (UINT16) msg->param0.data;
-       cmd.parm1 = (UINT16) msg->param1.data;
-       cmd.parm2 = (UINT16) msg->param2.data;
+       cmd.cmd = (u16) msg->command.data;
+       cmd.parm0 = (u16) msg->param0.data;
+       cmd.parm1 = (u16) msg->param1.data;
+       cmd.parm2 = (u16) msg->param2.data;
 
         hfa384x_drvr_low_level(hw,&cmd);
 
-        msg->resp0.data = (UINT32) cmd.result.resp0;
-        msg->resp1.data = (UINT32) cmd.result.resp1;
-        msg->resp2.data = (UINT32) cmd.result.resp2;
+        msg->resp0.data = (u32) cmd.result.resp0;
+        msg->resp1.data = (u32) cmd.result.resp1;
+        msg->resp2.data = (u32) cmd.result.resp2;
 
         msg->resultcode.data = P80211ENUM_resultcode_success;
 
@@ -1257,8 +1257,8 @@ int prism2mgmt_test_command(wlandevice_t *wlandev, void *msgp)
 
         DBFENTER;
 
-       cmd.cmd = ((UINT16) msg->testcode.data) << 8 | 0x38;
-       cmd.parm0 = (UINT16) msg->testparam.data;
+       cmd.cmd = ((u16) msg->testcode.data) << 8 | 0x38;
+       cmd.parm0 = (u16) msg->testparam.data;
        cmd.parm1 = 0;
        cmd.parm2 = 0;
 
@@ -1305,7 +1305,7 @@ int prism2mgmt_mmi_read(wlandevice_t *wlandev, void *msgp)
 {
        hfa384x_t               *hw = wlandev->priv;
        p80211msg_p2req_mmi_read_t      *msg = msgp;
-       UINT32 resp = 0;
+       u32 resp = 0;
 
        DBFENTER;
 
@@ -1450,9 +1450,9 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)
 {
        hfa384x_t               *hw = wlandev->priv;
        p80211msg_p2req_ramdl_write_t   *msg = msgp;
-       UINT32                  addr;
-       UINT32                  len;
-       UINT8                   *buf;
+       u32                     addr;
+       u32                     len;
+       u8                      *buf;
        DBFENTER;
 
        if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
@@ -1590,9 +1590,9 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)
 {
        hfa384x_t               *hw = wlandev->priv;
        p80211msg_p2req_flashdl_write_t *msg = msgp;
-       UINT32                  addr;
-       UINT32                  len;
-       UINT8                   *buf;
+       u32                     addr;
+       u32                     len;
+       u8                      *buf;
        DBFENTER;
 
        if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
@@ -1691,11 +1691,11 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
 {
        hfa384x_t                       *hw = wlandev->priv;
        int                     result = 0;
-       UINT16                  reg;
-       UINT16                  port_type;
+       u16                     reg;
+       u16                     port_type;
        p80211msg_lnxreq_autojoin_t     *msg = msgp;
        p80211pstrd_t           *pstr;
-       UINT8                   bytebuf[256];
+       u8                      bytebuf[256];
        hfa384x_bytestr_t       *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
        DBFENTER;
 
@@ -1785,7 +1785,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
        p80211msg_lnxreq_wlansniff_t    *msg = msgp;
 
        hfa384x_t                       *hw = wlandev->priv;
-       UINT16                  word;
+       u16                     word;
 
        DBFENTER;
 
index c214a6484f977c08c0c60510ca53b8aa23708c3e..17190fa370dc7162671c6aab131334c578834bcc 100644 (file)
@@ -80,8 +80,8 @@ extern int      prism2_reset_settletime;
 /*--- Function Declarations -----------------------------------*/
 /*=============================================================*/
 
-UINT32
-prism2sta_ifstate(wlandevice_t *wlandev, UINT32 ifstate);
+u32
+prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate);
 
 void
 prism2sta_ev_dtim(wlandevice_t *wlandev);
@@ -90,9 +90,9 @@ prism2sta_ev_infdrop(wlandevice_t *wlandev);
 void
 prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);
 void
-prism2sta_ev_txexc(wlandevice_t *wlandev, UINT16 status);
+prism2sta_ev_txexc(wlandevice_t *wlandev, u16 status);
 void
-prism2sta_ev_tx(wlandevice_t *wlandev, UINT16 status);
+prism2sta_ev_tx(wlandevice_t *wlandev, u16 status);
 void
 prism2sta_ev_rx(wlandevice_t *wlandev, struct sk_buff *skb);
 void
@@ -129,31 +129,31 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp);
 * Prism2 data types
 ---------------------------------------------------------------*/
 /* byte area conversion functions*/
-void prism2mgmt_pstr2bytearea(UINT8 *bytearea, p80211pstrd_t *pstr);
-void prism2mgmt_bytearea2pstr(UINT8 *bytearea, p80211pstrd_t *pstr, int len);
+void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr);
+void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len);
 
 /* byte string conversion functions*/
 void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr);
 void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr);
 
 /* integer conversion functions */
-void prism2mgmt_prism2int2p80211int(UINT16 *prism2int, UINT32 *wlanint);
-void prism2mgmt_p80211int2prism2int(UINT16 *prism2int, UINT32 *wlanint);
+void prism2mgmt_prism2int2p80211int(u16 *prism2int, u32 *wlanint);
+void prism2mgmt_p80211int2prism2int(u16 *prism2int, u32 *wlanint);
 
 /* enumerated integer conversion functions */
-void prism2mgmt_prism2enum2p80211enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid);
-void prism2mgmt_p80211enum2prism2enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid);
+void prism2mgmt_prism2enum2p80211enum(u16 *prism2enum, u32 *wlanenum, u16 rid);
+void prism2mgmt_p80211enum2prism2enum(u16 *prism2enum, u32 *wlanenum, u16 rid);
 
 /* functions to convert a bit area to/from an Operational Rate Set */
-void prism2mgmt_get_oprateset(UINT16 *rate, p80211pstrd_t *pstr);
-void prism2mgmt_set_oprateset(UINT16 *rate, p80211pstrd_t *pstr);
+void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr);
+void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr);
 
 /* functions to convert Group Addresses */
-void prism2mgmt_get_grpaddr(UINT32 did,
+void prism2mgmt_get_grpaddr(u32 did,
        p80211pstrd_t *pstr, hfa384x_t *priv );
-int prism2mgmt_set_grpaddr(UINT32 did,
-       UINT8 *prism2buf, p80211pstrd_t *pstr, hfa384x_t *priv );
-int prism2mgmt_get_grpaddr_index( UINT32 did );
+int prism2mgmt_set_grpaddr(u32 did,
+       u8 *prism2buf, p80211pstrd_t *pstr, hfa384x_t *priv );
+int prism2mgmt_get_grpaddr_index( u32 did );
 
 void prism2sta_processing_defer(struct work_struct *data);
 
index 5a8dffc5e1b889b670a1be85e6c5190eab240922..2517c426acecb6f7e219b520a5e3a1a3abdcfa78 100644 (file)
 
 typedef struct mibrec
 {
-    UINT32   did;
-    UINT16   flag;
-    UINT16   parm1;
-    UINT16   parm2;
-    UINT16   parm3;
+    u32   did;
+    u16   flag;
+    u16   parm1;
+    u16   parm2;
+    u16   parm3;
     int      (*func)(struct mibrec                *mib,
                      int                          isget,
                      wlandevice_t                 *wlandev,
@@ -909,7 +909,7 @@ static mibrec_t mibtab[] = {
           prism2mib_uint32 },
     { DIDmib_p2_p2MAC_p2CurrentBeaconInterval,
           F_STA | F_READ,
-          HFA384x_RID_CURRENTBCNINT, 0, 0,
+          HFA384x_RID_CURRENTBCNint, 0, 0,
           prism2mib_uint32 },
     { DIDmib_p2_p2MAC_p2StaCurrentScaleThresholds,
           F_STA | F_READ,
@@ -1103,7 +1103,7 @@ int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp)
        int                     result, isget;
        mibrec_t                *mib;
 
-       UINT16                  which;
+       u16                     which;
 
        p80211msg_dot11req_mibset_t     *msg = msgp;
        p80211itemd_t                   *mibitem;
@@ -1227,7 +1227,7 @@ void                         *data)
 {
        int                result;
        p80211pstrd_t      *pstr = (p80211pstrd_t*) data;
-       UINT8              bytebuf[MIB_TMP_MAXLEN];
+       u8              bytebuf[MIB_TMP_MAXLEN];
        hfa384x_bytestr_t  *p2bytestr = (hfa384x_bytestr_t*) bytebuf;
 
        DBFENTER;
@@ -1280,7 +1280,7 @@ void                         *data)
 {
        int            result;
        p80211pstrd_t  *pstr = (p80211pstrd_t*) data;
-       UINT8          bytebuf[MIB_TMP_MAXLEN];
+       u8          bytebuf[MIB_TMP_MAXLEN];
 
        DBFENTER;
 
@@ -1331,9 +1331,9 @@ p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
        int     result;
-       UINT32  *uint32 = (UINT32*) data;
-       UINT8   bytebuf[MIB_TMP_MAXLEN];
-       UINT16  *wordbuf = (UINT16*) bytebuf;
+       u32  *uint32 = (u32*) data;
+       u8   bytebuf[MIB_TMP_MAXLEN];
+       u16  *wordbuf = (u16*) bytebuf;
 
        DBFENTER;
 
@@ -1389,14 +1389,14 @@ p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
        int     result;
-       UINT32  *uint32 = (UINT32 *) data;
-       UINT8   bytebuf[MIB_TMP_MAXLEN];
-       UINT16  *wordbuf = (UINT16*) bytebuf;
+       u32  *uint32 = (u32 *) data;
+       u8   bytebuf[MIB_TMP_MAXLEN];
+       u16  *wordbuf = (u16*) bytebuf;
        int     i, cnt;
 
        DBFENTER;
 
-       cnt = mib->parm2 / sizeof(UINT16);
+       cnt = mib->parm2 / sizeof(u16);
 
        if (isget) {
                result = hfa384x_drvr_getconfig(hw, mib->parm1, wordbuf, mib->parm2);
@@ -1446,14 +1446,14 @@ p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
        int     result;
-       UINT32  *uint32 = (UINT32*) data;
-       UINT8   bytebuf[MIB_TMP_MAXLEN];
-       UINT16  *wordbuf = (UINT16*) bytebuf;
-       UINT16  cnt;
+       u32  *uint32 = (u32*) data;
+       u8   bytebuf[MIB_TMP_MAXLEN];
+       u16  *wordbuf = (u16*) bytebuf;
+       u16  cnt;
 
        DBFENTER;
 
-       cnt = mib->parm2 / sizeof(UINT16);
+       cnt = mib->parm2 / sizeof(u16);
 
        result = hfa384x_drvr_getconfig(hw, mib->parm1, wordbuf, mib->parm2);
        if (result == 0) {
@@ -1508,9 +1508,9 @@ p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
        int     result;
-       UINT32  *uint32 = (UINT32*) data;
-       UINT8   bytebuf[MIB_TMP_MAXLEN];
-       UINT16  *wordbuf = (UINT16*) bytebuf;
+       u32  *uint32 = (u32*) data;
+       u8   bytebuf[MIB_TMP_MAXLEN];
+       u16  *wordbuf = (u16*) bytebuf;
 
        DBFENTER;
 
@@ -1561,10 +1561,10 @@ p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
        int     result;
-       UINT32  *uint32 = (UINT32*) data;
-       UINT8   bytebuf[MIB_TMP_MAXLEN];
-       UINT16  *wordbuf = (UINT16*) bytebuf;
-       UINT32  flags;
+       u32  *uint32 = (u32*) data;
+       u8   bytebuf[MIB_TMP_MAXLEN];
+       u16  *wordbuf = (u16*) bytebuf;
+       u32  flags;
 
        DBFENTER;
 
@@ -1628,10 +1628,10 @@ p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
        int            result;
-       UINT32         cnt;
+       u32         cnt;
        p80211pstrd_t  *pstr = (p80211pstrd_t*) data;
-       UINT8          bytebuf[MIB_TMP_MAXLEN];
-       UINT16         *wordbuf = (UINT16*) bytebuf;
+       u8          bytebuf[MIB_TMP_MAXLEN];
+       u16         *wordbuf = (u16*) bytebuf;
 
        DBFENTER;
 
@@ -1640,7 +1640,7 @@ void                         *data)
        if (isget) {
                result = hfa384x_drvr_getconfig(hw, mib->parm1, wordbuf, mib->parm2);
                prism2mgmt_prism2int2p80211int(wordbuf, &cnt);
-               pstr->len = (UINT8) cnt;
+               pstr->len = (u8) cnt;
                memcpy(pstr->data, &wordbuf[1], pstr->len);
        }
 
@@ -1683,8 +1683,8 @@ void                         *data)
 {
        int            result;
        p80211pstrd_t  *pstr = (p80211pstrd_t*) data;
-       UINT8          bytebuf[MIB_TMP_MAXLEN];
-       UINT16         len;
+       u8          bytebuf[MIB_TMP_MAXLEN];
+       u16         len;
 
        DBFENTER;
 
@@ -1741,8 +1741,8 @@ p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
        int     result;
-       UINT32  *uint32 = (UINT32*) data;
-       UINT32  value;
+       u32  *uint32 = (u32*) data;
+       u32  value;
 
        DBFENTER;
 
@@ -1792,9 +1792,9 @@ p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
        int     result;
-       UINT32  *uint32 = (UINT32*) data;
-       UINT8   bytebuf[MIB_TMP_MAXLEN];
-       UINT16  *wordbuf = (UINT16*) bytebuf;
+       u32  *uint32 = (u32*) data;
+       u8   bytebuf[MIB_TMP_MAXLEN];
+       u16  *wordbuf = (u16*) bytebuf;
 
        DBFENTER;
 
@@ -1937,7 +1937,7 @@ p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
        int     result;
-       UINT32  *uint32 = (UINT32*) data;
+       u32  *uint32 = (u32*) data;
 
        DBFENTER;
 
@@ -1990,8 +1990,8 @@ void                         *data)
 {
        int            result;
        p80211pstrd_t  *pstr = (p80211pstrd_t *) data;
-       UINT8          bytebuf[MIB_TMP_MAXLEN];
-       UINT16         *wordbuf = (UINT16*) bytebuf;
+       u8          bytebuf[MIB_TMP_MAXLEN];
+       u16         *wordbuf = (u16*) bytebuf;
 
        DBFENTER;
 
@@ -2043,8 +2043,8 @@ void                         *data)
 {
        int            result;
        p80211pstrd_t  *pstr = (p80211pstrd_t *) data;
-       UINT8          bytebuf[MIB_TMP_MAXLEN];
-       UINT16         len;
+       u8          bytebuf[MIB_TMP_MAXLEN];
+       u16         len;
 
        DBFENTER;
 
@@ -2188,7 +2188,7 @@ hfa384x_t                    *hw,
 p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
-       UINT32  *uint32 = (UINT32*) data;
+       u32  *uint32 = (u32*) data;
 
        DBFENTER;
 
@@ -2252,11 +2252,11 @@ p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
        int     result;
-       UINT32  *uint32 = (UINT32*) data;
+       u32  *uint32 = (u32*) data;
 
        int     index;
-       UINT16  cnf_auth;
-       UINT16  mask;
+       u16  cnf_auth;
+       u16     mask;
 
        DBFENTER;
 
@@ -2331,7 +2331,7 @@ hfa384x_t                    *hw,
 p80211msg_dot11req_mibset_t  *msg,
 void                         *data)
 {
-       UINT32            *uint32 = (UINT32*) data;
+       u32            *uint32 = (u32*) data;
        p80211pstrd_t     *pstr = (p80211pstrd_t*) data;
 
        int  i, cnt, result;
@@ -2341,7 +2341,7 @@ void                         *data)
        ** it is long enough!
        */
 
-       UINT8  test[sizeof(wlandev->rx) + sizeof(hw->tallies)];
+       u8  test[sizeof(wlandev->rx) + sizeof(hw->tallies)];
 
        DBFENTER;
 
@@ -2443,7 +2443,7 @@ void                         *data)
                hfa384x_WPAData_t wpa;
                if (isget) {
                        hfa384x_drvr_getconfig( hw, HFA384x_RID_CNFWPADATA,
-                                               (UINT8 *) &wpa, sizeof(wpa));
+                                               (u8 *) &wpa, sizeof(wpa));
                        pstr->len = hfa384x2host_16(wpa.datalen);
                        memcpy(pstr->data, wpa.data, pstr->len);
                } else {
@@ -2451,7 +2451,7 @@ void                         *data)
                        memcpy(wpa.data, pstr->data, pstr->len);
 
                        result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFWPADATA,
-                               (UINT8 *) &wpa, sizeof(wpa));
+                               (u8 *) &wpa, sizeof(wpa));
                }
                break;
        }
@@ -2482,7 +2482,7 @@ void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
 {
        DBFENTER;
 
-       bytestr->len = host2hfa384x_16((UINT16)(pstr->len));
+       bytestr->len = host2hfa384x_16((u16)(pstr->len));
        memcpy(bytestr->data, pstr->data, pstr->len);
        DBFEXIT;
 }
@@ -2503,7 +2503,7 @@ void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
 *
 ----------------------------------------------------------------*/
 
-void prism2mgmt_pstr2bytearea(UINT8 *bytearea, p80211pstrd_t *pstr)
+void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr)
 {
        DBFENTER;
 
@@ -2531,7 +2531,7 @@ void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
 {
        DBFENTER;
 
-       pstr->len = (UINT8)(hfa384x2host_16((UINT16)(bytestr->len)));
+       pstr->len = (u8)(hfa384x2host_16((u16)(bytestr->len)));
        memcpy(pstr->data, bytestr->data, pstr->len);
        DBFEXIT;
 }
@@ -2552,11 +2552,11 @@ void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
 *
 ----------------------------------------------------------------*/
 
-void prism2mgmt_bytearea2pstr(UINT8 *bytearea, p80211pstrd_t *pstr, int len)
+void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len)
 {
        DBFENTER;
 
-       pstr->len = (UINT8)len;
+       pstr->len = (u8)len;
        memcpy(pstr->data, bytearea, len);
        DBFEXIT;
 }
@@ -2576,11 +2576,11 @@ void prism2mgmt_bytearea2pstr(UINT8 *bytearea, p80211pstrd_t *pstr, int len)
 *
 ----------------------------------------------------------------*/
 
-void prism2mgmt_prism2int2p80211int(UINT16 *prism2int, UINT32 *wlanint)
+void prism2mgmt_prism2int2p80211int(u16 *prism2int, u32 *wlanint)
 {
        DBFENTER;
 
-       *wlanint = (UINT32)hfa384x2host_16(*prism2int);
+       *wlanint = (u32)hfa384x2host_16(*prism2int);
        DBFEXIT;
 }
 
@@ -2599,11 +2599,11 @@ void prism2mgmt_prism2int2p80211int(UINT16 *prism2int, UINT32 *wlanint)
 *
 ----------------------------------------------------------------*/
 
-void prism2mgmt_p80211int2prism2int(UINT16 *prism2int, UINT32 *wlanint)
+void prism2mgmt_p80211int2prism2int(u16 *prism2int, u32 *wlanint)
 {
        DBFENTER;
 
-       *prism2int = host2hfa384x_16((UINT16)(*wlanint));
+       *prism2int = host2hfa384x_16((u16)(*wlanint));
        DBFEXIT;
 }
 
@@ -2622,7 +2622,7 @@ void prism2mgmt_p80211int2prism2int(UINT16 *prism2int, UINT32 *wlanint)
 *      Nothing
 *
 ----------------------------------------------------------------*/
-void prism2mgmt_prism2enum2p80211enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid)
+void prism2mgmt_prism2enum2p80211enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
 {
        DBFENTER;
 
@@ -2648,7 +2648,7 @@ void prism2mgmt_prism2enum2p80211enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT
 *      Nothing
 *
 ----------------------------------------------------------------*/
-void prism2mgmt_p80211enum2prism2enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid)
+void prism2mgmt_p80211enum2prism2enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
 {
        DBFENTER;
 
@@ -2674,10 +2674,10 @@ void prism2mgmt_p80211enum2prism2enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT
 *      Nothing
 *
 ----------------------------------------------------------------*/
-void prism2mgmt_get_oprateset(UINT16 *rate, p80211pstrd_t *pstr)
+void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr)
 {
-       UINT8   len;
-       UINT8   *datarate;
+       u8      len;
+       u8      *datarate;
 
        DBFENTER;
 
@@ -2686,29 +2686,29 @@ void prism2mgmt_get_oprateset(UINT16 *rate, p80211pstrd_t *pstr)
 
        /* 1 Mbps */
        if ( BIT0 & (*rate) ) {
-               len += (UINT8)1;
-               *datarate = (UINT8)2;
+               len += (u8)1;
+               *datarate = (u8)2;
                datarate++;
        }
 
        /* 2 Mbps */
        if ( BIT1 & (*rate) ) {
-               len += (UINT8)1;
-               *datarate = (UINT8)4;
+               len += (u8)1;
+               *datarate = (u8)4;
                datarate++;
        }
 
        /* 5.5 Mbps */
        if ( BIT2 & (*rate) ) {
-               len += (UINT8)1;
-               *datarate = (UINT8)11;
+               len += (u8)1;
+               *datarate = (u8)11;
                datarate++;
        }
 
        /* 11 Mbps */
        if ( BIT3 & (*rate) ) {
-               len += (UINT8)1;
-               *datarate = (UINT8)22;
+               len += (u8)1;
+               *datarate = (u8)22;
                datarate++;
        }
 
@@ -2733,9 +2733,9 @@ void prism2mgmt_get_oprateset(UINT16 *rate, p80211pstrd_t *pstr)
 *      Nothing
 *
 ----------------------------------------------------------------*/
-void prism2mgmt_set_oprateset(UINT16 *rate, p80211pstrd_t *pstr)
+void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr)
 {
-       UINT8   *datarate;
+       u8      *datarate;
        int     i;
 
        DBFENTER;
@@ -2786,7 +2786,7 @@ void prism2mgmt_set_oprateset(UINT16 *rate, p80211pstrd_t *pstr)
 *      Nothing
 *
 ----------------------------------------------------------------*/
-void prism2mgmt_get_grpaddr(UINT32 did, p80211pstrd_t *pstr,
+void prism2mgmt_get_grpaddr(u32 did, p80211pstrd_t *pstr,
        hfa384x_t *hw )
 {
        int     index;
@@ -2822,10 +2822,10 @@ void prism2mgmt_get_grpaddr(UINT32 did, p80211pstrd_t *pstr,
 *      !0      Error
 *
 ----------------------------------------------------------------*/
-int prism2mgmt_set_grpaddr(UINT32 did, UINT8 *prism2buf,
+int prism2mgmt_set_grpaddr(u32 did, u8 *prism2buf,
        p80211pstrd_t *pstr, hfa384x_t *hw )
 {
-       UINT8   no_addr[WLAN_ADDR_LEN];
+       u8      no_addr[WLAN_ADDR_LEN];
        int     index;
 
        DBFENTER;
@@ -2888,7 +2888,7 @@ int prism2mgmt_set_grpaddr(UINT32 did, UINT8 *prism2buf,
 *      < 0     If not valid did
 *
 ----------------------------------------------------------------*/
-int prism2mgmt_get_grpaddr_index( UINT32 did )
+int prism2mgmt_get_grpaddr_index( u32 did )
 {
        int     index;
 
index bc48014f264b3666157a682e48794c9768570e23..1fa79bf7972dcc62c1bdcd4e407ec0dd9be2e3b2 100644 (file)
@@ -189,7 +189,7 @@ inline void dmpmem(void *buf, int n)
        int c;
        for ( c= 0; c < n; c++) {
                if ( (c % 16) == 0 ) printk(KERN_DEBUG"dmp[%d]: ", c);
-               printk("%02x ", ((UINT8*)buf)[c]);
+               printk("%02x ", ((u8*)buf)[c]);
                if ( (c % 16) == 15 ) printk("\n");
        }
        if ( (c % 16) != 0 ) printk("\n");
@@ -534,10 +534,10 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg)
 *      process thread  (usually)
 *      interrupt
 ----------------------------------------------------------------*/
-UINT32 prism2sta_ifstate(wlandevice_t *wlandev, UINT32 ifstate)
+u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 {
         hfa384x_t               *hw = (hfa384x_t *)wlandev->priv;
-       UINT32                  result;
+       u32                     result;
        DBFENTER;
 
        result = P80211ENUM_resultcode_implementation_failure;
@@ -712,8 +712,8 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 {
        int                     result = 0;
         hfa384x_t               *hw = (hfa384x_t *)wlandev->priv;
-       UINT16                  temp;
-       UINT8                   snum[HFA384x_RID_NICSERIALNUMBER_LEN];
+       u16                  temp;
+       u8                      snum[HFA384x_RID_NICSERIALNUMBER_LEN];
        char                    pstr[(HFA384x_RID_NICSERIALNUMBER_LEN * 4) + 1];
 
        DBFENTER;
@@ -778,7 +778,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 
        /* strip out the 'special' variant bits */
        hw->mm_mods = hw->ident_sta_fw.variant & (BIT14 | BIT15);
-       hw->ident_sta_fw.variant &= ~((UINT16)(BIT14 | BIT15));
+       hw->ident_sta_fw.variant &= ~((u16)(BIT14 | BIT15));
 
        if  ( hw->ident_sta_fw.id == 0x1f ) {
                WLAN_LOG_INFO(
@@ -1039,7 +1039,7 @@ static int prism2sta_setmulticast(wlandevice_t *wlandev, netdevice_t *dev)
        int result = 0;
        hfa384x_t               *hw = (hfa384x_t *)wlandev->priv;
 
-       UINT16  promisc;
+       u16  promisc;
 
        DBFENTER;
 
@@ -1114,9 +1114,9 @@ static void prism2sta_inf_handover(wlandevice_t *wlandev, hfa384x_InfFrame_t *in
 static void prism2sta_inf_tallies(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf)
 {
         hfa384x_t               *hw = (hfa384x_t *)wlandev->priv;
-       UINT16                  *src16;
-       UINT32                  *dst;
-       UINT32                  *src32;
+       u16                     *src16;
+       u32                     *dst;
+       u32                     *src32;
        int                     i;
        int                     cnt;
 
@@ -1127,15 +1127,15 @@ static void prism2sta_inf_tallies(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf
        ** record length of the info record.
        */
 
-       cnt = sizeof(hfa384x_CommTallies32_t) / sizeof(UINT32);
+       cnt = sizeof(hfa384x_CommTallies32_t) / sizeof(u32);
        if (inf->framelen > 22) {
-               dst   = (UINT32 *) &hw->tallies;
-               src32 = (UINT32 *) &inf->info.commtallies32;
+               dst   = (u32 *) &hw->tallies;
+               src32 = (u32 *) &inf->info.commtallies32;
                for (i = 0; i < cnt; i++, dst++, src32++)
                        *dst += hfa384x2host_32(*src32);
        } else {
-               dst   = (UINT32 *) &hw->tallies;
-               src16 = (UINT16 *) &inf->info.commtallies16;
+               dst   = (u32 *) &hw->tallies;
+               src16 = (u16 *) &inf->info.commtallies16;
                for (i = 0; i < cnt; i++, dst++, src16++)
                        *dst += hfa384x2host_16(*src16);
        }
@@ -1175,7 +1175,7 @@ static void prism2sta_inf_scanresults(wlandevice_t *wlandev,
        DBFENTER;
 
        /* Get the number of results, first in bytes, then in results */
-       nbss = (inf->framelen * sizeof(UINT16)) -
+       nbss = (inf->framelen * sizeof(u16)) -
                sizeof(inf->infotype) -
                sizeof(inf->info.scanresult.scanreason);
        nbss /= sizeof(hfa384x_ScanResultSub_t);
@@ -1367,7 +1367,7 @@ void prism2sta_processing_defer(struct work_struct *data)
 
                /* Don't call this in monitor mode */
                if ( wlandev->netdev->type == ARPHRD_ETHER ) {
-                       UINT16                  portstatus;
+                       u16                     portstatus;
 
                        WLAN_LOG_INFO("linkstatus=CONNECTED\n");
 
@@ -1703,7 +1703,7 @@ static void prism2sta_inf_authreq_defer(wlandevice_t *wlandev,
        hfa384x_authenticateStation_data_t  rec;
 
        int    i, added, result, cnt;
-       UINT8  *addr;
+       u8  *addr;
 
        DBFENTER;
 
@@ -2030,7 +2030,7 @@ void prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf)
 * Call context:
 *      interrupt
 ----------------------------------------------------------------*/
-void prism2sta_ev_txexc(wlandevice_t *wlandev, UINT16 status)
+void prism2sta_ev_txexc(wlandevice_t *wlandev, u16 status)
 {
        DBFENTER;
 
@@ -2057,7 +2057,7 @@ void prism2sta_ev_txexc(wlandevice_t *wlandev, UINT16 status)
 * Call context:
 *      interrupt
 ----------------------------------------------------------------*/
-void prism2sta_ev_tx(wlandevice_t *wlandev, UINT16 status)
+void prism2sta_ev_tx(wlandevice_t *wlandev, u16 status)
 {
        DBFENTER;
        WLAN_LOG_DEBUG(4, "Tx Complete, status=0x%04x\n", status);
index 0ecc3fa49883e20c370c87022104a200fc8084cc..0f7289de79602ccc18f25d6ad9d809bba7f2874e 100644 (file)
 #define BIT30  0x40000000
 #define BIT31  0x80000000
 
-#include <linux/types.h>
-
-typedef u_int8_t       UINT8;
-typedef u_int16_t      UINT16;
-typedef u_int32_t      UINT32;
-
-typedef int8_t         INT8;
-typedef int16_t                INT16;
-typedef int32_t                INT32;
-
-typedef unsigned int    UINT;
-typedef signed int      INT;
-
-typedef u_int64_t      UINT64;
-typedef int64_t                INT64;
-
-#define UINT8_MAX      (0xffUL)
-#define UINT16_MAX     (0xffffUL)
-#define UINT32_MAX     (0xffffffffUL)
-
-#define INT8_MAX       (0x7fL)
-#define INT16_MAX      (0x7fffL)
-#define INT32_MAX      (0x7fffffffL)
-
 /*=============================================================*/
 /*------ Compiler Portability Macros --------------------------*/
 /*=============================================================*/
@@ -126,14 +102,14 @@ typedef int64_t           INT64;
 /*------ OS Portability Macros --------------------------------*/
 /*=============================================================*/
 
-#ifndef WLAN_DBVAR
-#define WLAN_DBVAR     wlan_debug
-#endif
-
 #ifndef KERNEL_VERSION
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 #endif
 
+#ifndef WLAN_DBVAR
+#define WLAN_DBVAR     wlan_debug
+#endif
+
 #define WLAN_RELEASE   "0.3.0-lkml"
 
 #include <linux/hardirq.h>
@@ -153,7 +129,7 @@ typedef int64_t             INT64;
                int __i__; \
                printk(KERN_DEBUG x ":"); \
                for( __i__=0; __i__ < (n); __i__++) \
-                       printk( " %02x", ((UINT8*)(p))[__i__]); \
+                       printk( " %02x", ((u8*)(p))[__i__]); \
                printk("\n"); }
        #define DBFENTER { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"---->\n"); } }
        #define DBFEXIT  { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"<----\n"); } }
@@ -198,7 +174,7 @@ do {                                                                      \
                                                                          \
           add_wait_queue(&wq, &__wait);                                   \
           for (;;) {                                                      \
-                  set_current_state(TASK_INTERRUPTIBLE);                  \
+                  set_current_state(TASK_intERRUPTIBLE);                  \
                   if (condition)                                          \
                           break;                                          \
                   if (!signal_pending(current)) {                         \