diff options
Diffstat (limited to 'drivers/staging/rt2860/chip/mac_usb.h')
| -rw-r--r-- | drivers/staging/rt2860/chip/mac_usb.h | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/drivers/staging/rt2860/chip/mac_usb.h b/drivers/staging/rt2860/chip/mac_usb.h index fe7ba28b9fc6..b902074a41cc 100644 --- a/drivers/staging/rt2860/chip/mac_usb.h +++ b/drivers/staging/rt2860/chip/mac_usb.h @@ -62,26 +62,26 @@ #define RT2870_RXDMALEN_FIELD_SIZE 4 typedef struct PACKED _RXINFO_STRUC { - UINT32 BA:1; - UINT32 DATA:1; - UINT32 NULLDATA:1; - UINT32 FRAG:1; - UINT32 U2M:1; /* 1: this RX frame is unicast to me */ - UINT32 Mcast:1; /* 1: this is a multicast frame */ - UINT32 Bcast:1; /* 1: this is a broadcast frame */ - UINT32 MyBss:1; /* 1: this frame belongs to the same BSSID */ - UINT32 Crc:1; /* 1: CRC error */ - UINT32 CipherErr:2; /* 0: decryption okay, 1:ICV error, 2:MIC error, 3:KEY not valid */ - UINT32 AMSDU:1; /* rx with 802.3 header, not 802.11 header. */ - UINT32 HTC:1; - UINT32 RSSI:1; - UINT32 L2PAD:1; - UINT32 AMPDU:1; /* To be moved */ - UINT32 Decrypted:1; - UINT32 PlcpRssil:1; - UINT32 CipherAlg:1; - UINT32 LastAMSDU:1; - UINT32 PlcpSignal:12; + u32 BA:1; + u32 DATA:1; + u32 NULLDATA:1; + u32 FRAG:1; + u32 U2M:1; /* 1: this RX frame is unicast to me */ + u32 Mcast:1; /* 1: this is a multicast frame */ + u32 Bcast:1; /* 1: this is a broadcast frame */ + u32 MyBss:1; /* 1: this frame belongs to the same BSSID */ + u32 Crc:1; /* 1: CRC error */ + u32 CipherErr:2; /* 0: decryption okay, 1:ICV error, 2:MIC error, 3:KEY not valid */ + u32 AMSDU:1; /* rx with 802.3 header, not 802.11 header. */ + u32 HTC:1; + u32 RSSI:1; + u32 L2PAD:1; + u32 AMPDU:1; /* To be moved */ + u32 Decrypted:1; + u32 PlcpRssil:1; + u32 CipherAlg:1; + u32 LastAMSDU:1; + u32 PlcpSignal:12; } RXINFO_STRUC, *PRXINFO_STRUC, RT28XX_RXD_STRUC, *PRT28XX_RXD_STRUC; /* */ @@ -91,14 +91,14 @@ typedef struct PACKED _RXINFO_STRUC { typedef struct _TXINFO_STRUC { /* Word 0 */ - UINT32 USBDMATxPktLen:16; /*used ONLY in USB bulk Aggregation, Total byte counts of all sub-frame. */ - UINT32 rsv:8; - UINT32 WIV:1; /* Wireless Info Valid. 1 if Driver already fill WI, o if DMA needs to copy WI to correctposition */ - UINT32 QSEL:2; /* select on-chip FIFO ID for 2nd-stage output scheduler.0:MGMT, 1:HCCA 2:EDCA */ - UINT32 SwUseLastRound:1; /* Software use. */ - UINT32 rsv2:2; /* Software use. */ - UINT32 USBDMANextVLD:1; /*used ONLY in USB bulk Aggregation, NextValid */ - UINT32 USBDMATxburst:1; /*used ONLY in USB bulk Aggre. Force USB DMA transmit frame from current selected endpoint */ + u32 USBDMATxPktLen:16; /*used ONLY in USB bulk Aggregation, Total byte counts of all sub-frame. */ + u32 rsv:8; + u32 WIV:1; /* Wireless Info Valid. 1 if Driver already fill WI, o if DMA needs to copy WI to correctposition */ + u32 QSEL:2; /* select on-chip FIFO ID for 2nd-stage output scheduler.0:MGMT, 1:HCCA 2:EDCA */ + u32 SwUseLastRound:1; /* Software use. */ + u32 rsv2:2; /* Software use. */ + u32 USBDMANextVLD:1; /*used ONLY in USB bulk Aggregation, NextValid */ + u32 USBDMATxburst:1; /*used ONLY in USB bulk Aggre. Force USB DMA transmit frame from current selected endpoint */ } TXINFO_STRUC, *PTXINFO_STRUC; /* */ @@ -106,8 +106,8 @@ typedef struct _TXINFO_STRUC { /* */ typedef struct _MGMT_STRUC { BOOLEAN Valid; - PUCHAR pBuffer; - ULONG Length; + u8 *pBuffer; + unsigned long Length; } MGMT_STRUC, *PMGMT_STRUC; /*////////////////////////////////////////////////////////////////////////// */ @@ -115,69 +115,69 @@ typedef struct _MGMT_STRUC { /*////////////////////////////////////////////////////////////////////////// */ typedef struct __TX_BUFFER { union { - UCHAR WirelessPacket[TX_BUFFER_NORMSIZE]; + u8 WirelessPacket[TX_BUFFER_NORMSIZE]; HEADER_802_11 NullFrame; PSPOLL_FRAME PsPollPacket; RTS_FRAME RTSFrame; } field; - UCHAR Aggregation[4]; /*Buffer for save Aggregation size. */ + u8 Aggregation[4]; /*Buffer for save Aggregation size. */ } TX_BUFFER, *PTX_BUFFER; typedef struct __HTTX_BUFFER { union { - UCHAR WirelessPacket[MAX_TXBULK_SIZE]; + u8 WirelessPacket[MAX_TXBULK_SIZE]; HEADER_802_11 NullFrame; PSPOLL_FRAME PsPollPacket; RTS_FRAME RTSFrame; } field; - UCHAR Aggregation[4]; /*Buffer for save Aggregation size. */ + u8 Aggregation[4]; /*Buffer for save Aggregation size. */ } HTTX_BUFFER, *PHTTX_BUFFER; /* used to track driver-generated write irps */ typedef struct _TX_CONTEXT { - PVOID pAd; /*Initialized in MiniportInitialize */ + void *pAd; /*Initialized in MiniportInitialize */ PURB pUrb; /*Initialized in MiniportInitialize */ PIRP pIrp; /*used to cancel pending bulk out. */ /*Initialized in MiniportInitialize */ PTX_BUFFER TransferBuffer; /*Initialized in MiniportInitialize */ - ULONG BulkOutSize; - UCHAR BulkOutPipeId; - UCHAR SelfIdx; + unsigned long BulkOutSize; + u8 BulkOutPipeId; + u8 SelfIdx; BOOLEAN InUse; BOOLEAN bWaitingBulkOut; /* at least one packet is in this TxContext, ready for making IRP anytime. */ BOOLEAN bFullForBulkOut; /* all tx buffer are full , so waiting for tx bulkout. */ BOOLEAN IRPPending; BOOLEAN LastOne; BOOLEAN bAggregatible; - UCHAR Header_802_3[LENGTH_802_3]; - UCHAR Rsv[2]; - ULONG DataOffset; - UINT TxRate; + u8 Header_802_3[LENGTH_802_3]; + u8 Rsv[2]; + unsigned long DataOffset; + u32 TxRate; dma_addr_t data_dma; /* urb dma on linux */ } TX_CONTEXT, *PTX_CONTEXT, **PPTX_CONTEXT; /* used to track driver-generated write irps */ typedef struct _HT_TX_CONTEXT { - PVOID pAd; /*Initialized in MiniportInitialize */ + void *pAd; /*Initialized in MiniportInitialize */ PURB pUrb; /*Initialized in MiniportInitialize */ PIRP pIrp; /*used to cancel pending bulk out. */ /*Initialized in MiniportInitialize */ PHTTX_BUFFER TransferBuffer; /*Initialized in MiniportInitialize */ - ULONG BulkOutSize; /* Indicate the total bulk-out size in bytes in one bulk-transmission */ - UCHAR BulkOutPipeId; + unsigned long BulkOutSize; /* Indicate the total bulk-out size in bytes in one bulk-transmission */ + u8 BulkOutPipeId; BOOLEAN IRPPending; BOOLEAN LastOne; BOOLEAN bCurWriting; BOOLEAN bRingEmpty; BOOLEAN bCopySavePad; - UCHAR SavedPad[8]; - UCHAR Header_802_3[LENGTH_802_3]; - ULONG CurWritePosition; /* Indicate the buffer offset which packet will be inserted start from. */ - ULONG CurWriteRealPos; /* Indicate the buffer offset which packet now are writing to. */ - ULONG NextBulkOutPosition; /* Indicate the buffer start offset of a bulk-transmission */ - ULONG ENextBulkOutPosition; /* Indicate the buffer end offset of a bulk-transmission */ - UINT TxRate; + u8 SavedPad[8]; + u8 Header_802_3[LENGTH_802_3]; + unsigned long CurWritePosition; /* Indicate the buffer offset which packet will be inserted start from. */ + unsigned long CurWriteRealPos; /* Indicate the buffer offset which packet now are writing to. */ + unsigned long NextBulkOutPosition; /* Indicate the buffer start offset of a bulk-transmission */ + unsigned long ENextBulkOutPosition; /* Indicate the buffer end offset of a bulk-transmission */ + u32 TxRate; dma_addr_t data_dma; /* urb dma on linux */ } HT_TX_CONTEXT, *PHT_TX_CONTEXT, **PPHT_TX_CONTEXT; @@ -186,12 +186,12 @@ typedef struct _HT_TX_CONTEXT { /* receive data to the protocol. */ /* */ typedef struct _RX_CONTEXT { - PUCHAR TransferBuffer; - PVOID pAd; + u8 *TransferBuffer; + void *pAd; PIRP pIrp; /*used to cancel pending bulk in. */ PURB pUrb; /*These 2 Boolean shouldn't both be 1 at the same time. */ - ULONG BulkInOffset; /* number of packets waiting for reordering . */ + unsigned long BulkInOffset; /* number of packets waiting for reordering . */ /* BOOLEAN ReorderInUse; // At least one packet in this buffer are in reordering buffer and wait for receive indication */ BOOLEAN bRxHandling; /* Notify this packet is being process now. */ BOOLEAN InUse; /* USB Hardware Occupied. Wait for USB HW to put packet. */ @@ -332,9 +332,9 @@ typedef struct _RX_CONTEXT { MlmeSetPsmBit(_pAd, _val);\ else \ { \ - USHORT _psm_val; \ + u16 _psm_val; \ _psm_val = _val; \ - RTUSBEnqueueInternalCmd(_pAd, CMDTHREAD_SET_PSM_BIT, &(_psm_val), sizeof(USHORT)); \ + RTUSBEnqueueInternalCmd(_pAd, CMDTHREAD_SET_PSM_BIT, &(_psm_val), sizeof(u16)); \ }\ } |