Staging: rt28x0: run *.h files through Lindent

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/rt2860/ap.h

@@ -41,40 +41,26 @@
 #define __AP_H__
 
 // ap_wpa.c
-VOID WpaStateMachineInit(
-    IN  PRTMP_ADAPTER   pAd,
-    IN  STATE_MACHINE *Sm,
-    OUT STATE_MACHINE_FUNC Trans[]);
+VOID WpaStateMachineInit(IN PRTMP_ADAPTER pAd,
+			 IN STATE_MACHINE * Sm, OUT STATE_MACHINE_FUNC Trans[]);
 
 #ifdef RTMP_MAC_USB
-VOID BeaconUpdateExec(
-    IN PVOID SystemSpecific1,
+VOID BeaconUpdateExec(IN PVOID SystemSpecific1,
 		      IN PVOID FunctionContext,
-    IN PVOID SystemSpecific2,
-    IN PVOID SystemSpecific3);
+		      IN PVOID SystemSpecific2, IN PVOID SystemSpecific3);
 #endif // RTMP_MAC_USB //
 
-VOID RTMPSetPiggyBack(
-	IN PRTMP_ADAPTER	pAd,
-	IN BOOLEAN			bPiggyBack);
+VOID RTMPSetPiggyBack(IN PRTMP_ADAPTER pAd, IN BOOLEAN bPiggyBack);
 
-VOID MacTableReset(
-    IN  PRTMP_ADAPTER   pAd);
+VOID MacTableReset(IN PRTMP_ADAPTER pAd);
 
-MAC_TABLE_ENTRY *MacTableInsertEntry(
-    IN  PRTMP_ADAPTER   pAd,
+MAC_TABLE_ENTRY *MacTableInsertEntry(IN PRTMP_ADAPTER pAd,
 				     IN PUCHAR pAddr,
-	IN	UCHAR			apidx,
-	IN BOOLEAN	CleanAll);
+				     IN UCHAR apidx, IN BOOLEAN CleanAll);
 
-BOOLEAN MacTableDeleteEntry(
-    IN  PRTMP_ADAPTER   pAd,
-	IN USHORT wcid,
-    IN  PUCHAR          pAddr);
+BOOLEAN MacTableDeleteEntry(IN PRTMP_ADAPTER pAd,
+			    IN USHORT wcid, IN PUCHAR pAddr);
 
-MAC_TABLE_ENTRY *MacTableLookup(
-    IN  PRTMP_ADAPTER   pAd,
-    IN  PUCHAR          pAddr);
+MAC_TABLE_ENTRY *MacTableLookup(IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr);
 
 #endif // __AP_H__
-

drivers/staging/rt2860/chip/mac_pci.h

@@ -43,7 +43,6 @@
 #include "../rtmp_iface.h"
 #include "../rtmp_dot11.h"
 
-
 //
 // Device ID & Vendor ID related definitions,
 // NOTE: you should not add the new VendorID/DeviceID here unless you not sure it belongs to what chip.
@@ -61,10 +60,6 @@
 #define PCI_CLASS_BRIDGE_PCI		0x0604
 #endif
 
-
-
-
-
 #define TXINFO_SIZE						0
 #define RTMP_PKT_TAIL_PADDING			0
 #define fRTMP_ADAPTER_NEED_STOP_TX	0
@@ -96,11 +91,10 @@ typedef	struct	PACKED _TXD_STRUC {
 	UINT32 ICO:1;		//
 } TXD_STRUC, *PTXD_STRUC;
 
-
 //
 // Rx descriptor format, Rx Ring
 //
-typedef	struct	PACKED _RXD_STRUC{
+typedef struct PACKED _RXD_STRUC {
 	// Word 0
 	UINT32 SDP0;
 	// Word 1
@@ -129,13 +123,12 @@ typedef	struct	PACKED _RXD_STRUC{
 	UINT32 AMPDU:1;
 	UINT32 Decrypted:1;	// this frame is being decrypted.
 	UINT32 PlcpSignal:1;	// To be moved
-	UINT32		PlcpRssil:1;// To be moved
+	UINT32 PlcpRssil:1;	// To be moved
 	UINT32 Rsv1:13;
 } RXD_STRUC, *PRXD_STRUC, RT28XX_RXD_STRUC, *PRT28XX_RXD_STRUC;
 
 typedef union _TX_ATTENUATION_CTRL_STRUC {
-	struct
-	{
+	struct {
 		ULONG RF_ISOLATION_ENABLE:1;
 		ULONG Reserve2:7;
 		ULONG PCIE_PHY_TX_ATTEN_VALUE:3;
@@ -152,7 +145,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 #define FIRMWARE_IMAGE_BASE     0x2000
 #define MAX_FIRMWARE_IMAGE_SIZE 0x2000	// 8kbyte
 
-
 /* ----------------- Frimware Related MACRO ----------------- */
 #define RTMP_WRITE_FIRMWARE(_pAd, _pFwImage, _FwLen)			\
 	do{								\
@@ -175,12 +167,10 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 		RTMP_IO_WRITE32(_pAd, H2M_MAILBOX_CSR, 0);		\
 	}while(0)
 
-
 /* ----------------- TX Related MACRO ----------------- */
 #define RTMP_START_DEQUEUE(pAd, QueIdx, irqFlags)		do{}while(0)
 #define RTMP_STOP_DEQUEUE(pAd, QueIdx, irqFlags)		do{}while(0)
 
-
 #define RTMP_HAS_ENOUGH_FREE_DESC(pAd, pTxBlk, freeNum, pPacket) \
 		((freeNum) >= (ULONG)(pTxBlk->TotalFragNum + RTMP_GET_PACKET_FRAGMENTS(pPacket) + 3))	/* rough estimate we will use 3 more descriptor. */
 #define RTMP_RELEASE_DESC_RESOURCE(pAd, QueIdx)	\
@@ -190,12 +180,11 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 		(((freeNum != (TX_RING_SIZE-1)) && (pAd->TxSwQueue[QueIdx].Number == 0)) || (freeNum<3))
 		//(((freeNum) != (TX_RING_SIZE-1)) && (pAd->TxSwQueue[QueIdx].Number == 1 /*0*/))
 
-
 #define HAL_KickOutMgmtTx(_pAd, _QueIdx, _pPacket, _pSrcBufVA, _SrcBufLen)	\
 			RtmpPCIMgmtKickOut(_pAd, _QueIdx, _pPacket, _pSrcBufVA, _SrcBufLen)
 
 #define HAL_WriteSubTxResource(pAd, pTxBlk, bIsLast, pFreeNumber)	\
-		/* RtmpPCI_WriteSubTxResource(pAd, pTxBlk, bIsLast, pFreeNumber)*/
+				/* RtmpPCI_WriteSubTxResource(pAd, pTxBlk, bIsLast, pFreeNumber) */
 
 #define HAL_WriteTxResource(pAd, pTxBlk,bIsLast, pFreeNumber)	\
 			RtmpPCI_WriteSingleTxResource(pAd, pTxBlk, bIsLast, pFreeNumber)
@@ -210,7 +199,7 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 			RtmpPCI_FinalWriteTxResource(_pAd, _pTxBlk, _TotalMPDUSize, _FirstTxIdx)
 
 #define HAL_LastTxIdx(_pAd, _QueIdx,_LastTxIdx) \
-			/*RtmpPCIDataLastTxIdx(_pAd, _QueIdx,_LastTxIdx)*/
+				/*RtmpPCIDataLastTxIdx(_pAd, _QueIdx,_LastTxIdx) */
 
 #define HAL_KickOutTx(_pAd, _pTxBlk, _QueIdx)	\
 			RTMP_IO_WRITE32((_pAd), TX_CTX_IDX0+((_QueIdx)*0x10), (_pAd)->TxRing[(_QueIdx)].TxCpuIdx)
@@ -225,17 +214,14 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 			 :	\
 			(_pAd->TxRing[_QueIdx].TxSwFreeIdx + TX_RING_SIZE - _pAd->TxRing[_QueIdx].TxCpuIdx - 1);
 
-
 #define GET_MGMTRING_FREENO(_pAd) \
 	(_pAd->MgmtRing.TxSwFreeIdx > _pAd->MgmtRing.TxCpuIdx)	? \
 			(_pAd->MgmtRing.TxSwFreeIdx - _pAd->MgmtRing.TxCpuIdx - 1) \
 			 :	\
 			(_pAd->MgmtRing.TxSwFreeIdx + MGMT_RING_SIZE - _pAd->MgmtRing.TxCpuIdx - 1);
 
-
 /* ----------------- RX Related MACRO ----------------- */
 
-
 /* ----------------- ASIC Related MACRO ----------------- */
 // reset MAC of a station entry to 0x000000000000
 #define RTMP_STA_ENTRY_MAC_RESET(pAd, Wcid)	\
@@ -272,7 +258,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 						  pAd->SharedKey[apidx][KeyID].CipherAlg,		\
 						  pEntry); }
 
-
 // Insert the BA bitmap to ASIC for the Wcid entry
 #define RTMP_ADD_BA_SESSION_TO_ASIC(_pAd, _Aid, _TID)	\
 		do{					\
@@ -283,7 +268,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 			RTMP_IO_WRITE32((_pAd), _Offset, _Value);\
 		}while(0)
 
-
 // Remove the BA bitmap from ASIC for the Wcid entry
 //              bitmap field starts at 0x10000 in ASIC WCID table
 #define RTMP_DEL_BA_SESSION_FROM_ASIC(_pAd, _Wcid, _TID)				\
@@ -295,7 +279,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 			RTMP_IO_WRITE32((_pAd), _Offset, _Value);			\
 		}while(0)
 
-
 /* ----------------- Interface Related MACRO ----------------- */
 
 //
@@ -314,7 +297,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 		RTMP_SET_FLAG((_pAd), fRTMP_ADAPTER_INTERRUPT_ACTIVE);	\
 	}while(0)
 
-
 #define RTMP_IRQ_INIT(pAd)	\
 	{	pAd->int_enable_reg = ((DELAYINTMASK) |		\
 					(RxINT|TxDataInt|TxMgmtInt)) & ~(0x03);	\
@@ -326,7 +308,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 		RTMP_IO_WRITE32(pAd, INT_SOURCE_CSR, 0xffffffff);\
 		RTMP_ASIC_INTERRUPT_ENABLE(pAd); }
 
-
 /* ----------------- MLME Related MACRO ----------------- */
 #define RTMP_MLME_HANDLER(pAd)			MlmeHandler(pAd)
 
@@ -344,7 +325,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 /* ----------------- Power Save Related MACRO ----------------- */
 #define RTMP_PS_POLL_ENQUEUE(pAd)				EnqueuePsPoll(pAd)
 
-
 // For RTMPPCIePowerLinkCtrlRestore () function
 #define RESTORE_HALT		1
 #define RESTORE_WAKEUP		2
@@ -358,7 +338,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
 #define CID2MASK		0x00ff0000
 #define CID3MASK		0xff000000
 
-
 #define RTMP_STA_FORCE_WAKEUP(pAd, bFromTx) \
     RT28xxPciStaAsicForceWakeup(pAd, bFromTx);
 

drivers/staging/rt2860/chip/mac_usb.h

@@ -43,7 +43,6 @@
 #include "../rtmp_iface.h"
 #include "../rtmp_dot11.h"
 
-
 #define USB_CYC_CFG				0x02a4
 
 #define BEACON_RING_SIZE		2
@@ -85,7 +84,6 @@ typedef	struct	PACKED _RXINFO_STRUC {
 	UINT32 PlcpSignal:12;
 } RXINFO_STRUC, *PRXINFO_STRUC, RT28XX_RXD_STRUC, *PRT28XX_RXD_STRUC;
 
-
 //
 // TXINFO
 //
@@ -100,10 +98,9 @@ typedef	struct	_TXINFO_STRUC {
 	UINT32 SwUseLastRound:1;	// Software use.
 	UINT32 rsv2:2;		// Software use.
 	UINT32 USBDMANextVLD:1;	//used ONLY in USB bulk Aggregation, NextValid
-	UINT32		USBDMATxburst:1;//used ONLY in USB bulk Aggre. Force USB DMA transmit frame from current selected endpoint
+	UINT32 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
 //
@@ -113,34 +110,31 @@ typedef	struct	_MGMT_STRUC	{
 	ULONG Length;
 } MGMT_STRUC, *PMGMT_STRUC;
 
-
 ////////////////////////////////////////////////////////////////////////////
 // The TX_BUFFER structure forms the transmitted USB packet to the device
 ////////////////////////////////////////////////////////////////////////////
-typedef struct __TX_BUFFER{
-	union{
+typedef struct __TX_BUFFER {
+	union {
 		UCHAR WirelessPacket[TX_BUFFER_NORMSIZE];
 		HEADER_802_11 NullFrame;
 		PSPOLL_FRAME PsPollPacket;
 		RTS_FRAME RTSFrame;
-	}field;
+	} field;
 	UCHAR Aggregation[4];	//Buffer for save Aggregation size.
 } TX_BUFFER, *PTX_BUFFER;
 
-typedef struct __HTTX_BUFFER{
-	union{
+typedef struct __HTTX_BUFFER {
+	union {
 		UCHAR WirelessPacket[MAX_TXBULK_SIZE];
 		HEADER_802_11 NullFrame;
 		PSPOLL_FRAME PsPollPacket;
 		RTS_FRAME RTSFrame;
-	}field;
+	} field;
 	UCHAR Aggregation[4];	//Buffer for save Aggregation size.
 } HTTX_BUFFER, *PHTTX_BUFFER;
 
-
 // used to track driver-generated write irps
-typedef struct _TX_CONTEXT
-{
+typedef struct _TX_CONTEXT {
 	PVOID pAd;		//Initialized in MiniportInitialize
 	PURB pUrb;		//Initialized in MiniportInitialize
 	PIRP pIrp;		//used to cancel pending bulk out.
@@ -163,10 +157,8 @@ typedef struct _TX_CONTEXT
 
 } TX_CONTEXT, *PTX_CONTEXT, **PPTX_CONTEXT;
 
-
 // used to track driver-generated write irps
-typedef struct _HT_TX_CONTEXT
-{
+typedef struct _HT_TX_CONTEXT {
 	PVOID pAd;		//Initialized in MiniportInitialize
 	PURB pUrb;		//Initialized in MiniportInitialize
 	PIRP pIrp;		//used to cancel pending bulk out.
@@ -189,16 +181,14 @@ typedef struct _HT_TX_CONTEXT
 	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
 // receive data to the protocol.
 //
-typedef struct _RX_CONTEXT
-{
+typedef struct _RX_CONTEXT {
 	PUCHAR TransferBuffer;
 	PVOID pAd;
-	PIRP				pIrp;//used to cancel pending bulk in.
+	PIRP pIrp;		//used to cancel pending bulk in.
 	PURB pUrb;
 	//These 2 Boolean shouldn't both be 1 at the same time.
 	ULONG BulkInOffset;	// number of packets waiting for reordering .
@@ -212,8 +202,6 @@ typedef struct _RX_CONTEXT
 	dma_addr_t data_dma;	// urb dma on linux
 } RX_CONTEXT, *PRX_CONTEXT;
 
-
-
 /******************************************************************************
 
 	USB Frimware Related MACRO
@@ -226,8 +214,6 @@ typedef struct _RX_CONTEXT
 #define RTMP_WRITE_FIRMWARE(_pAd, _pFwImage, _FwLen)		\
 	RTUSBFirmwareWrite(_pAd, _pFwImage, _FwLen)
 
-
-
 /******************************************************************************
 
 	USB TX Related MACRO
@@ -281,7 +267,7 @@ typedef struct _RX_CONTEXT
 			RtmpUSB_FinalWriteTxResource(pAd, pTxBlk, totalMPDUSize, TxIdx)
 
 #define HAL_LastTxIdx(pAd, QueIdx,TxIdx) \
-			/*RtmpUSBDataLastTxIdx(pAd, QueIdx,TxIdx)*/
+				/*RtmpUSBDataLastTxIdx(pAd, QueIdx,TxIdx) */
 
 #define HAL_KickOutTx(pAd, pTxBlk, QueIdx)	\
 			RtmpUSBDataKickOut(pAd, pTxBlk, QueIdx)
@@ -295,17 +281,14 @@ typedef struct _RX_CONTEXT
 #define GET_TXRING_FREENO(_pAd, _QueIdx)	(_QueIdx)	//(_pAd->TxRing[_QueIdx].TxSwFreeIdx)
 #define GET_MGMTRING_FREENO(_pAd)			(_pAd->MgmtRing.TxSwFreeIdx)
 
-
 /* ----------------- RX Related MACRO ----------------- */
 
-
 /*
   *	Device Hardware Interface Related MACRO
   */
 #define RTMP_IRQ_INIT(pAd)				do{}while(0)
 #define RTMP_IRQ_ENABLE(pAd)			do{}while(0)
 
-
 /*
   *	MLME Related MACRO
   */
@@ -330,7 +313,6 @@ typedef struct _RX_CONTEXT
 		RTUSBMlmeUp(_pAd);									\
 	}
 
-
 /*
   *	Power Save Related MACRO
   */

drivers/staging/rt2860/chip/rt2860.h

@@ -46,11 +46,9 @@
 #define NIC2760_PCI_DEVICE_ID	0x0701	// 1T/2R Cardbus ???
 #define NIC2790_PCIe_DEVICE_ID  0x0781	// 1T/2R miniCard
 
-
 #define VEN_AWT_PCIe_DEVICE_ID	0x1059
 #define VEN_AWT_PCI_VENDOR_ID		0x1A3B
 
 #define EDIMAX_PCI_VENDOR_ID		0x1432
 
-
 #endif //__RT2860_H__ //

drivers/staging/rt2860/chip/rt2870.h

@@ -40,7 +40,6 @@
 #include "../rtmp_type.h"
 #include "mac_usb.h"
 
-
 //#define RTMP_CHIP_NAME                "RT2870"
 
 #endif // RT2870 //

drivers/staging/rt2860/chip/rt3070.h

@@ -39,7 +39,6 @@
 
 #ifdef RT3070
 
-
 #ifndef RTMP_USB_SUPPORT
 #error "For RT3070, you should define the compile flag -DRTMP_USB_SUPPORT"
 #endif

drivers/staging/rt2860/chip/rt30xx.h

@@ -39,7 +39,6 @@
 
 #ifdef RT30xx
 
-
 extern REG_PAIR RT30xx_RFRegTable[];
 extern UCHAR NUM_RF_REG_PARMS;
 

drivers/staging/rt2860/chip/rtmp_mac.h

@@ -38,8 +38,6 @@
 #ifndef __RTMP_MAC_H__
 #define __RTMP_MAC_H__
 
-
-
 // =================================================================================
 // TX / RX ring descriptor format
 // =================================================================================
@@ -50,7 +48,6 @@
 #define FIFO_HCCA                 1
 #define FIFO_EDCA                 2
 
-
 //
 // TXD Wireless Information format for Tx ring and Mgmt Ring
 //
@@ -93,7 +90,6 @@ typedef	struct	PACKED _TXWI_STRUC {
 	UINT32 EIV;
 } TXWI_STRUC, *PTXWI_STRUC;
 
-
 //
 // RXWI wireless information format, in PBF. invisible in driver.
 //
@@ -124,15 +120,13 @@ typedef	struct	PACKED _RXWI_STRUC {
 	UINT32 SNR1:8;
 	UINT32 FOFFSET:8;	// RT35xx
 	UINT32 rsv2:8;
-	/*UINT32		rsv2:16;*/
+	/*UINT32                rsv2:16; */
 } RXWI_STRUC, *PRXWI_STRUC;
 
-
 // =================================================================================
 // Register format
 // =================================================================================
 
-
 //
 // SCH/DMA registers - base address 0x0200
 //
@@ -145,22 +139,22 @@ typedef	union	_INT_SOURCE_CSR_STRUC	{
 		UINT32 RxDelayINT:1;
 		UINT32 TxDelayINT:1;
 		UINT32 RxDone:1;
-		UINT32		Ac0DmaDone:1;//4
+		UINT32 Ac0DmaDone:1;	//4
 		UINT32 Ac1DmaDone:1;
 		UINT32 Ac2DmaDone:1;
 		UINT32 Ac3DmaDone:1;
 		UINT32 HccaDmaDone:1;	// bit7
 		UINT32 MgmtDmaDone:1;
-		UINT32		MCUCommandINT:1;//bit 9
+		UINT32 MCUCommandINT:1;	//bit 9
 		UINT32 RxTxCoherent:1;
 		UINT32 TBTTInt:1;
 		UINT32 PreTBTT:1;
-		UINT32		TXFifoStatusInt:1;//FIFO Statistics is full, sw should read 0x171c
-		UINT32		AutoWakeup:1;//bit14
+		UINT32 TXFifoStatusInt:1;	//FIFO Statistics is full, sw should read 0x171c
+		UINT32 AutoWakeup:1;	//bit14
 		UINT32 GPTimer:1;
-		UINT32		RxCoherent:1;//bit16
+		UINT32 RxCoherent:1;	//bit16
 		UINT32 TxCoherent:1;
-		UINT32		:14;
+		 UINT32:14;
 	} field;
 	UINT32 word;
 } INT_SOURCE_CSR_STRUC, *PINT_SOURCE_CSR_STRUC;
@@ -181,7 +175,7 @@ typedef	union	_INT_MASK_CSR_STRUC	{
 		UINT32 HccaDmaDone:1;
 		UINT32 MgmtDmaDone:1;
 		UINT32 MCUCommandINT:1;
-		UINT32		:20;
+		 UINT32:20;
 		UINT32 RxCoherent:1;
 		UINT32 TxCoherent:1;
 	} field;
@@ -215,7 +209,7 @@ typedef	union	_WPDMA_RST_IDX_STRUC	{
 		UINT32 RST_DTX_IDX5:1;
 		UINT32 rsv:10;
 		UINT32 RST_DRX_IDX0:1;
-		UINT32		:15;
+		 UINT32:15;
 	} field;
 	UINT32 word;
 } WPDMA_RST_IDX_STRUC, *PWPDMA_RST_IDX_STRUC;
@@ -272,7 +266,6 @@ typedef	union	_CWMAX_CSR_STRUC	{
 	UINT32 word;
 } CWMAX_CSR_STRUC, *PCWMAX_CSR_STRUC;
 
-
 //
 // AC_TXOP_CSR0: AC_BK/AC_BE TXOP register
 //
@@ -297,7 +290,6 @@ typedef	union	_AC_TXOP_CSR1_STRUC	{
 	UINT32 word;
 } AC_TXOP_CSR1_STRUC, *PAC_TXOP_CSR1_STRUC;
 
-
 #define RINGREG_DIFF			0x10
 #define GPIO_CTRL_CFG    0x0228	//MAC_CSR13
 #define MCU_CMD_CFG    0x022c
@@ -333,7 +325,6 @@ typedef	union	_AC_TXOP_CSR1_STRUC	{
 #define RX_CRX_IDX       0x0298
 #define RX_DRX_IDX      0x029c
 
-
 #define USB_DMA_CFG      0x02a0
 typedef union _USB_DMA_CFG_STRUC {
 	struct {
@@ -353,7 +344,6 @@ typedef	union	_USB_DMA_CFG_STRUC	{
 	UINT32 word;
 } USB_DMA_CFG_STRUC, *PUSB_DMA_CFG_STRUC;
 
-
 //
 //  3  PBF  registers
 //
@@ -385,7 +375,6 @@ typedef	union	_USB_DMA_CFG_STRUC	{
 #define LDO_CFG0				0x05d4
 #define GPIO_SWITCH				0x05dc
 
-
 //
 //  4  MAC  registers
 //
@@ -459,7 +448,7 @@ typedef	union	_BBP_CSR_CFG_STRUC	{
 		UINT32 Busy:1;	// 1: ASIC is busy execute BBP programming.
 		UINT32 BBP_PAR_DUR:1;	// 0: 4 MAC clock cycles  1: 8 MAC clock cycles
 		UINT32 BBP_RW_MODE:1;	// 0: use serial mode  1:parallel
-		UINT32		:12;
+		 UINT32:12;
 	} field;
 	UINT32 word;
 } BBP_CSR_CFG_STRUC, *PBBP_CSR_CFG_STRUC;
@@ -505,7 +494,7 @@ typedef	union	_LED_CFG_STRUC	{
 		UINT32 GLedMode:2;	// green Led Mode
 		UINT32 YLedMode:2;	// yellow Led Mode
 		UINT32 LedPolar:1;	// Led Polarity.  0: active low1: active high
-		UINT32		:1;
+		 UINT32:1;
 	} field;
 	UINT32 word;
 } LED_CFG_STRUC, *PLED_CFG_STRUC;
@@ -544,7 +533,7 @@ typedef	union	_BCN_TIME_CFG_STRUC	{
 		UINT32 TsfSyncMode:2;	// Enable TSF sync, 00: disable, 01: infra mode, 10: ad-hoc mode
 		UINT32 bTBTTEnable:1;
 		UINT32 bBeaconGen:1;	// Enable beacon generator
-        UINT32       :3;
+		 UINT32:3;
 		UINT32 TxTimestampCompensate:8;
 	} field;
 	UINT32 word;
@@ -571,7 +560,7 @@ typedef	union	_AUTO_WAKEUP_STRUC	{
 		UINT32 AutoLeadTime:8;
 		UINT32 NumofSleepingTbtt:7;	// ForceWake has high privilege than PutToSleep when both set
 		UINT32 EnableAutoWakeup:1;	// 0:sleep, 1:awake
-		UINT32		:16;
+		 UINT32:16;
 	} field;
 	UINT32 word;
 } AUTO_WAKEUP_STRUC, *PAUTO_WAKEUP_STRUC;
@@ -589,7 +578,7 @@ typedef	union	_EDCA_AC_CFG_STRUC	{
 		UINT32 Aifsn:4;	// # of slot time
 		UINT32 Cwmin:4;	//
 		UINT32 Cwmax:4;	//unit power of 2
-	    UINT32  :12;       //
+		 UINT32:12;	//
 	} field;
 	UINT32 word;
 } EDCA_AC_CFG_STRUC, *PEDCA_AC_CFG_STRUC;
@@ -711,7 +700,6 @@ typedef	union	_LG_FBK_CFG1_STRUC	{
 	UINT32 word;
 } LG_FBK_CFG1_STRUC, *PLG_FBK_CFG1_STRUC;
 
-
 //=======================================================
 //================ Protection Paramater================================
 //=======================================================
@@ -763,7 +751,7 @@ typedef union _AUTO_RSP_CFG_STRUC {
 		UINT32 rsv:1;	// Power bit value in conrtrol frame
 		UINT32 DualCTSEn:1;	// Power bit value in conrtrol frame
 		UINT32 AckCtsPsmBit:1;	// Power bit value in conrtrol frame
-     UINT32        :24;
+		 UINT32:24;
 	} field;
 	UINT32 word;
 } AUTO_RSP_CFG_STRUC, *PAUTO_RSP_CFG_STRUC;
@@ -990,25 +978,24 @@ typedef	union	_MPDU_DEN_CNT_STRUC	{
 #define SHAREDKEYTABLE			0
 #define PAIRWISEKEYTABLE			1
 
-
 typedef union _SHAREDKEY_MODE_STRUC {
 	struct {
 		UINT32 Bss0Key0CipherAlg:3;
-		UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss0Key1CipherAlg:3;
-		UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss0Key2CipherAlg:3;
-		UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss0Key3CipherAlg:3;
-		UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss1Key0CipherAlg:3;
-		UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss1Key1CipherAlg:3;
-		UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss1Key2CipherAlg:3;
-		UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss1Key3CipherAlg:3;
-		UINT32       :1;
+		 UINT32:1;
 	} field;
 	UINT32 word;
 } SHAREDKEY_MODE_STRUC, *PSHAREDKEY_MODE_STRUC;
@@ -1018,7 +1005,6 @@ typedef struct _HW_WCID_ENTRY {  // 8-byte per entry
 	UCHAR Rsv[2];
 } HW_WCID_ENTRY, PHW_WCID_ENTRY;
 
-
 // =================================================================================
 // WCID  format
 // =================================================================================
@@ -1048,7 +1034,6 @@ typedef	struct	_MAC_ATTRIBUTE_STRUC {
 	UINT32 rsv:22;
 } MAC_ATTRIBUTE_STRUC, *PMAC_ATTRIBUTE_STRUC;
 
-
 // =================================================================================
 // HOST-MCU communication data structure
 // =================================================================================
@@ -1079,7 +1064,6 @@ typedef union _M2H_CMD_DONE_STRUC {
 	UINT32 word;
 } M2H_CMD_DONE_STRUC, *PM2H_CMD_DONE_STRUC;
 
-
 //NAV_TIME_CFG :NAV
 typedef union _NAV_TIME_CFG_STRUC {
 	struct {
@@ -1092,7 +1076,6 @@ typedef	union	_NAV_TIME_CFG_STRUC	{
 	UINT32 word;
 } NAV_TIME_CFG_STRUC, *PNAV_TIME_CFG_STRUC;
 
-
 //
 // RX_FILTR_CFG:  /RX configuration register
 //
@@ -1119,14 +1102,11 @@ typedef	union	_RX_FILTR_CFG_STRUC	{
 		UINT32 DropBAR:1;	//
 
 		UINT32 DropRsvCntlType:1;
-		UINT32		:15;
+		 UINT32:15;
 	} field;
 	UINT32 word;
 } RX_FILTR_CFG_STRUC, *PRX_FILTR_CFG_STRUC;
 
-
-
-
 //
 // PHY_CSR4: RF serial control register
 //
@@ -1141,33 +1121,31 @@ typedef	union	_PHY_CSR4_STRUC	{
 	UINT32 word;
 } PHY_CSR4_STRUC, *PPHY_CSR4_STRUC;
 
-
 //
 // SEC_CSR5: shared key table security mode register
 //
 typedef union _SEC_CSR5_STRUC {
 	struct {
 		UINT32 Bss2Key0CipherAlg:3;
-        UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss2Key1CipherAlg:3;
-        UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss2Key2CipherAlg:3;
-        UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss2Key3CipherAlg:3;
-        UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss3Key0CipherAlg:3;
-        UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss3Key1CipherAlg:3;
-        UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss3Key2CipherAlg:3;
-        UINT32       :1;
+		 UINT32:1;
 		UINT32 Bss3Key3CipherAlg:3;
-        UINT32       :1;
+		 UINT32:1;
 	} field;
 	UINT32 word;
 } SEC_CSR5_STRUC, *PSEC_CSR5_STRUC;
 
-
 //
 // HOST_CMD_CSR: For HOST to interrupt embedded processor
 //
@@ -1179,13 +1157,10 @@ typedef	union	_HOST_CMD_CSR_STRUC	{
 	UINT32 word;
 } HOST_CMD_CSR_STRUC, *PHOST_CMD_CSR_STRUC;
 
-
 //
 // AIFSN_CSR: AIFSN for each EDCA AC
 //
 
-
-
 //
 // E2PROM_CSR: EEPROM control register
 //
@@ -1242,7 +1217,6 @@ typedef	union	_RF_CSR_CFG_STRUC	{
 	UINT word;
 } RF_CSR_CFG_STRUC, *PRF_CSR_CFG_STRUC;
 
-
 //
 // Other on-chip shared memory space, base = 0x2000
 //
@@ -1305,8 +1279,6 @@ typedef	union	_RF_CSR_CFG_STRUC	{
 #define E2PROM_CSR          0x0004
 #define IO_CNTL_CSR         0x77d0
 
-
-
 // ================================================================
 // Tx / Rx / Mgmt ring descriptor definition
 // ================================================================

drivers/staging/rt2860/chip/rtmp_phy.h

@@ -38,7 +38,6 @@
 #ifndef __RTMP_PHY_H__
 #define __RTMP_PHY_H__
 
-
 /*
 	RF sections
 */
@@ -75,7 +74,6 @@
 #define RF_R30			30
 #define RF_R31			31
 
-
 // value domain of pAd->RfIcType
 #define RFIC_2820                   1	// 2.4G 2T3R
 #define RFIC_2850                   2	// 2.4G/5G 2T3R
@@ -416,7 +414,6 @@
 		}														\
 	}while(0)
 
-
 /*
 	This marco used for the BBP write operation which didn't need via MCU.
 */
@@ -539,7 +536,6 @@
 		RTMP_IO_WRITE32(_pAd, 0x1210, _macData);				\
 	}while(0)
 
-
 #define RTMP_ASIC_MMPS_ENABLE(_pAd)							\
 	do{															\
 		UINT32 _macData; \

drivers/staging/rt2860/chlist.h

@@ -41,7 +41,6 @@
 #include "rtmp_type.h"
 #include "rtmp_def.h"
 
-
 #define ODOR			0
 #define IDOR			1
 #define BOTH			2
@@ -66,15 +65,14 @@ typedef struct _CH_REGION {
 
 extern CH_REGION ChRegion[];
 
-typedef struct _CH_FREQ_MAP_{
+typedef struct _CH_FREQ_MAP_ {
 	UINT16 channel;
 	UINT16 freqKHz;
-}CH_FREQ_MAP;
+} CH_FREQ_MAP;
 
 extern CH_FREQ_MAP CH_HZ_ID_MAP[];
 extern int CH_HZ_ID_MAP_NUM;
 
-
 #define     MAP_CHANNEL_ID_TO_KHZ(_ch, _khz)					\
 		do{													\
 			int _chIdx;											\
@@ -105,24 +103,15 @@ extern int CH_HZ_ID_MAP_NUM;
 				(_ch) = 1;											\
 		}while(0)
 
+VOID BuildChannelListEx(IN PRTMP_ADAPTER pAd);
 
-VOID BuildChannelListEx(
-	IN PRTMP_ADAPTER pAd);
+VOID BuildBeaconChList(IN PRTMP_ADAPTER pAd,
+		       OUT PUCHAR pBuf, OUT PULONG pBufLen);
 
-VOID BuildBeaconChList(
-	IN PRTMP_ADAPTER pAd,
-	OUT PUCHAR pBuf,
-	OUT	PULONG pBufLen);
+VOID N_ChannelCheck(IN PRTMP_ADAPTER pAd);
 
-VOID N_ChannelCheck(
-	IN PRTMP_ADAPTER pAd);
+VOID N_SetCenCh(IN PRTMP_ADAPTER pAd);
 
-VOID N_SetCenCh(
-	IN PRTMP_ADAPTER pAd);
-
-UINT8 GetCuntryMaxTxPwr(
-	IN PRTMP_ADAPTER pAd,
-	IN UINT8 channel);
+UINT8 GetCuntryMaxTxPwr(IN PRTMP_ADAPTER pAd, IN UINT8 channel);
 
 #endif // __CHLIST_H__
-

drivers/staging/rt2860/common/action.h

@@ -39,17 +39,14 @@
 #ifndef	__ACTION_H__
 #define	__ACTION_H__
 
-typedef struct PACKED __HT_INFO_OCTET
-{
+typedef struct PACKED __HT_INFO_OCTET {
 	UCHAR Request:1;
 	UCHAR Forty_MHz_Intolerant:1;
 	UCHAR STA_Channel_Width:1;
 	UCHAR Reserved:5;
 } HT_INFORMATION_OCTET;
 
-
-typedef struct PACKED __FRAME_HT_INFO
-{
+typedef struct PACKED __FRAME_HT_INFO {
 	HEADER_802_11 Hdr;
 	UCHAR Category;
 	UCHAR Action;
@@ -57,5 +54,3 @@ typedef struct PACKED __FRAME_HT_INFO
 } FRAME_HT_INFO, *PFRAME_HT_INFO;
 
 #endif /* __ACTION_H__ */
-
-

drivers/staging/rt2860/crypt_hmac.h

@@ -48,24 +48,18 @@
 
 #ifdef SHA1_SUPPORT
 #define HMAC_SHA1_SUPPORT
-VOID HMAC_SHA1 (
-    IN  const UINT8 Key[],
+VOID HMAC_SHA1(IN const UINT8 Key[],
 	       IN UINT KeyLen,
 	       IN const UINT8 Message[],
-    IN  UINT MessageLen,
-    OUT UINT8 MAC[],
-    IN  UINT MACLen);
+	       IN UINT MessageLen, OUT UINT8 MAC[], IN UINT MACLen);
 #endif /* SHA1_SUPPORT */
 
 #ifdef MD5_SUPPORT
 #define HMAC_MD5_SUPPORT
-VOID HMAC_MD5 (
-    IN  const UINT8 Key[],
+VOID HMAC_MD5(IN const UINT8 Key[],
 	      IN UINT KeyLen,
 	      IN const UINT8 Message[],
-    IN  UINT MessageLen,
-    OUT UINT8 MAC[],
-    IN  UINT MACLen);
+	      IN UINT MessageLen, OUT UINT8 MAC[], IN UINT MACLen);
 #endif /* MD5_SUPPORT */
 
 #endif /* __CRYPT_HMAC_H__ */

drivers/staging/rt2860/crypt_md5.h

@@ -60,21 +60,13 @@ typedef struct {
 	UINT BlockLen;
 } MD5_CTX_STRUC, *PMD5_CTX_STRUC;
 
-VOID MD5_Init (
-    IN  MD5_CTX_STRUC *pMD5_CTX);
-VOID MD5_Hash (
-    IN  MD5_CTX_STRUC *pMD5_CTX);
-VOID MD5_Append (
-    IN  MD5_CTX_STRUC *pMD5_CTX,
-    IN  const UINT8 Message[],
-    IN  UINT MessageLen);
-VOID MD5_End (
-    IN  MD5_CTX_STRUC *pMD5_CTX,
-    OUT UINT8 DigestMessage[]);
-VOID RT_MD5 (
-    IN  const UINT8 Message[],
-    IN  UINT MessageLen,
-    OUT UINT8 DigestMessage[]);
+VOID MD5_Init(IN MD5_CTX_STRUC * pMD5_CTX);
+VOID MD5_Hash(IN MD5_CTX_STRUC * pMD5_CTX);
+VOID MD5_Append(IN MD5_CTX_STRUC * pMD5_CTX,
+		IN const UINT8 Message[], IN UINT MessageLen);
+VOID MD5_End(IN MD5_CTX_STRUC * pMD5_CTX, OUT UINT8 DigestMessage[]);
+VOID RT_MD5(IN const UINT8 Message[],
+	    IN UINT MessageLen, OUT UINT8 DigestMessage[]);
 #endif /* MD5_SUPPORT */
 
 #endif /* __CRYPT_MD5_H__ */

drivers/staging/rt2860/crypt_sha2.h

@@ -61,21 +61,13 @@ typedef struct _SHA1_CTX_STRUC {
 	UINT BlockLen;
 } SHA1_CTX_STRUC, *PSHA1_CTX_STRUC;
 
-VOID RT_SHA1_Init (
-    IN  SHA1_CTX_STRUC *pSHA_CTX);
-VOID SHA1_Hash (
-    IN  SHA1_CTX_STRUC *pSHA_CTX);
-VOID SHA1_Append (
-    IN  SHA1_CTX_STRUC *pSHA_CTX,
-    IN  const UINT8 Message[],
-    IN  UINT MessageLen);
-VOID SHA1_End (
-    IN  SHA1_CTX_STRUC *pSHA_CTX,
-    OUT UINT8 DigestMessage[]);
-VOID RT_SHA1 (
-    IN  const UINT8 Message[],
-    IN  UINT MessageLen,
-    OUT UINT8 DigestMessage[]);
+VOID RT_SHA1_Init(IN SHA1_CTX_STRUC * pSHA_CTX);
+VOID SHA1_Hash(IN SHA1_CTX_STRUC * pSHA_CTX);
+VOID SHA1_Append(IN SHA1_CTX_STRUC * pSHA_CTX,
+		 IN const UINT8 Message[], IN UINT MessageLen);
+VOID SHA1_End(IN SHA1_CTX_STRUC * pSHA_CTX, OUT UINT8 DigestMessage[]);
+VOID RT_SHA1(IN const UINT8 Message[],
+	     IN UINT MessageLen, OUT UINT8 DigestMessage[]);
 #endif /* SHA1_SUPPORT */
 
 #endif /* __CRYPT_SHA2_H__ */

drivers/staging/rt2860/dfs.h

@@ -36,6 +36,4 @@
     Fonchi    03-12-2007      created
 */
 
-BOOLEAN RadarChannelCheck(
-	IN PRTMP_ADAPTER	pAd,
-	IN UCHAR			Ch);
+BOOLEAN RadarChannelCheck(IN PRTMP_ADAPTER pAd, IN UCHAR Ch);

drivers/staging/rt2860/eeprom.h

@@ -24,7 +24,6 @@
  *                                                                       *
  *************************************************************************
 
-
 	Module Name:
 	eeprom.h
 
@@ -38,41 +37,31 @@
 #ifndef __EEPROM_H__
 #define __EEPROM_H__
 
-
-
 #ifdef RTMP_PCI_SUPPORT
 /*************************************************************************
   *	Public function declarations for prom-based chipset
   ************************************************************************/
-int rtmp_ee_prom_read16(
-	IN PRTMP_ADAPTER	pAd,
-	IN USHORT			Offset,
-	OUT USHORT			*pValue);
+int rtmp_ee_prom_read16(IN PRTMP_ADAPTER pAd,
+			IN USHORT Offset, OUT USHORT * pValue);
 #endif // RTMP_PCI_SUPPORT //
 #ifdef RTMP_USB_SUPPORT
 /*************************************************************************
   *	Public function declarations for usb-based prom chipset
   ************************************************************************/
-NTSTATUS RTUSBReadEEPROM16(
-	IN PRTMP_ADAPTER	pAd,
-	IN	USHORT			offset,
-	OUT	PUSHORT			pData);
+NTSTATUS RTUSBReadEEPROM16(IN PRTMP_ADAPTER pAd,
+			   IN USHORT offset, OUT PUSHORT pData);
 #endif // RTMP_USB_SUPPORT //
 
 #ifdef RT30xx
 #ifdef RTMP_EFUSE_SUPPORT
-int rtmp_ee_efuse_read16(
-	IN RTMP_ADAPTER *pAd,
-	IN USHORT Offset,
-	OUT USHORT *pValue);
+int rtmp_ee_efuse_read16(IN RTMP_ADAPTER * pAd,
+			 IN USHORT Offset, OUT USHORT * pValue);
 #endif // RTMP_EFUSE_SUPPORT //
 #endif // RT30xx //
 
 /*************************************************************************
   *	Public function declarations for prom operation callback functions setting
   ************************************************************************/
-INT RtmpChipOpsEepromHook(
-	IN RTMP_ADAPTER *pAd,
-	IN INT			infType);
+INT RtmpChipOpsEepromHook(IN RTMP_ADAPTER * pAd, IN INT infType);
 
 #endif // __EEPROM_H__ //

drivers/staging/rt2860/iface/rtmp_pci.h

@@ -31,7 +31,6 @@
 #define RT28XX_HANDLE_DEV_ASSIGN(handle, dev_p)				\
 	((POS_COOKIE)handle)->pci_dev = dev_p;
 
-
 #ifdef LINUX
 // set driver data
 #define RT28XX_DRVDATA_SET(_a)			pci_set_drvdata(_a, net_dev);
@@ -64,7 +63,6 @@
 							pci_resource_len(dev_p, 0)); }	\
 	if (net_dev->irq) pci_release_regions(dev_p); }
 
-
 #define PCI_REG_READ_WORD(pci_dev, offset, Configuration)   \
     if (pci_read_config_word(pci_dev, offset, &reg16) == 0)     \
         Configuration = le2cpu16(reg16);                        \
@@ -77,5 +75,4 @@
 
 #endif // LINUX //
 
-
 #endif // __RTMP_PCI_H__ //

drivers/staging/rt2860/iface/rtmp_usb.h

@@ -28,28 +28,24 @@
 #ifndef __RTMP_USB_H__
 #define __RTMP_USB_H__
 
-
 #include "../rtusb_io.h"
 
-
 #ifdef LINUX
 #include <linux/usb.h>
 
-typedef struct usb_device	* PUSB_DEV;
+typedef struct usb_device *PUSB_DEV;
 typedef struct urb *purbb_t;
 typedef struct usb_ctrlrequest devctrlrequest;
 #endif // LINUX //
 
 extern UCHAR EpToQueue[6];
 
-
 #define RXBULKAGGRE_ZISE			12
 #define MAX_TXBULK_LIMIT			(LOCAL_TXBUF_SIZE*(BULKAGGRE_ZISE-1))
 #define MAX_TXBULK_SIZE			(LOCAL_TXBUF_SIZE*BULKAGGRE_ZISE)
 #define MAX_RXBULK_SIZE			(LOCAL_TXBUF_SIZE*RXBULKAGGRE_ZISE)
 #define MAX_MLME_HANDLER_MEMORY 20
 
-
 // Flags for Bulkflags control for bulk out data
 //
 #define	fRTUSB_BULK_OUT_DATA_NULL				0x00000001
@@ -69,7 +65,6 @@ extern UCHAR EpToQueue[6];
 
 // TODO:move to ./ate/include/iface/ate_usb.h
 
-
 #define FREE_HTTX_RING(_pCookie, _pipeId, _txContext)			\
 {										\
 	if ((_txContext)->ENextBulkOutPosition == (_txContext)->CurWritePosition)	\
@@ -79,8 +74,6 @@ extern UCHAR EpToQueue[6];
 	/*NdisInterlockedDecrement(&(_p)->TxCount); */\
 }
 
-
-
 /******************************************************************************
 
 	USB Bulk operation related definitions
@@ -100,7 +93,7 @@ extern UCHAR EpToQueue[6];
 // unlink urb
 #define RTUSB_UNLINK_URB(pUrb)		usb_kill_urb(pUrb)
 
-extern void dump_urb(struct urb* purb);
+extern void dump_urb(struct urb *purb);
 
 #define InterlockedIncrement		atomic_inc
 #define NdisInterlockedIncrement	atomic_inc
@@ -110,12 +103,8 @@ extern void dump_urb(struct urb* purb);
 
 #endif // LINUX //
 
-
-
 #define NT_SUCCESS(status)			(((status) >=0) ? (TRUE):(FALSE))
 
-
-
 #define USBD_TRANSFER_DIRECTION_OUT		0
 #define USBD_TRANSFER_DIRECTION_IN		0
 #define USBD_SHORT_TRANSFER_OK			0
@@ -131,7 +120,6 @@ extern void dump_urb(struct urb* purb);
 #define CONTROL_TIMEOUT_JIFFIES ( (100 * OS_HZ) / 1000)
 #define UNLINK_TIMEOUT_MS		3
 
-
 VOID RTUSBBulkOutDataPacketComplete(purbb_t purb, struct pt_regs *pt_regs);
 VOID RTUSBBulkOutMLMEPacketComplete(purbb_t pUrb, struct pt_regs *pt_regs);
 VOID RTUSBBulkOutNullFrameComplete(purbb_t pUrb, struct pt_regs *pt_regs);
@@ -139,7 +127,6 @@ VOID RTUSBBulkOutRTSFrameComplete(purbb_t pUrb, struct pt_regs *pt_regs);
 VOID RTUSBBulkOutPsPollComplete(purbb_t pUrb, struct pt_regs *pt_regs);
 VOID RTUSBBulkRxComplete(purbb_t pUrb, struct pt_regs *pt_regs);
 
-
 #ifdef KTHREAD_SUPPORT
 #define RTUSBMlmeUp(pAd) \
 	do{								    \
@@ -196,5 +183,4 @@ VOID RTUSBBulkRxComplete(purbb_t pUrb, struct pt_regs *pt_regs);
 #define RTMP_IRQ_REQUEST(net_dev)		do{}while(0)
 #define RTMP_IRQ_RELEASE(net_dev)		do{}while(0)
 
-
 #endif // __RTMP_USB_H__ //

drivers/staging/rt2860/rt_config.h

@@ -69,4 +69,3 @@
 #endif // IGMP_SNOOP_SUPPORT //
 
 #endif // __RT_CONFIG_H__
-

drivers/staging/rt2860/rtmp_chip.h

@@ -103,15 +103,12 @@
 
 #define RETRY_LIMIT		10
 
-
-
 // ------------------------------------------------------
 // BBP & RF     definition
 // ------------------------------------------------------
 #define	BUSY		                1
 #define	IDLE		                0
 
-
 //-------------------------------------------------------------------------
 // EEPROM definition
 //-------------------------------------------------------------------------
@@ -160,14 +157,12 @@
 #define EEPROM_TXPOWER_DELTA		0x50	// 20MHZ AND 40 MHZ use different power. This is delta in 40MHZ.
 #define VALID_EEPROM_VERSION        1
 
-
 /*
   *   EEPROM operation related marcos
   */
 #define RT28xx_EEPROM_READ16(_pAd, _offset, _value)			\
 	(_pAd)->chipOps.eeread((RTMP_ADAPTER *)(_pAd), (USHORT)(_offset), (PUSHORT)&(_value))
 
-
 // -------------------------------------------------------------------
 //  E2PROM data layout
 // -------------------------------------------------------------------
@@ -183,7 +178,6 @@ typedef union  _MCU_LEDCS_STRUC {
 	UCHAR word;
 } MCU_LEDCS_STRUC, *PMCU_LEDCS_STRUC;
 
-
 //
 // EEPROM antenna select format
 //
@@ -256,7 +250,7 @@ typedef	union	_EEPROM_TXPOWER_DELTA_STRUC	{
 	struct {
 		UCHAR DeltaValue:6;	// Tx Power dalta value (MAX=4)
 		UCHAR Type:1;	// 1: plus the delta value, 0: minus the delta value
-		UCHAR	TxPowerEnable:1;// Enable
+		UCHAR TxPowerEnable:1;	// Enable
 	} field;
 	UCHAR value;
 } EEPROM_TXPOWER_DELTA_STRUC, *PEEPROM_TXPOWER_DELTA_STRUC;

drivers/staging/rt2860/rtmp_ckipmic.h

@@ -46,33 +46,18 @@ typedef	struct	_MIC_CONTEXT	{
 	UCHAR part[4];		/* for conversion of message to u32 for mmh   */
 } MIC_CONTEXT, *PMIC_CONTEXT;
 
-VOID xor_128(
-    IN  PUCHAR              a,
-    IN  PUCHAR              b,
-    OUT PUCHAR              out);
+VOID xor_128(IN PUCHAR a, IN PUCHAR b, OUT PUCHAR out);
 
-UCHAR RTMPCkipSbox(
-    IN  UCHAR               a);
+UCHAR RTMPCkipSbox(IN UCHAR a);
 
-VOID xor_32(
-    IN  PUCHAR              a,
-    IN  PUCHAR              b,
-    OUT PUCHAR              out);
+VOID xor_32(IN PUCHAR a, IN PUCHAR b, OUT PUCHAR out);
 
-VOID next_key(
-    IN  PUCHAR              key,
-    IN  INT                 round);
+VOID next_key(IN PUCHAR key, IN INT round);
 
-VOID byte_sub(
-    IN  PUCHAR              in,
-    OUT PUCHAR              out);
+VOID byte_sub(IN PUCHAR in, OUT PUCHAR out);
 
-VOID shift_row(
-    IN  PUCHAR              in,
-    OUT PUCHAR              out);
+VOID shift_row(IN PUCHAR in, OUT PUCHAR out);
 
-VOID mix_column(
-    IN  PUCHAR              in,
-    OUT PUCHAR              out);
+VOID mix_column(IN PUCHAR in, OUT PUCHAR out);
 
 #endif //__RTMP_CKIPMIC_H__

drivers/staging/rt2860/rtmp_def.h

@@ -107,7 +107,6 @@
 
 #define MAX_RX_PROCESS_CNT	(RX_RING_SIZE)
 
-
 /*
 	WMM Note: If memory of your system is not much, please reduce the definition;
 	or when you do WMM test, the queue for low priority AC will be full, i.e.
@@ -133,7 +132,6 @@
 #define MAX_PACKETS_IN_PS_QUEUE				128	//32
 #define WMM_NUM_OF_AC                       4	/* AC0, AC1, AC2, and AC3 */
 
-
 #ifdef RTMP_EFUSE_SUPPORT
 //2008/09/11:KH add to support efuse<--
 #define MAX_EEPROM_BIN_FILE_SIZE					1024
@@ -303,7 +301,6 @@
 #define ERRLOG_NO_INTERRUPT_RESOURCE    0x00000604L
 #define ERRLOG_NO_MEMORY_RESOURCE       0x00000605L
 
-
 // WDS definition
 #define	MAX_WDS_ENTRY               4
 #define WDS_PAIRWISE_KEY_OFFSET     60	// WDS links uses pairwise key#60 ~ 63 in ASIC pairwise key table
@@ -314,7 +311,6 @@
 #define	WDS_REPEATER_MODE           3
 #define	WDS_LAZY_MODE               4
 
-
 #define MAX_MESH_NUM				0
 
 #define MAX_APCLI_NUM				0
@@ -336,7 +332,6 @@
 #define MAIN_MBSSID                 0
 #define FIRST_MBSSID                1
 
-
 #define MAX_BEACON_SIZE				512
 // If the MAX_MBSSID_NUM is larger than 6,
 // it shall reserve some WCID space(wcid 222~253) for beacon frames.
@@ -368,7 +363,6 @@
 
 #define IsGroupKeyWCID(__wcid) (((__wcid) < LAST_SPECIFIC_WCID) && ((__wcid) >= (LAST_SPECIFIC_WCID - (MAX_MBSSID_NUM))))
 
-
 // definition to support multiple BSSID
 #define BSS0                            0
 #define BSS1                            1
@@ -379,7 +373,6 @@
 #define BSS6                            6
 #define BSS7                            7
 
-
 //============================================================
 // Length definitions
 #define PEER_KEY_NO                     2
@@ -426,8 +419,8 @@
 
 #define NUM_OF_TID			8
 #define MAX_AID_BA                    4
-#define MAX_LEN_OF_BA_REC_TABLE          ((NUM_OF_TID * MAX_LEN_OF_MAC_TABLE)/2)//   (NUM_OF_TID*MAX_AID_BA + 32)	 //Block ACK recipient
-#define MAX_LEN_OF_BA_ORI_TABLE          ((NUM_OF_TID * MAX_LEN_OF_MAC_TABLE)/2)//   (NUM_OF_TID*MAX_AID_BA + 32)   // Block ACK originator
+#define MAX_LEN_OF_BA_REC_TABLE          ((NUM_OF_TID * MAX_LEN_OF_MAC_TABLE)/2)	//   (NUM_OF_TID*MAX_AID_BA + 32)        //Block ACK recipient
+#define MAX_LEN_OF_BA_ORI_TABLE          ((NUM_OF_TID * MAX_LEN_OF_MAC_TABLE)/2)	//   (NUM_OF_TID*MAX_AID_BA + 32)   // Block ACK originator
 #define MAX_LEN_OF_BSS_TABLE             64
 #define MAX_REORDERING_MPDU_NUM			 512
 
@@ -457,7 +450,6 @@
 #define BSS_ANY                         2	// = Ndis802_11AutoUnknown
 #define BSS_MONITOR			            3	// = Ndis802_11Monitor
 
-
 // Reason code definitions
 #define REASON_RESERVED                 0
 #define REASON_UNSPECIFY                1
@@ -566,7 +558,6 @@
 #define IE_ADD_HT                         61	// 802.11n d1. ADDITIONAL HT CAPABILITY. ELEMENT ID TBD
 #define IE_ADD_HT2                        53	// 802.11n d1. ADDITIONAL HT CAPABILITY. ELEMENT ID TBD
 
-
 // For 802.11n D3.03
 //#define IE_NEW_EXT_CHA_OFFSET             62    // 802.11n d1. New extension channel offset elemet
 #define IE_SECONDARY_CH_OFFSET		62	// 802.11n D3.03        Secondary Channel Offset element
@@ -576,7 +567,6 @@
 #define IE_OVERLAPBSS_SCAN_PARM           74	// 802.11n D3.03
 #define IE_EXT_CAPABILITY                127	// 802.11n D3.03
 
-
 #define IE_WPA                          221	// WPA
 #define IE_VENDOR_SPECIFIC              221	// Wifi WMM (WME)
 
@@ -619,11 +609,8 @@
 #define WSC_STATE_MACHINE            17
 #define WSC_UPNP_STATE_MACHINE		    18
 
-
 #define WPA_STATE_MACHINE			23
 
-
-
 //
 // STA's CONTROL/CONNECT state machine: states, events, total function #
 //
@@ -703,7 +690,6 @@
 #define MT2_PEER_HT_CATE             7	//      7.4.7
 #define MAX_PEER_CATE_MSG                   7
 
-
 #define MT2_MLME_ADD_BA_CATE             8
 #define MT2_MLME_ORI_DELBA_CATE             9
 #define MT2_MLME_REC_DELBA_CATE             10
@@ -721,7 +707,6 @@
 #define CATEGORY_RM			5
 #define CATEGORY_HT			7
 
-
 // DLS Action frame definition
 #define ACTION_DLS_REQUEST			0
 #define ACTION_DLS_RESPONSE			1
@@ -734,7 +719,6 @@
 #define SPEC_TPCRP	3
 #define SPEC_CHANNEL_SWITCH	4
 
-
 //BA  Action field value
 #define ADDBA_REQ	0
 #define ADDBA_RESP	1
@@ -751,7 +735,6 @@
 #define ACTION_MEASUREMENT_PILOT_ACTION		7	// 11y D9.0
 #define ACTION_DSE_POWER_CONSTRAINT			8	// 11y D9.0
 
-
 //HT  Action field value
 #define NOTIFY_BW_ACTION				0
 #define SMPS_ACTION						1
@@ -907,8 +890,6 @@
 
 #define WPA_FUNC_SIZE                (MAX_WPA_PTK_STATE * MAX_WPA_MSG)
 
-
-
 // =============================================================================
 
 // value domain of 802.11 header FC.Tyte, which is b3..b2 of the 1st-byte of MAC header
@@ -1081,7 +1062,6 @@
 #define   MMPS_RSV		2
 #define MMPS_ENABLE		3
 
-
 // A-MSDU size
 #define	AMSDU_0	0
 #define	AMSDU_1		1
@@ -1175,7 +1155,6 @@
 #define CIPHER_TKIP_NO_MIC          7	// MIC appended by driver: not a valid value in hardware key table
 #define CIPHER_SMS4					8
 
-
 // LED Status.
 #define LED_LINK_DOWN               0
 #define LED_LINK_UP                 1
@@ -1205,7 +1184,6 @@
 //definition of DRS
 #define MAX_STEP_OF_TX_RATE_SWITCH	32
 
-
 // pre-allocated free NDIS PACKET/BUFFER poll for internal usage
 #define MAX_NUM_OF_FREE_NDIS_PACKET 128
 
@@ -1262,7 +1240,6 @@
 // MBSSID definition
 #define ENTRY_NOT_FOUND             0xFF
 
-
 /* After Linux 2.6.9,
  * VLAN module use Private (from user) interface flags (netdevice->priv_flags).
  * #define IFF_802_1Q_VLAN 0x1         --    802.1Q VLAN device.  in if.h
@@ -1282,13 +1259,10 @@
 #define INF_APCLI_DEV_NAME		"apcli"
 #define INF_MESH_DEV_NAME		"mesh"
 
-
 // WEP Key TYPE
 #define WEP_HEXADECIMAL_TYPE    0
 #define WEP_ASCII_TYPE          1
 
-
-
 // WIRELESS EVENTS definition
 /* Max number of char in custom event, refer to wireless_tools.28/wireless.20.h */
 #define IW_CUSTOM_MAX_LEN				  			255	/* In bytes */
@@ -1375,7 +1349,6 @@
 #define GUI_IDLE_POWER_SAVE		3
 // --
 
-
 // definition for WpaSupport flag
 #define WPA_SUPPLICANT_DISABLE				0
 #define WPA_SUPPLICANT_ENABLE				1
@@ -1418,10 +1391,8 @@
 #define cpu2be16(x) SWAP16((x))
 #define be2cpu16(x) SWAP16((x))
 
-
 #define ABS(_x, _y) ((_x) > (_y)) ? ((_x) -(_y)) : ((_y) -(_x))
 
-
 #define A2Dec(_X, _p)				\
 {									\
 	UCHAR *p;						\
@@ -1435,7 +1406,6 @@
 	}												\
 }
 
-
 #define A2Hex(_X, _p)				\
 do{									\
 	char *__p;						\
@@ -1454,5 +1424,3 @@ do{									\
 }while(0)
 
 #endif // __RTMP_DEF_H__
-
-

drivers/staging/rt2860/rtmp_dot11.h

@@ -30,7 +30,6 @@
 
 #include "rtmp_type.h"
 
-
 // 4-byte HTC field.  maybe included in any frame except non-QOS data frame.  The Order bit must set 1.
 typedef struct PACKED {
 	UINT32 MA:1;		//management action payload exist in (QoS Null+HTC)
@@ -58,7 +57,6 @@ typedef struct PACKED {
 	USHORT Txop_QueueSize:8;
 } QOS_CONTROL, *PQOS_CONTROL;
 
-
 // 2-byte Frame control field
 typedef struct PACKED {
 	USHORT Ver:2;		// Protocol version
@@ -97,6 +95,6 @@ typedef	struct	PACKED _RTS_FRAME	{
 	USHORT Duration;
 	UCHAR Addr1[MAC_ADDR_LEN];
 	UCHAR Addr2[MAC_ADDR_LEN];
-}RTS_FRAME, *PRTS_FRAME;
+} RTS_FRAME, *PRTS_FRAME;
 
 #endif // __DOT11_BASE_H__ //

drivers/staging/rt2860/rtmp_iface.h

@@ -37,7 +37,6 @@
 #ifndef __RTMP_IFACE_H__
 #define __RTMP_IFACE_H__
 
-
 #ifdef RTMP_PCI_SUPPORT
 #include "iface/rtmp_pci.h"
 #endif // RTMP_PCI_SUPPORT //
@@ -45,40 +44,32 @@
 #include "iface/rtmp_usb.h"
 #endif // RTMP_USB_SUPPORT //
 
-typedef struct _INF_PCI_CONFIG_
-{
+typedef struct _INF_PCI_CONFIG_ {
 	unsigned long CSRBaseAddress;	// PCI MMIO Base Address, all access will use
 	unsigned int irq_num;
-}INF_PCI_CONFIG;
-
+} INF_PCI_CONFIG;
 
-typedef struct _INF_USB_CONFIG_
-{
+typedef struct _INF_USB_CONFIG_ {
 	UINT8 BulkInEpAddr;	// bulk-in endpoint address
 	UINT8 BulkOutEpAddr[6];	// bulk-out endpoint address
-}INF_USB_CONFIG;
-
+} INF_USB_CONFIG;
 
-typedef struct _INF_RBUS_CONFIG_
-{
+typedef struct _INF_RBUS_CONFIG_ {
 	unsigned long csr_addr;
 	unsigned int irq;
-}INF_RBUS_CONFIG;
+} INF_RBUS_CONFIG;
 
-
-typedef enum _RTMP_INF_TYPE_
-{
+typedef enum _RTMP_INF_TYPE_ {
 	RTMP_DEV_INF_UNKNOWN = 0,
 	RTMP_DEV_INF_PCI = 1,
 	RTMP_DEV_INF_USB = 2,
 	RTMP_DEV_INF_RBUS = 4,
-}RTMP_INF_TYPE;
-
+} RTMP_INF_TYPE;
 
-typedef union _RTMP_INF_CONFIG_{
+typedef union _RTMP_INF_CONFIG_ {
 	struct _INF_PCI_CONFIG_ pciConfig;
 	struct _INF_USB_CONFIG_ usbConfig;
 	struct _INF_RBUS_CONFIG_ rbusConfig;
-}RTMP_INF_CONFIG;
+} RTMP_INF_CONFIG;
 
 #endif // __RTMP_IFACE_H__ //

drivers/staging/rt2860/rtmp_mcu.h

@@ -38,18 +38,12 @@
 #ifndef __RTMP_MCU_H__
 #define __RTMP_MCU_H__
 
+INT RtmpAsicEraseFirmware(IN PRTMP_ADAPTER pAd);
 
-INT RtmpAsicEraseFirmware(
-	IN PRTMP_ADAPTER pAd);
+NDIS_STATUS RtmpAsicLoadFirmware(IN PRTMP_ADAPTER pAd);
 
-NDIS_STATUS RtmpAsicLoadFirmware(
-	IN PRTMP_ADAPTER pAd);
-
-INT RtmpAsicSendCommandToMcu(
-	IN PRTMP_ADAPTER pAd,
+INT RtmpAsicSendCommandToMcu(IN PRTMP_ADAPTER pAd,
 			     IN UCHAR Command,
-	IN UCHAR		 Token,
-	IN UCHAR		 Arg0,
-	IN UCHAR		 Arg1);
+			     IN UCHAR Token, IN UCHAR Arg0, IN UCHAR Arg1);
 
 #endif // __RTMP_MCU_H__ //

drivers/staging/rt2860/rtmp_os.h

@@ -34,7 +34,6 @@
     ---------    ----------    ----------------------------------------------
  */
 
-
 #ifndef __RTMP_OS_H__
 #define __RTMP_OS_H__
 
@@ -42,8 +41,6 @@
 #include "rt_linux.h"
 #endif // LINUX //
 
-
-
 /*
 	This data structure mainly strip some callback function defined in
 	"struct net_device" in kernel source "include/linux/netdevice.h".
@@ -51,29 +48,25 @@
 	The definition of this data structure may various depends on different
 	OS. Use it carefully.
 */
-typedef struct _RTMP_OS_NETDEV_OP_HOOK_
-{
+typedef struct _RTMP_OS_NETDEV_OP_HOOK_ {
 	const struct net_device_ops *netdev_ops;
 	void *priv;
 	int priv_flags;
 	unsigned char devAddr[6];
 	unsigned char devName[16];
 	unsigned char needProtcted;
-}RTMP_OS_NETDEV_OP_HOOK, *PRTMP_OS_NETDEV_OP_HOOK;
+} RTMP_OS_NETDEV_OP_HOOK, *PRTMP_OS_NETDEV_OP_HOOK;
 
-
-typedef enum _RTMP_TASK_STATUS_
-{
+typedef enum _RTMP_TASK_STATUS_ {
 	RTMP_TASK_STAT_UNKNOWN = 0,
 	RTMP_TASK_STAT_INITED = 1,
 	RTMP_TASK_STAT_RUNNING = 2,
 	RTMP_TASK_STAT_STOPED = 4,
-}RTMP_TASK_STATUS;
+} RTMP_TASK_STATUS;
 #define RTMP_TASK_CAN_DO_INSERT		(RTMP_TASK_STAT_INITED |RTMP_TASK_STAT_RUNNING)
 
 #define RTMP_OS_TASK_NAME_LEN	16
-typedef struct _RTMP_OS_TASK_
-{
+typedef struct _RTMP_OS_TASK_ {
 	char taskName[RTMP_OS_TASK_NAME_LEN];
 	void *priv;
 	//unsigned long         taskFlags;
@@ -89,8 +82,7 @@ typedef struct _RTMP_OS_TASK_
 	wait_queue_head_t kthread_q;
 	BOOLEAN kthread_running;
 #endif
-}RTMP_OS_TASK;
-
+} RTMP_OS_TASK;
 
 int RtmpOSIRQRequest(IN PNET_DEV pNetDev);
 int RtmpOSIRQRelease(IN PNET_DEV pNetDev);

drivers/staging/rt2860/rtmp_timer.h

@@ -43,22 +43,19 @@
 
 #include "rtmp_os.h"
 
-
 #define DECLARE_TIMER_FUNCTION(_func)			\
 	void rtmp_timer_##_func(unsigned long data)
 
 #define GET_TIMER_FUNCTION(_func)				\
 	rtmp_timer_##_func
 
-
 /* ----------------- Timer Related MARCO ---------------*/
 // In some os or chipset, we have a lot of timer functions and will read/write register,
 //   it's not allowed in Linux USB sub-system to do it ( because of sleep issue when
 //  submit to ctrl pipe). So we need a wrapper function to take care it.
 
 #ifdef RTMP_TIMER_TASK_SUPPORT
-typedef VOID (*RTMP_TIMER_TASK_HANDLE)(
-	IN  PVOID   SystemSpecific1,
+typedef VOID(*RTMP_TIMER_TASK_HANDLE) (IN PVOID SystemSpecific1,
 				       IN PVOID FunctionContext,
 				       IN PVOID SystemSpecific2,
 				       IN PVOID SystemSpecific3);
@@ -76,26 +73,22 @@ typedef struct  _RALINK_TIMER_STRUCT    {
 	RTMP_TIMER_TASK_HANDLE handle;
 	void *pAd;
 #endif				// RTMP_TIMER_TASK_SUPPORT //
-}RALINK_TIMER_STRUCT, *PRALINK_TIMER_STRUCT;
-
+} RALINK_TIMER_STRUCT, *PRALINK_TIMER_STRUCT;
 
 #ifdef RTMP_TIMER_TASK_SUPPORT
-typedef struct _RTMP_TIMER_TASK_ENTRY_
-{
+typedef struct _RTMP_TIMER_TASK_ENTRY_ {
 	RALINK_TIMER_STRUCT *pRaTimer;
 	struct _RTMP_TIMER_TASK_ENTRY_ *pNext;
-}RTMP_TIMER_TASK_ENTRY;
-
+} RTMP_TIMER_TASK_ENTRY;
 
 #define TIMER_QUEUE_SIZE_MAX	128
-typedef struct _RTMP_TIMER_TASK_QUEUE_
-{
+typedef struct _RTMP_TIMER_TASK_QUEUE_ {
 	unsigned int status;
 	unsigned char *pTimerQPoll;
 	RTMP_TIMER_TASK_ENTRY *pQPollFreeList;
 	RTMP_TIMER_TASK_ENTRY *pQHead;
 	RTMP_TIMER_TASK_ENTRY *pQTail;
-}RTMP_TIMER_TASK_QUEUE;
+} RTMP_TIMER_TASK_QUEUE;
 
 #define BUILD_TIMER_FUNCTION(_func)										\
 void rtmp_timer_##_func(unsigned long data)										\
@@ -122,7 +115,6 @@ void rtmp_timer_##_func(unsigned long data)										\
 }
 #endif // RTMP_TIMER_TASK_SUPPORT //
 
-
 DECLARE_TIMER_FUNCTION(MlmePeriodicExec);
 DECLARE_TIMER_FUNCTION(MlmeRssiReportExec);
 DECLARE_TIMER_FUNCTION(AsicRxAntEvalTimeout);
@@ -152,5 +144,4 @@ DECLARE_TIMER_FUNCTION(RtmpUsbStaAsicForceWakeupTimeout);
 DECLARE_TIMER_FUNCTION(LedCtrlMain);
 #endif
 
-
 #endif // __RTMP_TIMER_H__ //

drivers/staging/rt2860/rtmp_type.h

@@ -38,7 +38,6 @@
 #ifndef __RTMP_TYPE_H__
 #define __RTMP_TYPE_H__
 
-
 #define PACKED  __attribute__ ((packed))
 
 #ifdef LINUX
@@ -52,12 +51,12 @@ typedef int					INT32;
 typedef long long INT64;
 #endif // LINUX //
 
-typedef unsigned char *			PUINT8;
-typedef unsigned short *		PUINT16;
-typedef unsigned int *			PUINT32;
-typedef unsigned long long *	PUINT64;
-typedef int	*					PINT32;
-typedef long long * 			PINT64;
+typedef unsigned char *PUINT8;
+typedef unsigned short *PUINT16;
+typedef unsigned int *PUINT32;
+typedef unsigned long long *PUINT64;
+typedef int *PINT32;
+typedef long long *PINT64;
 
 // modified for fixing compile warning on Sigma 8634 platform
 typedef char STRING;
@@ -68,7 +67,6 @@ typedef signed int			INT;
 typedef signed long LONG;
 typedef signed long long LONGLONG;
 
-
 #ifdef LINUX
 typedef unsigned char UCHAR;
 typedef unsigned short USHORT;
@@ -82,14 +80,14 @@ typedef unsigned char		BOOLEAN;
 typedef void VOID;
 #endif // LINUX //
 
-typedef char *				PSTRING;
-typedef VOID *				PVOID;
-typedef CHAR *				PCHAR;
-typedef UCHAR * 			PUCHAR;
-typedef USHORT *			PUSHORT;
-typedef LONG *				PLONG;
-typedef ULONG *				PULONG;
-typedef UINT *				PUINT;
+typedef char *PSTRING;
+typedef VOID *PVOID;
+typedef CHAR *PCHAR;
+typedef UCHAR *PUCHAR;
+typedef USHORT *PUSHORT;
+typedef LONG *PLONG;
+typedef ULONG *PULONG;
+typedef UINT *PUINT;
 
 typedef unsigned int NDIS_MEDIA_STATE;
 
@@ -101,18 +99,15 @@ typedef union _LARGE_INTEGER {
 	INT64 QuadPart;
 } LARGE_INTEGER;
 
-
 //
 // Register set pair for initialzation register set definition
 //
-typedef struct  _RTMP_REG_PAIR
-{
+typedef struct _RTMP_REG_PAIR {
 	ULONG Register;
 	ULONG Value;
 } RTMP_REG_PAIR, *PRTMP_REG_PAIR;
 
-typedef struct  _REG_PAIR
-{
+typedef struct _REG_PAIR {
 	UCHAR Register;
 	UCHAR Value;
 } REG_PAIR, *PREG_PAIR;
@@ -120,8 +115,7 @@ typedef struct  _REG_PAIR
 //
 // Register set pair for initialzation register set definition
 //
-typedef struct  _RTMP_RF_REGS
-{
+typedef struct _RTMP_RF_REGS {
 	UCHAR Channel;
 	ULONG R1;
 	ULONG R2;
@@ -136,12 +130,9 @@ typedef struct _FREQUENCY_ITEM {
 	UCHAR K;
 } FREQUENCY_ITEM, *PFREQUENCY_ITEM;
 
-
 typedef int NTSTATUS;
 
-
 #define STATUS_SUCCESS				0x00
 #define STATUS_UNSUCCESSFUL		0x01
 
 #endif // __RTMP_TYPE_H__ //
-

drivers/staging/rt2860/rtusb_io.h

@@ -25,7 +25,6 @@
  *************************************************************************
 */
 
-
 #ifndef __RTUSB_IO_H__
 #define __RTUSB_IO_H__
 
@@ -75,7 +74,6 @@
 #define CMDTHREAD_UPDATE_PROTECT					0x0D790103	// cmd
 // end johnli
 
-
 //CMDTHREAD_MULTI_READ_MAC
 //CMDTHREAD_MULTI_WRITE_MAC
 //CMDTHREAD_VENDOR_EEPROM_READ
@@ -86,7 +84,6 @@ typedef	struct	_CMDHandler_TLV	{
 	UCHAR DataFirst;
 } CMDHandler_TLV, *PCMDHandler_TLV;
 
-
 typedef struct _CmdQElmt {
 	UINT command;
 	PVOID buffer;
@@ -101,8 +98,7 @@ typedef	struct	_CmdQ	{
 	CmdQElmt *head;
 	CmdQElmt *tail;
 	UINT32 CmdQState;
-}CmdQ, *PCmdQ;
-
+} CmdQ, *PCmdQ;
 
 #define EnqueueCmd(cmdq, cmdqelmt)		\
 {										\
@@ -115,7 +111,6 @@ typedef	struct	_CmdQ	{
 	cmdq->size++;						\
 }
 
-
 /******************************************************************************
 
 	USB Cmd to ASIC Related MACRO
@@ -185,5 +180,4 @@ typedef	struct	_CmdQ	{
 			RTUSBEnqueueInternalCmd((_pAd), CMDTHREAD_SET_ASIC_WCID, &SetAsicWcid, sizeof(RT_SET_ASIC_WCID));	\
 		}while(0)
 
-
 #endif // __RTUSB_IO_H__ //

drivers/staging/rt2860/spectrum.h

@@ -31,10 +31,7 @@
 #include "rtmp_type.h"
 #include "spectrum_def.h"
 
-
-CHAR RTMP_GetTxPwr(
-	IN PRTMP_ADAPTER pAd,
-	IN HTTRANSMIT_SETTING HTTxMode);
+CHAR RTMP_GetTxPwr(IN PRTMP_ADAPTER pAd, IN HTTRANSMIT_SETTING HTTxMode);
 
 /*
 	==========================================================================
@@ -48,8 +45,7 @@ CHAR RTMP_GetTxPwr(
 	Return	: None.
 	==========================================================================
  */
-VOID MakeMeasurementReqFrame(
-	IN PRTMP_ADAPTER pAd,
+VOID MakeMeasurementReqFrame(IN PRTMP_ADAPTER pAd,
 			     OUT PUCHAR pOutBuffer,
 			     OUT PULONG pFrameLen,
 			     IN UINT8 TotalLen,
@@ -72,15 +68,13 @@ VOID MakeMeasurementReqFrame(
 	Return	: None.
 	==========================================================================
  */
-VOID EnqueueMeasurementRep(
-	IN PRTMP_ADAPTER pAd,
+VOID EnqueueMeasurementRep(IN PRTMP_ADAPTER pAd,
 			   IN PUCHAR pDA,
 			   IN UINT8 DialogToken,
 			   IN UINT8 MeasureToken,
 			   IN UINT8 MeasureReqMode,
 			   IN UINT8 MeasureReqType,
-	IN UINT8 ReportInfoLen,
-	IN PUINT8 pReportInfo);
+			   IN UINT8 ReportInfoLen, IN PUINT8 pReportInfo);
 
 /*
 	==========================================================================
@@ -94,10 +88,7 @@ VOID EnqueueMeasurementRep(
 	Return	: None.
 	==========================================================================
  */
-VOID EnqueueTPCReq(
-	IN PRTMP_ADAPTER pAd,
-	IN PUCHAR pDA,
-	IN UCHAR DialogToken);
+VOID EnqueueTPCReq(IN PRTMP_ADAPTER pAd, IN PUCHAR pDA, IN UCHAR DialogToken);
 
 /*
 	==========================================================================
@@ -111,12 +102,9 @@ VOID EnqueueTPCReq(
 	Return	: None.
 	==========================================================================
  */
-VOID EnqueueTPCRep(
-	IN PRTMP_ADAPTER pAd,
+VOID EnqueueTPCRep(IN PRTMP_ADAPTER pAd,
 		   IN PUCHAR pDA,
-	IN UINT8 DialogToken,
-	IN UINT8 TxPwr,
-	IN UINT8 LinkMargin);
+		   IN UINT8 DialogToken, IN UINT8 TxPwr, IN UINT8 LinkMargin);
 
 /*
 	==========================================================================
@@ -132,11 +120,8 @@ VOID EnqueueTPCRep(
 	Return	: None.
 	==========================================================================
  */
-VOID EnqueueChSwAnn(
-	IN PRTMP_ADAPTER pAd,
-	IN PUCHAR pDA,
-	IN UINT8 ChSwMode,
-	IN UINT8 NewCh);
+VOID EnqueueChSwAnn(IN PRTMP_ADAPTER pAd,
+		    IN PUCHAR pDA, IN UINT8 ChSwMode, IN UINT8 NewCh);
 
 /*
 	==========================================================================
@@ -150,9 +135,7 @@ VOID EnqueueChSwAnn(
 	Return	: None.
 	==========================================================================
  */
-VOID PeerSpectrumAction(
-    IN PRTMP_ADAPTER pAd,
-    IN MLME_QUEUE_ELEM *Elem);
+VOID PeerSpectrumAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem);
 
 /*
 	==========================================================================
@@ -163,73 +146,44 @@ VOID PeerSpectrumAction(
 	Return	: None.
 	==========================================================================
  */
-INT Set_MeasureReq_Proc(
-	IN	PRTMP_ADAPTER	pAd,
-	IN	PSTRING			arg);
+INT Set_MeasureReq_Proc(IN PRTMP_ADAPTER pAd, IN PSTRING arg);
 
-INT Set_TpcReq_Proc(
-	IN	PRTMP_ADAPTER	pAd,
-	IN	PSTRING			arg);
+INT Set_TpcReq_Proc(IN PRTMP_ADAPTER pAd, IN PSTRING arg);
 
-INT Set_PwrConstraint(
-	IN	PRTMP_ADAPTER	pAd,
-	IN	PSTRING			arg);
+INT Set_PwrConstraint(IN PRTMP_ADAPTER pAd, IN PSTRING arg);
 
+VOID MeasureReqTabInit(IN PRTMP_ADAPTER pAd);
 
-VOID MeasureReqTabInit(
-	IN PRTMP_ADAPTER pAd);
+VOID MeasureReqTabExit(IN PRTMP_ADAPTER pAd);
 
-VOID MeasureReqTabExit(
-	IN PRTMP_ADAPTER pAd);
+PMEASURE_REQ_ENTRY MeasureReqLookUp(IN PRTMP_ADAPTER pAd, IN UINT8 DialogToken);
 
-PMEASURE_REQ_ENTRY MeasureReqLookUp(
-	IN PRTMP_ADAPTER	pAd,
-	IN UINT8			DialogToken);
+PMEASURE_REQ_ENTRY MeasureReqInsert(IN PRTMP_ADAPTER pAd, IN UINT8 DialogToken);
 
-PMEASURE_REQ_ENTRY MeasureReqInsert(
-	IN PRTMP_ADAPTER	pAd,
-	IN UINT8			DialogToken);
+VOID MeasureReqDelete(IN PRTMP_ADAPTER pAd, IN UINT8 DialogToken);
 
-VOID MeasureReqDelete(
-	IN PRTMP_ADAPTER	pAd,
-	IN UINT8			DialogToken);
-
-VOID InsertChannelRepIE(
-	IN PRTMP_ADAPTER pAd,
+VOID InsertChannelRepIE(IN PRTMP_ADAPTER pAd,
 			OUT PUCHAR pFrameBuf,
 			OUT PULONG pFrameLen,
-	IN PSTRING pCountry,
-	IN UINT8 RegulatoryClass);
+			IN PSTRING pCountry, IN UINT8 RegulatoryClass);
 
-VOID InsertTpcReportIE(
-	IN PRTMP_ADAPTER pAd,
+VOID InsertTpcReportIE(IN PRTMP_ADAPTER pAd,
 		       OUT PUCHAR pFrameBuf,
 		       OUT PULONG pFrameLen,
-	IN UINT8 TxPwr,
-	IN UINT8 LinkMargin);
+		       IN UINT8 TxPwr, IN UINT8 LinkMargin);
 
-VOID InsertDialogToken(
-	IN PRTMP_ADAPTER pAd,
+VOID InsertDialogToken(IN PRTMP_ADAPTER pAd,
 		       OUT PUCHAR pFrameBuf,
-	OUT PULONG pFrameLen,
-	IN UINT8 DialogToken);
+		       OUT PULONG pFrameLen, IN UINT8 DialogToken);
 
-VOID TpcReqTabInit(
-	IN PRTMP_ADAPTER pAd);
+VOID TpcReqTabInit(IN PRTMP_ADAPTER pAd);
 
-VOID TpcReqTabExit(
-	IN PRTMP_ADAPTER pAd);
+VOID TpcReqTabExit(IN PRTMP_ADAPTER pAd);
 
-VOID NotifyChSwAnnToPeerAPs(
-	IN PRTMP_ADAPTER pAd,
+VOID NotifyChSwAnnToPeerAPs(IN PRTMP_ADAPTER pAd,
 			    IN PUCHAR pRA,
-	IN PUCHAR pTA,
-	IN UINT8 ChSwMode,
-	IN UINT8 Channel);
-
-VOID RguClass_BuildBcnChList(
-	IN PRTMP_ADAPTER pAd,
-	OUT PUCHAR pBuf,
-	OUT	PULONG pBufLen);
-#endif // __SPECTRUM_H__ //
+			    IN PUCHAR pTA, IN UINT8 ChSwMode, IN UINT8 Channel);
 
+VOID RguClass_BuildBcnChList(IN PRTMP_ADAPTER pAd,
+			     OUT PUCHAR pBuf, OUT PULONG pBufLen);
+#endif // __SPECTRUM_H__ //

drivers/staging/rt2860/spectrum_def.h

@@ -39,7 +39,6 @@
 #ifndef __SPECTRUM_DEF_H__
 #define __SPECTRUM_DEF_H__
 
-
 #define MAX_MEASURE_REQ_TAB_SIZE		32
 #define MAX_HASH_MEASURE_REQ_TAB_SIZE	MAX_MEASURE_REQ_TAB_SIZE
 
@@ -54,8 +53,7 @@
 #define TPC_DIALOGTOKEN_HASH_INDEX(_DialogToken)	((_DialogToken) % MAX_HASH_TPC_REQ_TAB_SIZE)
 #define MQ_DIALOGTOKEN_HASH_INDEX(_DialogToken)		((_DialogToken) % MAX_MEASURE_REQ_TAB_SIZE)
 
-typedef struct _MEASURE_REQ_ENTRY
-{
+typedef struct _MEASURE_REQ_ENTRY {
 	struct _MEASURE_REQ_ENTRY *pNext;
 	ULONG lastTime;
 	BOOLEAN Valid;
@@ -63,45 +61,37 @@ typedef struct _MEASURE_REQ_ENTRY
 	UINT8 MeasureDialogToken[3];	// 0:basic measure, 1: CCA measure, 2: RPI_Histogram measure.
 } MEASURE_REQ_ENTRY, *PMEASURE_REQ_ENTRY;
 
-typedef struct _MEASURE_REQ_TAB
-{
+typedef struct _MEASURE_REQ_TAB {
 	UCHAR Size;
 	PMEASURE_REQ_ENTRY Hash[MAX_HASH_MEASURE_REQ_TAB_SIZE];
 	MEASURE_REQ_ENTRY Content[MAX_MEASURE_REQ_TAB_SIZE];
 } MEASURE_REQ_TAB, *PMEASURE_REQ_TAB;
 
-typedef struct _TPC_REQ_ENTRY
-{
+typedef struct _TPC_REQ_ENTRY {
 	struct _TPC_REQ_ENTRY *pNext;
 	ULONG lastTime;
 	BOOLEAN Valid;
 	UINT8 DialogToken;
 } TPC_REQ_ENTRY, *PTPC_REQ_ENTRY;
 
-typedef struct _TPC_REQ_TAB
-{
+typedef struct _TPC_REQ_TAB {
 	UCHAR Size;
 	PTPC_REQ_ENTRY Hash[MAX_HASH_TPC_REQ_TAB_SIZE];
 	TPC_REQ_ENTRY Content[MAX_TPC_REQ_TAB_SIZE];
 } TPC_REQ_TAB, *PTPC_REQ_TAB;
 
-
 /* The regulatory information */
-typedef struct _DOT11_CHANNEL_SET
-{
+typedef struct _DOT11_CHANNEL_SET {
 	UCHAR NumberOfChannels;
 	UINT8 MaxTxPwr;
 	UCHAR ChannelList[16];
 } DOT11_CHANNEL_SET, *PDOT11_CHANNEL_SET;
 
-typedef struct _DOT11_REGULATORY_INFORMATION
-{
+typedef struct _DOT11_REGULATORY_INFORMATION {
 	UCHAR RegulatoryClass;
 	DOT11_CHANNEL_SET ChannelSet;
 } DOT11_REGULATORY_INFORMATION, *PDOT11_REGULATORY_INFORMATION;
 
-
-
 #define RM_TPC_REQ				0
 #define RM_MEASURE_REQ			1
 
@@ -111,53 +101,44 @@ typedef struct _DOT11_REGULATORY_INFORMATION
 #define RM_CH_LOAD				3
 #define RM_NOISE_HISTOGRAM		4
 
-
-typedef struct PACKED _TPC_REPORT_INFO
-{
+typedef struct PACKED _TPC_REPORT_INFO {
 	UINT8 TxPwr;
 	UINT8 LinkMargin;
 } TPC_REPORT_INFO, *PTPC_REPORT_INFO;
 
-typedef struct PACKED _CH_SW_ANN_INFO
-{
+typedef struct PACKED _CH_SW_ANN_INFO {
 	UINT8 ChSwMode;
 	UINT8 Channel;
 	UINT8 ChSwCnt;
 } CH_SW_ANN_INFO, *PCH_SW_ANN_INFO;
 
-typedef union PACKED _MEASURE_REQ_MODE
-{
-	struct PACKED
-	{
+typedef union PACKED _MEASURE_REQ_MODE {
+	struct PACKED {
 		UINT8 Parallel:1;
 		UINT8 Enable:1;
 		UINT8 Request:1;
 		UINT8 Report:1;
 		UINT8 DurationMandatory:1;
-		UINT8 :3;
+		 UINT8:3;
 	} field;
 	UINT8 word;
 } MEASURE_REQ_MODE, *PMEASURE_REQ_MODE;
 
-typedef struct PACKED _MEASURE_REQ
-{
+typedef struct PACKED _MEASURE_REQ {
 	UINT8 ChNum;
 	UINT64 MeasureStartTime;
 	UINT16 MeasureDuration;
 } MEASURE_REQ, *PMEASURE_REQ;
 
-typedef struct PACKED _MEASURE_REQ_INFO
-{
+typedef struct PACKED _MEASURE_REQ_INFO {
 	UINT8 Token;
 	MEASURE_REQ_MODE ReqMode;
 	UINT8 ReqType;
 	UINT8 Oct[0];
 } MEASURE_REQ_INFO, *PMEASURE_REQ_INFO;
 
-typedef union PACKED _MEASURE_BASIC_REPORT_MAP
-{
-	struct PACKED
-	{
+typedef union PACKED _MEASURE_BASIC_REPORT_MAP {
+	struct PACKED {
 		UINT8 BSS:1;
 
 		UINT8 OfdmPreamble:1;
@@ -169,34 +150,29 @@ typedef union PACKED _MEASURE_BASIC_REPORT_MAP
 	UINT8 word;
 } MEASURE_BASIC_REPORT_MAP, *PMEASURE_BASIC_REPORT_MAP;
 
-typedef struct PACKED _MEASURE_BASIC_REPORT
-{
+typedef struct PACKED _MEASURE_BASIC_REPORT {
 	UINT8 ChNum;
 	UINT64 MeasureStartTime;
 	UINT16 MeasureDuration;
 	MEASURE_BASIC_REPORT_MAP Map;
 } MEASURE_BASIC_REPORT, *PMEASURE_BASIC_REPORT;
 
-typedef struct PACKED _MEASURE_CCA_REPORT
-{
+typedef struct PACKED _MEASURE_CCA_REPORT {
 	UINT8 ChNum;
 	UINT64 MeasureStartTime;
 	UINT16 MeasureDuration;
 	UINT8 CCA_Busy_Fraction;
 } MEASURE_CCA_REPORT, *PMEASURE_CCA_REPORT;
 
-typedef struct PACKED _MEASURE_RPI_REPORT
-{
+typedef struct PACKED _MEASURE_RPI_REPORT {
 	UINT8 ChNum;
 	UINT64 MeasureStartTime;
 	UINT16 MeasureDuration;
 	UINT8 RPI_Density[8];
 } MEASURE_RPI_REPORT, *PMEASURE_RPI_REPORT;
 
-typedef union PACKED _MEASURE_REPORT_MODE
-{
-	struct PACKED
-	{
+typedef union PACKED _MEASURE_REPORT_MODE {
+	struct PACKED {
 		UINT8 Late:1;
 		UINT8 Incapable:1;
 		UINT8 Refused:1;
@@ -205,16 +181,14 @@ typedef union PACKED _MEASURE_REPORT_MODE
 	UINT8 word;
 } MEASURE_REPORT_MODE, *PMEASURE_REPORT_MODE;
 
-typedef struct PACKED _MEASURE_REPORT_INFO
-{
+typedef struct PACKED _MEASURE_REPORT_INFO {
 	UINT8 Token;
 	UINT8 ReportMode;
 	UINT8 ReportType;
 	UINT8 Octect[0];
 } MEASURE_REPORT_INFO, *PMEASURE_REPORT_INFO;
 
-typedef struct PACKED _QUIET_INFO
-{
+typedef struct PACKED _QUIET_INFO {
 	UINT8 QuietCnt;
 	UINT8 QuietPeriod;
 	UINT16 QuietDuration;
@@ -222,4 +196,3 @@ typedef struct PACKED _QUIET_INFO
 } QUIET_INFO, *PQUIET_INFO;
 
 #endif // __SPECTRUM_DEF_H__ //
-

drivers/staging/rt2860/wpa.h

@@ -147,7 +147,6 @@
 #define AKM_SUITE					2
 #define PMKID_LIST					3
 
-
 #define EAPOL_START_DISABLE					0
 #define EAPOL_START_PSK						1
 #define EAPOL_START_1X						2
@@ -181,7 +180,6 @@
 
 #define	CONV_ARRARY_TO_UINT16(_V)	((_V[0]<<8) | (_V[1]))
 
-
 #define	ADD_ONE_To_64BIT_VAR(_V)		\
 {										\
 	UCHAR	cnt = LEN_KEY_DESC_REPLAY;	\
@@ -197,8 +195,7 @@
 #define IS_WPA_CAPABILITY(a)       (((a) >= Ndis802_11AuthModeWPA) && ((a) <= Ndis802_11AuthModeWPA1PSKWPA2PSK))
 
 // EAPOL Key Information definition within Key descriptor format
-typedef	struct PACKED _KEY_INFO
-{
+typedef struct PACKED _KEY_INFO {
 	UCHAR KeyMic:1;
 	UCHAR Secure:1;
 	UCHAR Error:1;
@@ -213,8 +210,7 @@ typedef	struct PACKED _KEY_INFO
 } KEY_INFO, *PKEY_INFO;
 
 // EAPOL Key descriptor format
-typedef	struct PACKED _KEY_DESCRIPTER
-{
+typedef struct PACKED _KEY_DESCRIPTER {
 	UCHAR Type;
 	KEY_INFO KeyInfo;
 	UCHAR KeyLength[2];
@@ -228,8 +224,7 @@ typedef	struct PACKED _KEY_DESCRIPTER
 	UCHAR KeyData[MAX_LEN_OF_RSNIE];
 } KEY_DESCRIPTER, *PKEY_DESCRIPTER;
 
-typedef	struct PACKED _EAPOL_PACKET
-{
+typedef struct PACKED _EAPOL_PACKET {
 	UCHAR ProVer;
 	UCHAR ProType;
 	UCHAR Body_Len[2];
@@ -237,8 +232,7 @@ typedef	struct PACKED _EAPOL_PACKET
 } EAPOL_PACKET, *PEAPOL_PACKET;
 
 //802.11i D10 page 83
-typedef struct PACKED _GTK_ENCAP
-{
+typedef struct PACKED _GTK_ENCAP {
 	UCHAR Kid:2;
 	UCHAR tx:1;
 	UCHAR rsv:5;
@@ -246,8 +240,7 @@ typedef struct PACKED _GTK_ENCAP
 	UCHAR GTK[TKIP_GTK_LENGTH];
 } GTK_ENCAP, *PGTK_ENCAP;
 
-typedef struct PACKED _KDE_ENCAP
-{
+typedef struct PACKED _KDE_ENCAP {
 	UCHAR Type;
 	UCHAR Len;
 	UCHAR OUI[3];
@@ -263,7 +256,7 @@ typedef struct PACKED _RSNIE {
 	USHORT ucount;
 	struct PACKED {
 		UCHAR oui[4];
-    }ucast[1];
+	} ucast[1];
 } RSNIE, *PRSNIE;
 
 // For WPA2
@@ -273,7 +266,7 @@ typedef struct PACKED _RSNIE2 {
 	USHORT ucount;
 	struct PACKED {
 		UCHAR oui[4];
-    }ucast[1];
+	} ucast[1];
 } RSNIE2, *PRSNIE2;
 
 // AKM Suite
@@ -281,8 +274,8 @@ typedef struct PACKED _RSNIE_AUTH {
 	USHORT acount;
 	struct PACKED {
 		UCHAR oui[4];
-    }auth[1];
-} RSNIE_AUTH,*PRSNIE_AUTH;
+	} auth[1];
+} RSNIE_AUTH, *PRSNIE_AUTH;
 
 typedef union PACKED _RSN_CAPABILITIES {
 	struct PACKED {
@@ -306,8 +299,7 @@ typedef struct PACKED _EAP_HDR {
 
 // For supplicant state machine states. 802.11i Draft 4.1, p. 97
 // We simplified it
-typedef	enum	_WpaState
-{
+typedef enum _WpaState {
 	SS_NOTUSE,		// 0
 	SS_START,		// 1
 	SS_WAIT_MSG_3,		// 2
@@ -333,8 +325,7 @@ typedef	enum	_WpaState
 //      |       1  |  1  |   1  |  1  | -> 0x0F
 //      +------+-----+------+-----+
 //
-typedef	enum	_WpaMixPairCipher
-{
+typedef enum _WpaMixPairCipher {
 	MIX_CIPHER_NOTUSE = 0x00,
 	WPA_NONE_WPA2_TKIPAES = 0x03,	// WPA2-TKIPAES
 	WPA_AES_WPA2_TKIP = 0x06,
@@ -374,47 +365,29 @@ typedef struct	PACKED _RSN_CAPABILITY	{
 	USHORT PreAuth:1;
 } RSN_CAPABILITY, *PRSN_CAPABILITY;
 
-
 /*========================================
 	The prototype is defined in cmm_wpa.c
   ========================================*/
-BOOLEAN WpaMsgTypeSubst(
-	IN  UCHAR   EAPType,
-	OUT INT		*MsgType);
+BOOLEAN WpaMsgTypeSubst(IN UCHAR EAPType, OUT INT * MsgType);
 
-VOID    PRF(
-	IN  UCHAR   *key,
+VOID PRF(IN UCHAR * key,
 	 IN INT key_len,
-	IN  UCHAR   *prefix,
+	 IN UCHAR * prefix,
 	 IN INT prefix_len,
-	IN  UCHAR   *data,
-	IN  INT     data_len,
-	OUT UCHAR   *output,
-	IN  INT     len);
-
-int PasswordHash(
-	char *password,
-	unsigned char *ssid,
-	int ssidlength,
-	unsigned char *output);
-
-PUINT8	GetSuiteFromRSNIE(
-		IN	PUINT8	rsnie,
-		IN	UINT	rsnie_len,
-		IN	UINT8	type,
-		OUT	UINT8	*count);
-
-VOID WpaShowAllsuite(
-	IN	PUINT8	rsnie,
-	IN	UINT	rsnie_len);
-
-VOID RTMPInsertRSNIE(
-	IN PUCHAR pFrameBuf,
+	 IN UCHAR * data, IN INT data_len, OUT UCHAR * output, IN INT len);
+
+int PasswordHash(char *password,
+		 unsigned char *ssid, int ssidlength, unsigned char *output);
+
+PUINT8 GetSuiteFromRSNIE(IN PUINT8 rsnie,
+			 IN UINT rsnie_len, IN UINT8 type, OUT UINT8 * count);
+
+VOID WpaShowAllsuite(IN PUINT8 rsnie, IN UINT rsnie_len);
+
+VOID RTMPInsertRSNIE(IN PUCHAR pFrameBuf,
 		     OUT PULONG pFrameLen,
 		     IN PUINT8 rsnie_ptr,
 		     IN UINT8 rsnie_len,
-	IN PUINT8 pmkid_ptr,
-	IN UINT8  pmkid_len);
-
+		     IN PUINT8 pmkid_ptr, IN UINT8 pmkid_len);
 
 #endif