Skip to content

L
linux
Commit 52b81c89 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rt28x0: run *.h files through Lindent 

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0f65bec1
Show whitespace changes
Inline Side-by-side
Showing with 5734 additions and 7419 deletions
drivers/staging/rt2860/ap.h
View file @ 52b81c89
...@@ -41,40 +41,26 @@ ...@@ -41,40 +41,26 @@
#define __AP_H__ #define __AP_H__
// ap_wpa.c // ap_wpa.c
VOID WpaStateMachineInit( VOID WpaStateMachineInit(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN STATE_MACHINE * Sm, OUT STATE_MACHINE_FUNC Trans[]);
IN STATE_MACHINE *Sm,
OUT STATE_MACHINE_FUNC Trans[]);
#ifdef RTMP_MAC_USB #ifdef RTMP_MAC_USB
VOID BeaconUpdateExec( VOID BeaconUpdateExec(IN PVOID SystemSpecific1,
IN PVOID SystemSpecific1,
IN PVOID FunctionContext, IN PVOID FunctionContext,
IN PVOID SystemSpecific2, IN PVOID SystemSpecific2, IN PVOID SystemSpecific3);
IN PVOID SystemSpecific3);
#endif // RTMP_MAC_USB // #endif // RTMP_MAC_USB //
VOID RTMPSetPiggyBack( VOID RTMPSetPiggyBack(IN PRTMP_ADAPTER pAd, IN BOOLEAN bPiggyBack);
IN PRTMP_ADAPTER pAd,
IN BOOLEAN bPiggyBack);
VOID MacTableReset( VOID MacTableReset(IN PRTMP_ADAPTER pAd);
IN PRTMP_ADAPTER pAd);
MAC_TABLE_ENTRY *MacTableInsertEntry( MAC_TABLE_ENTRY *MacTableInsertEntry(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd,
IN PUCHAR pAddr, IN PUCHAR pAddr,
IN UCHAR apidx, IN UCHAR apidx, IN BOOLEAN CleanAll);
IN BOOLEAN CleanAll);
BOOLEAN MacTableDeleteEntry( BOOLEAN MacTableDeleteEntry(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN USHORT wcid, IN PUCHAR pAddr);
IN USHORT wcid,
IN PUCHAR pAddr);
MAC_TABLE_ENTRY *MacTableLookup( MAC_TABLE_ENTRY *MacTableLookup(IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr);
IN PRTMP_ADAPTER pAd,
IN PUCHAR pAddr);
#endif // __AP_H__ #endif // __AP_H__
drivers/staging/rt2860/chip/mac_pci.h
View file @ 52b81c89
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include "../rtmp_iface.h" #include "../rtmp_iface.h"
#include "../rtmp_dot11.h" #include "../rtmp_dot11.h"
// //
// Device ID & Vendor ID related definitions, // Device ID & Vendor ID related definitions,
// NOTE: you should not add the new VendorID/DeviceID here unless you not sure it belongs to what chip. // NOTE: you should not add the new VendorID/DeviceID here unless you not sure it belongs to what chip.
...@@ -61,10 +60,6 @@ ...@@ -61,10 +60,6 @@
#define PCI_CLASS_BRIDGE_PCI 0x0604 #define PCI_CLASS_BRIDGE_PCI 0x0604
#endif #endif
#define TXINFO_SIZE 0 #define TXINFO_SIZE 0
#define RTMP_PKT_TAIL_PADDING 0 #define RTMP_PKT_TAIL_PADDING 0
#define fRTMP_ADAPTER_NEED_STOP_TX 0 #define fRTMP_ADAPTER_NEED_STOP_TX 0
...@@ -96,11 +91,10 @@ typedef struct PACKED _TXD_STRUC { ...@@ -96,11 +91,10 @@ typedef struct PACKED _TXD_STRUC {
UINT32 ICO:1; // UINT32 ICO:1; //
} TXD_STRUC, *PTXD_STRUC; } TXD_STRUC, *PTXD_STRUC;
// //
// Rx descriptor format, Rx Ring // Rx descriptor format, Rx Ring
// //
typedef struct PACKED _RXD_STRUC{ typedef struct PACKED _RXD_STRUC {
// Word 0 // Word 0
UINT32 SDP0; UINT32 SDP0;
// Word 1 // Word 1
...@@ -129,13 +123,12 @@ typedef struct PACKED _RXD_STRUC{ ...@@ -129,13 +123,12 @@ typedef struct PACKED _RXD_STRUC{
UINT32 AMPDU:1; UINT32 AMPDU:1;
UINT32 Decrypted:1; // this frame is being decrypted. UINT32 Decrypted:1; // this frame is being decrypted.
UINT32 PlcpSignal:1; // To be moved UINT32 PlcpSignal:1; // To be moved
UINT32 PlcpRssil:1;// To be moved UINT32 PlcpRssil:1; // To be moved
UINT32 Rsv1:13; UINT32 Rsv1:13;
} RXD_STRUC, *PRXD_STRUC, RT28XX_RXD_STRUC, *PRT28XX_RXD_STRUC; } RXD_STRUC, *PRXD_STRUC, RT28XX_RXD_STRUC, *PRT28XX_RXD_STRUC;
typedef union _TX_ATTENUATION_CTRL_STRUC { typedef union _TX_ATTENUATION_CTRL_STRUC {
struct struct {
{
ULONG RF_ISOLATION_ENABLE:1; ULONG RF_ISOLATION_ENABLE:1;
ULONG Reserve2:7; ULONG Reserve2:7;
ULONG PCIE_PHY_TX_ATTEN_VALUE:3; ULONG PCIE_PHY_TX_ATTEN_VALUE:3;
...@@ -152,7 +145,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -152,7 +145,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
#define FIRMWARE_IMAGE_BASE 0x2000 #define FIRMWARE_IMAGE_BASE 0x2000
#define MAX_FIRMWARE_IMAGE_SIZE 0x2000 // 8kbyte #define MAX_FIRMWARE_IMAGE_SIZE 0x2000 // 8kbyte
/* ----------------- Frimware Related MACRO ----------------- */ /* ----------------- Frimware Related MACRO ----------------- */
#define RTMP_WRITE_FIRMWARE(_pAd, _pFwImage, _FwLen) \ #define RTMP_WRITE_FIRMWARE(_pAd, _pFwImage, _FwLen) \
do{ \ do{ \
...@@ -175,12 +167,10 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -175,12 +167,10 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
RTMP_IO_WRITE32(_pAd, H2M_MAILBOX_CSR, 0); \ RTMP_IO_WRITE32(_pAd, H2M_MAILBOX_CSR, 0); \
}while(0) }while(0)
/* ----------------- TX Related MACRO ----------------- */ /* ----------------- TX Related MACRO ----------------- */
#define RTMP_START_DEQUEUE(pAd, QueIdx, irqFlags) do{}while(0) #define RTMP_START_DEQUEUE(pAd, QueIdx, irqFlags) do{}while(0)
#define RTMP_STOP_DEQUEUE(pAd, QueIdx, irqFlags) do{}while(0) #define RTMP_STOP_DEQUEUE(pAd, QueIdx, irqFlags) do{}while(0)
#define RTMP_HAS_ENOUGH_FREE_DESC(pAd, pTxBlk, freeNum, pPacket) \ #define RTMP_HAS_ENOUGH_FREE_DESC(pAd, pTxBlk, freeNum, pPacket) \
((freeNum) >= (ULONG)(pTxBlk->TotalFragNum + RTMP_GET_PACKET_FRAGMENTS(pPacket) + 3)) /* rough estimate we will use 3 more descriptor. */ ((freeNum) >= (ULONG)(pTxBlk->TotalFragNum + RTMP_GET_PACKET_FRAGMENTS(pPacket) + 3)) /* rough estimate we will use 3 more descriptor. */
#define RTMP_RELEASE_DESC_RESOURCE(pAd, QueIdx) \ #define RTMP_RELEASE_DESC_RESOURCE(pAd, QueIdx) \
...@@ -190,12 +180,11 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -190,12 +180,11 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
(((freeNum != (TX_RING_SIZE-1)) && (pAd->TxSwQueue[QueIdx].Number == 0)) || (freeNum<3)) (((freeNum != (TX_RING_SIZE-1)) && (pAd->TxSwQueue[QueIdx].Number == 0)) || (freeNum<3))
//(((freeNum) != (TX_RING_SIZE-1)) && (pAd->TxSwQueue[QueIdx].Number == 1 /*0*/)) //(((freeNum) != (TX_RING_SIZE-1)) && (pAd->TxSwQueue[QueIdx].Number == 1 /*0*/))
#define HAL_KickOutMgmtTx(_pAd, _QueIdx, _pPacket, _pSrcBufVA, _SrcBufLen) \ #define HAL_KickOutMgmtTx(_pAd, _QueIdx, _pPacket, _pSrcBufVA, _SrcBufLen) \
RtmpPCIMgmtKickOut(_pAd, _QueIdx, _pPacket, _pSrcBufVA, _SrcBufLen) RtmpPCIMgmtKickOut(_pAd, _QueIdx, _pPacket, _pSrcBufVA, _SrcBufLen)
#define HAL_WriteSubTxResource(pAd, pTxBlk, bIsLast, pFreeNumber) \ #define HAL_WriteSubTxResource(pAd, pTxBlk, bIsLast, pFreeNumber) \
/* RtmpPCI_WriteSubTxResource(pAd, pTxBlk, bIsLast, pFreeNumber)*/ /* RtmpPCI_WriteSubTxResource(pAd, pTxBlk, bIsLast, pFreeNumber) */
#define HAL_WriteTxResource(pAd, pTxBlk,bIsLast, pFreeNumber) \ #define HAL_WriteTxResource(pAd, pTxBlk,bIsLast, pFreeNumber) \
RtmpPCI_WriteSingleTxResource(pAd, pTxBlk, bIsLast, pFreeNumber) RtmpPCI_WriteSingleTxResource(pAd, pTxBlk, bIsLast, pFreeNumber)
...@@ -210,7 +199,7 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -210,7 +199,7 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
RtmpPCI_FinalWriteTxResource(_pAd, _pTxBlk, _TotalMPDUSize, _FirstTxIdx) RtmpPCI_FinalWriteTxResource(_pAd, _pTxBlk, _TotalMPDUSize, _FirstTxIdx)
#define HAL_LastTxIdx(_pAd, _QueIdx,_LastTxIdx) \ #define HAL_LastTxIdx(_pAd, _QueIdx,_LastTxIdx) \
/*RtmpPCIDataLastTxIdx(_pAd, _QueIdx,_LastTxIdx)*/ /*RtmpPCIDataLastTxIdx(_pAd, _QueIdx,_LastTxIdx) */
#define HAL_KickOutTx(_pAd, _pTxBlk, _QueIdx) \ #define HAL_KickOutTx(_pAd, _pTxBlk, _QueIdx) \
RTMP_IO_WRITE32((_pAd), TX_CTX_IDX0+((_QueIdx)*0x10), (_pAd)->TxRing[(_QueIdx)].TxCpuIdx) RTMP_IO_WRITE32((_pAd), TX_CTX_IDX0+((_QueIdx)*0x10), (_pAd)->TxRing[(_QueIdx)].TxCpuIdx)
...@@ -225,17 +214,14 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -225,17 +214,14 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
: \ : \
(_pAd->TxRing[_QueIdx].TxSwFreeIdx + TX_RING_SIZE - _pAd->TxRing[_QueIdx].TxCpuIdx - 1); (_pAd->TxRing[_QueIdx].TxSwFreeIdx + TX_RING_SIZE - _pAd->TxRing[_QueIdx].TxCpuIdx - 1);
#define GET_MGMTRING_FREENO(_pAd) \ #define GET_MGMTRING_FREENO(_pAd) \
(_pAd->MgmtRing.TxSwFreeIdx > _pAd->MgmtRing.TxCpuIdx) ? \ (_pAd->MgmtRing.TxSwFreeIdx > _pAd->MgmtRing.TxCpuIdx) ? \
(_pAd->MgmtRing.TxSwFreeIdx - _pAd->MgmtRing.TxCpuIdx - 1) \ (_pAd->MgmtRing.TxSwFreeIdx - _pAd->MgmtRing.TxCpuIdx - 1) \
: \ : \
(_pAd->MgmtRing.TxSwFreeIdx + MGMT_RING_SIZE - _pAd->MgmtRing.TxCpuIdx - 1); (_pAd->MgmtRing.TxSwFreeIdx + MGMT_RING_SIZE - _pAd->MgmtRing.TxCpuIdx - 1);
/* ----------------- RX Related MACRO ----------------- */ /* ----------------- RX Related MACRO ----------------- */
/* ----------------- ASIC Related MACRO ----------------- */ /* ----------------- ASIC Related MACRO ----------------- */
// reset MAC of a station entry to 0x000000000000 // reset MAC of a station entry to 0x000000000000
#define RTMP_STA_ENTRY_MAC_RESET(pAd, Wcid) \ #define RTMP_STA_ENTRY_MAC_RESET(pAd, Wcid) \
...@@ -272,7 +258,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -272,7 +258,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
pAd->SharedKey[apidx][KeyID].CipherAlg, \ pAd->SharedKey[apidx][KeyID].CipherAlg, \
pEntry); } pEntry); }
// Insert the BA bitmap to ASIC for the Wcid entry // Insert the BA bitmap to ASIC for the Wcid entry
#define RTMP_ADD_BA_SESSION_TO_ASIC(_pAd, _Aid, _TID) \ #define RTMP_ADD_BA_SESSION_TO_ASIC(_pAd, _Aid, _TID) \
do{ \ do{ \
...@@ -283,7 +268,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -283,7 +268,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
RTMP_IO_WRITE32((_pAd), _Offset, _Value);\ RTMP_IO_WRITE32((_pAd), _Offset, _Value);\
}while(0) }while(0)
// Remove the BA bitmap from ASIC for the Wcid entry // Remove the BA bitmap from ASIC for the Wcid entry
// bitmap field starts at 0x10000 in ASIC WCID table // bitmap field starts at 0x10000 in ASIC WCID table
#define RTMP_DEL_BA_SESSION_FROM_ASIC(_pAd, _Wcid, _TID) \ #define RTMP_DEL_BA_SESSION_FROM_ASIC(_pAd, _Wcid, _TID) \
...@@ -295,7 +279,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -295,7 +279,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
RTMP_IO_WRITE32((_pAd), _Offset, _Value); \ RTMP_IO_WRITE32((_pAd), _Offset, _Value); \
}while(0) }while(0)
/* ----------------- Interface Related MACRO ----------------- */ /* ----------------- Interface Related MACRO ----------------- */
// //
...@@ -314,7 +297,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -314,7 +297,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
RTMP_SET_FLAG((_pAd), fRTMP_ADAPTER_INTERRUPT_ACTIVE); \ RTMP_SET_FLAG((_pAd), fRTMP_ADAPTER_INTERRUPT_ACTIVE); \
}while(0) }while(0)
#define RTMP_IRQ_INIT(pAd) \ #define RTMP_IRQ_INIT(pAd) \
{ pAd->int_enable_reg = ((DELAYINTMASK) | \ { pAd->int_enable_reg = ((DELAYINTMASK) | \
(RxINT|TxDataInt|TxMgmtInt)) & ~(0x03); \ (RxINT|TxDataInt|TxMgmtInt)) & ~(0x03); \
...@@ -326,7 +308,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -326,7 +308,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
RTMP_IO_WRITE32(pAd, INT_SOURCE_CSR, 0xffffffff);\ RTMP_IO_WRITE32(pAd, INT_SOURCE_CSR, 0xffffffff);\
RTMP_ASIC_INTERRUPT_ENABLE(pAd); } RTMP_ASIC_INTERRUPT_ENABLE(pAd); }
/* ----------------- MLME Related MACRO ----------------- */ /* ----------------- MLME Related MACRO ----------------- */
#define RTMP_MLME_HANDLER(pAd) MlmeHandler(pAd) #define RTMP_MLME_HANDLER(pAd) MlmeHandler(pAd)
...@@ -344,7 +325,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -344,7 +325,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
/* ----------------- Power Save Related MACRO ----------------- */ /* ----------------- Power Save Related MACRO ----------------- */
#define RTMP_PS_POLL_ENQUEUE(pAd) EnqueuePsPoll(pAd) #define RTMP_PS_POLL_ENQUEUE(pAd) EnqueuePsPoll(pAd)
// For RTMPPCIePowerLinkCtrlRestore () function // For RTMPPCIePowerLinkCtrlRestore () function
#define RESTORE_HALT 1 #define RESTORE_HALT 1
#define RESTORE_WAKEUP 2 #define RESTORE_WAKEUP 2
...@@ -358,7 +338,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC { ...@@ -358,7 +338,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
#define CID2MASK 0x00ff0000 #define CID2MASK 0x00ff0000
#define CID3MASK 0xff000000 #define CID3MASK 0xff000000
#define RTMP_STA_FORCE_WAKEUP(pAd, bFromTx) \ #define RTMP_STA_FORCE_WAKEUP(pAd, bFromTx) \
RT28xxPciStaAsicForceWakeup(pAd, bFromTx); RT28xxPciStaAsicForceWakeup(pAd, bFromTx);
......
drivers/staging/rt2860/chip/mac_usb.h
View file @ 52b81c89
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include "../rtmp_iface.h" #include "../rtmp_iface.h"
#include "../rtmp_dot11.h" #include "../rtmp_dot11.h"
#define USB_CYC_CFG 0x02a4 #define USB_CYC_CFG 0x02a4
#define BEACON_RING_SIZE 2 #define BEACON_RING_SIZE 2
...@@ -85,7 +84,6 @@ typedef struct PACKED _RXINFO_STRUC { ...@@ -85,7 +84,6 @@ typedef struct PACKED _RXINFO_STRUC {
UINT32 PlcpSignal:12; UINT32 PlcpSignal:12;
} RXINFO_STRUC, *PRXINFO_STRUC, RT28XX_RXD_STRUC, *PRT28XX_RXD_STRUC; } RXINFO_STRUC, *PRXINFO_STRUC, RT28XX_RXD_STRUC, *PRT28XX_RXD_STRUC;
// //
// TXINFO // TXINFO
// //
...@@ -100,10 +98,9 @@ typedef struct _TXINFO_STRUC { ...@@ -100,10 +98,9 @@ typedef struct _TXINFO_STRUC {
UINT32 SwUseLastRound:1; // Software use. UINT32 SwUseLastRound:1; // Software use.
UINT32 rsv2:2; // Software use. UINT32 rsv2:2; // Software use.
UINT32 USBDMANextVLD:1; //used ONLY in USB bulk Aggregation, NextValid 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 UINT32 USBDMATxburst:1; //used ONLY in USB bulk Aggre. Force USB DMA transmit frame from current selected endpoint
} TXINFO_STRUC, *PTXINFO_STRUC; } TXINFO_STRUC, *PTXINFO_STRUC;
// //
// Management ring buffer format // Management ring buffer format
// //
...@@ -113,34 +110,31 @@ typedef struct _MGMT_STRUC { ...@@ -113,34 +110,31 @@ typedef struct _MGMT_STRUC {
ULONG Length; ULONG Length;
} MGMT_STRUC, *PMGMT_STRUC; } MGMT_STRUC, *PMGMT_STRUC;
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// The TX_BUFFER structure forms the transmitted USB packet to the device // The TX_BUFFER structure forms the transmitted USB packet to the device
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
typedef struct __TX_BUFFER{ typedef struct __TX_BUFFER {
union{ union {
UCHAR WirelessPacket[TX_BUFFER_NORMSIZE]; UCHAR WirelessPacket[TX_BUFFER_NORMSIZE];
HEADER_802_11 NullFrame; HEADER_802_11 NullFrame;
PSPOLL_FRAME PsPollPacket; PSPOLL_FRAME PsPollPacket;
RTS_FRAME RTSFrame; RTS_FRAME RTSFrame;
}field; } field;
UCHAR Aggregation[4]; //Buffer for save Aggregation size. UCHAR Aggregation[4]; //Buffer for save Aggregation size.
} TX_BUFFER, *PTX_BUFFER; } TX_BUFFER, *PTX_BUFFER;
typedef struct __HTTX_BUFFER{ typedef struct __HTTX_BUFFER {
union{ union {
UCHAR WirelessPacket[MAX_TXBULK_SIZE]; UCHAR WirelessPacket[MAX_TXBULK_SIZE];
HEADER_802_11 NullFrame; HEADER_802_11 NullFrame;
PSPOLL_FRAME PsPollPacket; PSPOLL_FRAME PsPollPacket;
RTS_FRAME RTSFrame; RTS_FRAME RTSFrame;
}field; } field;
UCHAR Aggregation[4]; //Buffer for save Aggregation size. UCHAR Aggregation[4]; //Buffer for save Aggregation size.
} HTTX_BUFFER, *PHTTX_BUFFER; } HTTX_BUFFER, *PHTTX_BUFFER;
// used to track driver-generated write irps // used to track driver-generated write irps
typedef struct _TX_CONTEXT typedef struct _TX_CONTEXT {
{
PVOID pAd; //Initialized in MiniportInitialize PVOID pAd; //Initialized in MiniportInitialize
PURB pUrb; //Initialized in MiniportInitialize PURB pUrb; //Initialized in MiniportInitialize
PIRP pIrp; //used to cancel pending bulk out. PIRP pIrp; //used to cancel pending bulk out.
...@@ -163,10 +157,8 @@ typedef struct _TX_CONTEXT ...@@ -163,10 +157,8 @@ typedef struct _TX_CONTEXT
} TX_CONTEXT, *PTX_CONTEXT, **PPTX_CONTEXT; } TX_CONTEXT, *PTX_CONTEXT, **PPTX_CONTEXT;
// used to track driver-generated write irps // used to track driver-generated write irps
typedef struct _HT_TX_CONTEXT typedef struct _HT_TX_CONTEXT {
{
PVOID pAd; //Initialized in MiniportInitialize PVOID pAd; //Initialized in MiniportInitialize
PURB pUrb; //Initialized in MiniportInitialize PURB pUrb; //Initialized in MiniportInitialize
PIRP pIrp; //used to cancel pending bulk out. PIRP pIrp; //used to cancel pending bulk out.
...@@ -189,16 +181,14 @@ typedef struct _HT_TX_CONTEXT ...@@ -189,16 +181,14 @@ typedef struct _HT_TX_CONTEXT
dma_addr_t data_dma; // urb dma on linux dma_addr_t data_dma; // urb dma on linux
} HT_TX_CONTEXT, *PHT_TX_CONTEXT, **PPHT_TX_CONTEXT; } HT_TX_CONTEXT, *PHT_TX_CONTEXT, **PPHT_TX_CONTEXT;
// //
// Structure to keep track of receive packets and buffers to indicate // Structure to keep track of receive packets and buffers to indicate
// receive data to the protocol. // receive data to the protocol.
// //
typedef struct _RX_CONTEXT typedef struct _RX_CONTEXT {
{
PUCHAR TransferBuffer; PUCHAR TransferBuffer;
PVOID pAd; PVOID pAd;
PIRP pIrp;//used to cancel pending bulk in. PIRP pIrp; //used to cancel pending bulk in.
PURB pUrb; PURB pUrb;
//These 2 Boolean shouldn't both be 1 at the same time. //These 2 Boolean shouldn't both be 1 at the same time.
ULONG BulkInOffset; // number of packets waiting for reordering . ULONG BulkInOffset; // number of packets waiting for reordering .
...@@ -212,8 +202,6 @@ typedef struct _RX_CONTEXT ...@@ -212,8 +202,6 @@ typedef struct _RX_CONTEXT
dma_addr_t data_dma; // urb dma on linux dma_addr_t data_dma; // urb dma on linux
} RX_CONTEXT, *PRX_CONTEXT; } RX_CONTEXT, *PRX_CONTEXT;
/****************************************************************************** /******************************************************************************
USB Frimware Related MACRO USB Frimware Related MACRO
...@@ -226,8 +214,6 @@ typedef struct _RX_CONTEXT ...@@ -226,8 +214,6 @@ typedef struct _RX_CONTEXT
#define RTMP_WRITE_FIRMWARE(_pAd, _pFwImage, _FwLen) \ #define RTMP_WRITE_FIRMWARE(_pAd, _pFwImage, _FwLen) \
RTUSBFirmwareWrite(_pAd, _pFwImage, _FwLen) RTUSBFirmwareWrite(_pAd, _pFwImage, _FwLen)
/****************************************************************************** /******************************************************************************
USB TX Related MACRO USB TX Related MACRO
...@@ -281,7 +267,7 @@ typedef struct _RX_CONTEXT ...@@ -281,7 +267,7 @@ typedef struct _RX_CONTEXT
RtmpUSB_FinalWriteTxResource(pAd, pTxBlk, totalMPDUSize, TxIdx) RtmpUSB_FinalWriteTxResource(pAd, pTxBlk, totalMPDUSize, TxIdx)
#define HAL_LastTxIdx(pAd, QueIdx,TxIdx) \ #define HAL_LastTxIdx(pAd, QueIdx,TxIdx) \
/*RtmpUSBDataLastTxIdx(pAd, QueIdx,TxIdx)*/ /*RtmpUSBDataLastTxIdx(pAd, QueIdx,TxIdx) */
#define HAL_KickOutTx(pAd, pTxBlk, QueIdx) \ #define HAL_KickOutTx(pAd, pTxBlk, QueIdx) \
RtmpUSBDataKickOut(pAd, pTxBlk, QueIdx) RtmpUSBDataKickOut(pAd, pTxBlk, QueIdx)
...@@ -295,17 +281,14 @@ typedef struct _RX_CONTEXT ...@@ -295,17 +281,14 @@ typedef struct _RX_CONTEXT
#define GET_TXRING_FREENO(_pAd, _QueIdx) (_QueIdx) //(_pAd->TxRing[_QueIdx].TxSwFreeIdx) #define GET_TXRING_FREENO(_pAd, _QueIdx) (_QueIdx) //(_pAd->TxRing[_QueIdx].TxSwFreeIdx)
#define GET_MGMTRING_FREENO(_pAd) (_pAd->MgmtRing.TxSwFreeIdx) #define GET_MGMTRING_FREENO(_pAd) (_pAd->MgmtRing.TxSwFreeIdx)
/* ----------------- RX Related MACRO ----------------- */ /* ----------------- RX Related MACRO ----------------- */
/* /*
* Device Hardware Interface Related MACRO * Device Hardware Interface Related MACRO
*/ */
#define RTMP_IRQ_INIT(pAd) do{}while(0) #define RTMP_IRQ_INIT(pAd) do{}while(0)
#define RTMP_IRQ_ENABLE(pAd) do{}while(0) #define RTMP_IRQ_ENABLE(pAd) do{}while(0)
/* /*
* MLME Related MACRO * MLME Related MACRO
*/ */
...@@ -330,7 +313,6 @@ typedef struct _RX_CONTEXT ...@@ -330,7 +313,6 @@ typedef struct _RX_CONTEXT
RTUSBMlmeUp(_pAd); \ RTUSBMlmeUp(_pAd); \
} }
/* /*
* Power Save Related MACRO * Power Save Related MACRO
*/ */
......
drivers/staging/rt2860/chip/rt2860.h
View file @ 52b81c89
...@@ -46,11 +46,9 @@ ...@@ -46,11 +46,9 @@
#define NIC2760_PCI_DEVICE_ID 0x0701 // 1T/2R Cardbus ??? #define NIC2760_PCI_DEVICE_ID 0x0701 // 1T/2R Cardbus ???
#define NIC2790_PCIe_DEVICE_ID 0x0781 // 1T/2R miniCard #define NIC2790_PCIe_DEVICE_ID 0x0781 // 1T/2R miniCard
#define VEN_AWT_PCIe_DEVICE_ID 0x1059 #define VEN_AWT_PCIe_DEVICE_ID 0x1059
#define VEN_AWT_PCI_VENDOR_ID 0x1A3B #define VEN_AWT_PCI_VENDOR_ID 0x1A3B
#define EDIMAX_PCI_VENDOR_ID 0x1432 #define EDIMAX_PCI_VENDOR_ID 0x1432
#endif //__RT2860_H__ // #endif //__RT2860_H__ //
drivers/staging/rt2860/chip/rt2870.h
View file @ 52b81c89
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include "../rtmp_type.h" #include "../rtmp_type.h"
#include "mac_usb.h" #include "mac_usb.h"
//#define RTMP_CHIP_NAME "RT2870" //#define RTMP_CHIP_NAME "RT2870"
#endif // RT2870 // #endif // RT2870 //
......
drivers/staging/rt2860/chip/rt3070.h
View file @ 52b81c89
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#ifdef RT3070 #ifdef RT3070
#ifndef RTMP_USB_SUPPORT #ifndef RTMP_USB_SUPPORT
#error "For RT3070, you should define the compile flag -DRTMP_USB_SUPPORT" #error "For RT3070, you should define the compile flag -DRTMP_USB_SUPPORT"
#endif #endif
......
drivers/staging/rt2860/chip/rt30xx.h
View file @ 52b81c89
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#ifdef RT30xx #ifdef RT30xx
extern REG_PAIR RT30xx_RFRegTable[]; extern REG_PAIR RT30xx_RFRegTable[];
extern UCHAR NUM_RF_REG_PARMS; extern UCHAR NUM_RF_REG_PARMS;
......
drivers/staging/rt2860/chip/rtmp_mac.h
View file @ 52b81c89
...@@ -38,8 +38,6 @@ ...@@ -38,8 +38,6 @@
#ifndef __RTMP_MAC_H__ #ifndef __RTMP_MAC_H__
#define __RTMP_MAC_H__ #define __RTMP_MAC_H__
// ================================================================================= // =================================================================================
// TX / RX ring descriptor format // TX / RX ring descriptor format
// ================================================================================= // =================================================================================
...@@ -50,7 +48,6 @@ ...@@ -50,7 +48,6 @@
#define FIFO_HCCA 1 #define FIFO_HCCA 1
#define FIFO_EDCA 2 #define FIFO_EDCA 2
// //
// TXD Wireless Information format for Tx ring and Mgmt Ring // TXD Wireless Information format for Tx ring and Mgmt Ring
// //
...@@ -93,7 +90,6 @@ typedef struct PACKED _TXWI_STRUC { ...@@ -93,7 +90,6 @@ typedef struct PACKED _TXWI_STRUC {
UINT32 EIV; UINT32 EIV;
} TXWI_STRUC, *PTXWI_STRUC; } TXWI_STRUC, *PTXWI_STRUC;
// //
// RXWI wireless information format, in PBF. invisible in driver. // RXWI wireless information format, in PBF. invisible in driver.
// //
...@@ -124,15 +120,13 @@ typedef struct PACKED _RXWI_STRUC { ...@@ -124,15 +120,13 @@ typedef struct PACKED _RXWI_STRUC {
UINT32 SNR1:8; UINT32 SNR1:8;
UINT32 FOFFSET:8; // RT35xx UINT32 FOFFSET:8; // RT35xx
UINT32 rsv2:8; UINT32 rsv2:8;
/*UINT32 rsv2:16;*/ /*UINT32 rsv2:16; */
} RXWI_STRUC, *PRXWI_STRUC; } RXWI_STRUC, *PRXWI_STRUC;
// ================================================================================= // =================================================================================
// Register format // Register format
// ================================================================================= // =================================================================================
// //
// SCH/DMA registers - base address 0x0200 // SCH/DMA registers - base address 0x0200
// //
...@@ -145,22 +139,22 @@ typedef union _INT_SOURCE_CSR_STRUC { ...@@ -145,22 +139,22 @@ typedef union _INT_SOURCE_CSR_STRUC {
UINT32 RxDelayINT:1; UINT32 RxDelayINT:1;
UINT32 TxDelayINT:1; UINT32 TxDelayINT:1;
UINT32 RxDone:1; UINT32 RxDone:1;
UINT32 Ac0DmaDone:1;//4 UINT32 Ac0DmaDone:1; //4
UINT32 Ac1DmaDone:1; UINT32 Ac1DmaDone:1;
UINT32 Ac2DmaDone:1; UINT32 Ac2DmaDone:1;
UINT32 Ac3DmaDone:1; UINT32 Ac3DmaDone:1;
UINT32 HccaDmaDone:1; // bit7 UINT32 HccaDmaDone:1; // bit7
UINT32 MgmtDmaDone:1; UINT32 MgmtDmaDone:1;
UINT32 MCUCommandINT:1;//bit 9 UINT32 MCUCommandINT:1; //bit 9
UINT32 RxTxCoherent:1; UINT32 RxTxCoherent:1;
UINT32 TBTTInt:1; UINT32 TBTTInt:1;
UINT32 PreTBTT:1; UINT32 PreTBTT:1;
UINT32 TXFifoStatusInt:1;//FIFO Statistics is full, sw should read 0x171c UINT32 TXFifoStatusInt:1; //FIFO Statistics is full, sw should read 0x171c
UINT32 AutoWakeup:1;//bit14 UINT32 AutoWakeup:1; //bit14
UINT32 GPTimer:1; UINT32 GPTimer:1;
UINT32 RxCoherent:1;//bit16 UINT32 RxCoherent:1; //bit16
UINT32 TxCoherent:1; UINT32 TxCoherent:1;
UINT32 :14; UINT32:14;
} field; } field;
UINT32 word; UINT32 word;
} INT_SOURCE_CSR_STRUC, *PINT_SOURCE_CSR_STRUC; } INT_SOURCE_CSR_STRUC, *PINT_SOURCE_CSR_STRUC;
...@@ -181,7 +175,7 @@ typedef union _INT_MASK_CSR_STRUC { ...@@ -181,7 +175,7 @@ typedef union _INT_MASK_CSR_STRUC {
UINT32 HccaDmaDone:1; UINT32 HccaDmaDone:1;
UINT32 MgmtDmaDone:1; UINT32 MgmtDmaDone:1;
UINT32 MCUCommandINT:1; UINT32 MCUCommandINT:1;
UINT32 :20; UINT32:20;
UINT32 RxCoherent:1; UINT32 RxCoherent:1;
UINT32 TxCoherent:1; UINT32 TxCoherent:1;
} field; } field;
...@@ -215,7 +209,7 @@ typedef union _WPDMA_RST_IDX_STRUC { ...@@ -215,7 +209,7 @@ typedef union _WPDMA_RST_IDX_STRUC {
UINT32 RST_DTX_IDX5:1; UINT32 RST_DTX_IDX5:1;
UINT32 rsv:10; UINT32 rsv:10;
UINT32 RST_DRX_IDX0:1; UINT32 RST_DRX_IDX0:1;
UINT32 :15; UINT32:15;
} field; } field;
UINT32 word; UINT32 word;
} WPDMA_RST_IDX_STRUC, *PWPDMA_RST_IDX_STRUC; } WPDMA_RST_IDX_STRUC, *PWPDMA_RST_IDX_STRUC;
...@@ -272,7 +266,6 @@ typedef union _CWMAX_CSR_STRUC { ...@@ -272,7 +266,6 @@ typedef union _CWMAX_CSR_STRUC {
UINT32 word; UINT32 word;
} CWMAX_CSR_STRUC, *PCWMAX_CSR_STRUC; } CWMAX_CSR_STRUC, *PCWMAX_CSR_STRUC;
// //
// AC_TXOP_CSR0: AC_BK/AC_BE TXOP register // AC_TXOP_CSR0: AC_BK/AC_BE TXOP register
// //
...@@ -297,7 +290,6 @@ typedef union _AC_TXOP_CSR1_STRUC { ...@@ -297,7 +290,6 @@ typedef union _AC_TXOP_CSR1_STRUC {
UINT32 word; UINT32 word;
} AC_TXOP_CSR1_STRUC, *PAC_TXOP_CSR1_STRUC; } AC_TXOP_CSR1_STRUC, *PAC_TXOP_CSR1_STRUC;
#define RINGREG_DIFF 0x10 #define RINGREG_DIFF 0x10
#define GPIO_CTRL_CFG 0x0228 //MAC_CSR13 #define GPIO_CTRL_CFG 0x0228 //MAC_CSR13
#define MCU_CMD_CFG 0x022c #define MCU_CMD_CFG 0x022c
...@@ -333,7 +325,6 @@ typedef union _AC_TXOP_CSR1_STRUC { ...@@ -333,7 +325,6 @@ typedef union _AC_TXOP_CSR1_STRUC {
#define RX_CRX_IDX 0x0298 #define RX_CRX_IDX 0x0298
#define RX_DRX_IDX 0x029c #define RX_DRX_IDX 0x029c
#define USB_DMA_CFG 0x02a0 #define USB_DMA_CFG 0x02a0
typedef union _USB_DMA_CFG_STRUC { typedef union _USB_DMA_CFG_STRUC {
struct { struct {
...@@ -353,7 +344,6 @@ typedef union _USB_DMA_CFG_STRUC { ...@@ -353,7 +344,6 @@ typedef union _USB_DMA_CFG_STRUC {
UINT32 word; UINT32 word;
} USB_DMA_CFG_STRUC, *PUSB_DMA_CFG_STRUC; } USB_DMA_CFG_STRUC, *PUSB_DMA_CFG_STRUC;
// //
// 3 PBF registers // 3 PBF registers
// //
...@@ -385,7 +375,6 @@ typedef union _USB_DMA_CFG_STRUC { ...@@ -385,7 +375,6 @@ typedef union _USB_DMA_CFG_STRUC {
#define LDO_CFG0 0x05d4 #define LDO_CFG0 0x05d4
#define GPIO_SWITCH 0x05dc #define GPIO_SWITCH 0x05dc
// //
// 4 MAC registers // 4 MAC registers
// //
...@@ -459,7 +448,7 @@ typedef union _BBP_CSR_CFG_STRUC { ...@@ -459,7 +448,7 @@ typedef union _BBP_CSR_CFG_STRUC {
UINT32 Busy:1; // 1: ASIC is busy execute BBP programming. UINT32 Busy:1; // 1: ASIC is busy execute BBP programming.
UINT32 BBP_PAR_DUR:1; // 0: 4 MAC clock cycles 1: 8 MAC clock cycles UINT32 BBP_PAR_DUR:1; // 0: 4 MAC clock cycles 1: 8 MAC clock cycles
UINT32 BBP_RW_MODE:1; // 0: use serial mode 1:parallel UINT32 BBP_RW_MODE:1; // 0: use serial mode 1:parallel
UINT32 :12; UINT32:12;
} field; } field;
UINT32 word; UINT32 word;
} BBP_CSR_CFG_STRUC, *PBBP_CSR_CFG_STRUC; } BBP_CSR_CFG_STRUC, *PBBP_CSR_CFG_STRUC;
...@@ -505,7 +494,7 @@ typedef union _LED_CFG_STRUC { ...@@ -505,7 +494,7 @@ typedef union _LED_CFG_STRUC {
UINT32 GLedMode:2; // green Led Mode UINT32 GLedMode:2; // green Led Mode
UINT32 YLedMode:2; // yellow Led Mode UINT32 YLedMode:2; // yellow Led Mode
UINT32 LedPolar:1; // Led Polarity. 0: active low1: active high UINT32 LedPolar:1; // Led Polarity. 0: active low1: active high
UINT32 :1; UINT32:1;
} field; } field;
UINT32 word; UINT32 word;
} LED_CFG_STRUC, *PLED_CFG_STRUC; } LED_CFG_STRUC, *PLED_CFG_STRUC;
...@@ -544,7 +533,7 @@ typedef union _BCN_TIME_CFG_STRUC { ...@@ -544,7 +533,7 @@ typedef union _BCN_TIME_CFG_STRUC {
UINT32 TsfSyncMode:2; // Enable TSF sync, 00: disable, 01: infra mode, 10: ad-hoc mode UINT32 TsfSyncMode:2; // Enable TSF sync, 00: disable, 01: infra mode, 10: ad-hoc mode
UINT32 bTBTTEnable:1; UINT32 bTBTTEnable:1;
UINT32 bBeaconGen:1; // Enable beacon generator UINT32 bBeaconGen:1; // Enable beacon generator
UINT32 :3; UINT32:3;
UINT32 TxTimestampCompensate:8; UINT32 TxTimestampCompensate:8;
} field; } field;
UINT32 word; UINT32 word;
...@@ -571,7 +560,7 @@ typedef union _AUTO_WAKEUP_STRUC { ...@@ -571,7 +560,7 @@ typedef union _AUTO_WAKEUP_STRUC {
UINT32 AutoLeadTime:8; UINT32 AutoLeadTime:8;
UINT32 NumofSleepingTbtt:7; // ForceWake has high privilege than PutToSleep when both set UINT32 NumofSleepingTbtt:7; // ForceWake has high privilege than PutToSleep when both set
UINT32 EnableAutoWakeup:1; // 0:sleep, 1:awake UINT32 EnableAutoWakeup:1; // 0:sleep, 1:awake
UINT32 :16; UINT32:16;
} field; } field;
UINT32 word; UINT32 word;
} AUTO_WAKEUP_STRUC, *PAUTO_WAKEUP_STRUC; } AUTO_WAKEUP_STRUC, *PAUTO_WAKEUP_STRUC;
...@@ -589,7 +578,7 @@ typedef union _EDCA_AC_CFG_STRUC { ...@@ -589,7 +578,7 @@ typedef union _EDCA_AC_CFG_STRUC {
UINT32 Aifsn:4; // # of slot time UINT32 Aifsn:4; // # of slot time
UINT32 Cwmin:4; // UINT32 Cwmin:4; //
UINT32 Cwmax:4; //unit power of 2 UINT32 Cwmax:4; //unit power of 2
UINT32 :12; // UINT32:12; //
} field; } field;
UINT32 word; UINT32 word;
} EDCA_AC_CFG_STRUC, *PEDCA_AC_CFG_STRUC; } EDCA_AC_CFG_STRUC, *PEDCA_AC_CFG_STRUC;
...@@ -711,7 +700,6 @@ typedef union _LG_FBK_CFG1_STRUC { ...@@ -711,7 +700,6 @@ typedef union _LG_FBK_CFG1_STRUC {
UINT32 word; UINT32 word;
} LG_FBK_CFG1_STRUC, *PLG_FBK_CFG1_STRUC; } LG_FBK_CFG1_STRUC, *PLG_FBK_CFG1_STRUC;
//======================================================= //=======================================================
//================ Protection Paramater================================ //================ Protection Paramater================================
//======================================================= //=======================================================
...@@ -763,7 +751,7 @@ typedef union _AUTO_RSP_CFG_STRUC { ...@@ -763,7 +751,7 @@ typedef union _AUTO_RSP_CFG_STRUC {
UINT32 rsv:1; // Power bit value in conrtrol frame UINT32 rsv:1; // Power bit value in conrtrol frame
UINT32 DualCTSEn:1; // Power bit value in conrtrol frame UINT32 DualCTSEn:1; // Power bit value in conrtrol frame
UINT32 AckCtsPsmBit:1; // Power bit value in conrtrol frame UINT32 AckCtsPsmBit:1; // Power bit value in conrtrol frame
UINT32 :24; UINT32:24;
} field; } field;
UINT32 word; UINT32 word;
} AUTO_RSP_CFG_STRUC, *PAUTO_RSP_CFG_STRUC; } AUTO_RSP_CFG_STRUC, *PAUTO_RSP_CFG_STRUC;
...@@ -990,25 +978,24 @@ typedef union _MPDU_DEN_CNT_STRUC { ...@@ -990,25 +978,24 @@ typedef union _MPDU_DEN_CNT_STRUC {
#define SHAREDKEYTABLE 0 #define SHAREDKEYTABLE 0
#define PAIRWISEKEYTABLE 1 #define PAIRWISEKEYTABLE 1
typedef union _SHAREDKEY_MODE_STRUC { typedef union _SHAREDKEY_MODE_STRUC {
struct { struct {
UINT32 Bss0Key0CipherAlg:3; UINT32 Bss0Key0CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss0Key1CipherAlg:3; UINT32 Bss0Key1CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss0Key2CipherAlg:3; UINT32 Bss0Key2CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss0Key3CipherAlg:3; UINT32 Bss0Key3CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss1Key0CipherAlg:3; UINT32 Bss1Key0CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss1Key1CipherAlg:3; UINT32 Bss1Key1CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss1Key2CipherAlg:3; UINT32 Bss1Key2CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss1Key3CipherAlg:3; UINT32 Bss1Key3CipherAlg:3;
UINT32 :1; UINT32:1;
} field; } field;
UINT32 word; UINT32 word;
} SHAREDKEY_MODE_STRUC, *PSHAREDKEY_MODE_STRUC; } SHAREDKEY_MODE_STRUC, *PSHAREDKEY_MODE_STRUC;
...@@ -1018,7 +1005,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry ...@@ -1018,7 +1005,6 @@ typedef struct _HW_WCID_ENTRY { // 8-byte per entry
UCHAR Rsv[2]; UCHAR Rsv[2];
} HW_WCID_ENTRY, PHW_WCID_ENTRY; } HW_WCID_ENTRY, PHW_WCID_ENTRY;
// ================================================================================= // =================================================================================
// WCID format // WCID format
// ================================================================================= // =================================================================================
...@@ -1048,7 +1034,6 @@ typedef struct _MAC_ATTRIBUTE_STRUC { ...@@ -1048,7 +1034,6 @@ typedef struct _MAC_ATTRIBUTE_STRUC {
UINT32 rsv:22; UINT32 rsv:22;
} MAC_ATTRIBUTE_STRUC, *PMAC_ATTRIBUTE_STRUC; } MAC_ATTRIBUTE_STRUC, *PMAC_ATTRIBUTE_STRUC;
// ================================================================================= // =================================================================================
// HOST-MCU communication data structure // HOST-MCU communication data structure
// ================================================================================= // =================================================================================
...@@ -1079,7 +1064,6 @@ typedef union _M2H_CMD_DONE_STRUC { ...@@ -1079,7 +1064,6 @@ typedef union _M2H_CMD_DONE_STRUC {
UINT32 word; UINT32 word;
} M2H_CMD_DONE_STRUC, *PM2H_CMD_DONE_STRUC; } M2H_CMD_DONE_STRUC, *PM2H_CMD_DONE_STRUC;
//NAV_TIME_CFG :NAV //NAV_TIME_CFG :NAV
typedef union _NAV_TIME_CFG_STRUC { typedef union _NAV_TIME_CFG_STRUC {
struct { struct {
...@@ -1092,7 +1076,6 @@ typedef union _NAV_TIME_CFG_STRUC { ...@@ -1092,7 +1076,6 @@ typedef union _NAV_TIME_CFG_STRUC {
UINT32 word; UINT32 word;
} NAV_TIME_CFG_STRUC, *PNAV_TIME_CFG_STRUC; } NAV_TIME_CFG_STRUC, *PNAV_TIME_CFG_STRUC;
// //
// RX_FILTR_CFG: /RX configuration register // RX_FILTR_CFG: /RX configuration register
// //
...@@ -1119,14 +1102,11 @@ typedef union _RX_FILTR_CFG_STRUC { ...@@ -1119,14 +1102,11 @@ typedef union _RX_FILTR_CFG_STRUC {
UINT32 DropBAR:1; // UINT32 DropBAR:1; //
UINT32 DropRsvCntlType:1; UINT32 DropRsvCntlType:1;
UINT32 :15; UINT32:15;
} field; } field;
UINT32 word; UINT32 word;
} RX_FILTR_CFG_STRUC, *PRX_FILTR_CFG_STRUC; } RX_FILTR_CFG_STRUC, *PRX_FILTR_CFG_STRUC;
// //
// PHY_CSR4: RF serial control register // PHY_CSR4: RF serial control register
// //
...@@ -1141,33 +1121,31 @@ typedef union _PHY_CSR4_STRUC { ...@@ -1141,33 +1121,31 @@ typedef union _PHY_CSR4_STRUC {
UINT32 word; UINT32 word;
} PHY_CSR4_STRUC, *PPHY_CSR4_STRUC; } PHY_CSR4_STRUC, *PPHY_CSR4_STRUC;
// //
// SEC_CSR5: shared key table security mode register // SEC_CSR5: shared key table security mode register
// //
typedef union _SEC_CSR5_STRUC { typedef union _SEC_CSR5_STRUC {
struct { struct {
UINT32 Bss2Key0CipherAlg:3; UINT32 Bss2Key0CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss2Key1CipherAlg:3; UINT32 Bss2Key1CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss2Key2CipherAlg:3; UINT32 Bss2Key2CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss2Key3CipherAlg:3; UINT32 Bss2Key3CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss3Key0CipherAlg:3; UINT32 Bss3Key0CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss3Key1CipherAlg:3; UINT32 Bss3Key1CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss3Key2CipherAlg:3; UINT32 Bss3Key2CipherAlg:3;
UINT32 :1; UINT32:1;
UINT32 Bss3Key3CipherAlg:3; UINT32 Bss3Key3CipherAlg:3;
UINT32 :1; UINT32:1;
} field; } field;
UINT32 word; UINT32 word;
} SEC_CSR5_STRUC, *PSEC_CSR5_STRUC; } SEC_CSR5_STRUC, *PSEC_CSR5_STRUC;
// //
// HOST_CMD_CSR: For HOST to interrupt embedded processor // HOST_CMD_CSR: For HOST to interrupt embedded processor
// //
...@@ -1179,13 +1157,10 @@ typedef union _HOST_CMD_CSR_STRUC { ...@@ -1179,13 +1157,10 @@ typedef union _HOST_CMD_CSR_STRUC {
UINT32 word; UINT32 word;
} HOST_CMD_CSR_STRUC, *PHOST_CMD_CSR_STRUC; } HOST_CMD_CSR_STRUC, *PHOST_CMD_CSR_STRUC;
// //
// AIFSN_CSR: AIFSN for each EDCA AC // AIFSN_CSR: AIFSN for each EDCA AC
// //
// //
// E2PROM_CSR: EEPROM control register // E2PROM_CSR: EEPROM control register
// //
...@@ -1242,7 +1217,6 @@ typedef union _RF_CSR_CFG_STRUC { ...@@ -1242,7 +1217,6 @@ typedef union _RF_CSR_CFG_STRUC {
UINT word; UINT word;
} RF_CSR_CFG_STRUC, *PRF_CSR_CFG_STRUC; } RF_CSR_CFG_STRUC, *PRF_CSR_CFG_STRUC;
// //
// Other on-chip shared memory space, base = 0x2000 // Other on-chip shared memory space, base = 0x2000
// //
...@@ -1305,8 +1279,6 @@ typedef union _RF_CSR_CFG_STRUC { ...@@ -1305,8 +1279,6 @@ typedef union _RF_CSR_CFG_STRUC {
#define E2PROM_CSR 0x0004 #define E2PROM_CSR 0x0004
#define IO_CNTL_CSR 0x77d0 #define IO_CNTL_CSR 0x77d0
// ================================================================ // ================================================================
// Tx / Rx / Mgmt ring descriptor definition // Tx / Rx / Mgmt ring descriptor definition
// ================================================================ // ================================================================
......
drivers/staging/rt2860/chip/rtmp_phy.h
View file @ 52b81c89
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#ifndef __RTMP_PHY_H__ #ifndef __RTMP_PHY_H__
#define __RTMP_PHY_H__ #define __RTMP_PHY_H__
/* /*
RF sections RF sections
*/ */
...@@ -75,7 +74,6 @@ ...@@ -75,7 +74,6 @@
#define RF_R30 30 #define RF_R30 30
#define RF_R31 31 #define RF_R31 31
// value domain of pAd->RfIcType // value domain of pAd->RfIcType
#define RFIC_2820 1 // 2.4G 2T3R #define RFIC_2820 1 // 2.4G 2T3R
#define RFIC_2850 2 // 2.4G/5G 2T3R #define RFIC_2850 2 // 2.4G/5G 2T3R
...@@ -416,7 +414,6 @@ ...@@ -416,7 +414,6 @@
} \ } \
}while(0) }while(0)
/* /*
This marco used for the BBP write operation which didn't need via MCU. This marco used for the BBP write operation which didn't need via MCU.
*/ */
...@@ -539,7 +536,6 @@ ...@@ -539,7 +536,6 @@
RTMP_IO_WRITE32(_pAd, 0x1210, _macData); \ RTMP_IO_WRITE32(_pAd, 0x1210, _macData); \
}while(0) }while(0)
#define RTMP_ASIC_MMPS_ENABLE(_pAd) \ #define RTMP_ASIC_MMPS_ENABLE(_pAd) \
do{ \ do{ \
UINT32 _macData; \ UINT32 _macData; \
......
drivers/staging/rt2860/chlist.h
View file @ 52b81c89
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include "rtmp_type.h" #include "rtmp_type.h"
#include "rtmp_def.h" #include "rtmp_def.h"
#define ODOR 0 #define ODOR 0
#define IDOR 1 #define IDOR 1
#define BOTH 2 #define BOTH 2
...@@ -66,15 +65,14 @@ typedef struct _CH_REGION { ...@@ -66,15 +65,14 @@ typedef struct _CH_REGION {
extern CH_REGION ChRegion[]; extern CH_REGION ChRegion[];
typedef struct _CH_FREQ_MAP_{ typedef struct _CH_FREQ_MAP_ {
UINT16 channel; UINT16 channel;
UINT16 freqKHz; UINT16 freqKHz;
}CH_FREQ_MAP; } CH_FREQ_MAP;
extern CH_FREQ_MAP CH_HZ_ID_MAP[]; extern CH_FREQ_MAP CH_HZ_ID_MAP[];
extern int CH_HZ_ID_MAP_NUM; extern int CH_HZ_ID_MAP_NUM;
#define MAP_CHANNEL_ID_TO_KHZ(_ch, _khz) \ #define MAP_CHANNEL_ID_TO_KHZ(_ch, _khz) \
do{ \ do{ \
int _chIdx; \ int _chIdx; \
...@@ -105,24 +103,15 @@ extern int CH_HZ_ID_MAP_NUM; ...@@ -105,24 +103,15 @@ extern int CH_HZ_ID_MAP_NUM;
(_ch) = 1; \ (_ch) = 1; \
}while(0) }while(0)
VOID BuildChannelListEx(IN PRTMP_ADAPTER pAd);
VOID BuildChannelListEx( VOID BuildBeaconChList(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd); OUT PUCHAR pBuf, OUT PULONG pBufLen);
VOID BuildBeaconChList( VOID N_ChannelCheck(IN PRTMP_ADAPTER pAd);
IN PRTMP_ADAPTER pAd,
OUT PUCHAR pBuf,
OUT PULONG pBufLen);
VOID N_ChannelCheck( VOID N_SetCenCh(IN PRTMP_ADAPTER pAd);
IN PRTMP_ADAPTER pAd);
VOID N_SetCenCh( UINT8 GetCuntryMaxTxPwr(IN PRTMP_ADAPTER pAd, IN UINT8 channel);
IN PRTMP_ADAPTER pAd);
UINT8 GetCuntryMaxTxPwr(
IN PRTMP_ADAPTER pAd,
IN UINT8 channel);
#endif // __CHLIST_H__ #endif // __CHLIST_H__
drivers/staging/rt2860/common/action.h
View file @ 52b81c89
...@@ -39,17 +39,14 @@ ...@@ -39,17 +39,14 @@
#ifndef __ACTION_H__ #ifndef __ACTION_H__
#define __ACTION_H__ #define __ACTION_H__
typedef struct PACKED __HT_INFO_OCTET typedef struct PACKED __HT_INFO_OCTET {
{
UCHAR Request:1; UCHAR Request:1;
UCHAR Forty_MHz_Intolerant:1; UCHAR Forty_MHz_Intolerant:1;
UCHAR STA_Channel_Width:1; UCHAR STA_Channel_Width:1;
UCHAR Reserved:5; UCHAR Reserved:5;
} HT_INFORMATION_OCTET; } HT_INFORMATION_OCTET;
typedef struct PACKED __FRAME_HT_INFO {
typedef struct PACKED __FRAME_HT_INFO
{
HEADER_802_11 Hdr; HEADER_802_11 Hdr;
UCHAR Category; UCHAR Category;
UCHAR Action; UCHAR Action;
...@@ -57,5 +54,3 @@ typedef struct PACKED __FRAME_HT_INFO ...@@ -57,5 +54,3 @@ typedef struct PACKED __FRAME_HT_INFO
} FRAME_HT_INFO, *PFRAME_HT_INFO; } FRAME_HT_INFO, *PFRAME_HT_INFO;
#endif /* __ACTION_H__ */ #endif /* __ACTION_H__ */
drivers/staging/rt2860/crypt_hmac.h
View file @ 52b81c89
...@@ -48,24 +48,18 @@ ...@@ -48,24 +48,18 @@
#ifdef SHA1_SUPPORT #ifdef SHA1_SUPPORT
#define HMAC_SHA1_SUPPORT #define HMAC_SHA1_SUPPORT
VOID HMAC_SHA1 ( VOID HMAC_SHA1(IN const UINT8 Key[],
IN const UINT8 Key[],
IN UINT KeyLen, IN UINT KeyLen,
IN const UINT8 Message[], IN const UINT8 Message[],
IN UINT MessageLen, IN UINT MessageLen, OUT UINT8 MAC[], IN UINT MACLen);
OUT UINT8 MAC[],
IN UINT MACLen);
#endif /* SHA1_SUPPORT */ #endif /* SHA1_SUPPORT */
#ifdef MD5_SUPPORT #ifdef MD5_SUPPORT
#define HMAC_MD5_SUPPORT #define HMAC_MD5_SUPPORT
VOID HMAC_MD5 ( VOID HMAC_MD5(IN const UINT8 Key[],
IN const UINT8 Key[],
IN UINT KeyLen, IN UINT KeyLen,
IN const UINT8 Message[], IN const UINT8 Message[],
IN UINT MessageLen, IN UINT MessageLen, OUT UINT8 MAC[], IN UINT MACLen);
OUT UINT8 MAC[],
IN UINT MACLen);
#endif /* MD5_SUPPORT */ #endif /* MD5_SUPPORT */
#endif /* __CRYPT_HMAC_H__ */ #endif /* __CRYPT_HMAC_H__ */
drivers/staging/rt2860/crypt_md5.h
View file @ 52b81c89
...@@ -60,21 +60,13 @@ typedef struct { ...@@ -60,21 +60,13 @@ typedef struct {
UINT BlockLen; UINT BlockLen;
} MD5_CTX_STRUC, *PMD5_CTX_STRUC; } MD5_CTX_STRUC, *PMD5_CTX_STRUC;
VOID MD5_Init ( VOID MD5_Init(IN MD5_CTX_STRUC * pMD5_CTX);
IN MD5_CTX_STRUC *pMD5_CTX); VOID MD5_Hash(IN MD5_CTX_STRUC * pMD5_CTX);
VOID MD5_Hash ( VOID MD5_Append(IN MD5_CTX_STRUC * pMD5_CTX,
IN MD5_CTX_STRUC *pMD5_CTX); IN const UINT8 Message[], IN UINT MessageLen);
VOID MD5_Append ( VOID MD5_End(IN MD5_CTX_STRUC * pMD5_CTX, OUT UINT8 DigestMessage[]);
IN MD5_CTX_STRUC *pMD5_CTX, VOID RT_MD5(IN const UINT8 Message[],
IN const UINT8 Message[], IN UINT MessageLen, OUT UINT8 DigestMessage[]);
IN UINT MessageLen);
VOID MD5_End (
IN MD5_CTX_STRUC *pMD5_CTX,
OUT UINT8 DigestMessage[]);
VOID RT_MD5 (
IN const UINT8 Message[],
IN UINT MessageLen,
OUT UINT8 DigestMessage[]);
#endif /* MD5_SUPPORT */ #endif /* MD5_SUPPORT */
#endif /* __CRYPT_MD5_H__ */ #endif /* __CRYPT_MD5_H__ */
drivers/staging/rt2860/crypt_sha2.h
View file @ 52b81c89
...@@ -61,21 +61,13 @@ typedef struct _SHA1_CTX_STRUC { ...@@ -61,21 +61,13 @@ typedef struct _SHA1_CTX_STRUC {
UINT BlockLen; UINT BlockLen;
} SHA1_CTX_STRUC, *PSHA1_CTX_STRUC; } SHA1_CTX_STRUC, *PSHA1_CTX_STRUC;
VOID RT_SHA1_Init ( VOID RT_SHA1_Init(IN SHA1_CTX_STRUC * pSHA_CTX);
IN SHA1_CTX_STRUC *pSHA_CTX); VOID SHA1_Hash(IN SHA1_CTX_STRUC * pSHA_CTX);
VOID SHA1_Hash ( VOID SHA1_Append(IN SHA1_CTX_STRUC * pSHA_CTX,
IN SHA1_CTX_STRUC *pSHA_CTX); IN const UINT8 Message[], IN UINT MessageLen);
VOID SHA1_Append ( VOID SHA1_End(IN SHA1_CTX_STRUC * pSHA_CTX, OUT UINT8 DigestMessage[]);
IN SHA1_CTX_STRUC *pSHA_CTX, VOID RT_SHA1(IN const UINT8 Message[],
IN const UINT8 Message[], IN UINT MessageLen, OUT UINT8 DigestMessage[]);
IN UINT MessageLen);
VOID SHA1_End (
IN SHA1_CTX_STRUC *pSHA_CTX,
OUT UINT8 DigestMessage[]);
VOID RT_SHA1 (
IN const UINT8 Message[],
IN UINT MessageLen,
OUT UINT8 DigestMessage[]);
#endif /* SHA1_SUPPORT */ #endif /* SHA1_SUPPORT */
#endif /* __CRYPT_SHA2_H__ */ #endif /* __CRYPT_SHA2_H__ */
drivers/staging/rt2860/dfs.h
View file @ 52b81c89
...@@ -36,6 +36,4 @@ ...@@ -36,6 +36,4 @@
Fonchi 03-12-2007 created Fonchi 03-12-2007 created
*/ */
BOOLEAN RadarChannelCheck( BOOLEAN RadarChannelCheck(IN PRTMP_ADAPTER pAd, IN UCHAR Ch);
IN PRTMP_ADAPTER pAd,
IN UCHAR Ch);
drivers/staging/rt2860/eeprom.h
View file @ 52b81c89
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
* * * *
************************************************************************* *************************************************************************
Module Name: Module Name:
eeprom.h eeprom.h
...@@ -38,41 +37,31 @@ ...@@ -38,41 +37,31 @@
#ifndef __EEPROM_H__ #ifndef __EEPROM_H__
#define __EEPROM_H__ #define __EEPROM_H__
#ifdef RTMP_PCI_SUPPORT #ifdef RTMP_PCI_SUPPORT
/************************************************************************* /*************************************************************************
* Public function declarations for prom-based chipset * Public function declarations for prom-based chipset
************************************************************************/ ************************************************************************/
int rtmp_ee_prom_read16( int rtmp_ee_prom_read16(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN USHORT Offset, OUT USHORT * pValue);
IN USHORT Offset,
OUT USHORT *pValue);
#endif // RTMP_PCI_SUPPORT // #endif // RTMP_PCI_SUPPORT //
#ifdef RTMP_USB_SUPPORT #ifdef RTMP_USB_SUPPORT
/************************************************************************* /*************************************************************************
* Public function declarations for usb-based prom chipset * Public function declarations for usb-based prom chipset
************************************************************************/ ************************************************************************/
NTSTATUS RTUSBReadEEPROM16( NTSTATUS RTUSBReadEEPROM16(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN USHORT offset, OUT PUSHORT pData);
IN USHORT offset,
OUT PUSHORT pData);
#endif // RTMP_USB_SUPPORT // #endif // RTMP_USB_SUPPORT //
#ifdef RT30xx #ifdef RT30xx
#ifdef RTMP_EFUSE_SUPPORT #ifdef RTMP_EFUSE_SUPPORT
int rtmp_ee_efuse_read16( int rtmp_ee_efuse_read16(IN RTMP_ADAPTER * pAd,
IN RTMP_ADAPTER *pAd, IN USHORT Offset, OUT USHORT * pValue);
IN USHORT Offset,
OUT USHORT *pValue);
#endif // RTMP_EFUSE_SUPPORT // #endif // RTMP_EFUSE_SUPPORT //
#endif // RT30xx // #endif // RT30xx //
/************************************************************************* /*************************************************************************
* Public function declarations for prom operation callback functions setting * Public function declarations for prom operation callback functions setting
************************************************************************/ ************************************************************************/
INT RtmpChipOpsEepromHook( INT RtmpChipOpsEepromHook(IN RTMP_ADAPTER * pAd, IN INT infType);
IN RTMP_ADAPTER *pAd,
IN INT infType);
#endif // __EEPROM_H__ // #endif // __EEPROM_H__ //
drivers/staging/rt2860/iface/rtmp_pci.h
View file @ 52b81c89
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#define RT28XX_HANDLE_DEV_ASSIGN(handle, dev_p) \ #define RT28XX_HANDLE_DEV_ASSIGN(handle, dev_p) \
((POS_COOKIE)handle)->pci_dev = dev_p; ((POS_COOKIE)handle)->pci_dev = dev_p;
#ifdef LINUX #ifdef LINUX
// set driver data // set driver data
#define RT28XX_DRVDATA_SET(_a) pci_set_drvdata(_a, net_dev); #define RT28XX_DRVDATA_SET(_a) pci_set_drvdata(_a, net_dev);
...@@ -64,7 +63,6 @@ ...@@ -64,7 +63,6 @@
pci_resource_len(dev_p, 0)); } \ pci_resource_len(dev_p, 0)); } \
if (net_dev->irq) pci_release_regions(dev_p); } if (net_dev->irq) pci_release_regions(dev_p); }
#define PCI_REG_READ_WORD(pci_dev, offset, Configuration) \ #define PCI_REG_READ_WORD(pci_dev, offset, Configuration) \
if (pci_read_config_word(pci_dev, offset, &reg16) == 0) \ if (pci_read_config_word(pci_dev, offset, &reg16) == 0) \
Configuration = le2cpu16(reg16); \ Configuration = le2cpu16(reg16); \
...@@ -77,5 +75,4 @@ ...@@ -77,5 +75,4 @@
#endif // LINUX // #endif // LINUX //
#endif // __RTMP_PCI_H__ // #endif // __RTMP_PCI_H__ //
drivers/staging/rt2860/iface/rtmp_usb.h
View file @ 52b81c89
...@@ -28,28 +28,24 @@ ...@@ -28,28 +28,24 @@
#ifndef __RTMP_USB_H__ #ifndef __RTMP_USB_H__
#define __RTMP_USB_H__ #define __RTMP_USB_H__
#include "../rtusb_io.h" #include "../rtusb_io.h"
#ifdef LINUX #ifdef LINUX
#include <linux/usb.h> #include <linux/usb.h>
typedef struct usb_device * PUSB_DEV; typedef struct usb_device *PUSB_DEV;
typedef struct urb *purbb_t; typedef struct urb *purbb_t;
typedef struct usb_ctrlrequest devctrlrequest; typedef struct usb_ctrlrequest devctrlrequest;
#endif // LINUX // #endif // LINUX //
extern UCHAR EpToQueue[6]; extern UCHAR EpToQueue[6];
#define RXBULKAGGRE_ZISE 12 #define RXBULKAGGRE_ZISE 12
#define MAX_TXBULK_LIMIT (LOCAL_TXBUF_SIZE*(BULKAGGRE_ZISE-1)) #define MAX_TXBULK_LIMIT (LOCAL_TXBUF_SIZE*(BULKAGGRE_ZISE-1))
#define MAX_TXBULK_SIZE (LOCAL_TXBUF_SIZE*BULKAGGRE_ZISE) #define MAX_TXBULK_SIZE (LOCAL_TXBUF_SIZE*BULKAGGRE_ZISE)
#define MAX_RXBULK_SIZE (LOCAL_TXBUF_SIZE*RXBULKAGGRE_ZISE) #define MAX_RXBULK_SIZE (LOCAL_TXBUF_SIZE*RXBULKAGGRE_ZISE)
#define MAX_MLME_HANDLER_MEMORY 20 #define MAX_MLME_HANDLER_MEMORY 20
// Flags for Bulkflags control for bulk out data // Flags for Bulkflags control for bulk out data
// //
#define fRTUSB_BULK_OUT_DATA_NULL 0x00000001 #define fRTUSB_BULK_OUT_DATA_NULL 0x00000001
...@@ -69,7 +65,6 @@ extern UCHAR EpToQueue[6]; ...@@ -69,7 +65,6 @@ extern UCHAR EpToQueue[6];
// TODO:move to ./ate/include/iface/ate_usb.h // TODO:move to ./ate/include/iface/ate_usb.h
#define FREE_HTTX_RING(_pCookie, _pipeId, _txContext) \ #define FREE_HTTX_RING(_pCookie, _pipeId, _txContext) \
{ \ { \
if ((_txContext)->ENextBulkOutPosition == (_txContext)->CurWritePosition) \ if ((_txContext)->ENextBulkOutPosition == (_txContext)->CurWritePosition) \
...@@ -79,8 +74,6 @@ extern UCHAR EpToQueue[6]; ...@@ -79,8 +74,6 @@ extern UCHAR EpToQueue[6];
/*NdisInterlockedDecrement(&(_p)->TxCount); */\ /*NdisInterlockedDecrement(&(_p)->TxCount); */\
} }
/****************************************************************************** /******************************************************************************
USB Bulk operation related definitions USB Bulk operation related definitions
...@@ -100,7 +93,7 @@ extern UCHAR EpToQueue[6]; ...@@ -100,7 +93,7 @@ extern UCHAR EpToQueue[6];
// unlink urb // unlink urb
#define RTUSB_UNLINK_URB(pUrb) usb_kill_urb(pUrb) #define RTUSB_UNLINK_URB(pUrb) usb_kill_urb(pUrb)
extern void dump_urb(struct urb* purb); extern void dump_urb(struct urb *purb);
#define InterlockedIncrement atomic_inc #define InterlockedIncrement atomic_inc
#define NdisInterlockedIncrement atomic_inc #define NdisInterlockedIncrement atomic_inc
...@@ -110,12 +103,8 @@ extern void dump_urb(struct urb* purb); ...@@ -110,12 +103,8 @@ extern void dump_urb(struct urb* purb);
#endif // LINUX // #endif // LINUX //
#define NT_SUCCESS(status) (((status) >=0) ? (TRUE):(FALSE)) #define NT_SUCCESS(status) (((status) >=0) ? (TRUE):(FALSE))
#define USBD_TRANSFER_DIRECTION_OUT 0 #define USBD_TRANSFER_DIRECTION_OUT 0
#define USBD_TRANSFER_DIRECTION_IN 0 #define USBD_TRANSFER_DIRECTION_IN 0
#define USBD_SHORT_TRANSFER_OK 0 #define USBD_SHORT_TRANSFER_OK 0
...@@ -131,7 +120,6 @@ extern void dump_urb(struct urb* purb); ...@@ -131,7 +120,6 @@ extern void dump_urb(struct urb* purb);
#define CONTROL_TIMEOUT_JIFFIES ( (100 * OS_HZ) / 1000) #define CONTROL_TIMEOUT_JIFFIES ( (100 * OS_HZ) / 1000)
#define UNLINK_TIMEOUT_MS 3 #define UNLINK_TIMEOUT_MS 3
VOID RTUSBBulkOutDataPacketComplete(purbb_t purb, struct pt_regs *pt_regs); VOID RTUSBBulkOutDataPacketComplete(purbb_t purb, struct pt_regs *pt_regs);
VOID RTUSBBulkOutMLMEPacketComplete(purbb_t pUrb, struct pt_regs *pt_regs); VOID RTUSBBulkOutMLMEPacketComplete(purbb_t pUrb, struct pt_regs *pt_regs);
VOID RTUSBBulkOutNullFrameComplete(purbb_t pUrb, struct pt_regs *pt_regs); VOID RTUSBBulkOutNullFrameComplete(purbb_t pUrb, struct pt_regs *pt_regs);
...@@ -139,7 +127,6 @@ VOID RTUSBBulkOutRTSFrameComplete(purbb_t pUrb, struct pt_regs *pt_regs); ...@@ -139,7 +127,6 @@ VOID RTUSBBulkOutRTSFrameComplete(purbb_t pUrb, struct pt_regs *pt_regs);
VOID RTUSBBulkOutPsPollComplete(purbb_t pUrb, struct pt_regs *pt_regs); VOID RTUSBBulkOutPsPollComplete(purbb_t pUrb, struct pt_regs *pt_regs);
VOID RTUSBBulkRxComplete(purbb_t pUrb, struct pt_regs *pt_regs); VOID RTUSBBulkRxComplete(purbb_t pUrb, struct pt_regs *pt_regs);
#ifdef KTHREAD_SUPPORT #ifdef KTHREAD_SUPPORT
#define RTUSBMlmeUp(pAd) \ #define RTUSBMlmeUp(pAd) \
do{ \ do{ \
...@@ -196,5 +183,4 @@ VOID RTUSBBulkRxComplete(purbb_t pUrb, struct pt_regs *pt_regs); ...@@ -196,5 +183,4 @@ VOID RTUSBBulkRxComplete(purbb_t pUrb, struct pt_regs *pt_regs);
#define RTMP_IRQ_REQUEST(net_dev) do{}while(0) #define RTMP_IRQ_REQUEST(net_dev) do{}while(0)
#define RTMP_IRQ_RELEASE(net_dev) do{}while(0) #define RTMP_IRQ_RELEASE(net_dev) do{}while(0)
#endif // __RTMP_USB_H__ // #endif // __RTMP_USB_H__ //
drivers/staging/rt2860/mlme.h
View file @ 52b81c89
...@@ -41,8 +41,6 @@ ...@@ -41,8 +41,6 @@
#include "rtmp_dot11.h" #include "rtmp_dot11.h"
// maximum supported capability information - // maximum supported capability information -
// ESS, IBSS, Privacy, Short Preamble, Spectrum mgmt, Short Slot // ESS, IBSS, Privacy, Short Preamble, Spectrum mgmt, Short Slot
#define SUPPORTED_CAPABILITY_INFO 0x0533 #define SUPPORTED_CAPABILITY_INFO 0x0533
...@@ -76,10 +74,8 @@ ...@@ -76,10 +74,8 @@
#define LINK_DOWN_TIMEOUT 20000 // unit: msec #define LINK_DOWN_TIMEOUT 20000 // unit: msec
#define AUTO_WAKEUP_TIMEOUT 70 //unit: msec #define AUTO_WAKEUP_TIMEOUT 70 //unit: msec
#define CW_MAX_IN_BITS 10 // actual CwMax = 2^CW_MAX_IN_BITS - 1 #define CW_MAX_IN_BITS 10 // actual CwMax = 2^CW_MAX_IN_BITS - 1
// Note: RSSI_TO_DBM_OFFSET has been changed to variable for new RF (2004-0720). // Note: RSSI_TO_DBM_OFFSET has been changed to variable for new RF (2004-0720).
// SHould not refer to this constant anymore // SHould not refer to this constant anymore
//#define RSSI_TO_DBM_OFFSET 120 // for RT2530 RSSI-115 = dBm //#define RSSI_TO_DBM_OFFSET 120 // for RT2530 RSSI-115 = dBm
...@@ -155,7 +151,7 @@ ...@@ -155,7 +151,7 @@
#define ERP_IS_USE_PROTECTION(x) (((x) & 0x02) != 0) // 802.11g #define ERP_IS_USE_PROTECTION(x) (((x) & 0x02) != 0) // 802.11g
#define ERP_IS_USE_BARKER_PREAMBLE(x) (((x) & 0x04) != 0) // 802.11g #define ERP_IS_USE_BARKER_PREAMBLE(x) (((x) & 0x04) != 0) // 802.11g
#define DRS_TX_QUALITY_WORST_BOUND 8// 3 // just test by gary #define DRS_TX_QUALITY_WORST_BOUND 8 // 3 // just test by gary
#define DRS_PENALTY 8 #define DRS_PENALTY 8
#define BA_NOTUSE 2 #define BA_NOTUSE 2
...@@ -194,7 +190,7 @@ if (((__pEntry)) != NULL) \ ...@@ -194,7 +190,7 @@ if (((__pEntry)) != NULL) \
typedef struct PACKED { typedef struct PACKED {
USHORT AdvCoding:1; USHORT AdvCoding:1;
USHORT ChannelWidth:1; USHORT ChannelWidth:1;
USHORT MimoPs:2;//momi power safe USHORT MimoPs:2; //momi power safe
USHORT GF:1; //green field USHORT GF:1; //green field
USHORT ShortGIfor20:1; USHORT ShortGIfor20:1;
USHORT ShortGIfor40:1; //for40MHz USHORT ShortGIfor40:1; //for40MHz
...@@ -212,7 +208,7 @@ typedef struct PACKED { ...@@ -212,7 +208,7 @@ typedef struct PACKED {
typedef struct PACKED { typedef struct PACKED {
UCHAR MaxRAmpduFactor:2; UCHAR MaxRAmpduFactor:2;
UCHAR MpduDensity:3; UCHAR MpduDensity:3;
UCHAR rsv:3;//momi power safe UCHAR rsv:3; //momi power safe
} HT_CAP_PARM, *PHT_CAP_PARM; } HT_CAP_PARM, *PHT_CAP_PARM;
// HT Capability INFO field in HT Cap IE . // HT Capability INFO field in HT Cap IE .
...@@ -231,7 +227,7 @@ typedef struct PACKED { ...@@ -231,7 +227,7 @@ typedef struct PACKED {
typedef struct PACKED { typedef struct PACKED {
USHORT Pco:1; USHORT Pco:1;
USHORT TranTime:2; USHORT TranTime:2;
USHORT rsv:5;//momi power safe USHORT rsv:5; //momi power safe
USHORT MCSFeedback:2; //0:no MCS feedback, 2:unsolicited MCS feedback, 3:Full MCS feedback, 1:rsv. USHORT MCSFeedback:2; //0:no MCS feedback, 2:unsolicited MCS feedback, 3:Full MCS feedback, 1:rsv.
USHORT PlusHTC:1; //+HTC control field support USHORT PlusHTC:1; //+HTC control field support
USHORT RDGSupport:1; //reverse Direction Grant support USHORT RDGSupport:1; //reverse Direction Grant support
...@@ -239,7 +235,7 @@ typedef struct PACKED { ...@@ -239,7 +235,7 @@ typedef struct PACKED {
} EXT_HT_CAP_INFO, *PEXT_HT_CAP_INFO; } EXT_HT_CAP_INFO, *PEXT_HT_CAP_INFO;
// HT Beamforming field in HT Cap IE . // HT Beamforming field in HT Cap IE .
typedef struct PACKED _HT_BF_CAP{ typedef struct PACKED _HT_BF_CAP {
ULONG TxBFRecCapable:1; ULONG TxBFRecCapable:1;
ULONG RxSoundCapable:1; ULONG RxSoundCapable:1;
ULONG TxSoundCapable:1; ULONG TxSoundCapable:1;
...@@ -263,7 +259,7 @@ typedef struct PACKED _HT_BF_CAP{ ...@@ -263,7 +259,7 @@ typedef struct PACKED _HT_BF_CAP{
} HT_BF_CAP, *PHT_BF_CAP; } HT_BF_CAP, *PHT_BF_CAP;
// HT antenna selection field in HT Cap IE . // HT antenna selection field in HT Cap IE .
typedef struct PACKED _HT_AS_CAP{ typedef struct PACKED _HT_AS_CAP {
UCHAR AntSelect:1; UCHAR AntSelect:1;
UCHAR ExpCSIFbkTxASEL:1; UCHAR ExpCSIFbkTxASEL:1;
UCHAR AntIndFbkTxASEL:1; UCHAR AntIndFbkTxASEL:1;
...@@ -277,7 +273,7 @@ typedef struct PACKED _HT_AS_CAP{ ...@@ -277,7 +273,7 @@ typedef struct PACKED _HT_AS_CAP{
// Draft 1.0 set IE length 26, but is extensible.. // Draft 1.0 set IE length 26, but is extensible..
#define SIZE_HT_CAP_IE 26 #define SIZE_HT_CAP_IE 26
// The structure for HT Capability IE. // The structure for HT Capability IE.
typedef struct PACKED _HT_CAPABILITY_IE{ typedef struct PACKED _HT_CAPABILITY_IE {
HT_CAP_INFO HtCapInfo; HT_CAP_INFO HtCapInfo;
HT_CAP_PARM HtCapParm; HT_CAP_PARM HtCapParm;
// HT_MCS_SET HtMCSSet; // HT_MCS_SET HtMCSSet;
...@@ -287,7 +283,6 @@ typedef struct PACKED _HT_CAPABILITY_IE{ ...@@ -287,7 +283,6 @@ typedef struct PACKED _HT_CAPABILITY_IE{
HT_AS_CAP ASCap; //antenna selection. HT_AS_CAP ASCap; //antenna selection.
} HT_CAPABILITY_IE, *PHT_CAPABILITY_IE; } HT_CAPABILITY_IE, *PHT_CAPABILITY_IE;
// 802.11n draft3 related structure definitions. // 802.11n draft3 related structure definitions.
// 7.3.2.60 // 7.3.2.60
#define dot11OBSSScanPassiveDwell 20 // in TU. min amount of time that the STA continously scans each channel when performing an active OBSS scan. #define dot11OBSSScanPassiveDwell 20 // in TU. min amount of time that the STA continously scans each channel when performing an active OBSS scan.
...@@ -301,7 +296,7 @@ typedef struct PACKED _HT_CAPABILITY_IE{ ...@@ -301,7 +296,7 @@ typedef struct PACKED _HT_CAPABILITY_IE{
// (dot11BSSWidthChannelTransactionDelayFactor * dot11BSSWidthTriggerScanInterval) seconds without // (dot11BSSWidthChannelTransactionDelayFactor * dot11BSSWidthTriggerScanInterval) seconds without
// being obligated to perform OBSS Scan operations. default is 25(== 0.25%) // being obligated to perform OBSS Scan operations. default is 25(== 0.25%)
typedef struct PACKED _OVERLAP_BSS_SCAN_IE{ typedef struct PACKED _OVERLAP_BSS_SCAN_IE {
USHORT ScanPassiveDwell; USHORT ScanPassiveDwell;
USHORT ScanActiveDwell; USHORT ScanActiveDwell;
USHORT TriggerScanInt; // Trigger scan interval USHORT TriggerScanInt; // Trigger scan interval
...@@ -309,11 +304,10 @@ typedef struct PACKED _OVERLAP_BSS_SCAN_IE{ ...@@ -309,11 +304,10 @@ typedef struct PACKED _OVERLAP_BSS_SCAN_IE{
USHORT ActiveTalPerChannel; // active total per channel USHORT ActiveTalPerChannel; // active total per channel
USHORT DelayFactor; // BSS width channel transition delay factor USHORT DelayFactor; // BSS width channel transition delay factor
USHORT ScanActThre; // Scan Activity threshold USHORT ScanActThre; // Scan Activity threshold
}OVERLAP_BSS_SCAN_IE, *POVERLAP_BSS_SCAN_IE; } OVERLAP_BSS_SCAN_IE, *POVERLAP_BSS_SCAN_IE;
// 7.3.2.56. 20/40 Coexistence element used in Element ID = 72 = IE_2040_BSS_COEXIST // 7.3.2.56. 20/40 Coexistence element used in Element ID = 72 = IE_2040_BSS_COEXIST
typedef union PACKED _BSS_2040_COEXIST_IE{ typedef union PACKED _BSS_2040_COEXIST_IE {
struct PACKED { struct PACKED {
UCHAR InfoReq:1; UCHAR InfoReq:1;
UCHAR Intolerant40:1; // Inter-BSS. set 1 when prohibits a receiving BSS from operating as a 20/40 Mhz BSS. UCHAR Intolerant40:1; // Inter-BSS. set 1 when prohibits a receiving BSS from operating as a 20/40 Mhz BSS.
...@@ -323,8 +317,7 @@ typedef union PACKED _BSS_2040_COEXIST_IE{ ...@@ -323,8 +317,7 @@ typedef union PACKED _BSS_2040_COEXIST_IE{
UCHAR word; UCHAR word;
} BSS_2040_COEXIST_IE, *PBSS_2040_COEXIST_IE; } BSS_2040_COEXIST_IE, *PBSS_2040_COEXIST_IE;
typedef struct _TRIGGER_EVENTA {
typedef struct _TRIGGER_EVENTA{
BOOLEAN bValid; BOOLEAN bValid;
UCHAR BSSID[6]; UCHAR BSSID[6];
UCHAR RegClass; // Regulatory Class UCHAR RegClass; // Regulatory Class
...@@ -335,7 +328,7 @@ typedef struct _TRIGGER_EVENTA{ ...@@ -335,7 +328,7 @@ typedef struct _TRIGGER_EVENTA{
// 20/40 trigger event table // 20/40 trigger event table
// If one Event A delete or created, or if Event B is detected or not detected, STA should send 2040BSSCoexistence to AP. // If one Event A delete or created, or if Event B is detected or not detected, STA should send 2040BSSCoexistence to AP.
#define MAX_TRIGGER_EVENT 64 #define MAX_TRIGGER_EVENT 64
typedef struct _TRIGGER_EVENT_TAB{ typedef struct _TRIGGER_EVENT_TAB {
UCHAR EventANo; UCHAR EventANo;
TRIGGER_EVENTA EventA[MAX_TRIGGER_EVENT]; TRIGGER_EVENTA EventA[MAX_TRIGGER_EVENT];
ULONG EventBCountDown; // Count down counter for Event B. ULONG EventBCountDown; // Count down counter for Event B.
...@@ -343,45 +336,40 @@ typedef struct _TRIGGER_EVENT_TAB{ ...@@ -343,45 +336,40 @@ typedef struct _TRIGGER_EVENT_TAB{
// 7.3.27 20/40 Bss Coexistence Mgmt capability used in extended capabilities information IE( ID = 127 = IE_EXT_CAPABILITY). // 7.3.27 20/40 Bss Coexistence Mgmt capability used in extended capabilities information IE( ID = 127 = IE_EXT_CAPABILITY).
// This is the first octet and was defined in 802.11n D3.03 and 802.11yD9.0 // This is the first octet and was defined in 802.11n D3.03 and 802.11yD9.0
typedef struct PACKED _EXT_CAP_INFO_ELEMENT{ typedef struct PACKED _EXT_CAP_INFO_ELEMENT {
UCHAR BssCoexistMgmtSupport:1; UCHAR BssCoexistMgmtSupport:1;
UCHAR rsv:1; UCHAR rsv:1;
UCHAR ExtendChannelSwitch:1; UCHAR ExtendChannelSwitch:1;
UCHAR rsv2:5; UCHAR rsv2:5;
}EXT_CAP_INFO_ELEMENT, *PEXT_CAP_INFO_ELEMENT; } EXT_CAP_INFO_ELEMENT, *PEXT_CAP_INFO_ELEMENT;
// 802.11n 7.3.2.61 // 802.11n 7.3.2.61
typedef struct PACKED _BSS_2040_COEXIST_ELEMENT{ typedef struct PACKED _BSS_2040_COEXIST_ELEMENT {
UCHAR ElementID; // ID = IE_2040_BSS_COEXIST = 72 UCHAR ElementID; // ID = IE_2040_BSS_COEXIST = 72
UCHAR Len; UCHAR Len;
BSS_2040_COEXIST_IE BssCoexistIe; BSS_2040_COEXIST_IE BssCoexistIe;
}BSS_2040_COEXIST_ELEMENT, *PBSS_2040_COEXIST_ELEMENT; } BSS_2040_COEXIST_ELEMENT, *PBSS_2040_COEXIST_ELEMENT;
//802.11n 7.3.2.59 //802.11n 7.3.2.59
typedef struct PACKED _BSS_2040_INTOLERANT_CH_REPORT{ typedef struct PACKED _BSS_2040_INTOLERANT_CH_REPORT {
UCHAR ElementID; // ID = IE_2040_BSS_INTOLERANT_REPORT = 73 UCHAR ElementID; // ID = IE_2040_BSS_INTOLERANT_REPORT = 73
UCHAR Len; UCHAR Len;
UCHAR RegulatoryClass; UCHAR RegulatoryClass;
UCHAR ChList[0]; UCHAR ChList[0];
}BSS_2040_INTOLERANT_CH_REPORT, *PBSS_2040_INTOLERANT_CH_REPORT; } BSS_2040_INTOLERANT_CH_REPORT, *PBSS_2040_INTOLERANT_CH_REPORT;
// The structure for channel switch annoucement IE. This is in 802.11n D3.03 // The structure for channel switch annoucement IE. This is in 802.11n D3.03
typedef struct PACKED _CHA_SWITCH_ANNOUNCE_IE{ typedef struct PACKED _CHA_SWITCH_ANNOUNCE_IE {
UCHAR SwitchMode; //channel switch mode UCHAR SwitchMode; //channel switch mode
UCHAR NewChannel; // UCHAR NewChannel; //
UCHAR SwitchCount; // UCHAR SwitchCount; //
} CHA_SWITCH_ANNOUNCE_IE, *PCHA_SWITCH_ANNOUNCE_IE; } CHA_SWITCH_ANNOUNCE_IE, *PCHA_SWITCH_ANNOUNCE_IE;
// The structure for channel switch annoucement IE. This is in 802.11n D3.03 // The structure for channel switch annoucement IE. This is in 802.11n D3.03
typedef struct PACKED _SEC_CHA_OFFSET_IE{ typedef struct PACKED _SEC_CHA_OFFSET_IE {
UCHAR SecondaryChannelOffset; // 1: Secondary above, 3: Secondary below, 0: no Secondary UCHAR SecondaryChannelOffset; // 1: Secondary above, 3: Secondary below, 0: no Secondary
} SEC_CHA_OFFSET_IE, *PSEC_CHA_OFFSET_IE; } SEC_CHA_OFFSET_IE, *PSEC_CHA_OFFSET_IE;
// This structure is extracted from struct RT_HT_CAPABILITY // This structure is extracted from struct RT_HT_CAPABILITY
typedef struct { typedef struct {
BOOLEAN bHtEnable; // If we should use ht rate. BOOLEAN bHtEnable; // If we should use ht rate.
...@@ -394,7 +382,7 @@ typedef struct { ...@@ -394,7 +382,7 @@ typedef struct {
//Features not listed here but contained in 802.11n spec are not supported in rt2860. //Features not listed here but contained in 802.11n spec are not supported in rt2860.
typedef struct { typedef struct {
USHORT ChannelWidth:1; USHORT ChannelWidth:1;
USHORT MimoPs:2;//mimo power safe MMPS_ USHORT MimoPs:2; //mimo power safe MMPS_
USHORT GF:1; //green field USHORT GF:1; //green field
USHORT ShortGIfor20:1; USHORT ShortGIfor20:1;
USHORT ShortGIfor40:1; //for40MHz USHORT ShortGIfor40:1; //for40MHz
...@@ -431,7 +419,7 @@ typedef struct PACKED { ...@@ -431,7 +419,7 @@ typedef struct PACKED {
UCHAR SerInterGranu:3; //service interval granularity UCHAR SerInterGranu:3; //service interval granularity
} ADD_HTINFO, *PADD_HTINFO; } ADD_HTINFO, *PADD_HTINFO;
typedef struct PACKED{ typedef struct PACKED {
USHORT OperaionMode:2; USHORT OperaionMode:2;
USHORT NonGfPresent:1; USHORT NonGfPresent:1;
USHORT rsv:1; USHORT rsv:1;
...@@ -439,9 +427,8 @@ typedef struct PACKED{ ...@@ -439,9 +427,8 @@ typedef struct PACKED{
USHORT rsv2:11; USHORT rsv2:11;
} ADD_HTINFO2, *PADD_HTINFO2; } ADD_HTINFO2, *PADD_HTINFO2;
// TODO: Need sync with spec about the definition of StbcMcs. In Draft 3.03, it's reserved. // TODO: Need sync with spec about the definition of StbcMcs. In Draft 3.03, it's reserved.
typedef struct PACKED{ typedef struct PACKED {
USHORT StbcMcs:6; USHORT StbcMcs:6;
USHORT DualBeacon:1; USHORT DualBeacon:1;
USHORT DualCTSProtect:1; USHORT DualCTSProtect:1;
...@@ -453,7 +440,7 @@ typedef struct PACKED{ ...@@ -453,7 +440,7 @@ typedef struct PACKED{
} ADD_HTINFO3, *PADD_HTINFO3; } ADD_HTINFO3, *PADD_HTINFO3;
#define SIZE_ADD_HT_INFO_IE 22 #define SIZE_ADD_HT_INFO_IE 22
typedef struct PACKED{ typedef struct PACKED {
UCHAR ControlChan; UCHAR ControlChan;
ADD_HTINFO AddHtInfo; ADD_HTINFO AddHtInfo;
ADD_HTINFO2 AddHtInfo2; ADD_HTINFO2 AddHtInfo2;
...@@ -461,7 +448,7 @@ typedef struct PACKED{ ...@@ -461,7 +448,7 @@ typedef struct PACKED{
UCHAR MCSSet[16]; // Basic MCS set UCHAR MCSSet[16]; // Basic MCS set
} ADD_HT_INFO_IE, *PADD_HT_INFO_IE; } ADD_HT_INFO_IE, *PADD_HT_INFO_IE;
typedef struct PACKED{ typedef struct PACKED {
UCHAR NewExtChanOffset; UCHAR NewExtChanOffset;
} NEW_EXT_CHAN_IE, *PNEW_EXT_CHAN_IE; } NEW_EXT_CHAN_IE, *PNEW_EXT_CHAN_IE;
...@@ -484,7 +471,7 @@ typedef struct PACKED _HEADER_802_3 { ...@@ -484,7 +471,7 @@ typedef struct PACKED _HEADER_802_3 {
} HEADER_802_3, *PHEADER_802_3; } HEADER_802_3, *PHEADER_802_3;
////Block ACK related format ////Block ACK related format
// 2-byte BA Parameter field in DELBA frames to terminate an already set up bA // 2-byte BA Parameter field in DELBA frames to terminate an already set up bA
typedef struct PACKED{ typedef struct PACKED {
USHORT Rsv:11; // always set to 0 USHORT Rsv:11; // always set to 0
USHORT Initiator:1; // 1: originator 0:recipient USHORT Initiator:1; // 1: originator 0:recipient
USHORT TID:4; // value of TC os TS USHORT TID:4; // value of TC os TS
...@@ -545,7 +532,6 @@ typedef struct { ...@@ -545,7 +532,6 @@ typedef struct {
BASEQ_CONTROL BAStartingSeq; BASEQ_CONTROL BAStartingSeq;
} EACH_TID, *PEACH_TID; } EACH_TID, *PEACH_TID;
// BAREQ AND MTBAREQ have the same subtype BAR, 802.11n BAR use compressed bitmap. // BAREQ AND MTBAREQ have the same subtype BAR, 802.11n BAR use compressed bitmap.
typedef struct PACKED _FRAME_BA_REQ { typedef struct PACKED _FRAME_BA_REQ {
FRAME_CONTROL FC; FRAME_CONTROL FC;
...@@ -598,7 +584,6 @@ typedef struct PACKED _CHAN_SWITCH_ANNOUNCE { ...@@ -598,7 +584,6 @@ typedef struct PACKED _CHAN_SWITCH_ANNOUNCE {
CHA_SWITCH_ANNOUNCE_IE CSAnnounceIe; CHA_SWITCH_ANNOUNCE_IE CSAnnounceIe;
} CHAN_SWITCH_ANNOUNCE, *PCHAN_SWITCH_ANNOUNCE; } CHAN_SWITCH_ANNOUNCE, *PCHAN_SWITCH_ANNOUNCE;
//802.11n : 7.3.2.20a //802.11n : 7.3.2.20a
typedef struct PACKED _SECOND_CHAN_OFFSET { typedef struct PACKED _SECOND_CHAN_OFFSET {
UCHAR ElementID; // ID = IE_SECONDARY_CH_OFFSET = 62 UCHAR ElementID; // ID = IE_SECONDARY_CH_OFFSET = 62
...@@ -606,7 +591,6 @@ typedef struct PACKED _SECOND_CHAN_OFFSET { ...@@ -606,7 +591,6 @@ typedef struct PACKED _SECOND_CHAN_OFFSET {
SEC_CHA_OFFSET_IE SecChOffsetIe; SEC_CHA_OFFSET_IE SecChOffsetIe;
} SECOND_CHAN_OFFSET, *PSECOND_CHAN_OFFSET; } SECOND_CHAN_OFFSET, *PSECOND_CHAN_OFFSET;
typedef struct PACKED _FRAME_SPETRUM_CS { typedef struct PACKED _FRAME_SPETRUM_CS {
HEADER_802_11 Hdr; HEADER_802_11 Hdr;
UCHAR Category; UCHAR Category;
...@@ -615,7 +599,6 @@ typedef struct PACKED _FRAME_SPETRUM_CS { ...@@ -615,7 +599,6 @@ typedef struct PACKED _FRAME_SPETRUM_CS {
SECOND_CHAN_OFFSET SecondChannel; SECOND_CHAN_OFFSET SecondChannel;
} FRAME_SPETRUM_CS, *PFRAME_SPETRUM_CS; } FRAME_SPETRUM_CS, *PFRAME_SPETRUM_CS;
typedef struct PACKED _FRAME_ADDBA_REQ { typedef struct PACKED _FRAME_ADDBA_REQ {
HEADER_802_11 Hdr; HEADER_802_11 Hdr;
UCHAR Category; UCHAR Category;
...@@ -644,7 +627,6 @@ typedef struct PACKED _FRAME_DELBA_REQ { ...@@ -644,7 +627,6 @@ typedef struct PACKED _FRAME_DELBA_REQ {
USHORT ReasonCode; USHORT ReasonCode;
} FRAME_DELBA_REQ, *PFRAME_DELBA_REQ; } FRAME_DELBA_REQ, *PFRAME_DELBA_REQ;
//7.2.1.7 //7.2.1.7
typedef struct PACKED _FRAME_BAR { typedef struct PACKED _FRAME_BAR {
FRAME_CONTROL FC; FRAME_CONTROL FC;
...@@ -666,7 +648,6 @@ typedef struct PACKED _FRAME_BA { ...@@ -666,7 +648,6 @@ typedef struct PACKED _FRAME_BA {
UCHAR bitmask[8]; UCHAR bitmask[8];
} FRAME_BA, *PFRAME_BA; } FRAME_BA, *PFRAME_BA;
// Radio Measuement Request Frame Format // Radio Measuement Request Frame Format
typedef struct PACKED _FRAME_RM_REQ_ACTION { typedef struct PACKED _FRAME_RM_REQ_ACTION {
HEADER_802_11 Hdr; HEADER_802_11 Hdr;
...@@ -684,8 +665,8 @@ typedef struct PACKED { ...@@ -684,8 +665,8 @@ typedef struct PACKED {
UCHAR NewRegClass; UCHAR NewRegClass;
UCHAR NewChannelNum; UCHAR NewChannelNum;
UCHAR ChannelSwitchCount; UCHAR ChannelSwitchCount;
} HT_EXT_CHANNEL_SWITCH_ANNOUNCEMENT_IE, *PHT_EXT_CHANNEL_SWITCH_ANNOUNCEMENT_IE; } HT_EXT_CHANNEL_SWITCH_ANNOUNCEMENT_IE,
*PHT_EXT_CHANNEL_SWITCH_ANNOUNCEMENT_IE;
// //
// _Limit must be the 2**n - 1 // _Limit must be the 2**n - 1
...@@ -843,7 +824,6 @@ typedef struct { ...@@ -843,7 +824,6 @@ typedef struct {
BSS_ENTRY BssEntry[MAX_LEN_OF_BSS_TABLE]; BSS_ENTRY BssEntry[MAX_LEN_OF_BSS_TABLE];
} BSS_TABLE, *PBSS_TABLE; } BSS_TABLE, *PBSS_TABLE;
typedef struct _MLME_QUEUE_ELEM { typedef struct _MLME_QUEUE_ELEM {
ULONG Machine; ULONG Machine;
ULONG MsgType; ULONG MsgType;
...@@ -867,7 +847,7 @@ typedef struct _MLME_QUEUE { ...@@ -867,7 +847,7 @@ typedef struct _MLME_QUEUE {
MLME_QUEUE_ELEM Entry[MAX_LEN_OF_MLME_QUEUE]; MLME_QUEUE_ELEM Entry[MAX_LEN_OF_MLME_QUEUE];
} MLME_QUEUE, *PMLME_QUEUE; } MLME_QUEUE, *PMLME_QUEUE;
typedef VOID (*STATE_MACHINE_FUNC)(VOID *Adaptor, MLME_QUEUE_ELEM *Elem); typedef VOID(*STATE_MACHINE_FUNC) (VOID * Adaptor, MLME_QUEUE_ELEM * Elem);
typedef struct _STATE_MACHINE { typedef struct _STATE_MACHINE {
ULONG Base; ULONG Base;
...@@ -877,7 +857,6 @@ typedef struct _STATE_MACHINE { ...@@ -877,7 +857,6 @@ typedef struct _STATE_MACHINE {
STATE_MACHINE_FUNC *TransFunc; STATE_MACHINE_FUNC *TransFunc;
} STATE_MACHINE, *PSTATE_MACHINE; } STATE_MACHINE, *PSTATE_MACHINE;
// MLME AUX data structure that hold temporarliy settings during a connection attempt. // MLME AUX data structure that hold temporarliy settings during a connection attempt.
// Once this attemp succeeds, all settings will be copy to pAd->StaActive. // Once this attemp succeeds, all settings will be copy to pAd->StaActive.
// A connection attempt (user set OID, roaming, CCX fast roaming,..) consists of // A connection attempt (user set OID, roaming, CCX fast roaming,..) consists of
...@@ -934,7 +913,7 @@ typedef struct _MLME_AUX { ...@@ -934,7 +913,7 @@ typedef struct _MLME_AUX {
RALINK_TIMER_STRUCT AssocTimer, ReassocTimer, DisassocTimer; RALINK_TIMER_STRUCT AssocTimer, ReassocTimer, DisassocTimer;
} MLME_AUX, *PMLME_AUX; } MLME_AUX, *PMLME_AUX;
typedef struct _MLME_ADDBA_REQ_STRUCT{ typedef struct _MLME_ADDBA_REQ_STRUCT {
UCHAR Wcid; // UCHAR Wcid; //
UCHAR pAddr[MAC_ADDR_LEN]; UCHAR pAddr[MAC_ADDR_LEN];
UCHAR BaBufSize; UCHAR BaBufSize;
...@@ -944,8 +923,7 @@ typedef struct _MLME_ADDBA_REQ_STRUCT{ ...@@ -944,8 +923,7 @@ typedef struct _MLME_ADDBA_REQ_STRUCT{
USHORT BaStartSeq; USHORT BaStartSeq;
} MLME_ADDBA_REQ_STRUCT, *PMLME_ADDBA_REQ_STRUCT; } MLME_ADDBA_REQ_STRUCT, *PMLME_ADDBA_REQ_STRUCT;
typedef struct _MLME_DELBA_REQ_STRUCT {
typedef struct _MLME_DELBA_REQ_STRUCT{
UCHAR Wcid; // UCHAR Wcid; //
UCHAR Addr[MAC_ADDR_LEN]; UCHAR Addr[MAC_ADDR_LEN];
UCHAR TID; UCHAR TID;
...@@ -953,14 +931,15 @@ typedef struct _MLME_DELBA_REQ_STRUCT{ ...@@ -953,14 +931,15 @@ typedef struct _MLME_DELBA_REQ_STRUCT{
} MLME_DELBA_REQ_STRUCT, *PMLME_DELBA_REQ_STRUCT; } MLME_DELBA_REQ_STRUCT, *PMLME_DELBA_REQ_STRUCT;
// assoc struct is equal to reassoc // assoc struct is equal to reassoc
typedef struct _MLME_ASSOC_REQ_STRUCT{ typedef struct _MLME_ASSOC_REQ_STRUCT {
UCHAR Addr[MAC_ADDR_LEN]; UCHAR Addr[MAC_ADDR_LEN];
USHORT CapabilityInfo; USHORT CapabilityInfo;
USHORT ListenIntv; USHORT ListenIntv;
ULONG Timeout; ULONG Timeout;
} MLME_ASSOC_REQ_STRUCT, *PMLME_ASSOC_REQ_STRUCT, MLME_REASSOC_REQ_STRUCT, *PMLME_REASSOC_REQ_STRUCT; } MLME_ASSOC_REQ_STRUCT, *PMLME_ASSOC_REQ_STRUCT, MLME_REASSOC_REQ_STRUCT,
*PMLME_REASSOC_REQ_STRUCT;
typedef struct _MLME_DISASSOC_REQ_STRUCT{ typedef struct _MLME_DISASSOC_REQ_STRUCT {
UCHAR Addr[MAC_ADDR_LEN]; UCHAR Addr[MAC_ADDR_LEN];
USHORT Reason; USHORT Reason;
} MLME_DISASSOC_REQ_STRUCT, *PMLME_DISASSOC_REQ_STRUCT; } MLME_DISASSOC_REQ_STRUCT, *PMLME_DISASSOC_REQ_STRUCT;
...@@ -997,10 +976,9 @@ typedef struct PACKED { ...@@ -997,10 +976,9 @@ typedef struct PACKED {
UCHAR Eid; UCHAR Eid;
UCHAR Len; UCHAR Len;
UCHAR Octet[1]; UCHAR Octet[1];
} EID_STRUCT,*PEID_STRUCT, BEACON_EID_STRUCT, *PBEACON_EID_STRUCT; } EID_STRUCT, *PEID_STRUCT, BEACON_EID_STRUCT, *PBEACON_EID_STRUCT;
typedef struct PACKED _RTMP_TX_RATE_SWITCH typedef struct PACKED _RTMP_TX_RATE_SWITCH {
{
UCHAR ItemNo; UCHAR ItemNo;
UCHAR STBC:1; UCHAR STBC:1;
UCHAR ShortGI:1; UCHAR ShortGI:1;
...@@ -1071,5 +1049,4 @@ typedef enum _WpaGTKState { ...@@ -1071,5 +1049,4 @@ typedef enum _WpaGTKState {
} WPA_GTK_STATE; } WPA_GTK_STATE;
// ====================== end of AP mlme.h ============================ // ====================== end of AP mlme.h ============================
#endif // MLME_H__ #endif // MLME_H__
drivers/staging/rt2860/oid.h
View file @ 52b81c89
...@@ -86,7 +86,6 @@ ...@@ -86,7 +86,6 @@
#define MAX_LENGTH_OF_SUPPORT_RATES 12 // 1, 2, 5.5, 11, 6, 9, 12, 18, 24, 36, 48, 54 #define MAX_LENGTH_OF_SUPPORT_RATES 12 // 1, 2, 5.5, 11, 6, 9, 12, 18, 24, 36, 48, 54
#define MAX_NUMBER_OF_DLS_ENTRY 4 #define MAX_NUMBER_OF_DLS_ENTRY 4
#define RT_QUERY_SIGNAL_CONTEXT 0x0402 #define RT_QUERY_SIGNAL_CONTEXT 0x0402
#define RT_SET_IAPP_PID 0x0404 #define RT_SET_IAPP_PID 0x0404
#define RT_SET_APD_PID 0x0405 #define RT_SET_APD_PID 0x0405
...@@ -129,8 +128,7 @@ ...@@ -129,8 +128,7 @@
#define RT_OID_DRIVER_DEVICE_NAME 0x0645 #define RT_OID_DRIVER_DEVICE_NAME 0x0645
#define RT_OID_QUERY_MULTIPLE_CARD_SUPPORT 0x0647 #define RT_OID_QUERY_MULTIPLE_CARD_SUPPORT 0x0647
typedef enum _NDIS_802_11_STATUS_TYPE typedef enum _NDIS_802_11_STATUS_TYPE {
{
Ndis802_11StatusType_Authentication, Ndis802_11StatusType_Authentication,
Ndis802_11StatusType_MediaStreamMode, Ndis802_11StatusType_MediaStreamMode,
Ndis802_11StatusType_PMKID_CandidateList, Ndis802_11StatusType_PMKID_CandidateList,
...@@ -139,8 +137,7 @@ typedef enum _NDIS_802_11_STATUS_TYPE ...@@ -139,8 +137,7 @@ typedef enum _NDIS_802_11_STATUS_TYPE
typedef UCHAR NDIS_802_11_MAC_ADDRESS[6]; typedef UCHAR NDIS_802_11_MAC_ADDRESS[6];
typedef struct _NDIS_802_11_STATUS_INDICATION typedef struct _NDIS_802_11_STATUS_INDICATION {
{
NDIS_802_11_STATUS_TYPE StatusType; NDIS_802_11_STATUS_TYPE StatusType;
} NDIS_802_11_STATUS_INDICATION, *PNDIS_802_11_STATUS_INDICATION; } NDIS_802_11_STATUS_INDICATION, *PNDIS_802_11_STATUS_INDICATION;
...@@ -152,8 +149,7 @@ typedef struct _NDIS_802_11_STATUS_INDICATION ...@@ -152,8 +149,7 @@ typedef struct _NDIS_802_11_STATUS_INDICATION
#define NDIS_802_11_AUTH_REQUEST_PAIRWISE_ERROR 0x06 #define NDIS_802_11_AUTH_REQUEST_PAIRWISE_ERROR 0x06
#define NDIS_802_11_AUTH_REQUEST_GROUP_ERROR 0x0E #define NDIS_802_11_AUTH_REQUEST_GROUP_ERROR 0x0E
typedef struct _NDIS_802_11_AUTHENTICATION_REQUEST typedef struct _NDIS_802_11_AUTHENTICATION_REQUEST {
{
ULONG Length; // Length of structure ULONG Length; // Length of structure
NDIS_802_11_MAC_ADDRESS Bssid; NDIS_802_11_MAC_ADDRESS Bssid;
ULONG Flags; ULONG Flags;
...@@ -165,8 +161,7 @@ typedef struct _PMKID_CANDIDATE { ...@@ -165,8 +161,7 @@ typedef struct _PMKID_CANDIDATE {
ULONG Flags; ULONG Flags;
} PMKID_CANDIDATE, *PPMKID_CANDIDATE; } PMKID_CANDIDATE, *PPMKID_CANDIDATE;
typedef struct _NDIS_802_11_PMKID_CANDIDATE_LIST typedef struct _NDIS_802_11_PMKID_CANDIDATE_LIST {
{
ULONG Version; // Version of the structure ULONG Version; // Version of the structure
ULONG NumCandidates; // No. of pmkid candidates ULONG NumCandidates; // No. of pmkid candidates
PMKID_CANDIDATE CandidateList[1]; PMKID_CANDIDATE CandidateList[1];
...@@ -176,8 +171,7 @@ typedef struct _NDIS_802_11_PMKID_CANDIDATE_LIST ...@@ -176,8 +171,7 @@ typedef struct _NDIS_802_11_PMKID_CANDIDATE_LIST
#define NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED 0x01 #define NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED 0x01
// Added new types for OFDM 5G and 2.4G // Added new types for OFDM 5G and 2.4G
typedef enum _NDIS_802_11_NETWORK_TYPE typedef enum _NDIS_802_11_NETWORK_TYPE {
{
Ndis802_11FH, Ndis802_11FH,
Ndis802_11DS, Ndis802_11DS,
Ndis802_11OFDM5, Ndis802_11OFDM5,
...@@ -188,14 +182,12 @@ typedef enum _NDIS_802_11_NETWORK_TYPE ...@@ -188,14 +182,12 @@ typedef enum _NDIS_802_11_NETWORK_TYPE
Ndis802_11NetworkTypeMax // not a real type, defined as an upper bound Ndis802_11NetworkTypeMax // not a real type, defined as an upper bound
} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE; } NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE;
typedef struct _NDIS_802_11_NETWORK_TYPE_LIST typedef struct _NDIS_802_11_NETWORK_TYPE_LIST {
{
UINT NumberOfItems; // in list below, at least 1 UINT NumberOfItems; // in list below, at least 1
NDIS_802_11_NETWORK_TYPE NetworkType [1]; NDIS_802_11_NETWORK_TYPE NetworkType[1];
} NDIS_802_11_NETWORK_TYPE_LIST, *PNDIS_802_11_NETWORK_TYPE_LIST; } NDIS_802_11_NETWORK_TYPE_LIST, *PNDIS_802_11_NETWORK_TYPE_LIST;
typedef enum _NDIS_802_11_POWER_MODE typedef enum _NDIS_802_11_POWER_MODE {
{
Ndis802_11PowerModeCAM, Ndis802_11PowerModeCAM,
Ndis802_11PowerModeMAX_PSP, Ndis802_11PowerModeMAX_PSP,
Ndis802_11PowerModeFast_PSP, Ndis802_11PowerModeFast_PSP,
...@@ -210,16 +202,14 @@ typedef ULONG NDIS_802_11_TX_POWER_LEVEL; // in milliwatts ...@@ -210,16 +202,14 @@ typedef ULONG NDIS_802_11_TX_POWER_LEVEL; // in milliwatts
// //
typedef LONG NDIS_802_11_RSSI; // in dBm typedef LONG NDIS_802_11_RSSI; // in dBm
typedef struct _NDIS_802_11_CONFIGURATION_FH typedef struct _NDIS_802_11_CONFIGURATION_FH {
{
ULONG Length; // Length of structure ULONG Length; // Length of structure
ULONG HopPattern; // As defined by 802.11, MSB set ULONG HopPattern; // As defined by 802.11, MSB set
ULONG HopSet; // to one if non-802.11 ULONG HopSet; // to one if non-802.11
ULONG DwellTime; // units are Kusec ULONG DwellTime; // units are Kusec
} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH; } NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH;
typedef struct _NDIS_802_11_CONFIGURATION typedef struct _NDIS_802_11_CONFIGURATION {
{
ULONG Length; // Length of structure ULONG Length; // Length of structure
ULONG BeaconPeriod; // units are Kusec ULONG BeaconPeriod; // units are Kusec
ULONG ATIMWindow; // units are Kusec ULONG ATIMWindow; // units are Kusec
...@@ -227,8 +217,7 @@ typedef struct _NDIS_802_11_CONFIGURATION ...@@ -227,8 +217,7 @@ typedef struct _NDIS_802_11_CONFIGURATION
NDIS_802_11_CONFIGURATION_FH FHConfig; NDIS_802_11_CONFIGURATION_FH FHConfig;
} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION; } NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION;
typedef struct _NDIS_802_11_STATISTICS typedef struct _NDIS_802_11_STATISTICS {
{
ULONG Length; // Length of structure ULONG Length; // Length of structure
LARGE_INTEGER TransmittedFragmentCount; LARGE_INTEGER TransmittedFragmentCount;
LARGE_INTEGER MulticastTransmittedFrameCount; LARGE_INTEGER MulticastTransmittedFrameCount;
...@@ -265,8 +254,7 @@ typedef struct PACKED _RADIUS_SRV_INFO { ...@@ -265,8 +254,7 @@ typedef struct PACKED _RADIUS_SRV_INFO {
UCHAR radius_key_len; UCHAR radius_key_len;
} RADIUS_SRV_INFO, *PRADIUS_SRV_INFO; } RADIUS_SRV_INFO, *PRADIUS_SRV_INFO;
typedef struct PACKED _RADIUS_KEY_INFO typedef struct PACKED _RADIUS_KEY_INFO {
{
UCHAR radius_srv_num; UCHAR radius_srv_num;
RADIUS_SRV_INFO radius_srv_info[MAX_RADIUS_SRV_NUM]; RADIUS_SRV_INFO radius_srv_info[MAX_RADIUS_SRV_NUM];
UCHAR ieee8021xWEP; // dynamic WEP UCHAR ieee8021xWEP; // dynamic WEP
...@@ -276,8 +264,7 @@ typedef struct PACKED _RADIUS_KEY_INFO ...@@ -276,8 +264,7 @@ typedef struct PACKED _RADIUS_KEY_INFO
} RADIUS_KEY_INFO, *PRADIUS_KEY_INFO; } RADIUS_KEY_INFO, *PRADIUS_KEY_INFO;
// It's used by 802.1x daemon to require relative configuration // It's used by 802.1x daemon to require relative configuration
typedef struct PACKED _RADIUS_CONF typedef struct PACKED _RADIUS_CONF {
{
UINT32 Length; // Length of this structure UINT32 Length; // Length of this structure
UCHAR mbss_num; // indicate multiple BSS number UCHAR mbss_num; // indicate multiple BSS number
UINT32 own_ip_addr; UINT32 own_ip_addr;
...@@ -290,11 +277,8 @@ typedef struct PACKED _RADIUS_CONF ...@@ -290,11 +277,8 @@ typedef struct PACKED _RADIUS_CONF
RADIUS_KEY_INFO RadiusInfo[8]; RADIUS_KEY_INFO RadiusInfo[8];
} RADIUS_CONF, *PRADIUS_CONF; } RADIUS_CONF, *PRADIUS_CONF;
// Key mapping keys require a BSSID // Key mapping keys require a BSSID
typedef struct _NDIS_802_11_KEY typedef struct _NDIS_802_11_KEY {
{
UINT Length; // Length of this structure UINT Length; // Length of this structure
UINT KeyIndex; UINT KeyIndex;
UINT KeyLength; // length of key in bytes UINT KeyLength; // length of key in bytes
...@@ -303,32 +287,27 @@ typedef struct _NDIS_802_11_KEY ...@@ -303,32 +287,27 @@ typedef struct _NDIS_802_11_KEY
UCHAR KeyMaterial[1]; // variable length depending on above field UCHAR KeyMaterial[1]; // variable length depending on above field
} NDIS_802_11_KEY, *PNDIS_802_11_KEY; } NDIS_802_11_KEY, *PNDIS_802_11_KEY;
typedef struct _NDIS_802_11_PASSPHRASE typedef struct _NDIS_802_11_PASSPHRASE {
{
UINT KeyLength; // length of key in bytes UINT KeyLength; // length of key in bytes
NDIS_802_11_MAC_ADDRESS BSSID; NDIS_802_11_MAC_ADDRESS BSSID;
UCHAR KeyMaterial[1]; // variable length depending on above field UCHAR KeyMaterial[1]; // variable length depending on above field
} NDIS_802_11_PASSPHRASE, *PNDIS_802_11_PASSPHRASE; } NDIS_802_11_PASSPHRASE, *PNDIS_802_11_PASSPHRASE;
typedef struct _NDIS_802_11_REMOVE_KEY typedef struct _NDIS_802_11_REMOVE_KEY {
{
UINT Length; // Length of this structure UINT Length; // Length of this structure
UINT KeyIndex; UINT KeyIndex;
NDIS_802_11_MAC_ADDRESS BSSID; NDIS_802_11_MAC_ADDRESS BSSID;
} NDIS_802_11_REMOVE_KEY, *PNDIS_802_11_REMOVE_KEY; } NDIS_802_11_REMOVE_KEY, *PNDIS_802_11_REMOVE_KEY;
typedef struct _NDIS_802_11_WEP typedef struct _NDIS_802_11_WEP {
{
UINT Length; // Length of this structure UINT Length; // Length of this structure
UINT KeyIndex; // 0 is the per-client key, 1-N are the UINT KeyIndex; // 0 is the per-client key, 1-N are the
// global keys // global keys
UINT KeyLength; // length of key in bytes UINT KeyLength; // length of key in bytes
UCHAR KeyMaterial[1];// variable length depending on above field UCHAR KeyMaterial[1]; // variable length depending on above field
} NDIS_802_11_WEP, *PNDIS_802_11_WEP; } NDIS_802_11_WEP, *PNDIS_802_11_WEP;
typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE {
typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE
{
Ndis802_11IBSS, Ndis802_11IBSS,
Ndis802_11Infrastructure, Ndis802_11Infrastructure,
Ndis802_11AutoUnknown, Ndis802_11AutoUnknown,
...@@ -337,8 +316,7 @@ typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE ...@@ -337,8 +316,7 @@ typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE
} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE; } NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE;
// Add new authentication modes // Add new authentication modes
typedef enum _NDIS_802_11_AUTHENTICATION_MODE typedef enum _NDIS_802_11_AUTHENTICATION_MODE {
{
Ndis802_11AuthModeOpen, Ndis802_11AuthModeOpen,
Ndis802_11AuthModeShared, Ndis802_11AuthModeShared,
Ndis802_11AuthModeAutoSwitch, Ndis802_11AuthModeAutoSwitch,
...@@ -355,16 +333,13 @@ typedef enum _NDIS_802_11_AUTHENTICATION_MODE ...@@ -355,16 +333,13 @@ typedef enum _NDIS_802_11_AUTHENTICATION_MODE
typedef UCHAR NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; // Set of 8 data rates typedef UCHAR NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; // Set of 8 data rates
typedef UCHAR NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; // Set of 16 data rates typedef UCHAR NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; // Set of 16 data rates
typedef struct PACKED _NDIS_802_11_SSID typedef struct PACKED _NDIS_802_11_SSID {
{
UINT SsidLength; // length of SSID field below, in bytes; UINT SsidLength; // length of SSID field below, in bytes;
// this can be zero. // this can be zero.
UCHAR Ssid[NDIS_802_11_LENGTH_SSID]; // SSID information field UCHAR Ssid[NDIS_802_11_LENGTH_SSID]; // SSID information field
} NDIS_802_11_SSID, *PNDIS_802_11_SSID; } NDIS_802_11_SSID, *PNDIS_802_11_SSID;
typedef struct PACKED _NDIS_WLAN_BSSID {
typedef struct PACKED _NDIS_WLAN_BSSID
{
ULONG Length; // Length of this structure ULONG Length; // Length of this structure
NDIS_802_11_MAC_ADDRESS MacAddress; // BSSID NDIS_802_11_MAC_ADDRESS MacAddress; // BSSID
UCHAR Reserved[2]; UCHAR Reserved[2];
...@@ -377,15 +352,13 @@ typedef struct PACKED _NDIS_WLAN_BSSID ...@@ -377,15 +352,13 @@ typedef struct PACKED _NDIS_WLAN_BSSID
NDIS_802_11_RATES SupportedRates; NDIS_802_11_RATES SupportedRates;
} NDIS_WLAN_BSSID, *PNDIS_WLAN_BSSID; } NDIS_WLAN_BSSID, *PNDIS_WLAN_BSSID;
typedef struct PACKED _NDIS_802_11_BSSID_LIST typedef struct PACKED _NDIS_802_11_BSSID_LIST {
{
UINT NumberOfItems; // in list below, at least 1 UINT NumberOfItems; // in list below, at least 1
NDIS_WLAN_BSSID Bssid[1]; NDIS_WLAN_BSSID Bssid[1];
} NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST; } NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST;
// Added Capabilities, IELength and IEs for each BSSID // Added Capabilities, IELength and IEs for each BSSID
typedef struct PACKED _NDIS_WLAN_BSSID_EX typedef struct PACKED _NDIS_WLAN_BSSID_EX {
{
ULONG Length; // Length of this structure ULONG Length; // Length of this structure
NDIS_802_11_MAC_ADDRESS MacAddress; // BSSID NDIS_802_11_MAC_ADDRESS MacAddress; // BSSID
UCHAR Reserved[2]; UCHAR Reserved[2];
...@@ -401,21 +374,18 @@ typedef struct PACKED _NDIS_WLAN_BSSID_EX ...@@ -401,21 +374,18 @@ typedef struct PACKED _NDIS_WLAN_BSSID_EX
UCHAR IEs[1]; UCHAR IEs[1];
} NDIS_WLAN_BSSID_EX, *PNDIS_WLAN_BSSID_EX; } NDIS_WLAN_BSSID_EX, *PNDIS_WLAN_BSSID_EX;
typedef struct PACKED _NDIS_802_11_BSSID_LIST_EX typedef struct PACKED _NDIS_802_11_BSSID_LIST_EX {
{
UINT NumberOfItems; // in list below, at least 1 UINT NumberOfItems; // in list below, at least 1
NDIS_WLAN_BSSID_EX Bssid[1]; NDIS_WLAN_BSSID_EX Bssid[1];
} NDIS_802_11_BSSID_LIST_EX, *PNDIS_802_11_BSSID_LIST_EX; } NDIS_802_11_BSSID_LIST_EX, *PNDIS_802_11_BSSID_LIST_EX;
typedef struct PACKED _NDIS_802_11_FIXED_IEs typedef struct PACKED _NDIS_802_11_FIXED_IEs {
{
UCHAR Timestamp[8]; UCHAR Timestamp[8];
USHORT BeaconInterval; USHORT BeaconInterval;
USHORT Capabilities; USHORT Capabilities;
} NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs; } NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs;
typedef struct _NDIS_802_11_VARIABLE_IEs typedef struct _NDIS_802_11_VARIABLE_IEs {
{
UCHAR ElementID; UCHAR ElementID;
UCHAR Length; // Number of bytes in data field UCHAR Length; // Number of bytes in data field
UCHAR data[1]; UCHAR data[1];
...@@ -427,16 +397,14 @@ typedef ULONG NDIS_802_11_RTS_THRESHOLD; ...@@ -427,16 +397,14 @@ typedef ULONG NDIS_802_11_RTS_THRESHOLD;
typedef ULONG NDIS_802_11_ANTENNA; typedef ULONG NDIS_802_11_ANTENNA;
typedef enum _NDIS_802_11_PRIVACY_FILTER typedef enum _NDIS_802_11_PRIVACY_FILTER {
{
Ndis802_11PrivFilterAcceptAll, Ndis802_11PrivFilterAcceptAll,
Ndis802_11PrivFilter8021xWEP Ndis802_11PrivFilter8021xWEP
} NDIS_802_11_PRIVACY_FILTER, *PNDIS_802_11_PRIVACY_FILTER; } NDIS_802_11_PRIVACY_FILTER, *PNDIS_802_11_PRIVACY_FILTER;
// Added new encryption types // Added new encryption types
// Also aliased typedef to new name // Also aliased typedef to new name
typedef enum _NDIS_802_11_WEP_STATUS typedef enum _NDIS_802_11_WEP_STATUS {
{
Ndis802_11WEPEnabled, Ndis802_11WEPEnabled,
Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled, Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled,
Ndis802_11WEPDisabled, Ndis802_11WEPDisabled,
...@@ -456,8 +424,7 @@ typedef enum _NDIS_802_11_WEP_STATUS ...@@ -456,8 +424,7 @@ typedef enum _NDIS_802_11_WEP_STATUS
} NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS, } NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS,
NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS; NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS;
typedef enum _NDIS_802_11_RELOAD_DEFAULTS typedef enum _NDIS_802_11_RELOAD_DEFAULTS {
{
Ndis802_11ReloadWEPKeys Ndis802_11ReloadWEPKeys
} NDIS_802_11_RELOAD_DEFAULTS, *PNDIS_802_11_RELOAD_DEFAULTS; } NDIS_802_11_RELOAD_DEFAULTS, *PNDIS_802_11_RELOAD_DEFAULTS;
...@@ -469,22 +436,19 @@ typedef enum _NDIS_802_11_RELOAD_DEFAULTS ...@@ -469,22 +436,19 @@ typedef enum _NDIS_802_11_RELOAD_DEFAULTS
#define NDIS_802_11_AI_RESFI_STATUSCODE 2 #define NDIS_802_11_AI_RESFI_STATUSCODE 2
#define NDIS_802_11_AI_RESFI_ASSOCIATIONID 4 #define NDIS_802_11_AI_RESFI_ASSOCIATIONID 4
typedef struct _NDIS_802_11_AI_REQFI typedef struct _NDIS_802_11_AI_REQFI {
{
USHORT Capabilities; USHORT Capabilities;
USHORT ListenInterval; USHORT ListenInterval;
NDIS_802_11_MAC_ADDRESS CurrentAPAddress; NDIS_802_11_MAC_ADDRESS CurrentAPAddress;
} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI; } NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
typedef struct _NDIS_802_11_AI_RESFI typedef struct _NDIS_802_11_AI_RESFI {
{
USHORT Capabilities; USHORT Capabilities;
USHORT StatusCode; USHORT StatusCode;
USHORT AssociationId; USHORT AssociationId;
} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI; } NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION {
{
ULONG Length; ULONG Length;
USHORT AvailableRequestFixedIEs; USHORT AvailableRequestFixedIEs;
NDIS_802_11_AI_REQFI RequestFixedIEs; NDIS_802_11_AI_REQFI RequestFixedIEs;
...@@ -496,15 +460,13 @@ typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION ...@@ -496,15 +460,13 @@ typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION
ULONG OffsetResponseIEs; ULONG OffsetResponseIEs;
} NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION; } NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION;
typedef struct _NDIS_802_11_AUTHENTICATION_EVENT typedef struct _NDIS_802_11_AUTHENTICATION_EVENT {
{
NDIS_802_11_STATUS_INDICATION Status; NDIS_802_11_STATUS_INDICATION Status;
NDIS_802_11_AUTHENTICATION_REQUEST Request[1]; NDIS_802_11_AUTHENTICATION_REQUEST Request[1];
} NDIS_802_11_AUTHENTICATION_EVENT, *PNDIS_802_11_AUTHENTICATION_EVENT; } NDIS_802_11_AUTHENTICATION_EVENT, *PNDIS_802_11_AUTHENTICATION_EVENT;
// 802.11 Media stream constraints, associated with OID_802_11_MEDIA_STREAM_MODE // 802.11 Media stream constraints, associated with OID_802_11_MEDIA_STREAM_MODE
typedef enum _NDIS_802_11_MEDIA_STREAM_MODE typedef enum _NDIS_802_11_MEDIA_STREAM_MODE {
{
Ndis802_11MediaStreamOff, Ndis802_11MediaStreamOff,
Ndis802_11MediaStreamOn, Ndis802_11MediaStreamOn,
} NDIS_802_11_MEDIA_STREAM_MODE, *PNDIS_802_11_MEDIA_STREAM_MODE; } NDIS_802_11_MEDIA_STREAM_MODE, *PNDIS_802_11_MEDIA_STREAM_MODE;
...@@ -512,32 +474,30 @@ typedef enum _NDIS_802_11_MEDIA_STREAM_MODE ...@@ -512,32 +474,30 @@ typedef enum _NDIS_802_11_MEDIA_STREAM_MODE
// PMKID Structures // PMKID Structures
typedef UCHAR NDIS_802_11_PMKID_VALUE[16]; typedef UCHAR NDIS_802_11_PMKID_VALUE[16];
typedef struct _BSSID_INFO typedef struct _BSSID_INFO {
{
NDIS_802_11_MAC_ADDRESS BSSID; NDIS_802_11_MAC_ADDRESS BSSID;
NDIS_802_11_PMKID_VALUE PMKID; NDIS_802_11_PMKID_VALUE PMKID;
} BSSID_INFO, *PBSSID_INFO; } BSSID_INFO, *PBSSID_INFO;
typedef struct _NDIS_802_11_PMKID typedef struct _NDIS_802_11_PMKID {
{
UINT Length; UINT Length;
UINT BSSIDInfoCount; UINT BSSIDInfoCount;
BSSID_INFO BSSIDInfo[1]; BSSID_INFO BSSIDInfo[1];
} NDIS_802_11_PMKID, *PNDIS_802_11_PMKID; } NDIS_802_11_PMKID, *PNDIS_802_11_PMKID;
typedef struct _NDIS_802_11_AUTHENTICATION_ENCRYPTION typedef struct _NDIS_802_11_AUTHENTICATION_ENCRYPTION {
{
NDIS_802_11_AUTHENTICATION_MODE AuthModeSupported; NDIS_802_11_AUTHENTICATION_MODE AuthModeSupported;
NDIS_802_11_ENCRYPTION_STATUS EncryptStatusSupported; NDIS_802_11_ENCRYPTION_STATUS EncryptStatusSupported;
} NDIS_802_11_AUTHENTICATION_ENCRYPTION, *PNDIS_802_11_AUTHENTICATION_ENCRYPTION; } NDIS_802_11_AUTHENTICATION_ENCRYPTION,
*PNDIS_802_11_AUTHENTICATION_ENCRYPTION;
typedef struct _NDIS_802_11_CAPABILITY typedef struct _NDIS_802_11_CAPABILITY {
{
ULONG Length; ULONG Length;
ULONG Version; ULONG Version;
ULONG NoOfPMKIDs; ULONG NoOfPMKIDs;
ULONG NoOfAuthEncryptPairsSupported; ULONG NoOfAuthEncryptPairsSupported;
NDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1]; NDIS_802_11_AUTHENTICATION_ENCRYPTION
AuthenticationEncryptionSupported[1];
} NDIS_802_11_CAPABILITY, *PNDIS_802_11_CAPABILITY; } NDIS_802_11_CAPABILITY, *PNDIS_802_11_CAPABILITY;
#define RT_PRIV_IOCTL (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon #define RT_PRIV_IOCTL (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon
...@@ -566,11 +526,6 @@ enum { ...@@ -566,11 +526,6 @@ enum {
SHOW_ADHOC_ENTRY_INFO = 21, SHOW_ADHOC_ENTRY_INFO = 21,
}; };
#define OID_802_11_BUILD_CHANNEL_EX 0x0714 #define OID_802_11_BUILD_CHANNEL_EX 0x0714
#define OID_802_11_GET_CH_LIST 0x0715 #define OID_802_11_GET_CH_LIST 0x0715
#define OID_802_11_GET_COUNTRY_CODE 0x0716 #define OID_802_11_GET_COUNTRY_CODE 0x0716
...@@ -616,7 +571,7 @@ typedef union _HTTRANSMIT_SETTING { ...@@ -616,7 +571,7 @@ typedef union _HTTRANSMIT_SETTING {
USHORT MODE:2; // Use definition MODE_xxx. USHORT MODE:2; // Use definition MODE_xxx.
} field; } field;
USHORT word; USHORT word;
} HTTRANSMIT_SETTING, *PHTTRANSMIT_SETTING; } HTTRANSMIT_SETTING, *PHTTRANSMIT_SETTING;
typedef enum _RT_802_11_PREAMBLE { typedef enum _RT_802_11_PREAMBLE {
Rt802_11PreambleLong, Rt802_11PreambleLong,
...@@ -671,7 +626,7 @@ typedef union _MACHTTRANSMIT_SETTING { ...@@ -671,7 +626,7 @@ typedef union _MACHTTRANSMIT_SETTING {
USHORT MODE:2; // Use definition MODE_xxx. USHORT MODE:2; // Use definition MODE_xxx.
} field; } field;
USHORT word; USHORT word;
} MACHTTRANSMIT_SETTING, *PMACHTTRANSMIT_SETTING; } MACHTTRANSMIT_SETTING, *PMACHTTRANSMIT_SETTING;
typedef struct _RT_802_11_MAC_ENTRY { typedef struct _RT_802_11_MAC_ENTRY {
UCHAR Addr[MAC_ADDR_LENGTH]; UCHAR Addr[MAC_ADDR_LENGTH];
...@@ -747,7 +702,7 @@ typedef struct PACKED _RT_802_11_ACL { ...@@ -747,7 +702,7 @@ typedef struct PACKED _RT_802_11_ACL {
typedef struct _RT_802_11_WDS { typedef struct _RT_802_11_WDS {
ULONG Num; ULONG Num;
NDIS_802_11_MAC_ADDRESS Entry[24/*MAX_NUM_OF_WDS_LINK*/]; NDIS_802_11_MAC_ADDRESS Entry[24 /*MAX_NUM_OF_WDS_LINK */ ];
ULONG KeyLength; ULONG KeyLength;
UCHAR KeyMaterial[32]; UCHAR KeyMaterial[32];
} RT_802_11_WDS, *PRT_802_11_WDS; } RT_802_11_WDS, *PRT_802_11_WDS;
...@@ -759,7 +714,6 @@ typedef struct _RT_802_11_TX_RATES_ { ...@@ -759,7 +714,6 @@ typedef struct _RT_802_11_TX_RATES_ {
UCHAR ExtRate[MAX_LENGTH_OF_SUPPORT_RATES]; UCHAR ExtRate[MAX_LENGTH_OF_SUPPORT_RATES];
} RT_802_11_TX_RATES, *PRT_802_11_TX_RATES; } RT_802_11_TX_RATES, *PRT_802_11_TX_RATES;
// Definition of extra information code // Definition of extra information code
#define GENERAL_LINK_UP 0x0 // Link is Up #define GENERAL_LINK_UP 0x0 // Link is Up
#define GENERAL_LINK_DOWN 0x1 // Link is Down #define GENERAL_LINK_DOWN 0x1 // Link is Down
...@@ -792,22 +746,19 @@ typedef struct { ...@@ -792,22 +746,19 @@ typedef struct {
#define MAX_CUSTOM_LEN 128 #define MAX_CUSTOM_LEN 128
typedef enum _RT_802_11_D_CLIENT_MODE typedef enum _RT_802_11_D_CLIENT_MODE {
{
Rt802_11_D_None, Rt802_11_D_None,
Rt802_11_D_Flexible, Rt802_11_D_Flexible,
Rt802_11_D_Strict, Rt802_11_D_Strict,
} RT_802_11_D_CLIENT_MODE, *PRT_802_11_D_CLIENT_MODE; } RT_802_11_D_CLIENT_MODE, *PRT_802_11_D_CLIENT_MODE;
typedef struct _RT_CHANNEL_LIST_INFO typedef struct _RT_CHANNEL_LIST_INFO {
{
UCHAR ChannelList[MAX_NUM_OF_CHS]; // list all supported channels for site survey UCHAR ChannelList[MAX_NUM_OF_CHS]; // list all supported channels for site survey
UCHAR ChannelListNum; // number of channel in ChannelList[] UCHAR ChannelListNum; // number of channel in ChannelList[]
} RT_CHANNEL_LIST_INFO, *PRT_CHANNEL_LIST_INFO; } RT_CHANNEL_LIST_INFO, *PRT_CHANNEL_LIST_INFO;
// WSC configured credential // WSC configured credential
typedef struct _WSC_CREDENTIAL typedef struct _WSC_CREDENTIAL {
{
NDIS_802_11_SSID SSID; // mandatory NDIS_802_11_SSID SSID; // mandatory
USHORT AuthType; // mandatory, 1: open, 2: wpa-psk, 4: shared, 8:wpa, 0x10: wpa2, 0x20: wpa2-psk USHORT AuthType; // mandatory, 1: open, 2: wpa-psk, 4: shared, 8:wpa, 0x10: wpa2, 0x20: wpa2-psk
USHORT EncrType; // mandatory, 1: none, 2: wep, 4: tkip, 8: aes USHORT EncrType; // mandatory, 1: none, 2: wep, 4: tkip, 8: aes
...@@ -819,12 +770,10 @@ typedef struct _WSC_CREDENTIAL ...@@ -819,12 +770,10 @@ typedef struct _WSC_CREDENTIAL
} WSC_CREDENTIAL, *PWSC_CREDENTIAL; } WSC_CREDENTIAL, *PWSC_CREDENTIAL;
// WSC configured profiles // WSC configured profiles
typedef struct _WSC_PROFILE typedef struct _WSC_PROFILE {
{
UINT ProfileCnt; UINT ProfileCnt;
UINT ApplyProfileIdx; // add by johnli, fix WPS test plan 5.1.1 UINT ApplyProfileIdx; // add by johnli, fix WPS test plan 5.1.1
WSC_CREDENTIAL Profile[8]; // Support up to 8 profiles WSC_CREDENTIAL Profile[8]; // Support up to 8 profiles
} WSC_PROFILE, *PWSC_PROFILE; } WSC_PROFILE, *PWSC_PROFILE;
#endif // _OID_H_ #endif // _OID_H_
drivers/staging/rt2860/rt_config.h
View file @ 52b81c89
...@@ -69,4 +69,3 @@ ...@@ -69,4 +69,3 @@
#endif // IGMP_SNOOP_SUPPORT // #endif // IGMP_SNOOP_SUPPORT //
#endif // __RT_CONFIG_H__ #endif // __RT_CONFIG_H__
drivers/staging/rt2860/rt_linux.h
View file @ 52b81c89
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
* Profile related sections * Profile related sections
***********************************************************************************/ ***********************************************************************************/
#ifdef RTMP_MAC_PCI #ifdef RTMP_MAC_PCI
#define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" #define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat"
#define STA_DRIVER_VERSION "2.1.0.0" #define STA_DRIVER_VERSION "2.1.0.0"
...@@ -92,7 +91,6 @@ ...@@ -92,7 +91,6 @@
extern const struct iw_handler_def rt28xx_iw_handler_def; extern const struct iw_handler_def rt28xx_iw_handler_def;
/*********************************************************************************** /***********************************************************************************
* Compiler related definitions * Compiler related definitions
***********************************************************************************/ ***********************************************************************************/
...@@ -103,23 +101,23 @@ extern const struct iw_handler_def rt28xx_iw_handler_def; ...@@ -103,23 +101,23 @@ extern const struct iw_handler_def rt28xx_iw_handler_def;
#define INOUT #define INOUT
#define NDIS_STATUS INT #define NDIS_STATUS INT
/*********************************************************************************** /***********************************************************************************
* OS Specific definitions and data structures * OS Specific definitions and data structures
***********************************************************************************/ ***********************************************************************************/
typedef struct pci_dev * PPCI_DEV; typedef struct pci_dev *PPCI_DEV;
typedef struct net_device * PNET_DEV; typedef struct net_device *PNET_DEV;
typedef void * PNDIS_PACKET; typedef void *PNDIS_PACKET;
typedef char NDIS_PACKET; typedef char NDIS_PACKET;
typedef PNDIS_PACKET * PPNDIS_PACKET; typedef PNDIS_PACKET *PPNDIS_PACKET;
typedef dma_addr_t NDIS_PHYSICAL_ADDRESS; typedef dma_addr_t NDIS_PHYSICAL_ADDRESS;
typedef dma_addr_t * PNDIS_PHYSICAL_ADDRESS; typedef dma_addr_t *PNDIS_PHYSICAL_ADDRESS;
typedef void * NDIS_HANDLE; typedef void *NDIS_HANDLE;
typedef char * PNDIS_BUFFER; typedef char *PNDIS_BUFFER;
typedef struct pid * RTMP_OS_PID; typedef struct pid *RTMP_OS_PID;
typedef struct semaphore RTMP_OS_SEM; typedef struct semaphore RTMP_OS_SEM;
typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_dev); typedef int (*HARD_START_XMIT_FUNC) (struct sk_buff * skb,
struct net_device * net_dev);
#ifdef RTMP_MAC_PCI #ifdef RTMP_MAC_PCI
#ifndef PCI_DEVICE #ifndef PCI_DEVICE
...@@ -142,11 +140,8 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_ ...@@ -142,11 +140,8 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_
#define RTMP_DEC_REF(_A) 0 #define RTMP_DEC_REF(_A) 0
#define RTMP_GET_REF(_A) 0 #define RTMP_GET_REF(_A) 0
// This function will be called when query /proc // This function will be called when query /proc
struct iw_statistics *rt28xx_get_wireless_stats( struct iw_statistics *rt28xx_get_wireless_stats(IN struct net_device *net_dev);
IN struct net_device *net_dev);
/*********************************************************************************** /***********************************************************************************
* Network related constant definitions * Network related constant definitions
...@@ -178,7 +173,6 @@ struct iw_statistics *rt28xx_get_wireless_stats( ...@@ -178,7 +173,6 @@ struct iw_statistics *rt28xx_get_wireless_stats(
#define STATS_INC_RX_DROPPED(_pAd, _dev) #define STATS_INC_RX_DROPPED(_pAd, _dev)
#define STATS_INC_TX_DROPPED(_pAd, _dev) #define STATS_INC_TX_DROPPED(_pAd, _dev)
/*********************************************************************************** /***********************************************************************************
* Ralink Specific network related constant definitions * Ralink Specific network related constant definitions
***********************************************************************************/ ***********************************************************************************/
...@@ -190,34 +184,29 @@ struct iw_statistics *rt28xx_get_wireless_stats( ...@@ -190,34 +184,29 @@ struct iw_statistics *rt28xx_get_wireless_stats(
#define MIN_NET_DEVICE_FOR_DLS 0x40 #define MIN_NET_DEVICE_FOR_DLS 0x40
#define NET_DEVICE_REAL_IDX_MASK 0x0f // for each operation mode, we maximum support 15 entities. #define NET_DEVICE_REAL_IDX_MASK 0x0f // for each operation mode, we maximum support 15 entities.
#define NDIS_PACKET_TYPE_DIRECTED 0 #define NDIS_PACKET_TYPE_DIRECTED 0
#define NDIS_PACKET_TYPE_MULTICAST 1 #define NDIS_PACKET_TYPE_MULTICAST 1
#define NDIS_PACKET_TYPE_BROADCAST 2 #define NDIS_PACKET_TYPE_BROADCAST 2
#define NDIS_PACKET_TYPE_ALL_MULTICAST 3 #define NDIS_PACKET_TYPE_ALL_MULTICAST 3
#define NDIS_PACKET_TYPE_PROMISCUOUS 4 #define NDIS_PACKET_TYPE_PROMISCUOUS 4
/*********************************************************************************** /***********************************************************************************
* OS signaling related constant definitions * OS signaling related constant definitions
***********************************************************************************/ ***********************************************************************************/
/*********************************************************************************** /***********************************************************************************
* OS file operation related data structure definitions * OS file operation related data structure definitions
***********************************************************************************/ ***********************************************************************************/
typedef struct file* RTMP_OS_FD; typedef struct file *RTMP_OS_FD;
typedef struct _RTMP_OS_FS_INFO_ typedef struct _RTMP_OS_FS_INFO_ {
{
int fsuid; int fsuid;
int fsgid; int fsgid;
mm_segment_t fs; mm_segment_t fs;
}RTMP_OS_FS_INFO; } RTMP_OS_FS_INFO;
#define IS_FILE_OPEN_ERR(_fd) IS_ERR((_fd)) #define IS_FILE_OPEN_ERR(_fd) IS_ERR((_fd))
/*********************************************************************************** /***********************************************************************************
* OS semaphore related data structure and definitions * OS semaphore related data structure and definitions
***********************************************************************************/ ***********************************************************************************/
...@@ -239,7 +228,6 @@ typedef spinlock_t NDIS_SPIN_LOCK; ...@@ -239,7 +228,6 @@ typedef spinlock_t NDIS_SPIN_LOCK;
#define NdisFreeSpinLock(lock) \ #define NdisFreeSpinLock(lock) \
do{}while(0) do{}while(0)
#define RTMP_SEM_LOCK(__lock) \ #define RTMP_SEM_LOCK(__lock) \
{ \ { \
spin_lock_bh((spinlock_t *)(__lock)); \ spin_lock_bh((spinlock_t *)(__lock)); \
...@@ -250,7 +238,6 @@ typedef spinlock_t NDIS_SPIN_LOCK; ...@@ -250,7 +238,6 @@ typedef spinlock_t NDIS_SPIN_LOCK;
spin_unlock_bh((spinlock_t *)(__lock)); \ spin_unlock_bh((spinlock_t *)(__lock)); \
} }
// sample, use semaphore lock to replace IRQ lock, 2007/11/15 // sample, use semaphore lock to replace IRQ lock, 2007/11/15
#define RTMP_IRQ_LOCK(__lock, __irqflags) \ #define RTMP_IRQ_LOCK(__lock, __irqflags) \
{ \ { \
...@@ -358,13 +345,12 @@ do { \ ...@@ -358,13 +345,12 @@ do { \
#define COPY_MAC_ADDR(Addr1, Addr2) memcpy((Addr1), (Addr2), MAC_ADDR_LEN) #define COPY_MAC_ADDR(Addr1, Addr2) memcpy((Addr1), (Addr2), MAC_ADDR_LEN)
/*********************************************************************************** /***********************************************************************************
* OS task related data structure and definitions * OS task related data structure and definitions
***********************************************************************************/ ***********************************************************************************/
#define RTMP_OS_MGMT_TASK_FLAGS CLONE_VM #define RTMP_OS_MGMT_TASK_FLAGS CLONE_VM
typedef struct pid * THREAD_PID; typedef struct pid *THREAD_PID;
#define THREAD_PID_INIT_VALUE NULL #define THREAD_PID_INIT_VALUE NULL
#define GET_PID(_v) find_get_pid((_v)) #define GET_PID(_v) find_get_pid((_v))
#define GET_PID_NUMBER(_v) pid_nr((_v)) #define GET_PID_NUMBER(_v) pid_nr((_v))
...@@ -374,7 +360,6 @@ typedef struct pid * THREAD_PID; ...@@ -374,7 +360,6 @@ typedef struct pid * THREAD_PID;
typedef struct tasklet_struct RTMP_NET_TASK_STRUCT; typedef struct tasklet_struct RTMP_NET_TASK_STRUCT;
typedef struct tasklet_struct *PRTMP_NET_TASK_STRUCT; typedef struct tasklet_struct *PRTMP_NET_TASK_STRUCT;
/*********************************************************************************** /***********************************************************************************
* Timer related definitions and data structures. * Timer related definitions and data structures.
**********************************************************************************/ **********************************************************************************/
...@@ -382,8 +367,7 @@ typedef struct tasklet_struct *PRTMP_NET_TASK_STRUCT; ...@@ -382,8 +367,7 @@ typedef struct tasklet_struct *PRTMP_NET_TASK_STRUCT;
typedef struct timer_list NDIS_MINIPORT_TIMER; typedef struct timer_list NDIS_MINIPORT_TIMER;
typedef struct timer_list RTMP_OS_TIMER; typedef struct timer_list RTMP_OS_TIMER;
typedef void (*TIMER_FUNCTION)(unsigned long); typedef void (*TIMER_FUNCTION) (unsigned long);
#define OS_WAIT(_time) \ #define OS_WAIT(_time) \
{ int _i; \ { int _i; \
...@@ -406,12 +390,11 @@ typedef void (*TIMER_FUNCTION)(unsigned long); ...@@ -406,12 +390,11 @@ typedef void (*TIMER_FUNCTION)(unsigned long);
#define ONE_TICK 1 #define ONE_TICK 1
static inline void NdisGetSystemUpTime(ULONG *time) static inline void NdisGetSystemUpTime(ULONG * time)
{ {
*time = jiffies; *time = jiffies;
} }
/*********************************************************************************** /***********************************************************************************
* OS specific cookie data structure binding to RTMP_ADAPTER * OS specific cookie data structure binding to RTMP_ADAPTER
***********************************************************************************/ ***********************************************************************************/
...@@ -448,9 +431,7 @@ struct os_cookie { ...@@ -448,9 +431,7 @@ struct os_cookie {
INT ioctl_if; INT ioctl_if;
}; };
typedef struct os_cookie * POS_COOKIE; typedef struct os_cookie *POS_COOKIE;
/*********************************************************************************** /***********************************************************************************
* OS debugging and printing related definitions and data structure * OS debugging and printing related definitions and data structure
...@@ -471,7 +452,6 @@ do{ \ ...@@ -471,7 +452,6 @@ do{ \
#define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt) #define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt)
#define DBGPRINT_ERR(Fmt) \ #define DBGPRINT_ERR(Fmt) \
{ \ { \
printk("ERROR!!! "); \ printk("ERROR!!! "); \
...@@ -483,7 +463,6 @@ do{ \ ...@@ -483,7 +463,6 @@ do{ \
printk Fmt; \ printk Fmt; \
} }
#else #else
#define DBGPRINT(Level, Fmt) #define DBGPRINT(Level, Fmt)
#define DBGPRINT_RAW(Level, Fmt) #define DBGPRINT_RAW(Level, Fmt)
...@@ -495,18 +474,18 @@ do{ \ ...@@ -495,18 +474,18 @@ do{ \
void hex_dump(char *str, unsigned char *pSrcBufVA, unsigned int SrcBufLen); void hex_dump(char *str, unsigned char *pSrcBufVA, unsigned int SrcBufLen);
/********************************************************************************************************* /*********************************************************************************************************
The following code are not revised, temporary put it here. The following code are not revised, temporary put it here.
*********************************************************************************************************/ *********************************************************************************************************/
/*********************************************************************************** /***********************************************************************************
* Device DMA Access related definitions and data structures. * Device DMA Access related definitions and data structures.
**********************************************************************************/ **********************************************************************************/
#ifdef RTMP_MAC_PCI #ifdef RTMP_MAC_PCI
dma_addr_t linux_pci_map_single(void *handle, void *ptr, size_t size, int sd_idx, int direction); dma_addr_t linux_pci_map_single(void *handle, void *ptr, size_t size,
void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int direction); int sd_idx, int direction);
void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size,
int direction);
#define PCI_MAP_SINGLE(_handle, _ptr, _size, _sd_idx, _dir) \ #define PCI_MAP_SINGLE(_handle, _ptr, _size, _sd_idx, _dir) \
linux_pci_map_single(_handle, _ptr, _size, _sd_idx, _dir) linux_pci_map_single(_handle, _ptr, _size, _sd_idx, _dir)
...@@ -562,8 +541,6 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int ...@@ -562,8 +541,6 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int
#define NdisMIndicateStatus(_w, _x, _y, _z) #define NdisMIndicateStatus(_w, _x, _y, _z)
/*********************************************************************************** /***********************************************************************************
* Device Register I/O Access related definitions and data structures. * Device Register I/O Access related definitions and data structures.
**********************************************************************************/ **********************************************************************************/
...@@ -729,7 +706,6 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int ...@@ -729,7 +706,6 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int
#define GET_OS_PKT_NEXT(_pkt) \ #define GET_OS_PKT_NEXT(_pkt) \
(RTPKT_TO_OSPKT(_pkt)->next) (RTPKT_TO_OSPKT(_pkt)->next)
#define OS_PKT_CLONED(_pkt) skb_cloned(RTPKT_TO_OSPKT(_pkt)) #define OS_PKT_CLONED(_pkt) skb_cloned(RTPKT_TO_OSPKT(_pkt))
#define OS_NTOHS(_Val) \ #define OS_NTOHS(_Val) \
...@@ -783,7 +759,6 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int ...@@ -783,7 +759,6 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int
#define RTMP_SET_PACKET_MOREDATA(_p, _morebit) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7] = _morebit) #define RTMP_SET_PACKET_MOREDATA(_p, _morebit) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7] = _morebit)
#define RTMP_GET_PACKET_MOREDATA(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7]) #define RTMP_GET_PACKET_MOREDATA(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7])
// //
// Sepcific Pakcet Type definition // Sepcific Pakcet Type definition
// //
...@@ -863,13 +838,10 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int ...@@ -863,13 +838,10 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int
#define RTMP_GET_PACKET_IPV4(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+11] & RTMP_PACKET_SPECIFIC_IPV4) #define RTMP_GET_PACKET_IPV4(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+11] & RTMP_PACKET_SPECIFIC_IPV4)
// If this flag is set, it indicates that this EAPoL frame MUST be clear. // If this flag is set, it indicates that this EAPoL frame MUST be clear.
#define RTMP_SET_PACKET_CLEAR_EAP_FRAME(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+12] = _flg) #define RTMP_SET_PACKET_CLEAR_EAP_FRAME(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+12] = _flg)
#define RTMP_GET_PACKET_CLEAR_EAP_FRAME(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+12]) #define RTMP_GET_PACKET_CLEAR_EAP_FRAME(_p) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+12])
/* use bit3 of cb[CB_OFF+16] */ /* use bit3 of cb[CB_OFF+16] */
#define RTMP_SET_PACKET_5VT(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+22] = _flg) #define RTMP_SET_PACKET_5VT(_p, _flg) (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+22] = _flg)
...@@ -877,12 +849,10 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int ...@@ -877,12 +849,10 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size, int
/* Max skb->cb = 48B = [CB_OFF+38] */ /* Max skb->cb = 48B = [CB_OFF+38] */
/*********************************************************************************** /***********************************************************************************
* Other function prototypes definitions * Other function prototypes definitions
***********************************************************************************/ ***********************************************************************************/
void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time); void RTMP_GetCurrentSystemTime(LARGE_INTEGER * time);
int rt28xx_packet_xmit(struct sk_buff *skb); int rt28xx_packet_xmit(struct sk_buff *skb);
#ifdef RTMP_MAC_PCI #ifdef RTMP_MAC_PCI
...@@ -892,13 +862,10 @@ int rt28xx_packet_xmit(struct sk_buff *skb); ...@@ -892,13 +862,10 @@ int rt28xx_packet_xmit(struct sk_buff *skb);
IRQ_HANDLE_TYPE rt2860_interrupt(int irq, void *dev_instance); IRQ_HANDLE_TYPE rt2860_interrupt(int irq, void *dev_instance);
#endif // RTMP_MAC_PCI // #endif // RTMP_MAC_PCI //
INT rt28xx_sta_ioctl( INT rt28xx_sta_ioctl(IN PNET_DEV net_dev, IN OUT struct ifreq *rq, IN INT cmd);
IN PNET_DEV net_dev,
IN OUT struct ifreq *rq,
IN INT cmd);
extern int ra_mtd_write(int num, loff_t to, size_t len, const u_char *buf); extern int ra_mtd_write(int num, loff_t to, size_t len, const u_char * buf);
extern int ra_mtd_read(int num, loff_t from, size_t len, u_char *buf); extern int ra_mtd_read(int num, loff_t from, size_t len, u_char * buf);
#define GET_PAD_FROM_NET_DEV(_pAd, _net_dev) (_pAd) = (PRTMP_ADAPTER)(_net_dev)->ml_priv; #define GET_PAD_FROM_NET_DEV(_pAd, _net_dev) (_pAd) = (PRTMP_ADAPTER)(_net_dev)->ml_priv;
......
drivers/staging/rt2860/rtmp.h
View file @ 52b81c89
This source diff could not be displayed because it is too large. You can view the blob instead.
drivers/staging/rt2860/rtmp_chip.h
View file @ 52b81c89
...@@ -103,15 +103,12 @@ ...@@ -103,15 +103,12 @@
#define RETRY_LIMIT 10 #define RETRY_LIMIT 10
// ------------------------------------------------------ // ------------------------------------------------------
// BBP & RF definition // BBP & RF definition
// ------------------------------------------------------ // ------------------------------------------------------
#define BUSY 1 #define BUSY 1
#define IDLE 0 #define IDLE 0
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// EEPROM definition // EEPROM definition
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
...@@ -160,14 +157,12 @@ ...@@ -160,14 +157,12 @@
#define EEPROM_TXPOWER_DELTA 0x50 // 20MHZ AND 40 MHZ use different power. This is delta in 40MHZ. #define EEPROM_TXPOWER_DELTA 0x50 // 20MHZ AND 40 MHZ use different power. This is delta in 40MHZ.
#define VALID_EEPROM_VERSION 1 #define VALID_EEPROM_VERSION 1
/* /*
* EEPROM operation related marcos * EEPROM operation related marcos
*/ */
#define RT28xx_EEPROM_READ16(_pAd, _offset, _value) \ #define RT28xx_EEPROM_READ16(_pAd, _offset, _value) \
(_pAd)->chipOps.eeread((RTMP_ADAPTER *)(_pAd), (USHORT)(_offset), (PUSHORT)&(_value)) (_pAd)->chipOps.eeread((RTMP_ADAPTER *)(_pAd), (USHORT)(_offset), (PUSHORT)&(_value))
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// E2PROM data layout // E2PROM data layout
// ------------------------------------------------------------------- // -------------------------------------------------------------------
...@@ -183,7 +178,6 @@ typedef union _MCU_LEDCS_STRUC { ...@@ -183,7 +178,6 @@ typedef union _MCU_LEDCS_STRUC {
UCHAR word; UCHAR word;
} MCU_LEDCS_STRUC, *PMCU_LEDCS_STRUC; } MCU_LEDCS_STRUC, *PMCU_LEDCS_STRUC;
// //
// EEPROM antenna select format // EEPROM antenna select format
// //
...@@ -256,7 +250,7 @@ typedef union _EEPROM_TXPOWER_DELTA_STRUC { ...@@ -256,7 +250,7 @@ typedef union _EEPROM_TXPOWER_DELTA_STRUC {
struct { struct {
UCHAR DeltaValue:6; // Tx Power dalta value (MAX=4) UCHAR DeltaValue:6; // Tx Power dalta value (MAX=4)
UCHAR Type:1; // 1: plus the delta value, 0: minus the delta value UCHAR Type:1; // 1: plus the delta value, 0: minus the delta value
UCHAR TxPowerEnable:1;// Enable UCHAR TxPowerEnable:1; // Enable
} field; } field;
UCHAR value; UCHAR value;
} EEPROM_TXPOWER_DELTA_STRUC, *PEEPROM_TXPOWER_DELTA_STRUC; } EEPROM_TXPOWER_DELTA_STRUC, *PEEPROM_TXPOWER_DELTA_STRUC;
......
drivers/staging/rt2860/rtmp_ckipmic.h
View file @ 52b81c89
...@@ -46,33 +46,18 @@ typedef struct _MIC_CONTEXT { ...@@ -46,33 +46,18 @@ typedef struct _MIC_CONTEXT {
UCHAR part[4]; /* for conversion of message to u32 for mmh */ UCHAR part[4]; /* for conversion of message to u32 for mmh */
} MIC_CONTEXT, *PMIC_CONTEXT; } MIC_CONTEXT, *PMIC_CONTEXT;
VOID xor_128( VOID xor_128(IN PUCHAR a, IN PUCHAR b, OUT PUCHAR out);
IN PUCHAR a,
IN PUCHAR b,
OUT PUCHAR out);
UCHAR RTMPCkipSbox( UCHAR RTMPCkipSbox(IN UCHAR a);
IN UCHAR a);
VOID xor_32( VOID xor_32(IN PUCHAR a, IN PUCHAR b, OUT PUCHAR out);
IN PUCHAR a,
IN PUCHAR b,
OUT PUCHAR out);
VOID next_key( VOID next_key(IN PUCHAR key, IN INT round);
IN PUCHAR key,
IN INT round);
VOID byte_sub( VOID byte_sub(IN PUCHAR in, OUT PUCHAR out);
IN PUCHAR in,
OUT PUCHAR out);
VOID shift_row( VOID shift_row(IN PUCHAR in, OUT PUCHAR out);
IN PUCHAR in,
OUT PUCHAR out);
VOID mix_column( VOID mix_column(IN PUCHAR in, OUT PUCHAR out);
IN PUCHAR in,
OUT PUCHAR out);
#endif //__RTMP_CKIPMIC_H__ #endif //__RTMP_CKIPMIC_H__
drivers/staging/rt2860/rtmp_def.h
View file @ 52b81c89
...@@ -107,7 +107,6 @@ ...@@ -107,7 +107,6 @@
#define MAX_RX_PROCESS_CNT (RX_RING_SIZE) #define MAX_RX_PROCESS_CNT (RX_RING_SIZE)
/* /*
WMM Note: If memory of your system is not much, please reduce the definition; WMM Note: If memory of your system is not much, please reduce the definition;
or when you do WMM test, the queue for low priority AC will be full, i.e. or when you do WMM test, the queue for low priority AC will be full, i.e.
...@@ -133,7 +132,6 @@ ...@@ -133,7 +132,6 @@
#define MAX_PACKETS_IN_PS_QUEUE 128 //32 #define MAX_PACKETS_IN_PS_QUEUE 128 //32
#define WMM_NUM_OF_AC 4 /* AC0, AC1, AC2, and AC3 */ #define WMM_NUM_OF_AC 4 /* AC0, AC1, AC2, and AC3 */
#ifdef RTMP_EFUSE_SUPPORT #ifdef RTMP_EFUSE_SUPPORT
//2008/09/11:KH add to support efuse<-- //2008/09/11:KH add to support efuse<--
#define MAX_EEPROM_BIN_FILE_SIZE 1024 #define MAX_EEPROM_BIN_FILE_SIZE 1024
...@@ -303,7 +301,6 @@ ...@@ -303,7 +301,6 @@
#define ERRLOG_NO_INTERRUPT_RESOURCE 0x00000604L #define ERRLOG_NO_INTERRUPT_RESOURCE 0x00000604L
#define ERRLOG_NO_MEMORY_RESOURCE 0x00000605L #define ERRLOG_NO_MEMORY_RESOURCE 0x00000605L
// WDS definition // WDS definition
#define MAX_WDS_ENTRY 4 #define MAX_WDS_ENTRY 4
#define WDS_PAIRWISE_KEY_OFFSET 60 // WDS links uses pairwise key#60 ~ 63 in ASIC pairwise key table #define WDS_PAIRWISE_KEY_OFFSET 60 // WDS links uses pairwise key#60 ~ 63 in ASIC pairwise key table
...@@ -314,7 +311,6 @@ ...@@ -314,7 +311,6 @@
#define WDS_REPEATER_MODE 3 #define WDS_REPEATER_MODE 3
#define WDS_LAZY_MODE 4 #define WDS_LAZY_MODE 4
#define MAX_MESH_NUM 0 #define MAX_MESH_NUM 0
#define MAX_APCLI_NUM 0 #define MAX_APCLI_NUM 0
...@@ -336,7 +332,6 @@ ...@@ -336,7 +332,6 @@
#define MAIN_MBSSID 0 #define MAIN_MBSSID 0
#define FIRST_MBSSID 1 #define FIRST_MBSSID 1
#define MAX_BEACON_SIZE 512 #define MAX_BEACON_SIZE 512
// If the MAX_MBSSID_NUM is larger than 6, // If the MAX_MBSSID_NUM is larger than 6,
// it shall reserve some WCID space(wcid 222~253) for beacon frames. // it shall reserve some WCID space(wcid 222~253) for beacon frames.
...@@ -368,7 +363,6 @@ ...@@ -368,7 +363,6 @@
#define IsGroupKeyWCID(__wcid) (((__wcid) < LAST_SPECIFIC_WCID) && ((__wcid) >= (LAST_SPECIFIC_WCID - (MAX_MBSSID_NUM)))) #define IsGroupKeyWCID(__wcid) (((__wcid) < LAST_SPECIFIC_WCID) && ((__wcid) >= (LAST_SPECIFIC_WCID - (MAX_MBSSID_NUM))))
// definition to support multiple BSSID // definition to support multiple BSSID
#define BSS0 0 #define BSS0 0
#define BSS1 1 #define BSS1 1
...@@ -379,7 +373,6 @@ ...@@ -379,7 +373,6 @@
#define BSS6 6 #define BSS6 6
#define BSS7 7 #define BSS7 7
//============================================================ //============================================================
// Length definitions // Length definitions
#define PEER_KEY_NO 2 #define PEER_KEY_NO 2
...@@ -426,8 +419,8 @@ ...@@ -426,8 +419,8 @@
#define NUM_OF_TID 8 #define NUM_OF_TID 8
#define MAX_AID_BA 4 #define MAX_AID_BA 4
#define MAX_LEN_OF_BA_REC_TABLE ((NUM_OF_TID * MAX_LEN_OF_MAC_TABLE)/2)// (NUM_OF_TID*MAX_AID_BA + 32) //Block ACK recipient #define MAX_LEN_OF_BA_REC_TABLE ((NUM_OF_TID * MAX_LEN_OF_MAC_TABLE)/2) // (NUM_OF_TID*MAX_AID_BA + 32) //Block ACK recipient
#define MAX_LEN_OF_BA_ORI_TABLE ((NUM_OF_TID * MAX_LEN_OF_MAC_TABLE)/2)// (NUM_OF_TID*MAX_AID_BA + 32) // Block ACK originator #define MAX_LEN_OF_BA_ORI_TABLE ((NUM_OF_TID * MAX_LEN_OF_MAC_TABLE)/2) // (NUM_OF_TID*MAX_AID_BA + 32) // Block ACK originator
#define MAX_LEN_OF_BSS_TABLE 64 #define MAX_LEN_OF_BSS_TABLE 64
#define MAX_REORDERING_MPDU_NUM 512 #define MAX_REORDERING_MPDU_NUM 512
...@@ -457,7 +450,6 @@ ...@@ -457,7 +450,6 @@
#define BSS_ANY 2 // = Ndis802_11AutoUnknown #define BSS_ANY 2 // = Ndis802_11AutoUnknown
#define BSS_MONITOR 3 // = Ndis802_11Monitor #define BSS_MONITOR 3 // = Ndis802_11Monitor
// Reason code definitions // Reason code definitions
#define REASON_RESERVED 0 #define REASON_RESERVED 0
#define REASON_UNSPECIFY 1 #define REASON_UNSPECIFY 1
...@@ -566,7 +558,6 @@ ...@@ -566,7 +558,6 @@
#define IE_ADD_HT 61 // 802.11n d1. ADDITIONAL HT CAPABILITY. ELEMENT ID TBD #define IE_ADD_HT 61 // 802.11n d1. ADDITIONAL HT CAPABILITY. ELEMENT ID TBD
#define IE_ADD_HT2 53 // 802.11n d1. ADDITIONAL HT CAPABILITY. ELEMENT ID TBD #define IE_ADD_HT2 53 // 802.11n d1. ADDITIONAL HT CAPABILITY. ELEMENT ID TBD
// For 802.11n D3.03 // For 802.11n D3.03
//#define IE_NEW_EXT_CHA_OFFSET 62 // 802.11n d1. New extension channel offset elemet //#define IE_NEW_EXT_CHA_OFFSET 62 // 802.11n d1. New extension channel offset elemet
#define IE_SECONDARY_CH_OFFSET 62 // 802.11n D3.03 Secondary Channel Offset element #define IE_SECONDARY_CH_OFFSET 62 // 802.11n D3.03 Secondary Channel Offset element
...@@ -576,7 +567,6 @@ ...@@ -576,7 +567,6 @@
#define IE_OVERLAPBSS_SCAN_PARM 74 // 802.11n D3.03 #define IE_OVERLAPBSS_SCAN_PARM 74 // 802.11n D3.03
#define IE_EXT_CAPABILITY 127 // 802.11n D3.03 #define IE_EXT_CAPABILITY 127 // 802.11n D3.03
#define IE_WPA 221 // WPA #define IE_WPA 221 // WPA
#define IE_VENDOR_SPECIFIC 221 // Wifi WMM (WME) #define IE_VENDOR_SPECIFIC 221 // Wifi WMM (WME)
...@@ -619,11 +609,8 @@ ...@@ -619,11 +609,8 @@
#define WSC_STATE_MACHINE 17 #define WSC_STATE_MACHINE 17
#define WSC_UPNP_STATE_MACHINE 18 #define WSC_UPNP_STATE_MACHINE 18
#define WPA_STATE_MACHINE 23 #define WPA_STATE_MACHINE 23
// //
// STA's CONTROL/CONNECT state machine: states, events, total function # // STA's CONTROL/CONNECT state machine: states, events, total function #
// //
...@@ -703,7 +690,6 @@ ...@@ -703,7 +690,6 @@
#define MT2_PEER_HT_CATE 7 // 7.4.7 #define MT2_PEER_HT_CATE 7 // 7.4.7
#define MAX_PEER_CATE_MSG 7 #define MAX_PEER_CATE_MSG 7
#define MT2_MLME_ADD_BA_CATE 8 #define MT2_MLME_ADD_BA_CATE 8
#define MT2_MLME_ORI_DELBA_CATE 9 #define MT2_MLME_ORI_DELBA_CATE 9
#define MT2_MLME_REC_DELBA_CATE 10 #define MT2_MLME_REC_DELBA_CATE 10
...@@ -721,7 +707,6 @@ ...@@ -721,7 +707,6 @@
#define CATEGORY_RM 5 #define CATEGORY_RM 5
#define CATEGORY_HT 7 #define CATEGORY_HT 7
// DLS Action frame definition // DLS Action frame definition
#define ACTION_DLS_REQUEST 0 #define ACTION_DLS_REQUEST 0
#define ACTION_DLS_RESPONSE 1 #define ACTION_DLS_RESPONSE 1
...@@ -734,7 +719,6 @@ ...@@ -734,7 +719,6 @@
#define SPEC_TPCRP 3 #define SPEC_TPCRP 3
#define SPEC_CHANNEL_SWITCH 4 #define SPEC_CHANNEL_SWITCH 4
//BA Action field value //BA Action field value
#define ADDBA_REQ 0 #define ADDBA_REQ 0
#define ADDBA_RESP 1 #define ADDBA_RESP 1
...@@ -751,7 +735,6 @@ ...@@ -751,7 +735,6 @@
#define ACTION_MEASUREMENT_PILOT_ACTION 7 // 11y D9.0 #define ACTION_MEASUREMENT_PILOT_ACTION 7 // 11y D9.0
#define ACTION_DSE_POWER_CONSTRAINT 8 // 11y D9.0 #define ACTION_DSE_POWER_CONSTRAINT 8 // 11y D9.0
//HT Action field value //HT Action field value
#define NOTIFY_BW_ACTION 0 #define NOTIFY_BW_ACTION 0
#define SMPS_ACTION 1 #define SMPS_ACTION 1
...@@ -907,8 +890,6 @@ ...@@ -907,8 +890,6 @@
#define WPA_FUNC_SIZE (MAX_WPA_PTK_STATE * MAX_WPA_MSG) #define WPA_FUNC_SIZE (MAX_WPA_PTK_STATE * MAX_WPA_MSG)
// ============================================================================= // =============================================================================
// value domain of 802.11 header FC.Tyte, which is b3..b2 of the 1st-byte of MAC header // value domain of 802.11 header FC.Tyte, which is b3..b2 of the 1st-byte of MAC header
...@@ -1081,7 +1062,6 @@ ...@@ -1081,7 +1062,6 @@
#define MMPS_RSV 2 #define MMPS_RSV 2
#define MMPS_ENABLE 3 #define MMPS_ENABLE 3
// A-MSDU size // A-MSDU size
#define AMSDU_0 0 #define AMSDU_0 0
#define AMSDU_1 1 #define AMSDU_1 1
...@@ -1175,7 +1155,6 @@ ...@@ -1175,7 +1155,6 @@
#define CIPHER_TKIP_NO_MIC 7 // MIC appended by driver: not a valid value in hardware key table #define CIPHER_TKIP_NO_MIC 7 // MIC appended by driver: not a valid value in hardware key table
#define CIPHER_SMS4 8 #define CIPHER_SMS4 8
// LED Status. // LED Status.
#define LED_LINK_DOWN 0 #define LED_LINK_DOWN 0
#define LED_LINK_UP 1 #define LED_LINK_UP 1
...@@ -1205,7 +1184,6 @@ ...@@ -1205,7 +1184,6 @@
//definition of DRS //definition of DRS
#define MAX_STEP_OF_TX_RATE_SWITCH 32 #define MAX_STEP_OF_TX_RATE_SWITCH 32
// pre-allocated free NDIS PACKET/BUFFER poll for internal usage // pre-allocated free NDIS PACKET/BUFFER poll for internal usage
#define MAX_NUM_OF_FREE_NDIS_PACKET 128 #define MAX_NUM_OF_FREE_NDIS_PACKET 128
...@@ -1262,7 +1240,6 @@ ...@@ -1262,7 +1240,6 @@
// MBSSID definition // MBSSID definition
#define ENTRY_NOT_FOUND 0xFF #define ENTRY_NOT_FOUND 0xFF
/* After Linux 2.6.9, /* After Linux 2.6.9,
* VLAN module use Private (from user) interface flags (netdevice->priv_flags). * VLAN module use Private (from user) interface flags (netdevice->priv_flags).
* #define IFF_802_1Q_VLAN 0x1 -- 802.1Q VLAN device. in if.h * #define IFF_802_1Q_VLAN 0x1 -- 802.1Q VLAN device. in if.h
...@@ -1282,13 +1259,10 @@ ...@@ -1282,13 +1259,10 @@
#define INF_APCLI_DEV_NAME "apcli" #define INF_APCLI_DEV_NAME "apcli"
#define INF_MESH_DEV_NAME "mesh" #define INF_MESH_DEV_NAME "mesh"
// WEP Key TYPE // WEP Key TYPE
#define WEP_HEXADECIMAL_TYPE 0 #define WEP_HEXADECIMAL_TYPE 0
#define WEP_ASCII_TYPE 1 #define WEP_ASCII_TYPE 1
// WIRELESS EVENTS definition // WIRELESS EVENTS definition
/* Max number of char in custom event, refer to wireless_tools.28/wireless.20.h */ /* Max number of char in custom event, refer to wireless_tools.28/wireless.20.h */
#define IW_CUSTOM_MAX_LEN 255 /* In bytes */ #define IW_CUSTOM_MAX_LEN 255 /* In bytes */
...@@ -1375,7 +1349,6 @@ ...@@ -1375,7 +1349,6 @@
#define GUI_IDLE_POWER_SAVE 3 #define GUI_IDLE_POWER_SAVE 3
// -- // --
// definition for WpaSupport flag // definition for WpaSupport flag
#define WPA_SUPPLICANT_DISABLE 0 #define WPA_SUPPLICANT_DISABLE 0
#define WPA_SUPPLICANT_ENABLE 1 #define WPA_SUPPLICANT_ENABLE 1
...@@ -1418,10 +1391,8 @@ ...@@ -1418,10 +1391,8 @@
#define cpu2be16(x) SWAP16((x)) #define cpu2be16(x) SWAP16((x))
#define be2cpu16(x) SWAP16((x)) #define be2cpu16(x) SWAP16((x))
#define ABS(_x, _y) ((_x) > (_y)) ? ((_x) -(_y)) : ((_y) -(_x)) #define ABS(_x, _y) ((_x) > (_y)) ? ((_x) -(_y)) : ((_y) -(_x))
#define A2Dec(_X, _p) \ #define A2Dec(_X, _p) \
{ \ { \
UCHAR *p; \ UCHAR *p; \
...@@ -1435,7 +1406,6 @@ ...@@ -1435,7 +1406,6 @@
} \ } \
} }
#define A2Hex(_X, _p) \ #define A2Hex(_X, _p) \
do{ \ do{ \
char *__p; \ char *__p; \
...@@ -1454,5 +1424,3 @@ do{ \ ...@@ -1454,5 +1424,3 @@ do{ \
}while(0) }while(0)
#endif // __RTMP_DEF_H__ #endif // __RTMP_DEF_H__
drivers/staging/rt2860/rtmp_dot11.h
View file @ 52b81c89
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "rtmp_type.h" #include "rtmp_type.h"
// 4-byte HTC field. maybe included in any frame except non-QOS data frame. The Order bit must set 1. // 4-byte HTC field. maybe included in any frame except non-QOS data frame. The Order bit must set 1.
typedef struct PACKED { typedef struct PACKED {
UINT32 MA:1; //management action payload exist in (QoS Null+HTC) UINT32 MA:1; //management action payload exist in (QoS Null+HTC)
...@@ -58,7 +57,6 @@ typedef struct PACKED { ...@@ -58,7 +57,6 @@ typedef struct PACKED {
USHORT Txop_QueueSize:8; USHORT Txop_QueueSize:8;
} QOS_CONTROL, *PQOS_CONTROL; } QOS_CONTROL, *PQOS_CONTROL;
// 2-byte Frame control field // 2-byte Frame control field
typedef struct PACKED { typedef struct PACKED {
USHORT Ver:2; // Protocol version USHORT Ver:2; // Protocol version
...@@ -97,6 +95,6 @@ typedef struct PACKED _RTS_FRAME { ...@@ -97,6 +95,6 @@ typedef struct PACKED _RTS_FRAME {
USHORT Duration; USHORT Duration;
UCHAR Addr1[MAC_ADDR_LEN]; UCHAR Addr1[MAC_ADDR_LEN];
UCHAR Addr2[MAC_ADDR_LEN]; UCHAR Addr2[MAC_ADDR_LEN];
}RTS_FRAME, *PRTS_FRAME; } RTS_FRAME, *PRTS_FRAME;
#endif // __DOT11_BASE_H__ // #endif // __DOT11_BASE_H__ //
drivers/staging/rt2860/rtmp_iface.h
View file @ 52b81c89
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#ifndef __RTMP_IFACE_H__ #ifndef __RTMP_IFACE_H__
#define __RTMP_IFACE_H__ #define __RTMP_IFACE_H__
#ifdef RTMP_PCI_SUPPORT #ifdef RTMP_PCI_SUPPORT
#include "iface/rtmp_pci.h" #include "iface/rtmp_pci.h"
#endif // RTMP_PCI_SUPPORT // #endif // RTMP_PCI_SUPPORT //
...@@ -45,40 +44,32 @@ ...@@ -45,40 +44,32 @@
#include "iface/rtmp_usb.h" #include "iface/rtmp_usb.h"
#endif // RTMP_USB_SUPPORT // #endif // RTMP_USB_SUPPORT //
typedef struct _INF_PCI_CONFIG_ typedef struct _INF_PCI_CONFIG_ {
{
unsigned long CSRBaseAddress; // PCI MMIO Base Address, all access will use unsigned long CSRBaseAddress; // PCI MMIO Base Address, all access will use
unsigned int irq_num; unsigned int irq_num;
}INF_PCI_CONFIG; } INF_PCI_CONFIG;
typedef struct _INF_USB_CONFIG_ typedef struct _INF_USB_CONFIG_ {
{
UINT8 BulkInEpAddr; // bulk-in endpoint address UINT8 BulkInEpAddr; // bulk-in endpoint address
UINT8 BulkOutEpAddr[6]; // bulk-out endpoint address UINT8 BulkOutEpAddr[6]; // bulk-out endpoint address
}INF_USB_CONFIG; } INF_USB_CONFIG;
typedef struct _INF_RBUS_CONFIG_ typedef struct _INF_RBUS_CONFIG_ {
{
unsigned long csr_addr; unsigned long csr_addr;
unsigned int irq; unsigned int irq;
}INF_RBUS_CONFIG; } INF_RBUS_CONFIG;
typedef enum _RTMP_INF_TYPE_ {
typedef enum _RTMP_INF_TYPE_
{
RTMP_DEV_INF_UNKNOWN = 0, RTMP_DEV_INF_UNKNOWN = 0,
RTMP_DEV_INF_PCI = 1, RTMP_DEV_INF_PCI = 1,
RTMP_DEV_INF_USB = 2, RTMP_DEV_INF_USB = 2,
RTMP_DEV_INF_RBUS = 4, RTMP_DEV_INF_RBUS = 4,
}RTMP_INF_TYPE; } RTMP_INF_TYPE;
typedef union _RTMP_INF_CONFIG_{ typedef union _RTMP_INF_CONFIG_ {
struct _INF_PCI_CONFIG_ pciConfig; struct _INF_PCI_CONFIG_ pciConfig;
struct _INF_USB_CONFIG_ usbConfig; struct _INF_USB_CONFIG_ usbConfig;
struct _INF_RBUS_CONFIG_ rbusConfig; struct _INF_RBUS_CONFIG_ rbusConfig;
}RTMP_INF_CONFIG; } RTMP_INF_CONFIG;
#endif // __RTMP_IFACE_H__ // #endif // __RTMP_IFACE_H__ //
drivers/staging/rt2860/rtmp_mcu.h
View file @ 52b81c89
...@@ -38,18 +38,12 @@ ...@@ -38,18 +38,12 @@
#ifndef __RTMP_MCU_H__ #ifndef __RTMP_MCU_H__
#define __RTMP_MCU_H__ #define __RTMP_MCU_H__
INT RtmpAsicEraseFirmware(IN PRTMP_ADAPTER pAd);
INT RtmpAsicEraseFirmware( NDIS_STATUS RtmpAsicLoadFirmware(IN PRTMP_ADAPTER pAd);
IN PRTMP_ADAPTER pAd);
NDIS_STATUS RtmpAsicLoadFirmware( INT RtmpAsicSendCommandToMcu(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd);
INT RtmpAsicSendCommandToMcu(
IN PRTMP_ADAPTER pAd,
IN UCHAR Command, IN UCHAR Command,
IN UCHAR Token, IN UCHAR Token, IN UCHAR Arg0, IN UCHAR Arg1);
IN UCHAR Arg0,
IN UCHAR Arg1);
#endif // __RTMP_MCU_H__ // #endif // __RTMP_MCU_H__ //
drivers/staging/rt2860/rtmp_os.h
View file @ 52b81c89
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
--------- ---------- ---------------------------------------------- --------- ---------- ----------------------------------------------
*/ */
#ifndef __RTMP_OS_H__ #ifndef __RTMP_OS_H__
#define __RTMP_OS_H__ #define __RTMP_OS_H__
...@@ -42,8 +41,6 @@ ...@@ -42,8 +41,6 @@
#include "rt_linux.h" #include "rt_linux.h"
#endif // LINUX // #endif // LINUX //
/* /*
This data structure mainly strip some callback function defined in This data structure mainly strip some callback function defined in
"struct net_device" in kernel source "include/linux/netdevice.h". "struct net_device" in kernel source "include/linux/netdevice.h".
...@@ -51,29 +48,25 @@ ...@@ -51,29 +48,25 @@
The definition of this data structure may various depends on different The definition of this data structure may various depends on different
OS. Use it carefully. OS. Use it carefully.
*/ */
typedef struct _RTMP_OS_NETDEV_OP_HOOK_ typedef struct _RTMP_OS_NETDEV_OP_HOOK_ {
{
const struct net_device_ops *netdev_ops; const struct net_device_ops *netdev_ops;
void *priv; void *priv;
int priv_flags; int priv_flags;
unsigned char devAddr[6]; unsigned char devAddr[6];
unsigned char devName[16]; unsigned char devName[16];
unsigned char needProtcted; unsigned char needProtcted;
}RTMP_OS_NETDEV_OP_HOOK, *PRTMP_OS_NETDEV_OP_HOOK; } RTMP_OS_NETDEV_OP_HOOK, *PRTMP_OS_NETDEV_OP_HOOK;
typedef enum _RTMP_TASK_STATUS_ {
typedef enum _RTMP_TASK_STATUS_
{
RTMP_TASK_STAT_UNKNOWN = 0, RTMP_TASK_STAT_UNKNOWN = 0,
RTMP_TASK_STAT_INITED = 1, RTMP_TASK_STAT_INITED = 1,
RTMP_TASK_STAT_RUNNING = 2, RTMP_TASK_STAT_RUNNING = 2,
RTMP_TASK_STAT_STOPED = 4, RTMP_TASK_STAT_STOPED = 4,
}RTMP_TASK_STATUS; } RTMP_TASK_STATUS;
#define RTMP_TASK_CAN_DO_INSERT (RTMP_TASK_STAT_INITED |RTMP_TASK_STAT_RUNNING) #define RTMP_TASK_CAN_DO_INSERT (RTMP_TASK_STAT_INITED |RTMP_TASK_STAT_RUNNING)
#define RTMP_OS_TASK_NAME_LEN 16 #define RTMP_OS_TASK_NAME_LEN 16
typedef struct _RTMP_OS_TASK_ typedef struct _RTMP_OS_TASK_ {
{
char taskName[RTMP_OS_TASK_NAME_LEN]; char taskName[RTMP_OS_TASK_NAME_LEN];
void *priv; void *priv;
//unsigned long taskFlags; //unsigned long taskFlags;
...@@ -89,8 +82,7 @@ typedef struct _RTMP_OS_TASK_ ...@@ -89,8 +82,7 @@ typedef struct _RTMP_OS_TASK_
wait_queue_head_t kthread_q; wait_queue_head_t kthread_q;
BOOLEAN kthread_running; BOOLEAN kthread_running;
#endif #endif
}RTMP_OS_TASK; } RTMP_OS_TASK;
int RtmpOSIRQRequest(IN PNET_DEV pNetDev); int RtmpOSIRQRequest(IN PNET_DEV pNetDev);
int RtmpOSIRQRelease(IN PNET_DEV pNetDev); int RtmpOSIRQRelease(IN PNET_DEV pNetDev);
......
drivers/staging/rt2860/rtmp_timer.h
View file @ 52b81c89
...@@ -43,22 +43,19 @@ ...@@ -43,22 +43,19 @@
#include "rtmp_os.h" #include "rtmp_os.h"
#define DECLARE_TIMER_FUNCTION(_func) \ #define DECLARE_TIMER_FUNCTION(_func) \
void rtmp_timer_##_func(unsigned long data) void rtmp_timer_##_func(unsigned long data)
#define GET_TIMER_FUNCTION(_func) \ #define GET_TIMER_FUNCTION(_func) \
rtmp_timer_##_func rtmp_timer_##_func
/* ----------------- Timer Related MARCO ---------------*/ /* ----------------- Timer Related MARCO ---------------*/
// In some os or chipset, we have a lot of timer functions and will read/write register, // In some os or chipset, we have a lot of timer functions and will read/write register,
// it's not allowed in Linux USB sub-system to do it ( because of sleep issue when // it's not allowed in Linux USB sub-system to do it ( because of sleep issue when
// submit to ctrl pipe). So we need a wrapper function to take care it. // submit to ctrl pipe). So we need a wrapper function to take care it.
#ifdef RTMP_TIMER_TASK_SUPPORT #ifdef RTMP_TIMER_TASK_SUPPORT
typedef VOID (*RTMP_TIMER_TASK_HANDLE)( typedef VOID(*RTMP_TIMER_TASK_HANDLE) (IN PVOID SystemSpecific1,
IN PVOID SystemSpecific1,
IN PVOID FunctionContext, IN PVOID FunctionContext,
IN PVOID SystemSpecific2, IN PVOID SystemSpecific2,
IN PVOID SystemSpecific3); IN PVOID SystemSpecific3);
...@@ -76,26 +73,22 @@ typedef struct _RALINK_TIMER_STRUCT { ...@@ -76,26 +73,22 @@ typedef struct _RALINK_TIMER_STRUCT {
RTMP_TIMER_TASK_HANDLE handle; RTMP_TIMER_TASK_HANDLE handle;
void *pAd; void *pAd;
#endif // RTMP_TIMER_TASK_SUPPORT // #endif // RTMP_TIMER_TASK_SUPPORT //
}RALINK_TIMER_STRUCT, *PRALINK_TIMER_STRUCT; } RALINK_TIMER_STRUCT, *PRALINK_TIMER_STRUCT;
#ifdef RTMP_TIMER_TASK_SUPPORT #ifdef RTMP_TIMER_TASK_SUPPORT
typedef struct _RTMP_TIMER_TASK_ENTRY_ typedef struct _RTMP_TIMER_TASK_ENTRY_ {
{
RALINK_TIMER_STRUCT *pRaTimer; RALINK_TIMER_STRUCT *pRaTimer;
struct _RTMP_TIMER_TASK_ENTRY_ *pNext; struct _RTMP_TIMER_TASK_ENTRY_ *pNext;
}RTMP_TIMER_TASK_ENTRY; } RTMP_TIMER_TASK_ENTRY;
#define TIMER_QUEUE_SIZE_MAX 128 #define TIMER_QUEUE_SIZE_MAX 128
typedef struct _RTMP_TIMER_TASK_QUEUE_ typedef struct _RTMP_TIMER_TASK_QUEUE_ {
{
unsigned int status; unsigned int status;
unsigned char *pTimerQPoll; unsigned char *pTimerQPoll;
RTMP_TIMER_TASK_ENTRY *pQPollFreeList; RTMP_TIMER_TASK_ENTRY *pQPollFreeList;
RTMP_TIMER_TASK_ENTRY *pQHead; RTMP_TIMER_TASK_ENTRY *pQHead;
RTMP_TIMER_TASK_ENTRY *pQTail; RTMP_TIMER_TASK_ENTRY *pQTail;
}RTMP_TIMER_TASK_QUEUE; } RTMP_TIMER_TASK_QUEUE;
#define BUILD_TIMER_FUNCTION(_func) \ #define BUILD_TIMER_FUNCTION(_func) \
void rtmp_timer_##_func(unsigned long data) \ void rtmp_timer_##_func(unsigned long data) \
...@@ -122,7 +115,6 @@ void rtmp_timer_##_func(unsigned long data) \ ...@@ -122,7 +115,6 @@ void rtmp_timer_##_func(unsigned long data) \
} }
#endif // RTMP_TIMER_TASK_SUPPORT // #endif // RTMP_TIMER_TASK_SUPPORT //
DECLARE_TIMER_FUNCTION(MlmePeriodicExec); DECLARE_TIMER_FUNCTION(MlmePeriodicExec);
DECLARE_TIMER_FUNCTION(MlmeRssiReportExec); DECLARE_TIMER_FUNCTION(MlmeRssiReportExec);
DECLARE_TIMER_FUNCTION(AsicRxAntEvalTimeout); DECLARE_TIMER_FUNCTION(AsicRxAntEvalTimeout);
...@@ -152,5 +144,4 @@ DECLARE_TIMER_FUNCTION(RtmpUsbStaAsicForceWakeupTimeout); ...@@ -152,5 +144,4 @@ DECLARE_TIMER_FUNCTION(RtmpUsbStaAsicForceWakeupTimeout);
DECLARE_TIMER_FUNCTION(LedCtrlMain); DECLARE_TIMER_FUNCTION(LedCtrlMain);
#endif #endif
#endif // __RTMP_TIMER_H__ // #endif // __RTMP_TIMER_H__ //
drivers/staging/rt2860/rtmp_type.h
View file @ 52b81c89
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#ifndef __RTMP_TYPE_H__ #ifndef __RTMP_TYPE_H__
#define __RTMP_TYPE_H__ #define __RTMP_TYPE_H__
#define PACKED __attribute__ ((packed)) #define PACKED __attribute__ ((packed))
#ifdef LINUX #ifdef LINUX
...@@ -52,12 +51,12 @@ typedef int INT32; ...@@ -52,12 +51,12 @@ typedef int INT32;
typedef long long INT64; typedef long long INT64;
#endif // LINUX // #endif // LINUX //
typedef unsigned char * PUINT8; typedef unsigned char *PUINT8;
typedef unsigned short * PUINT16; typedef unsigned short *PUINT16;
typedef unsigned int * PUINT32; typedef unsigned int *PUINT32;
typedef unsigned long long * PUINT64; typedef unsigned long long *PUINT64;
typedef int * PINT32; typedef int *PINT32;
typedef long long * PINT64; typedef long long *PINT64;
// modified for fixing compile warning on Sigma 8634 platform // modified for fixing compile warning on Sigma 8634 platform
typedef char STRING; typedef char STRING;
...@@ -68,7 +67,6 @@ typedef signed int INT; ...@@ -68,7 +67,6 @@ typedef signed int INT;
typedef signed long LONG; typedef signed long LONG;
typedef signed long long LONGLONG; typedef signed long long LONGLONG;
#ifdef LINUX #ifdef LINUX
typedef unsigned char UCHAR; typedef unsigned char UCHAR;
typedef unsigned short USHORT; typedef unsigned short USHORT;
...@@ -82,14 +80,14 @@ typedef unsigned char BOOLEAN; ...@@ -82,14 +80,14 @@ typedef unsigned char BOOLEAN;
typedef void VOID; typedef void VOID;
#endif // LINUX // #endif // LINUX //
typedef char * PSTRING; typedef char *PSTRING;
typedef VOID * PVOID; typedef VOID *PVOID;
typedef CHAR * PCHAR; typedef CHAR *PCHAR;
typedef UCHAR * PUCHAR; typedef UCHAR *PUCHAR;
typedef USHORT * PUSHORT; typedef USHORT *PUSHORT;
typedef LONG * PLONG; typedef LONG *PLONG;
typedef ULONG * PULONG; typedef ULONG *PULONG;
typedef UINT * PUINT; typedef UINT *PUINT;
typedef unsigned int NDIS_MEDIA_STATE; typedef unsigned int NDIS_MEDIA_STATE;
...@@ -101,18 +99,15 @@ typedef union _LARGE_INTEGER { ...@@ -101,18 +99,15 @@ typedef union _LARGE_INTEGER {
INT64 QuadPart; INT64 QuadPart;
} LARGE_INTEGER; } LARGE_INTEGER;
// //
// Register set pair for initialzation register set definition // Register set pair for initialzation register set definition
// //
typedef struct _RTMP_REG_PAIR typedef struct _RTMP_REG_PAIR {
{
ULONG Register; ULONG Register;
ULONG Value; ULONG Value;
} RTMP_REG_PAIR, *PRTMP_REG_PAIR; } RTMP_REG_PAIR, *PRTMP_REG_PAIR;
typedef struct _REG_PAIR typedef struct _REG_PAIR {
{
UCHAR Register; UCHAR Register;
UCHAR Value; UCHAR Value;
} REG_PAIR, *PREG_PAIR; } REG_PAIR, *PREG_PAIR;
...@@ -120,8 +115,7 @@ typedef struct _REG_PAIR ...@@ -120,8 +115,7 @@ typedef struct _REG_PAIR
// //
// Register set pair for initialzation register set definition // Register set pair for initialzation register set definition
// //
typedef struct _RTMP_RF_REGS typedef struct _RTMP_RF_REGS {
{
UCHAR Channel; UCHAR Channel;
ULONG R1; ULONG R1;
ULONG R2; ULONG R2;
...@@ -136,12 +130,9 @@ typedef struct _FREQUENCY_ITEM { ...@@ -136,12 +130,9 @@ typedef struct _FREQUENCY_ITEM {
UCHAR K; UCHAR K;
} FREQUENCY_ITEM, *PFREQUENCY_ITEM; } FREQUENCY_ITEM, *PFREQUENCY_ITEM;
typedef int NTSTATUS; typedef int NTSTATUS;
#define STATUS_SUCCESS 0x00 #define STATUS_SUCCESS 0x00
#define STATUS_UNSUCCESSFUL 0x01 #define STATUS_UNSUCCESSFUL 0x01
#endif // __RTMP_TYPE_H__ // #endif // __RTMP_TYPE_H__ //
drivers/staging/rt2860/rtusb_io.h
View file @ 52b81c89
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
************************************************************************* *************************************************************************
*/ */
#ifndef __RTUSB_IO_H__ #ifndef __RTUSB_IO_H__
#define __RTUSB_IO_H__ #define __RTUSB_IO_H__
...@@ -75,7 +74,6 @@ ...@@ -75,7 +74,6 @@
#define CMDTHREAD_UPDATE_PROTECT 0x0D790103 // cmd #define CMDTHREAD_UPDATE_PROTECT 0x0D790103 // cmd
// end johnli // end johnli
//CMDTHREAD_MULTI_READ_MAC //CMDTHREAD_MULTI_READ_MAC
//CMDTHREAD_MULTI_WRITE_MAC //CMDTHREAD_MULTI_WRITE_MAC
//CMDTHREAD_VENDOR_EEPROM_READ //CMDTHREAD_VENDOR_EEPROM_READ
...@@ -86,7 +84,6 @@ typedef struct _CMDHandler_TLV { ...@@ -86,7 +84,6 @@ typedef struct _CMDHandler_TLV {
UCHAR DataFirst; UCHAR DataFirst;
} CMDHandler_TLV, *PCMDHandler_TLV; } CMDHandler_TLV, *PCMDHandler_TLV;
typedef struct _CmdQElmt { typedef struct _CmdQElmt {
UINT command; UINT command;
PVOID buffer; PVOID buffer;
...@@ -101,8 +98,7 @@ typedef struct _CmdQ { ...@@ -101,8 +98,7 @@ typedef struct _CmdQ {
CmdQElmt *head; CmdQElmt *head;
CmdQElmt *tail; CmdQElmt *tail;
UINT32 CmdQState; UINT32 CmdQState;
}CmdQ, *PCmdQ; } CmdQ, *PCmdQ;
#define EnqueueCmd(cmdq, cmdqelmt) \ #define EnqueueCmd(cmdq, cmdqelmt) \
{ \ { \
...@@ -115,7 +111,6 @@ typedef struct _CmdQ { ...@@ -115,7 +111,6 @@ typedef struct _CmdQ {
cmdq->size++; \ cmdq->size++; \
} }
/****************************************************************************** /******************************************************************************
USB Cmd to ASIC Related MACRO USB Cmd to ASIC Related MACRO
...@@ -185,5 +180,4 @@ typedef struct _CmdQ { ...@@ -185,5 +180,4 @@ typedef struct _CmdQ {
RTUSBEnqueueInternalCmd((_pAd), CMDTHREAD_SET_ASIC_WCID, &SetAsicWcid, sizeof(RT_SET_ASIC_WCID)); \ RTUSBEnqueueInternalCmd((_pAd), CMDTHREAD_SET_ASIC_WCID, &SetAsicWcid, sizeof(RT_SET_ASIC_WCID)); \
}while(0) }while(0)
#endif // __RTUSB_IO_H__ // #endif // __RTUSB_IO_H__ //
drivers/staging/rt2860/spectrum.h
View file @ 52b81c89
...@@ -31,10 +31,7 @@ ...@@ -31,10 +31,7 @@
#include "rtmp_type.h" #include "rtmp_type.h"
#include "spectrum_def.h" #include "spectrum_def.h"
CHAR RTMP_GetTxPwr(IN PRTMP_ADAPTER pAd, IN HTTRANSMIT_SETTING HTTxMode);
CHAR RTMP_GetTxPwr(
IN PRTMP_ADAPTER pAd,
IN HTTRANSMIT_SETTING HTTxMode);
/* /*
========================================================================== ==========================================================================
...@@ -48,8 +45,7 @@ CHAR RTMP_GetTxPwr( ...@@ -48,8 +45,7 @@ CHAR RTMP_GetTxPwr(
Return : None. Return : None.
========================================================================== ==========================================================================
*/ */
VOID MakeMeasurementReqFrame( VOID MakeMeasurementReqFrame(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd,
OUT PUCHAR pOutBuffer, OUT PUCHAR pOutBuffer,
OUT PULONG pFrameLen, OUT PULONG pFrameLen,
IN UINT8 TotalLen, IN UINT8 TotalLen,
...@@ -72,15 +68,13 @@ VOID MakeMeasurementReqFrame( ...@@ -72,15 +68,13 @@ VOID MakeMeasurementReqFrame(
Return : None. Return : None.
========================================================================== ==========================================================================
*/ */
VOID EnqueueMeasurementRep( VOID EnqueueMeasurementRep(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd,
IN PUCHAR pDA, IN PUCHAR pDA,
IN UINT8 DialogToken, IN UINT8 DialogToken,
IN UINT8 MeasureToken, IN UINT8 MeasureToken,
IN UINT8 MeasureReqMode, IN UINT8 MeasureReqMode,
IN UINT8 MeasureReqType, IN UINT8 MeasureReqType,
IN UINT8 ReportInfoLen, IN UINT8 ReportInfoLen, IN PUINT8 pReportInfo);
IN PUINT8 pReportInfo);
/* /*
========================================================================== ==========================================================================
...@@ -94,10 +88,7 @@ VOID EnqueueMeasurementRep( ...@@ -94,10 +88,7 @@ VOID EnqueueMeasurementRep(
Return : None. Return : None.
========================================================================== ==========================================================================
*/ */
VOID EnqueueTPCReq( VOID EnqueueTPCReq(IN PRTMP_ADAPTER pAd, IN PUCHAR pDA, IN UCHAR DialogToken);
IN PRTMP_ADAPTER pAd,
IN PUCHAR pDA,
IN UCHAR DialogToken);
/* /*
========================================================================== ==========================================================================
...@@ -111,12 +102,9 @@ VOID EnqueueTPCReq( ...@@ -111,12 +102,9 @@ VOID EnqueueTPCReq(
Return : None. Return : None.
========================================================================== ==========================================================================
*/ */
VOID EnqueueTPCRep( VOID EnqueueTPCRep(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd,
IN PUCHAR pDA, IN PUCHAR pDA,
IN UINT8 DialogToken, IN UINT8 DialogToken, IN UINT8 TxPwr, IN UINT8 LinkMargin);
IN UINT8 TxPwr,
IN UINT8 LinkMargin);
/* /*
========================================================================== ==========================================================================
...@@ -132,11 +120,8 @@ VOID EnqueueTPCRep( ...@@ -132,11 +120,8 @@ VOID EnqueueTPCRep(
Return : None. Return : None.
========================================================================== ==========================================================================
*/ */
VOID EnqueueChSwAnn( VOID EnqueueChSwAnn(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN PUCHAR pDA, IN UINT8 ChSwMode, IN UINT8 NewCh);
IN PUCHAR pDA,
IN UINT8 ChSwMode,
IN UINT8 NewCh);
/* /*
========================================================================== ==========================================================================
...@@ -150,9 +135,7 @@ VOID EnqueueChSwAnn( ...@@ -150,9 +135,7 @@ VOID EnqueueChSwAnn(
Return : None. Return : None.
========================================================================== ==========================================================================
*/ */
VOID PeerSpectrumAction( VOID PeerSpectrumAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem);
IN PRTMP_ADAPTER pAd,
IN MLME_QUEUE_ELEM *Elem);
/* /*
========================================================================== ==========================================================================
...@@ -163,73 +146,44 @@ VOID PeerSpectrumAction( ...@@ -163,73 +146,44 @@ VOID PeerSpectrumAction(
Return : None. Return : None.
========================================================================== ==========================================================================
*/ */
INT Set_MeasureReq_Proc( INT Set_MeasureReq_Proc(IN PRTMP_ADAPTER pAd, IN PSTRING arg);
IN PRTMP_ADAPTER pAd,
IN PSTRING arg);
INT Set_TpcReq_Proc( INT Set_TpcReq_Proc(IN PRTMP_ADAPTER pAd, IN PSTRING arg);
IN PRTMP_ADAPTER pAd,
IN PSTRING arg);
INT Set_PwrConstraint( INT Set_PwrConstraint(IN PRTMP_ADAPTER pAd, IN PSTRING arg);
IN PRTMP_ADAPTER pAd,
IN PSTRING arg);
VOID MeasureReqTabInit(IN PRTMP_ADAPTER pAd);
VOID MeasureReqTabInit( VOID MeasureReqTabExit(IN PRTMP_ADAPTER pAd);
IN PRTMP_ADAPTER pAd);
VOID MeasureReqTabExit( PMEASURE_REQ_ENTRY MeasureReqLookUp(IN PRTMP_ADAPTER pAd, IN UINT8 DialogToken);
IN PRTMP_ADAPTER pAd);
PMEASURE_REQ_ENTRY MeasureReqLookUp( PMEASURE_REQ_ENTRY MeasureReqInsert(IN PRTMP_ADAPTER pAd, IN UINT8 DialogToken);
IN PRTMP_ADAPTER pAd,
IN UINT8 DialogToken);
PMEASURE_REQ_ENTRY MeasureReqInsert( VOID MeasureReqDelete(IN PRTMP_ADAPTER pAd, IN UINT8 DialogToken);
IN PRTMP_ADAPTER pAd,
IN UINT8 DialogToken);
VOID MeasureReqDelete( VOID InsertChannelRepIE(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd,
IN UINT8 DialogToken);
VOID InsertChannelRepIE(
IN PRTMP_ADAPTER pAd,
OUT PUCHAR pFrameBuf, OUT PUCHAR pFrameBuf,
OUT PULONG pFrameLen, OUT PULONG pFrameLen,
IN PSTRING pCountry, IN PSTRING pCountry, IN UINT8 RegulatoryClass);
IN UINT8 RegulatoryClass);
VOID InsertTpcReportIE( VOID InsertTpcReportIE(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd,
OUT PUCHAR pFrameBuf, OUT PUCHAR pFrameBuf,
OUT PULONG pFrameLen, OUT PULONG pFrameLen,
IN UINT8 TxPwr, IN UINT8 TxPwr, IN UINT8 LinkMargin);
IN UINT8 LinkMargin);
VOID InsertDialogToken( VOID InsertDialogToken(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd,
OUT PUCHAR pFrameBuf, OUT PUCHAR pFrameBuf,
OUT PULONG pFrameLen, OUT PULONG pFrameLen, IN UINT8 DialogToken);
IN UINT8 DialogToken);
VOID TpcReqTabInit( VOID TpcReqTabInit(IN PRTMP_ADAPTER pAd);
IN PRTMP_ADAPTER pAd);
VOID TpcReqTabExit( VOID TpcReqTabExit(IN PRTMP_ADAPTER pAd);
IN PRTMP_ADAPTER pAd);
VOID NotifyChSwAnnToPeerAPs( VOID NotifyChSwAnnToPeerAPs(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd,
IN PUCHAR pRA, IN PUCHAR pRA,
IN PUCHAR pTA, IN PUCHAR pTA, IN UINT8 ChSwMode, IN UINT8 Channel);
IN UINT8 ChSwMode,
IN UINT8 Channel);
VOID RguClass_BuildBcnChList(
IN PRTMP_ADAPTER pAd,
OUT PUCHAR pBuf,
OUT PULONG pBufLen);
#endif // __SPECTRUM_H__ //
VOID RguClass_BuildBcnChList(IN PRTMP_ADAPTER pAd,
OUT PUCHAR pBuf, OUT PULONG pBufLen);
#endif // __SPECTRUM_H__ //
drivers/staging/rt2860/spectrum_def.h
View file @ 52b81c89
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#ifndef __SPECTRUM_DEF_H__ #ifndef __SPECTRUM_DEF_H__
#define __SPECTRUM_DEF_H__ #define __SPECTRUM_DEF_H__
#define MAX_MEASURE_REQ_TAB_SIZE 32 #define MAX_MEASURE_REQ_TAB_SIZE 32
#define MAX_HASH_MEASURE_REQ_TAB_SIZE MAX_MEASURE_REQ_TAB_SIZE #define MAX_HASH_MEASURE_REQ_TAB_SIZE MAX_MEASURE_REQ_TAB_SIZE
...@@ -54,8 +53,7 @@ ...@@ -54,8 +53,7 @@
#define TPC_DIALOGTOKEN_HASH_INDEX(_DialogToken) ((_DialogToken) % MAX_HASH_TPC_REQ_TAB_SIZE) #define TPC_DIALOGTOKEN_HASH_INDEX(_DialogToken) ((_DialogToken) % MAX_HASH_TPC_REQ_TAB_SIZE)
#define MQ_DIALOGTOKEN_HASH_INDEX(_DialogToken) ((_DialogToken) % MAX_MEASURE_REQ_TAB_SIZE) #define MQ_DIALOGTOKEN_HASH_INDEX(_DialogToken) ((_DialogToken) % MAX_MEASURE_REQ_TAB_SIZE)
typedef struct _MEASURE_REQ_ENTRY typedef struct _MEASURE_REQ_ENTRY {
{
struct _MEASURE_REQ_ENTRY *pNext; struct _MEASURE_REQ_ENTRY *pNext;
ULONG lastTime; ULONG lastTime;
BOOLEAN Valid; BOOLEAN Valid;
...@@ -63,45 +61,37 @@ typedef struct _MEASURE_REQ_ENTRY ...@@ -63,45 +61,37 @@ typedef struct _MEASURE_REQ_ENTRY
UINT8 MeasureDialogToken[3]; // 0:basic measure, 1: CCA measure, 2: RPI_Histogram measure. UINT8 MeasureDialogToken[3]; // 0:basic measure, 1: CCA measure, 2: RPI_Histogram measure.
} MEASURE_REQ_ENTRY, *PMEASURE_REQ_ENTRY; } MEASURE_REQ_ENTRY, *PMEASURE_REQ_ENTRY;
typedef struct _MEASURE_REQ_TAB typedef struct _MEASURE_REQ_TAB {
{
UCHAR Size; UCHAR Size;
PMEASURE_REQ_ENTRY Hash[MAX_HASH_MEASURE_REQ_TAB_SIZE]; PMEASURE_REQ_ENTRY Hash[MAX_HASH_MEASURE_REQ_TAB_SIZE];
MEASURE_REQ_ENTRY Content[MAX_MEASURE_REQ_TAB_SIZE]; MEASURE_REQ_ENTRY Content[MAX_MEASURE_REQ_TAB_SIZE];
} MEASURE_REQ_TAB, *PMEASURE_REQ_TAB; } MEASURE_REQ_TAB, *PMEASURE_REQ_TAB;
typedef struct _TPC_REQ_ENTRY typedef struct _TPC_REQ_ENTRY {
{
struct _TPC_REQ_ENTRY *pNext; struct _TPC_REQ_ENTRY *pNext;
ULONG lastTime; ULONG lastTime;
BOOLEAN Valid; BOOLEAN Valid;
UINT8 DialogToken; UINT8 DialogToken;
} TPC_REQ_ENTRY, *PTPC_REQ_ENTRY; } TPC_REQ_ENTRY, *PTPC_REQ_ENTRY;
typedef struct _TPC_REQ_TAB typedef struct _TPC_REQ_TAB {
{
UCHAR Size; UCHAR Size;
PTPC_REQ_ENTRY Hash[MAX_HASH_TPC_REQ_TAB_SIZE]; PTPC_REQ_ENTRY Hash[MAX_HASH_TPC_REQ_TAB_SIZE];
TPC_REQ_ENTRY Content[MAX_TPC_REQ_TAB_SIZE]; TPC_REQ_ENTRY Content[MAX_TPC_REQ_TAB_SIZE];
} TPC_REQ_TAB, *PTPC_REQ_TAB; } TPC_REQ_TAB, *PTPC_REQ_TAB;
/* The regulatory information */ /* The regulatory information */
typedef struct _DOT11_CHANNEL_SET typedef struct _DOT11_CHANNEL_SET {
{
UCHAR NumberOfChannels; UCHAR NumberOfChannels;
UINT8 MaxTxPwr; UINT8 MaxTxPwr;
UCHAR ChannelList[16]; UCHAR ChannelList[16];
} DOT11_CHANNEL_SET, *PDOT11_CHANNEL_SET; } DOT11_CHANNEL_SET, *PDOT11_CHANNEL_SET;
typedef struct _DOT11_REGULATORY_INFORMATION typedef struct _DOT11_REGULATORY_INFORMATION {
{
UCHAR RegulatoryClass; UCHAR RegulatoryClass;
DOT11_CHANNEL_SET ChannelSet; DOT11_CHANNEL_SET ChannelSet;
} DOT11_REGULATORY_INFORMATION, *PDOT11_REGULATORY_INFORMATION; } DOT11_REGULATORY_INFORMATION, *PDOT11_REGULATORY_INFORMATION;
#define RM_TPC_REQ 0 #define RM_TPC_REQ 0
#define RM_MEASURE_REQ 1 #define RM_MEASURE_REQ 1
...@@ -111,53 +101,44 @@ typedef struct _DOT11_REGULATORY_INFORMATION ...@@ -111,53 +101,44 @@ typedef struct _DOT11_REGULATORY_INFORMATION
#define RM_CH_LOAD 3 #define RM_CH_LOAD 3
#define RM_NOISE_HISTOGRAM 4 #define RM_NOISE_HISTOGRAM 4
typedef struct PACKED _TPC_REPORT_INFO {
typedef struct PACKED _TPC_REPORT_INFO
{
UINT8 TxPwr; UINT8 TxPwr;
UINT8 LinkMargin; UINT8 LinkMargin;
} TPC_REPORT_INFO, *PTPC_REPORT_INFO; } TPC_REPORT_INFO, *PTPC_REPORT_INFO;
typedef struct PACKED _CH_SW_ANN_INFO typedef struct PACKED _CH_SW_ANN_INFO {
{
UINT8 ChSwMode; UINT8 ChSwMode;
UINT8 Channel; UINT8 Channel;
UINT8 ChSwCnt; UINT8 ChSwCnt;
} CH_SW_ANN_INFO, *PCH_SW_ANN_INFO; } CH_SW_ANN_INFO, *PCH_SW_ANN_INFO;
typedef union PACKED _MEASURE_REQ_MODE typedef union PACKED _MEASURE_REQ_MODE {
{ struct PACKED {
struct PACKED
{
UINT8 Parallel:1; UINT8 Parallel:1;
UINT8 Enable:1; UINT8 Enable:1;
UINT8 Request:1; UINT8 Request:1;
UINT8 Report:1; UINT8 Report:1;
UINT8 DurationMandatory:1; UINT8 DurationMandatory:1;
UINT8 :3; UINT8:3;
} field; } field;
UINT8 word; UINT8 word;
} MEASURE_REQ_MODE, *PMEASURE_REQ_MODE; } MEASURE_REQ_MODE, *PMEASURE_REQ_MODE;
typedef struct PACKED _MEASURE_REQ typedef struct PACKED _MEASURE_REQ {
{
UINT8 ChNum; UINT8 ChNum;
UINT64 MeasureStartTime; UINT64 MeasureStartTime;
UINT16 MeasureDuration; UINT16 MeasureDuration;
} MEASURE_REQ, *PMEASURE_REQ; } MEASURE_REQ, *PMEASURE_REQ;
typedef struct PACKED _MEASURE_REQ_INFO typedef struct PACKED _MEASURE_REQ_INFO {
{
UINT8 Token; UINT8 Token;
MEASURE_REQ_MODE ReqMode; MEASURE_REQ_MODE ReqMode;
UINT8 ReqType; UINT8 ReqType;
UINT8 Oct[0]; UINT8 Oct[0];
} MEASURE_REQ_INFO, *PMEASURE_REQ_INFO; } MEASURE_REQ_INFO, *PMEASURE_REQ_INFO;
typedef union PACKED _MEASURE_BASIC_REPORT_MAP typedef union PACKED _MEASURE_BASIC_REPORT_MAP {
{ struct PACKED {
struct PACKED
{
UINT8 BSS:1; UINT8 BSS:1;
UINT8 OfdmPreamble:1; UINT8 OfdmPreamble:1;
...@@ -169,34 +150,29 @@ typedef union PACKED _MEASURE_BASIC_REPORT_MAP ...@@ -169,34 +150,29 @@ typedef union PACKED _MEASURE_BASIC_REPORT_MAP
UINT8 word; UINT8 word;
} MEASURE_BASIC_REPORT_MAP, *PMEASURE_BASIC_REPORT_MAP; } MEASURE_BASIC_REPORT_MAP, *PMEASURE_BASIC_REPORT_MAP;
typedef struct PACKED _MEASURE_BASIC_REPORT typedef struct PACKED _MEASURE_BASIC_REPORT {
{
UINT8 ChNum; UINT8 ChNum;
UINT64 MeasureStartTime; UINT64 MeasureStartTime;
UINT16 MeasureDuration; UINT16 MeasureDuration;
MEASURE_BASIC_REPORT_MAP Map; MEASURE_BASIC_REPORT_MAP Map;
} MEASURE_BASIC_REPORT, *PMEASURE_BASIC_REPORT; } MEASURE_BASIC_REPORT, *PMEASURE_BASIC_REPORT;
typedef struct PACKED _MEASURE_CCA_REPORT typedef struct PACKED _MEASURE_CCA_REPORT {
{
UINT8 ChNum; UINT8 ChNum;
UINT64 MeasureStartTime; UINT64 MeasureStartTime;
UINT16 MeasureDuration; UINT16 MeasureDuration;
UINT8 CCA_Busy_Fraction; UINT8 CCA_Busy_Fraction;
} MEASURE_CCA_REPORT, *PMEASURE_CCA_REPORT; } MEASURE_CCA_REPORT, *PMEASURE_CCA_REPORT;
typedef struct PACKED _MEASURE_RPI_REPORT typedef struct PACKED _MEASURE_RPI_REPORT {
{
UINT8 ChNum; UINT8 ChNum;
UINT64 MeasureStartTime; UINT64 MeasureStartTime;
UINT16 MeasureDuration; UINT16 MeasureDuration;
UINT8 RPI_Density[8]; UINT8 RPI_Density[8];
} MEASURE_RPI_REPORT, *PMEASURE_RPI_REPORT; } MEASURE_RPI_REPORT, *PMEASURE_RPI_REPORT;
typedef union PACKED _MEASURE_REPORT_MODE typedef union PACKED _MEASURE_REPORT_MODE {
{ struct PACKED {
struct PACKED
{
UINT8 Late:1; UINT8 Late:1;
UINT8 Incapable:1; UINT8 Incapable:1;
UINT8 Refused:1; UINT8 Refused:1;
...@@ -205,16 +181,14 @@ typedef union PACKED _MEASURE_REPORT_MODE ...@@ -205,16 +181,14 @@ typedef union PACKED _MEASURE_REPORT_MODE
UINT8 word; UINT8 word;
} MEASURE_REPORT_MODE, *PMEASURE_REPORT_MODE; } MEASURE_REPORT_MODE, *PMEASURE_REPORT_MODE;
typedef struct PACKED _MEASURE_REPORT_INFO typedef struct PACKED _MEASURE_REPORT_INFO {
{
UINT8 Token; UINT8 Token;
UINT8 ReportMode; UINT8 ReportMode;
UINT8 ReportType; UINT8 ReportType;
UINT8 Octect[0]; UINT8 Octect[0];
} MEASURE_REPORT_INFO, *PMEASURE_REPORT_INFO; } MEASURE_REPORT_INFO, *PMEASURE_REPORT_INFO;
typedef struct PACKED _QUIET_INFO typedef struct PACKED _QUIET_INFO {
{
UINT8 QuietCnt; UINT8 QuietCnt;
UINT8 QuietPeriod; UINT8 QuietPeriod;
UINT16 QuietDuration; UINT16 QuietDuration;
...@@ -222,4 +196,3 @@ typedef struct PACKED _QUIET_INFO ...@@ -222,4 +196,3 @@ typedef struct PACKED _QUIET_INFO
} QUIET_INFO, *PQUIET_INFO; } QUIET_INFO, *PQUIET_INFO;
#endif // __SPECTRUM_DEF_H__ // #endif // __SPECTRUM_DEF_H__ //
drivers/staging/rt2860/wpa.h
View file @ 52b81c89
...@@ -147,7 +147,6 @@ ...@@ -147,7 +147,6 @@
#define AKM_SUITE 2 #define AKM_SUITE 2
#define PMKID_LIST 3 #define PMKID_LIST 3
#define EAPOL_START_DISABLE 0 #define EAPOL_START_DISABLE 0
#define EAPOL_START_PSK 1 #define EAPOL_START_PSK 1
#define EAPOL_START_1X 2 #define EAPOL_START_1X 2
...@@ -181,7 +180,6 @@ ...@@ -181,7 +180,6 @@
#define CONV_ARRARY_TO_UINT16(_V) ((_V[0]<<8) | (_V[1])) #define CONV_ARRARY_TO_UINT16(_V) ((_V[0]<<8) | (_V[1]))
#define ADD_ONE_To_64BIT_VAR(_V) \ #define ADD_ONE_To_64BIT_VAR(_V) \
{ \ { \
UCHAR cnt = LEN_KEY_DESC_REPLAY; \ UCHAR cnt = LEN_KEY_DESC_REPLAY; \
...@@ -197,8 +195,7 @@ ...@@ -197,8 +195,7 @@
#define IS_WPA_CAPABILITY(a) (((a) >= Ndis802_11AuthModeWPA) && ((a) <= Ndis802_11AuthModeWPA1PSKWPA2PSK)) #define IS_WPA_CAPABILITY(a) (((a) >= Ndis802_11AuthModeWPA) && ((a) <= Ndis802_11AuthModeWPA1PSKWPA2PSK))
// EAPOL Key Information definition within Key descriptor format // EAPOL Key Information definition within Key descriptor format
typedef struct PACKED _KEY_INFO typedef struct PACKED _KEY_INFO {
{
UCHAR KeyMic:1; UCHAR KeyMic:1;
UCHAR Secure:1; UCHAR Secure:1;
UCHAR Error:1; UCHAR Error:1;
...@@ -213,8 +210,7 @@ typedef struct PACKED _KEY_INFO ...@@ -213,8 +210,7 @@ typedef struct PACKED _KEY_INFO
} KEY_INFO, *PKEY_INFO; } KEY_INFO, *PKEY_INFO;
// EAPOL Key descriptor format // EAPOL Key descriptor format
typedef struct PACKED _KEY_DESCRIPTER typedef struct PACKED _KEY_DESCRIPTER {
{
UCHAR Type; UCHAR Type;
KEY_INFO KeyInfo; KEY_INFO KeyInfo;
UCHAR KeyLength[2]; UCHAR KeyLength[2];
...@@ -228,8 +224,7 @@ typedef struct PACKED _KEY_DESCRIPTER ...@@ -228,8 +224,7 @@ typedef struct PACKED _KEY_DESCRIPTER
UCHAR KeyData[MAX_LEN_OF_RSNIE]; UCHAR KeyData[MAX_LEN_OF_RSNIE];
} KEY_DESCRIPTER, *PKEY_DESCRIPTER; } KEY_DESCRIPTER, *PKEY_DESCRIPTER;
typedef struct PACKED _EAPOL_PACKET typedef struct PACKED _EAPOL_PACKET {
{
UCHAR ProVer; UCHAR ProVer;
UCHAR ProType; UCHAR ProType;
UCHAR Body_Len[2]; UCHAR Body_Len[2];
...@@ -237,8 +232,7 @@ typedef struct PACKED _EAPOL_PACKET ...@@ -237,8 +232,7 @@ typedef struct PACKED _EAPOL_PACKET
} EAPOL_PACKET, *PEAPOL_PACKET; } EAPOL_PACKET, *PEAPOL_PACKET;
//802.11i D10 page 83 //802.11i D10 page 83
typedef struct PACKED _GTK_ENCAP typedef struct PACKED _GTK_ENCAP {
{
UCHAR Kid:2; UCHAR Kid:2;
UCHAR tx:1; UCHAR tx:1;
UCHAR rsv:5; UCHAR rsv:5;
...@@ -246,8 +240,7 @@ typedef struct PACKED _GTK_ENCAP ...@@ -246,8 +240,7 @@ typedef struct PACKED _GTK_ENCAP
UCHAR GTK[TKIP_GTK_LENGTH]; UCHAR GTK[TKIP_GTK_LENGTH];
} GTK_ENCAP, *PGTK_ENCAP; } GTK_ENCAP, *PGTK_ENCAP;
typedef struct PACKED _KDE_ENCAP typedef struct PACKED _KDE_ENCAP {
{
UCHAR Type; UCHAR Type;
UCHAR Len; UCHAR Len;
UCHAR OUI[3]; UCHAR OUI[3];
...@@ -263,7 +256,7 @@ typedef struct PACKED _RSNIE { ...@@ -263,7 +256,7 @@ typedef struct PACKED _RSNIE {
USHORT ucount; USHORT ucount;
struct PACKED { struct PACKED {
UCHAR oui[4]; UCHAR oui[4];
}ucast[1]; } ucast[1];
} RSNIE, *PRSNIE; } RSNIE, *PRSNIE;
// For WPA2 // For WPA2
...@@ -273,7 +266,7 @@ typedef struct PACKED _RSNIE2 { ...@@ -273,7 +266,7 @@ typedef struct PACKED _RSNIE2 {
USHORT ucount; USHORT ucount;
struct PACKED { struct PACKED {
UCHAR oui[4]; UCHAR oui[4];
}ucast[1]; } ucast[1];
} RSNIE2, *PRSNIE2; } RSNIE2, *PRSNIE2;
// AKM Suite // AKM Suite
...@@ -281,8 +274,8 @@ typedef struct PACKED _RSNIE_AUTH { ...@@ -281,8 +274,8 @@ typedef struct PACKED _RSNIE_AUTH {
USHORT acount; USHORT acount;
struct PACKED { struct PACKED {
UCHAR oui[4]; UCHAR oui[4];
}auth[1]; } auth[1];
} RSNIE_AUTH,*PRSNIE_AUTH; } RSNIE_AUTH, *PRSNIE_AUTH;
typedef union PACKED _RSN_CAPABILITIES { typedef union PACKED _RSN_CAPABILITIES {
struct PACKED { struct PACKED {
...@@ -306,8 +299,7 @@ typedef struct PACKED _EAP_HDR { ...@@ -306,8 +299,7 @@ typedef struct PACKED _EAP_HDR {
// For supplicant state machine states. 802.11i Draft 4.1, p. 97 // For supplicant state machine states. 802.11i Draft 4.1, p. 97
// We simplified it // We simplified it
typedef enum _WpaState typedef enum _WpaState {
{
SS_NOTUSE, // 0 SS_NOTUSE, // 0
SS_START, // 1 SS_START, // 1
SS_WAIT_MSG_3, // 2 SS_WAIT_MSG_3, // 2
...@@ -333,8 +325,7 @@ typedef enum _WpaState ...@@ -333,8 +325,7 @@ typedef enum _WpaState
// | 1 | 1 | 1 | 1 | -> 0x0F // | 1 | 1 | 1 | 1 | -> 0x0F
// +------+-----+------+-----+ // +------+-----+------+-----+
// //
typedef enum _WpaMixPairCipher typedef enum _WpaMixPairCipher {
{
MIX_CIPHER_NOTUSE = 0x00, MIX_CIPHER_NOTUSE = 0x00,
WPA_NONE_WPA2_TKIPAES = 0x03, // WPA2-TKIPAES WPA_NONE_WPA2_TKIPAES = 0x03, // WPA2-TKIPAES
WPA_AES_WPA2_TKIP = 0x06, WPA_AES_WPA2_TKIP = 0x06,
...@@ -374,47 +365,29 @@ typedef struct PACKED _RSN_CAPABILITY { ...@@ -374,47 +365,29 @@ typedef struct PACKED _RSN_CAPABILITY {
USHORT PreAuth:1; USHORT PreAuth:1;
} RSN_CAPABILITY, *PRSN_CAPABILITY; } RSN_CAPABILITY, *PRSN_CAPABILITY;
/*======================================== /*========================================
The prototype is defined in cmm_wpa.c The prototype is defined in cmm_wpa.c
========================================*/ ========================================*/
BOOLEAN WpaMsgTypeSubst( BOOLEAN WpaMsgTypeSubst(IN UCHAR EAPType, OUT INT * MsgType);
IN UCHAR EAPType,
OUT INT *MsgType);
VOID PRF( VOID PRF(IN UCHAR * key,
IN UCHAR *key,
IN INT key_len, IN INT key_len,
IN UCHAR *prefix, IN UCHAR * prefix,
IN INT prefix_len, IN INT prefix_len,
IN UCHAR *data, IN UCHAR * data, IN INT data_len, OUT UCHAR * output, IN INT len);
IN INT data_len,
OUT UCHAR *output, int PasswordHash(char *password,
IN INT len); unsigned char *ssid, int ssidlength, unsigned char *output);
int PasswordHash( PUINT8 GetSuiteFromRSNIE(IN PUINT8 rsnie,
char *password, IN UINT rsnie_len, IN UINT8 type, OUT UINT8 * count);
unsigned char *ssid,
int ssidlength, VOID WpaShowAllsuite(IN PUINT8 rsnie, IN UINT rsnie_len);
unsigned char *output);
VOID RTMPInsertRSNIE(IN PUCHAR pFrameBuf,
PUINT8 GetSuiteFromRSNIE(
IN PUINT8 rsnie,
IN UINT rsnie_len,
IN UINT8 type,
OUT UINT8 *count);
VOID WpaShowAllsuite(
IN PUINT8 rsnie,
IN UINT rsnie_len);
VOID RTMPInsertRSNIE(
IN PUCHAR pFrameBuf,
OUT PULONG pFrameLen, OUT PULONG pFrameLen,
IN PUINT8 rsnie_ptr, IN PUINT8 rsnie_ptr,
IN UINT8 rsnie_len, IN UINT8 rsnie_len,
IN PUINT8 pmkid_ptr, IN PUINT8 pmkid_ptr, IN UINT8 pmkid_len);
IN UINT8 pmkid_len);
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7