Skip to content

L
linux
Commit 1a48ba14 authored by Lars Lindley's avatar Lars Lindley Committed by Greg Kroah-Hartman
Browse files
Options

Staging: winbond: mlme_s.h Coding style fixes 

I fixed all problems found by checkpatch.pl except typedefs.
Signed-off-by: default avatarLars Lindley <lindley@coyote.org>
Acked-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5ea05255
Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 148 deletions
drivers/staging/winbond/mlme_s.h
View file @ 1a48ba14
...@@ -7,20 +7,21 @@ ...@@ -7,20 +7,21 @@
#include "mac_structures.h" #include "mac_structures.h"
#include "mds_s.h" #include "mds_s.h"
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ /*
// Mlme.h * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Define the related definitions of MLME module * Mlme.h
// history -- 01/14/03' created * Define the related definitions of MLME module
// *
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
#define AUTH_REJECT_REASON_CHALLENGE_FAIL 1 #define AUTH_REJECT_REASON_CHALLENGE_FAIL 1
//====== the state of MLME module /* the state of MLME module */
#define INACTIVE 0x0 #define INACTIVE 0x0
#define IDLE_SCAN 0x1 #define IDLE_SCAN 0x1
//====== the state of MLME/ESS module /* the state of MLME/ESS module */
#define STATE_1 0x2 #define STATE_1 0x2
#define AUTH_REQ 0x3 #define AUTH_REQ 0x3
#define AUTH_WEP 0x4 #define AUTH_WEP 0x4
...@@ -28,7 +29,7 @@ ...@@ -28,7 +29,7 @@
#define ASSOC_REQ 0x6 #define ASSOC_REQ 0x6
#define STATE_3 0x7 #define STATE_3 0x7
//====== the state of MLME/IBSS module /* the state of MLME/IBSS module */
#define IBSS_JOIN_SYNC 0x8 #define IBSS_JOIN_SYNC 0x8
#define IBSS_AUTH_REQ 0x9 #define IBSS_AUTH_REQ 0x9
#define IBSS_AUTH_CHANLGE 0xa #define IBSS_AUTH_CHANLGE 0xa
...@@ -38,28 +39,24 @@ ...@@ -38,28 +39,24 @@
//========================================= /*
//depend on D5C(MAC timing control 03 register): MaxTxMSDULifeTime default 0x80000us * =========================================
* depend on D5C(MAC timing control 03 register):
* MaxTxMSDULifeTime default 0x80000us
*/
#define AUTH_FAIL_TIMEOUT 550 #define AUTH_FAIL_TIMEOUT 550
#define ASSOC_FAIL_TIMEOUT 550 #define ASSOC_FAIL_TIMEOUT 550
#define REASSOC_FAIL_TIMEOUT 550 #define REASSOC_FAIL_TIMEOUT 550
/* MLME task global CONSTANTS, STRUCTURE, variables */
/* =========================================
// * enum_ResultCode --
// MLME task global CONSTANTS, STRUCTURE, variables * Result code returned from MLME to SME.
// * =========================================
*/
#define MLME_SUCCESS 0 /* follow spec. */
///////////////////////////////////////////////////////////// #define INVALID_PARAMETERS 1 /* Not following spec. */
// enum_ResultCode --
// Result code returned from MLME to SME.
//
/////////////////////////////////////////////////////////////
// PD43 20030829 Modifiled
//#define SUCCESS 0
#define MLME_SUCCESS 0 //follow spec.
#define INVALID_PARAMETERS 1 //Not following spec.
#define NOT_SUPPPORTED 2 #define NOT_SUPPPORTED 2
#define TIMEOUT 3 #define TIMEOUT 3
#define TOO_MANY_SIMULTANEOUS_REQUESTS 4 #define TOO_MANY_SIMULTANEOUS_REQUESTS 4
...@@ -74,21 +71,21 @@ ...@@ -74,21 +71,21 @@
#define OPEN_AUTH 0 #define OPEN_AUTH 0
#define SHARE_AUTH 1 #define SHARE_AUTH 1
#define ANY_AUTH 2 #define ANY_AUTH 2
#define WPA_AUTH 3 //for WPA #define WPA_AUTH 3 /* for WPA */
#define WPAPSK_AUTH 4 #define WPAPSK_AUTH 4
#define WPANONE_AUTH 5 #define WPANONE_AUTH 5
///////////////////////////////////////////// added by ws 04/19/04
#ifdef _WPA2_ #ifdef _WPA2_
#define WPA2_AUTH 6//for WPA2 #define WPA2_AUTH 6 /* for WPA2 */
#define WPA2PSK_AUTH 7 #define WPA2PSK_AUTH 7
#endif //end def _WPA2_ #endif /* end def _WPA2_ */
////////////////////////////////////////////////////////////////// /*
//define the msg type of MLME module * =========================================
////////////////////////////////////////////////////////////////// * define the msg type of MLME module
//-------------------------------------------------------- * =========================================
//from SME */
/* from SME */
#define MLMEMSG_AUTH_REQ 0x0b #define MLMEMSG_AUTH_REQ 0x0b
#define MLMEMSG_DEAUTH_REQ 0x0c #define MLMEMSG_DEAUTH_REQ 0x0c
#define MLMEMSG_ASSOC_REQ 0x0d #define MLMEMSG_ASSOC_REQ 0x0d
...@@ -97,7 +94,7 @@ ...@@ -97,7 +94,7 @@
#define MLMEMSG_START_IBSS_REQ 0x10 #define MLMEMSG_START_IBSS_REQ 0x10
#define MLMEMSG_IBSS_NET_CFM 0x11 #define MLMEMSG_IBSS_NET_CFM 0x11
//from RX : /* from RX */
#define MLMEMSG_RCV_MLMEFRAME 0x20 #define MLMEMSG_RCV_MLMEFRAME 0x20
#define MLMEMSG_RCV_ASSOCRSP 0x22 #define MLMEMSG_RCV_ASSOCRSP 0x22
#define MLMEMSG_RCV_REASSOCRSP 0x24 #define MLMEMSG_RCV_REASSOCRSP 0x24
...@@ -106,7 +103,7 @@ ...@@ -106,7 +103,7 @@
#define MLMEMSG_RCV_DEAUTH 0x2d #define MLMEMSG_RCV_DEAUTH 0x2d
//from TX callback /* from TX callback */
#define MLMEMSG_TX_CALLBACK 0x40 #define MLMEMSG_TX_CALLBACK 0x40
#define MLMEMSG_ASSOCREQ_CALLBACK 0x41 #define MLMEMSG_ASSOCREQ_CALLBACK 0x41
#define MLMEMSG_REASSOCREQ_CALLBACK 0x43 #define MLMEMSG_REASSOCREQ_CALLBACK 0x43
...@@ -114,27 +111,29 @@ ...@@ -114,27 +111,29 @@
#define MLMEMSG_AUTH_CALLBACK 0x4c #define MLMEMSG_AUTH_CALLBACK 0x4c
#define MLMEMSG_DEAUTH_CALLBACK 0x4d #define MLMEMSG_DEAUTH_CALLBACK 0x4d
//#define MLMEMSG_JOIN_FAIL 4
//#define MLMEMSG_AUTHEN_FAIL 18
#define MLMEMSG_TIMEOUT 0x50 #define MLMEMSG_TIMEOUT 0x50
/////////////////////////////////////////////////////////////////////////// /*
//Global data structures * ==============================================
* Global data structures
* ==============================================
*/
#define MAX_NUM_TX_MMPDU 2 #define MAX_NUM_TX_MMPDU 2
#define MAX_MMPDU_SIZE 1512 #define MAX_MMPDU_SIZE 1512
#define MAX_NUM_RX_MMPDU 6 #define MAX_NUM_RX_MMPDU 6
/////////////////////////////////////////////////////////////////////////// /*
//MACRO * ==============================================
#define boMLME_InactiveState(_AA_) (_AA_->wState==INACTIVE) * MACRO
#define boMLME_IdleScanState(_BB_) (_BB_->wState==IDLE_SCAN) * ==============================================
#define boMLME_FoundSTAinfo(_CC_) (_CC_->wState>=IDLE_SCAN) */
#define boMLME_InactiveState(_AA_) (_AA_->wState == INACTIVE)
#define boMLME_IdleScanState(_BB_) (_BB_->wState == IDLE_SCAN)
#define boMLME_FoundSTAinfo(_CC_) (_CC_->wState >= IDLE_SCAN)
typedef struct _MLME_FRAME typedef struct _MLME_FRAME {
{ s8 *pMMPDU;
//NDIS_PACKET MLME_Packet;
s8 * pMMPDU;
u16 len; u16 len;
u8 DataType; u8 DataType;
u8 IsInUsed; u8 IsInUsed;
...@@ -142,55 +141,48 @@ typedef struct _MLME_FRAME ...@@ -142,55 +141,48 @@ typedef struct _MLME_FRAME
spinlock_t MLMESpinLock; spinlock_t MLMESpinLock;
u8 TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE]; u8 TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE];
u8 TxMMPDUInUse[ (MAX_NUM_TX_MMPDU+3) & ~0x03 ]; u8 TxMMPDUInUse[(MAX_NUM_TX_MMPDU + 3) & ~0x03];
u16 wNumTxMMPDU; u16 wNumTxMMPDU;
u16 wNumTxMMPDUDiscarded; u16 wNumTxMMPDUDiscarded;
u8 RxMMPDU[MAX_NUM_RX_MMPDU][MAX_MMPDU_SIZE]; u8 RxMMPDU[MAX_NUM_RX_MMPDU][MAX_MMPDU_SIZE];
u8 SaveRxBufSlotInUse[ (MAX_NUM_RX_MMPDU+3) & ~0x03 ]; u8 SaveRxBufSlotInUse[(MAX_NUM_RX_MMPDU + 3) & ~0x03];
u16 wNumRxMMPDU; u16 wNumRxMMPDU;
u16 wNumRxMMPDUDiscarded; u16 wNumRxMMPDUDiscarded;
u16 wNumRxMMPDUInMLME; // Number of the Rx MMPDU u16 wNumRxMMPDUInMLME; /* Number of the Rx MMPDU */
u16 reserved_1; // in MLME. u16 reserved_1; /* in MLME. */
// excluding the discarded /* excluding the discarded */
} MLME_FRAME, *psMLME_FRAME; } MLME_FRAME, *psMLME_FRAME;
typedef struct _AUTHREQ { typedef struct _AUTHREQ {
u8 peerMACaddr[MAC_ADDR_LENGTH]; u8 peerMACaddr[MAC_ADDR_LENGTH];
u16 wAuthAlgorithm; u16 wAuthAlgorithm;
} MLME_AUTHREQ_PARA, *psMLME_AUTHREQ_PARA; } MLME_AUTHREQ_PARA, *psMLME_AUTHREQ_PARA;
typedef struct _ASSOCREQ { typedef struct _ASSOCREQ {
u8 PeerSTAAddr[MAC_ADDR_LENGTH]; u8 PeerSTAAddr[MAC_ADDR_LENGTH];
u16 CapabilityInfo; u16 CapabilityInfo;
u16 ListenInterval; u16 ListenInterval;
} __attribute__ ((packed)) MLME_ASSOCREQ_PARA, *psMLME_ASSOCREQ_PARA;
}__attribute__ ((packed)) MLME_ASSOCREQ_PARA, *psMLME_ASSOCREQ_PARA;
typedef struct _REASSOCREQ { typedef struct _REASSOCREQ {
u8 NewAPAddr[MAC_ADDR_LENGTH]; u8 NewAPAddr[MAC_ADDR_LENGTH];
u16 CapabilityInfo; u16 CapabilityInfo;
u16 ListenInterval; u16 ListenInterval;
} __attribute__ ((packed)) MLME_REASSOCREQ_PARA, *psMLME_REASSOCREQ_PARA;
}__attribute__ ((packed)) MLME_REASSOCREQ_PARA, *psMLME_REASSOCREQ_PARA;
typedef struct _MLMECALLBACK { typedef struct _MLMECALLBACK {
u8 *psFramePtr; u8 *psFramePtr;
u8 bResult; u8 bResult;
} MLME_TXCALLBACK, *psMLME_TXCALLBACK; } MLME_TXCALLBACK, *psMLME_TXCALLBACK;
typedef struct _RXDATA typedef struct _RXDATA {
{
s32 FrameLength; s32 FrameLength;
u8 __attribute__ ((packed)) *pbFramePtr; u8 __attribute__ ((packed)) *pbFramePtr;
} __attribute__ ((packed)) RXDATA, *psRXDATA;
}__attribute__ ((packed)) RXDATA, *psRXDATA;
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7