Skip to content

K
Kernel

openeuler / Kernel
接近 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 62eb734b 编写于 作者: B Bartlomiej Zolnierkiewicz 提交者： Greg Kroah-Hartman
浏览文件
操作

Staging: rt28x0: remove typedefs (part three) 

Remove misc typedefs.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 8a10a546
展开全部 隐藏空白更改
内联 并排
Showing with 3628 addition and 3623 deletion
drivers/staging/rt2860/ap.h
浏览文件 @ 62eb734b
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
#define __AP_H__ #define __AP_H__
/* ap_wpa.c */ /* ap_wpa.c */
void WpaStateMachineInit(IN PRTMP_ADAPTER pAd, void WpaStateMachineInit(struct rt_rtmp_adapter *pAd,
IN STATE_MACHINE * Sm, OUT STATE_MACHINE_FUNC Trans[]); struct rt_state_machine *Sm, OUT STATE_MACHINE_FUNC Trans[]);
#ifdef RTMP_MAC_USB #ifdef RTMP_MAC_USB
void BeaconUpdateExec(void *SystemSpecific1, void BeaconUpdateExec(void *SystemSpecific1,
...@@ -50,17 +50,17 @@ void BeaconUpdateExec(void *SystemSpecific1, ...@@ -50,17 +50,17 @@ void BeaconUpdateExec(void *SystemSpecific1,
void *SystemSpecific2, void *SystemSpecific3); void *SystemSpecific2, void *SystemSpecific3);
#endif /* RTMP_MAC_USB // */ #endif /* RTMP_MAC_USB // */
void RTMPSetPiggyBack(IN PRTMP_ADAPTER pAd, IN BOOLEAN bPiggyBack); void RTMPSetPiggyBack(struct rt_rtmp_adapter *pAd, IN BOOLEAN bPiggyBack);
void MacTableReset(IN PRTMP_ADAPTER pAd); void MacTableReset(struct rt_rtmp_adapter *pAd);
MAC_TABLE_ENTRY *MacTableInsertEntry(IN PRTMP_ADAPTER pAd, struct rt_mac_table_entry *MacTableInsertEntry(struct rt_rtmp_adapter *pAd,
u8 *pAddr, u8 *pAddr,
u8 apidx, IN BOOLEAN CleanAll); u8 apidx, IN BOOLEAN CleanAll);
BOOLEAN MacTableDeleteEntry(IN PRTMP_ADAPTER pAd, BOOLEAN MacTableDeleteEntry(struct rt_rtmp_adapter *pAd,
u16 wcid, u8 *pAddr); u16 wcid, u8 *pAddr);
MAC_TABLE_ENTRY *MacTableLookup(IN PRTMP_ADAPTER pAd, u8 *pAddr); struct rt_mac_table_entry *MacTableLookup(struct rt_rtmp_adapter *pAd, u8 *pAddr);
#endif /* __AP_H__ */ #endif /* __AP_H__ */
drivers/staging/rt2860/chip/mac_pci.h
浏览文件 @ 62eb734b
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
// //
// TX descriptor format, Tx ring, Mgmt Ring // TX descriptor format, Tx ring, Mgmt Ring
// //
typedef struct PACKED _TXD_STRUC { struct PACKED rt_txd {
// Word 0 // Word 0
u32 SDPtr0; u32 SDPtr0;
// Word 1 // Word 1
...@@ -89,12 +89,12 @@ typedef struct PACKED _TXD_STRUC { ...@@ -89,12 +89,12 @@ typedef struct PACKED _TXD_STRUC {
u32 TCO:1; /* */ u32 TCO:1; /* */
u32 UCO:1; /* */ u32 UCO:1; /* */
u32 ICO:1; /* */ u32 ICO:1; /* */
} TXD_STRUC, *PTXD_STRUC; };
// //
// Rx descriptor format, Rx Ring // Rx descriptor format, Rx Ring
// //
typedef struct PACKED _RXD_STRUC { typedef struct PACKED rt_rxd {
// Word 0 // Word 0
u32 SDP0; u32 SDP0;
// Word 1 // Word 1
...@@ -125,7 +125,7 @@ typedef struct PACKED _RXD_STRUC { ...@@ -125,7 +125,7 @@ typedef struct PACKED _RXD_STRUC {
u32 PlcpSignal:1; /* To be moved */ u32 PlcpSignal:1; /* To be moved */
u32 PlcpRssil:1; /* To be moved */ u32 PlcpRssil:1; /* To be moved */
u32 Rsv1:13; u32 Rsv1:13;
} RXD_STRUC, *PRXD_STRUC, RT28XX_RXD_STRUC, *PRT28XX_RXD_STRUC; } RT28XX_RXD_STRUC, *PRT28XX_RXD_STRUC;
typedef union _TX_ATTENUATION_CTRL_STRUC { typedef union _TX_ATTENUATION_CTRL_STRUC {
struct { struct {
......
drivers/staging/rt2860/chip/mac_usb.h
浏览文件 @ 62eb734b
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
#define RXINFO_SIZE 4 #define RXINFO_SIZE 4
#define RT2870_RXDMALEN_FIELD_SIZE 4 #define RT2870_RXDMALEN_FIELD_SIZE 4
typedef struct PACKED _RXINFO_STRUC { typedef struct PACKED rt_rxinfo {
u32 BA:1; u32 BA:1;
u32 DATA:1; u32 DATA:1;
u32 NULLDATA:1; u32 NULLDATA:1;
...@@ -82,14 +82,14 @@ typedef struct PACKED _RXINFO_STRUC { ...@@ -82,14 +82,14 @@ typedef struct PACKED _RXINFO_STRUC {
u32 CipherAlg:1; u32 CipherAlg:1;
u32 LastAMSDU:1; u32 LastAMSDU:1;
u32 PlcpSignal:12; u32 PlcpSignal:12;
} RXINFO_STRUC, *PRXINFO_STRUC, RT28XX_RXD_STRUC, *PRT28XX_RXD_STRUC; } RT28XX_RXD_STRUC, *PRT28XX_RXD_STRUC;
/* */ /* */
/* TXINFO */ /* TXINFO */
/* */ /* */
#define TXINFO_SIZE 4 #define TXINFO_SIZE 4
typedef struct _TXINFO_STRUC { struct rt_txinfo {
/* Word 0 */ /* Word 0 */
u32 USBDMATxPktLen:16; /*used ONLY in USB bulk Aggregation, Total byte counts of all sub-frame. */ u32 USBDMATxPktLen:16; /*used ONLY in USB bulk Aggregation, Total byte counts of all sub-frame. */
u32 rsv:8; u32 rsv:8;
...@@ -99,47 +99,47 @@ typedef struct _TXINFO_STRUC { ...@@ -99,47 +99,47 @@ typedef struct _TXINFO_STRUC {
u32 rsv2:2; /* Software use. */ u32 rsv2:2; /* Software use. */
u32 USBDMANextVLD:1; /*used ONLY in USB bulk Aggregation, NextValid */ u32 USBDMANextVLD:1; /*used ONLY in USB bulk Aggregation, NextValid */
u32 USBDMATxburst:1; /*used ONLY in USB bulk Aggre. Force USB DMA transmit frame from current selected endpoint */ u32 USBDMATxburst:1; /*used ONLY in USB bulk Aggre. Force USB DMA transmit frame from current selected endpoint */
} TXINFO_STRUC, *PTXINFO_STRUC; };
/* */ /* */
/* Management ring buffer format */ /* Management ring buffer format */
/* */ /* */
typedef struct _MGMT_STRUC { struct rt_mgmt {
BOOLEAN Valid; BOOLEAN Valid;
u8 *pBuffer; u8 *pBuffer;
unsigned long Length; unsigned long Length;
} MGMT_STRUC, *PMGMT_STRUC; };
/*////////////////////////////////////////////////////////////////////////// */ /*////////////////////////////////////////////////////////////////////////// */
/* The TX_BUFFER structure forms the transmitted USB packet to the device */ /* The struct rt_tx_buffer structure forms the transmitted USB packet to the device */
/*////////////////////////////////////////////////////////////////////////// */ /*////////////////////////////////////////////////////////////////////////// */
typedef struct __TX_BUFFER { struct rt_tx_buffer {
union { union {
u8 WirelessPacket[TX_BUFFER_NORMSIZE]; u8 WirelessPacket[TX_BUFFER_NORMSIZE];
HEADER_802_11 NullFrame; struct rt_header_802_11 NullFrame;
PSPOLL_FRAME PsPollPacket; struct rt_pspoll_frame PsPollPacket;
RTS_FRAME RTSFrame; struct rt_rts_frame RTSFrame;
} field; } field;
u8 Aggregation[4]; /*Buffer for save Aggregation size. */ u8 Aggregation[4]; /*Buffer for save Aggregation size. */
} TX_BUFFER, *PTX_BUFFER; };
typedef struct __HTTX_BUFFER { struct rt_httx_buffer {
union { union {
u8 WirelessPacket[MAX_TXBULK_SIZE]; u8 WirelessPacket[MAX_TXBULK_SIZE];
HEADER_802_11 NullFrame; struct rt_header_802_11 NullFrame;
PSPOLL_FRAME PsPollPacket; struct rt_pspoll_frame PsPollPacket;
RTS_FRAME RTSFrame; struct rt_rts_frame RTSFrame;
} field; } field;
u8 Aggregation[4]; /*Buffer for save Aggregation size. */ u8 Aggregation[4]; /*Buffer for save Aggregation size. */
} HTTX_BUFFER, *PHTTX_BUFFER; };
/* used to track driver-generated write irps */ /* used to track driver-generated write irps */
typedef struct _TX_CONTEXT { struct rt_tx_context {
void *pAd; /*Initialized in MiniportInitialize */ void *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. */
/*Initialized in MiniportInitialize */ /*Initialized in MiniportInitialize */
PTX_BUFFER TransferBuffer; /*Initialized in MiniportInitialize */ struct rt_tx_buffer *TransferBuffer; /*Initialized in MiniportInitialize */
unsigned long BulkOutSize; unsigned long BulkOutSize;
u8 BulkOutPipeId; u8 BulkOutPipeId;
u8 SelfIdx; u8 SelfIdx;
...@@ -155,15 +155,15 @@ typedef struct _TX_CONTEXT { ...@@ -155,15 +155,15 @@ typedef struct _TX_CONTEXT {
u32 TxRate; u32 TxRate;
dma_addr_t data_dma; /* urb dma on linux */ dma_addr_t data_dma; /* urb dma on linux */
} 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 { struct rt_ht_tx_context {
void *pAd; /*Initialized in MiniportInitialize */ void *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. */
/*Initialized in MiniportInitialize */ /*Initialized in MiniportInitialize */
PHTTX_BUFFER TransferBuffer; /*Initialized in MiniportInitialize */ struct rt_httx_buffer *TransferBuffer; /*Initialized in MiniportInitialize */
unsigned long BulkOutSize; /* Indicate the total bulk-out size in bytes in one bulk-transmission */ unsigned long BulkOutSize; /* Indicate the total bulk-out size in bytes in one bulk-transmission */
u8 BulkOutPipeId; u8 BulkOutPipeId;
BOOLEAN IRPPending; BOOLEAN IRPPending;
...@@ -179,13 +179,13 @@ typedef struct _HT_TX_CONTEXT { ...@@ -179,13 +179,13 @@ typedef struct _HT_TX_CONTEXT {
unsigned long ENextBulkOutPosition; /* Indicate the buffer end offset of a bulk-transmission */ unsigned long ENextBulkOutPosition; /* Indicate the buffer end offset of a bulk-transmission */
u32 TxRate; u32 TxRate;
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; };
/* */ /* */
/* 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 { struct rt_rx_context {
u8 *TransferBuffer; u8 *TransferBuffer;
void *pAd; void *pAd;
PIRP pIrp; /*used to cancel pending bulk in. */ PIRP pIrp; /*used to cancel pending bulk in. */
...@@ -200,7 +200,7 @@ typedef struct _RX_CONTEXT { ...@@ -200,7 +200,7 @@ typedef struct _RX_CONTEXT {
atomic_t IrpLock; atomic_t IrpLock;
spinlock_t RxContextLock; spinlock_t RxContextLock;
dma_addr_t data_dma; /* urb dma on linux */ dma_addr_t data_dma; /* urb dma on linux */
} RX_CONTEXT, *PRX_CONTEXT; };
/****************************************************************************** /******************************************************************************
...@@ -309,7 +309,7 @@ typedef struct _RX_CONTEXT { ...@@ -309,7 +309,7 @@ typedef struct _RX_CONTEXT {
RTUSBMlmeUp(pAd); RTUSBMlmeUp(pAd);
#define RTMP_HANDLE_COUNTER_MEASURE(_pAd, _pEntry) \ #define RTMP_HANDLE_COUNTER_MEASURE(_pAd, _pEntry) \
{ RTUSBEnqueueInternalCmd(_pAd, CMDTHREAD_802_11_COUNTER_MEASURE, _pEntry, sizeof(MAC_TABLE_ENTRY)); \ { RTUSBEnqueueInternalCmd(_pAd, CMDTHREAD_802_11_COUNTER_MEASURE, _pEntry, sizeof(struct rt_mac_table_entry)); \
RTUSBMlmeUp(_pAd); \ RTUSBMlmeUp(_pAd); \
} }
......
drivers/staging/rt2860/chip/rt30xx.h
浏览文件 @ 62eb734b
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#ifdef RT30xx #ifdef RT30xx
extern REG_PAIR RT30xx_RFRegTable[]; extern struct rt_reg_pair RT30xx_RFRegTable[];
extern u8 NUM_RF_REG_PARMS; extern u8 NUM_RF_REG_PARMS;
#endif /* RT30xx // */ #endif /* RT30xx // */
......
drivers/staging/rt2860/chip/rtmp_mac.h
浏览文件 @ 62eb734b
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
/*txop : for txop mode */ /*txop : for txop mode */
/* 0:txop for the MPDU frame will be handles by ASIC by register */ /* 0:txop for the MPDU frame will be handles by ASIC by register */
/* 1/2/3:the MPDU frame is send after PIFS/backoff/SIFS */ /* 1/2/3:the MPDU frame is send after PIFS/backoff/SIFS */
typedef struct PACKED _TXWI_STRUC { struct PACKED rt_txwi {
/* Word 0 */ /* Word 0 */
/* ex: 00 03 00 40 means txop = 3, PHYMODE = 1 */ /* ex: 00 03 00 40 means txop = 3, PHYMODE = 1 */
u32 FRAG:1; /* 1 to inform TKIP engine this is a fragment. */ u32 FRAG:1; /* 1 to inform TKIP engine this is a fragment. */
...@@ -88,12 +88,12 @@ typedef struct PACKED _TXWI_STRUC { ...@@ -88,12 +88,12 @@ typedef struct PACKED _TXWI_STRUC {
u32 IV; u32 IV;
/*Word3 */ /*Word3 */
u32 EIV; u32 EIV;
} TXWI_STRUC, *PTXWI_STRUC; };
/* */ /* */
/* RXWI wireless information format, in PBF. invisible in driver. */ /* RXWI wireless information format, in PBF. invisible in driver. */
/* */ /* */
typedef struct PACKED _RXWI_STRUC { struct PACKED rt_rxwi {
/* Word 0 */ /* Word 0 */
u32 WirelessCliID:8; u32 WirelessCliID:8;
u32 KeyIndex:2; u32 KeyIndex:2;
...@@ -121,7 +121,7 @@ typedef struct PACKED _RXWI_STRUC { ...@@ -121,7 +121,7 @@ typedef struct PACKED _RXWI_STRUC {
u32 FOFFSET:8; /* RT35xx */ u32 FOFFSET:8; /* RT35xx */
u32 rsv2:8; u32 rsv2:8;
/*u32 rsv2:16; */ /*u32 rsv2:16; */
} RXWI_STRUC, *PRXWI_STRUC; };
/* ================================================================================= */ /* ================================================================================= */
/* Register format */ /* Register format */
...@@ -999,40 +999,41 @@ typedef union _SHAREDKEY_MODE_STRUC { ...@@ -999,40 +999,41 @@ typedef union _SHAREDKEY_MODE_STRUC {
} field; } field;
u32 word; u32 word;
} SHAREDKEY_MODE_STRUC, *PSHAREDKEY_MODE_STRUC; } SHAREDKEY_MODE_STRUC, *PSHAREDKEY_MODE_STRUC;
/* 64-entry for pairwise key table */
typedef struct _HW_WCID_ENTRY { /* 8-byte per entry */ /* 8-byte per entry, 64-entry for pairwise key table */
struct rt_hw_wcid_entry {
u8 Address[6]; u8 Address[6];
u8 Rsv[2]; u8 Rsv[2];
} HW_WCID_ENTRY, PHW_WCID_ENTRY; };
/* ================================================================================= */ /* ================================================================================= */
/* WCID format */ /* WCID format */
/* ================================================================================= */ /* ================================================================================= */
/*7.1 WCID ENTRY format : 8bytes */ /*7.1 WCID ENTRY format : 8bytes */
typedef struct _WCID_ENTRY_STRUC { struct rt_wcid_entry {
u8 RXBABitmap7; /* bit0 for TID8, bit7 for TID 15 */ u8 RXBABitmap7; /* bit0 for TID8, bit7 for TID 15 */
u8 RXBABitmap0; /* bit0 for TID0, bit7 for TID 7 */ u8 RXBABitmap0; /* bit0 for TID0, bit7 for TID 7 */
u8 MAC[6]; /* 0 for shared key table. 1 for pairwise key table */ u8 MAC[6]; /* 0 for shared key table. 1 for pairwise key table */
} WCID_ENTRY_STRUC, *PWCID_ENTRY_STRUC; };
/*8.1.1 SECURITY KEY format : 8DW */ /*8.1.1 SECURITY KEY format : 8DW */
/* 32-byte per entry, total 16-entry for shared key table, 64-entry for pairwise key table */ /* 32-byte per entry, total 16-entry for shared key table, 64-entry for pairwise key table */
typedef struct _HW_KEY_ENTRY { /* 32-byte per entry */ struct rt_hw_key_entry {
u8 Key[16]; u8 Key[16];
u8 TxMic[8]; u8 TxMic[8];
u8 RxMic[8]; u8 RxMic[8];
} HW_KEY_ENTRY, *PHW_KEY_ENTRY; };
/*8.1.2 IV/EIV format : 2DW */ /*8.1.2 IV/EIV format : 2DW */
/*8.1.3 RX attribute entry format : 1DW */ /*8.1.3 RX attribute entry format : 1DW */
typedef struct _MAC_ATTRIBUTE_STRUC { struct rt_mac_attribute {
u32 KeyTab:1; /* 0 for shared key table. 1 for pairwise key table */ u32 KeyTab:1; /* 0 for shared key table. 1 for pairwise key table */
u32 PairKeyMode:3; u32 PairKeyMode:3;
u32 BSSIDIdx:3; /*multipleBSS index for the WCID */ u32 BSSIDIdx:3; /*multipleBSS index for the WCID */
u32 RXWIUDF:3; u32 RXWIUDF:3;
u32 rsv:22; u32 rsv:22;
} MAC_ATTRIBUTE_STRUC, *PMAC_ATTRIBUTE_STRUC; };
/* ================================================================================= */ /* ================================================================================= */
/* HOST-MCU communication data structure */ /* HOST-MCU communication data structure */
......
drivers/staging/rt2860/chip/rtmp_phy.h
浏览文件 @ 62eb734b
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
#ifdef RTMP_MAC_PCI #ifdef RTMP_MAC_PCI
/* /*
basic marco for BBP read operation. basic marco for BBP read operation.
_pAd: the data structure pointer of RTMP_ADAPTER _pAd: the data structure pointer of struct rt_rtmp_adapter
_bbpID : the bbp register ID _bbpID : the bbp register ID
_pV: data pointer used to save the value of queried bbp register. _pV: data pointer used to save the value of queried bbp register.
_bViaMCU: if we need access the bbp via the MCU. _bViaMCU: if we need access the bbp via the MCU.
...@@ -370,7 +370,7 @@ ...@@ -370,7 +370,7 @@
/* /*
basic marco for BBP write operation. basic marco for BBP write operation.
_pAd: the data structure pointer of RTMP_ADAPTER _pAd: the data structure pointer of struct rt_rtmp_adapter
_bbpID : the bbp register ID _bbpID : the bbp register ID
_pV: data used to save the value of queried bbp register. _pV: data used to save the value of queried bbp register.
_bViaMCU: if we need access the bbp via the MCU. _bViaMCU: if we need access the bbp via the MCU.
......
drivers/staging/rt2860/chips/rt3070.c
浏览文件 @ 62eb734b
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip" #error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip"
#endif /* RTMP_RF_RW_SUPPORT // */ #endif /* RTMP_RF_RW_SUPPORT // */
void NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd) void NICInitRT3070RFRegisters(struct rt_rtmp_adapter *pAd)
{ {
int i; int i;
u8 RFValue; u8 RFValue;
......
drivers/staging/rt2860/chips/rt3090.c
浏览文件 @ 62eb734b
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip" #error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip"
#endif /* RTMP_RF_RW_SUPPORT // */ #endif /* RTMP_RF_RW_SUPPORT // */
void NICInitRT3090RFRegisters(IN PRTMP_ADAPTER pAd) void NICInitRT3090RFRegisters(struct rt_rtmp_adapter *pAd)
{ {
int i; int i;
/* Driver must read EEPROM to get RfIcType before initial RF registers */ /* Driver must read EEPROM to get RfIcType before initial RF registers */
......
drivers/staging/rt2860/chips/rt30xx.c
浏览文件 @ 62eb734b
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
/* */ /* */
/* RF register initialization set */ /* RF register initialization set */
/* */ /* */
REG_PAIR RT30xx_RFRegTable[] = { struct rt_reg_pair RT30xx_RFRegTable[] = {
{RF_R04, 0x40} {RF_R04, 0x40}
, ,
{RF_R05, 0x03} {RF_R05, 0x03}
...@@ -87,7 +87,7 @@ REG_PAIR RT30xx_RFRegTable[] = { ...@@ -87,7 +87,7 @@ REG_PAIR RT30xx_RFRegTable[] = {
, ,
}; };
u8 NUM_RF_REG_PARMS = (sizeof(RT30xx_RFRegTable) / sizeof(REG_PAIR)); u8 NUM_RF_REG_PARMS = (sizeof(RT30xx_RFRegTable) / sizeof(struct rt_reg_pair));
/* Antenna divesity use GPIO3 and EESK pin for control */ /* Antenna divesity use GPIO3 and EESK pin for control */
/* Antenna and EEPROM access are both using EESK pin, */ /* Antenna and EEPROM access are both using EESK pin, */
...@@ -95,7 +95,7 @@ u8 NUM_RF_REG_PARMS = (sizeof(RT30xx_RFRegTable) / sizeof(REG_PAIR)); ...@@ -95,7 +95,7 @@ u8 NUM_RF_REG_PARMS = (sizeof(RT30xx_RFRegTable) / sizeof(REG_PAIR));
/* Then restore antenna after EEPROM access */ /* Then restore antenna after EEPROM access */
/* The original name of this function is AsicSetRxAnt(), now change to */ /* The original name of this function is AsicSetRxAnt(), now change to */
/*void AsicSetRxAnt( */ /*void AsicSetRxAnt( */
void RT30xxSetRxAnt(IN PRTMP_ADAPTER pAd, u8 Ant) void RT30xxSetRxAnt(struct rt_rtmp_adapter *pAd, u8 Ant)
{ {
u32 Value; u32 Value;
#ifdef RTMP_MAC_PCI #ifdef RTMP_MAC_PCI
...@@ -159,7 +159,7 @@ void RT30xxSetRxAnt(IN PRTMP_ADAPTER pAd, u8 Ant) ...@@ -159,7 +159,7 @@ void RT30xxSetRxAnt(IN PRTMP_ADAPTER pAd, u8 Ant)
======================================================================== ========================================================================
*/ */
void RTMPFilterCalibration(IN PRTMP_ADAPTER pAd) void RTMPFilterCalibration(struct rt_rtmp_adapter *pAd)
{ {
u8 R55x = 0, value, FilterTarget = 0x1E, BBPValue = 0; u8 R55x = 0, value, FilterTarget = 0x1E, BBPValue = 0;
u32 loop = 0, count = 0, loopcnt = 0, ReTry = 0; u32 loop = 0, count = 0, loopcnt = 0, ReTry = 0;
...@@ -306,7 +306,7 @@ void RTMPFilterCalibration(IN PRTMP_ADAPTER pAd) ...@@ -306,7 +306,7 @@ void RTMPFilterCalibration(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void RT30xxLoadRFNormalModeSetup(IN PRTMP_ADAPTER pAd) void RT30xxLoadRFNormalModeSetup(struct rt_rtmp_adapter *pAd)
{ {
u8 RFValue; u8 RFValue;
...@@ -372,7 +372,7 @@ void RT30xxLoadRFNormalModeSetup(IN PRTMP_ADAPTER pAd) ...@@ -372,7 +372,7 @@ void RT30xxLoadRFNormalModeSetup(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void RT30xxLoadRFSleepModeSetup(IN PRTMP_ADAPTER pAd) void RT30xxLoadRFSleepModeSetup(struct rt_rtmp_adapter *pAd)
{ {
u8 RFValue; u8 RFValue;
u32 MACValue; u32 MACValue;
...@@ -428,7 +428,7 @@ void RT30xxLoadRFSleepModeSetup(IN PRTMP_ADAPTER pAd) ...@@ -428,7 +428,7 @@ void RT30xxLoadRFSleepModeSetup(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void RT30xxReverseRFSleepModeSetup(IN PRTMP_ADAPTER pAd) void RT30xxReverseRFSleepModeSetup(struct rt_rtmp_adapter *pAd)
{ {
u8 RFValue; u8 RFValue;
u32 MACValue; u32 MACValue;
...@@ -493,7 +493,7 @@ void RT30xxReverseRFSleepModeSetup(IN PRTMP_ADAPTER pAd) ...@@ -493,7 +493,7 @@ void RT30xxReverseRFSleepModeSetup(IN PRTMP_ADAPTER pAd)
/* end johnli */ /* end johnli */
void RT30xxHaltAction(IN PRTMP_ADAPTER pAd) void RT30xxHaltAction(struct rt_rtmp_adapter *pAd)
{ {
u32 TxPinCfg = 0x00050F0F; u32 TxPinCfg = 0x00050F0F;
......
drivers/staging/rt2860/chlist.h
浏览文件 @ 62eb734b
...@@ -49,28 +49,28 @@ ...@@ -49,28 +49,28 @@
#define BAND_24G 1 #define BAND_24G 1
#define BAND_BOTH 2 #define BAND_BOTH 2
typedef struct _CH_DESP { struct rt_ch_desp {
u8 FirstChannel; u8 FirstChannel;
u8 NumOfCh; u8 NumOfCh;
char MaxTxPwr; /* dBm */ char MaxTxPwr; /* dBm */
u8 Geography; /* 0:out door, 1:in door, 2:both */ u8 Geography; /* 0:out door, 1:in door, 2:both */
BOOLEAN DfsReq; /* Dfs require, 0: No, 1: yes. */ BOOLEAN DfsReq; /* Dfs require, 0: No, 1: yes. */
} CH_DESP, *PCH_DESP; };
typedef struct _CH_REGION { struct rt_ch_region {
u8 CountReg[3]; u8 CountReg[3];
u8 DfsType; /* 0: CE, 1: FCC, 2: JAP, 3:JAP_W53, JAP_W56 */ u8 DfsType; /* 0: CE, 1: FCC, 2: JAP, 3:JAP_W53, JAP_W56 */
CH_DESP ChDesp[10]; struct rt_ch_desp ChDesp[10];
} CH_REGION, *PCH_REGION; };
extern CH_REGION ChRegion[]; extern struct rt_ch_region ChRegion[];
typedef struct _CH_FREQ_MAP_ { struct rt_ch_freq_map {
u16 channel; u16 channel;
u16 freqKHz; u16 freqKHz;
} CH_FREQ_MAP; };
extern CH_FREQ_MAP CH_HZ_ID_MAP[]; extern struct rt_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) \
...@@ -103,15 +103,15 @@ extern int CH_HZ_ID_MAP_NUM; ...@@ -103,15 +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(struct rt_rtmp_adapter *pAd);
void BuildBeaconChList(IN PRTMP_ADAPTER pAd, void BuildBeaconChList(struct rt_rtmp_adapter *pAd,
u8 *pBuf, unsigned long *pBufLen); u8 *pBuf, unsigned long *pBufLen);
void N_ChannelCheck(IN PRTMP_ADAPTER pAd); void N_ChannelCheck(struct rt_rtmp_adapter *pAd);
void N_SetCenCh(IN PRTMP_ADAPTER pAd); void N_SetCenCh(struct rt_rtmp_adapter *pAd);
u8 GetCuntryMaxTxPwr(IN PRTMP_ADAPTER pAd, u8 channel); u8 GetCuntryMaxTxPwr(struct rt_rtmp_adapter *pAd, u8 channel);
#endif /* __CHLIST_H__ */ #endif /* __CHLIST_H__ */
drivers/staging/rt2860/common/action.c
浏览文件 @ 62eb734b
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "../rt_config.h" #include "../rt_config.h"
#include "action.h" #include "action.h"
static void ReservedAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem); static void ReservedAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem);
/* /*
========================================================================== ==========================================================================
...@@ -58,8 +58,8 @@ static void ReservedAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem); ...@@ -58,8 +58,8 @@ static void ReservedAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem);
MT2_CLS3ERR cls3err_action MT2_CLS3ERR cls3err_action
========================================================================== ==========================================================================
*/ */
void ActionStateMachineInit(IN PRTMP_ADAPTER pAd, void ActionStateMachineInit(struct rt_rtmp_adapter *pAd,
IN STATE_MACHINE * S, struct rt_state_machine *S,
OUT STATE_MACHINE_FUNC Trans[]) OUT STATE_MACHINE_FUNC Trans[])
{ {
StateMachineInit(S, (STATE_MACHINE_FUNC *) Trans, MAX_ACT_STATE, StateMachineInit(S, (STATE_MACHINE_FUNC *) Trans, MAX_ACT_STATE,
...@@ -98,19 +98,19 @@ void ActionStateMachineInit(IN PRTMP_ADAPTER pAd, ...@@ -98,19 +98,19 @@ void ActionStateMachineInit(IN PRTMP_ADAPTER pAd,
(STATE_MACHINE_FUNC) MlmeInvalidAction); (STATE_MACHINE_FUNC) MlmeInvalidAction);
} }
void MlmeADDBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) void MlmeADDBAAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
{ {
MLME_ADDBA_REQ_STRUCT *pInfo; struct rt_mlme_addba_req *pInfo;
u8 Addr[6]; u8 Addr[6];
u8 *pOutBuffer = NULL; u8 *pOutBuffer = NULL;
int NStatus; int NStatus;
unsigned long Idx; unsigned long Idx;
FRAME_ADDBA_REQ Frame; struct rt_frame_addba_req Frame;
unsigned long FrameLen; unsigned long FrameLen;
BA_ORI_ENTRY *pBAEntry = NULL; struct rt_ba_ori_entry *pBAEntry = NULL;
pInfo = (MLME_ADDBA_REQ_STRUCT *) Elem->Msg; pInfo = (struct rt_mlme_addba_req *)Elem->Msg;
NdisZeroMemory(&Frame, sizeof(FRAME_ADDBA_REQ)); NdisZeroMemory(&Frame, sizeof(struct rt_frame_addba_req));
if (MlmeAddBAReqSanity(pAd, Elem->Msg, Elem->MsgLen, Addr)) { if (MlmeAddBAReqSanity(pAd, Elem->Msg, Elem->MsgLen, Addr)) {
NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); /*Get an unused nonpaged memory */ NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); /*Get an unused nonpaged memory */
...@@ -161,7 +161,7 @@ void MlmeADDBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -161,7 +161,7 @@ void MlmeADDBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Frame.BaStartSeq.word = cpu2le16(Frame.BaStartSeq.word); Frame.BaStartSeq.word = cpu2le16(Frame.BaStartSeq.word);
MakeOutgoingFrame(pOutBuffer, &FrameLen, MakeOutgoingFrame(pOutBuffer, &FrameLen,
sizeof(FRAME_ADDBA_REQ), &Frame, END_OF_ARGS); sizeof(struct rt_frame_addba_req), &Frame, END_OF_ARGS);
MiniportMMRequest(pAd, MiniportMMRequest(pAd,
(MGMT_USE_QUEUE_FLAG | (MGMT_USE_QUEUE_FLAG |
...@@ -182,26 +182,26 @@ void MlmeADDBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -182,26 +182,26 @@ void MlmeADDBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Description: Description:
send DELBA and delete BaEntry if any send DELBA and delete BaEntry if any
Parametrs: Parametrs:
Elem - MLME message MLME_DELBA_REQ_STRUCT Elem - MLME message struct rt_mlme_delba_req
IRQL = DISPATCH_LEVEL IRQL = DISPATCH_LEVEL
========================================================================== ==========================================================================
*/ */
void MlmeDELBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) void MlmeDELBAAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
{ {
MLME_DELBA_REQ_STRUCT *pInfo; struct rt_mlme_delba_req *pInfo;
u8 *pOutBuffer = NULL; u8 *pOutBuffer = NULL;
u8 *pOutBuffer2 = NULL; u8 *pOutBuffer2 = NULL;
int NStatus; int NStatus;
unsigned long Idx; unsigned long Idx;
FRAME_DELBA_REQ Frame; struct rt_frame_delba_req Frame;
unsigned long FrameLen; unsigned long FrameLen;
FRAME_BAR FrameBar; struct rt_frame_bar FrameBar;
pInfo = (MLME_DELBA_REQ_STRUCT *) Elem->Msg; pInfo = (struct rt_mlme_delba_req *)Elem->Msg;
/* must send back DELBA */ /* must send back DELBA */
NdisZeroMemory(&Frame, sizeof(FRAME_DELBA_REQ)); NdisZeroMemory(&Frame, sizeof(struct rt_frame_delba_req));
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("==> MlmeDELBAAction(), Initiator(%d) \n", pInfo->Initiator)); ("==> MlmeDELBAAction(), Initiator(%d) \n", pInfo->Initiator));
...@@ -236,7 +236,7 @@ void MlmeDELBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -236,7 +236,7 @@ void MlmeDELBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
FrameBar.BarControl.MTID = 0; /* make sure sequence not clear in DEL funciton. */ FrameBar.BarControl.MTID = 0; /* make sure sequence not clear in DEL funciton. */
MakeOutgoingFrame(pOutBuffer2, &FrameLen, MakeOutgoingFrame(pOutBuffer2, &FrameLen,
sizeof(FRAME_BAR), &FrameBar, END_OF_ARGS); sizeof(struct rt_frame_bar), &FrameBar, END_OF_ARGS);
MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer2, FrameLen); MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer2, FrameLen);
MlmeFreeMemory(pAd, pOutBuffer2); MlmeFreeMemory(pAd, pOutBuffer2);
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
...@@ -269,7 +269,7 @@ void MlmeDELBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -269,7 +269,7 @@ void MlmeDELBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Frame.ReasonCode = cpu2le16(Frame.ReasonCode); Frame.ReasonCode = cpu2le16(Frame.ReasonCode);
MakeOutgoingFrame(pOutBuffer, &FrameLen, MakeOutgoingFrame(pOutBuffer, &FrameLen,
sizeof(FRAME_DELBA_REQ), &Frame, END_OF_ARGS); sizeof(struct rt_frame_delba_req), &Frame, END_OF_ARGS);
MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen); MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen);
MlmeFreeMemory(pAd, pOutBuffer); MlmeFreeMemory(pAd, pOutBuffer);
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
...@@ -278,25 +278,25 @@ void MlmeDELBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -278,25 +278,25 @@ void MlmeDELBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
} }
} }
void MlmeQOSAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) void MlmeQOSAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
{ {
} }
void MlmeDLSAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) void MlmeDLSAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
{ {
} }
void MlmeInvalidAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) void MlmeInvalidAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
{ {
/*u8 * pOutBuffer = NULL; */ /*u8 * pOutBuffer = NULL; */
/*Return the receiving frame except the MSB of category filed set to 1. 7.3.1.11 */ /*Return the receiving frame except the MSB of category filed set to 1. 7.3.1.11 */
} }
void PeerQOSAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) void PeerQOSAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
{ {
} }
void PeerBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) void PeerBAAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
{ {
u8 Action = Elem->Msg[LENGTH_802_11 + 1]; u8 Action = Elem->Msg[LENGTH_802_11 + 1];
...@@ -313,13 +313,13 @@ void PeerBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -313,13 +313,13 @@ void PeerBAAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
} }
} }
void PeerPublicAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) void PeerPublicAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
{ {
if (Elem->Wcid >= MAX_LEN_OF_MAC_TABLE) if (Elem->Wcid >= MAX_LEN_OF_MAC_TABLE)
return; return;
} }
static void ReservedAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) static void ReservedAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
{ {
u8 Category; u8 Category;
...@@ -333,18 +333,18 @@ static void ReservedAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -333,18 +333,18 @@ static void ReservedAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
hex_dump("Reserved Action Frame", &Elem->Msg[0], Elem->MsgLen); hex_dump("Reserved Action Frame", &Elem->Msg[0], Elem->MsgLen);
} }
void PeerRMAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) void PeerRMAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
{ {
return; return;
} }
static void respond_ht_information_exchange_action(IN PRTMP_ADAPTER pAd, static void respond_ht_information_exchange_action(struct rt_rtmp_adapter *pAd,
IN MLME_QUEUE_ELEM * Elem) struct rt_mlme_queue_elem *Elem)
{ {
u8 *pOutBuffer = NULL; u8 *pOutBuffer = NULL;
int NStatus; int NStatus;
unsigned long FrameLen; unsigned long FrameLen;
FRAME_HT_INFO HTINFOframe, *pFrame; struct rt_frame_ht_info HTINFOframe, *pFrame;
u8 *pAddr; u8 *pAddr;
/* 2. Always send back ADDBA Response */ /* 2. Always send back ADDBA Response */
...@@ -356,10 +356,10 @@ static void respond_ht_information_exchange_action(IN PRTMP_ADAPTER pAd, ...@@ -356,10 +356,10 @@ static void respond_ht_information_exchange_action(IN PRTMP_ADAPTER pAd,
return; return;
} }
/* get RA */ /* get RA */
pFrame = (FRAME_HT_INFO *) & Elem->Msg[0]; pFrame = (struct rt_frame_ht_info *) & Elem->Msg[0];
pAddr = pFrame->Hdr.Addr2; pAddr = pFrame->Hdr.Addr2;
NdisZeroMemory(&HTINFOframe, sizeof(FRAME_HT_INFO)); NdisZeroMemory(&HTINFOframe, sizeof(struct rt_frame_ht_info));
/* 2-1. Prepare ADDBA Response frame. */ /* 2-1. Prepare ADDBA Response frame. */
{ {
if (ADHOC_ON(pAd)) if (ADHOC_ON(pAd))
...@@ -381,13 +381,13 @@ static void respond_ht_information_exchange_action(IN PRTMP_ADAPTER pAd, ...@@ -381,13 +381,13 @@ static void respond_ht_information_exchange_action(IN PRTMP_ADAPTER pAd,
pAd->CommonCfg.AddHTInfo.AddHtInfo.RecomWidth; pAd->CommonCfg.AddHTInfo.AddHtInfo.RecomWidth;
MakeOutgoingFrame(pOutBuffer, &FrameLen, MakeOutgoingFrame(pOutBuffer, &FrameLen,
sizeof(FRAME_HT_INFO), &HTINFOframe, END_OF_ARGS); sizeof(struct rt_frame_ht_info), &HTINFOframe, END_OF_ARGS);
MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen); MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen);
MlmeFreeMemory(pAd, pOutBuffer); MlmeFreeMemory(pAd, pOutBuffer);
} }
void PeerHTAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) void PeerHTAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
{ {
u8 Action = Elem->Msg[LENGTH_802_11 + 1]; u8 Action = Elem->Msg[LENGTH_802_11 + 1];
...@@ -436,10 +436,10 @@ void PeerHTAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -436,10 +436,10 @@ void PeerHTAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
break; break;
case HT_INFO_EXCHANGE: case HT_INFO_EXCHANGE:
{ {
HT_INFORMATION_OCTET *pHT_info; struct rt_ht_information_octet *pHT_info;
pHT_info = pHT_info =
(HT_INFORMATION_OCTET *) & Elem->Msg[LENGTH_802_11 + (struct rt_ht_information_octet *) & Elem->Msg[LENGTH_802_11 +
2]; 2];
/* 7.4.8.10 */ /* 7.4.8.10 */
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
...@@ -467,9 +467,9 @@ void PeerHTAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -467,9 +467,9 @@ void PeerHTAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
FALSE , then continue indicaterx at this moment. FALSE , then continue indicaterx at this moment.
========================================================================== ==========================================================================
*/ */
void ORIBATimerTimeout(IN PRTMP_ADAPTER pAd) void ORIBATimerTimeout(struct rt_rtmp_adapter *pAd)
{ {
MAC_TABLE_ENTRY *pEntry; struct rt_mac_table_entry *pEntry;
int i, total; int i, total;
u8 TID; u8 TID;
...@@ -489,16 +489,16 @@ void ORIBATimerTimeout(IN PRTMP_ADAPTER pAd) ...@@ -489,16 +489,16 @@ void ORIBATimerTimeout(IN PRTMP_ADAPTER pAd)
} }
} }
void SendRefreshBAR(IN PRTMP_ADAPTER pAd, IN MAC_TABLE_ENTRY * pEntry) void SendRefreshBAR(struct rt_rtmp_adapter *pAd, struct rt_mac_table_entry *pEntry)
{ {
FRAME_BAR FrameBar; struct rt_frame_bar FrameBar;
unsigned long FrameLen; unsigned long FrameLen;
int NStatus; int NStatus;
u8 *pOutBuffer = NULL; u8 *pOutBuffer = NULL;
u16 Sequence; u16 Sequence;
u8 i, TID; u8 i, TID;
u16 idx; u16 idx;
BA_ORI_ENTRY *pBAEntry; struct rt_ba_ori_entry *pBAEntry;
for (i = 0; i < NUM_OF_TID; i++) { for (i = 0; i < NUM_OF_TID; i++) {
idx = pEntry->BAOriWcidArray[i]; idx = pEntry->BAOriWcidArray[i];
...@@ -529,7 +529,7 @@ void SendRefreshBAR(IN PRTMP_ADAPTER pAd, IN MAC_TABLE_ENTRY * pEntry) ...@@ -529,7 +529,7 @@ void SendRefreshBAR(IN PRTMP_ADAPTER pAd, IN MAC_TABLE_ENTRY * pEntry)
FrameBar.BarControl.TID = TID; /* make sure sequence not clear in DEL funciton. */ FrameBar.BarControl.TID = TID; /* make sure sequence not clear in DEL funciton. */
MakeOutgoingFrame(pOutBuffer, &FrameLen, MakeOutgoingFrame(pOutBuffer, &FrameLen,
sizeof(FRAME_BAR), &FrameBar, sizeof(struct rt_frame_bar), &FrameBar,
END_OF_ARGS); END_OF_ARGS);
/*if (!(CLIENT_STATUS_TEST_FLAG(pEntry, fCLIENT_STATUS_RALINK_CHIPSET))) */ /*if (!(CLIENT_STATUS_TEST_FLAG(pEntry, fCLIENT_STATUS_RALINK_CHIPSET))) */
if (1) /* Now we always send BAR. */ if (1) /* Now we always send BAR. */
...@@ -547,11 +547,11 @@ void SendRefreshBAR(IN PRTMP_ADAPTER pAd, IN MAC_TABLE_ENTRY * pEntry) ...@@ -547,11 +547,11 @@ void SendRefreshBAR(IN PRTMP_ADAPTER pAd, IN MAC_TABLE_ENTRY * pEntry)
} }
} }
void ActHeaderInit(IN PRTMP_ADAPTER pAd, void ActHeaderInit(struct rt_rtmp_adapter *pAd,
IN OUT PHEADER_802_11 pHdr80211, struct rt_header_802_11 * pHdr80211,
u8 *Addr1, u8 *Addr2, u8 *Addr3) u8 *Addr1, u8 *Addr2, u8 *Addr3)
{ {
NdisZeroMemory(pHdr80211, sizeof(HEADER_802_11)); NdisZeroMemory(pHdr80211, sizeof(struct rt_header_802_11));
pHdr80211->FC.Type = BTYPE_MGMT; pHdr80211->FC.Type = BTYPE_MGMT;
pHdr80211->FC.SubType = SUBTYPE_ACTION; pHdr80211->FC.SubType = SUBTYPE_ACTION;
...@@ -560,10 +560,10 @@ void ActHeaderInit(IN PRTMP_ADAPTER pAd, ...@@ -560,10 +560,10 @@ void ActHeaderInit(IN PRTMP_ADAPTER pAd,
COPY_MAC_ADDR(pHdr80211->Addr3, Addr3); COPY_MAC_ADDR(pHdr80211->Addr3, Addr3);
} }
void BarHeaderInit(IN PRTMP_ADAPTER pAd, void BarHeaderInit(struct rt_rtmp_adapter *pAd,
IN OUT PFRAME_BAR pCntlBar, u8 *pDA, u8 *pSA) struct rt_frame_bar * pCntlBar, u8 *pDA, u8 *pSA)
{ {
NdisZeroMemory(pCntlBar, sizeof(FRAME_BAR)); NdisZeroMemory(pCntlBar, sizeof(struct rt_frame_bar));
pCntlBar->FC.Type = BTYPE_CNTL; pCntlBar->FC.Type = BTYPE_CNTL;
pCntlBar->FC.SubType = SUBTYPE_BLOCK_ACK_REQ; pCntlBar->FC.SubType = SUBTYPE_BLOCK_ACK_REQ;
pCntlBar->BarControl.MTID = 0; pCntlBar->BarControl.MTID = 0;
...@@ -571,7 +571,7 @@ void BarHeaderInit(IN PRTMP_ADAPTER pAd, ...@@ -571,7 +571,7 @@ void BarHeaderInit(IN PRTMP_ADAPTER pAd,
pCntlBar->BarControl.ACKPolicy = 0; pCntlBar->BarControl.ACKPolicy = 0;
pCntlBar->Duration = pCntlBar->Duration =
16 + RTMPCalcDuration(pAd, RATE_1, sizeof(FRAME_BA)); 16 + RTMPCalcDuration(pAd, RATE_1, sizeof(struct rt_frame_ba));
COPY_MAC_ADDR(pCntlBar->Addr1, pDA); COPY_MAC_ADDR(pCntlBar->Addr1, pDA);
COPY_MAC_ADDR(pCntlBar->Addr2, pSA); COPY_MAC_ADDR(pCntlBar->Addr2, pSA);
...@@ -591,7 +591,7 @@ void BarHeaderInit(IN PRTMP_ADAPTER pAd, ...@@ -591,7 +591,7 @@ void BarHeaderInit(IN PRTMP_ADAPTER pAd,
Return : None. Return : None.
========================================================================== ==========================================================================
*/ */
void InsertActField(IN PRTMP_ADAPTER pAd, void InsertActField(struct rt_rtmp_adapter *pAd,
u8 *pFrameBuf, u8 *pFrameBuf,
unsigned long *pFrameLen, u8 Category, u8 ActCode) unsigned long *pFrameLen, u8 Category, u8 ActCode)
{ {
......
drivers/staging/rt2860/common/action.h
浏览文件 @ 62eb734b
...@@ -39,18 +39,18 @@ ...@@ -39,18 +39,18 @@
#ifndef __ACTION_H__ #ifndef __ACTION_H__
#define __ACTION_H__ #define __ACTION_H__
typedef struct PACKED __HT_INFO_OCTET { struct PACKED rt_ht_information_octet {
u8 Request:1; u8 Request:1;
u8 Forty_MHz_Intolerant:1; u8 Forty_MHz_Intolerant:1;
u8 STA_Channel_Width:1; u8 STA_Channel_Width:1;
u8 Reserved:5; u8 Reserved:5;
} HT_INFORMATION_OCTET; };
typedef struct PACKED __FRAME_HT_INFO { struct PACKED rt_frame_ht_info {
HEADER_802_11 Hdr; struct rt_header_802_11 Hdr;
u8 Category; u8 Category;
u8 Action; u8 Action;
HT_INFORMATION_OCTET HT_Info; struct rt_ht_information_octet HT_Info;
} FRAME_HT_INFO, *PFRAME_HT_INFO; };
#endif /* __ACTION_H__ */ #endif /* __ACTION_H__ */
drivers/staging/rt2860/common/cmm_aes.c
浏览文件 @ 62eb734b
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
#include "../rt_config.h" #include "../rt_config.h"
typedef struct { struct aes_context {
u32 erk[64]; /* encryption round keys */ u32 erk[64]; /* encryption round keys */
u32 drk[64]; /* decryption round keys */ u32 drk[64]; /* decryption round keys */
int nr; /* number of rounds */ int nr; /* number of rounds */
} aes_context; };
/*****************************/ /*****************************/
/******** SBOX Table *********/ /******** SBOX Table *********/
...@@ -408,9 +408,9 @@ void construct_ctr_preload(unsigned char *ctr_preload, ...@@ -408,9 +408,9 @@ void construct_ctr_preload(unsigned char *ctr_preload,
} }
BOOLEAN RTMPSoftDecryptAES(IN PRTMP_ADAPTER pAd, BOOLEAN RTMPSoftDecryptAES(struct rt_rtmp_adapter *pAd,
u8 *pData, u8 *pData,
unsigned long DataByteCnt, IN PCIPHER_KEY pWpaKey) unsigned long DataByteCnt, struct rt_cipher_key *pWpaKey)
{ {
u8 KeyID; u8 KeyID;
u32 HeaderLen; u32 HeaderLen;
...@@ -878,7 +878,7 @@ static uint32 KT3[256]; ...@@ -878,7 +878,7 @@ static uint32 KT3[256];
(b)[(i) + 3] = (uint8) ( (n) ); \ (b)[(i) + 3] = (uint8) ( (n) ); \
} }
int rt_aes_set_key(aes_context * ctx, uint8 * key, int nbits) int rt_aes_set_key(struct aes_context * ctx, uint8 * key, int nbits)
{ {
int i; int i;
uint32 *RK, *SK; uint32 *RK, *SK;
...@@ -1020,7 +1020,7 @@ int rt_aes_set_key(aes_context * ctx, uint8 * key, int nbits) ...@@ -1020,7 +1020,7 @@ int rt_aes_set_key(aes_context * ctx, uint8 * key, int nbits)
/* AES 128-bit block encryption routine */ /* AES 128-bit block encryption routine */
void rt_aes_encrypt(aes_context * ctx, uint8 input[16], uint8 output[16]) void rt_aes_encrypt(struct aes_context * ctx, uint8 input[16], uint8 output[16])
{ {
uint32 *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3; uint32 *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
...@@ -1107,7 +1107,7 @@ void rt_aes_encrypt(aes_context * ctx, uint8 input[16], uint8 output[16]) ...@@ -1107,7 +1107,7 @@ void rt_aes_encrypt(aes_context * ctx, uint8 input[16], uint8 output[16])
/* AES 128-bit block decryption routine */ /* AES 128-bit block decryption routine */
void rt_aes_decrypt(aes_context * ctx, uint8 input[16], uint8 output[16]) void rt_aes_decrypt(struct aes_context * ctx, uint8 input[16], uint8 output[16])
{ {
uint32 *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3; uint32 *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
...@@ -1210,7 +1210,7 @@ void AES_GTK_KEY_WRAP(u8 * key, ...@@ -1210,7 +1210,7 @@ void AES_GTK_KEY_WRAP(u8 * key,
u8 R[512]; u8 R[512];
int num_blocks = p_len / 8; /* unit:64bits */ int num_blocks = p_len / 8; /* unit:64bits */
int i, j; int i, j;
aes_context aesctx; struct aes_context aesctx;
u8 xor; u8 xor;
rt_aes_set_key(&aesctx, key, 128); rt_aes_set_key(&aesctx, key, 128);
...@@ -1271,7 +1271,7 @@ void AES_GTK_KEY_UNWRAP(u8 * key, ...@@ -1271,7 +1271,7 @@ void AES_GTK_KEY_UNWRAP(u8 * key,
u8 A[8], BIN[16], BOUT[16]; u8 A[8], BIN[16], BOUT[16];
u8 xor; u8 xor;
int i, j; int i, j;
aes_context aesctx; struct aes_context aesctx;
u8 *R; u8 *R;
int num_blocks = c_len / 8; /* unit:64bits */ int num_blocks = c_len / 8; /* unit:64bits */
......
drivers/staging/rt2860/common/cmm_asic.c
浏览文件 @ 62eb734b
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "../rt_config.h" #include "../rt_config.h"
/* Reset the RFIC setting to new series */ /* Reset the RFIC setting to new series */
RTMP_RF_REGS RF2850RegTable[] = { struct rt_rtmp_rf_regs RF2850RegTable[] = {
/* ch R1 R2 R3(TX0~4=0) R4 */ /* ch R1 R2 R3(TX0~4=0) R4 */
{1, 0x98402ecc, 0x984c0786, 0x9816b455, 0x9800510b} {1, 0x98402ecc, 0x984c0786, 0x9816b455, 0x9800510b}
, ,
...@@ -177,9 +177,9 @@ RTMP_RF_REGS RF2850RegTable[] = { ...@@ -177,9 +177,9 @@ RTMP_RF_REGS RF2850RegTable[] = {
/* still lack of MMAC(Japan) ch 34,38,42,46 */ /* still lack of MMAC(Japan) ch 34,38,42,46 */
}; };
u8 NUM_OF_2850_CHNL = (sizeof(RF2850RegTable) / sizeof(RTMP_RF_REGS)); u8 NUM_OF_2850_CHNL = (sizeof(RF2850RegTable) / sizeof(struct rt_rtmp_rf_regs));
FREQUENCY_ITEM FreqItems3020[] = { struct rt_frequency_item FreqItems3020[] = {
/**************************************************/ /**************************************************/
/* ISM : 2.4 to 2.483 GHz // */ /* ISM : 2.4 to 2.483 GHz // */
/**************************************************/ /**************************************************/
...@@ -216,16 +216,16 @@ FREQUENCY_ITEM FreqItems3020[] = { ...@@ -216,16 +216,16 @@ FREQUENCY_ITEM FreqItems3020[] = {
, ,
}; };
u8 NUM_OF_3020_CHNL = (sizeof(FreqItems3020) / sizeof(FREQUENCY_ITEM)); u8 NUM_OF_3020_CHNL = (sizeof(FreqItems3020) / sizeof(struct rt_frequency_item));
void AsicUpdateAutoFallBackTable(IN PRTMP_ADAPTER pAd, u8 *pRateTable) void AsicUpdateAutoFallBackTable(struct rt_rtmp_adapter *pAd, u8 *pRateTable)
{ {
u8 i; u8 i;
HT_FBK_CFG0_STRUC HtCfg0; HT_FBK_CFG0_STRUC HtCfg0;
HT_FBK_CFG1_STRUC HtCfg1; HT_FBK_CFG1_STRUC HtCfg1;
LG_FBK_CFG0_STRUC LgCfg0; LG_FBK_CFG0_STRUC LgCfg0;
LG_FBK_CFG1_STRUC LgCfg1; LG_FBK_CFG1_STRUC LgCfg1;
PRTMP_TX_RATE_SWITCH pCurrTxRate, pNextTxRate; struct rt_rtmp_tx_rate_switch *pCurrTxRate, *pNextTxRate;
/* set to initial value */ /* set to initial value */
HtCfg0.word = 0x65432100; HtCfg0.word = 0x65432100;
...@@ -233,9 +233,9 @@ void AsicUpdateAutoFallBackTable(IN PRTMP_ADAPTER pAd, u8 *pRateTable) ...@@ -233,9 +233,9 @@ void AsicUpdateAutoFallBackTable(IN PRTMP_ADAPTER pAd, u8 *pRateTable)
LgCfg0.word = 0xedcba988; LgCfg0.word = 0xedcba988;
LgCfg1.word = 0x00002100; LgCfg1.word = 0x00002100;
pNextTxRate = (PRTMP_TX_RATE_SWITCH) pRateTable + 1; pNextTxRate = (struct rt_rtmp_tx_rate_switch *) pRateTable + 1;
for (i = 1; i < *((u8 *)pRateTable); i++) { for (i = 1; i < *((u8 *)pRateTable); i++) {
pCurrTxRate = (PRTMP_TX_RATE_SWITCH) pRateTable + 1 + i; pCurrTxRate = (struct rt_rtmp_tx_rate_switch *) pRateTable + 1 + i;
switch (pCurrTxRate->Mode) { switch (pCurrTxRate->Mode) {
case 0: /*CCK */ case 0: /*CCK */
break; break;
...@@ -417,7 +417,7 @@ void AsicUpdateAutoFallBackTable(IN PRTMP_ADAPTER pAd, u8 *pRateTable) ...@@ -417,7 +417,7 @@ void AsicUpdateAutoFallBackTable(IN PRTMP_ADAPTER pAd, u8 *pRateTable)
we should choose not to use GF. But still set correct ASIC registers. we should choose not to use GF. But still set correct ASIC registers.
======================================================================== ========================================================================
*/ */
void AsicUpdateProtect(IN PRTMP_ADAPTER pAd, void AsicUpdateProtect(struct rt_rtmp_adapter *pAd,
u16 OperationMode, u16 OperationMode,
u8 SetMask, u8 SetMask,
IN BOOLEAN bDisableBGProtect, IN BOOLEAN bNonGFExist) IN BOOLEAN bDisableBGProtect, IN BOOLEAN bNonGFExist)
...@@ -631,13 +631,13 @@ void AsicUpdateProtect(IN PRTMP_ADAPTER pAd, ...@@ -631,13 +631,13 @@ void AsicUpdateProtect(IN PRTMP_ADAPTER pAd,
========================================================================== ==========================================================================
*/ */
void AsicSwitchChannel(IN PRTMP_ADAPTER pAd, u8 Channel, IN BOOLEAN bScan) void AsicSwitchChannel(struct rt_rtmp_adapter *pAd, u8 Channel, IN BOOLEAN bScan)
{ {
unsigned long R2 = 0, R3 = DEFAULT_RF_TX_POWER, R4 = 0; unsigned long R2 = 0, R3 = DEFAULT_RF_TX_POWER, R4 = 0;
char TxPwer = 0, TxPwer2 = DEFAULT_RF_TX_POWER; /*Bbp94 = BBPR94_DEFAULT, TxPwer2 = DEFAULT_RF_TX_POWER; */ char TxPwer = 0, TxPwer2 = DEFAULT_RF_TX_POWER; /*Bbp94 = BBPR94_DEFAULT, TxPwer2 = DEFAULT_RF_TX_POWER; */
u8 index; u8 index;
u32 Value = 0; /*BbpReg, Value; */ u32 Value = 0; /*BbpReg, Value; */
RTMP_RF_REGS *RFRegTable; struct rt_rtmp_rf_regs *RFRegTable;
u8 RFValue; u8 RFValue;
RFValue = 0; RFValue = 0;
...@@ -1002,7 +1002,7 @@ void AsicSwitchChannel(IN PRTMP_ADAPTER pAd, u8 Channel, IN BOOLEAN bScan) ...@@ -1002,7 +1002,7 @@ void AsicSwitchChannel(IN PRTMP_ADAPTER pAd, u8 Channel, IN BOOLEAN bScan)
RTMPusecDelay(1000); RTMPusecDelay(1000);
} }
void AsicResetBBPAgent(IN PRTMP_ADAPTER pAd) void AsicResetBBPAgent(struct rt_rtmp_adapter *pAd)
{ {
BBP_CSR_CFG_STRUC BbpCsr; BBP_CSR_CFG_STRUC BbpCsr;
DBGPRINT(RT_DEBUG_ERROR, ("Reset BBP Agent busy bit.!! \n")); DBGPRINT(RT_DEBUG_ERROR, ("Reset BBP Agent busy bit.!! \n"));
...@@ -1025,7 +1025,7 @@ void AsicResetBBPAgent(IN PRTMP_ADAPTER pAd) ...@@ -1025,7 +1025,7 @@ void AsicResetBBPAgent(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void AsicLockChannel(IN PRTMP_ADAPTER pAd, u8 Channel) void AsicLockChannel(struct rt_rtmp_adapter *pAd, u8 Channel)
{ {
} }
...@@ -1052,7 +1052,7 @@ void AsicRfTuningExec(void *SystemSpecific1, ...@@ -1052,7 +1052,7 @@ void AsicRfTuningExec(void *SystemSpecific1,
it should be called AFTER MlmeDynamicTxRatSwitching() it should be called AFTER MlmeDynamicTxRatSwitching()
========================================================================== ==========================================================================
*/ */
void AsicAdjustTxPower(IN PRTMP_ADAPTER pAd) void AsicAdjustTxPower(struct rt_rtmp_adapter *pAd)
{ {
int i, j; int i, j;
char DeltaPwr = 0; char DeltaPwr = 0;
...@@ -1277,7 +1277,7 @@ void AsicAdjustTxPower(IN PRTMP_ADAPTER pAd) ...@@ -1277,7 +1277,7 @@ void AsicAdjustTxPower(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void AsicSleepThenAutoWakeup(IN PRTMP_ADAPTER pAd, void AsicSleepThenAutoWakeup(struct rt_rtmp_adapter *pAd,
u16 TbttNumToNextWakeUp) u16 TbttNumToNextWakeUp)
{ {
RTMP_STA_SLEEP_THEN_AUTO_WAKEUP(pAd, TbttNumToNextWakeUp); RTMP_STA_SLEEP_THEN_AUTO_WAKEUP(pAd, TbttNumToNextWakeUp);
...@@ -1291,7 +1291,7 @@ void AsicSleepThenAutoWakeup(IN PRTMP_ADAPTER pAd, ...@@ -1291,7 +1291,7 @@ void AsicSleepThenAutoWakeup(IN PRTMP_ADAPTER pAd,
in INFRA BSS, we should use AsicSleepThenAutoWakeup() instead. in INFRA BSS, we should use AsicSleepThenAutoWakeup() instead.
========================================================================== ==========================================================================
*/ */
void AsicForceSleep(IN PRTMP_ADAPTER pAd) void AsicForceSleep(struct rt_rtmp_adapter *pAd)
{ {
} }
...@@ -1306,7 +1306,7 @@ void AsicForceSleep(IN PRTMP_ADAPTER pAd) ...@@ -1306,7 +1306,7 @@ void AsicForceSleep(IN PRTMP_ADAPTER pAd)
IRQL = DISPATCH_LEVEL IRQL = DISPATCH_LEVEL
========================================================================== ==========================================================================
*/ */
void AsicForceWakeup(IN PRTMP_ADAPTER pAd, IN BOOLEAN bFromTx) void AsicForceWakeup(struct rt_rtmp_adapter *pAd, IN BOOLEAN bFromTx)
{ {
DBGPRINT(RT_DEBUG_INFO, ("--> AsicForceWakeup \n")); DBGPRINT(RT_DEBUG_INFO, ("--> AsicForceWakeup \n"));
RTMP_STA_FORCE_WAKEUP(pAd, bFromTx); RTMP_STA_FORCE_WAKEUP(pAd, bFromTx);
...@@ -1321,7 +1321,7 @@ void AsicForceWakeup(IN PRTMP_ADAPTER pAd, IN BOOLEAN bFromTx) ...@@ -1321,7 +1321,7 @@ void AsicForceWakeup(IN PRTMP_ADAPTER pAd, IN BOOLEAN bFromTx)
========================================================================== ==========================================================================
*/ */
void AsicSetBssid(IN PRTMP_ADAPTER pAd, u8 *pBssid) void AsicSetBssid(struct rt_rtmp_adapter *pAd, u8 *pBssid)
{ {
unsigned long Addr4; unsigned long Addr4;
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
...@@ -1340,9 +1340,9 @@ void AsicSetBssid(IN PRTMP_ADAPTER pAd, u8 *pBssid) ...@@ -1340,9 +1340,9 @@ void AsicSetBssid(IN PRTMP_ADAPTER pAd, u8 *pBssid)
RTMP_IO_WRITE32(pAd, MAC_BSSID_DW1, Addr4); RTMP_IO_WRITE32(pAd, MAC_BSSID_DW1, Addr4);
} }
void AsicSetMcastWC(IN PRTMP_ADAPTER pAd) void AsicSetMcastWC(struct rt_rtmp_adapter *pAd)
{ {
MAC_TABLE_ENTRY *pEntry = &pAd->MacTab.Content[MCAST_WCID]; struct rt_mac_table_entry *pEntry = &pAd->MacTab.Content[MCAST_WCID];
u16 offset; u16 offset;
pEntry->Sst = SST_ASSOC; pEntry->Sst = SST_ASSOC;
...@@ -1360,7 +1360,7 @@ void AsicSetMcastWC(IN PRTMP_ADAPTER pAd) ...@@ -1360,7 +1360,7 @@ void AsicSetMcastWC(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void AsicDelWcidTab(IN PRTMP_ADAPTER pAd, u8 Wcid) void AsicDelWcidTab(struct rt_rtmp_adapter *pAd, u8 Wcid)
{ {
unsigned long Addr0 = 0x0, Addr1 = 0x0; unsigned long Addr0 = 0x0, Addr1 = 0x0;
unsigned long offset; unsigned long offset;
...@@ -1380,7 +1380,7 @@ void AsicDelWcidTab(IN PRTMP_ADAPTER pAd, u8 Wcid) ...@@ -1380,7 +1380,7 @@ void AsicDelWcidTab(IN PRTMP_ADAPTER pAd, u8 Wcid)
========================================================================== ==========================================================================
*/ */
void AsicEnableRDG(IN PRTMP_ADAPTER pAd) void AsicEnableRDG(struct rt_rtmp_adapter *pAd)
{ {
TX_LINK_CFG_STRUC TxLinkCfg; TX_LINK_CFG_STRUC TxLinkCfg;
u32 Data = 0; u32 Data = 0;
...@@ -1405,7 +1405,7 @@ void AsicEnableRDG(IN PRTMP_ADAPTER pAd) ...@@ -1405,7 +1405,7 @@ void AsicEnableRDG(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void AsicDisableRDG(IN PRTMP_ADAPTER pAd) void AsicDisableRDG(struct rt_rtmp_adapter *pAd)
{ {
TX_LINK_CFG_STRUC TxLinkCfg; TX_LINK_CFG_STRUC TxLinkCfg;
u32 Data = 0; u32 Data = 0;
...@@ -1441,7 +1441,7 @@ void AsicDisableRDG(IN PRTMP_ADAPTER pAd) ...@@ -1441,7 +1441,7 @@ void AsicDisableRDG(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void AsicDisableSync(IN PRTMP_ADAPTER pAd) void AsicDisableSync(struct rt_rtmp_adapter *pAd)
{ {
BCN_TIME_CFG_STRUC csr; BCN_TIME_CFG_STRUC csr;
...@@ -1468,7 +1468,7 @@ void AsicDisableSync(IN PRTMP_ADAPTER pAd) ...@@ -1468,7 +1468,7 @@ void AsicDisableSync(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void AsicEnableBssSync(IN PRTMP_ADAPTER pAd) void AsicEnableBssSync(struct rt_rtmp_adapter *pAd)
{ {
BCN_TIME_CFG_STRUC csr; BCN_TIME_CFG_STRUC csr;
...@@ -1498,7 +1498,7 @@ void AsicEnableBssSync(IN PRTMP_ADAPTER pAd) ...@@ -1498,7 +1498,7 @@ void AsicEnableBssSync(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void AsicEnableIbssSync(IN PRTMP_ADAPTER pAd) void AsicEnableIbssSync(struct rt_rtmp_adapter *pAd)
{ {
BCN_TIME_CFG_STRUC csr9; BCN_TIME_CFG_STRUC csr9;
u8 *ptr; u8 *ptr;
...@@ -1581,7 +1581,7 @@ void AsicEnableIbssSync(IN PRTMP_ADAPTER pAd) ...@@ -1581,7 +1581,7 @@ void AsicEnableIbssSync(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void AsicSetEdcaParm(IN PRTMP_ADAPTER pAd, IN PEDCA_PARM pEdcaParm) void AsicSetEdcaParm(struct rt_rtmp_adapter *pAd, struct rt_edca_parm *pEdcaParm)
{ {
EDCA_AC_CFG_STRUC Ac0Cfg, Ac1Cfg, Ac2Cfg, Ac3Cfg; EDCA_AC_CFG_STRUC Ac0Cfg, Ac1Cfg, Ac2Cfg, Ac3Cfg;
AC_TXOP_CSR0_STRUC csr0; AC_TXOP_CSR0_STRUC csr0;
...@@ -1676,7 +1676,7 @@ void AsicSetEdcaParm(IN PRTMP_ADAPTER pAd, IN PEDCA_PARM pEdcaParm) ...@@ -1676,7 +1676,7 @@ void AsicSetEdcaParm(IN PRTMP_ADAPTER pAd, IN PEDCA_PARM pEdcaParm)
RTMP_IO_WRITE32(pAd, WMM_AIFSN_CFG, 0x00002222); RTMP_IO_WRITE32(pAd, WMM_AIFSN_CFG, 0x00002222);
NdisZeroMemory(&pAd->CommonCfg.APEdcaParm, sizeof(EDCA_PARM)); NdisZeroMemory(&pAd->CommonCfg.APEdcaParm, sizeof(struct rt_edca_parm));
} else { } else {
OPSTATUS_SET_FLAG(pAd, fOP_STATUS_WMM_INUSED); OPSTATUS_SET_FLAG(pAd, fOP_STATUS_WMM_INUSED);
/*======================================================== */ /*======================================================== */
...@@ -1823,7 +1823,7 @@ void AsicSetEdcaParm(IN PRTMP_ADAPTER pAd, IN PEDCA_PARM pEdcaParm) ...@@ -1823,7 +1823,7 @@ void AsicSetEdcaParm(IN PRTMP_ADAPTER pAd, IN PEDCA_PARM pEdcaParm)
RTMP_IO_WRITE32(pAd, WMM_AIFSN_CFG, AifsnCsr.word); RTMP_IO_WRITE32(pAd, WMM_AIFSN_CFG, AifsnCsr.word);
NdisMoveMemory(&pAd->CommonCfg.APEdcaParm, pEdcaParm, NdisMoveMemory(&pAd->CommonCfg.APEdcaParm, pEdcaParm,
sizeof(EDCA_PARM)); sizeof(struct rt_edca_parm));
if (!ADHOC_ON(pAd)) { if (!ADHOC_ON(pAd)) {
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("EDCA [#%d]: AIFSN CWmin CWmax TXOP(us) ACM\n", ("EDCA [#%d]: AIFSN CWmin CWmax TXOP(us) ACM\n",
...@@ -1862,7 +1862,7 @@ void AsicSetEdcaParm(IN PRTMP_ADAPTER pAd, IN PEDCA_PARM pEdcaParm) ...@@ -1862,7 +1862,7 @@ void AsicSetEdcaParm(IN PRTMP_ADAPTER pAd, IN PEDCA_PARM pEdcaParm)
========================================================================== ==========================================================================
*/ */
void AsicSetSlotTime(IN PRTMP_ADAPTER pAd, IN BOOLEAN bUseShortSlotTime) void AsicSetSlotTime(struct rt_rtmp_adapter *pAd, IN BOOLEAN bUseShortSlotTime)
{ {
unsigned long SlotTime; unsigned long SlotTime;
u32 RegValue = 0; u32 RegValue = 0;
...@@ -1930,7 +1930,7 @@ void AsicSetSlotTime(IN PRTMP_ADAPTER pAd, IN BOOLEAN bUseShortSlotTime) ...@@ -1930,7 +1930,7 @@ void AsicSetSlotTime(IN PRTMP_ADAPTER pAd, IN BOOLEAN bUseShortSlotTime)
Return: Return:
======================================================================== ========================================================================
*/ */
void AsicAddSharedKeyEntry(IN PRTMP_ADAPTER pAd, void AsicAddSharedKeyEntry(struct rt_rtmp_adapter *pAd,
u8 BssIndex, u8 BssIndex,
u8 KeyIdx, u8 KeyIdx,
u8 CipherAlg, u8 CipherAlg,
...@@ -2048,7 +2048,7 @@ void AsicAddSharedKeyEntry(IN PRTMP_ADAPTER pAd, ...@@ -2048,7 +2048,7 @@ void AsicAddSharedKeyEntry(IN PRTMP_ADAPTER pAd,
} }
/* IRQL = DISPATCH_LEVEL */ /* IRQL = DISPATCH_LEVEL */
void AsicRemoveSharedKeyEntry(IN PRTMP_ADAPTER pAd, void AsicRemoveSharedKeyEntry(struct rt_rtmp_adapter *pAd,
u8 BssIndex, u8 KeyIdx) u8 BssIndex, u8 KeyIdx)
{ {
/*unsigned long SecCsr0; */ /*unsigned long SecCsr0; */
...@@ -2088,7 +2088,7 @@ void AsicRemoveSharedKeyEntry(IN PRTMP_ADAPTER pAd, ...@@ -2088,7 +2088,7 @@ void AsicRemoveSharedKeyEntry(IN PRTMP_ADAPTER pAd,
} }
void AsicUpdateWCIDAttribute(IN PRTMP_ADAPTER pAd, void AsicUpdateWCIDAttribute(struct rt_rtmp_adapter *pAd,
u16 WCID, u16 WCID,
u8 BssIndex, u8 BssIndex,
u8 CipherAlg, u8 CipherAlg,
...@@ -2106,7 +2106,7 @@ void AsicUpdateWCIDAttribute(IN PRTMP_ADAPTER pAd, ...@@ -2106,7 +2106,7 @@ void AsicUpdateWCIDAttribute(IN PRTMP_ADAPTER pAd,
RTMP_IO_WRITE32(pAd, offset, WCIDAttri); RTMP_IO_WRITE32(pAd, offset, WCIDAttri);
} }
void AsicUpdateWCIDIVEIV(IN PRTMP_ADAPTER pAd, void AsicUpdateWCIDIVEIV(struct rt_rtmp_adapter *pAd,
u16 WCID, unsigned long uIV, unsigned long uEIV) u16 WCID, unsigned long uIV, unsigned long uEIV)
{ {
unsigned long offset; unsigned long offset;
...@@ -2117,7 +2117,7 @@ void AsicUpdateWCIDIVEIV(IN PRTMP_ADAPTER pAd, ...@@ -2117,7 +2117,7 @@ void AsicUpdateWCIDIVEIV(IN PRTMP_ADAPTER pAd,
RTMP_IO_WRITE32(pAd, offset + 4, uEIV); RTMP_IO_WRITE32(pAd, offset + 4, uEIV);
} }
void AsicUpdateRxWCIDTable(IN PRTMP_ADAPTER pAd, void AsicUpdateRxWCIDTable(struct rt_rtmp_adapter *pAd,
u16 WCID, u8 *pAddr) u16 WCID, u8 *pAddr)
{ {
unsigned long offset; unsigned long offset;
...@@ -2163,11 +2163,11 @@ void AsicUpdateRxWCIDTable(IN PRTMP_ADAPTER pAd, ...@@ -2163,11 +2163,11 @@ void AsicUpdateRxWCIDTable(IN PRTMP_ADAPTER pAd,
For AP mode bTxKey must be always set to TRUE. For AP mode bTxKey must be always set to TRUE.
======================================================================== ========================================================================
*/ */
void AsicAddKeyEntry(IN PRTMP_ADAPTER pAd, void AsicAddKeyEntry(struct rt_rtmp_adapter *pAd,
u16 WCID, u16 WCID,
u8 BssIndex, u8 BssIndex,
u8 KeyIdx, u8 KeyIdx,
IN PCIPHER_KEY pCipherKey, struct rt_cipher_key *pCipherKey,
IN BOOLEAN bUsePairewiseKeyTable, IN BOOLEAN bTxKey) IN BOOLEAN bUsePairewiseKeyTable, IN BOOLEAN bTxKey)
{ {
unsigned long offset; unsigned long offset;
...@@ -2339,9 +2339,9 @@ void AsicAddKeyEntry(IN PRTMP_ADAPTER pAd, ...@@ -2339,9 +2339,9 @@ void AsicAddKeyEntry(IN PRTMP_ADAPTER pAd,
Return: Return:
======================================================================== ========================================================================
*/ */
void AsicAddPairwiseKeyEntry(IN PRTMP_ADAPTER pAd, void AsicAddPairwiseKeyEntry(struct rt_rtmp_adapter *pAd,
u8 *pAddr, u8 *pAddr,
u8 WCID, IN CIPHER_KEY * pCipherKey) u8 WCID, struct rt_cipher_key *pCipherKey)
{ {
int i; int i;
unsigned long offset; unsigned long offset;
...@@ -2422,7 +2422,7 @@ void AsicAddPairwiseKeyEntry(IN PRTMP_ADAPTER pAd, ...@@ -2422,7 +2422,7 @@ void AsicAddPairwiseKeyEntry(IN PRTMP_ADAPTER pAd,
Return: Return:
======================================================================== ========================================================================
*/ */
void AsicRemovePairwiseKeyEntry(IN PRTMP_ADAPTER pAd, void AsicRemovePairwiseKeyEntry(struct rt_rtmp_adapter *pAd,
u8 BssIdx, u8 Wcid) u8 BssIdx, u8 Wcid)
{ {
unsigned long WCIDAttri; unsigned long WCIDAttri;
...@@ -2434,7 +2434,7 @@ void AsicRemovePairwiseKeyEntry(IN PRTMP_ADAPTER pAd, ...@@ -2434,7 +2434,7 @@ void AsicRemovePairwiseKeyEntry(IN PRTMP_ADAPTER pAd,
RTMP_IO_WRITE32(pAd, offset, WCIDAttri); RTMP_IO_WRITE32(pAd, offset, WCIDAttri);
} }
BOOLEAN AsicSendCommandToMcu(IN PRTMP_ADAPTER pAd, BOOLEAN AsicSendCommandToMcu(struct rt_rtmp_adapter *pAd,
u8 Command, u8 Command,
u8 Token, u8 Arg0, u8 Arg1) u8 Token, u8 Arg0, u8 Arg1)
{ {
...@@ -2445,7 +2445,7 @@ BOOLEAN AsicSendCommandToMcu(IN PRTMP_ADAPTER pAd, ...@@ -2445,7 +2445,7 @@ BOOLEAN AsicSendCommandToMcu(IN PRTMP_ADAPTER pAd,
return TRUE; return TRUE;
} }
void AsicSetRxAnt(IN PRTMP_ADAPTER pAd, u8 Ant) void AsicSetRxAnt(struct rt_rtmp_adapter *pAd, u8 Ant)
{ {
#ifdef RT30xx #ifdef RT30xx
/* RT3572 ATE need not to do this. */ /* RT3572 ATE need not to do this. */
...@@ -2453,7 +2453,7 @@ void AsicSetRxAnt(IN PRTMP_ADAPTER pAd, u8 Ant) ...@@ -2453,7 +2453,7 @@ void AsicSetRxAnt(IN PRTMP_ADAPTER pAd, u8 Ant)
#endif /* RT30xx // */ #endif /* RT30xx // */
} }
void AsicTurnOffRFClk(IN PRTMP_ADAPTER pAd, u8 Channel) void AsicTurnOffRFClk(struct rt_rtmp_adapter *pAd, u8 Channel)
{ {
if (pAd->chipOps.AsicRfTurnOff) { if (pAd->chipOps.AsicRfTurnOff) {
pAd->chipOps.AsicRfTurnOff(pAd); pAd->chipOps.AsicRfTurnOff(pAd);
...@@ -2461,7 +2461,7 @@ void AsicTurnOffRFClk(IN PRTMP_ADAPTER pAd, u8 Channel) ...@@ -2461,7 +2461,7 @@ void AsicTurnOffRFClk(IN PRTMP_ADAPTER pAd, u8 Channel)
/* RF R2 bit 18 = 0 */ /* RF R2 bit 18 = 0 */
u32 R1 = 0, R2 = 0, R3 = 0; u32 R1 = 0, R2 = 0, R3 = 0;
u8 index; u8 index;
RTMP_RF_REGS *RFRegTable; struct rt_rtmp_rf_regs *RFRegTable;
RFRegTable = RF2850RegTable; RFRegTable = RF2850RegTable;
...@@ -2507,12 +2507,12 @@ void AsicTurnOffRFClk(IN PRTMP_ADAPTER pAd, u8 Channel) ...@@ -2507,12 +2507,12 @@ void AsicTurnOffRFClk(IN PRTMP_ADAPTER pAd, u8 Channel)
} }
} }
void AsicTurnOnRFClk(IN PRTMP_ADAPTER pAd, u8 Channel) void AsicTurnOnRFClk(struct rt_rtmp_adapter *pAd, u8 Channel)
{ {
/* RF R2 bit 18 = 0 */ /* RF R2 bit 18 = 0 */
u32 R1 = 0, R2 = 0, R3 = 0; u32 R1 = 0, R2 = 0, R3 = 0;
u8 index; u8 index;
RTMP_RF_REGS *RFRegTable; struct rt_rtmp_rf_regs *RFRegTable;
#ifdef PCIE_PS_SUPPORT #ifdef PCIE_PS_SUPPORT
/* The RF programming sequence is difference between 3xxx and 2xxx */ /* The RF programming sequence is difference between 3xxx and 2xxx */
......
drivers/staging/rt2860/common/cmm_cfg.c
浏览文件 @ 62eb734b
...@@ -80,7 +80,7 @@ char *GetBW(int BW) ...@@ -80,7 +80,7 @@ char *GetBW(int BW)
TRUE if all parameters are OK, FALSE otherwise TRUE if all parameters are OK, FALSE otherwise
========================================================================== ==========================================================================
*/ */
int RT_CfgSetCountryRegion(IN PRTMP_ADAPTER pAd, char *arg, int band) int RT_CfgSetCountryRegion(struct rt_rtmp_adapter *pAd, char *arg, int band)
{ {
long region, regionMax; long region, regionMax;
u8 *pCountryRegion; u8 *pCountryRegion;
...@@ -126,7 +126,7 @@ int RT_CfgSetCountryRegion(IN PRTMP_ADAPTER pAd, char *arg, int band) ...@@ -126,7 +126,7 @@ int RT_CfgSetCountryRegion(IN PRTMP_ADAPTER pAd, char *arg, int band)
TRUE if all parameters are OK, FALSE otherwise TRUE if all parameters are OK, FALSE otherwise
========================================================================== ==========================================================================
*/ */
int RT_CfgSetWirelessMode(IN PRTMP_ADAPTER pAd, char *arg) int RT_CfgSetWirelessMode(struct rt_rtmp_adapter *pAd, char *arg)
{ {
int MaxPhyMode = PHY_11G; int MaxPhyMode = PHY_11G;
long WirelessMode; long WirelessMode;
...@@ -143,7 +143,7 @@ int RT_CfgSetWirelessMode(IN PRTMP_ADAPTER pAd, char *arg) ...@@ -143,7 +143,7 @@ int RT_CfgSetWirelessMode(IN PRTMP_ADAPTER pAd, char *arg)
} }
int RT_CfgSetShortSlot(IN PRTMP_ADAPTER pAd, char *arg) int RT_CfgSetShortSlot(struct rt_rtmp_adapter *pAd, char *arg)
{ {
long ShortSlot; long ShortSlot;
...@@ -167,9 +167,9 @@ int RT_CfgSetShortSlot(IN PRTMP_ADAPTER pAd, char *arg) ...@@ -167,9 +167,9 @@ int RT_CfgSetShortSlot(IN PRTMP_ADAPTER pAd, char *arg)
TRUE if all parameters are OK, FALSE otherwise TRUE if all parameters are OK, FALSE otherwise
========================================================================== ==========================================================================
*/ */
int RT_CfgSetWepKey(IN PRTMP_ADAPTER pAd, int RT_CfgSetWepKey(struct rt_rtmp_adapter *pAd,
char *keyString, char *keyString,
IN CIPHER_KEY * pSharedKey, int keyIdx) struct rt_cipher_key *pSharedKey, int keyIdx)
{ {
int KeyLen; int KeyLen;
int i; int i;
...@@ -177,7 +177,7 @@ int RT_CfgSetWepKey(IN PRTMP_ADAPTER pAd, ...@@ -177,7 +177,7 @@ int RT_CfgSetWepKey(IN PRTMP_ADAPTER pAd,
BOOLEAN bKeyIsHex = FALSE; BOOLEAN bKeyIsHex = FALSE;
/* TODO: Shall we do memset for the original key info?? */ /* TODO: Shall we do memset for the original key info?? */
memset(pSharedKey, 0, sizeof(CIPHER_KEY)); memset(pSharedKey, 0, sizeof(struct rt_cipher_key));
KeyLen = strlen(keyString); KeyLen = strlen(keyString);
switch (KeyLen) { switch (KeyLen) {
case 5: /*wep 40 Ascii type */ case 5: /*wep 40 Ascii type */
...@@ -230,7 +230,7 @@ int RT_CfgSetWepKey(IN PRTMP_ADAPTER pAd, ...@@ -230,7 +230,7 @@ int RT_CfgSetWepKey(IN PRTMP_ADAPTER pAd,
TRUE if all parameters are OK, FALSE otherwise TRUE if all parameters are OK, FALSE otherwise
========================================================================== ==========================================================================
*/ */
int RT_CfgSetWPAPSKKey(IN RTMP_ADAPTER * pAd, int RT_CfgSetWPAPSKKey(struct rt_rtmp_adapter *pAd,
char *keyString, char *keyString,
u8 * pHashStr, u8 * pHashStr,
int hashStrLen, u8 *pPMKBuf) int hashStrLen, u8 *pPMKBuf)
......
drivers/staging/rt2860/common/cmm_data.c
浏览文件 @ 62eb734b
...@@ -104,7 +104,7 @@ QID_AC_VO, QID_AC_VO }; ...@@ -104,7 +104,7 @@ QID_AC_VO, QID_AC_VO };
======================================================================== ========================================================================
*/ */
int MiniportMMRequest(IN PRTMP_ADAPTER pAd, int MiniportMMRequest(struct rt_rtmp_adapter *pAd,
u8 QueIdx, u8 *pData, u32 Length) u8 QueIdx, u8 *pData, u32 Length)
{ {
void *pPacket; void *pPacket;
...@@ -242,13 +242,13 @@ int MiniportMMRequest(IN PRTMP_ADAPTER pAd, ...@@ -242,13 +242,13 @@ int MiniportMMRequest(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
int MlmeHardTransmit(IN PRTMP_ADAPTER pAd, int MlmeHardTransmit(struct rt_rtmp_adapter *pAd,
u8 QueIdx, void *pPacket) u8 QueIdx, void *pPacket)
{ {
PACKET_INFO PacketInfo; struct rt_packet_info PacketInfo;
u8 *pSrcBufVA; u8 *pSrcBufVA;
u32 SrcBufLen; u32 SrcBufLen;
PHEADER_802_11 pHeader_802_11; struct rt_header_802_11 * pHeader_802_11;
if ((pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE) if ((pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)
) { ) {
...@@ -259,7 +259,7 @@ int MlmeHardTransmit(IN PRTMP_ADAPTER pAd, ...@@ -259,7 +259,7 @@ int MlmeHardTransmit(IN PRTMP_ADAPTER pAd,
if (pSrcBufVA == NULL) if (pSrcBufVA == NULL)
return NDIS_STATUS_FAILURE; return NDIS_STATUS_FAILURE;
pHeader_802_11 = (PHEADER_802_11) (pSrcBufVA + TXINFO_SIZE + TXWI_SIZE); pHeader_802_11 = (struct rt_header_802_11 *) (pSrcBufVA + TXINFO_SIZE + TXWI_SIZE);
#ifdef RTMP_MAC_PCI #ifdef RTMP_MAC_PCI
if (pAd->MACVersion == 0x28600100) if (pAd->MACVersion == 0x28600100)
...@@ -270,17 +270,17 @@ int MlmeHardTransmit(IN PRTMP_ADAPTER pAd, ...@@ -270,17 +270,17 @@ int MlmeHardTransmit(IN PRTMP_ADAPTER pAd,
} }
int MlmeHardTransmitMgmtRing(IN PRTMP_ADAPTER pAd, int MlmeHardTransmitMgmtRing(struct rt_rtmp_adapter *pAd,
u8 QueIdx, void *pPacket) u8 QueIdx, void *pPacket)
{ {
PACKET_INFO PacketInfo; struct rt_packet_info PacketInfo;
u8 *pSrcBufVA; u8 *pSrcBufVA;
u32 SrcBufLen; u32 SrcBufLen;
PHEADER_802_11 pHeader_802_11; struct rt_header_802_11 * pHeader_802_11;
BOOLEAN bAckRequired, bInsertTimestamp; BOOLEAN bAckRequired, bInsertTimestamp;
u8 MlmeRate; u8 MlmeRate;
PTXWI_STRUC pFirstTxWI; struct rt_txwi * pFirstTxWI;
MAC_TABLE_ENTRY *pMacEntry = NULL; struct rt_mac_table_entry *pMacEntry = NULL;
u8 PID; u8 PID;
RTMP_QueryPacketInfo(pPacket, &PacketInfo, &pSrcBufVA, &SrcBufLen); RTMP_QueryPacketInfo(pPacket, &PacketInfo, &pSrcBufVA, &SrcBufLen);
...@@ -299,8 +299,8 @@ int MlmeHardTransmitMgmtRing(IN PRTMP_ADAPTER pAd, ...@@ -299,8 +299,8 @@ int MlmeHardTransmitMgmtRing(IN PRTMP_ADAPTER pAd,
AsicForceWakeup(pAd, TRUE); AsicForceWakeup(pAd, TRUE);
} }
pFirstTxWI = (PTXWI_STRUC) (pSrcBufVA + TXINFO_SIZE); pFirstTxWI = (struct rt_txwi *) (pSrcBufVA + TXINFO_SIZE);
pHeader_802_11 = (PHEADER_802_11) (pSrcBufVA + TXINFO_SIZE + TXWI_SIZE); /*TXWI_SIZE); */ pHeader_802_11 = (struct rt_header_802_11 *) (pSrcBufVA + TXINFO_SIZE + TXWI_SIZE); /*TXWI_SIZE); */
if (pHeader_802_11->Addr1[0] & 0x01) { if (pHeader_802_11->Addr1[0] & 0x01) {
MlmeRate = pAd->CommonCfg.BasicMlmeRate; MlmeRate = pAd->CommonCfg.BasicMlmeRate;
...@@ -506,11 +506,11 @@ int MlmeHardTransmitMgmtRing(IN PRTMP_ADAPTER pAd, ...@@ -506,11 +506,11 @@ int MlmeHardTransmitMgmtRing(IN PRTMP_ADAPTER pAd,
(2).Normal (2).Normal
======================================================================== ========================================================================
*/ */
static u8 TxPktClassification(IN RTMP_ADAPTER * pAd, void *pPacket) static u8 TxPktClassification(struct rt_rtmp_adapter *pAd, void *pPacket)
{ {
u8 TxFrameType = TX_UNKOWN_FRAME; u8 TxFrameType = TX_UNKOWN_FRAME;
u8 Wcid; u8 Wcid;
MAC_TABLE_ENTRY *pMacEntry = NULL; struct rt_mac_table_entry *pMacEntry = NULL;
BOOLEAN bHTRate = FALSE; BOOLEAN bHTRate = FALSE;
Wcid = RTMP_GET_PACKET_WCID(pPacket); Wcid = RTMP_GET_PACKET_WCID(pPacket);
...@@ -554,11 +554,11 @@ static u8 TxPktClassification(IN RTMP_ADAPTER * pAd, void *pPacket) ...@@ -554,11 +554,11 @@ static u8 TxPktClassification(IN RTMP_ADAPTER * pAd, void *pPacket)
return TxFrameType; return TxFrameType;
} }
BOOLEAN RTMP_FillTxBlkInfo(IN RTMP_ADAPTER * pAd, IN TX_BLK * pTxBlk) BOOLEAN RTMP_FillTxBlkInfo(struct rt_rtmp_adapter *pAd, struct rt_tx_blk *pTxBlk)
{ {
PACKET_INFO PacketInfo; struct rt_packet_info PacketInfo;
void *pPacket; void *pPacket;
PMAC_TABLE_ENTRY pMacEntry = NULL; struct rt_mac_table_entry *pMacEntry = NULL;
pPacket = pTxBlk->pPacket; pPacket = pTxBlk->pPacket;
RTMP_QueryPacketInfo(pPacket, &PacketInfo, &pTxBlk->pSrcBufHeader, RTMP_QueryPacketInfo(pPacket, &PacketInfo, &pTxBlk->pSrcBufHeader,
...@@ -662,8 +662,8 @@ BOOLEAN RTMP_FillTxBlkInfo(IN RTMP_ADAPTER * pAd, IN TX_BLK * pTxBlk) ...@@ -662,8 +662,8 @@ BOOLEAN RTMP_FillTxBlkInfo(IN RTMP_ADAPTER * pAd, IN TX_BLK * pTxBlk)
return TRUE; return TRUE;
} }
BOOLEAN CanDoAggregateTransmit(IN RTMP_ADAPTER * pAd, BOOLEAN CanDoAggregateTransmit(struct rt_rtmp_adapter *pAd,
char * pPacket, IN TX_BLK * pTxBlk) char * pPacket, struct rt_tx_blk *pTxBlk)
{ {
/*DBGPRINT(RT_DEBUG_TRACE, ("Check if can do aggregation! TxFrameType=%d!\n", pTxBlk->TxFrameType)); */ /*DBGPRINT(RT_DEBUG_TRACE, ("Check if can do aggregation! TxFrameType=%d!\n", pTxBlk->TxFrameType)); */
...@@ -712,20 +712,20 @@ BOOLEAN CanDoAggregateTransmit(IN RTMP_ADAPTER * pAd, ...@@ -712,20 +712,20 @@ BOOLEAN CanDoAggregateTransmit(IN RTMP_ADAPTER * pAd,
======================================================================== ========================================================================
*/ */
void RTMPDeQueuePacket(IN PRTMP_ADAPTER pAd, IN BOOLEAN bIntContext, u8 QIdx, /* BulkOutPipeId */ void RTMPDeQueuePacket(struct rt_rtmp_adapter *pAd, IN BOOLEAN bIntContext, u8 QIdx, /* BulkOutPipeId */
u8 Max_Tx_Packets) u8 Max_Tx_Packets)
{ {
PQUEUE_ENTRY pEntry = NULL; struct rt_queue_entry *pEntry = NULL;
void *pPacket; void *pPacket;
int Status = NDIS_STATUS_SUCCESS; int Status = NDIS_STATUS_SUCCESS;
u8 Count = 0; u8 Count = 0;
PQUEUE_HEADER pQueue; struct rt_queue_header *pQueue;
unsigned long FreeNumber[NUM_OF_TX_RING]; unsigned long FreeNumber[NUM_OF_TX_RING];
u8 QueIdx, sQIdx, eQIdx; u8 QueIdx, sQIdx, eQIdx;
unsigned long IrqFlags = 0; unsigned long IrqFlags = 0;
BOOLEAN hasTxDesc = FALSE; BOOLEAN hasTxDesc = FALSE;
TX_BLK TxBlk; struct rt_tx_blk TxBlk;
TX_BLK *pTxBlk; struct rt_tx_blk *pTxBlk;
if (QIdx == NUM_OF_TX_RING) { if (QIdx == NUM_OF_TX_RING) {
sQIdx = 0; sQIdx = 0;
...@@ -780,7 +780,7 @@ void RTMPDeQueuePacket(IN PRTMP_ADAPTER pAd, IN BOOLEAN bIntContext, u8 QIdx, /* ...@@ -780,7 +780,7 @@ void RTMPDeQueuePacket(IN PRTMP_ADAPTER pAd, IN BOOLEAN bIntContext, u8 QIdx, /*
} }
pTxBlk = &TxBlk; pTxBlk = &TxBlk;
NdisZeroMemory((u8 *)pTxBlk, sizeof(TX_BLK)); NdisZeroMemory((u8 *)pTxBlk, sizeof(struct rt_tx_blk));
/*InitializeQueueHeader(&pTxBlk->TxPacketList); // Didn't need it because we already memzero it. */ /*InitializeQueueHeader(&pTxBlk->TxPacketList); // Didn't need it because we already memzero it. */
pTxBlk->QueIdx = QueIdx; pTxBlk->QueIdx = QueIdx;
...@@ -908,7 +908,7 @@ void RTMPDeQueuePacket(IN PRTMP_ADAPTER pAd, IN BOOLEAN bIntContext, u8 QIdx, /* ...@@ -908,7 +908,7 @@ void RTMPDeQueuePacket(IN PRTMP_ADAPTER pAd, IN BOOLEAN bIntContext, u8 QIdx, /*
======================================================================== ========================================================================
*/ */
u16 RTMPCalcDuration(IN PRTMP_ADAPTER pAd, u8 Rate, unsigned long Size) u16 RTMPCalcDuration(struct rt_rtmp_adapter *pAd, u8 Rate, unsigned long Size)
{ {
unsigned long Duration = 0; unsigned long Duration = 0;
...@@ -968,7 +968,7 @@ u16 RTMPCalcDuration(IN PRTMP_ADAPTER pAd, u8 Rate, unsigned long Size) ...@@ -968,7 +968,7 @@ u16 RTMPCalcDuration(IN PRTMP_ADAPTER pAd, u8 Rate, unsigned long Size)
======================================================================== ========================================================================
*/ */
void RTMPWriteTxWI(IN PRTMP_ADAPTER pAd, IN PTXWI_STRUC pOutTxWI, IN BOOLEAN FRAG, IN BOOLEAN CFACK, IN BOOLEAN InsTimestamp, IN BOOLEAN AMPDU, IN BOOLEAN Ack, IN BOOLEAN NSeq, /* HW new a sequence. */ void RTMPWriteTxWI(struct rt_rtmp_adapter *pAd, struct rt_txwi * pOutTxWI, IN BOOLEAN FRAG, IN BOOLEAN CFACK, IN BOOLEAN InsTimestamp, IN BOOLEAN AMPDU, IN BOOLEAN Ack, IN BOOLEAN NSeq, /* HW new a sequence. */
u8 BASize, u8 BASize,
u8 WCID, u8 WCID,
unsigned long Length, unsigned long Length,
...@@ -978,9 +978,9 @@ void RTMPWriteTxWI(IN PRTMP_ADAPTER pAd, IN PTXWI_STRUC pOutTxWI, IN BOOLEAN FRA ...@@ -978,9 +978,9 @@ void RTMPWriteTxWI(IN PRTMP_ADAPTER pAd, IN PTXWI_STRUC pOutTxWI, IN BOOLEAN FRA
u8 Txopmode, u8 Txopmode,
IN BOOLEAN CfAck, IN HTTRANSMIT_SETTING * pTransmit) IN BOOLEAN CfAck, IN HTTRANSMIT_SETTING * pTransmit)
{ {
PMAC_TABLE_ENTRY pMac = NULL; struct rt_mac_table_entry *pMac = NULL;
TXWI_STRUC TxWI; struct rt_txwi TxWI;
PTXWI_STRUC pTxWI; struct rt_txwi * pTxWI;
if (WCID < MAX_LEN_OF_MAC_TABLE) if (WCID < MAX_LEN_OF_MAC_TABLE)
pMac = &pAd->MacTab.Content[WCID]; pMac = &pAd->MacTab.Content[WCID];
...@@ -1053,14 +1053,14 @@ void RTMPWriteTxWI(IN PRTMP_ADAPTER pAd, IN PTXWI_STRUC pOutTxWI, IN BOOLEAN FRA ...@@ -1053,14 +1053,14 @@ void RTMPWriteTxWI(IN PRTMP_ADAPTER pAd, IN PTXWI_STRUC pOutTxWI, IN BOOLEAN FRA
} }
pTxWI->PacketId = pTxWI->MCS; pTxWI->PacketId = pTxWI->MCS;
NdisMoveMemory(pOutTxWI, &TxWI, sizeof(TXWI_STRUC)); NdisMoveMemory(pOutTxWI, &TxWI, sizeof(struct rt_txwi));
} }
void RTMPWriteTxWI_Data(IN PRTMP_ADAPTER pAd, void RTMPWriteTxWI_Data(struct rt_rtmp_adapter *pAd,
IN OUT PTXWI_STRUC pTxWI, IN TX_BLK * pTxBlk) struct rt_txwi * pTxWI, struct rt_tx_blk *pTxBlk)
{ {
HTTRANSMIT_SETTING *pTransmit; HTTRANSMIT_SETTING *pTransmit;
PMAC_TABLE_ENTRY pMacEntry; struct rt_mac_table_entry *pMacEntry;
u8 BASize; u8 BASize;
ASSERT(pTxWI); ASSERT(pTxWI);
...@@ -1134,11 +1134,11 @@ void RTMPWriteTxWI_Data(IN PRTMP_ADAPTER pAd, ...@@ -1134,11 +1134,11 @@ void RTMPWriteTxWI_Data(IN PRTMP_ADAPTER pAd,
pTxWI->PacketId = pTxWI->MCS; pTxWI->PacketId = pTxWI->MCS;
} }
void RTMPWriteTxWI_Cache(IN PRTMP_ADAPTER pAd, void RTMPWriteTxWI_Cache(struct rt_rtmp_adapter *pAd,
IN OUT PTXWI_STRUC pTxWI, IN TX_BLK * pTxBlk) struct rt_txwi * pTxWI, struct rt_tx_blk *pTxBlk)
{ {
PHTTRANSMIT_SETTING /*pTxHTPhyMode, */ pTransmit; PHTTRANSMIT_SETTING /*pTxHTPhyMode, */ pTransmit;
PMAC_TABLE_ENTRY pMacEntry; struct rt_mac_table_entry *pMacEntry;
/* */ /* */
/* update TXWI */ /* update TXWI */
...@@ -1194,7 +1194,7 @@ void RTMPWriteTxWI_Cache(IN PRTMP_ADAPTER pAd, ...@@ -1194,7 +1194,7 @@ void RTMPWriteTxWI_Cache(IN PRTMP_ADAPTER pAd,
/* 2. AGGREGATION_IN_USED */ /* 2. AGGREGATION_IN_USED */
/* 3. Fragmentation not in used */ /* 3. Fragmentation not in used */
/* 4. either no previous frame (pPrevAddr1=NULL) .OR. previoud frame is aggregatible */ /* 4. either no previous frame (pPrevAddr1=NULL) .OR. previoud frame is aggregatible */
BOOLEAN TxFrameIsAggregatible(IN PRTMP_ADAPTER pAd, BOOLEAN TxFrameIsAggregatible(struct rt_rtmp_adapter *pAd,
u8 *pPrevAddr1, u8 *p8023hdr) u8 *pPrevAddr1, u8 *p8023hdr)
{ {
...@@ -1230,8 +1230,8 @@ BOOLEAN TxFrameIsAggregatible(IN PRTMP_ADAPTER pAd, ...@@ -1230,8 +1230,8 @@ BOOLEAN TxFrameIsAggregatible(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
BOOLEAN PeerIsAggreOn(IN PRTMP_ADAPTER pAd, BOOLEAN PeerIsAggreOn(struct rt_rtmp_adapter *pAd,
unsigned long TxRate, IN PMAC_TABLE_ENTRY pMacEntry) unsigned long TxRate, struct rt_mac_table_entry *pMacEntry)
{ {
unsigned long AFlags = unsigned long AFlags =
(fCLIENT_STATUS_AMSDU_INUSED | fCLIENT_STATUS_AGGREGATION_CAPABLE); (fCLIENT_STATUS_AMSDU_INUSED | fCLIENT_STATUS_AGGREGATION_CAPABLE);
...@@ -1269,7 +1269,7 @@ BOOLEAN PeerIsAggreOn(IN PRTMP_ADAPTER pAd, ...@@ -1269,7 +1269,7 @@ BOOLEAN PeerIsAggreOn(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
PQUEUE_HEADER RTMPCheckTxSwQueue(IN PRTMP_ADAPTER pAd, u8 *pQueIdx) struct rt_queue_header *RTMPCheckTxSwQueue(struct rt_rtmp_adapter *pAd, u8 *pQueIdx)
{ {
unsigned long Number; unsigned long Number;
...@@ -1317,7 +1317,7 @@ PQUEUE_HEADER RTMPCheckTxSwQueue(IN PRTMP_ADAPTER pAd, u8 *pQueIdx) ...@@ -1317,7 +1317,7 @@ PQUEUE_HEADER RTMPCheckTxSwQueue(IN PRTMP_ADAPTER pAd, u8 *pQueIdx)
======================================================================== ========================================================================
*/ */
void RTMPSuspendMsduTransmission(IN PRTMP_ADAPTER pAd) void RTMPSuspendMsduTransmission(struct rt_rtmp_adapter *pAd)
{ {
DBGPRINT(RT_DEBUG_TRACE, ("SCANNING, suspend MSDU transmission ...\n")); DBGPRINT(RT_DEBUG_TRACE, ("SCANNING, suspend MSDU transmission ...\n"));
...@@ -1354,7 +1354,7 @@ void RTMPSuspendMsduTransmission(IN PRTMP_ADAPTER pAd) ...@@ -1354,7 +1354,7 @@ void RTMPSuspendMsduTransmission(IN PRTMP_ADAPTER pAd)
======================================================================== ========================================================================
*/ */
void RTMPResumeMsduTransmission(IN PRTMP_ADAPTER pAd) void RTMPResumeMsduTransmission(struct rt_rtmp_adapter *pAd)
{ {
/* u8 IrqState; */ /* u8 IrqState; */
...@@ -1379,13 +1379,13 @@ void RTMPResumeMsduTransmission(IN PRTMP_ADAPTER pAd) ...@@ -1379,13 +1379,13 @@ void RTMPResumeMsduTransmission(IN PRTMP_ADAPTER pAd)
RTMPDeQueuePacket(pAd, FALSE, NUM_OF_TX_RING, MAX_TX_PROCESS); RTMPDeQueuePacket(pAd, FALSE, NUM_OF_TX_RING, MAX_TX_PROCESS);
} }
u32 deaggregate_AMSDU_announce(IN PRTMP_ADAPTER pAd, u32 deaggregate_AMSDU_announce(struct rt_rtmp_adapter *pAd,
void *pPacket, void *pPacket,
u8 *pData, unsigned long DataSize) u8 *pData, unsigned long DataSize)
{ {
u16 PayloadSize; u16 PayloadSize;
u16 SubFrameSize; u16 SubFrameSize;
PHEADER_802_3 pAMSDUsubheader; struct rt_header_802_3 * pAMSDUsubheader;
u32 nMSDU; u32 nMSDU;
u8 Header802_3[14]; u8 Header802_3[14];
...@@ -1399,7 +1399,7 @@ u32 deaggregate_AMSDU_announce(IN PRTMP_ADAPTER pAd, ...@@ -1399,7 +1399,7 @@ u32 deaggregate_AMSDU_announce(IN PRTMP_ADAPTER pAd,
nMSDU++; nMSDU++;
/*hex_dump("subheader", pData, 64); */ /*hex_dump("subheader", pData, 64); */
pAMSDUsubheader = (PHEADER_802_3) pData; pAMSDUsubheader = (struct rt_header_802_3 *) pData;
/*pData += LENGTH_802_3; */ /*pData += LENGTH_802_3; */
PayloadSize = PayloadSize =
pAMSDUsubheader->Octet[1] + pAMSDUsubheader->Octet[1] +
...@@ -1421,8 +1421,8 @@ u32 deaggregate_AMSDU_announce(IN PRTMP_ADAPTER pAd, ...@@ -1421,8 +1421,8 @@ u32 deaggregate_AMSDU_announce(IN PRTMP_ADAPTER pAd,
if ((Header802_3[12] == 0x88) && (Header802_3[13] == 0x8E)) { if ((Header802_3[12] == 0x88) && (Header802_3[13] == 0x8E)) {
/* avoid local heap overflow, use dyanamic allocation */ /* avoid local heap overflow, use dyanamic allocation */
MLME_QUEUE_ELEM *Elem = struct rt_mlme_queue_elem *Elem =
(MLME_QUEUE_ELEM *) kmalloc(sizeof(MLME_QUEUE_ELEM), (struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
MEM_ALLOC_FLAG); MEM_ALLOC_FLAG);
if (Elem != NULL) { if (Elem != NULL) {
memmove(Elem->Msg + memmove(Elem->Msg +
...@@ -1479,7 +1479,7 @@ u32 deaggregate_AMSDU_announce(IN PRTMP_ADAPTER pAd, ...@@ -1479,7 +1479,7 @@ u32 deaggregate_AMSDU_announce(IN PRTMP_ADAPTER pAd,
return nMSDU; return nMSDU;
} }
u32 BA_Reorder_AMSDU_Annnounce(IN PRTMP_ADAPTER pAd, void *pPacket) u32 BA_Reorder_AMSDU_Annnounce(struct rt_rtmp_adapter *pAd, void *pPacket)
{ {
u8 *pData; u8 *pData;
u16 DataSize; u16 DataSize;
...@@ -1501,10 +1501,10 @@ u32 BA_Reorder_AMSDU_Annnounce(IN PRTMP_ADAPTER pAd, void *pPacket) ...@@ -1501,10 +1501,10 @@ u32 BA_Reorder_AMSDU_Annnounce(IN PRTMP_ADAPTER pAd, void *pPacket)
pEntry - pointer to the MAC entry; NULL is not found pEntry - pointer to the MAC entry; NULL is not found
========================================================================== ==========================================================================
*/ */
MAC_TABLE_ENTRY *MacTableLookup(IN PRTMP_ADAPTER pAd, u8 *pAddr) struct rt_mac_table_entry *MacTableLookup(struct rt_rtmp_adapter *pAd, u8 *pAddr)
{ {
unsigned long HashIdx; unsigned long HashIdx;
MAC_TABLE_ENTRY *pEntry = NULL; struct rt_mac_table_entry *pEntry = NULL;
HashIdx = MAC_ADDR_HASH_INDEX(pAddr); HashIdx = MAC_ADDR_HASH_INDEX(pAddr);
pEntry = pAd->MacTab.Hash[HashIdx]; pEntry = pAd->MacTab.Hash[HashIdx];
...@@ -1521,13 +1521,13 @@ MAC_TABLE_ENTRY *MacTableLookup(IN PRTMP_ADAPTER pAd, u8 *pAddr) ...@@ -1521,13 +1521,13 @@ MAC_TABLE_ENTRY *MacTableLookup(IN PRTMP_ADAPTER pAd, u8 *pAddr)
return pEntry; return pEntry;
} }
MAC_TABLE_ENTRY *MacTableInsertEntry(IN PRTMP_ADAPTER pAd, struct rt_mac_table_entry *MacTableInsertEntry(struct rt_rtmp_adapter *pAd,
u8 *pAddr, u8 *pAddr,
u8 apidx, IN BOOLEAN CleanAll) u8 apidx, IN BOOLEAN CleanAll)
{ {
u8 HashIdx; u8 HashIdx;
int i, FirstWcid; int i, FirstWcid;
MAC_TABLE_ENTRY *pEntry = NULL, *pCurrEntry; struct rt_mac_table_entry *pEntry = NULL, *pCurrEntry;
/* u16 offset; */ /* u16 offset; */
/* unsigned long addr; */ /* unsigned long addr; */
...@@ -1554,7 +1554,7 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(IN PRTMP_ADAPTER pAd, ...@@ -1554,7 +1554,7 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(IN PRTMP_ADAPTER pAd,
if (CleanAll == TRUE) { if (CleanAll == TRUE) {
pEntry->MaxSupportedRate = RATE_11; pEntry->MaxSupportedRate = RATE_11;
pEntry->CurrTxRate = RATE_11; pEntry->CurrTxRate = RATE_11;
NdisZeroMemory(pEntry, sizeof(MAC_TABLE_ENTRY)); NdisZeroMemory(pEntry, sizeof(struct rt_mac_table_entry));
pEntry->PairwiseKey.KeyLen = 0; pEntry->PairwiseKey.KeyLen = 0;
pEntry->PairwiseKey.CipherAlg = CIPHER_NONE; pEntry->PairwiseKey.CipherAlg = CIPHER_NONE;
} }
...@@ -1658,11 +1658,11 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(IN PRTMP_ADAPTER pAd, ...@@ -1658,11 +1658,11 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(IN PRTMP_ADAPTER pAd,
Delete a specified client from MAC table Delete a specified client from MAC table
========================================================================== ==========================================================================
*/ */
BOOLEAN MacTableDeleteEntry(IN PRTMP_ADAPTER pAd, BOOLEAN MacTableDeleteEntry(struct rt_rtmp_adapter *pAd,
u16 wcid, u8 *pAddr) u16 wcid, u8 *pAddr)
{ {
u16 HashIdx; u16 HashIdx;
MAC_TABLE_ENTRY *pEntry, *pPrevEntry, *pProbeEntry; struct rt_mac_table_entry *pEntry, *pPrevEntry, *pProbeEntry;
BOOLEAN Cancelled; BOOLEAN Cancelled;
/*u16 offset; // unused variable */ /*u16 offset; // unused variable */
/*u8 j; // unused variable */ /*u8 j; // unused variable */
...@@ -1722,7 +1722,7 @@ BOOLEAN MacTableDeleteEntry(IN PRTMP_ADAPTER pAd, ...@@ -1722,7 +1722,7 @@ BOOLEAN MacTableDeleteEntry(IN PRTMP_ADAPTER pAd,
EAPOL_START_DISABLE; EAPOL_START_DISABLE;
} }
NdisZeroMemory(pEntry, sizeof(MAC_TABLE_ENTRY)); NdisZeroMemory(pEntry, sizeof(struct rt_mac_table_entry));
pAd->MacTab.Size--; pAd->MacTab.Size--;
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("MacTableDeleteEntry1 - Total= %d\n", ("MacTableDeleteEntry1 - Total= %d\n",
...@@ -1752,7 +1752,7 @@ BOOLEAN MacTableDeleteEntry(IN PRTMP_ADAPTER pAd, ...@@ -1752,7 +1752,7 @@ BOOLEAN MacTableDeleteEntry(IN PRTMP_ADAPTER pAd,
the power-saving queues are freed here. the power-saving queues are freed here.
========================================================================== ==========================================================================
*/ */
void MacTableReset(IN PRTMP_ADAPTER pAd) void MacTableReset(struct rt_rtmp_adapter *pAd)
{ {
int i; int i;
...@@ -1790,8 +1790,8 @@ void MacTableReset(IN PRTMP_ADAPTER pAd) ...@@ -1790,8 +1790,8 @@ void MacTableReset(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
void AssocParmFill(IN PRTMP_ADAPTER pAd, void AssocParmFill(struct rt_rtmp_adapter *pAd,
IN OUT MLME_ASSOC_REQ_STRUCT * AssocReq, struct rt_mlme_assoc_req *AssocReq,
u8 *pAddr, u8 *pAddr,
u16 CapabilityInfo, u16 CapabilityInfo,
unsigned long Timeout, u16 ListenIntv) unsigned long Timeout, u16 ListenIntv)
...@@ -1811,8 +1811,8 @@ void AssocParmFill(IN PRTMP_ADAPTER pAd, ...@@ -1811,8 +1811,8 @@ void AssocParmFill(IN PRTMP_ADAPTER pAd,
========================================================================== ==========================================================================
*/ */
void DisassocParmFill(IN PRTMP_ADAPTER pAd, void DisassocParmFill(struct rt_rtmp_adapter *pAd,
IN OUT MLME_DISASSOC_REQ_STRUCT * DisassocReq, struct rt_mlme_disassoc_req *DisassocReq,
u8 *pAddr, u16 Reason) u8 *pAddr, u16 Reason)
{ {
COPY_MAC_ADDR(DisassocReq->Addr, pAddr); COPY_MAC_ADDR(DisassocReq->Addr, pAddr);
...@@ -1853,9 +1853,9 @@ void DisassocParmFill(IN PRTMP_ADAPTER pAd, ...@@ -1853,9 +1853,9 @@ void DisassocParmFill(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
BOOLEAN RTMPCheckDHCPFrame(IN PRTMP_ADAPTER pAd, void *pPacket) BOOLEAN RTMPCheckDHCPFrame(struct rt_rtmp_adapter *pAd, void *pPacket)
{ {
PACKET_INFO PacketInfo; struct rt_packet_info PacketInfo;
unsigned long NumberOfBytesRead = 0; unsigned long NumberOfBytesRead = 0;
unsigned long CurrentOffset = 0; unsigned long CurrentOffset = 0;
void *pVirtualAddress = NULL; void *pVirtualAddress = NULL;
...@@ -1908,7 +1908,7 @@ BOOLEAN RTMPCheckDHCPFrame(IN PRTMP_ADAPTER pAd, void *pPacket) ...@@ -1908,7 +1908,7 @@ BOOLEAN RTMPCheckDHCPFrame(IN PRTMP_ADAPTER pAd, void *pPacket)
return TRUE; return TRUE;
} }
BOOLEAN RTMPCheckEtherType(IN PRTMP_ADAPTER pAd, void *pPacket) BOOLEAN RTMPCheckEtherType(struct rt_rtmp_adapter *pAd, void *pPacket)
{ {
u16 TypeLen; u16 TypeLen;
u8 Byte0, Byte1; u8 Byte0, Byte1;
...@@ -2010,8 +2010,8 @@ BOOLEAN RTMPCheckEtherType(IN PRTMP_ADAPTER pAd, void *pPacket) ...@@ -2010,8 +2010,8 @@ BOOLEAN RTMPCheckEtherType(IN PRTMP_ADAPTER pAd, void *pPacket)
} }
void Update_Rssi_Sample(IN PRTMP_ADAPTER pAd, void Update_Rssi_Sample(struct rt_rtmp_adapter *pAd,
IN RSSI_SAMPLE * pRssi, IN PRXWI_STRUC pRxWI) struct rt_rssi_sample *pRssi, struct rt_rxwi * pRxWI)
{ {
char rssi0 = pRxWI->RSSI0; char rssi0 = pRxWI->RSSI0;
char rssi1 = pRxWI->RSSI1; char rssi1 = pRxWI->RSSI1;
...@@ -2040,8 +2040,8 @@ void Update_Rssi_Sample(IN PRTMP_ADAPTER pAd, ...@@ -2040,8 +2040,8 @@ void Update_Rssi_Sample(IN PRTMP_ADAPTER pAd,
} }
/* Normal legacy Rx packet indication */ /* Normal legacy Rx packet indication */
void Indicate_Legacy_Packet(IN PRTMP_ADAPTER pAd, void Indicate_Legacy_Packet(struct rt_rtmp_adapter *pAd,
IN RX_BLK * pRxBlk, u8 FromWhichBSSID) struct rt_rx_blk *pRxBlk, u8 FromWhichBSSID)
{ {
void *pRxPacket = pRxBlk->pRxPacket; void *pRxPacket = pRxBlk->pRxPacket;
u8 Header802_3[LENGTH_802_3]; u8 Header802_3[LENGTH_802_3];
...@@ -2063,7 +2063,7 @@ void Indicate_Legacy_Packet(IN PRTMP_ADAPTER pAd, ...@@ -2063,7 +2063,7 @@ void Indicate_Legacy_Packet(IN PRTMP_ADAPTER pAd,
#ifdef RTMP_MAC_USB #ifdef RTMP_MAC_USB
if (pAd->CommonCfg.bDisableReordering == 0) { if (pAd->CommonCfg.bDisableReordering == 0) {
PBA_REC_ENTRY pBAEntry; struct rt_ba_rec_entry *pBAEntry;
unsigned long Now32; unsigned long Now32;
u8 Wcid = pRxBlk->pRxWI->WirelessCliID; u8 Wcid = pRxBlk->pRxWI->WirelessCliID;
u8 TID = pRxBlk->pRxWI->TID; u8 TID = pRxBlk->pRxWI->TID;
...@@ -2111,8 +2111,8 @@ void Indicate_Legacy_Packet(IN PRTMP_ADAPTER pAd, ...@@ -2111,8 +2111,8 @@ void Indicate_Legacy_Packet(IN PRTMP_ADAPTER pAd,
} }
/* Normal, AMPDU or AMSDU */ /* Normal, AMPDU or AMSDU */
void CmmRxnonRalinkFrameIndicate(IN PRTMP_ADAPTER pAd, void CmmRxnonRalinkFrameIndicate(struct rt_rtmp_adapter *pAd,
IN RX_BLK * pRxBlk, u8 FromWhichBSSID) struct rt_rx_blk *pRxBlk, u8 FromWhichBSSID)
{ {
if (RX_BLK_TEST_FLAG(pRxBlk, fRX_AMPDU) if (RX_BLK_TEST_FLAG(pRxBlk, fRX_AMPDU)
&& (pAd->CommonCfg.bDisableReordering == 0)) { && (pAd->CommonCfg.bDisableReordering == 0)) {
...@@ -2127,9 +2127,9 @@ void CmmRxnonRalinkFrameIndicate(IN PRTMP_ADAPTER pAd, ...@@ -2127,9 +2127,9 @@ void CmmRxnonRalinkFrameIndicate(IN PRTMP_ADAPTER pAd,
} }
} }
void CmmRxRalinkFrameIndicate(IN PRTMP_ADAPTER pAd, void CmmRxRalinkFrameIndicate(struct rt_rtmp_adapter *pAd,
IN MAC_TABLE_ENTRY * pEntry, struct rt_mac_table_entry *pEntry,
IN RX_BLK * pRxBlk, u8 FromWhichBSSID) struct rt_rx_blk *pRxBlk, u8 FromWhichBSSID)
{ {
u8 Header802_3[LENGTH_802_3]; u8 Header802_3[LENGTH_802_3];
u16 Msdu2Size; u16 Msdu2Size;
...@@ -2192,9 +2192,9 @@ void CmmRxRalinkFrameIndicate(IN PRTMP_ADAPTER pAd, ...@@ -2192,9 +2192,9 @@ void CmmRxRalinkFrameIndicate(IN PRTMP_ADAPTER pAd,
_fragFrame.Flags = 0; \ _fragFrame.Flags = 0; \
} }
void *RTMPDeFragmentDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk) void *RTMPDeFragmentDataFrame(struct rt_rtmp_adapter *pAd, struct rt_rx_blk *pRxBlk)
{ {
PHEADER_802_11 pHeader = pRxBlk->pHeader; struct rt_header_802_11 * pHeader = pRxBlk->pHeader;
void *pRxPacket = pRxBlk->pRxPacket; void *pRxPacket = pRxBlk->pRxPacket;
u8 *pData = pRxBlk->pData; u8 *pData = pRxBlk->pData;
u16 DataSize = pRxBlk->DataSize; u16 DataSize = pRxBlk->DataSize;
...@@ -2283,7 +2283,7 @@ void *RTMPDeFragmentDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk) ...@@ -2283,7 +2283,7 @@ void *RTMPDeFragmentDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
pRetPacket = pAd->FragFrame.pFragPacket; pRetPacket = pAd->FragFrame.pFragPacket;
pAd->FragFrame.pFragPacket = pNewFragPacket; pAd->FragFrame.pFragPacket = pNewFragPacket;
pRxBlk->pHeader = pRxBlk->pHeader =
(PHEADER_802_11) GET_OS_PKT_DATAPTR(pRetPacket); (struct rt_header_802_11 *) GET_OS_PKT_DATAPTR(pRetPacket);
pRxBlk->pData = (u8 *) pRxBlk->pHeader + HeaderRoom; pRxBlk->pData = (u8 *) pRxBlk->pHeader + HeaderRoom;
pRxBlk->DataSize = pAd->FragFrame.RxSize - HeaderRoom; pRxBlk->DataSize = pAd->FragFrame.RxSize - HeaderRoom;
pRxBlk->pRxPacket = pRetPacket; pRxBlk->pRxPacket = pRetPacket;
...@@ -2295,8 +2295,8 @@ void *RTMPDeFragmentDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk) ...@@ -2295,8 +2295,8 @@ void *RTMPDeFragmentDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
return pRetPacket; return pRetPacket;
} }
void Indicate_AMSDU_Packet(IN PRTMP_ADAPTER pAd, void Indicate_AMSDU_Packet(struct rt_rtmp_adapter *pAd,
IN RX_BLK * pRxBlk, u8 FromWhichBSSID) struct rt_rx_blk *pRxBlk, u8 FromWhichBSSID)
{ {
u32 nMSDU; u32 nMSDU;
...@@ -2307,10 +2307,10 @@ void Indicate_AMSDU_Packet(IN PRTMP_ADAPTER pAd, ...@@ -2307,10 +2307,10 @@ void Indicate_AMSDU_Packet(IN PRTMP_ADAPTER pAd,
pRxBlk->DataSize); pRxBlk->DataSize);
} }
void Indicate_EAPOL_Packet(IN PRTMP_ADAPTER pAd, void Indicate_EAPOL_Packet(struct rt_rtmp_adapter *pAd,
IN RX_BLK * pRxBlk, u8 FromWhichBSSID) struct rt_rx_blk *pRxBlk, u8 FromWhichBSSID)
{ {
MAC_TABLE_ENTRY *pEntry = NULL; struct rt_mac_table_entry *pEntry = NULL;
{ {
pEntry = &pAd->MacTab.Content[BSSID_WCID]; pEntry = &pAd->MacTab.Content[BSSID_WCID];
...@@ -2329,7 +2329,7 @@ void Indicate_EAPOL_Packet(IN PRTMP_ADAPTER pAd, ...@@ -2329,7 +2329,7 @@ void Indicate_EAPOL_Packet(IN PRTMP_ADAPTER pAd,
} }
#define BCN_TBTT_OFFSET 64 /*defer 64 us */ #define BCN_TBTT_OFFSET 64 /*defer 64 us */
void ReSyncBeaconTime(IN PRTMP_ADAPTER pAd) void ReSyncBeaconTime(struct rt_rtmp_adapter *pAd)
{ {
u32 Offset; u32 Offset;
......
drivers/staging/rt2860/common/cmm_data_pci.c
浏览文件 @ 62eb734b
...@@ -32,16 +32,16 @@ ...@@ -32,16 +32,16 @@
*/ */
#include "../rt_config.h" #include "../rt_config.h"
u16 RtmpPCI_WriteTxResource(IN PRTMP_ADAPTER pAd, u16 RtmpPCI_WriteTxResource(struct rt_rtmp_adapter *pAd,
IN TX_BLK * pTxBlk, struct rt_tx_blk *pTxBlk,
IN BOOLEAN bIsLast, u16 * FreeNumber) IN BOOLEAN bIsLast, u16 * FreeNumber)
{ {
u8 *pDMAHeaderBufVA; u8 *pDMAHeaderBufVA;
u16 TxIdx, RetTxIdx; u16 TxIdx, RetTxIdx;
PTXD_STRUC pTxD; struct rt_txd * pTxD;
u32 BufBasePaLow; u32 BufBasePaLow;
PRTMP_TX_RING pTxRing; struct rt_rtmp_tx_ring *pTxRing;
u16 hwHeaderLen; u16 hwHeaderLen;
/* */ /* */
...@@ -73,7 +73,7 @@ u16 RtmpPCI_WriteTxResource(IN PRTMP_ADAPTER pAd, ...@@ -73,7 +73,7 @@ u16 RtmpPCI_WriteTxResource(IN PRTMP_ADAPTER pAd,
/* build Tx Descriptor */ /* build Tx Descriptor */
/* */ /* */
pTxD = (PTXD_STRUC) pTxRing->Cell[TxIdx].AllocVa; pTxD = (struct rt_txd *) pTxRing->Cell[TxIdx].AllocVa;
NdisZeroMemory(pTxD, TXD_SIZE); NdisZeroMemory(pTxD, TXD_SIZE);
pTxD->SDPtr0 = BufBasePaLow; pTxD->SDPtr0 = BufBasePaLow;
...@@ -97,17 +97,17 @@ u16 RtmpPCI_WriteTxResource(IN PRTMP_ADAPTER pAd, ...@@ -97,17 +97,17 @@ u16 RtmpPCI_WriteTxResource(IN PRTMP_ADAPTER pAd,
return RetTxIdx; return RetTxIdx;
} }
u16 RtmpPCI_WriteSingleTxResource(IN PRTMP_ADAPTER pAd, u16 RtmpPCI_WriteSingleTxResource(struct rt_rtmp_adapter *pAd,
IN TX_BLK * pTxBlk, struct rt_tx_blk *pTxBlk,
IN BOOLEAN bIsLast, IN BOOLEAN bIsLast,
u16 * FreeNumber) u16 * FreeNumber)
{ {
u8 *pDMAHeaderBufVA; u8 *pDMAHeaderBufVA;
u16 TxIdx, RetTxIdx; u16 TxIdx, RetTxIdx;
PTXD_STRUC pTxD; struct rt_txd * pTxD;
u32 BufBasePaLow; u32 BufBasePaLow;
PRTMP_TX_RING pTxRing; struct rt_rtmp_tx_ring *pTxRing;
u16 hwHeaderLen; u16 hwHeaderLen;
/* */ /* */
...@@ -132,7 +132,7 @@ u16 RtmpPCI_WriteSingleTxResource(IN PRTMP_ADAPTER pAd, ...@@ -132,7 +132,7 @@ u16 RtmpPCI_WriteSingleTxResource(IN PRTMP_ADAPTER pAd,
/* */ /* */
/* build Tx Descriptor */ /* build Tx Descriptor */
/* */ /* */
pTxD = (PTXD_STRUC) pTxRing->Cell[TxIdx].AllocVa; pTxD = (struct rt_txd *) pTxRing->Cell[TxIdx].AllocVa;
NdisZeroMemory(pTxD, TXD_SIZE); NdisZeroMemory(pTxD, TXD_SIZE);
pTxD->SDPtr0 = BufBasePaLow; pTxD->SDPtr0 = BufBasePaLow;
...@@ -156,16 +156,16 @@ u16 RtmpPCI_WriteSingleTxResource(IN PRTMP_ADAPTER pAd, ...@@ -156,16 +156,16 @@ u16 RtmpPCI_WriteSingleTxResource(IN PRTMP_ADAPTER pAd,
return RetTxIdx; return RetTxIdx;
} }
u16 RtmpPCI_WriteMultiTxResource(IN PRTMP_ADAPTER pAd, u16 RtmpPCI_WriteMultiTxResource(struct rt_rtmp_adapter *pAd,
IN TX_BLK * pTxBlk, struct rt_tx_blk *pTxBlk,
u8 frameNum, u16 * FreeNumber) u8 frameNum, u16 * FreeNumber)
{ {
BOOLEAN bIsLast; BOOLEAN bIsLast;
u8 *pDMAHeaderBufVA; u8 *pDMAHeaderBufVA;
u16 TxIdx, RetTxIdx; u16 TxIdx, RetTxIdx;
PTXD_STRUC pTxD; struct rt_txd * pTxD;
u32 BufBasePaLow; u32 BufBasePaLow;
PRTMP_TX_RING pTxRing; struct rt_rtmp_tx_ring *pTxRing;
u16 hwHdrLen; u16 hwHdrLen;
u32 firstDMALen; u32 firstDMALen;
...@@ -210,7 +210,7 @@ u16 RtmpPCI_WriteMultiTxResource(IN PRTMP_ADAPTER pAd, ...@@ -210,7 +210,7 @@ u16 RtmpPCI_WriteMultiTxResource(IN PRTMP_ADAPTER pAd,
/* */ /* */
/* build Tx Descriptor */ /* build Tx Descriptor */
/* */ /* */
pTxD = (PTXD_STRUC) pTxRing->Cell[TxIdx].AllocVa; pTxD = (struct rt_txd *) pTxRing->Cell[TxIdx].AllocVa;
NdisZeroMemory(pTxD, TXD_SIZE); NdisZeroMemory(pTxD, TXD_SIZE);
pTxD->SDPtr0 = BufBasePaLow; pTxD->SDPtr0 = BufBasePaLow;
...@@ -235,28 +235,28 @@ u16 RtmpPCI_WriteMultiTxResource(IN PRTMP_ADAPTER pAd, ...@@ -235,28 +235,28 @@ u16 RtmpPCI_WriteMultiTxResource(IN PRTMP_ADAPTER pAd,
} }
void RtmpPCI_FinalWriteTxResource(IN PRTMP_ADAPTER pAd, void RtmpPCI_FinalWriteTxResource(struct rt_rtmp_adapter *pAd,
IN TX_BLK * pTxBlk, struct rt_tx_blk *pTxBlk,
u16 totalMPDUSize, u16 FirstTxIdx) u16 totalMPDUSize, u16 FirstTxIdx)
{ {
PTXWI_STRUC pTxWI; struct rt_txwi * pTxWI;
PRTMP_TX_RING pTxRing; struct rt_rtmp_tx_ring *pTxRing;
/* */ /* */
/* get Tx Ring Resource */ /* get Tx Ring Resource */
/* */ /* */
pTxRing = &pAd->TxRing[pTxBlk->QueIdx]; pTxRing = &pAd->TxRing[pTxBlk->QueIdx];
pTxWI = (PTXWI_STRUC) pTxRing->Cell[FirstTxIdx].DmaBuf.AllocVa; pTxWI = (struct rt_txwi *) pTxRing->Cell[FirstTxIdx].DmaBuf.AllocVa;
pTxWI->MPDUtotalByteCount = totalMPDUSize; pTxWI->MPDUtotalByteCount = totalMPDUSize;
} }
void RtmpPCIDataLastTxIdx(IN PRTMP_ADAPTER pAd, void RtmpPCIDataLastTxIdx(struct rt_rtmp_adapter *pAd,
u8 QueIdx, u16 LastTxIdx) u8 QueIdx, u16 LastTxIdx)
{ {
PTXD_STRUC pTxD; struct rt_txd * pTxD;
PRTMP_TX_RING pTxRing; struct rt_rtmp_tx_ring *pTxRing;
/* */ /* */
/* get Tx Ring Resource */ /* get Tx Ring Resource */
...@@ -266,21 +266,21 @@ void RtmpPCIDataLastTxIdx(IN PRTMP_ADAPTER pAd, ...@@ -266,21 +266,21 @@ void RtmpPCIDataLastTxIdx(IN PRTMP_ADAPTER pAd,
/* */ /* */
/* build Tx Descriptor */ /* build Tx Descriptor */
/* */ /* */
pTxD = (PTXD_STRUC) pTxRing->Cell[LastTxIdx].AllocVa; pTxD = (struct rt_txd *) pTxRing->Cell[LastTxIdx].AllocVa;
pTxD->LastSec1 = 1; pTxD->LastSec1 = 1;
} }
u16 RtmpPCI_WriteFragTxResource(IN PRTMP_ADAPTER pAd, u16 RtmpPCI_WriteFragTxResource(struct rt_rtmp_adapter *pAd,
IN TX_BLK * pTxBlk, struct rt_tx_blk *pTxBlk,
u8 fragNum, u16 * FreeNumber) u8 fragNum, u16 * FreeNumber)
{ {
u8 *pDMAHeaderBufVA; u8 *pDMAHeaderBufVA;
u16 TxIdx, RetTxIdx; u16 TxIdx, RetTxIdx;
PTXD_STRUC pTxD; struct rt_txd * pTxD;
u32 BufBasePaLow; u32 BufBasePaLow;
PRTMP_TX_RING pTxRing; struct rt_rtmp_tx_ring *pTxRing;
u16 hwHeaderLen; u16 hwHeaderLen;
u32 firstDMALen; u32 firstDMALen;
...@@ -305,7 +305,7 @@ u16 RtmpPCI_WriteFragTxResource(IN PRTMP_ADAPTER pAd, ...@@ -305,7 +305,7 @@ u16 RtmpPCI_WriteFragTxResource(IN PRTMP_ADAPTER pAd,
/* */ /* */
/* Build Tx Descriptor */ /* Build Tx Descriptor */
/* */ /* */
pTxD = (PTXD_STRUC) pTxRing->Cell[TxIdx].AllocVa; pTxD = (struct rt_txd *) pTxRing->Cell[TxIdx].AllocVa;
NdisZeroMemory(pTxD, TXD_SIZE); NdisZeroMemory(pTxD, TXD_SIZE);
if (fragNum == pTxBlk->TotalFragNum) { if (fragNum == pTxBlk->TotalFragNum) {
...@@ -341,15 +341,15 @@ u16 RtmpPCI_WriteFragTxResource(IN PRTMP_ADAPTER pAd, ...@@ -341,15 +341,15 @@ u16 RtmpPCI_WriteFragTxResource(IN PRTMP_ADAPTER pAd,
Must be run in Interrupt context Must be run in Interrupt context
This function handle PCI specific TxDesc and cpu index update and kick the packet out. This function handle PCI specific TxDesc and cpu index update and kick the packet out.
*/ */
int RtmpPCIMgmtKickOut(IN RTMP_ADAPTER * pAd, int RtmpPCIMgmtKickOut(struct rt_rtmp_adapter *pAd,
u8 QueIdx, u8 QueIdx,
void *pPacket, void *pPacket,
u8 *pSrcBufVA, u32 SrcBufLen) u8 *pSrcBufVA, u32 SrcBufLen)
{ {
PTXD_STRUC pTxD; struct rt_txd * pTxD;
unsigned long SwIdx = pAd->MgmtRing.TxCpuIdx; unsigned long SwIdx = pAd->MgmtRing.TxCpuIdx;
pTxD = (PTXD_STRUC) pAd->MgmtRing.Cell[SwIdx].AllocVa; pTxD = (struct rt_txd *) pAd->MgmtRing.Cell[SwIdx].AllocVa;
pAd->MgmtRing.Cell[SwIdx].pNdisPacket = pPacket; pAd->MgmtRing.Cell[SwIdx].pNdisPacket = pPacket;
pAd->MgmtRing.Cell[SwIdx].pNextNdisPacket = NULL; pAd->MgmtRing.Cell[SwIdx].pNextNdisPacket = NULL;
...@@ -405,11 +405,11 @@ int RtmpPCIMgmtKickOut(IN RTMP_ADAPTER * pAd, ...@@ -405,11 +405,11 @@ int RtmpPCIMgmtKickOut(IN RTMP_ADAPTER * pAd,
======================================================================== ========================================================================
*/ */
int RTMPCheckRxError(IN PRTMP_ADAPTER pAd, int RTMPCheckRxError(struct rt_rtmp_adapter *pAd,
IN PHEADER_802_11 pHeader, struct rt_header_802_11 * pHeader,
IN PRXWI_STRUC pRxWI, IN PRT28XX_RXD_STRUC pRxD) struct rt_rxwi * pRxWI, IN PRT28XX_RXD_STRUC pRxD)
{ {
PCIPHER_KEY pWpaKey; struct rt_cipher_key *pWpaKey;
int dBm; int dBm;
/* Phy errors & CRC errors */ /* Phy errors & CRC errors */
...@@ -516,13 +516,13 @@ int RTMPCheckRxError(IN PRTMP_ADAPTER pAd, ...@@ -516,13 +516,13 @@ int RTMPCheckRxError(IN PRTMP_ADAPTER pAd,
return (NDIS_STATUS_SUCCESS); return (NDIS_STATUS_SUCCESS);
} }
BOOLEAN RTMPFreeTXDUponTxDmaDone(IN PRTMP_ADAPTER pAd, u8 QueIdx) BOOLEAN RTMPFreeTXDUponTxDmaDone(struct rt_rtmp_adapter *pAd, u8 QueIdx)
{ {
PRTMP_TX_RING pTxRing; struct rt_rtmp_tx_ring *pTxRing;
PTXD_STRUC pTxD; struct rt_txd * pTxD;
void *pPacket; void *pPacket;
u8 FREE = 0; u8 FREE = 0;
TXD_STRUC TxD, *pOriTxD; struct rt_txd TxD, *pOriTxD;
/*unsigned long IrqFlags; */ /*unsigned long IrqFlags; */
BOOLEAN bReschedule = FALSE; BOOLEAN bReschedule = FALSE;
...@@ -541,9 +541,9 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone(IN PRTMP_ADAPTER pAd, u8 QueIdx) ...@@ -541,9 +541,9 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone(IN PRTMP_ADAPTER pAd, u8 QueIdx)
/* Note : If (pAd->ate.bQATxStart == TRUE), we will never reach here. */ /* Note : If (pAd->ate.bQATxStart == TRUE), we will never reach here. */
FREE++; FREE++;
pTxD = pTxD =
(PTXD_STRUC) (pTxRing->Cell[pTxRing->TxSwFreeIdx].AllocVa); (struct rt_txd *) (pTxRing->Cell[pTxRing->TxSwFreeIdx].AllocVa);
pOriTxD = pTxD; pOriTxD = pTxD;
NdisMoveMemory(&TxD, pTxD, sizeof(TXD_STRUC)); NdisMoveMemory(&TxD, pTxD, sizeof(struct rt_txd));
pTxD = &TxD; pTxD = &TxD;
pTxD->DMADONE = 0; pTxD->DMADONE = 0;
...@@ -584,7 +584,7 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone(IN PRTMP_ADAPTER pAd, u8 QueIdx) ...@@ -584,7 +584,7 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone(IN PRTMP_ADAPTER pAd, u8 QueIdx)
/* get tx_tdx_idx again */ /* get tx_tdx_idx again */
RTMP_IO_READ32(pAd, TX_DTX_IDX0 + QueIdx * RINGREG_DIFF, RTMP_IO_READ32(pAd, TX_DTX_IDX0 + QueIdx * RINGREG_DIFF,
&pTxRing->TxDmaIdx); &pTxRing->TxDmaIdx);
NdisMoveMemory(pOriTxD, pTxD, sizeof(TXD_STRUC)); NdisMoveMemory(pOriTxD, pTxD, sizeof(struct rt_txd));
/* RTMP_IRQ_UNLOCK(&pAd->irq_lock, IrqFlags); */ /* RTMP_IRQ_UNLOCK(&pAd->irq_lock, IrqFlags); */
} }
...@@ -609,7 +609,7 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone(IN PRTMP_ADAPTER pAd, u8 QueIdx) ...@@ -609,7 +609,7 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone(IN PRTMP_ADAPTER pAd, u8 QueIdx)
======================================================================== ========================================================================
*/ */
BOOLEAN RTMPHandleTxRingDmaDoneInterrupt(IN PRTMP_ADAPTER pAd, BOOLEAN RTMPHandleTxRingDmaDoneInterrupt(struct rt_rtmp_adapter *pAd,
INT_SOURCE_CSR_STRUC TxRingBitmap) INT_SOURCE_CSR_STRUC TxRingBitmap)
{ {
/* u8 Count = 0; */ /* u8 Count = 0; */
...@@ -661,13 +661,13 @@ BOOLEAN RTMPHandleTxRingDmaDoneInterrupt(IN PRTMP_ADAPTER pAd, ...@@ -661,13 +661,13 @@ BOOLEAN RTMPHandleTxRingDmaDoneInterrupt(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
void RTMPHandleMgmtRingDmaDoneInterrupt(IN PRTMP_ADAPTER pAd) void RTMPHandleMgmtRingDmaDoneInterrupt(struct rt_rtmp_adapter *pAd)
{ {
PTXD_STRUC pTxD; struct rt_txd * pTxD;
void *pPacket; void *pPacket;
/* int i; */ /* int i; */
u8 FREE = 0; u8 FREE = 0;
PRTMP_MGMT_RING pMgmtRing = &pAd->MgmtRing; struct rt_rtmp_mgmt_ring *pMgmtRing = &pAd->MgmtRing;
NdisAcquireSpinLock(&pAd->MgmtRingLock); NdisAcquireSpinLock(&pAd->MgmtRingLock);
...@@ -675,7 +675,7 @@ void RTMPHandleMgmtRingDmaDoneInterrupt(IN PRTMP_ADAPTER pAd) ...@@ -675,7 +675,7 @@ void RTMPHandleMgmtRingDmaDoneInterrupt(IN PRTMP_ADAPTER pAd)
while (pMgmtRing->TxSwFreeIdx != pMgmtRing->TxDmaIdx) { while (pMgmtRing->TxSwFreeIdx != pMgmtRing->TxDmaIdx) {
FREE++; FREE++;
pTxD = pTxD =
(PTXD_STRUC) (pMgmtRing->Cell[pAd->MgmtRing.TxSwFreeIdx]. (struct rt_txd *) (pMgmtRing->Cell[pAd->MgmtRing.TxSwFreeIdx].
AllocVa); AllocVa);
pTxD->DMADONE = 0; pTxD->DMADONE = 0;
pPacket = pMgmtRing->Cell[pMgmtRing->TxSwFreeIdx].pNdisPacket; pPacket = pMgmtRing->Cell[pMgmtRing->TxSwFreeIdx].pNdisPacket;
...@@ -713,7 +713,7 @@ void RTMPHandleMgmtRingDmaDoneInterrupt(IN PRTMP_ADAPTER pAd) ...@@ -713,7 +713,7 @@ void RTMPHandleMgmtRingDmaDoneInterrupt(IN PRTMP_ADAPTER pAd)
======================================================================== ========================================================================
*/ */
void RTMPHandleTBTTInterrupt(IN PRTMP_ADAPTER pAd) void RTMPHandleTBTTInterrupt(struct rt_rtmp_adapter *pAd)
{ {
{ {
if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)) { if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)) {
...@@ -732,7 +732,7 @@ void RTMPHandleTBTTInterrupt(IN PRTMP_ADAPTER pAd) ...@@ -732,7 +732,7 @@ void RTMPHandleTBTTInterrupt(IN PRTMP_ADAPTER pAd)
======================================================================== ========================================================================
*/ */
void RTMPHandlePreTBTTInterrupt(IN PRTMP_ADAPTER pAd) void RTMPHandlePreTBTTInterrupt(struct rt_rtmp_adapter *pAd)
{ {
{ {
if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)) { if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)) {
...@@ -743,7 +743,7 @@ void RTMPHandlePreTBTTInterrupt(IN PRTMP_ADAPTER pAd) ...@@ -743,7 +743,7 @@ void RTMPHandlePreTBTTInterrupt(IN PRTMP_ADAPTER pAd)
} }
void RTMPHandleRxCoherentInterrupt(IN PRTMP_ADAPTER pAd) void RTMPHandleRxCoherentInterrupt(struct rt_rtmp_adapter *pAd)
{ {
WPDMA_GLO_CFG_STRUC GloCfg; WPDMA_GLO_CFG_STRUC GloCfg;
...@@ -773,18 +773,18 @@ void RTMPHandleRxCoherentInterrupt(IN PRTMP_ADAPTER pAd) ...@@ -773,18 +773,18 @@ void RTMPHandleRxCoherentInterrupt(IN PRTMP_ADAPTER pAd)
DBGPRINT(RT_DEBUG_TRACE, ("<== RTMPHandleRxCoherentInterrupt \n")); DBGPRINT(RT_DEBUG_TRACE, ("<== RTMPHandleRxCoherentInterrupt \n"));
} }
void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd, void *GetPacketFromRxRing(struct rt_rtmp_adapter *pAd,
OUT PRT28XX_RXD_STRUC pSaveRxD, OUT PRT28XX_RXD_STRUC pSaveRxD,
OUT BOOLEAN * pbReschedule, OUT BOOLEAN * pbReschedule,
IN u32 * pRxPending) IN u32 * pRxPending)
{ {
PRXD_STRUC pRxD; struct rt_rxd * pRxD;
void *pRxPacket = NULL; void *pRxPacket = NULL;
void *pNewPacket; void *pNewPacket;
void *AllocVa; void *AllocVa;
dma_addr_t AllocPa; dma_addr_t AllocPa;
BOOLEAN bReschedule = FALSE; BOOLEAN bReschedule = FALSE;
RTMP_DMACB *pRxCell; struct rt_rtmp_dmacb *pRxCell;
RTMP_SEM_LOCK(&pAd->RxRingLock); RTMP_SEM_LOCK(&pAd->RxRingLock);
...@@ -811,7 +811,7 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd, ...@@ -811,7 +811,7 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd,
pRxCell = &pAd->RxRing.Cell[pAd->RxRing.RxSwReadIdx]; pRxCell = &pAd->RxRing.Cell[pAd->RxRing.RxSwReadIdx];
/* Point to Rx indexed rx ring descriptor */ /* Point to Rx indexed rx ring descriptor */
pRxD = (PRXD_STRUC) pRxCell->AllocVa; pRxD = (struct rt_rxd *) pRxCell->AllocVa;
if (pRxD->DDONE == 0) { if (pRxD->DDONE == 0) {
*pRxPending = 0; *pRxPending = 0;
...@@ -864,24 +864,24 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd, ...@@ -864,24 +864,24 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd,
return pRxPacket; return pRxPacket;
} }
int MlmeHardTransmitTxRing(IN PRTMP_ADAPTER pAd, int MlmeHardTransmitTxRing(struct rt_rtmp_adapter *pAd,
u8 QueIdx, void *pPacket) u8 QueIdx, void *pPacket)
{ {
PACKET_INFO PacketInfo; struct rt_packet_info PacketInfo;
u8 *pSrcBufVA; u8 *pSrcBufVA;
u32 SrcBufLen; u32 SrcBufLen;
PTXD_STRUC pTxD; struct rt_txd * pTxD;
PHEADER_802_11 pHeader_802_11; struct rt_header_802_11 * pHeader_802_11;
BOOLEAN bAckRequired, bInsertTimestamp; BOOLEAN bAckRequired, bInsertTimestamp;
unsigned long SrcBufPA; unsigned long SrcBufPA;
/*u8 TxBufIdx; */ /*u8 TxBufIdx; */
u8 MlmeRate; u8 MlmeRate;
unsigned long SwIdx = pAd->TxRing[QueIdx].TxCpuIdx; unsigned long SwIdx = pAd->TxRing[QueIdx].TxCpuIdx;
PTXWI_STRUC pFirstTxWI; struct rt_txwi * pFirstTxWI;
/*unsigned long i; */ /*unsigned long i; */
/*HTTRANSMIT_SETTING MlmeTransmit; //Rate for this MGMT frame. */ /*HTTRANSMIT_SETTING MlmeTransmit; //Rate for this MGMT frame. */
unsigned long FreeNum; unsigned long FreeNum;
MAC_TABLE_ENTRY *pMacEntry = NULL; struct rt_mac_table_entry *pMacEntry = NULL;
RTMP_QueryPacketInfo(pPacket, &PacketInfo, &pSrcBufVA, &SrcBufLen); RTMP_QueryPacketInfo(pPacket, &PacketInfo, &pSrcBufVA, &SrcBufLen);
...@@ -901,7 +901,7 @@ int MlmeHardTransmitTxRing(IN PRTMP_ADAPTER pAd, ...@@ -901,7 +901,7 @@ int MlmeHardTransmitTxRing(IN PRTMP_ADAPTER pAd,
SwIdx = pAd->TxRing[QueIdx].TxCpuIdx; SwIdx = pAd->TxRing[QueIdx].TxCpuIdx;
pTxD = (PTXD_STRUC) pAd->TxRing[QueIdx].Cell[SwIdx].AllocVa; pTxD = (struct rt_txd *) pAd->TxRing[QueIdx].Cell[SwIdx].AllocVa;
if (pAd->TxRing[QueIdx].Cell[SwIdx].pNdisPacket) { if (pAd->TxRing[QueIdx].Cell[SwIdx].pNdisPacket) {
DBGPRINT(RT_DEBUG_OFF, ("MlmeHardTransmit Error\n")); DBGPRINT(RT_DEBUG_OFF, ("MlmeHardTransmit Error\n"));
...@@ -915,9 +915,9 @@ int MlmeHardTransmitTxRing(IN PRTMP_ADAPTER pAd, ...@@ -915,9 +915,9 @@ int MlmeHardTransmitTxRing(IN PRTMP_ADAPTER pAd,
if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)) if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))
AsicForceWakeup(pAd, TRUE); AsicForceWakeup(pAd, TRUE);
} }
pFirstTxWI = (PTXWI_STRUC) pSrcBufVA; pFirstTxWI = (struct rt_txwi *) pSrcBufVA;
pHeader_802_11 = (PHEADER_802_11) (pSrcBufVA + TXWI_SIZE); pHeader_802_11 = (struct rt_header_802_11 *) (pSrcBufVA + TXWI_SIZE);
if (pHeader_802_11->Addr1[0] & 0x01) { if (pHeader_802_11->Addr1[0] & 0x01) {
MlmeRate = pAd->CommonCfg.BasicMlmeRate; MlmeRate = pAd->CommonCfg.BasicMlmeRate;
} else { } else {
...@@ -1040,7 +1040,7 @@ int MlmeHardTransmitTxRing(IN PRTMP_ADAPTER pAd, ...@@ -1040,7 +1040,7 @@ int MlmeHardTransmitTxRing(IN PRTMP_ADAPTER pAd,
return NDIS_STATUS_SUCCESS; return NDIS_STATUS_SUCCESS;
} }
int MlmeDataHardTransmit(IN PRTMP_ADAPTER pAd, int MlmeDataHardTransmit(struct rt_rtmp_adapter *pAd,
u8 QueIdx, void *pPacket) u8 QueIdx, void *pPacket)
{ {
if ((pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE) if ((pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)
...@@ -1078,8 +1078,8 @@ int MlmeDataHardTransmit(IN PRTMP_ADAPTER pAd, ...@@ -1078,8 +1078,8 @@ int MlmeDataHardTransmit(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
void RTMPWriteTxDescriptor(IN PRTMP_ADAPTER pAd, void RTMPWriteTxDescriptor(struct rt_rtmp_adapter *pAd,
IN PTXD_STRUC pTxD, struct rt_txd * pTxD,
IN BOOLEAN bWIV, u8 QueueSEL) IN BOOLEAN bWIV, u8 QueueSEL)
{ {
/* */ /* */
......
drivers/staging/rt2860/common/cmm_data_usb.c
浏览文件 @ 62eb734b
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
=> =>
=> =>
*/ */
static inline int RtmpUSBCanDoWrite(IN RTMP_ADAPTER * pAd, static inline int RtmpUSBCanDoWrite(struct rt_rtmp_adapter *pAd,
u8 QueIdx, u8 QueIdx,
IN HT_TX_CONTEXT * pHTTXContext) struct rt_ht_tx_context *pHTTXContext)
{ {
int canWrite = NDIS_STATUS_RESOURCES; int canWrite = NDIS_STATUS_RESOURCES;
...@@ -68,8 +68,8 @@ static inline int RtmpUSBCanDoWrite(IN RTMP_ADAPTER * pAd, ...@@ -68,8 +68,8 @@ static inline int RtmpUSBCanDoWrite(IN RTMP_ADAPTER * pAd,
return canWrite; return canWrite;
} }
u16 RtmpUSB_WriteSubTxResource(IN PRTMP_ADAPTER pAd, u16 RtmpUSB_WriteSubTxResource(struct rt_rtmp_adapter *pAd,
IN TX_BLK * pTxBlk, struct rt_tx_blk *pTxBlk,
IN BOOLEAN bIsLast, u16 * FreeNumber) IN BOOLEAN bIsLast, u16 * FreeNumber)
{ {
...@@ -78,15 +78,15 @@ u16 RtmpUSB_WriteSubTxResource(IN PRTMP_ADAPTER pAd, ...@@ -78,15 +78,15 @@ u16 RtmpUSB_WriteSubTxResource(IN PRTMP_ADAPTER pAd,
} }
u16 RtmpUSB_WriteFragTxResource(IN PRTMP_ADAPTER pAd, u16 RtmpUSB_WriteFragTxResource(struct rt_rtmp_adapter *pAd,
IN TX_BLK * pTxBlk, struct rt_tx_blk *pTxBlk,
u8 fragNum, u16 * FreeNumber) u8 fragNum, u16 * FreeNumber)
{ {
HT_TX_CONTEXT *pHTTXContext; struct rt_ht_tx_context *pHTTXContext;
u16 hwHdrLen; /* The hwHdrLen consist of 802.11 header length plus the header padding length. */ u16 hwHdrLen; /* The hwHdrLen consist of 802.11 header length plus the header padding length. */
u32 fillOffset; u32 fillOffset;
TXINFO_STRUC *pTxInfo; struct rt_txinfo *pTxInfo;
TXWI_STRUC *pTxWI; struct rt_txwi *pTxWI;
u8 *pWirelessPacket = NULL; u8 *pWirelessPacket = NULL;
u8 QueIdx; u8 QueIdx;
int Status; int Status;
...@@ -147,8 +147,8 @@ u16 RtmpUSB_WriteFragTxResource(IN PRTMP_ADAPTER pAd, ...@@ -147,8 +147,8 @@ u16 RtmpUSB_WriteFragTxResource(IN PRTMP_ADAPTER pAd,
} }
NdisZeroMemory((u8 *)(&pTxBlk->HeaderBuf[0]), TXINFO_SIZE); NdisZeroMemory((u8 *)(&pTxBlk->HeaderBuf[0]), TXINFO_SIZE);
pTxInfo = (PTXINFO_STRUC) (&pTxBlk->HeaderBuf[0]); pTxInfo = (struct rt_txinfo *)(&pTxBlk->HeaderBuf[0]);
pTxWI = (PTXWI_STRUC) (&pTxBlk->HeaderBuf[TXINFO_SIZE]); pTxWI = (struct rt_txwi *) (&pTxBlk->HeaderBuf[TXINFO_SIZE]);
pWirelessPacket = pWirelessPacket =
&pHTTXContext->TransferBuffer->field.WirelessPacket[fillOffset]; &pHTTXContext->TransferBuffer->field.WirelessPacket[fillOffset];
...@@ -215,16 +215,16 @@ u16 RtmpUSB_WriteFragTxResource(IN PRTMP_ADAPTER pAd, ...@@ -215,16 +215,16 @@ u16 RtmpUSB_WriteFragTxResource(IN PRTMP_ADAPTER pAd,
} }
u16 RtmpUSB_WriteSingleTxResource(IN PRTMP_ADAPTER pAd, u16 RtmpUSB_WriteSingleTxResource(struct rt_rtmp_adapter *pAd,
IN TX_BLK * pTxBlk, struct rt_tx_blk *pTxBlk,
IN BOOLEAN bIsLast, IN BOOLEAN bIsLast,
u16 * FreeNumber) u16 * FreeNumber)
{ {
HT_TX_CONTEXT *pHTTXContext; struct rt_ht_tx_context *pHTTXContext;
u16 hwHdrLen; u16 hwHdrLen;
u32 fillOffset; u32 fillOffset;
TXINFO_STRUC *pTxInfo; struct rt_txinfo *pTxInfo;
TXWI_STRUC *pTxWI; struct rt_txwi *pTxWI;
u8 *pWirelessPacket; u8 *pWirelessPacket;
u8 QueIdx; u8 QueIdx;
unsigned long IrqFlags; unsigned long IrqFlags;
...@@ -249,8 +249,8 @@ u16 RtmpUSB_WriteSingleTxResource(IN PRTMP_ADAPTER pAd, ...@@ -249,8 +249,8 @@ u16 RtmpUSB_WriteSingleTxResource(IN PRTMP_ADAPTER pAd,
if (Status == NDIS_STATUS_SUCCESS) { if (Status == NDIS_STATUS_SUCCESS) {
pHTTXContext->bCurWriting = TRUE; pHTTXContext->bCurWriting = TRUE;
pTxInfo = (PTXINFO_STRUC) (&pTxBlk->HeaderBuf[0]); pTxInfo = (struct rt_txinfo *)(&pTxBlk->HeaderBuf[0]);
pTxWI = (PTXWI_STRUC) (&pTxBlk->HeaderBuf[TXINFO_SIZE]); pTxWI = (struct rt_txwi *) (&pTxBlk->HeaderBuf[TXINFO_SIZE]);
/* Reserve space for 8 bytes padding. */ /* Reserve space for 8 bytes padding. */
if ((pHTTXContext->ENextBulkOutPosition == if ((pHTTXContext->ENextBulkOutPosition ==
...@@ -328,15 +328,15 @@ u16 RtmpUSB_WriteSingleTxResource(IN PRTMP_ADAPTER pAd, ...@@ -328,15 +328,15 @@ u16 RtmpUSB_WriteSingleTxResource(IN PRTMP_ADAPTER pAd,
} }
u16 RtmpUSB_WriteMultiTxResource(IN PRTMP_ADAPTER pAd, u16 RtmpUSB_WriteMultiTxResource(struct rt_rtmp_adapter *pAd,
IN TX_BLK * pTxBlk, struct rt_tx_blk *pTxBlk,
u8 frameNum, u16 * FreeNumber) u8 frameNum, u16 * FreeNumber)
{ {
HT_TX_CONTEXT *pHTTXContext; struct rt_ht_tx_context *pHTTXContext;
u16 hwHdrLen; /* The hwHdrLen consist of 802.11 header length plus the header padding length. */ u16 hwHdrLen; /* The hwHdrLen consist of 802.11 header length plus the header padding length. */
u32 fillOffset; u32 fillOffset;
TXINFO_STRUC *pTxInfo; struct rt_txinfo *pTxInfo;
TXWI_STRUC *pTxWI; struct rt_txwi *pTxWI;
u8 *pWirelessPacket = NULL; u8 *pWirelessPacket = NULL;
u8 QueIdx; u8 QueIdx;
int Status; int Status;
...@@ -357,8 +357,8 @@ u16 RtmpUSB_WriteMultiTxResource(IN PRTMP_ADAPTER pAd, ...@@ -357,8 +357,8 @@ u16 RtmpUSB_WriteMultiTxResource(IN PRTMP_ADAPTER pAd,
if (Status == NDIS_STATUS_SUCCESS) { if (Status == NDIS_STATUS_SUCCESS) {
pHTTXContext->bCurWriting = TRUE; pHTTXContext->bCurWriting = TRUE;
pTxInfo = (PTXINFO_STRUC) (&pTxBlk->HeaderBuf[0]); pTxInfo = (struct rt_txinfo *)(&pTxBlk->HeaderBuf[0]);
pTxWI = (PTXWI_STRUC) (&pTxBlk->HeaderBuf[TXINFO_SIZE]); pTxWI = (struct rt_txwi *) (&pTxBlk->HeaderBuf[TXINFO_SIZE]);
/* Reserve space for 8 bytes padding. */ /* Reserve space for 8 bytes padding. */
if ((pHTTXContext->ENextBulkOutPosition == if ((pHTTXContext->ENextBulkOutPosition ==
...@@ -467,15 +467,15 @@ u16 RtmpUSB_WriteMultiTxResource(IN PRTMP_ADAPTER pAd, ...@@ -467,15 +467,15 @@ u16 RtmpUSB_WriteMultiTxResource(IN PRTMP_ADAPTER pAd,
} }
void RtmpUSB_FinalWriteTxResource(IN PRTMP_ADAPTER pAd, void RtmpUSB_FinalWriteTxResource(struct rt_rtmp_adapter *pAd,
IN TX_BLK * pTxBlk, struct rt_tx_blk *pTxBlk,
u16 totalMPDUSize, u16 TxIdx) u16 totalMPDUSize, u16 TxIdx)
{ {
u8 QueIdx; u8 QueIdx;
HT_TX_CONTEXT *pHTTXContext; struct rt_ht_tx_context *pHTTXContext;
u32 fillOffset; u32 fillOffset;
TXINFO_STRUC *pTxInfo; struct rt_txinfo *pTxInfo;
TXWI_STRUC *pTxWI; struct rt_txwi *pTxWI;
u32 USBDMApktLen, padding; u32 USBDMApktLen, padding;
unsigned long IrqFlags; unsigned long IrqFlags;
u8 *pWirelessPacket; u8 *pWirelessPacket;
...@@ -502,7 +502,7 @@ void RtmpUSB_FinalWriteTxResource(IN PRTMP_ADAPTER pAd, ...@@ -502,7 +502,7 @@ void RtmpUSB_FinalWriteTxResource(IN PRTMP_ADAPTER pAd,
/* Update TxInfo->USBDMApktLen , */ /* Update TxInfo->USBDMApktLen , */
/* the length = TXWI_SIZE + 802.11_hdr + 802.11_hdr_pad + payload_of_all_batch_frames + Bulk-Out-padding */ /* the length = TXWI_SIZE + 802.11_hdr + 802.11_hdr_pad + payload_of_all_batch_frames + Bulk-Out-padding */
/* */ /* */
pTxInfo = (PTXINFO_STRUC) (pWirelessPacket); pTxInfo = (struct rt_txinfo *)(pWirelessPacket);
/* Calculate the bulk-out padding */ /* Calculate the bulk-out padding */
USBDMApktLen = pTxBlk->Priv - TXINFO_SIZE; USBDMApktLen = pTxBlk->Priv - TXINFO_SIZE;
...@@ -514,7 +514,7 @@ void RtmpUSB_FinalWriteTxResource(IN PRTMP_ADAPTER pAd, ...@@ -514,7 +514,7 @@ void RtmpUSB_FinalWriteTxResource(IN PRTMP_ADAPTER pAd,
/* */ /* */
/* Update TXWI->MPDUtotalByteCount , */ /* Update TXWI->MPDUtotalByteCount , */
/* the length = 802.11 header + payload_of_all_batch_frames */ /* the length = 802.11 header + payload_of_all_batch_frames */
pTxWI = (PTXWI_STRUC) (pWirelessPacket + TXINFO_SIZE); pTxWI = (struct rt_txwi *) (pWirelessPacket + TXINFO_SIZE);
pTxWI->MPDUtotalByteCount = totalMPDUSize; pTxWI->MPDUtotalByteCount = totalMPDUSize;
/* */ /* */
...@@ -547,7 +547,7 @@ void RtmpUSB_FinalWriteTxResource(IN PRTMP_ADAPTER pAd, ...@@ -547,7 +547,7 @@ void RtmpUSB_FinalWriteTxResource(IN PRTMP_ADAPTER pAd,
} }
void RtmpUSBDataLastTxIdx(IN PRTMP_ADAPTER pAd, void RtmpUSBDataLastTxIdx(struct rt_rtmp_adapter *pAd,
u8 QueIdx, u16 TxIdx) u8 QueIdx, u16 TxIdx)
{ {
/* DO nothing for USB. */ /* DO nothing for USB. */
...@@ -561,8 +561,8 @@ void RtmpUSBDataLastTxIdx(IN PRTMP_ADAPTER pAd, ...@@ -561,8 +561,8 @@ void RtmpUSBDataLastTxIdx(IN PRTMP_ADAPTER pAd,
Check if the CurWriting flag is FALSE, if it's FALSE, we can do kick out. Check if the CurWriting flag is FALSE, if it's FALSE, we can do kick out.
*/ */
void RtmpUSBDataKickOut(IN PRTMP_ADAPTER pAd, void RtmpUSBDataKickOut(struct rt_rtmp_adapter *pAd,
IN TX_BLK * pTxBlk, u8 QueIdx) struct rt_tx_blk *pTxBlk, u8 QueIdx)
{ {
RTUSB_SET_BULK_FLAG(pAd, (fRTUSB_BULK_OUT_DATA_NORMAL << QueIdx)); RTUSB_SET_BULK_FLAG(pAd, (fRTUSB_BULK_OUT_DATA_NORMAL << QueIdx));
RTUSBKickBulkOut(pAd); RTUSBKickBulkOut(pAd);
...@@ -573,21 +573,21 @@ void RtmpUSBDataKickOut(IN PRTMP_ADAPTER pAd, ...@@ -573,21 +573,21 @@ void RtmpUSBDataKickOut(IN PRTMP_ADAPTER pAd,
Must be run in Interrupt context Must be run in Interrupt context
This function handle RT2870 specific TxDesc and cpu index update and kick the packet out. This function handle RT2870 specific TxDesc and cpu index update and kick the packet out.
*/ */
int RtmpUSBMgmtKickOut(IN RTMP_ADAPTER * pAd, int RtmpUSBMgmtKickOut(struct rt_rtmp_adapter *pAd,
u8 QueIdx, u8 QueIdx,
void *pPacket, void *pPacket,
u8 *pSrcBufVA, u32 SrcBufLen) u8 *pSrcBufVA, u32 SrcBufLen)
{ {
PTXINFO_STRUC pTxInfo; struct rt_txinfo *pTxInfo;
unsigned long BulkOutSize; unsigned long BulkOutSize;
u8 padLen; u8 padLen;
u8 *pDest; u8 *pDest;
unsigned long SwIdx = pAd->MgmtRing.TxCpuIdx; unsigned long SwIdx = pAd->MgmtRing.TxCpuIdx;
PTX_CONTEXT pMLMEContext = struct rt_tx_context *pMLMEContext =
(PTX_CONTEXT) pAd->MgmtRing.Cell[SwIdx].AllocVa; (struct rt_tx_context *)pAd->MgmtRing.Cell[SwIdx].AllocVa;
unsigned long IrqFlags; unsigned long IrqFlags;
pTxInfo = (PTXINFO_STRUC) (pSrcBufVA); pTxInfo = (struct rt_txinfo *)(pSrcBufVA);
/* Build our URB for USBD */ /* Build our URB for USBD */
BulkOutSize = SrcBufLen; BulkOutSize = SrcBufLen;
...@@ -613,7 +613,7 @@ int RtmpUSBMgmtKickOut(IN RTMP_ADAPTER * pAd, ...@@ -613,7 +613,7 @@ int RtmpUSBMgmtKickOut(IN RTMP_ADAPTER * pAd,
pAd->MgmtRing.Cell[pAd->MgmtRing.TxCpuIdx].pNdisPacket = pPacket; pAd->MgmtRing.Cell[pAd->MgmtRing.TxCpuIdx].pNdisPacket = pPacket;
pMLMEContext->TransferBuffer = pMLMEContext->TransferBuffer =
(PTX_BUFFER) (GET_OS_PKT_DATAPTR(pPacket)); (struct rt_tx_buffer *)(GET_OS_PKT_DATAPTR(pPacket));
/* Length in TxInfo should be 8 less than bulkout size. */ /* Length in TxInfo should be 8 less than bulkout size. */
pMLMEContext->BulkOutSize = BulkOutSize; pMLMEContext->BulkOutSize = BulkOutSize;
...@@ -642,14 +642,14 @@ int RtmpUSBMgmtKickOut(IN RTMP_ADAPTER * pAd, ...@@ -642,14 +642,14 @@ int RtmpUSBMgmtKickOut(IN RTMP_ADAPTER * pAd,
return 0; return 0;
} }
void RtmpUSBNullFrameKickOut(IN RTMP_ADAPTER * pAd, void RtmpUSBNullFrameKickOut(struct rt_rtmp_adapter *pAd,
u8 QueIdx, u8 QueIdx,
u8 * pNullFrame, u32 frameLen) u8 * pNullFrame, u32 frameLen)
{ {
if (pAd->NullContext.InUse == FALSE) { if (pAd->NullContext.InUse == FALSE) {
PTX_CONTEXT pNullContext; struct rt_tx_context *pNullContext;
PTXINFO_STRUC pTxInfo; struct rt_txinfo *pTxInfo;
PTXWI_STRUC pTxWI; struct rt_txwi * pTxWI;
u8 *pWirelessPkt; u8 *pWirelessPkt;
pNullContext = &(pAd->NullContext); pNullContext = &(pAd->NullContext);
...@@ -661,19 +661,19 @@ void RtmpUSBNullFrameKickOut(IN RTMP_ADAPTER * pAd, ...@@ -661,19 +661,19 @@ void RtmpUSBNullFrameKickOut(IN RTMP_ADAPTER * pAd,
WirelessPacket[0]; WirelessPacket[0];
RTMPZeroMemory(&pWirelessPkt[0], 100); RTMPZeroMemory(&pWirelessPkt[0], 100);
pTxInfo = (PTXINFO_STRUC) & pWirelessPkt[0]; pTxInfo = (struct rt_txinfo *)& pWirelessPkt[0];
RTMPWriteTxInfo(pAd, pTxInfo, RTMPWriteTxInfo(pAd, pTxInfo,
(u16)(sizeof(HEADER_802_11) + TXWI_SIZE), (u16)(sizeof(struct rt_header_802_11) + TXWI_SIZE),
TRUE, EpToQueue[MGMTPIPEIDX], FALSE, FALSE); TRUE, EpToQueue[MGMTPIPEIDX], FALSE, FALSE);
pTxInfo->QSEL = FIFO_EDCA; pTxInfo->QSEL = FIFO_EDCA;
pTxWI = (PTXWI_STRUC) & pWirelessPkt[TXINFO_SIZE]; pTxWI = (struct rt_txwi *) & pWirelessPkt[TXINFO_SIZE];
RTMPWriteTxWI(pAd, pTxWI, FALSE, FALSE, FALSE, FALSE, TRUE, RTMPWriteTxWI(pAd, pTxWI, FALSE, FALSE, FALSE, FALSE, TRUE,
FALSE, 0, BSSID_WCID, (sizeof(HEADER_802_11)), 0, FALSE, 0, BSSID_WCID, (sizeof(struct rt_header_802_11)), 0,
0, (u8)pAd->CommonCfg.MlmeTransmit.field.MCS, 0, (u8)pAd->CommonCfg.MlmeTransmit.field.MCS,
IFS_HTTXOP, FALSE, &pAd->CommonCfg.MlmeTransmit); IFS_HTTXOP, FALSE, &pAd->CommonCfg.MlmeTransmit);
RTMPMoveMemory(&pWirelessPkt[TXWI_SIZE + TXINFO_SIZE], RTMPMoveMemory(&pWirelessPkt[TXWI_SIZE + TXINFO_SIZE],
&pAd->NullFrame, sizeof(HEADER_802_11)); &pAd->NullFrame, sizeof(struct rt_header_802_11));
pAd->NullContext.BulkOutSize = pAd->NullContext.BulkOutSize =
TXINFO_SIZE + TXWI_SIZE + sizeof(pAd->NullFrame) + 4; TXINFO_SIZE + TXWI_SIZE + sizeof(pAd->NullFrame) + 4;
...@@ -707,17 +707,17 @@ Return Value: ...@@ -707,17 +707,17 @@ Return Value:
Note: Note:
======================================================================== ========================================================================
*/ */
void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd, void *GetPacketFromRxRing(struct rt_rtmp_adapter *pAd,
OUT PRT28XX_RXD_STRUC pSaveRxD, OUT PRT28XX_RXD_STRUC pSaveRxD,
OUT BOOLEAN * pbReschedule, OUT BOOLEAN * pbReschedule,
IN u32 * pRxPending) IN u32 * pRxPending)
{ {
PRX_CONTEXT pRxContext; struct rt_rx_context *pRxContext;
void *pSkb; void *pSkb;
u8 *pData; u8 *pData;
unsigned long ThisFrameLen; unsigned long ThisFrameLen;
unsigned long RxBufferLength; unsigned long RxBufferLength;
PRXWI_STRUC pRxWI; struct rt_rxwi * pRxWI;
pRxContext = &pAd->RxContext[pAd->NextRxBulkInReadIndex]; pRxContext = &pAd->RxContext[pAd->NextRxBulkInReadIndex];
if ((pRxContext->Readable == FALSE) || (pRxContext->InUse == TRUE)) if ((pRxContext->Readable == FALSE) || (pRxContext->InUse == TRUE))
...@@ -725,8 +725,8 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd, ...@@ -725,8 +725,8 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd,
RxBufferLength = pRxContext->BulkInOffset - pAd->ReadPosition; RxBufferLength = pRxContext->BulkInOffset - pAd->ReadPosition;
if (RxBufferLength < if (RxBufferLength <
(RT2870_RXDMALEN_FIELD_SIZE + sizeof(RXWI_STRUC) + (RT2870_RXDMALEN_FIELD_SIZE + sizeof(struct rt_rxwi) +
sizeof(RXINFO_STRUC))) { sizeof(struct rt_rxinfo))) {
goto label_null; goto label_null;
} }
...@@ -748,7 +748,7 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd, ...@@ -748,7 +748,7 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd,
goto label_null; goto label_null;
} }
if ((ThisFrameLen + 8) > RxBufferLength) /* 8 for (RT2870_RXDMALEN_FIELD_SIZE + sizeof(RXINFO_STRUC)) */ if ((ThisFrameLen + 8) > RxBufferLength) /* 8 for (RT2870_RXDMALEN_FIELD_SIZE + sizeof(struct rt_rxinfo)) */
{ {
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("BIRIdx(%d):FrameLen(0x%lx) outranges. BulkInLen=0x%lx, remaining RxBufLen=0x%lx, ReadPos=0x%lx\n", ("BIRIdx(%d):FrameLen(0x%lx) outranges. BulkInLen=0x%lx, remaining RxBufLen=0x%lx, ReadPos=0x%lx\n",
...@@ -761,7 +761,7 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd, ...@@ -761,7 +761,7 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd,
} }
/* skip USB frame length field */ /* skip USB frame length field */
pData += RT2870_RXDMALEN_FIELD_SIZE; pData += RT2870_RXDMALEN_FIELD_SIZE;
pRxWI = (PRXWI_STRUC) pData; pRxWI = (struct rt_rxwi *) pData;
if (pRxWI->MPDUtotalByteCount > ThisFrameLen) { if (pRxWI->MPDUtotalByteCount > ThisFrameLen) {
DBGPRINT(RT_DEBUG_ERROR, DBGPRINT(RT_DEBUG_ERROR,
("%s():pRxWIMPDUtotalByteCount(%d) large than RxDMALen(%ld)\n", ("%s():pRxWIMPDUtotalByteCount(%d) large than RxDMALen(%ld)\n",
...@@ -783,10 +783,10 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd, ...@@ -783,10 +783,10 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd,
RTMP_SET_PACKET_SOURCE(OSPKT_TO_RTPKT(pSkb), PKTSRC_NDIS); RTMP_SET_PACKET_SOURCE(OSPKT_TO_RTPKT(pSkb), PKTSRC_NDIS);
/* copy RxD */ /* copy RxD */
*pSaveRxD = *(PRXINFO_STRUC) (pData + ThisFrameLen); *pSaveRxD = *(struct rt_rxinfo *) (pData + ThisFrameLen);
/* update next packet read position. */ /* update next packet read position. */
pAd->ReadPosition += (ThisFrameLen + RT2870_RXDMALEN_FIELD_SIZE + RXINFO_SIZE); /* 8 for (RT2870_RXDMALEN_FIELD_SIZE + sizeof(RXINFO_STRUC)) */ pAd->ReadPosition += (ThisFrameLen + RT2870_RXDMALEN_FIELD_SIZE + RXINFO_SIZE); /* 8 for (RT2870_RXDMALEN_FIELD_SIZE + sizeof(struct rt_rxinfo)) */
return pSkb; return pSkb;
...@@ -812,11 +812,11 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd, ...@@ -812,11 +812,11 @@ void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
int RTMPCheckRxError(IN PRTMP_ADAPTER pAd, int RTMPCheckRxError(struct rt_rtmp_adapter *pAd,
IN PHEADER_802_11 pHeader, struct rt_header_802_11 * pHeader,
IN PRXWI_STRUC pRxWI, IN PRT28XX_RXD_STRUC pRxINFO) struct rt_rxwi * pRxWI, IN PRT28XX_RXD_STRUC pRxINFO)
{ {
PCIPHER_KEY pWpaKey; struct rt_cipher_key *pWpaKey;
int dBm; int dBm;
if (pAd->bPromiscuous == TRUE) if (pAd->bPromiscuous == TRUE)
...@@ -909,7 +909,7 @@ void RtmpUsbStaAsicForceWakeupTimeout(void *SystemSpecific1, ...@@ -909,7 +909,7 @@ void RtmpUsbStaAsicForceWakeupTimeout(void *SystemSpecific1,
void *SystemSpecific2, void *SystemSpecific2,
void *SystemSpecific3) void *SystemSpecific3)
{ {
RTMP_ADAPTER *pAd = (RTMP_ADAPTER *) FunctionContext; struct rt_rtmp_adapter *pAd = (struct rt_rtmp_adapter *)FunctionContext;
if (pAd && pAd->Mlme.AutoWakeupTimerRunning) { if (pAd && pAd->Mlme.AutoWakeupTimerRunning) {
AsicSendCommandToMcu(pAd, 0x31, 0xff, 0x00, 0x02); AsicSendCommandToMcu(pAd, 0x31, 0xff, 0x00, 0x02);
...@@ -919,7 +919,7 @@ void RtmpUsbStaAsicForceWakeupTimeout(void *SystemSpecific1, ...@@ -919,7 +919,7 @@ void RtmpUsbStaAsicForceWakeupTimeout(void *SystemSpecific1,
} }
} }
void RT28xxUsbStaAsicForceWakeup(IN PRTMP_ADAPTER pAd, IN BOOLEAN bFromTx) void RT28xxUsbStaAsicForceWakeup(struct rt_rtmp_adapter *pAd, IN BOOLEAN bFromTx)
{ {
BOOLEAN Canceled; BOOLEAN Canceled;
...@@ -931,7 +931,7 @@ void RT28xxUsbStaAsicForceWakeup(IN PRTMP_ADAPTER pAd, IN BOOLEAN bFromTx) ...@@ -931,7 +931,7 @@ void RT28xxUsbStaAsicForceWakeup(IN PRTMP_ADAPTER pAd, IN BOOLEAN bFromTx)
OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_DOZE); OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_DOZE);
} }
void RT28xxUsbStaAsicSleepThenAutoWakeup(IN PRTMP_ADAPTER pAd, void RT28xxUsbStaAsicSleepThenAutoWakeup(struct rt_rtmp_adapter *pAd,
u16 TbttNumToNextWakeUp) u16 TbttNumToNextWakeUp)
{ {
......
drivers/staging/rt2860/common/cmm_info.c
浏览文件 @ 62eb734b
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
======================================================================== ========================================================================
*/ */
void RTMPSetDesiredRates(IN PRTMP_ADAPTER pAdapter, long Rates) void RTMPSetDesiredRates(struct rt_rtmp_adapter *pAdapter, long Rates)
{ {
NDIS_802_11_RATES aryRates; NDIS_802_11_RATES aryRates;
...@@ -235,7 +235,7 @@ void RTMPSetDesiredRates(IN PRTMP_ADAPTER pAdapter, long Rates) ...@@ -235,7 +235,7 @@ void RTMPSetDesiredRates(IN PRTMP_ADAPTER pAdapter, long Rates)
======================================================================== ========================================================================
*/ */
void RTMPWPARemoveAllKeys(IN PRTMP_ADAPTER pAd) void RTMPWPARemoveAllKeys(struct rt_rtmp_adapter *pAd)
{ {
u8 i; u8 i;
...@@ -262,7 +262,7 @@ void RTMPWPARemoveAllKeys(IN PRTMP_ADAPTER pAd) ...@@ -262,7 +262,7 @@ void RTMPWPARemoveAllKeys(IN PRTMP_ADAPTER pAd)
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("remove %s key #%d\n", ("remove %s key #%d\n",
CipherName[pAd->SharedKey[BSS0][i].CipherAlg], i)); CipherName[pAd->SharedKey[BSS0][i].CipherAlg], i));
NdisZeroMemory(&pAd->SharedKey[BSS0][i], sizeof(CIPHER_KEY)); NdisZeroMemory(&pAd->SharedKey[BSS0][i], sizeof(struct rt_cipher_key));
AsicRemoveSharedKeyEntry(pAd, BSS0, i); AsicRemoveSharedKeyEntry(pAd, BSS0, i);
} }
...@@ -307,7 +307,7 @@ void RTMPWPARemoveAllKeys(IN PRTMP_ADAPTER pAd) ...@@ -307,7 +307,7 @@ void RTMPWPARemoveAllKeys(IN PRTMP_ADAPTER pAd)
======================================================================== ========================================================================
*/ */
void RTMPSetPhyMode(IN PRTMP_ADAPTER pAd, unsigned long phymode) void RTMPSetPhyMode(struct rt_rtmp_adapter *pAd, unsigned long phymode)
{ {
int i; int i;
/* the selected phymode must be supported by the RF IC encoded in E2PROM */ /* the selected phymode must be supported by the RF IC encoded in E2PROM */
...@@ -435,7 +435,7 @@ void RTMPSetPhyMode(IN PRTMP_ADAPTER pAd, unsigned long phymode) ...@@ -435,7 +435,7 @@ void RTMPSetPhyMode(IN PRTMP_ADAPTER pAd, unsigned long phymode)
======================================================================== ========================================================================
*/ */
void RTMPSetHT(IN PRTMP_ADAPTER pAd, IN OID_SET_HT_PHYMODE * pHTPhyMode) void RTMPSetHT(struct rt_rtmp_adapter *pAd, struct rt_oid_set_ht_phymode *pHTPhyMode)
{ {
/*unsigned long *pmcs; */ /*unsigned long *pmcs; */
u32 Value = 0; u32 Value = 0;
...@@ -648,9 +648,9 @@ void RTMPSetHT(IN PRTMP_ADAPTER pAd, IN OID_SET_HT_PHYMODE * pHTPhyMode) ...@@ -648,9 +648,9 @@ void RTMPSetHT(IN PRTMP_ADAPTER pAd, IN OID_SET_HT_PHYMODE * pHTPhyMode)
======================================================================== ========================================================================
*/ */
void RTMPSetIndividualHT(IN PRTMP_ADAPTER pAd, u8 apidx) void RTMPSetIndividualHT(struct rt_rtmp_adapter *pAd, u8 apidx)
{ {
PRT_HT_PHY_INFO pDesired_ht_phy = NULL; struct rt_ht_phy_info *pDesired_ht_phy = NULL;
u8 TxStream = pAd->CommonCfg.TxStream; u8 TxStream = pAd->CommonCfg.TxStream;
u8 DesiredMcs = MCS_AUTO; u8 DesiredMcs = MCS_AUTO;
...@@ -669,7 +669,7 @@ void RTMPSetIndividualHT(IN PRTMP_ADAPTER pAd, u8 apidx) ...@@ -669,7 +669,7 @@ void RTMPSetIndividualHT(IN PRTMP_ADAPTER pAd, u8 apidx)
("RTMPSetIndividualHT: invalid apidx(%d)\n", apidx)); ("RTMPSetIndividualHT: invalid apidx(%d)\n", apidx));
return; return;
} }
RTMPZeroMemory(pDesired_ht_phy, sizeof(RT_HT_PHY_INFO)); RTMPZeroMemory(pDesired_ht_phy, sizeof(struct rt_ht_phy_info));
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("RTMPSetIndividualHT : Desired MCS = %d\n", DesiredMcs)); ("RTMPSetIndividualHT : Desired MCS = %d\n", DesiredMcs));
...@@ -755,13 +755,13 @@ void RTMPSetIndividualHT(IN PRTMP_ADAPTER pAd, u8 apidx) ...@@ -755,13 +755,13 @@ void RTMPSetIndividualHT(IN PRTMP_ADAPTER pAd, u8 apidx)
======================================================================== ========================================================================
*/ */
void RTMPUpdateHTIE(IN RT_HT_CAPABILITY * pRtHt, void RTMPUpdateHTIE(struct rt_ht_capability *pRtHt,
u8 * pMcsSet, u8 * pMcsSet,
OUT HT_CAPABILITY_IE * pHtCapability, struct rt_ht_capability_ie * pHtCapability,
OUT ADD_HT_INFO_IE * pAddHtInfo) struct rt_add_ht_info_ie * pAddHtInfo)
{ {
RTMPZeroMemory(pHtCapability, sizeof(HT_CAPABILITY_IE)); RTMPZeroMemory(pHtCapability, sizeof(struct rt_ht_capability_ie));
RTMPZeroMemory(pAddHtInfo, sizeof(ADD_HT_INFO_IE)); RTMPZeroMemory(pAddHtInfo, sizeof(struct rt_add_ht_info_ie));
pHtCapability->HtCapInfo.ChannelWidth = pRtHt->ChannelWidth; pHtCapability->HtCapInfo.ChannelWidth = pRtHt->ChannelWidth;
pHtCapability->HtCapInfo.MimoPs = pRtHt->MimoPs; pHtCapability->HtCapInfo.MimoPs = pRtHt->MimoPs;
...@@ -790,10 +790,10 @@ void RTMPUpdateHTIE(IN RT_HT_CAPABILITY * pRtHt, ...@@ -790,10 +790,10 @@ void RTMPUpdateHTIE(IN RT_HT_CAPABILITY * pRtHt,
Return: Return:
======================================================================== ========================================================================
*/ */
void RTMPAddWcidAttributeEntry(IN PRTMP_ADAPTER pAd, void RTMPAddWcidAttributeEntry(struct rt_rtmp_adapter *pAd,
u8 BssIdx, u8 BssIdx,
u8 KeyIdx, u8 KeyIdx,
u8 CipherAlg, IN MAC_TABLE_ENTRY * pEntry) u8 CipherAlg, struct rt_mac_table_entry *pEntry)
{ {
u32 WCIDAttri = 0; u32 WCIDAttri = 0;
u16 offset; u16 offset;
...@@ -914,9 +914,9 @@ char *GetAuthMode(char auth) ...@@ -914,9 +914,9 @@ char *GetAuthMode(char auth)
return "UNKNOW"; return "UNKNOW";
} }
int SetCommonHT(IN PRTMP_ADAPTER pAd) int SetCommonHT(struct rt_rtmp_adapter *pAd)
{ {
OID_SET_HT_PHYMODE SetHT; struct rt_oid_set_ht_phymode SetHT;
if (pAd->CommonCfg.PhyMode < PHY_11ABGN_MIXED) if (pAd->CommonCfg.PhyMode < PHY_11ABGN_MIXED)
return FALSE; return FALSE;
......
drivers/staging/rt2860/common/cmm_mac_pci.c
浏览文件 @ 62eb734b
...@@ -48,18 +48,18 @@ ...@@ -48,18 +48,18 @@
======================================================================== ========================================================================
*/ */
int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd) int RTMPAllocTxRxRingMemory(struct rt_rtmp_adapter *pAd)
{ {
int Status = NDIS_STATUS_SUCCESS; int Status = NDIS_STATUS_SUCCESS;
unsigned long RingBasePaHigh; unsigned long RingBasePaHigh;
unsigned long RingBasePaLow; unsigned long RingBasePaLow;
void *RingBaseVa; void *RingBaseVa;
int index, num; int index, num;
PTXD_STRUC pTxD; struct rt_txd * pTxD;
PRXD_STRUC pRxD; struct rt_rxd * pRxD;
unsigned long ErrorValue = 0; unsigned long ErrorValue = 0;
PRTMP_TX_RING pTxRing; struct rt_rtmp_tx_ring *pTxRing;
PRTMP_DMABUF pDmaBuf; struct rt_rtmp_dmabuf *pDmaBuf;
void *pPacket; void *pPacket;
/* PRTMP_REORDERBUF pReorderBuf; */ /* PRTMP_REORDERBUF pReorderBuf; */
...@@ -166,7 +166,7 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -166,7 +166,7 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd)
/* link the pre-allocated TxBuf to TXD */ /* link the pre-allocated TxBuf to TXD */
pTxD = pTxD =
(PTXD_STRUC) pTxRing->Cell[index].AllocVa; (struct rt_txd *) pTxRing->Cell[index].AllocVa;
pTxD->SDPtr0 = BufBasePaLow; pTxD->SDPtr0 = BufBasePaLow;
/* advance to next ring descriptor address */ /* advance to next ring descriptor address */
pTxD->DMADONE = 1; pTxD->DMADONE = 1;
...@@ -231,7 +231,7 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -231,7 +231,7 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd)
RingBaseVa = (u8 *)RingBaseVa + TXD_SIZE; RingBaseVa = (u8 *)RingBaseVa + TXD_SIZE;
/* link the pre-allocated TxBuf to TXD */ /* link the pre-allocated TxBuf to TXD */
pTxD = (PTXD_STRUC) pAd->MgmtRing.Cell[index].AllocVa; pTxD = (struct rt_txd *) pAd->MgmtRing.Cell[index].AllocVa;
pTxD->DMADONE = 1; pTxD->DMADONE = 1;
/* no pre-allocated buffer required in MgmtRing for scatter-gather case */ /* no pre-allocated buffer required in MgmtRing for scatter-gather case */
...@@ -312,7 +312,7 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -312,7 +312,7 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd)
NdisZeroMemory(pDmaBuf->AllocVa, pDmaBuf->AllocSize); NdisZeroMemory(pDmaBuf->AllocVa, pDmaBuf->AllocSize);
/* Write RxD buffer address & allocated buffer length */ /* Write RxD buffer address & allocated buffer length */
pRxD = (PRXD_STRUC) pAd->RxRing.Cell[index].AllocVa; pRxD = (struct rt_rxd *) pAd->RxRing.Cell[index].AllocVa;
pRxD->SDP0 = pRxD->SDP0 =
RTMP_GetPhysicalAddressLow(pDmaBuf->AllocPa); RTMP_GetPhysicalAddressLow(pDmaBuf->AllocPa);
pRxD->DDONE = 0; pRxD->DDONE = 0;
...@@ -324,7 +324,7 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -324,7 +324,7 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd)
} while (FALSE); } while (FALSE);
NdisZeroMemory(&pAd->FragFrame, sizeof(FRAGMENT_FRAME)); NdisZeroMemory(&pAd->FragFrame, sizeof(struct rt_fragment_frame));
pAd->FragFrame.pFragPacket = pAd->FragFrame.pFragPacket =
RTMP_AllocateFragPacketBuffer(pAd, RX_BUFFER_NORMSIZE); RTMP_AllocateFragPacketBuffer(pAd, RX_BUFFER_NORMSIZE);
...@@ -400,14 +400,14 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -400,14 +400,14 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd)
======================================================================== ========================================================================
*/ */
void RTMPRingCleanUp(IN PRTMP_ADAPTER pAd, u8 RingType) void RTMPRingCleanUp(struct rt_rtmp_adapter *pAd, u8 RingType)
{ {
PTXD_STRUC pTxD; struct rt_txd * pTxD;
PRXD_STRUC pRxD; struct rt_rxd * pRxD;
PQUEUE_ENTRY pEntry; struct rt_queue_entry *pEntry;
void *pPacket; void *pPacket;
int i; int i;
PRTMP_TX_RING pTxRing; struct rt_rtmp_tx_ring *pTxRing;
unsigned long IrqFlags; unsigned long IrqFlags;
/*u32 RxSwReadIdx; */ /*u32 RxSwReadIdx; */
...@@ -426,7 +426,7 @@ void RTMPRingCleanUp(IN PRTMP_ADAPTER pAd, u8 RingType) ...@@ -426,7 +426,7 @@ void RTMPRingCleanUp(IN PRTMP_ADAPTER pAd, u8 RingType)
/* We have to clean all descriptors in case some error happened with reset */ /* We have to clean all descriptors in case some error happened with reset */
for (i = 0; i < TX_RING_SIZE; i++) /* We have to scan all TX ring */ for (i = 0; i < TX_RING_SIZE; i++) /* We have to scan all TX ring */
{ {
pTxD = (PTXD_STRUC) pTxRing->Cell[i].AllocVa; pTxD = (struct rt_txd *) pTxRing->Cell[i].AllocVa;
pPacket = (void *)pTxRing->Cell[i].pNdisPacket; pPacket = (void *)pTxRing->Cell[i].pNdisPacket;
/* release scatter-and-gather char */ /* release scatter-and-gather char */
...@@ -471,7 +471,7 @@ void RTMPRingCleanUp(IN PRTMP_ADAPTER pAd, u8 RingType) ...@@ -471,7 +471,7 @@ void RTMPRingCleanUp(IN PRTMP_ADAPTER pAd, u8 RingType)
NdisAcquireSpinLock(&pAd->MgmtRingLock); NdisAcquireSpinLock(&pAd->MgmtRingLock);
for (i = 0; i < MGMT_RING_SIZE; i++) { for (i = 0; i < MGMT_RING_SIZE; i++) {
pTxD = (PTXD_STRUC) pAd->MgmtRing.Cell[i].AllocVa; pTxD = (struct rt_txd *) pAd->MgmtRing.Cell[i].AllocVa;
pPacket = pPacket =
(void *)pAd->MgmtRing.Cell[i].pNdisPacket; (void *)pAd->MgmtRing.Cell[i].pNdisPacket;
...@@ -514,7 +514,7 @@ void RTMPRingCleanUp(IN PRTMP_ADAPTER pAd, u8 RingType) ...@@ -514,7 +514,7 @@ void RTMPRingCleanUp(IN PRTMP_ADAPTER pAd, u8 RingType)
NdisAcquireSpinLock(&pAd->RxRingLock); NdisAcquireSpinLock(&pAd->RxRingLock);
for (i = 0; i < RX_RING_SIZE; i++) { for (i = 0; i < RX_RING_SIZE; i++) {
pRxD = (PRXD_STRUC) pAd->RxRing.Cell[i].AllocVa; pRxD = (struct rt_rxd *) pAd->RxRing.Cell[i].AllocVa;
pRxD->DDONE = 0; pRxD->DDONE = 0;
} }
...@@ -533,11 +533,11 @@ void RTMPRingCleanUp(IN PRTMP_ADAPTER pAd, u8 RingType) ...@@ -533,11 +533,11 @@ void RTMPRingCleanUp(IN PRTMP_ADAPTER pAd, u8 RingType)
} }
} }
void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd) void RTMPFreeTxRxRingMemory(struct rt_rtmp_adapter *pAd)
{ {
int index, num, j; int index, num, j;
PRTMP_TX_RING pTxRing; struct rt_rtmp_tx_ring *pTxRing;
PTXD_STRUC pTxD; struct rt_txd * pTxD;
void *pPacket; void *pPacket;
unsigned int IrqFlags; unsigned int IrqFlags;
...@@ -547,9 +547,9 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -547,9 +547,9 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd)
/* Free TxSwQueue Packet */ /* Free TxSwQueue Packet */
for (index = 0; index < NUM_OF_TX_RING; index++) { for (index = 0; index < NUM_OF_TX_RING; index++) {
PQUEUE_ENTRY pEntry; struct rt_queue_entry *pEntry;
void *pPacket; void *pPacket;
PQUEUE_HEADER pQueue; struct rt_queue_header *pQueue;
RTMP_IRQ_LOCK(&pAd->irq_lock, IrqFlags); RTMP_IRQ_LOCK(&pAd->irq_lock, IrqFlags);
pQueue = &pAd->TxSwQueue[index]; pQueue = &pAd->TxSwQueue[index];
...@@ -566,7 +566,7 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -566,7 +566,7 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd)
pTxRing = &pAd->TxRing[index]; pTxRing = &pAd->TxRing[index];
for (j = 0; j < TX_RING_SIZE; j++) { for (j = 0; j < TX_RING_SIZE; j++) {
pTxD = (PTXD_STRUC) (pTxRing->Cell[j].AllocVa); pTxD = (struct rt_txd *) (pTxRing->Cell[j].AllocVa);
pPacket = pTxRing->Cell[j].pNdisPacket; pPacket = pTxRing->Cell[j].pNdisPacket;
if (pPacket) { if (pPacket) {
...@@ -607,21 +607,21 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -607,21 +607,21 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd)
NDIS_STATUS_SUCCESS); NDIS_STATUS_SUCCESS);
} }
} }
NdisZeroMemory(pAd->RxRing.Cell, RX_RING_SIZE * sizeof(RTMP_DMACB)); NdisZeroMemory(pAd->RxRing.Cell, RX_RING_SIZE * sizeof(struct rt_rtmp_dmacb));
if (pAd->RxDescRing.AllocVa) { if (pAd->RxDescRing.AllocVa) {
RTMP_FreeDescMemory(pAd, pAd->RxDescRing.AllocSize, RTMP_FreeDescMemory(pAd, pAd->RxDescRing.AllocSize,
pAd->RxDescRing.AllocVa, pAd->RxDescRing.AllocVa,
pAd->RxDescRing.AllocPa); pAd->RxDescRing.AllocPa);
} }
NdisZeroMemory(&pAd->RxDescRing, sizeof(RTMP_DMABUF)); NdisZeroMemory(&pAd->RxDescRing, sizeof(struct rt_rtmp_dmabuf));
if (pAd->MgmtDescRing.AllocVa) { if (pAd->MgmtDescRing.AllocVa) {
RTMP_FreeDescMemory(pAd, pAd->MgmtDescRing.AllocSize, RTMP_FreeDescMemory(pAd, pAd->MgmtDescRing.AllocSize,
pAd->MgmtDescRing.AllocVa, pAd->MgmtDescRing.AllocVa,
pAd->MgmtDescRing.AllocPa); pAd->MgmtDescRing.AllocPa);
} }
NdisZeroMemory(&pAd->MgmtDescRing, sizeof(RTMP_DMABUF)); NdisZeroMemory(&pAd->MgmtDescRing, sizeof(struct rt_rtmp_dmabuf));
for (num = 0; num < NUM_OF_TX_RING; num++) { for (num = 0; num < NUM_OF_TX_RING; num++) {
if (pAd->TxBufSpace[num].AllocVa) { if (pAd->TxBufSpace[num].AllocVa) {
...@@ -631,14 +631,14 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -631,14 +631,14 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd)
pAd->TxBufSpace[num].AllocVa, pAd->TxBufSpace[num].AllocVa,
pAd->TxBufSpace[num].AllocPa); pAd->TxBufSpace[num].AllocPa);
} }
NdisZeroMemory(&pAd->TxBufSpace[num], sizeof(RTMP_DMABUF)); NdisZeroMemory(&pAd->TxBufSpace[num], sizeof(struct rt_rtmp_dmabuf));
if (pAd->TxDescRing[num].AllocVa) { if (pAd->TxDescRing[num].AllocVa) {
RTMP_FreeDescMemory(pAd, pAd->TxDescRing[num].AllocSize, RTMP_FreeDescMemory(pAd, pAd->TxDescRing[num].AllocSize,
pAd->TxDescRing[num].AllocVa, pAd->TxDescRing[num].AllocVa,
pAd->TxDescRing[num].AllocPa); pAd->TxDescRing[num].AllocPa);
} }
NdisZeroMemory(&pAd->TxDescRing[num], sizeof(RTMP_DMABUF)); NdisZeroMemory(&pAd->TxDescRing[num], sizeof(struct rt_rtmp_dmabuf));
} }
if (pAd->FragFrame.pFragPacket) if (pAd->FragFrame.pFragPacket)
...@@ -667,7 +667,7 @@ Return Value: ...@@ -667,7 +667,7 @@ Return Value:
Note: Note:
======================================================================== ========================================================================
*/ */
void RT28XXDMADisable(IN RTMP_ADAPTER * pAd) void RT28XXDMADisable(struct rt_rtmp_adapter *pAd)
{ {
WPDMA_GLO_CFG_STRUC GloCfg; WPDMA_GLO_CFG_STRUC GloCfg;
...@@ -691,7 +691,7 @@ Return Value: ...@@ -691,7 +691,7 @@ Return Value:
Note: Note:
======================================================================== ========================================================================
*/ */
void RT28XXDMAEnable(IN RTMP_ADAPTER * pAd) void RT28XXDMAEnable(struct rt_rtmp_adapter *pAd)
{ {
WPDMA_GLO_CFG_STRUC GloCfg; WPDMA_GLO_CFG_STRUC GloCfg;
int i = 0; int i = 0;
...@@ -721,7 +721,7 @@ void RT28XXDMAEnable(IN RTMP_ADAPTER * pAd) ...@@ -721,7 +721,7 @@ void RT28XXDMAEnable(IN RTMP_ADAPTER * pAd)
} }
BOOLEAN AsicCheckCommanOk(IN PRTMP_ADAPTER pAd, u8 Command) BOOLEAN AsicCheckCommanOk(struct rt_rtmp_adapter *pAd, u8 Command)
{ {
u32 CmdStatus = 0, CID = 0, i; u32 CmdStatus = 0, CID = 0, i;
u32 ThisCIDMask = 0; u32 ThisCIDMask = 0;
...@@ -794,7 +794,7 @@ Return Value: ...@@ -794,7 +794,7 @@ Return Value:
Note: Note:
======================================================================== ========================================================================
*/ */
void RT28xx_UpdateBeaconToAsic(IN RTMP_ADAPTER * pAd, void RT28xx_UpdateBeaconToAsic(struct rt_rtmp_adapter *pAd,
int apidx, int apidx,
unsigned long FrameLen, unsigned long UpdatePos) unsigned long FrameLen, unsigned long UpdatePos)
{ {
...@@ -853,7 +853,7 @@ void RT28xx_UpdateBeaconToAsic(IN RTMP_ADAPTER * pAd, ...@@ -853,7 +853,7 @@ void RT28xx_UpdateBeaconToAsic(IN RTMP_ADAPTER * pAd,
} }
void RT28xxPciStaAsicForceWakeup(IN PRTMP_ADAPTER pAd, IN BOOLEAN bFromTx) void RT28xxPciStaAsicForceWakeup(struct rt_rtmp_adapter *pAd, IN BOOLEAN bFromTx)
{ {
AUTO_WAKEUP_STRUC AutoWakeupCfg; AUTO_WAKEUP_STRUC AutoWakeupCfg;
...@@ -888,7 +888,7 @@ void RT28xxPciStaAsicForceWakeup(IN PRTMP_ADAPTER pAd, IN BOOLEAN bFromTx) ...@@ -888,7 +888,7 @@ void RT28xxPciStaAsicForceWakeup(IN PRTMP_ADAPTER pAd, IN BOOLEAN bFromTx)
/* add by johnli, RF power sequence setup, load RF normal operation-mode setup */ /* add by johnli, RF power sequence setup, load RF normal operation-mode setup */
if ((IS_RT3090(pAd) || IS_RT3572(pAd) || IS_RT3390(pAd)) if ((IS_RT3090(pAd) || IS_RT3572(pAd) || IS_RT3390(pAd))
&& IS_VERSION_AFTER_F(pAd)) { && IS_VERSION_AFTER_F(pAd)) {
RTMP_CHIP_OP *pChipOps = &pAd->chipOps; struct rt_rtmp_chip_op *pChipOps = &pAd->chipOps;
if (pChipOps->AsicReverseRfFromSleepMode) if (pChipOps->AsicReverseRfFromSleepMode)
pChipOps-> pChipOps->
...@@ -949,7 +949,7 @@ void RT28xxPciStaAsicForceWakeup(IN PRTMP_ADAPTER pAd, IN BOOLEAN bFromTx) ...@@ -949,7 +949,7 @@ void RT28xxPciStaAsicForceWakeup(IN PRTMP_ADAPTER pAd, IN BOOLEAN bFromTx)
DBGPRINT(RT_DEBUG_TRACE, ("<=======RT28xxPciStaAsicForceWakeup\n")); DBGPRINT(RT_DEBUG_TRACE, ("<=======RT28xxPciStaAsicForceWakeup\n"));
} }
void RT28xxPciStaAsicSleepThenAutoWakeup(IN PRTMP_ADAPTER pAd, void RT28xxPciStaAsicSleepThenAutoWakeup(struct rt_rtmp_adapter *pAd,
u16 TbttNumToNextWakeUp) u16 TbttNumToNextWakeUp)
{ {
BOOLEAN brc; BOOLEAN brc;
...@@ -1020,7 +1020,7 @@ void PsPollWakeExec(void *SystemSpecific1, ...@@ -1020,7 +1020,7 @@ void PsPollWakeExec(void *SystemSpecific1,
void *FunctionContext, void *FunctionContext,
void *SystemSpecific2, void *SystemSpecific3) void *SystemSpecific2, void *SystemSpecific3)
{ {
RTMP_ADAPTER *pAd = (RTMP_ADAPTER *) FunctionContext; struct rt_rtmp_adapter *pAd = (struct rt_rtmp_adapter *)FunctionContext;
unsigned long flags; unsigned long flags;
DBGPRINT(RT_DEBUG_TRACE, ("-->PsPollWakeExec \n")); DBGPRINT(RT_DEBUG_TRACE, ("-->PsPollWakeExec \n"));
...@@ -1048,8 +1048,8 @@ void RadioOnExec(void *SystemSpecific1, ...@@ -1048,8 +1048,8 @@ void RadioOnExec(void *SystemSpecific1,
void *FunctionContext, void *FunctionContext,
void *SystemSpecific2, void *SystemSpecific3) void *SystemSpecific2, void *SystemSpecific3)
{ {
RTMP_ADAPTER *pAd = (RTMP_ADAPTER *) FunctionContext; struct rt_rtmp_adapter *pAd = (struct rt_rtmp_adapter *)FunctionContext;
RTMP_CHIP_OP *pChipOps = &pAd->chipOps; struct rt_rtmp_chip_op *pChipOps = &pAd->chipOps;
WPDMA_GLO_CFG_STRUC DmaCfg; WPDMA_GLO_CFG_STRUC DmaCfg;
BOOLEAN Cancelled; BOOLEAN Cancelled;
...@@ -1164,7 +1164,7 @@ void RadioOnExec(void *SystemSpecific1, ...@@ -1164,7 +1164,7 @@ void RadioOnExec(void *SystemSpecific1,
========================================================================== ==========================================================================
*/ */
BOOLEAN RT28xxPciAsicRadioOn(IN PRTMP_ADAPTER pAd, u8 Level) BOOLEAN RT28xxPciAsicRadioOn(struct rt_rtmp_adapter *pAd, u8 Level)
{ {
/*WPDMA_GLO_CFG_STRUC DmaCfg; */ /*WPDMA_GLO_CFG_STRUC DmaCfg; */
BOOLEAN Cancelled; BOOLEAN Cancelled;
...@@ -1223,7 +1223,7 @@ BOOLEAN RT28xxPciAsicRadioOn(IN PRTMP_ADAPTER pAd, u8 Level) ...@@ -1223,7 +1223,7 @@ BOOLEAN RT28xxPciAsicRadioOn(IN PRTMP_ADAPTER pAd, u8 Level)
/* add by johnli, RF power sequence setup, load RF normal operation-mode setup */ /* add by johnli, RF power sequence setup, load RF normal operation-mode setup */
if ((IS_RT3090(pAd) || IS_RT3572(pAd) || IS_RT3390(pAd))) { if ((IS_RT3090(pAd) || IS_RT3572(pAd) || IS_RT3390(pAd))) {
RTMP_CHIP_OP *pChipOps = &pAd->chipOps; struct rt_rtmp_chip_op *pChipOps = &pAd->chipOps;
if (pChipOps->AsicReverseRfFromSleepMode) if (pChipOps->AsicReverseRfFromSleepMode)
pChipOps->AsicReverseRfFromSleepMode(pAd); pChipOps->AsicReverseRfFromSleepMode(pAd);
...@@ -1286,7 +1286,7 @@ BOOLEAN RT28xxPciAsicRadioOn(IN PRTMP_ADAPTER pAd, u8 Level) ...@@ -1286,7 +1286,7 @@ BOOLEAN RT28xxPciAsicRadioOn(IN PRTMP_ADAPTER pAd, u8 Level)
========================================================================== ==========================================================================
*/ */
BOOLEAN RT28xxPciAsicRadioOff(IN PRTMP_ADAPTER pAd, BOOLEAN RT28xxPciAsicRadioOff(struct rt_rtmp_adapter *pAd,
u8 Level, u16 TbttNumToNextWakeUp) u8 Level, u16 TbttNumToNextWakeUp)
{ {
WPDMA_GLO_CFG_STRUC DmaCfg; WPDMA_GLO_CFG_STRUC DmaCfg;
...@@ -1497,7 +1497,7 @@ BOOLEAN RT28xxPciAsicRadioOff(IN PRTMP_ADAPTER pAd, ...@@ -1497,7 +1497,7 @@ BOOLEAN RT28xxPciAsicRadioOff(IN PRTMP_ADAPTER pAd,
return TRUE; return TRUE;
} }
void RT28xxPciMlmeRadioOn(IN PRTMP_ADAPTER pAd) void RT28xxPciMlmeRadioOn(struct rt_rtmp_adapter *pAd)
{ {
if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF)) if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF))
return; return;
...@@ -1546,7 +1546,7 @@ void RT28xxPciMlmeRadioOn(IN PRTMP_ADAPTER pAd) ...@@ -1546,7 +1546,7 @@ void RT28xxPciMlmeRadioOn(IN PRTMP_ADAPTER pAd)
} }
} }
void RT28xxPciMlmeRadioOFF(IN PRTMP_ADAPTER pAd) void RT28xxPciMlmeRadioOFF(struct rt_rtmp_adapter *pAd)
{ {
BOOLEAN brc = TRUE; BOOLEAN brc = TRUE;
...@@ -1556,9 +1556,9 @@ void RT28xxPciMlmeRadioOFF(IN PRTMP_ADAPTER pAd) ...@@ -1556,9 +1556,9 @@ void RT28xxPciMlmeRadioOFF(IN PRTMP_ADAPTER pAd)
/* Link down first if any association exists */ /* Link down first if any association exists */
if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST)) { if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST)) {
if (INFRA_ON(pAd) || ADHOC_ON(pAd)) { if (INFRA_ON(pAd) || ADHOC_ON(pAd)) {
MLME_DISASSOC_REQ_STRUCT DisReq; struct rt_mlme_disassoc_req DisReq;
MLME_QUEUE_ELEM *pMsgElem = struct rt_mlme_queue_elem *pMsgElem =
(MLME_QUEUE_ELEM *) kmalloc(sizeof(MLME_QUEUE_ELEM), (struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
MEM_ALLOC_FLAG); MEM_ALLOC_FLAG);
if (pMsgElem) { if (pMsgElem) {
...@@ -1569,10 +1569,10 @@ void RT28xxPciMlmeRadioOFF(IN PRTMP_ADAPTER pAd) ...@@ -1569,10 +1569,10 @@ void RT28xxPciMlmeRadioOFF(IN PRTMP_ADAPTER pAd)
pMsgElem->Machine = ASSOC_STATE_MACHINE; pMsgElem->Machine = ASSOC_STATE_MACHINE;
pMsgElem->MsgType = MT2_MLME_DISASSOC_REQ; pMsgElem->MsgType = MT2_MLME_DISASSOC_REQ;
pMsgElem->MsgLen = pMsgElem->MsgLen =
sizeof(MLME_DISASSOC_REQ_STRUCT); sizeof(struct rt_mlme_disassoc_req);
NdisMoveMemory(pMsgElem->Msg, &DisReq, NdisMoveMemory(pMsgElem->Msg, &DisReq,
sizeof sizeof
(MLME_DISASSOC_REQ_STRUCT)); (struct rt_mlme_disassoc_req));
MlmeDisassocReqAction(pAd, pMsgElem); MlmeDisassocReqAction(pAd, pMsgElem);
kfree(pMsgElem); kfree(pMsgElem);
......
drivers/staging/rt2860/common/cmm_mac_usb.c
浏览文件 @ 62eb734b
...@@ -43,12 +43,12 @@ Return Value: ...@@ -43,12 +43,12 @@ Return Value:
Note: Note:
Initialize all receive releated private buffer, include those define Initialize all receive releated private buffer, include those define
in RTMP_ADAPTER structure and all private data structures. The mahor in struct rt_rtmp_adapter structure and all private data structures. The mahor
work is to allocate buffer for each packet and chain buffer to work is to allocate buffer for each packet and chain buffer to
NDIS packet descriptor. NDIS packet descriptor.
======================================================================== ========================================================================
*/ */
int NICInitRecv(IN PRTMP_ADAPTER pAd) int NICInitRecv(struct rt_rtmp_adapter *pAd)
{ {
u8 i; u8 i;
int Status = NDIS_STATUS_SUCCESS; int Status = NDIS_STATUS_SUCCESS;
...@@ -64,7 +64,7 @@ int NICInitRecv(IN PRTMP_ADAPTER pAd) ...@@ -64,7 +64,7 @@ int NICInitRecv(IN PRTMP_ADAPTER pAd)
pAd->NextRxBulkInPosition = 0; pAd->NextRxBulkInPosition = 0;
for (i = 0; i < (RX_RING_SIZE); i++) { for (i = 0; i < (RX_RING_SIZE); i++) {
PRX_CONTEXT pRxContext = &(pAd->RxContext[i]); struct rt_rx_context *pRxContext = &(pAd->RxContext[i]);
/*Allocate URB */ /*Allocate URB */
pRxContext->pUrb = RTUSB_ALLOC_URB(0); pRxContext->pUrb = RTUSB_ALLOC_URB(0);
...@@ -98,7 +98,7 @@ int NICInitRecv(IN PRTMP_ADAPTER pAd) ...@@ -98,7 +98,7 @@ int NICInitRecv(IN PRTMP_ADAPTER pAd)
out1: out1:
for (i = 0; i < (RX_RING_SIZE); i++) { for (i = 0; i < (RX_RING_SIZE); i++) {
PRX_CONTEXT pRxContext = &(pAd->RxContext[i]); struct rt_rx_context *pRxContext = &(pAd->RxContext[i]);
if (NULL != pRxContext->TransferBuffer) { if (NULL != pRxContext->TransferBuffer) {
RTUSB_URB_FREE_BUFFER(pObj->pUsb_Dev, MAX_RXBULK_SIZE, RTUSB_URB_FREE_BUFFER(pObj->pUsb_Dev, MAX_RXBULK_SIZE,
...@@ -132,7 +132,7 @@ Return Value: ...@@ -132,7 +132,7 @@ Return Value:
Note: Note:
======================================================================== ========================================================================
*/ */
int NICInitTransmit(IN PRTMP_ADAPTER pAd) int NICInitTransmit(struct rt_rtmp_adapter *pAd)
{ {
#define LM_USB_ALLOC(pObj, Context, TB_Type, BufferSize, Status, msg1, err1, msg2, err2) \ #define LM_USB_ALLOC(pObj, Context, TB_Type, BufferSize, Status, msg1, err1, msg2, err2) \
Context->pUrb = RTUSB_ALLOC_URB(0); \ Context->pUrb = RTUSB_ALLOC_URB(0); \
...@@ -161,15 +161,15 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -161,15 +161,15 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
u8 i, acidx; u8 i, acidx;
int Status = NDIS_STATUS_SUCCESS; int Status = NDIS_STATUS_SUCCESS;
PTX_CONTEXT pNullContext = &(pAd->NullContext); struct rt_tx_context *pNullContext = &(pAd->NullContext);
PTX_CONTEXT pPsPollContext = &(pAd->PsPollContext); struct rt_tx_context *pPsPollContext = &(pAd->PsPollContext);
PTX_CONTEXT pRTSContext = &(pAd->RTSContext); struct rt_tx_context *pRTSContext = &(pAd->RTSContext);
PTX_CONTEXT pMLMEContext = NULL; struct rt_tx_context *pMLMEContext = NULL;
/* PHT_TX_CONTEXT pHTTXContext = NULL; */ /* struct rt_ht_tx_context *pHTTXContext = NULL; */
struct os_cookie *pObj = (struct os_cookie *)pAd->OS_Cookie; struct os_cookie *pObj = (struct os_cookie *)pAd->OS_Cookie;
void *RingBaseVa; void *RingBaseVa;
/* RTMP_TX_RING *pTxRing; */ /* struct rt_rtmp_tx_ring *pTxRing; */
RTMP_MGMT_RING *pMgmtRing; struct rt_rtmp_mgmt_ring *pMgmtRing;
DBGPRINT(RT_DEBUG_TRACE, ("--> NICInitTransmit\n")); DBGPRINT(RT_DEBUG_TRACE, ("--> NICInitTransmit\n"));
pObj = pObj; pObj = pObj;
...@@ -199,15 +199,15 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -199,15 +199,15 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
/* TX_RING_SIZE, 4 ACs */ /* TX_RING_SIZE, 4 ACs */
/* */ /* */
for (acidx = 0; acidx < 4; acidx++) { for (acidx = 0; acidx < 4; acidx++) {
PHT_TX_CONTEXT pHTTXContext = &(pAd->TxContext[acidx]); struct rt_ht_tx_context *pHTTXContext = &(pAd->TxContext[acidx]);
NdisZeroMemory(pHTTXContext, sizeof(HT_TX_CONTEXT)); NdisZeroMemory(pHTTXContext, sizeof(struct rt_ht_tx_context));
/*Allocate URB */ /*Allocate URB */
LM_USB_ALLOC(pObj, pHTTXContext, PHTTX_BUFFER, LM_USB_ALLOC(pObj, pHTTXContext, struct rt_httx_buffer *,
sizeof(HTTX_BUFFER), Status, sizeof(struct rt_httx_buffer), Status,
("<-- ERROR in Alloc TX TxContext[%d] urb!! \n", ("<-- ERROR in Alloc TX TxContext[%d] urb!! \n",
acidx), done, acidx), done,
("<-- ERROR in Alloc TX TxContext[%d] HTTX_BUFFER !! \n", ("<-- ERROR in Alloc TX TxContext[%d] struct rt_httx_buffer !! \n",
acidx), out1); acidx), out1);
NdisZeroMemory(pHTTXContext->TransferBuffer-> NdisZeroMemory(pHTTXContext->TransferBuffer->
...@@ -232,7 +232,7 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -232,7 +232,7 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
/* Allocate MGMT ring descriptor's memory */ /* Allocate MGMT ring descriptor's memory */
pAd->MgmtDescRing.AllocSize = pAd->MgmtDescRing.AllocSize =
MGMT_RING_SIZE * sizeof(TX_CONTEXT); MGMT_RING_SIZE * sizeof(struct rt_tx_context);
os_alloc_mem(pAd, (u8 **) (&pAd->MgmtDescRing.AllocVa), os_alloc_mem(pAd, (u8 **) (&pAd->MgmtDescRing.AllocVa),
pAd->MgmtDescRing.AllocSize); pAd->MgmtDescRing.AllocSize);
if (pAd->MgmtDescRing.AllocVa == NULL) { if (pAd->MgmtDescRing.AllocVa == NULL) {
...@@ -248,14 +248,14 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -248,14 +248,14 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
pMgmtRing = &pAd->MgmtRing; pMgmtRing = &pAd->MgmtRing;
for (i = 0; i < MGMT_RING_SIZE; i++) { for (i = 0; i < MGMT_RING_SIZE; i++) {
/* link the pre-allocated Mgmt buffer to MgmtRing.Cell */ /* link the pre-allocated Mgmt buffer to MgmtRing.Cell */
pMgmtRing->Cell[i].AllocSize = sizeof(TX_CONTEXT); pMgmtRing->Cell[i].AllocSize = sizeof(struct rt_tx_context);
pMgmtRing->Cell[i].AllocVa = RingBaseVa; pMgmtRing->Cell[i].AllocVa = RingBaseVa;
pMgmtRing->Cell[i].pNdisPacket = NULL; pMgmtRing->Cell[i].pNdisPacket = NULL;
pMgmtRing->Cell[i].pNextNdisPacket = NULL; pMgmtRing->Cell[i].pNextNdisPacket = NULL;
/*Allocate URB for MLMEContext */ /*Allocate URB for MLMEContext */
pMLMEContext = pMLMEContext =
(PTX_CONTEXT) pAd->MgmtRing.Cell[i].AllocVa; (struct rt_tx_context *)pAd->MgmtRing.Cell[i].AllocVa;
pMLMEContext->pUrb = RTUSB_ALLOC_URB(0); pMLMEContext->pUrb = RTUSB_ALLOC_URB(0);
if (pMLMEContext->pUrb == NULL) { if (pMLMEContext->pUrb == NULL) {
DBGPRINT(RT_DEBUG_ERROR, DBGPRINT(RT_DEBUG_ERROR,
...@@ -274,7 +274,7 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -274,7 +274,7 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
pMLMEContext->SelfIdx = i; pMLMEContext->SelfIdx = i;
/* Offset to next ring descriptor address */ /* Offset to next ring descriptor address */
RingBaseVa = (u8 *)RingBaseVa + sizeof(TX_CONTEXT); RingBaseVa = (u8 *)RingBaseVa + sizeof(struct rt_tx_context);
} }
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("MGMT Ring: total %d entry allocated\n", i)); ("MGMT Ring: total %d entry allocated\n", i));
...@@ -289,16 +289,16 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -289,16 +289,16 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
/* */ /* */
for (i = 0; i < BEACON_RING_SIZE; i++) /* 2 */ for (i = 0; i < BEACON_RING_SIZE; i++) /* 2 */
{ {
PTX_CONTEXT pBeaconContext = &(pAd->BeaconContext[i]); struct rt_tx_context *pBeaconContext = &(pAd->BeaconContext[i]);
NdisZeroMemory(pBeaconContext, sizeof(TX_CONTEXT)); NdisZeroMemory(pBeaconContext, sizeof(struct rt_tx_context));
/*Allocate URB */ /*Allocate URB */
LM_USB_ALLOC(pObj, pBeaconContext, PTX_BUFFER, LM_USB_ALLOC(pObj, pBeaconContext, struct rt_tx_buffer *,
sizeof(TX_BUFFER), Status, sizeof(struct rt_tx_buffer), Status,
("<-- ERROR in Alloc TX BeaconContext[%d] urb!! \n", ("<-- ERROR in Alloc TX BeaconContext[%d] urb!! \n",
i), out2, i), out2,
("<-- ERROR in Alloc TX BeaconContext[%d] TX_BUFFER !! \n", ("<-- ERROR in Alloc TX BeaconContext[%d] struct rt_tx_buffer !! \n",
i), out3); i), out3);
pBeaconContext->pAd = pAd; pBeaconContext->pAd = pAd;
...@@ -310,14 +310,14 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -310,14 +310,14 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
/* */ /* */
/* NullContext */ /* NullContext */
/* */ /* */
NdisZeroMemory(pNullContext, sizeof(TX_CONTEXT)); NdisZeroMemory(pNullContext, sizeof(struct rt_tx_context));
/*Allocate URB */ /*Allocate URB */
LM_USB_ALLOC(pObj, pNullContext, PTX_BUFFER, sizeof(TX_BUFFER), LM_USB_ALLOC(pObj, pNullContext, struct rt_tx_buffer *, sizeof(struct rt_tx_buffer),
Status, Status,
("<-- ERROR in Alloc TX NullContext urb!! \n"), ("<-- ERROR in Alloc TX NullContext urb!! \n"),
out3, out3,
("<-- ERROR in Alloc TX NullContext TX_BUFFER !! \n"), ("<-- ERROR in Alloc TX NullContext struct rt_tx_buffer !! \n"),
out4); out4);
pNullContext->pAd = pAd; pNullContext->pAd = pAd;
...@@ -328,14 +328,14 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -328,14 +328,14 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
/* */ /* */
/* RTSContext */ /* RTSContext */
/* */ /* */
NdisZeroMemory(pRTSContext, sizeof(TX_CONTEXT)); NdisZeroMemory(pRTSContext, sizeof(struct rt_tx_context));
/*Allocate URB */ /*Allocate URB */
LM_USB_ALLOC(pObj, pRTSContext, PTX_BUFFER, sizeof(TX_BUFFER), LM_USB_ALLOC(pObj, pRTSContext, struct rt_tx_buffer *, sizeof(struct rt_tx_buffer),
Status, Status,
("<-- ERROR in Alloc TX RTSContext urb!! \n"), ("<-- ERROR in Alloc TX RTSContext urb!! \n"),
out4, out4,
("<-- ERROR in Alloc TX RTSContext TX_BUFFER !! \n"), ("<-- ERROR in Alloc TX RTSContext struct rt_tx_buffer !! \n"),
out5); out5);
pRTSContext->pAd = pAd; pRTSContext->pAd = pAd;
...@@ -346,13 +346,13 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -346,13 +346,13 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
/* */ /* */
/* PsPollContext */ /* PsPollContext */
/* */ /* */
/*NdisZeroMemory(pPsPollContext, sizeof(TX_CONTEXT)); */ /*NdisZeroMemory(pPsPollContext, sizeof(struct rt_tx_context)); */
/*Allocate URB */ /*Allocate URB */
LM_USB_ALLOC(pObj, pPsPollContext, PTX_BUFFER, LM_USB_ALLOC(pObj, pPsPollContext, struct rt_tx_buffer *,
sizeof(TX_BUFFER), Status, sizeof(struct rt_tx_buffer), Status,
("<-- ERROR in Alloc TX PsPollContext urb!! \n"), ("<-- ERROR in Alloc TX PsPollContext urb!! \n"),
out5, out5,
("<-- ERROR in Alloc TX PsPollContext TX_BUFFER !! \n"), ("<-- ERROR in Alloc TX PsPollContext struct rt_tx_buffer !! \n"),
out6); out6);
pPsPollContext->pAd = pAd; pPsPollContext->pAd = pAd;
...@@ -371,19 +371,19 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -371,19 +371,19 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
/* --------------------------- ERROR HANDLE --------------------------- */ /* --------------------------- ERROR HANDLE --------------------------- */
out6: out6:
LM_URB_FREE(pObj, pPsPollContext, sizeof(TX_BUFFER)); LM_URB_FREE(pObj, pPsPollContext, sizeof(struct rt_tx_buffer));
out5: out5:
LM_URB_FREE(pObj, pRTSContext, sizeof(TX_BUFFER)); LM_URB_FREE(pObj, pRTSContext, sizeof(struct rt_tx_buffer));
out4: out4:
LM_URB_FREE(pObj, pNullContext, sizeof(TX_BUFFER)); LM_URB_FREE(pObj, pNullContext, sizeof(struct rt_tx_buffer));
out3: out3:
for (i = 0; i < BEACON_RING_SIZE; i++) { for (i = 0; i < BEACON_RING_SIZE; i++) {
PTX_CONTEXT pBeaconContext = &(pAd->BeaconContext[i]); struct rt_tx_context *pBeaconContext = &(pAd->BeaconContext[i]);
if (pBeaconContext) if (pBeaconContext)
LM_URB_FREE(pObj, pBeaconContext, sizeof(TX_BUFFER)); LM_URB_FREE(pObj, pBeaconContext, sizeof(struct rt_tx_buffer));
} }
out2: out2:
...@@ -391,10 +391,10 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -391,10 +391,10 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
pMgmtRing = &pAd->MgmtRing; pMgmtRing = &pAd->MgmtRing;
for (i = 0; i < MGMT_RING_SIZE; i++) { for (i = 0; i < MGMT_RING_SIZE; i++) {
pMLMEContext = pMLMEContext =
(PTX_CONTEXT) pAd->MgmtRing.Cell[i].AllocVa; (struct rt_tx_context *)pAd->MgmtRing.Cell[i].AllocVa;
if (pMLMEContext) if (pMLMEContext)
LM_URB_FREE(pObj, pMLMEContext, LM_URB_FREE(pObj, pMLMEContext,
sizeof(TX_BUFFER)); sizeof(struct rt_tx_buffer));
} }
os_free_mem(pAd, pAd->MgmtDescRing.AllocVa); os_free_mem(pAd, pAd->MgmtDescRing.AllocVa);
pAd->MgmtDescRing.AllocVa = NULL; pAd->MgmtDescRing.AllocVa = NULL;
...@@ -402,9 +402,9 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd) ...@@ -402,9 +402,9 @@ int NICInitTransmit(IN PRTMP_ADAPTER pAd)
out1: out1:
for (acidx = 0; acidx < 4; acidx++) { for (acidx = 0; acidx < 4; acidx++) {
PHT_TX_CONTEXT pTxContext = &(pAd->TxContext[acidx]); struct rt_ht_tx_context *pTxContext = &(pAd->TxContext[acidx]);
if (pTxContext) if (pTxContext)
LM_URB_FREE(pObj, pTxContext, sizeof(HTTX_BUFFER)); LM_URB_FREE(pObj, pTxContext, sizeof(struct rt_httx_buffer));
} }
/* Here we didn't have any pre-allocated memory need to free. */ /* Here we didn't have any pre-allocated memory need to free. */
...@@ -428,16 +428,16 @@ Return Value: ...@@ -428,16 +428,16 @@ Return Value:
Note: Note:
======================================================================== ========================================================================
*/ */
int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd) int RTMPAllocTxRxRingMemory(struct rt_rtmp_adapter *pAd)
{ {
/* COUNTER_802_11 pCounter = &pAd->WlanCounters; */ /* struct rt_counter_802_11 pCounter = &pAd->WlanCounters; */
int Status; int Status;
int num; int num;
DBGPRINT(RT_DEBUG_TRACE, ("--> RTMPAllocTxRxRingMemory\n")); DBGPRINT(RT_DEBUG_TRACE, ("--> RTMPAllocTxRxRingMemory\n"));
do { do {
/* Init the CmdQ and CmdQLock */ /* Init the struct rt_cmdq and CmdQLock */
NdisAllocateSpinLock(&pAd->CmdQLock); NdisAllocateSpinLock(&pAd->CmdQLock);
NdisAcquireSpinLock(&pAd->CmdQLock); NdisAcquireSpinLock(&pAd->CmdQLock);
RTUSBInitializeCmdQ(&pAd->CmdQ); RTUSBInitializeCmdQ(&pAd->CmdQ);
...@@ -490,7 +490,7 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -490,7 +490,7 @@ int RTMPAllocTxRxRingMemory(IN PRTMP_ADAPTER pAd)
} while (FALSE); } while (FALSE);
NdisZeroMemory(&pAd->FragFrame, sizeof(FRAGMENT_FRAME)); NdisZeroMemory(&pAd->FragFrame, sizeof(struct rt_fragment_frame));
pAd->FragFrame.pFragPacket = pAd->FragFrame.pFragPacket =
RTMP_AllocateFragPacketBuffer(pAd, RX_BUFFER_NORMSIZE); RTMP_AllocateFragPacketBuffer(pAd, RX_BUFFER_NORMSIZE);
...@@ -519,7 +519,7 @@ Return Value: ...@@ -519,7 +519,7 @@ Return Value:
Note: Note:
======================================================================== ========================================================================
*/ */
void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd) void RTMPFreeTxRxRingMemory(struct rt_rtmp_adapter *pAd)
{ {
#define LM_URB_FREE(pObj, Context, BufferSize) \ #define LM_URB_FREE(pObj, Context, BufferSize) \
if (NULL != Context->pUrb) { \ if (NULL != Context->pUrb) { \
...@@ -533,45 +533,45 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -533,45 +533,45 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd)
Context->TransferBuffer = NULL; } Context->TransferBuffer = NULL; }
u32 i, acidx; u32 i, acidx;
PTX_CONTEXT pNullContext = &pAd->NullContext; struct rt_tx_context *pNullContext = &pAd->NullContext;
PTX_CONTEXT pPsPollContext = &pAd->PsPollContext; struct rt_tx_context *pPsPollContext = &pAd->PsPollContext;
PTX_CONTEXT pRTSContext = &pAd->RTSContext; struct rt_tx_context *pRTSContext = &pAd->RTSContext;
/* PHT_TX_CONTEXT pHTTXContext; */ /* struct rt_ht_tx_context *pHTTXContext; */
/*PRTMP_REORDERBUF pReorderBuf; */ /*PRTMP_REORDERBUF pReorderBuf; */
struct os_cookie *pObj = (struct os_cookie *)pAd->OS_Cookie; struct os_cookie *pObj = (struct os_cookie *)pAd->OS_Cookie;
/* RTMP_TX_RING *pTxRing; */ /* struct rt_rtmp_tx_ring *pTxRing; */
DBGPRINT(RT_DEBUG_ERROR, ("---> RTMPFreeTxRxRingMemory\n")); DBGPRINT(RT_DEBUG_ERROR, ("---> RTMPFreeTxRxRingMemory\n"));
pObj = pObj; pObj = pObj;
/* Free all resources for the RECEIVE buffer queue. */ /* Free all resources for the RECEIVE buffer queue. */
for (i = 0; i < (RX_RING_SIZE); i++) { for (i = 0; i < (RX_RING_SIZE); i++) {
PRX_CONTEXT pRxContext = &(pAd->RxContext[i]); struct rt_rx_context *pRxContext = &(pAd->RxContext[i]);
if (pRxContext) if (pRxContext)
LM_URB_FREE(pObj, pRxContext, MAX_RXBULK_SIZE); LM_URB_FREE(pObj, pRxContext, MAX_RXBULK_SIZE);
} }
/* Free PsPoll frame resource */ /* Free PsPoll frame resource */
LM_URB_FREE(pObj, pPsPollContext, sizeof(TX_BUFFER)); LM_URB_FREE(pObj, pPsPollContext, sizeof(struct rt_tx_buffer));
/* Free NULL frame resource */ /* Free NULL frame resource */
LM_URB_FREE(pObj, pNullContext, sizeof(TX_BUFFER)); LM_URB_FREE(pObj, pNullContext, sizeof(struct rt_tx_buffer));
/* Free RTS frame resource */ /* Free RTS frame resource */
LM_URB_FREE(pObj, pRTSContext, sizeof(TX_BUFFER)); LM_URB_FREE(pObj, pRTSContext, sizeof(struct rt_tx_buffer));
/* Free beacon frame resource */ /* Free beacon frame resource */
for (i = 0; i < BEACON_RING_SIZE; i++) { for (i = 0; i < BEACON_RING_SIZE; i++) {
PTX_CONTEXT pBeaconContext = &(pAd->BeaconContext[i]); struct rt_tx_context *pBeaconContext = &(pAd->BeaconContext[i]);
if (pBeaconContext) if (pBeaconContext)
LM_URB_FREE(pObj, pBeaconContext, sizeof(TX_BUFFER)); LM_URB_FREE(pObj, pBeaconContext, sizeof(struct rt_tx_buffer));
} }
/* Free mgmt frame resource */ /* Free mgmt frame resource */
for (i = 0; i < MGMT_RING_SIZE; i++) { for (i = 0; i < MGMT_RING_SIZE; i++) {
PTX_CONTEXT pMLMEContext = struct rt_tx_context *pMLMEContext =
(PTX_CONTEXT) pAd->MgmtRing.Cell[i].AllocVa; (struct rt_tx_context *)pAd->MgmtRing.Cell[i].AllocVa;
/*LM_URB_FREE(pObj, pMLMEContext, sizeof(TX_BUFFER)); */ /*LM_URB_FREE(pObj, pMLMEContext, sizeof(struct rt_tx_buffer)); */
if (NULL != pAd->MgmtRing.Cell[i].pNdisPacket) { if (NULL != pAd->MgmtRing.Cell[i].pNdisPacket) {
RTMPFreeNdisPacket(pAd, RTMPFreeNdisPacket(pAd,
pAd->MgmtRing.Cell[i].pNdisPacket); pAd->MgmtRing.Cell[i].pNdisPacket);
...@@ -592,9 +592,9 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd) ...@@ -592,9 +592,9 @@ void RTMPFreeTxRxRingMemory(IN PRTMP_ADAPTER pAd)
/* Free Tx frame resource */ /* Free Tx frame resource */
for (acidx = 0; acidx < 4; acidx++) { for (acidx = 0; acidx < 4; acidx++) {
PHT_TX_CONTEXT pHTTXContext = &(pAd->TxContext[acidx]); struct rt_ht_tx_context *pHTTXContext = &(pAd->TxContext[acidx]);
if (pHTTXContext) if (pHTTXContext)
LM_URB_FREE(pObj, pHTTXContext, sizeof(HTTX_BUFFER)); LM_URB_FREE(pObj, pHTTXContext, sizeof(struct rt_httx_buffer));
} }
if (pAd->FragFrame.pFragPacket) if (pAd->FragFrame.pFragPacket)
...@@ -636,7 +636,7 @@ Return Value: ...@@ -636,7 +636,7 @@ Return Value:
Note: Note:
======================================================================== ========================================================================
*/ */
int RTUSBWriteHWMACAddress(IN PRTMP_ADAPTER pAd) int RTUSBWriteHWMACAddress(struct rt_rtmp_adapter *pAd)
{ {
MAC_DW0_STRUC StaMacReg0; MAC_DW0_STRUC StaMacReg0;
MAC_DW1_STRUC StaMacReg1; MAC_DW1_STRUC StaMacReg1;
...@@ -687,7 +687,7 @@ Return Value: ...@@ -687,7 +687,7 @@ Return Value:
Note: Note:
======================================================================== ========================================================================
*/ */
void RT28XXDMADisable(IN RTMP_ADAPTER * pAd) void RT28XXDMADisable(struct rt_rtmp_adapter *pAd)
{ {
/* no use */ /* no use */
} }
...@@ -706,7 +706,7 @@ Return Value: ...@@ -706,7 +706,7 @@ Return Value:
Note: Note:
======================================================================== ========================================================================
*/ */
void RT28XXDMAEnable(IN RTMP_ADAPTER * pAd) void RT28XXDMAEnable(struct rt_rtmp_adapter *pAd)
{ {
WPDMA_GLO_CFG_STRUC GloCfg; WPDMA_GLO_CFG_STRUC GloCfg;
USB_DMA_CFG_STRUC UsbCfg; USB_DMA_CFG_STRUC UsbCfg;
...@@ -767,14 +767,14 @@ Return Value: ...@@ -767,14 +767,14 @@ Return Value:
Note: Note:
======================================================================== ========================================================================
*/ */
void RT28xx_UpdateBeaconToAsic(IN RTMP_ADAPTER * pAd, void RT28xx_UpdateBeaconToAsic(struct rt_rtmp_adapter *pAd,
int apidx, int apidx,
unsigned long FrameLen, unsigned long UpdatePos) unsigned long FrameLen, unsigned long UpdatePos)
{ {
u8 *pBeaconFrame = NULL; u8 *pBeaconFrame = NULL;
u8 *ptr; u8 *ptr;
u32 i, padding; u32 i, padding;
BEACON_SYNC_STRUCT *pBeaconSync = pAd->CommonCfg.pBeaconSync; struct rt_beacon_sync *pBeaconSync = pAd->CommonCfg.pBeaconSync;
u32 longValue; u32 longValue;
/* u16 shortValue; */ /* u16 shortValue; */
BOOLEAN bBcnReq = FALSE; BOOLEAN bBcnReq = FALSE;
...@@ -849,9 +849,9 @@ void RT28xx_UpdateBeaconToAsic(IN RTMP_ADAPTER * pAd, ...@@ -849,9 +849,9 @@ void RT28xx_UpdateBeaconToAsic(IN RTMP_ADAPTER * pAd,
} }
void RTUSBBssBeaconStop(IN RTMP_ADAPTER * pAd) void RTUSBBssBeaconStop(struct rt_rtmp_adapter *pAd)
{ {
BEACON_SYNC_STRUCT *pBeaconSync; struct rt_beacon_sync *pBeaconSync;
int i, offset; int i, offset;
BOOLEAN Cancelled = TRUE; BOOLEAN Cancelled = TRUE;
...@@ -883,10 +883,10 @@ void RTUSBBssBeaconStop(IN RTMP_ADAPTER * pAd) ...@@ -883,10 +883,10 @@ void RTUSBBssBeaconStop(IN RTMP_ADAPTER * pAd)
} }
} }
void RTUSBBssBeaconStart(IN RTMP_ADAPTER * pAd) void RTUSBBssBeaconStart(struct rt_rtmp_adapter *pAd)
{ {
int apidx; int apidx;
BEACON_SYNC_STRUCT *pBeaconSync; struct rt_beacon_sync *pBeaconSync;
/* LARGE_INTEGER tsfTime, deltaTime; */ /* LARGE_INTEGER tsfTime, deltaTime; */
pBeaconSync = pAd->CommonCfg.pBeaconSync; pBeaconSync = pAd->CommonCfg.pBeaconSync;
...@@ -929,17 +929,17 @@ void RTUSBBssBeaconStart(IN RTMP_ADAPTER * pAd) ...@@ -929,17 +929,17 @@ void RTUSBBssBeaconStart(IN RTMP_ADAPTER * pAd)
} }
} }
void RTUSBBssBeaconInit(IN RTMP_ADAPTER * pAd) void RTUSBBssBeaconInit(struct rt_rtmp_adapter *pAd)
{ {
BEACON_SYNC_STRUCT *pBeaconSync; struct rt_beacon_sync *pBeaconSync;
int i; int i;
os_alloc_mem(pAd, (u8 **) (&pAd->CommonCfg.pBeaconSync), os_alloc_mem(pAd, (u8 **) (&pAd->CommonCfg.pBeaconSync),
sizeof(BEACON_SYNC_STRUCT)); sizeof(struct rt_beacon_sync));
/*NdisAllocMemory(pAd->CommonCfg.pBeaconSync, sizeof(BEACON_SYNC_STRUCT), MEM_ALLOC_FLAG); */ /*NdisAllocMemory(pAd->CommonCfg.pBeaconSync, sizeof(struct rt_beacon_sync), MEM_ALLOC_FLAG); */
if (pAd->CommonCfg.pBeaconSync) { if (pAd->CommonCfg.pBeaconSync) {
pBeaconSync = pAd->CommonCfg.pBeaconSync; pBeaconSync = pAd->CommonCfg.pBeaconSync;
NdisZeroMemory(pBeaconSync, sizeof(BEACON_SYNC_STRUCT)); NdisZeroMemory(pBeaconSync, sizeof(struct rt_beacon_sync));
for (i = 0; i < HW_BEACON_MAX_COUNT; i++) { for (i = 0; i < HW_BEACON_MAX_COUNT; i++) {
NdisZeroMemory(pBeaconSync->BeaconBuf[i], NdisZeroMemory(pBeaconSync->BeaconBuf[i],
HW_BEACON_OFFSET); HW_BEACON_OFFSET);
...@@ -954,9 +954,9 @@ void RTUSBBssBeaconInit(IN RTMP_ADAPTER * pAd) ...@@ -954,9 +954,9 @@ void RTUSBBssBeaconInit(IN RTMP_ADAPTER * pAd)
} }
} }
void RTUSBBssBeaconExit(IN RTMP_ADAPTER * pAd) void RTUSBBssBeaconExit(struct rt_rtmp_adapter *pAd)
{ {
BEACON_SYNC_STRUCT *pBeaconSync; struct rt_beacon_sync *pBeaconSync;
BOOLEAN Cancelled = TRUE; BOOLEAN Cancelled = TRUE;
int i; int i;
...@@ -1001,7 +1001,7 @@ void BeaconUpdateExec(void *SystemSpecific1, ...@@ -1001,7 +1001,7 @@ void BeaconUpdateExec(void *SystemSpecific1,
void *FunctionContext, void *FunctionContext,
void *SystemSpecific2, void *SystemSpecific3) void *SystemSpecific2, void *SystemSpecific3)
{ {
PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) FunctionContext; struct rt_rtmp_adapter *pAd = (struct rt_rtmp_adapter *)FunctionContext;
LARGE_INTEGER tsfTime_a; /*, tsfTime_b, deltaTime_exp, deltaTime_ab; */ LARGE_INTEGER tsfTime_a; /*, tsfTime_b, deltaTime_exp, deltaTime_ab; */
u32 delta, delta2MS, period2US, remain, remain_low, remain_high; u32 delta, delta2MS, period2US, remain, remain_low, remain_high;
/* BOOLEAN positive; */ /* BOOLEAN positive; */
...@@ -1038,9 +1038,9 @@ void BeaconUpdateExec(void *SystemSpecific1, ...@@ -1038,9 +1038,9 @@ void BeaconUpdateExec(void *SystemSpecific1,
* 2870 Radio on/off Related functions. * 2870 Radio on/off Related functions.
* *
********************************************************************/ ********************************************************************/
void RT28xxUsbMlmeRadioOn(IN PRTMP_ADAPTER pAd) void RT28xxUsbMlmeRadioOn(struct rt_rtmp_adapter *pAd)
{ {
RTMP_CHIP_OP *pChipOps = &pAd->chipOps; struct rt_rtmp_chip_op *pChipOps = &pAd->chipOps;
DBGPRINT(RT_DEBUG_TRACE, ("RT28xxUsbMlmeRadioOn()\n")); DBGPRINT(RT_DEBUG_TRACE, ("RT28xxUsbMlmeRadioOn()\n"));
...@@ -1068,7 +1068,7 @@ void RT28xxUsbMlmeRadioOn(IN PRTMP_ADAPTER pAd) ...@@ -1068,7 +1068,7 @@ void RT28xxUsbMlmeRadioOn(IN PRTMP_ADAPTER pAd)
RTMPSetLED(pAd, LED_RADIO_ON); RTMPSetLED(pAd, LED_RADIO_ON);
} }
void RT28xxUsbMlmeRadioOFF(IN PRTMP_ADAPTER pAd) void RT28xxUsbMlmeRadioOFF(struct rt_rtmp_adapter *pAd)
{ {
WPDMA_GLO_CFG_STRUC GloCfg; WPDMA_GLO_CFG_STRUC GloCfg;
u32 Value, i; u32 Value, i;
...@@ -1080,14 +1080,14 @@ void RT28xxUsbMlmeRadioOFF(IN PRTMP_ADAPTER pAd) ...@@ -1080,14 +1080,14 @@ void RT28xxUsbMlmeRadioOFF(IN PRTMP_ADAPTER pAd)
/* Clear PMKID cache. */ /* Clear PMKID cache. */
pAd->StaCfg.SavedPMKNum = 0; pAd->StaCfg.SavedPMKNum = 0;
RTMPZeroMemory(pAd->StaCfg.SavedPMK, (PMKID_NO * sizeof(BSSID_INFO))); RTMPZeroMemory(pAd->StaCfg.SavedPMK, (PMKID_NO * sizeof(struct rt_bssid_info)));
/* Link down first if any association exists */ /* Link down first if any association exists */
if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST)) { if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST)) {
if (INFRA_ON(pAd) || ADHOC_ON(pAd)) { if (INFRA_ON(pAd) || ADHOC_ON(pAd)) {
MLME_DISASSOC_REQ_STRUCT DisReq; struct rt_mlme_disassoc_req DisReq;
MLME_QUEUE_ELEM *pMsgElem = struct rt_mlme_queue_elem *pMsgElem =
(MLME_QUEUE_ELEM *) kmalloc(sizeof(MLME_QUEUE_ELEM), (struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
MEM_ALLOC_FLAG); MEM_ALLOC_FLAG);
if (pMsgElem) { if (pMsgElem) {
...@@ -1098,10 +1098,10 @@ void RT28xxUsbMlmeRadioOFF(IN PRTMP_ADAPTER pAd) ...@@ -1098,10 +1098,10 @@ void RT28xxUsbMlmeRadioOFF(IN PRTMP_ADAPTER pAd)
pMsgElem->Machine = ASSOC_STATE_MACHINE; pMsgElem->Machine = ASSOC_STATE_MACHINE;
pMsgElem->MsgType = MT2_MLME_DISASSOC_REQ; pMsgElem->MsgType = MT2_MLME_DISASSOC_REQ;
pMsgElem->MsgLen = pMsgElem->MsgLen =
sizeof(MLME_DISASSOC_REQ_STRUCT); sizeof(struct rt_mlme_disassoc_req);
NdisMoveMemory(pMsgElem->Msg, &DisReq, NdisMoveMemory(pMsgElem->Msg, &DisReq,
sizeof sizeof
(MLME_DISASSOC_REQ_STRUCT)); (struct rt_mlme_disassoc_req));
MlmeDisassocReqAction(pAd, pMsgElem); MlmeDisassocReqAction(pAd, pMsgElem);
kfree(pMsgElem); kfree(pMsgElem);
......
drivers/staging/rt2860/common/cmm_sanity.c
浏览文件 @ 62eb734b
...@@ -58,14 +58,14 @@ extern u8 WPS_OUI[]; ...@@ -58,14 +58,14 @@ extern u8 WPS_OUI[];
========================================================================== ==========================================================================
*/ */
BOOLEAN MlmeAddBAReqSanity(IN PRTMP_ADAPTER pAd, BOOLEAN MlmeAddBAReqSanity(struct rt_rtmp_adapter *pAd,
void * Msg, unsigned long MsgLen, u8 *pAddr2) void * Msg, unsigned long MsgLen, u8 *pAddr2)
{ {
PMLME_ADDBA_REQ_STRUCT pInfo; struct rt_mlme_addba_req *pInfo;
pInfo = (MLME_ADDBA_REQ_STRUCT *) Msg; pInfo = (struct rt_mlme_addba_req *)Msg;
if ((MsgLen != sizeof(MLME_ADDBA_REQ_STRUCT))) { if ((MsgLen != sizeof(struct rt_mlme_addba_req))) {
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("MlmeAddBAReqSanity fail - message lenght not correct.\n")); ("MlmeAddBAReqSanity fail - message lenght not correct.\n"));
return FALSE; return FALSE;
...@@ -97,12 +97,12 @@ BOOLEAN MlmeAddBAReqSanity(IN PRTMP_ADAPTER pAd, ...@@ -97,12 +97,12 @@ BOOLEAN MlmeAddBAReqSanity(IN PRTMP_ADAPTER pAd,
========================================================================== ==========================================================================
*/ */
BOOLEAN MlmeDelBAReqSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned long MsgLen) BOOLEAN MlmeDelBAReqSanity(struct rt_rtmp_adapter *pAd, void * Msg, unsigned long MsgLen)
{ {
MLME_DELBA_REQ_STRUCT *pInfo; struct rt_mlme_delba_req *pInfo;
pInfo = (MLME_DELBA_REQ_STRUCT *) Msg; pInfo = (struct rt_mlme_delba_req *)Msg;
if ((MsgLen != sizeof(MLME_DELBA_REQ_STRUCT))) { if ((MsgLen != sizeof(struct rt_mlme_delba_req))) {
DBGPRINT(RT_DEBUG_ERROR, DBGPRINT(RT_DEBUG_ERROR,
("MlmeDelBAReqSanity fail - message lenght not correct.\n")); ("MlmeDelBAReqSanity fail - message lenght not correct.\n"));
return FALSE; return FALSE;
...@@ -131,14 +131,14 @@ BOOLEAN MlmeDelBAReqSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned long MsgLe ...@@ -131,14 +131,14 @@ BOOLEAN MlmeDelBAReqSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned long MsgLe
return TRUE; return TRUE;
} }
BOOLEAN PeerAddBAReqActionSanity(IN PRTMP_ADAPTER pAd, BOOLEAN PeerAddBAReqActionSanity(struct rt_rtmp_adapter *pAd,
void * pMsg, void * pMsg,
unsigned long MsgLen, u8 *pAddr2) unsigned long MsgLen, u8 *pAddr2)
{ {
PFRAME_802_11 pFrame = (PFRAME_802_11) pMsg; struct rt_frame_802_11 * pFrame = (struct rt_frame_802_11 *) pMsg;
PFRAME_ADDBA_REQ pAddFrame; struct rt_frame_addba_req * pAddFrame;
pAddFrame = (PFRAME_ADDBA_REQ) (pMsg); pAddFrame = (struct rt_frame_addba_req *) (pMsg);
if (MsgLen < (sizeof(FRAME_ADDBA_REQ))) { if (MsgLen < (sizeof(struct rt_frame_addba_req))) {
DBGPRINT(RT_DEBUG_ERROR, DBGPRINT(RT_DEBUG_ERROR,
("PeerAddBAReqActionSanity: ADDBA Request frame length size = %ld incorrect\n", ("PeerAddBAReqActionSanity: ADDBA Request frame length size = %ld incorrect\n",
MsgLen)); MsgLen));
...@@ -171,13 +171,13 @@ BOOLEAN PeerAddBAReqActionSanity(IN PRTMP_ADAPTER pAd, ...@@ -171,13 +171,13 @@ BOOLEAN PeerAddBAReqActionSanity(IN PRTMP_ADAPTER pAd,
return TRUE; return TRUE;
} }
BOOLEAN PeerAddBARspActionSanity(IN PRTMP_ADAPTER pAd, BOOLEAN PeerAddBARspActionSanity(struct rt_rtmp_adapter *pAd,
void * pMsg, unsigned long MsgLen) void * pMsg, unsigned long MsgLen)
{ {
PFRAME_ADDBA_RSP pAddFrame; struct rt_frame_addba_rsp * pAddFrame;
pAddFrame = (PFRAME_ADDBA_RSP) (pMsg); pAddFrame = (struct rt_frame_addba_rsp *) (pMsg);
if (MsgLen < (sizeof(FRAME_ADDBA_RSP))) { if (MsgLen < (sizeof(struct rt_frame_addba_rsp))) {
DBGPRINT(RT_DEBUG_ERROR, DBGPRINT(RT_DEBUG_ERROR,
("PeerAddBARspActionSanity: ADDBA Response frame length size = %ld incorrect\n", ("PeerAddBARspActionSanity: ADDBA Response frame length size = %ld incorrect\n",
MsgLen)); MsgLen));
...@@ -206,18 +206,18 @@ BOOLEAN PeerAddBARspActionSanity(IN PRTMP_ADAPTER pAd, ...@@ -206,18 +206,18 @@ BOOLEAN PeerAddBARspActionSanity(IN PRTMP_ADAPTER pAd,
} }
BOOLEAN PeerDelBAActionSanity(IN PRTMP_ADAPTER pAd, BOOLEAN PeerDelBAActionSanity(struct rt_rtmp_adapter *pAd,
u8 Wcid, void * pMsg, unsigned long MsgLen) u8 Wcid, void * pMsg, unsigned long MsgLen)
{ {
/*PFRAME_802_11 pFrame = (PFRAME_802_11)pMsg; */ /*struct rt_frame_802_11 * pFrame = (struct rt_frame_802_11 *)pMsg; */
PFRAME_DELBA_REQ pDelFrame; struct rt_frame_delba_req * pDelFrame;
if (MsgLen != (sizeof(FRAME_DELBA_REQ))) if (MsgLen != (sizeof(struct rt_frame_delba_req)))
return FALSE; return FALSE;
if (Wcid >= MAX_LEN_OF_MAC_TABLE) if (Wcid >= MAX_LEN_OF_MAC_TABLE)
return FALSE; return FALSE;
pDelFrame = (PFRAME_DELBA_REQ) (pMsg); pDelFrame = (struct rt_frame_delba_req *) (pMsg);
*(u16 *) (&pDelFrame->DelbaParm) = *(u16 *) (&pDelFrame->DelbaParm) =
cpu2le16(*(u16 *) (&pDelFrame->DelbaParm)); cpu2le16(*(u16 *) (&pDelFrame->DelbaParm));
...@@ -240,14 +240,14 @@ BOOLEAN PeerDelBAActionSanity(IN PRTMP_ADAPTER pAd, ...@@ -240,14 +240,14 @@ BOOLEAN PeerDelBAActionSanity(IN PRTMP_ADAPTER pAd,
========================================================================== ==========================================================================
*/ */
BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned long MsgLen, u8 MsgChannel, u8 *pAddr2, u8 *pBssid, char Ssid[], u8 * pSsidLen, u8 * pBssType, u16 * pBeaconPeriod, u8 * pChannel, u8 * pNewChannel, OUT LARGE_INTEGER * pTimestamp, OUT CF_PARM * pCfParm, u16 * pAtimWin, u16 * pCapabilityInfo, u8 * pErp, u8 * pDtimCount, u8 * pDtimPeriod, u8 * pBcastFlag, u8 * pMessageToMe, u8 SupRate[], u8 * pSupRateLen, u8 ExtRate[], u8 * pExtRateLen, u8 * pCkipFlag, u8 * pAironetCellPowerLimit, OUT PEDCA_PARM pEdcaParm, OUT PQBSS_LOAD_PARM pQbssLoad, OUT PQOS_CAPABILITY_PARM pQosCapability, unsigned long * pRalinkIe, u8 * pHtCapabilityLen, u8 * pPreNHtCapabilityLen, OUT HT_CAPABILITY_IE * pHtCapability, u8 * AddHtInfoLen, OUT ADD_HT_INFO_IE * AddHtInfo, u8 * NewExtChannelOffset, /* Ht extension channel offset(above or below) */ BOOLEAN PeerBeaconAndProbeRspSanity(struct rt_rtmp_adapter *pAd, void * Msg, unsigned long MsgLen, u8 MsgChannel, u8 *pAddr2, u8 *pBssid, char Ssid[], u8 * pSsidLen, u8 * pBssType, u16 * pBeaconPeriod, u8 * pChannel, u8 * pNewChannel, OUT LARGE_INTEGER * pTimestamp, struct rt_cf_parm * pCfParm, u16 * pAtimWin, u16 * pCapabilityInfo, u8 * pErp, u8 * pDtimCount, u8 * pDtimPeriod, u8 * pBcastFlag, u8 * pMessageToMe, u8 SupRate[], u8 * pSupRateLen, u8 ExtRate[], u8 * pExtRateLen, u8 * pCkipFlag, u8 * pAironetCellPowerLimit, struct rt_edca_parm *pEdcaParm, struct rt_qbss_load_parm *pQbssLoad, struct rt_qos_capability_parm *pQosCapability, unsigned long * pRalinkIe, u8 * pHtCapabilityLen, u8 * pPreNHtCapabilityLen, struct rt_ht_capability_ie * pHtCapability, u8 * AddHtInfoLen, struct rt_add_ht_info_ie * AddHtInfo, u8 * NewExtChannelOffset, /* Ht extension channel offset(above or below) */
u16 * LengthVIE, u16 * LengthVIE,
OUT PNDIS_802_11_VARIABLE_IEs pVIE) struct rt_ndis_802_11_variable_ies *pVIE)
{ {
u8 *Ptr; u8 *Ptr;
u8 TimLen; u8 TimLen;
PFRAME_802_11 pFrame; struct rt_frame_802_11 * pFrame;
PEID_STRUCT pEid; struct rt_eid * pEid;
u8 SubType; u8 SubType;
u8 Sanity; u8 Sanity;
/*u8 ECWMin, ECWMax; */ /*u8 ECWMin, ECWMax; */
...@@ -284,7 +284,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l ...@@ -284,7 +284,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l
pEdcaParm->bValid = FALSE; /* default: no IE_EDCA_PARAMETER found */ pEdcaParm->bValid = FALSE; /* default: no IE_EDCA_PARAMETER found */
pQosCapability->bValid = FALSE; /* default: no IE_QOS_CAPABILITY found */ pQosCapability->bValid = FALSE; /* default: no IE_QOS_CAPABILITY found */
pFrame = (PFRAME_802_11) Msg; pFrame = (struct rt_frame_802_11 *) Msg;
/* get subtype from header */ /* get subtype from header */
SubType = (u8)pFrame->Hdr.FC.SubType; SubType = (u8)pFrame->Hdr.FC.SubType;
...@@ -320,7 +320,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l ...@@ -320,7 +320,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l
else else
*pBssType = BSS_ADHOC; *pBssType = BSS_ADHOC;
pEid = (PEID_STRUCT) Ptr; pEid = (struct rt_eid *) Ptr;
/* get variable fields from payload and advance the pointer */ /* get variable fields from payload and advance the pointer */
while ((Length + 2 + pEid->Len) <= MsgLen) { while ((Length + 2 + pEid->Len) <= MsgLen) {
...@@ -374,7 +374,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l ...@@ -374,7 +374,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l
if (pEid->Len >= SIZE_HT_CAP_IE) /*Note: allow extension.!! */ if (pEid->Len >= SIZE_HT_CAP_IE) /*Note: allow extension.!! */
{ {
NdisMoveMemory(pHtCapability, pEid->Octet, NdisMoveMemory(pHtCapability, pEid->Octet,
sizeof(HT_CAPABILITY_IE)); sizeof(struct rt_ht_capability_ie));
*pHtCapabilityLen = SIZE_HT_CAP_IE; /* Nnow we only support 26 bytes. */ *pHtCapabilityLen = SIZE_HT_CAP_IE; /* Nnow we only support 26 bytes. */
*(u16 *) (&pHtCapability->HtCapInfo) = *(u16 *) (&pHtCapability->HtCapInfo) =
...@@ -401,11 +401,11 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l ...@@ -401,11 +401,11 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l
break; break;
case IE_ADD_HT: case IE_ADD_HT:
if (pEid->Len >= sizeof(ADD_HT_INFO_IE)) { if (pEid->Len >= sizeof(struct rt_add_ht_info_ie)) {
/* This IE allows extension, but we can ignore extra bytes beyond our knowledge , so only */ /* This IE allows extension, but we can ignore extra bytes beyond our knowledge , so only */
/* copy first sizeof(ADD_HT_INFO_IE) */ /* copy first sizeof(struct rt_add_ht_info_ie) */
NdisMoveMemory(AddHtInfo, pEid->Octet, NdisMoveMemory(AddHtInfo, pEid->Octet,
sizeof(ADD_HT_INFO_IE)); sizeof(struct rt_add_ht_info_ie));
*AddHtInfoLen = SIZE_ADD_HT_INFO_IE; *AddHtInfoLen = SIZE_ADD_HT_INFO_IE;
CtrlChannel = AddHtInfo->ControlChan; CtrlChannel = AddHtInfo->ControlChan;
...@@ -516,14 +516,14 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l ...@@ -516,14 +516,14 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l
if ((pEid->Octet[3] == OUI_BROADCOM_HT) && (pEid->Len >= 30)) if ((pEid->Octet[3] == OUI_BROADCOM_HT) && (pEid->Len >= 30))
{ {
{ {
NdisMoveMemory(pHtCapability, &pEid->Octet[4], sizeof(HT_CAPABILITY_IE)); NdisMoveMemory(pHtCapability, &pEid->Octet[4], sizeof(struct rt_ht_capability_ie));
*pHtCapabilityLen = SIZE_HT_CAP_IE; // Nnow we only support 26 bytes. *pHtCapabilityLen = SIZE_HT_CAP_IE; // Nnow we only support 26 bytes.
} }
} }
if ((pEid->Octet[3] == OUI_BROADCOM_HT) && (pEid->Len >= 26)) if ((pEid->Octet[3] == OUI_BROADCOM_HT) && (pEid->Len >= 26))
{ {
{ {
NdisMoveMemory(AddHtInfo, &pEid->Octet[4], sizeof(ADD_HT_INFO_IE)); NdisMoveMemory(AddHtInfo, &pEid->Octet[4], sizeof(struct rt_add_ht_info_ie));
*AddHtInfoLen = SIZE_ADD_HT_INFO_IE; // Nnow we only support 26 bytes. *AddHtInfoLen = SIZE_ADD_HT_INFO_IE; // Nnow we only support 26 bytes.
} }
} }
...@@ -552,7 +552,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l ...@@ -552,7 +552,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l
NdisMoveMemory(pHtCapability, NdisMoveMemory(pHtCapability,
&pEid->Octet[4], &pEid->Octet[4],
sizeof sizeof
(HT_CAPABILITY_IE)); (struct rt_ht_capability_ie));
*pPreNHtCapabilityLen = SIZE_HT_CAP_IE; *pPreNHtCapabilityLen = SIZE_HT_CAP_IE;
} }
...@@ -560,7 +560,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l ...@@ -560,7 +560,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l
&& (pEid->Len >= 26)) { && (pEid->Len >= 26)) {
NdisMoveMemory(AddHtInfo, NdisMoveMemory(AddHtInfo,
&pEid->Octet[4], &pEid->Octet[4],
sizeof(ADD_HT_INFO_IE)); sizeof(struct rt_add_ht_info_ie));
*AddHtInfoLen = SIZE_ADD_HT_INFO_IE; *AddHtInfoLen = SIZE_ADD_HT_INFO_IE;
} }
} else if (NdisEqualMemory(pEid->Octet, WPA_OUI, 4)) { } else if (NdisEqualMemory(pEid->Octet, WPA_OUI, 4)) {
...@@ -696,7 +696,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l ...@@ -696,7 +696,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l
} }
Length = Length + 2 + pEid->Len; /* Eid[1] + Len[1]+ content[Len] */ Length = Length + 2 + pEid->Len; /* Eid[1] + Len[1]+ content[Len] */
pEid = (PEID_STRUCT) ((u8 *) pEid + 2 + pEid->Len); pEid = (struct rt_eid *) ((u8 *) pEid + 2 + pEid->Len);
} }
/* For some 11a AP. it did not have the channel EID, patch here */ /* For some 11a AP. it did not have the channel EID, patch here */
...@@ -730,16 +730,16 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l ...@@ -730,16 +730,16 @@ BOOLEAN PeerBeaconAndProbeRspSanity(IN PRTMP_ADAPTER pAd, void * Msg, unsigned l
TRUE if all parameters are OK, FALSE otherwise TRUE if all parameters are OK, FALSE otherwise
========================================================================== ==========================================================================
*/ */
BOOLEAN MlmeScanReqSanity(IN PRTMP_ADAPTER pAd, BOOLEAN MlmeScanReqSanity(struct rt_rtmp_adapter *pAd,
void * Msg, void * Msg,
unsigned long MsgLen, unsigned long MsgLen,
u8 * pBssType, u8 * pBssType,
char Ssid[], char Ssid[],
u8 * pSsidLen, u8 * pScanType) u8 * pSsidLen, u8 * pScanType)
{ {
MLME_SCAN_REQ_STRUCT *Info; struct rt_mlme_scan_req *Info;
Info = (MLME_SCAN_REQ_STRUCT *) (Msg); Info = (struct rt_mlme_scan_req *)(Msg);
*pBssType = Info->BssType; *pBssType = Info->BssType;
*pSsidLen = Info->SsidLen; *pSsidLen = Info->SsidLen;
NdisMoveMemory(Ssid, Info->Ssid, *pSsidLen); NdisMoveMemory(Ssid, Info->Ssid, *pSsidLen);
...@@ -757,7 +757,7 @@ BOOLEAN MlmeScanReqSanity(IN PRTMP_ADAPTER pAd, ...@@ -757,7 +757,7 @@ BOOLEAN MlmeScanReqSanity(IN PRTMP_ADAPTER pAd,
} }
/* IRQL = DISPATCH_LEVEL */ /* IRQL = DISPATCH_LEVEL */
u8 ChannelSanity(IN PRTMP_ADAPTER pAd, u8 channel) u8 ChannelSanity(struct rt_rtmp_adapter *pAd, u8 channel)
{ {
int i; int i;
...@@ -779,12 +779,12 @@ u8 ChannelSanity(IN PRTMP_ADAPTER pAd, u8 channel) ...@@ -779,12 +779,12 @@ u8 ChannelSanity(IN PRTMP_ADAPTER pAd, u8 channel)
========================================================================== ==========================================================================
*/ */
BOOLEAN PeerDeauthSanity(IN PRTMP_ADAPTER pAd, BOOLEAN PeerDeauthSanity(struct rt_rtmp_adapter *pAd,
void * Msg, void * Msg,
unsigned long MsgLen, unsigned long MsgLen,
u8 *pAddr2, u16 * pReason) u8 *pAddr2, u16 * pReason)
{ {
PFRAME_802_11 pFrame = (PFRAME_802_11) Msg; struct rt_frame_802_11 * pFrame = (struct rt_frame_802_11 *) Msg;
COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2); COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2);
NdisMoveMemory(pReason, &pFrame->Octet[0], 2); NdisMoveMemory(pReason, &pFrame->Octet[0], 2);
...@@ -803,7 +803,7 @@ BOOLEAN PeerDeauthSanity(IN PRTMP_ADAPTER pAd, ...@@ -803,7 +803,7 @@ BOOLEAN PeerDeauthSanity(IN PRTMP_ADAPTER pAd,
========================================================================== ==========================================================================
*/ */
BOOLEAN PeerAuthSanity(IN PRTMP_ADAPTER pAd, BOOLEAN PeerAuthSanity(struct rt_rtmp_adapter *pAd,
void * Msg, void * Msg,
unsigned long MsgLen, unsigned long MsgLen,
u8 *pAddr, u8 *pAddr,
...@@ -811,7 +811,7 @@ BOOLEAN PeerAuthSanity(IN PRTMP_ADAPTER pAd, ...@@ -811,7 +811,7 @@ BOOLEAN PeerAuthSanity(IN PRTMP_ADAPTER pAd,
u16 * pSeq, u16 * pSeq,
u16 * pStatus, char * pChlgText) u16 * pStatus, char * pChlgText)
{ {
PFRAME_802_11 pFrame = (PFRAME_802_11) Msg; struct rt_frame_802_11 * pFrame = (struct rt_frame_802_11 *) Msg;
COPY_MAC_ADDR(pAddr, pFrame->Hdr.Addr2); COPY_MAC_ADDR(pAddr, pFrame->Hdr.Addr2);
NdisMoveMemory(pAlg, &pFrame->Octet[0], 2); NdisMoveMemory(pAlg, &pFrame->Octet[0], 2);
...@@ -853,15 +853,15 @@ BOOLEAN PeerAuthSanity(IN PRTMP_ADAPTER pAd, ...@@ -853,15 +853,15 @@ BOOLEAN PeerAuthSanity(IN PRTMP_ADAPTER pAd,
TRUE if all parameters are OK, FALSE otherwise TRUE if all parameters are OK, FALSE otherwise
========================================================================== ==========================================================================
*/ */
BOOLEAN MlmeAuthReqSanity(IN PRTMP_ADAPTER pAd, BOOLEAN MlmeAuthReqSanity(struct rt_rtmp_adapter *pAd,
void * Msg, void * Msg,
unsigned long MsgLen, unsigned long MsgLen,
u8 *pAddr, u8 *pAddr,
unsigned long * pTimeout, u16 * pAlg) unsigned long * pTimeout, u16 * pAlg)
{ {
MLME_AUTH_REQ_STRUCT *pInfo; struct rt_mlme_auth_req *pInfo;
pInfo = (MLME_AUTH_REQ_STRUCT *) Msg; pInfo = (struct rt_mlme_auth_req *)Msg;
COPY_MAC_ADDR(pAddr, pInfo->Addr); COPY_MAC_ADDR(pAddr, pInfo->Addr);
*pTimeout = pInfo->Timeout; *pTimeout = pInfo->Timeout;
*pAlg = pInfo->Alg; *pAlg = pInfo->Alg;
...@@ -887,16 +887,16 @@ BOOLEAN MlmeAuthReqSanity(IN PRTMP_ADAPTER pAd, ...@@ -887,16 +887,16 @@ BOOLEAN MlmeAuthReqSanity(IN PRTMP_ADAPTER pAd,
========================================================================== ==========================================================================
*/ */
BOOLEAN MlmeAssocReqSanity(IN PRTMP_ADAPTER pAd, BOOLEAN MlmeAssocReqSanity(struct rt_rtmp_adapter *pAd,
void * Msg, void * Msg,
unsigned long MsgLen, unsigned long MsgLen,
u8 *pApAddr, u8 *pApAddr,
u16 * pCapabilityInfo, u16 * pCapabilityInfo,
unsigned long * pTimeout, u16 * pListenIntv) unsigned long * pTimeout, u16 * pListenIntv)
{ {
MLME_ASSOC_REQ_STRUCT *pInfo; struct rt_mlme_assoc_req *pInfo;
pInfo = (MLME_ASSOC_REQ_STRUCT *) Msg; pInfo = (struct rt_mlme_assoc_req *)Msg;
*pTimeout = pInfo->Timeout; /* timeout */ *pTimeout = pInfo->Timeout; /* timeout */
COPY_MAC_ADDR(pApAddr, pInfo->Addr); /* AP address */ COPY_MAC_ADDR(pApAddr, pInfo->Addr); /* AP address */
*pCapabilityInfo = pInfo->CapabilityInfo; /* capability info */ *pCapabilityInfo = pInfo->CapabilityInfo; /* capability info */
...@@ -916,12 +916,12 @@ BOOLEAN MlmeAssocReqSanity(IN PRTMP_ADAPTER pAd, ...@@ -916,12 +916,12 @@ BOOLEAN MlmeAssocReqSanity(IN PRTMP_ADAPTER pAd,
========================================================================== ==========================================================================
*/ */
BOOLEAN PeerDisassocSanity(IN PRTMP_ADAPTER pAd, BOOLEAN PeerDisassocSanity(struct rt_rtmp_adapter *pAd,
void * Msg, void * Msg,
unsigned long MsgLen, unsigned long MsgLen,
u8 *pAddr2, u16 * pReason) u8 *pAddr2, u16 * pReason)
{ {
PFRAME_802_11 pFrame = (PFRAME_802_11) Msg; struct rt_frame_802_11 * pFrame = (struct rt_frame_802_11 *) Msg;
COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2); COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2);
NdisMoveMemory(pReason, &pFrame->Octet[0], 2); NdisMoveMemory(pReason, &pFrame->Octet[0], 2);
...@@ -946,7 +946,7 @@ BOOLEAN PeerDisassocSanity(IN PRTMP_ADAPTER pAd, ...@@ -946,7 +946,7 @@ BOOLEAN PeerDisassocSanity(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
NDIS_802_11_NETWORK_TYPE NetworkTypeInUseSanity(IN PBSS_ENTRY pBss) NDIS_802_11_NETWORK_TYPE NetworkTypeInUseSanity(struct rt_bss_entry *pBss)
{ {
NDIS_802_11_NETWORK_TYPE NetWorkType; NDIS_802_11_NETWORK_TYPE NetWorkType;
u8 rate, i; u8 rate, i;
...@@ -1012,15 +1012,15 @@ NDIS_802_11_NETWORK_TYPE NetworkTypeInUseSanity(IN PBSS_ENTRY pBss) ...@@ -1012,15 +1012,15 @@ NDIS_802_11_NETWORK_TYPE NetworkTypeInUseSanity(IN PBSS_ENTRY pBss)
FALSE otherwise FALSE otherwise
========================================================================== ==========================================================================
*/ */
BOOLEAN PeerWpaMessageSanity(IN PRTMP_ADAPTER pAd, BOOLEAN PeerWpaMessageSanity(struct rt_rtmp_adapter *pAd,
IN PEAPOL_PACKET pMsg, struct rt_eapol_packet * pMsg,
unsigned long MsgLen, unsigned long MsgLen,
u8 MsgType, IN MAC_TABLE_ENTRY * pEntry) u8 MsgType, struct rt_mac_table_entry *pEntry)
{ {
u8 mic[LEN_KEY_DESC_MIC], digest[80], KEYDATA[MAX_LEN_OF_RSNIE]; u8 mic[LEN_KEY_DESC_MIC], digest[80], KEYDATA[MAX_LEN_OF_RSNIE];
BOOLEAN bReplayDiff = FALSE; BOOLEAN bReplayDiff = FALSE;
BOOLEAN bWPA2 = FALSE; BOOLEAN bWPA2 = FALSE;
KEY_INFO EapolKeyInfo; struct rt_key_info EapolKeyInfo;
u8 GroupKeyIndex = 0; u8 GroupKeyIndex = 0;
NdisZeroMemory(mic, sizeof(mic)); NdisZeroMemory(mic, sizeof(mic));
...@@ -1029,7 +1029,7 @@ BOOLEAN PeerWpaMessageSanity(IN PRTMP_ADAPTER pAd, ...@@ -1029,7 +1029,7 @@ BOOLEAN PeerWpaMessageSanity(IN PRTMP_ADAPTER pAd,
NdisZeroMemory((u8 *)& EapolKeyInfo, sizeof(EapolKeyInfo)); NdisZeroMemory((u8 *)& EapolKeyInfo, sizeof(EapolKeyInfo));
NdisMoveMemory((u8 *)& EapolKeyInfo, NdisMoveMemory((u8 *)& EapolKeyInfo,
(u8 *)& pMsg->KeyDesc.KeyInfo, sizeof(KEY_INFO)); (u8 *)& pMsg->KeyDesc.KeyInfo, sizeof(struct rt_key_info));
*((u16 *) & EapolKeyInfo) = cpu2le16(*((u16 *) & EapolKeyInfo)); *((u16 *) & EapolKeyInfo) = cpu2le16(*((u16 *) & EapolKeyInfo));
......
drivers/staging/rt2860/common/cmm_sync.c
浏览文件 @ 62eb734b
...@@ -105,13 +105,13 @@ u8 BaSizeArray[4] = { 8, 16, 32, 64 }; ...@@ -105,13 +105,13 @@ u8 BaSizeArray[4] = { 8, 16, 32, 64 };
========================================================================== ==========================================================================
*/ */
void BuildChannelList(IN PRTMP_ADAPTER pAd) void BuildChannelList(struct rt_rtmp_adapter *pAd)
{ {
u8 i, j, index = 0, num = 0; u8 i, j, index = 0, num = 0;
u8 *pChannelList = NULL; u8 *pChannelList = NULL;
NdisZeroMemory(pAd->ChannelList, NdisZeroMemory(pAd->ChannelList,
MAX_NUM_OF_CHANNELS * sizeof(CHANNEL_TX_POWER)); MAX_NUM_OF_CHANNELS * sizeof(struct rt_channel_tx_power));
/* if not 11a-only mode, channel list starts from 2.4Ghz band */ /* if not 11a-only mode, channel list starts from 2.4Ghz band */
if ((pAd->CommonCfg.PhyMode != PHY_11A) if ((pAd->CommonCfg.PhyMode != PHY_11A)
...@@ -122,63 +122,63 @@ void BuildChannelList(IN PRTMP_ADAPTER pAd) ...@@ -122,63 +122,63 @@ void BuildChannelList(IN PRTMP_ADAPTER pAd)
case REGION_0_BG_BAND: /* 1 -11 */ case REGION_0_BG_BAND: /* 1 -11 */
NdisMoveMemory(&pAd->ChannelList[index], NdisMoveMemory(&pAd->ChannelList[index],
&pAd->TxPower[BG_BAND_REGION_0_START], &pAd->TxPower[BG_BAND_REGION_0_START],
sizeof(CHANNEL_TX_POWER) * sizeof(struct rt_channel_tx_power) *
BG_BAND_REGION_0_SIZE); BG_BAND_REGION_0_SIZE);
index += BG_BAND_REGION_0_SIZE; index += BG_BAND_REGION_0_SIZE;
break; break;
case REGION_1_BG_BAND: /* 1 - 13 */ case REGION_1_BG_BAND: /* 1 - 13 */
NdisMoveMemory(&pAd->ChannelList[index], NdisMoveMemory(&pAd->ChannelList[index],
&pAd->TxPower[BG_BAND_REGION_1_START], &pAd->TxPower[BG_BAND_REGION_1_START],
sizeof(CHANNEL_TX_POWER) * sizeof(struct rt_channel_tx_power) *
BG_BAND_REGION_1_SIZE); BG_BAND_REGION_1_SIZE);
index += BG_BAND_REGION_1_SIZE; index += BG_BAND_REGION_1_SIZE;
break; break;
case REGION_2_BG_BAND: /* 10 - 11 */ case REGION_2_BG_BAND: /* 10 - 11 */
NdisMoveMemory(&pAd->ChannelList[index], NdisMoveMemory(&pAd->ChannelList[index],
&pAd->TxPower[BG_BAND_REGION_2_START], &pAd->TxPower[BG_BAND_REGION_2_START],
sizeof(CHANNEL_TX_POWER) * sizeof(struct rt_channel_tx_power) *
BG_BAND_REGION_2_SIZE); BG_BAND_REGION_2_SIZE);
index += BG_BAND_REGION_2_SIZE; index += BG_BAND_REGION_2_SIZE;
break; break;
case REGION_3_BG_BAND: /* 10 - 13 */ case REGION_3_BG_BAND: /* 10 - 13 */
NdisMoveMemory(&pAd->ChannelList[index], NdisMoveMemory(&pAd->ChannelList[index],
&pAd->TxPower[BG_BAND_REGION_3_START], &pAd->TxPower[BG_BAND_REGION_3_START],
sizeof(CHANNEL_TX_POWER) * sizeof(struct rt_channel_tx_power) *
BG_BAND_REGION_3_SIZE); BG_BAND_REGION_3_SIZE);
index += BG_BAND_REGION_3_SIZE; index += BG_BAND_REGION_3_SIZE;
break; break;
case REGION_4_BG_BAND: /* 14 */ case REGION_4_BG_BAND: /* 14 */
NdisMoveMemory(&pAd->ChannelList[index], NdisMoveMemory(&pAd->ChannelList[index],
&pAd->TxPower[BG_BAND_REGION_4_START], &pAd->TxPower[BG_BAND_REGION_4_START],
sizeof(CHANNEL_TX_POWER) * sizeof(struct rt_channel_tx_power) *
BG_BAND_REGION_4_SIZE); BG_BAND_REGION_4_SIZE);
index += BG_BAND_REGION_4_SIZE; index += BG_BAND_REGION_4_SIZE;
break; break;
case REGION_5_BG_BAND: /* 1 - 14 */ case REGION_5_BG_BAND: /* 1 - 14 */
NdisMoveMemory(&pAd->ChannelList[index], NdisMoveMemory(&pAd->ChannelList[index],
&pAd->TxPower[BG_BAND_REGION_5_START], &pAd->TxPower[BG_BAND_REGION_5_START],
sizeof(CHANNEL_TX_POWER) * sizeof(struct rt_channel_tx_power) *
BG_BAND_REGION_5_SIZE); BG_BAND_REGION_5_SIZE);
index += BG_BAND_REGION_5_SIZE; index += BG_BAND_REGION_5_SIZE;
break; break;
case REGION_6_BG_BAND: /* 3 - 9 */ case REGION_6_BG_BAND: /* 3 - 9 */
NdisMoveMemory(&pAd->ChannelList[index], NdisMoveMemory(&pAd->ChannelList[index],
&pAd->TxPower[BG_BAND_REGION_6_START], &pAd->TxPower[BG_BAND_REGION_6_START],
sizeof(CHANNEL_TX_POWER) * sizeof(struct rt_channel_tx_power) *
BG_BAND_REGION_6_SIZE); BG_BAND_REGION_6_SIZE);
index += BG_BAND_REGION_6_SIZE; index += BG_BAND_REGION_6_SIZE;
break; break;
case REGION_7_BG_BAND: /* 5 - 13 */ case REGION_7_BG_BAND: /* 5 - 13 */
NdisMoveMemory(&pAd->ChannelList[index], NdisMoveMemory(&pAd->ChannelList[index],
&pAd->TxPower[BG_BAND_REGION_7_START], &pAd->TxPower[BG_BAND_REGION_7_START],
sizeof(CHANNEL_TX_POWER) * sizeof(struct rt_channel_tx_power) *
BG_BAND_REGION_7_SIZE); BG_BAND_REGION_7_SIZE);
index += BG_BAND_REGION_7_SIZE; index += BG_BAND_REGION_7_SIZE;
break; break;
case REGION_31_BG_BAND: /* 1 - 14 */ case REGION_31_BG_BAND: /* 1 - 14 */
NdisMoveMemory(&pAd->ChannelList[index], NdisMoveMemory(&pAd->ChannelList[index],
&pAd->TxPower[BG_BAND_REGION_31_START], &pAd->TxPower[BG_BAND_REGION_31_START],
sizeof(CHANNEL_TX_POWER) * sizeof(struct rt_channel_tx_power) *
BG_BAND_REGION_31_SIZE); BG_BAND_REGION_31_SIZE);
index += BG_BAND_REGION_31_SIZE; index += BG_BAND_REGION_31_SIZE;
break; break;
...@@ -315,7 +315,7 @@ void BuildChannelList(IN PRTMP_ADAPTER pAd) ...@@ -315,7 +315,7 @@ void BuildChannelList(IN PRTMP_ADAPTER pAd)
+ i], + i],
&pAd->TxPower[j], &pAd->TxPower[j],
sizeof sizeof
(CHANNEL_TX_POWER)); (struct rt_channel_tx_power));
} }
for (j = 0; j < 15; j++) { for (j = 0; j < 15; j++) {
if (pChannelList[i] == RadarCh[j]) if (pChannelList[i] == RadarCh[j])
...@@ -359,7 +359,7 @@ void BuildChannelList(IN PRTMP_ADAPTER pAd) ...@@ -359,7 +359,7 @@ void BuildChannelList(IN PRTMP_ADAPTER pAd)
========================================================================== ==========================================================================
*/ */
u8 FirstChannel(IN PRTMP_ADAPTER pAd) u8 FirstChannel(struct rt_rtmp_adapter *pAd)
{ {
return pAd->ChannelList[0].Channel; return pAd->ChannelList[0].Channel;
} }
...@@ -375,7 +375,7 @@ u8 FirstChannel(IN PRTMP_ADAPTER pAd) ...@@ -375,7 +375,7 @@ u8 FirstChannel(IN PRTMP_ADAPTER pAd)
return 0 if no more next channel return 0 if no more next channel
========================================================================== ==========================================================================
*/ */
u8 NextChannel(IN PRTMP_ADAPTER pAd, u8 channel) u8 NextChannel(struct rt_rtmp_adapter *pAd, u8 channel)
{ {
int i; int i;
u8 next_channel = 0; u8 next_channel = 0;
...@@ -408,7 +408,7 @@ u8 NextChannel(IN PRTMP_ADAPTER pAd, u8 channel) ...@@ -408,7 +408,7 @@ u8 NextChannel(IN PRTMP_ADAPTER pAd, u8 channel)
the minimum value or next lower value. the minimum value or next lower value.
========================================================================== ==========================================================================
*/ */
void ChangeToCellPowerLimit(IN PRTMP_ADAPTER pAd, void ChangeToCellPowerLimit(struct rt_rtmp_adapter *pAd,
u8 AironetCellPowerLimit) u8 AironetCellPowerLimit)
{ {
/*valud 0xFF means that hasn't found power limit information */ /*valud 0xFF means that hasn't found power limit information */
...@@ -435,7 +435,7 @@ void ChangeToCellPowerLimit(IN PRTMP_ADAPTER pAd, ...@@ -435,7 +435,7 @@ void ChangeToCellPowerLimit(IN PRTMP_ADAPTER pAd,
} }
char ConvertToRssi(IN PRTMP_ADAPTER pAd, char Rssi, u8 RssiNumber) char ConvertToRssi(struct rt_rtmp_adapter *pAd, char Rssi, u8 RssiNumber)
{ {
u8 RssiOffset, LNAGain; u8 RssiOffset, LNAGain;
...@@ -469,15 +469,15 @@ char ConvertToRssi(IN PRTMP_ADAPTER pAd, char Rssi, u8 RssiNumber) ...@@ -469,15 +469,15 @@ char ConvertToRssi(IN PRTMP_ADAPTER pAd, char Rssi, u8 RssiNumber)
Scan next channel Scan next channel
========================================================================== ==========================================================================
*/ */
void ScanNextChannel(IN PRTMP_ADAPTER pAd) void ScanNextChannel(struct rt_rtmp_adapter *pAd)
{ {
HEADER_802_11 Hdr80211; struct rt_header_802_11 Hdr80211;
u8 *pOutBuffer = NULL; u8 *pOutBuffer = NULL;
int NStatus; int NStatus;
unsigned long FrameLen = 0; unsigned long FrameLen = 0;
u8 SsidLen = 0, ScanType = pAd->MlmeAux.ScanType, BBPValue = 0; u8 SsidLen = 0, ScanType = pAd->MlmeAux.ScanType, BBPValue = 0;
u16 Status; u16 Status;
PHEADER_802_11 pHdr80211; struct rt_header_802_11 * pHdr80211;
u32 ScanTimeIn5gChannel = SHORT_CHANNEL_TIME; u32 ScanTimeIn5gChannel = SHORT_CHANNEL_TIME;
{ {
...@@ -522,7 +522,7 @@ void ScanNextChannel(IN PRTMP_ADAPTER pAd) ...@@ -522,7 +522,7 @@ void ScanNextChannel(IN PRTMP_ADAPTER pAd)
MlmeAllocateMemory(pAd, MlmeAllocateMemory(pAd,
(void *)& pOutBuffer); (void *)& pOutBuffer);
if (NStatus == NDIS_STATUS_SUCCESS) { if (NStatus == NDIS_STATUS_SUCCESS) {
pHdr80211 = (PHEADER_802_11) pOutBuffer; pHdr80211 = (struct rt_header_802_11 *) pOutBuffer;
MgtMacHeaderInit(pAd, pHdr80211, MgtMacHeaderInit(pAd, pHdr80211,
SUBTYPE_NULL_FUNC, 1, SUBTYPE_NULL_FUNC, 1,
pAd->CommonCfg.Bssid, pAd->CommonCfg.Bssid,
...@@ -535,7 +535,7 @@ void ScanNextChannel(IN PRTMP_ADAPTER pAd) ...@@ -535,7 +535,7 @@ void ScanNextChannel(IN PRTMP_ADAPTER pAd)
/* Send using priority queue */ /* Send using priority queue */
MiniportMMRequest(pAd, 0, pOutBuffer, MiniportMMRequest(pAd, 0, pOutBuffer,
sizeof sizeof
(HEADER_802_11)); (struct rt_header_802_11));
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("MlmeScanReqAction -- Send PSM Data frame\n")); ("MlmeScanReqAction -- Send PSM Data frame\n"));
MlmeFreeMemory(pAd, pOutBuffer); MlmeFreeMemory(pAd, pOutBuffer);
...@@ -642,7 +642,7 @@ void ScanNextChannel(IN PRTMP_ADAPTER pAd) ...@@ -642,7 +642,7 @@ void ScanNextChannel(IN PRTMP_ADAPTER pAd)
MgtMacHeaderInit(pAd, &Hdr80211, SUBTYPE_PROBE_REQ, 0, MgtMacHeaderInit(pAd, &Hdr80211, SUBTYPE_PROBE_REQ, 0,
BROADCAST_ADDR, BROADCAST_ADDR); BROADCAST_ADDR, BROADCAST_ADDR);
MakeOutgoingFrame(pOutBuffer, &FrameLen, MakeOutgoingFrame(pOutBuffer, &FrameLen,
sizeof(HEADER_802_11), &Hdr80211, 1, sizeof(struct rt_header_802_11), &Hdr80211, 1,
&SsidIe, 1, &SsidLen, SsidLen, &SsidIe, 1, &SsidLen, SsidLen,
pAd->MlmeAux.Ssid, 1, &SupRateIe, 1, pAd->MlmeAux.Ssid, 1, &SupRateIe, 1,
&pAd->CommonCfg.SupRateLen, &pAd->CommonCfg.SupRateLen,
...@@ -700,12 +700,12 @@ void ScanNextChannel(IN PRTMP_ADAPTER pAd) ...@@ -700,12 +700,12 @@ void ScanNextChannel(IN PRTMP_ADAPTER pAd)
} }
} }
void MgtProbReqMacHeaderInit(IN PRTMP_ADAPTER pAd, void MgtProbReqMacHeaderInit(struct rt_rtmp_adapter *pAd,
IN OUT PHEADER_802_11 pHdr80211, struct rt_header_802_11 * pHdr80211,
u8 SubType, u8 SubType,
u8 ToDs, u8 *pDA, u8 *pBssid) u8 ToDs, u8 *pDA, u8 *pBssid)
{ {
NdisZeroMemory(pHdr80211, sizeof(HEADER_802_11)); NdisZeroMemory(pHdr80211, sizeof(struct rt_header_802_11));
pHdr80211->FC.Type = BTYPE_MGMT; pHdr80211->FC.Type = BTYPE_MGMT;
pHdr80211->FC.SubType = SubType; pHdr80211->FC.SubType = SubType;
......
drivers/staging/rt2860/common/cmm_tkip.c
浏览文件 @ 62eb734b
...@@ -115,7 +115,7 @@ u32 Tkip_Sbox_Upper[256] = { ...@@ -115,7 +115,7 @@ u32 Tkip_Sbox_Upper[256] = {
/* */ /* */
/* Expanded IV for TKIP function. */ /* Expanded IV for TKIP function. */
/* */ /* */
typedef struct PACKED _IV_CONTROL_ { struct PACKED rt_tkip_iv {
union PACKED { union PACKED {
struct PACKED { struct PACKED {
u8 rc0; u8 rc0;
...@@ -136,7 +136,7 @@ typedef struct PACKED _IV_CONTROL_ { ...@@ -136,7 +136,7 @@ typedef struct PACKED _IV_CONTROL_ {
} IV16; } IV16;
unsigned long IV32; unsigned long IV32;
} TKIP_IV, *PTKIP_IV; };
/* /*
======================================================================== ========================================================================
...@@ -214,7 +214,7 @@ void RTMPTkipPutUInt32(IN u8 *pDst, unsigned long val) ...@@ -214,7 +214,7 @@ void RTMPTkipPutUInt32(IN u8 *pDst, unsigned long val)
======================================================================== ========================================================================
*/ */
void RTMPTkipSetMICKey(IN PTKIP_KEY_INFO pTkip, u8 *pMICKey) void RTMPTkipSetMICKey(struct rt_tkip_key_info *pTkip, u8 *pMICKey)
{ {
/* Set the key */ /* Set the key */
pTkip->K0 = RTMPTkipGetUInt32(pMICKey); pTkip->K0 = RTMPTkipGetUInt32(pMICKey);
...@@ -245,7 +245,7 @@ void RTMPTkipSetMICKey(IN PTKIP_KEY_INFO pTkip, u8 *pMICKey) ...@@ -245,7 +245,7 @@ void RTMPTkipSetMICKey(IN PTKIP_KEY_INFO pTkip, u8 *pMICKey)
======================================================================== ========================================================================
*/ */
void RTMPTkipAppendByte(IN PTKIP_KEY_INFO pTkip, u8 uChar) void RTMPTkipAppendByte(struct rt_tkip_key_info *pTkip, u8 uChar)
{ {
/* Append the byte to our word-sized buffer */ /* Append the byte to our word-sized buffer */
pTkip->M |= (uChar << (8 * pTkip->nBytesInM)); pTkip->M |= (uChar << (8 * pTkip->nBytesInM));
...@@ -289,7 +289,7 @@ void RTMPTkipAppendByte(IN PTKIP_KEY_INFO pTkip, u8 uChar) ...@@ -289,7 +289,7 @@ void RTMPTkipAppendByte(IN PTKIP_KEY_INFO pTkip, u8 uChar)
======================================================================== ========================================================================
*/ */
void RTMPTkipAppend(IN PTKIP_KEY_INFO pTkip, u8 *pSrc, u32 nBytes) void RTMPTkipAppend(struct rt_tkip_key_info *pTkip, u8 *pSrc, u32 nBytes)
{ {
/* This is simple */ /* This is simple */
while (nBytes > 0) { while (nBytes > 0) {
...@@ -316,7 +316,7 @@ void RTMPTkipAppend(IN PTKIP_KEY_INFO pTkip, u8 *pSrc, u32 nBytes) ...@@ -316,7 +316,7 @@ void RTMPTkipAppend(IN PTKIP_KEY_INFO pTkip, u8 *pSrc, u32 nBytes)
the MIC Value is store in pAd->PrivateInfo.MIC the MIC Value is store in pAd->PrivateInfo.MIC
======================================================================== ========================================================================
*/ */
void RTMPTkipGetMIC(IN PTKIP_KEY_INFO pTkip) void RTMPTkipGetMIC(struct rt_tkip_key_info *pTkip)
{ {
/* Append the minimum padding */ /* Append the minimum padding */
RTMPTkipAppendByte(pTkip, 0x5a); RTMPTkipAppendByte(pTkip, 0x5a);
...@@ -355,17 +355,17 @@ void RTMPTkipGetMIC(IN PTKIP_KEY_INFO pTkip) ...@@ -355,17 +355,17 @@ void RTMPTkipGetMIC(IN PTKIP_KEY_INFO pTkip)
======================================================================== ========================================================================
*/ */
void RTMPInitTkipEngine(IN PRTMP_ADAPTER pAd, void RTMPInitTkipEngine(struct rt_rtmp_adapter *pAd,
u8 *pKey, u8 *pKey,
u8 KeyId, u8 KeyId,
u8 *pTA, u8 *pTA,
u8 *pMICKey, u8 *pMICKey,
u8 *pTSC, unsigned long *pIV16, unsigned long *pIV32) u8 *pTSC, unsigned long *pIV16, unsigned long *pIV32)
{ {
TKIP_IV tkipIv; struct rt_tkip_iv tkipIv;
/* Prepare 8 bytes TKIP encapsulation for MPDU */ /* Prepare 8 bytes TKIP encapsulation for MPDU */
NdisZeroMemory(&tkipIv, sizeof(TKIP_IV)); NdisZeroMemory(&tkipIv, sizeof(struct rt_tkip_iv));
tkipIv.IV16.field.rc0 = *(pTSC + 1); tkipIv.IV16.field.rc0 = *(pTSC + 1);
tkipIv.IV16.field.rc1 = (tkipIv.IV16.field.rc0 | 0x20) & 0x7f; tkipIv.IV16.field.rc1 = (tkipIv.IV16.field.rc0 | 0x20) & 0x7f;
tkipIv.IV16.field.rc2 = *pTSC; tkipIv.IV16.field.rc2 = *pTSC;
...@@ -399,7 +399,7 @@ void RTMPInitTkipEngine(IN PRTMP_ADAPTER pAd, ...@@ -399,7 +399,7 @@ void RTMPInitTkipEngine(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
void RTMPInitMICEngine(IN PRTMP_ADAPTER pAd, void RTMPInitMICEngine(struct rt_rtmp_adapter *pAd,
u8 *pKey, u8 *pKey,
u8 *pDA, u8 *pDA,
u8 *pSA, u8 UserPriority, u8 *pMICKey) u8 *pSA, u8 UserPriority, u8 *pMICKey)
...@@ -440,7 +440,7 @@ void RTMPInitMICEngine(IN PRTMP_ADAPTER pAd, ...@@ -440,7 +440,7 @@ void RTMPInitMICEngine(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
BOOLEAN RTMPTkipCompareMICValue(IN PRTMP_ADAPTER pAd, BOOLEAN RTMPTkipCompareMICValue(struct rt_rtmp_adapter *pAd,
u8 *pSrc, u8 *pSrc,
u8 *pDA, u8 *pDA,
u8 *pSA, u8 *pSA,
...@@ -500,12 +500,12 @@ BOOLEAN RTMPTkipCompareMICValue(IN PRTMP_ADAPTER pAd, ...@@ -500,12 +500,12 @@ BOOLEAN RTMPTkipCompareMICValue(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
void RTMPCalculateMICValue(IN PRTMP_ADAPTER pAd, void RTMPCalculateMICValue(struct rt_rtmp_adapter *pAd,
void *pPacket, void *pPacket,
u8 *pEncap, u8 *pEncap,
IN PCIPHER_KEY pKey, u8 apidx) struct rt_cipher_key *pKey, u8 apidx)
{ {
PACKET_INFO PacketInfo; struct rt_packet_info PacketInfo;
u8 *pSrcBufVA; u8 *pSrcBufVA;
u32 SrcBufLen; u32 SrcBufLen;
u8 *pSrc; u8 *pSrc;
...@@ -698,10 +698,10 @@ void RTMPTkipMixKey(u8 * key, u8 * ta, unsigned long pnl, /* Least significant 1 ...@@ -698,10 +698,10 @@ void RTMPTkipMixKey(u8 * key, u8 * ta, unsigned long pnl, /* Least significant 1
/* TRUE: Success! */ /* TRUE: Success! */
/* FALSE: Decrypt Error! */ /* FALSE: Decrypt Error! */
/* */ /* */
BOOLEAN RTMPSoftDecryptTKIP(IN PRTMP_ADAPTER pAd, BOOLEAN RTMPSoftDecryptTKIP(struct rt_rtmp_adapter *pAd,
u8 *pData, u8 *pData,
unsigned long DataByteCnt, unsigned long DataByteCnt,
u8 UserPriority, IN PCIPHER_KEY pWpaKey) u8 UserPriority, struct rt_cipher_key *pWpaKey)
{ {
u8 KeyID; u8 KeyID;
u32 HeaderLen; u32 HeaderLen;
...@@ -726,7 +726,7 @@ BOOLEAN RTMPSoftDecryptTKIP(IN PRTMP_ADAPTER pAd, ...@@ -726,7 +726,7 @@ BOOLEAN RTMPSoftDecryptTKIP(IN PRTMP_ADAPTER pAd,
unsigned long pnh; /* Most significant 32 bits of PN */ unsigned long pnh; /* Most significant 32 bits of PN */
u32 num_blocks; u32 num_blocks;
u32 payload_remainder; u32 payload_remainder;
ARCFOURCONTEXT ArcFourContext; struct rt_arcfourcontext ArcFourContext;
u32 crc32 = 0; u32 crc32 = 0;
u32 trailfcs = 0; u32 trailfcs = 0;
u8 MIC[8]; u8 MIC[8];
......
drivers/staging/rt2860/common/cmm_wep.c
浏览文件 @ 62eb734b
...@@ -135,7 +135,7 @@ u8 WEPKEY[] = { ...@@ -135,7 +135,7 @@ u8 WEPKEY[] = {
======================================================================== ========================================================================
*/ */
void RTMPInitWepEngine(IN PRTMP_ADAPTER pAd, void RTMPInitWepEngine(struct rt_rtmp_adapter *pAd,
u8 *pKey, u8 *pKey,
u8 KeyId, u8 KeyLen, IN u8 *pDest) u8 KeyId, u8 KeyLen, IN u8 *pDest)
{ {
...@@ -184,7 +184,7 @@ void RTMPInitWepEngine(IN PRTMP_ADAPTER pAd, ...@@ -184,7 +184,7 @@ void RTMPInitWepEngine(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
void RTMPEncryptData(IN PRTMP_ADAPTER pAd, void RTMPEncryptData(struct rt_rtmp_adapter *pAd,
u8 *pSrc, u8 *pDest, u32 Len) u8 *pSrc, u8 *pDest, u32 Len)
{ {
pAd->PrivateInfo.FCSCRC32 = pAd->PrivateInfo.FCSCRC32 =
...@@ -211,9 +211,9 @@ void RTMPEncryptData(IN PRTMP_ADAPTER pAd, ...@@ -211,9 +211,9 @@ void RTMPEncryptData(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
BOOLEAN RTMPSoftDecryptWEP(IN PRTMP_ADAPTER pAd, BOOLEAN RTMPSoftDecryptWEP(struct rt_rtmp_adapter *pAd,
u8 *pData, u8 *pData,
unsigned long DataByteCnt, IN PCIPHER_KEY pGroupKey) unsigned long DataByteCnt, struct rt_cipher_key *pGroupKey)
{ {
u32 trailfcs; u32 trailfcs;
u32 crc32; u32 crc32;
...@@ -255,10 +255,10 @@ BOOLEAN RTMPSoftDecryptWEP(IN PRTMP_ADAPTER pAd, ...@@ -255,10 +255,10 @@ BOOLEAN RTMPSoftDecryptWEP(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
Routine Description: Routine Description:
The Stream Cipher Encryption Algorithm "ARCFOUR" initialize The Stream Cipher Encryption Algorithm "struct rt_arcfour" initialize
Arguments: Arguments:
Ctx Pointer to ARCFOUR CONTEXT (SBOX) Ctx Pointer to struct rt_arcfour CONTEXT (SBOX)
pKey Pointer to the WEP KEY pKey Pointer to the WEP KEY
KeyLen Indicate the length fo the WEP KEY KeyLen Indicate the length fo the WEP KEY
...@@ -271,7 +271,7 @@ BOOLEAN RTMPSoftDecryptWEP(IN PRTMP_ADAPTER pAd, ...@@ -271,7 +271,7 @@ BOOLEAN RTMPSoftDecryptWEP(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
void ARCFOUR_INIT(IN PARCFOURCONTEXT Ctx, u8 *pKey, u32 KeyLen) void ARCFOUR_INIT(struct rt_arcfourcontext *Ctx, u8 *pKey, u32 KeyLen)
{ {
u8 t, u; u8 t, u;
u32 keyindex; u32 keyindex;
...@@ -301,19 +301,19 @@ void ARCFOUR_INIT(IN PARCFOURCONTEXT Ctx, u8 *pKey, u32 KeyLen) ...@@ -301,19 +301,19 @@ void ARCFOUR_INIT(IN PARCFOURCONTEXT Ctx, u8 *pKey, u32 KeyLen)
======================================================================== ========================================================================
Routine Description: Routine Description:
Get bytes from ARCFOUR CONTEXT (S-BOX) Get bytes from struct rt_arcfour CONTEXT (S-BOX)
Arguments: Arguments:
Ctx Pointer to ARCFOUR CONTEXT (SBOX) Ctx Pointer to struct rt_arcfour CONTEXT (SBOX)
Return Value: Return Value:
u8 - the value of the ARCFOUR CONTEXT (S-BOX) u8 - the value of the struct rt_arcfour CONTEXT (S-BOX)
Note: Note:
======================================================================== ========================================================================
*/ */
u8 ARCFOUR_BYTE(IN PARCFOURCONTEXT Ctx) u8 ARCFOUR_BYTE(struct rt_arcfourcontext *Ctx)
{ {
u32 x; u32 x;
u32 y; u32 y;
...@@ -341,7 +341,7 @@ u8 ARCFOUR_BYTE(IN PARCFOURCONTEXT Ctx) ...@@ -341,7 +341,7 @@ u8 ARCFOUR_BYTE(IN PARCFOURCONTEXT Ctx)
The Stream Cipher Decryption Algorithm The Stream Cipher Decryption Algorithm
Arguments: Arguments:
Ctx Pointer to ARCFOUR CONTEXT (SBOX) Ctx Pointer to struct rt_arcfour CONTEXT (SBOX)
pDest Pointer to the Destination pDest Pointer to the Destination
pSrc Pointer to the Source data pSrc Pointer to the Source data
Len Indicate the length of the Source data Len Indicate the length of the Source data
...@@ -353,7 +353,7 @@ u8 ARCFOUR_BYTE(IN PARCFOURCONTEXT Ctx) ...@@ -353,7 +353,7 @@ u8 ARCFOUR_BYTE(IN PARCFOURCONTEXT Ctx)
======================================================================== ========================================================================
*/ */
void ARCFOUR_DECRYPT(IN PARCFOURCONTEXT Ctx, void ARCFOUR_DECRYPT(struct rt_arcfourcontext *Ctx,
u8 *pDest, u8 *pSrc, u32 Len) u8 *pDest, u8 *pSrc, u32 Len)
{ {
u32 i; u32 i;
...@@ -369,7 +369,7 @@ void ARCFOUR_DECRYPT(IN PARCFOURCONTEXT Ctx, ...@@ -369,7 +369,7 @@ void ARCFOUR_DECRYPT(IN PARCFOURCONTEXT Ctx,
The Stream Cipher Encryption Algorithm The Stream Cipher Encryption Algorithm
Arguments: Arguments:
Ctx Pointer to ARCFOUR CONTEXT (SBOX) Ctx Pointer to struct rt_arcfour CONTEXT (SBOX)
pDest Pointer to the Destination pDest Pointer to the Destination
pSrc Pointer to the Source data pSrc Pointer to the Source data
Len Indicate the length of the Source dta Len Indicate the length of the Source dta
...@@ -383,7 +383,7 @@ void ARCFOUR_DECRYPT(IN PARCFOURCONTEXT Ctx, ...@@ -383,7 +383,7 @@ void ARCFOUR_DECRYPT(IN PARCFOURCONTEXT Ctx,
======================================================================== ========================================================================
*/ */
void ARCFOUR_ENCRYPT(IN PARCFOURCONTEXT Ctx, void ARCFOUR_ENCRYPT(struct rt_arcfourcontext *Ctx,
u8 *pDest, u8 *pSrc, u32 Len) u8 *pDest, u8 *pSrc, u32 Len)
{ {
u32 i; u32 i;
...@@ -399,7 +399,7 @@ void ARCFOUR_ENCRYPT(IN PARCFOURCONTEXT Ctx, ...@@ -399,7 +399,7 @@ void ARCFOUR_ENCRYPT(IN PARCFOURCONTEXT Ctx,
The Stream Cipher Encryption Algorithm which conform to the special requirement to encrypt GTK. The Stream Cipher Encryption Algorithm which conform to the special requirement to encrypt GTK.
Arguments: Arguments:
Ctx Pointer to ARCFOUR CONTEXT (SBOX) Ctx Pointer to struct rt_arcfour CONTEXT (SBOX)
pDest Pointer to the Destination pDest Pointer to the Destination
pSrc Pointer to the Source data pSrc Pointer to the Source data
Len Indicate the length of the Source dta Len Indicate the length of the Source dta
...@@ -407,7 +407,7 @@ void ARCFOUR_ENCRYPT(IN PARCFOURCONTEXT Ctx, ...@@ -407,7 +407,7 @@ void ARCFOUR_ENCRYPT(IN PARCFOURCONTEXT Ctx,
======================================================================== ========================================================================
*/ */
void WPAARCFOUR_ENCRYPT(IN PARCFOURCONTEXT Ctx, void WPAARCFOUR_ENCRYPT(struct rt_arcfourcontext *Ctx,
u8 *pDest, u8 *pSrc, u32 Len) u8 *pDest, u8 *pSrc, u32 Len)
{ {
u32 i; u32 i;
...@@ -463,7 +463,7 @@ u32 RTMP_CALC_FCS32(u32 Fcs, u8 *Cp, int Len) ...@@ -463,7 +463,7 @@ u32 RTMP_CALC_FCS32(u32 Fcs, u8 *Cp, int Len)
======================================================================== ========================================================================
*/ */
void RTMPSetICV(IN PRTMP_ADAPTER pAd, u8 *pDest) void RTMPSetICV(struct rt_rtmp_adapter *pAd, u8 *pDest)
{ {
pAd->PrivateInfo.FCSCRC32 ^= 0xffffffff; /* complement */ pAd->PrivateInfo.FCSCRC32 ^= 0xffffffff; /* complement */
pAd->PrivateInfo.FCSCRC32 = cpu2le32(pAd->PrivateInfo.FCSCRC32); pAd->PrivateInfo.FCSCRC32 = cpu2le32(pAd->PrivateInfo.FCSCRC32);
......
drivers/staging/rt2860/common/crypt_hmac.c
浏览文件 @ 62eb734b
...@@ -51,14 +51,14 @@ void HMAC_SHA1(IN const u8 Key[], ...@@ -51,14 +51,14 @@ void HMAC_SHA1(IN const u8 Key[],
IN const u8 Message[], IN const u8 Message[],
u32 MessageLen, u8 MAC[], u32 MACLen) u32 MessageLen, u8 MAC[], u32 MACLen)
{ {
SHA1_CTX_STRUC sha_ctx1; struct rt_sha1_ctx sha_ctx1;
SHA1_CTX_STRUC sha_ctx2; struct rt_sha1_ctx sha_ctx2;
u8 K0[SHA1_BLOCK_SIZE]; u8 K0[SHA1_BLOCK_SIZE];
u8 Digest[SHA1_DIGEST_SIZE]; u8 Digest[SHA1_DIGEST_SIZE];
u32 index; u32 index;
NdisZeroMemory(&sha_ctx1, sizeof(SHA1_CTX_STRUC)); NdisZeroMemory(&sha_ctx1, sizeof(struct rt_sha1_ctx));
NdisZeroMemory(&sha_ctx2, sizeof(SHA1_CTX_STRUC)); NdisZeroMemory(&sha_ctx2, sizeof(struct rt_sha1_ctx));
/* /*
* If the length of K = B(Block size): K0 = K. * If the length of K = B(Block size): K0 = K.
* If the length of K > B: hash K to obtain an L byte string, * If the length of K > B: hash K to obtain an L byte string,
...@@ -130,14 +130,14 @@ void HMAC_MD5(IN const u8 Key[], ...@@ -130,14 +130,14 @@ void HMAC_MD5(IN const u8 Key[],
IN const u8 Message[], IN const u8 Message[],
u32 MessageLen, u8 MAC[], u32 MACLen) u32 MessageLen, u8 MAC[], u32 MACLen)
{ {
MD5_CTX_STRUC md5_ctx1; struct rt_md5_ctx_struc md5_ctx1;
MD5_CTX_STRUC md5_ctx2; struct rt_md5_ctx_struc md5_ctx2;
u8 K0[MD5_BLOCK_SIZE]; u8 K0[MD5_BLOCK_SIZE];
u8 Digest[MD5_DIGEST_SIZE]; u8 Digest[MD5_DIGEST_SIZE];
u32 index; u32 index;
NdisZeroMemory(&md5_ctx1, sizeof(MD5_CTX_STRUC)); NdisZeroMemory(&md5_ctx1, sizeof(struct rt_md5_ctx_struc));
NdisZeroMemory(&md5_ctx2, sizeof(MD5_CTX_STRUC)); NdisZeroMemory(&md5_ctx2, sizeof(struct rt_md5_ctx_struc));
/* /*
* If the length of K = B(Block size): K0 = K. * If the length of K = B(Block size): K0 = K.
* If the length of K > B: hash K to obtain an L byte string, * If the length of K > B: hash K to obtain an L byte string,
......
drivers/staging/rt2860/common/crypt_md5.c
浏览文件 @ 62eb734b
...@@ -79,7 +79,7 @@ Return Value: ...@@ -79,7 +79,7 @@ Return Value:
None None
======================================================================== ========================================================================
*/ */
void MD5_Init(IN MD5_CTX_STRUC * pMD5_CTX) void MD5_Init(struct rt_md5_ctx_struc *pMD5_CTX)
{ {
NdisMoveMemory(pMD5_CTX->HashValue, MD5_DefaultHashValue, NdisMoveMemory(pMD5_CTX->HashValue, MD5_DefaultHashValue,
sizeof(MD5_DefaultHashValue)); sizeof(MD5_DefaultHashValue));
...@@ -103,7 +103,7 @@ Return Value: ...@@ -103,7 +103,7 @@ Return Value:
T[i] := floor(abs(sin(i + 1)) * (2 pow 32)), i is number of round T[i] := floor(abs(sin(i + 1)) * (2 pow 32)), i is number of round
======================================================================== ========================================================================
*/ */
void MD5_Hash(IN MD5_CTX_STRUC * pMD5_CTX) void MD5_Hash(struct rt_md5_ctx_struc *pMD5_CTX)
{ {
u32 X_i; u32 X_i;
u32 X[16]; u32 X[16];
...@@ -227,7 +227,7 @@ Routine Description: ...@@ -227,7 +227,7 @@ Routine Description:
will be called. will be called.
Arguments: Arguments:
pMD5_CTX Pointer to MD5_CTX_STRUC pMD5_CTX Pointer to struct rt_md5_ctx_struc
message Message context message Message context
messageLen The length of message in bytes messageLen The length of message in bytes
...@@ -238,7 +238,7 @@ Return Value: ...@@ -238,7 +238,7 @@ Return Value:
None None
======================================================================== ========================================================================
*/ */
void MD5_Append(IN MD5_CTX_STRUC * pMD5_CTX, void MD5_Append(struct rt_md5_ctx_struc *pMD5_CTX,
IN const u8 Message[], u32 MessageLen) IN const u8 Message[], u32 MessageLen)
{ {
u32 appendLen = 0; u32 appendLen = 0;
...@@ -271,7 +271,7 @@ Routine Description: ...@@ -271,7 +271,7 @@ Routine Description:
3. Transform the Hash Value to digest message 3. Transform the Hash Value to digest message
Arguments: Arguments:
pMD5_CTX Pointer to MD5_CTX_STRUC pMD5_CTX Pointer to struct rt_md5_ctx_struc
Return Value: Return Value:
digestMessage Digest message digestMessage Digest message
...@@ -280,7 +280,7 @@ Return Value: ...@@ -280,7 +280,7 @@ Return Value:
None None
======================================================================== ========================================================================
*/ */
void MD5_End(IN MD5_CTX_STRUC * pMD5_CTX, u8 DigestMessage[]) void MD5_End(struct rt_md5_ctx_struc *pMD5_CTX, u8 DigestMessage[])
{ {
u32 index; u32 index;
u64 message_length_bits; u64 message_length_bits;
...@@ -326,9 +326,9 @@ Return Value: ...@@ -326,9 +326,9 @@ Return Value:
void RT_MD5(IN const u8 Message[], void RT_MD5(IN const u8 Message[],
u32 MessageLen, u8 DigestMessage[]) u32 MessageLen, u8 DigestMessage[])
{ {
MD5_CTX_STRUC md5_ctx; struct rt_md5_ctx_struc md5_ctx;
NdisZeroMemory(&md5_ctx, sizeof(MD5_CTX_STRUC)); NdisZeroMemory(&md5_ctx, sizeof(struct rt_md5_ctx_struc));
MD5_Init(&md5_ctx); MD5_Init(&md5_ctx);
MD5_Append(&md5_ctx, Message, MessageLen); MD5_Append(&md5_ctx, Message, MessageLen);
MD5_End(&md5_ctx, DigestMessage); MD5_End(&md5_ctx, DigestMessage);
......
drivers/staging/rt2860/common/crypt_sha2.c
浏览文件 @ 62eb734b
...@@ -52,10 +52,10 @@ static const u32 SHA1_DefaultHashValue[5] = { ...@@ -52,10 +52,10 @@ static const u32 SHA1_DefaultHashValue[5] = {
/* /*
======================================================================== ========================================================================
Routine Description: Routine Description:
Initial SHA1_CTX_STRUC Initial struct rt_sha1_ctx
Arguments: Arguments:
pSHA_CTX Pointer to SHA1_CTX_STRUC pSHA_CTX Pointer to struct rt_sha1_ctx
Return Value: Return Value:
None None
...@@ -64,7 +64,7 @@ Return Value: ...@@ -64,7 +64,7 @@ Return Value:
None None
======================================================================== ========================================================================
*/ */
void RT_SHA1_Init(IN SHA1_CTX_STRUC * pSHA_CTX) void RT_SHA1_Init(struct rt_sha1_ctx *pSHA_CTX)
{ {
NdisMoveMemory(pSHA_CTX->HashValue, SHA1_DefaultHashValue, NdisMoveMemory(pSHA_CTX->HashValue, SHA1_DefaultHashValue,
sizeof(SHA1_DefaultHashValue)); sizeof(SHA1_DefaultHashValue));
...@@ -79,7 +79,7 @@ Routine Description: ...@@ -79,7 +79,7 @@ Routine Description:
SHA1 computation for one block (512 bits) SHA1 computation for one block (512 bits)
Arguments: Arguments:
pSHA_CTX Pointer to SHA1_CTX_STRUC pSHA_CTX Pointer to struct rt_sha1_ctx
Return Value: Return Value:
None None
...@@ -88,7 +88,7 @@ Return Value: ...@@ -88,7 +88,7 @@ Return Value:
None None
======================================================================== ========================================================================
*/ */
void SHA1_Hash(IN SHA1_CTX_STRUC * pSHA_CTX) void SHA1_Hash(struct rt_sha1_ctx *pSHA_CTX)
{ {
u32 W_i, t, s; u32 W_i, t, s;
u32 W[16]; u32 W[16];
...@@ -157,7 +157,7 @@ Routine Description: ...@@ -157,7 +157,7 @@ Routine Description:
will be called. will be called.
Arguments: Arguments:
pSHA_CTX Pointer to SHA1_CTX_STRUC pSHA_CTX Pointer to struct rt_sha1_ctx
message Message context message Message context
messageLen The length of message in bytes messageLen The length of message in bytes
...@@ -168,7 +168,7 @@ Return Value: ...@@ -168,7 +168,7 @@ Return Value:
None None
======================================================================== ========================================================================
*/ */
void SHA1_Append(IN SHA1_CTX_STRUC * pSHA_CTX, void SHA1_Append(struct rt_sha1_ctx *pSHA_CTX,
IN const u8 Message[], u32 MessageLen) IN const u8 Message[], u32 MessageLen)
{ {
u32 appendLen = 0; u32 appendLen = 0;
...@@ -201,7 +201,7 @@ Routine Description: ...@@ -201,7 +201,7 @@ Routine Description:
3. Transform the Hash Value to digest message 3. Transform the Hash Value to digest message
Arguments: Arguments:
pSHA_CTX Pointer to SHA1_CTX_STRUC pSHA_CTX Pointer to struct rt_sha1_ctx
Return Value: Return Value:
digestMessage Digest message digestMessage Digest message
...@@ -210,7 +210,7 @@ Return Value: ...@@ -210,7 +210,7 @@ Return Value:
None None
======================================================================== ========================================================================
*/ */
void SHA1_End(IN SHA1_CTX_STRUC * pSHA_CTX, u8 DigestMessage[]) void SHA1_End(struct rt_sha1_ctx *pSHA_CTX, u8 DigestMessage[])
{ {
u32 index; u32 index;
u64 message_length_bits; u64 message_length_bits;
...@@ -257,9 +257,9 @@ void RT_SHA1(IN const u8 Message[], ...@@ -257,9 +257,9 @@ void RT_SHA1(IN const u8 Message[],
u32 MessageLen, u8 DigestMessage[]) u32 MessageLen, u8 DigestMessage[])
{ {
SHA1_CTX_STRUC sha_ctx; struct rt_sha1_ctx sha_ctx;
NdisZeroMemory(&sha_ctx, sizeof(SHA1_CTX_STRUC)); NdisZeroMemory(&sha_ctx, sizeof(struct rt_sha1_ctx));
RT_SHA1_Init(&sha_ctx); RT_SHA1_Init(&sha_ctx);
SHA1_Append(&sha_ctx, Message, MessageLen); SHA1_Append(&sha_ctx, Message, MessageLen);
SHA1_End(&sha_ctx, DigestMessage); SHA1_End(&sha_ctx, DigestMessage);
......
drivers/staging/rt2860/common/dfs.c
浏览文件 @ 62eb734b
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
======================================================================== ========================================================================
*/ */
BOOLEAN RadarChannelCheck(IN PRTMP_ADAPTER pAd, u8 Ch) BOOLEAN RadarChannelCheck(struct rt_rtmp_adapter *pAd, u8 Ch)
{ {
int i; int i;
BOOLEAN result = FALSE; BOOLEAN result = FALSE;
......
drivers/staging/rt2860/common/ee_efuse.c
浏览文件 @ 62eb734b
...@@ -73,7 +73,7 @@ typedef union _EFUSE_CTRL_STRUC { ...@@ -73,7 +73,7 @@ typedef union _EFUSE_CTRL_STRUC {
======================================================================== ========================================================================
*/ */
u8 eFuseReadRegisters(IN PRTMP_ADAPTER pAd, u8 eFuseReadRegisters(struct rt_rtmp_adapter *pAd,
u16 Offset, u16 Length, u16 * pData) u16 Offset, u16 Length, u16 * pData)
{ {
EFUSE_CTRL_STRUC eFuseCtrlStruc; EFUSE_CTRL_STRUC eFuseCtrlStruc;
...@@ -149,7 +149,7 @@ u8 eFuseReadRegisters(IN PRTMP_ADAPTER pAd, ...@@ -149,7 +149,7 @@ u8 eFuseReadRegisters(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
void eFusePhysicalReadRegisters(IN PRTMP_ADAPTER pAd, void eFusePhysicalReadRegisters(struct rt_rtmp_adapter *pAd,
u16 Offset, u16 Offset,
u16 Length, u16 * pData) u16 Length, u16 * pData)
{ {
...@@ -214,7 +214,7 @@ void eFusePhysicalReadRegisters(IN PRTMP_ADAPTER pAd, ...@@ -214,7 +214,7 @@ void eFusePhysicalReadRegisters(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
static void eFuseReadPhysical(IN PRTMP_ADAPTER pAd, static void eFuseReadPhysical(struct rt_rtmp_adapter *pAd,
u16 *lpInBuffer, u16 *lpInBuffer,
unsigned long nInBufferSize, unsigned long nInBufferSize,
u16 *lpOutBuffer, unsigned long nOutBufferSize) u16 *lpOutBuffer, unsigned long nOutBufferSize)
...@@ -244,7 +244,7 @@ static void eFuseReadPhysical(IN PRTMP_ADAPTER pAd, ...@@ -244,7 +244,7 @@ static void eFuseReadPhysical(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
int set_eFuseGetFreeBlockCount_Proc(IN PRTMP_ADAPTER pAd, char *arg) int set_eFuseGetFreeBlockCount_Proc(struct rt_rtmp_adapter *pAd, char *arg)
{ {
u16 i; u16 i;
u16 LogicalAddress; u16 LogicalAddress;
...@@ -268,7 +268,7 @@ int set_eFuseGetFreeBlockCount_Proc(IN PRTMP_ADAPTER pAd, char *arg) ...@@ -268,7 +268,7 @@ int set_eFuseGetFreeBlockCount_Proc(IN PRTMP_ADAPTER pAd, char *arg)
return TRUE; return TRUE;
} }
int set_eFusedump_Proc(IN PRTMP_ADAPTER pAd, char *arg) int set_eFusedump_Proc(struct rt_rtmp_adapter *pAd, char *arg)
{ {
u16 InBuf[3]; u16 InBuf[3];
int i = 0; int i = 0;
...@@ -287,14 +287,14 @@ int set_eFusedump_Proc(IN PRTMP_ADAPTER pAd, char *arg) ...@@ -287,14 +287,14 @@ int set_eFusedump_Proc(IN PRTMP_ADAPTER pAd, char *arg)
return TRUE; return TRUE;
} }
int rtmp_ee_efuse_read16(IN RTMP_ADAPTER * pAd, int rtmp_ee_efuse_read16(struct rt_rtmp_adapter *pAd,
u16 Offset, u16 * pValue) u16 Offset, u16 * pValue)
{ {
eFuseReadRegisters(pAd, Offset, 2, pValue); eFuseReadRegisters(pAd, Offset, 2, pValue);
return (*pValue); return (*pValue);
} }
int RtmpEfuseSupportCheck(IN RTMP_ADAPTER * pAd) int RtmpEfuseSupportCheck(struct rt_rtmp_adapter *pAd)
{ {
u16 value; u16 value;
...@@ -305,7 +305,7 @@ int RtmpEfuseSupportCheck(IN RTMP_ADAPTER * pAd) ...@@ -305,7 +305,7 @@ int RtmpEfuseSupportCheck(IN RTMP_ADAPTER * pAd)
return 0; return 0;
} }
void eFuseGetFreeBlockCount(IN PRTMP_ADAPTER pAd, u32 *EfuseFreeBlock) void eFuseGetFreeBlockCount(struct rt_rtmp_adapter *pAd, u32 *EfuseFreeBlock)
{ {
u16 i; u16 i;
u16 LogicalAddress; u16 LogicalAddress;
...@@ -331,7 +331,7 @@ void eFuseGetFreeBlockCount(IN PRTMP_ADAPTER pAd, u32 *EfuseFreeBlock) ...@@ -331,7 +331,7 @@ void eFuseGetFreeBlockCount(IN PRTMP_ADAPTER pAd, u32 *EfuseFreeBlock)
("eFuseGetFreeBlockCount is 0x%x\n", *EfuseFreeBlock)); ("eFuseGetFreeBlockCount is 0x%x\n", *EfuseFreeBlock));
} }
int eFuse_init(IN PRTMP_ADAPTER pAd) int eFuse_init(struct rt_rtmp_adapter *pAd)
{ {
u32 EfuseFreeBlock = 0; u32 EfuseFreeBlock = 0;
DBGPRINT(RT_DEBUG_ERROR, DBGPRINT(RT_DEBUG_ERROR,
......
drivers/staging/rt2860/common/ee_prom.c
浏览文件 @ 62eb734b
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "../rt_config.h" #include "../rt_config.h"
/* IRQL = PASSIVE_LEVEL */ /* IRQL = PASSIVE_LEVEL */
static inline void RaiseClock(IN PRTMP_ADAPTER pAd, u32 * x) static inline void RaiseClock(struct rt_rtmp_adapter *pAd, u32 * x)
{ {
*x = *x | EESK; *x = *x | EESK;
RTMP_IO_WRITE32(pAd, E2PROM_CSR, *x); RTMP_IO_WRITE32(pAd, E2PROM_CSR, *x);
...@@ -46,7 +46,7 @@ static inline void RaiseClock(IN PRTMP_ADAPTER pAd, u32 * x) ...@@ -46,7 +46,7 @@ static inline void RaiseClock(IN PRTMP_ADAPTER pAd, u32 * x)
} }
/* IRQL = PASSIVE_LEVEL */ /* IRQL = PASSIVE_LEVEL */
static inline void LowerClock(IN PRTMP_ADAPTER pAd, u32 * x) static inline void LowerClock(struct rt_rtmp_adapter *pAd, u32 * x)
{ {
*x = *x & ~EESK; *x = *x & ~EESK;
RTMP_IO_WRITE32(pAd, E2PROM_CSR, *x); RTMP_IO_WRITE32(pAd, E2PROM_CSR, *x);
...@@ -54,7 +54,7 @@ static inline void LowerClock(IN PRTMP_ADAPTER pAd, u32 * x) ...@@ -54,7 +54,7 @@ static inline void LowerClock(IN PRTMP_ADAPTER pAd, u32 * x)
} }
/* IRQL = PASSIVE_LEVEL */ /* IRQL = PASSIVE_LEVEL */
static inline u16 ShiftInBits(IN PRTMP_ADAPTER pAd) static inline u16 ShiftInBits(struct rt_rtmp_adapter *pAd)
{ {
u32 x, i; u32 x, i;
u16 data = 0; u16 data = 0;
...@@ -79,7 +79,7 @@ static inline u16 ShiftInBits(IN PRTMP_ADAPTER pAd) ...@@ -79,7 +79,7 @@ static inline u16 ShiftInBits(IN PRTMP_ADAPTER pAd)
} }
/* IRQL = PASSIVE_LEVEL */ /* IRQL = PASSIVE_LEVEL */
static inline void ShiftOutBits(IN PRTMP_ADAPTER pAd, static inline void ShiftOutBits(struct rt_rtmp_adapter *pAd,
u16 data, u16 count) u16 data, u16 count)
{ {
u32 x, mask; u32 x, mask;
...@@ -107,7 +107,7 @@ static inline void ShiftOutBits(IN PRTMP_ADAPTER pAd, ...@@ -107,7 +107,7 @@ static inline void ShiftOutBits(IN PRTMP_ADAPTER pAd,
} }
/* IRQL = PASSIVE_LEVEL */ /* IRQL = PASSIVE_LEVEL */
static inline void EEpromCleanup(IN PRTMP_ADAPTER pAd) static inline void EEpromCleanup(struct rt_rtmp_adapter *pAd)
{ {
u32 x; u32 x;
...@@ -120,7 +120,7 @@ static inline void EEpromCleanup(IN PRTMP_ADAPTER pAd) ...@@ -120,7 +120,7 @@ static inline void EEpromCleanup(IN PRTMP_ADAPTER pAd)
LowerClock(pAd, &x); LowerClock(pAd, &x);
} }
static inline void EWEN(IN PRTMP_ADAPTER pAd) static inline void EWEN(struct rt_rtmp_adapter *pAd)
{ {
u32 x; u32 x;
...@@ -141,7 +141,7 @@ static inline void EWEN(IN PRTMP_ADAPTER pAd) ...@@ -141,7 +141,7 @@ static inline void EWEN(IN PRTMP_ADAPTER pAd)
EEpromCleanup(pAd); EEpromCleanup(pAd);
} }
static inline void EWDS(IN PRTMP_ADAPTER pAd) static inline void EWDS(struct rt_rtmp_adapter *pAd)
{ {
u32 x; u32 x;
...@@ -163,7 +163,7 @@ static inline void EWDS(IN PRTMP_ADAPTER pAd) ...@@ -163,7 +163,7 @@ static inline void EWDS(IN PRTMP_ADAPTER pAd)
} }
/* IRQL = PASSIVE_LEVEL */ /* IRQL = PASSIVE_LEVEL */
int rtmp_ee_prom_read16(IN PRTMP_ADAPTER pAd, int rtmp_ee_prom_read16(struct rt_rtmp_adapter *pAd,
u16 Offset, u16 * pValue) u16 Offset, u16 * pValue)
{ {
u32 x; u32 x;
......
drivers/staging/rt2860/common/eeprom.c
浏览文件 @ 62eb734b
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
*/ */
#include "../rt_config.h" #include "../rt_config.h"
int RtmpChipOpsEepromHook(IN RTMP_ADAPTER * pAd, int infType) int RtmpChipOpsEepromHook(struct rt_rtmp_adapter *pAd, int infType)
{ {
RTMP_CHIP_OP *pChipOps = &pAd->chipOps; struct rt_rtmp_chip_op *pChipOps = &pAd->chipOps;
#ifdef RT30xx #ifdef RT30xx
#ifdef RTMP_EFUSE_SUPPORT #ifdef RTMP_EFUSE_SUPPORT
u32 eFuseCtrl, MacCsr0; u32 eFuseCtrl, MacCsr0;
......
drivers/staging/rt2860/common/rt_rf.c
浏览文件 @ 62eb734b
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
======================================================================== ========================================================================
*/ */
int RT30xxWriteRFRegister(IN PRTMP_ADAPTER pAd, int RT30xxWriteRFRegister(struct rt_rtmp_adapter *pAd,
u8 regID, u8 value) u8 regID, u8 value)
{ {
RF_CSR_CFG_STRUC rfcsr; RF_CSR_CFG_STRUC rfcsr;
...@@ -101,7 +101,7 @@ int RT30xxWriteRFRegister(IN PRTMP_ADAPTER pAd, ...@@ -101,7 +101,7 @@ int RT30xxWriteRFRegister(IN PRTMP_ADAPTER pAd,
======================================================================== ========================================================================
*/ */
int RT30xxReadRFRegister(IN PRTMP_ADAPTER pAd, int RT30xxReadRFRegister(struct rt_rtmp_adapter *pAd,
u8 regID, u8 *pValue) u8 regID, u8 *pValue)
{ {
RF_CSR_CFG_STRUC rfcsr; RF_CSR_CFG_STRUC rfcsr;
...@@ -139,15 +139,15 @@ int RT30xxReadRFRegister(IN PRTMP_ADAPTER pAd, ...@@ -139,15 +139,15 @@ int RT30xxReadRFRegister(IN PRTMP_ADAPTER pAd,
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
void NICInitRFRegisters(IN RTMP_ADAPTER * pAd) void NICInitRFRegisters(struct rt_rtmp_adapter *pAd)
{ {
if (pAd->chipOps.AsicRfInit) if (pAd->chipOps.AsicRfInit)
pAd->chipOps.AsicRfInit(pAd); pAd->chipOps.AsicRfInit(pAd);
} }
void RtmpChipOpsRFHook(IN RTMP_ADAPTER * pAd) void RtmpChipOpsRFHook(struct rt_rtmp_adapter *pAd)
{ {
RTMP_CHIP_OP *pChipOps = &pAd->chipOps; struct rt_rtmp_chip_op *pChipOps = &pAd->chipOps;
pChipOps->pRFRegTable = NULL; pChipOps->pRFRegTable = NULL;
pChipOps->AsicRfInit = NULL; pChipOps->AsicRfInit = NULL;
......
drivers/staging/rt2860/crypt_md5.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/crypt_sha2.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/dfs.h
浏览文件 @ 62eb734b
...@@ -36,4 +36,4 @@ ...@@ -36,4 +36,4 @@
Fonchi 03-12-2007 created Fonchi 03-12-2007 created
*/ */
BOOLEAN RadarChannelCheck(IN PRTMP_ADAPTER pAd, u8 Ch); BOOLEAN RadarChannelCheck(struct rt_rtmp_adapter *pAd, u8 Ch);
drivers/staging/rt2860/eeprom.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/mlme.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/oid.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rt_linux.c
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rt_linux.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rt_usb.c
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rtmp.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rtmp_chip.h
浏览文件 @ 62eb734b
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
* 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), (u16)(_offset), (u16 *)&(_value)) (_pAd)->chipOps.eeread((struct rt_rtmp_adapter *)(_pAd), (u16)(_offset), (u16 *)&(_value))
/* ------------------------------------------------------------------- */ /* ------------------------------------------------------------------- */
/* E2PROM data layout */ /* E2PROM data layout */
......
drivers/staging/rt2860/rtmp_def.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rtmp_dot11.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rtmp_iface.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rtmp_mcu.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rtmp_os.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rtmp_timer.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rtmp_type.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/rtusb_io.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/spectrum.h
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/sta/assoc.c
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/sta/auth.c
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/sta/sanity.c
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/sta/sync.c
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/sta/wpa.c
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/sta_ioctl.c
浏览文件 @ 62eb734b
此差异已折叠。
drivers/staging/rt2860/wpa.h
浏览文件 @ 62eb734b
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或