Staging: rt28x0: run *.h files through Lindent (52b81c89) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/staging/rt2860/ap.h

+14 −28

Original line number	Original line	Diff line number	Diff line
	@@ -41,40 +41,26 @@
	#define __AP_H__		#define __AP_H__

	// ap_wpa.c		// ap_wpa.c
	VOID WpaStateMachineInit(		VOID WpaStateMachineInit(IN PRTMP_ADAPTER pAd,
	IN PRTMP_ADAPTER pAd,		IN STATE_MACHINE * Sm, OUT STATE_MACHINE_FUNC Trans[]);
	IN STATE_MACHINE *Sm,
	OUT STATE_MACHINE_FUNC Trans[]);

	#ifdef RTMP_MAC_USB		#ifdef RTMP_MAC_USB
	VOID BeaconUpdateExec(		VOID BeaconUpdateExec(IN PVOID SystemSpecific1,
	IN PVOID SystemSpecific1,
	IN PVOID FunctionContext,		IN PVOID FunctionContext,
	IN PVOID SystemSpecific2,		IN PVOID SystemSpecific2, IN PVOID SystemSpecific3);
	IN PVOID SystemSpecific3);
	#endif // RTMP_MAC_USB //		#endif // RTMP_MAC_USB //

	VOID RTMPSetPiggyBack(		VOID RTMPSetPiggyBack(IN PRTMP_ADAPTER pAd, IN BOOLEAN bPiggyBack);
	IN PRTMP_ADAPTER pAd,
	IN BOOLEAN bPiggyBack);

	VOID MacTableReset(		VOID MacTableReset(IN PRTMP_ADAPTER pAd);
	IN PRTMP_ADAPTER pAd);

	MAC_TABLE_ENTRY *MacTableInsertEntry(		MAC_TABLE_ENTRY *MacTableInsertEntry(IN PRTMP_ADAPTER pAd,
	IN PRTMP_ADAPTER pAd,
	IN PUCHAR pAddr,		IN PUCHAR pAddr,
	IN UCHAR apidx,		IN UCHAR apidx, IN BOOLEAN CleanAll);
	IN BOOLEAN CleanAll);

	BOOLEAN MacTableDeleteEntry(		BOOLEAN MacTableDeleteEntry(IN PRTMP_ADAPTER pAd,
	IN PRTMP_ADAPTER pAd,		IN USHORT wcid, IN PUCHAR pAddr);
	IN USHORT wcid,
	IN PUCHAR pAddr);

	MAC_TABLE_ENTRY *MacTableLookup(		MAC_TABLE_ENTRY *MacTableLookup(IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr);
	IN PRTMP_ADAPTER pAd,
	IN PUCHAR pAddr);

	#endif // __AP_H__		#endif // __AP_H__

drivers/staging/rt2860/chip/mac_pci.h

+64 −85

drivers/staging/rt2860/chip/mac_usb.h

+117 −135

Original line number	Original line	Diff line number	Diff line
	@@ -43,7 +43,6 @@
	#include "../rtmp_iface.h"		#include "../rtmp_iface.h"
	#include "../rtmp_dot11.h"		#include "../rtmp_dot11.h"


	#define USB_CYC_CFG 0x02a4		#define USB_CYC_CFG 0x02a4

	#define BEACON_RING_SIZE 2		#define BEACON_RING_SIZE 2
	@@ -85,7 +84,6 @@ typedef struct PACKED _RXINFO_STRUC {
	UINT32 PlcpSignal:12;		UINT32 PlcpSignal:12;
	} RXINFO_STRUC, PRXINFO_STRUC, RT28XX_RXD_STRUC, PRT28XX_RXD_STRUC;		} RXINFO_STRUC, PRXINFO_STRUC, RT28XX_RXD_STRUC, PRT28XX_RXD_STRUC;


	//		//
	// TXINFO		// TXINFO
	//		//
	@@ -103,7 +101,6 @@ typedef struct _TXINFO_STRUC {
	UINT32 USBDMATxburst:1; //used ONLY in USB bulk Aggre. Force USB DMA transmit frame from current selected endpoint		UINT32 USBDMATxburst:1; //used ONLY in USB bulk Aggre. Force USB DMA transmit frame from current selected endpoint
	} TXINFO_STRUC, *PTXINFO_STRUC;		} TXINFO_STRUC, *PTXINFO_STRUC;


	//		//
	// Management ring buffer format		// Management ring buffer format
	//		//
	@@ -113,7 +110,6 @@ typedef struct _MGMT_STRUC {
	ULONG Length;		ULONG Length;
	} MGMT_STRUC, *PMGMT_STRUC;		} MGMT_STRUC, *PMGMT_STRUC;


	////////////////////////////////////////////////////////////////////////////		////////////////////////////////////////////////////////////////////////////
	// The TX_BUFFER structure forms the transmitted USB packet to the device		// The TX_BUFFER structure forms the transmitted USB packet to the device
	////////////////////////////////////////////////////////////////////////////		////////////////////////////////////////////////////////////////////////////
	@@ -137,10 +133,8 @@ typedef struct __HTTX_BUFFER{
	UCHAR Aggregation[4]; //Buffer for save Aggregation size.		UCHAR Aggregation[4]; //Buffer for save Aggregation size.
	} HTTX_BUFFER, *PHTTX_BUFFER;		} HTTX_BUFFER, *PHTTX_BUFFER;


	// used to track driver-generated write irps		// used to track driver-generated write irps
	typedef struct _TX_CONTEXT		typedef struct _TX_CONTEXT {
	{
	PVOID pAd; //Initialized in MiniportInitialize		PVOID pAd; //Initialized in MiniportInitialize
	PURB pUrb; //Initialized in MiniportInitialize		PURB pUrb; //Initialized in MiniportInitialize
	PIRP pIrp; //used to cancel pending bulk out.		PIRP pIrp; //used to cancel pending bulk out.
	@@ -163,10 +157,8 @@ typedef struct _TX_CONTEXT

	} TX_CONTEXT, PTX_CONTEXT, *PPTX_CONTEXT;		} TX_CONTEXT, PTX_CONTEXT, *PPTX_CONTEXT;


	// used to track driver-generated write irps		// used to track driver-generated write irps
	typedef struct _HT_TX_CONTEXT		typedef struct _HT_TX_CONTEXT {
	{
	PVOID pAd; //Initialized in MiniportInitialize		PVOID pAd; //Initialized in MiniportInitialize
	PURB pUrb; //Initialized in MiniportInitialize		PURB pUrb; //Initialized in MiniportInitialize
	PIRP pIrp; //used to cancel pending bulk out.		PIRP pIrp; //used to cancel pending bulk out.
	@@ -189,13 +181,11 @@ typedef struct _HT_TX_CONTEXT
	dma_addr_t data_dma; // urb dma on linux		dma_addr_t data_dma; // urb dma on linux
	} HT_TX_CONTEXT, PHT_TX_CONTEXT, *PPHT_TX_CONTEXT;		} HT_TX_CONTEXT, PHT_TX_CONTEXT, *PPHT_TX_CONTEXT;


	//		//
	// Structure to keep track of receive packets and buffers to indicate		// Structure to keep track of receive packets and buffers to indicate
	// receive data to the protocol.		// receive data to the protocol.
	//		//
	typedef struct _RX_CONTEXT		typedef struct _RX_CONTEXT {
	{
	PUCHAR TransferBuffer;		PUCHAR TransferBuffer;
	PVOID pAd;		PVOID pAd;
	PIRP pIrp; //used to cancel pending bulk in.		PIRP pIrp; //used to cancel pending bulk in.
	@@ -212,8 +202,6 @@ typedef struct _RX_CONTEXT
	dma_addr_t data_dma; // urb dma on linux		dma_addr_t data_dma; // urb dma on linux
	} RX_CONTEXT, *PRX_CONTEXT;		} RX_CONTEXT, *PRX_CONTEXT;



	/******************************************************************************		/******************************************************************************

	USB Frimware Related MACRO		USB Frimware Related MACRO
	@@ -226,8 +214,6 @@ typedef struct _RX_CONTEXT
	#define RTMP_WRITE_FIRMWARE(_pAd, _pFwImage, _FwLen) \		#define RTMP_WRITE_FIRMWARE(_pAd, _pFwImage, _FwLen) \
	RTUSBFirmwareWrite(_pAd, _pFwImage, _FwLen)		RTUSBFirmwareWrite(_pAd, _pFwImage, _FwLen)



	/******************************************************************************		/******************************************************************************

	USB TX Related MACRO		USB TX Related MACRO
	@@ -295,17 +281,14 @@ typedef struct _RX_CONTEXT
	#define GET_TXRING_FREENO(_pAd, _QueIdx) (_QueIdx) //(_pAd->TxRing[_QueIdx].TxSwFreeIdx)		#define GET_TXRING_FREENO(_pAd, _QueIdx) (_QueIdx) //(_pAd->TxRing[_QueIdx].TxSwFreeIdx)
	#define GET_MGMTRING_FREENO(_pAd) (_pAd->MgmtRing.TxSwFreeIdx)		#define GET_MGMTRING_FREENO(_pAd) (_pAd->MgmtRing.TxSwFreeIdx)


	/* ----------------- RX Related MACRO ----------------- */		/* ----------------- RX Related MACRO ----------------- */


	/*		/*
	* Device Hardware Interface Related MACRO		* Device Hardware Interface Related MACRO
	*/		*/
	#define RTMP_IRQ_INIT(pAd) do{}while(0)		#define RTMP_IRQ_INIT(pAd) do{}while(0)
	#define RTMP_IRQ_ENABLE(pAd) do{}while(0)		#define RTMP_IRQ_ENABLE(pAd) do{}while(0)


	/*		/*
	* MLME Related MACRO		* MLME Related MACRO
	*/		*/
	@@ -330,7 +313,6 @@ typedef struct _RX_CONTEXT
	RTUSBMlmeUp(_pAd); \		RTUSBMlmeUp(_pAd); \
	}		}


	/*		/*
	* Power Save Related MACRO		* Power Save Related MACRO
	*/		*/

drivers/staging/rt2860/chip/rt2860.h

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -46,11 +46,9 @@
	#define NIC2760_PCI_DEVICE_ID 0x0701 // 1T/2R Cardbus ???		#define NIC2760_PCI_DEVICE_ID 0x0701 // 1T/2R Cardbus ???
	#define NIC2790_PCIe_DEVICE_ID 0x0781 // 1T/2R miniCard		#define NIC2790_PCIe_DEVICE_ID 0x0781 // 1T/2R miniCard


	#define VEN_AWT_PCIe_DEVICE_ID 0x1059		#define VEN_AWT_PCIe_DEVICE_ID 0x1059
	#define VEN_AWT_PCI_VENDOR_ID 0x1A3B		#define VEN_AWT_PCI_VENDOR_ID 0x1A3B

	#define EDIMAX_PCI_VENDOR_ID 0x1432		#define EDIMAX_PCI_VENDOR_ID 0x1432


	#endif //__RT2860_H__ //		#endif //__RT2860_H__ //

drivers/staging/rt2860/chip/rt2870.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,6 @@
	#include "../rtmp_type.h"		#include "../rtmp_type.h"
	#include "mac_usb.h"		#include "mac_usb.h"


	//#define RTMP_CHIP_NAME "RT2870"		//#define RTMP_CHIP_NAME "RT2870"

	#endif // RT2870 //		#endif // RT2870 //

Original line number	Original line	Diff line number	Diff line
	@@ -43,7 +43,6 @@
	#include "../rtmp_iface.h"		#include "../rtmp_iface.h"
	#include "../rtmp_dot11.h"		#include "../rtmp_dot11.h"


	//		//
	// Device ID & Vendor ID related definitions,		// Device ID & Vendor ID related definitions,
	// NOTE: you should not add the new VendorID/DeviceID here unless you not sure it belongs to what chip.		// NOTE: you should not add the new VendorID/DeviceID here unless you not sure it belongs to what chip.
	@@ -61,10 +60,6 @@
	#define PCI_CLASS_BRIDGE_PCI 0x0604		#define PCI_CLASS_BRIDGE_PCI 0x0604
	#endif		#endif





	#define TXINFO_SIZE 0		#define TXINFO_SIZE 0
	#define RTMP_PKT_TAIL_PADDING 0		#define RTMP_PKT_TAIL_PADDING 0
	#define fRTMP_ADAPTER_NEED_STOP_TX 0		#define fRTMP_ADAPTER_NEED_STOP_TX 0
	@@ -96,7 +91,6 @@ typedef struct PACKED _TXD_STRUC {
	UINT32 ICO:1; //		UINT32 ICO:1; //
	} TXD_STRUC, *PTXD_STRUC;		} TXD_STRUC, *PTXD_STRUC;


	//		//
	// Rx descriptor format, Rx Ring		// Rx descriptor format, Rx Ring
	//		//
	@@ -134,8 +128,7 @@ typedef struct PACKED _RXD_STRUC{
	} RXD_STRUC, PRXD_STRUC, RT28XX_RXD_STRUC, PRT28XX_RXD_STRUC;		} RXD_STRUC, PRXD_STRUC, RT28XX_RXD_STRUC, PRT28XX_RXD_STRUC;

	typedef union _TX_ATTENUATION_CTRL_STRUC {		typedef union _TX_ATTENUATION_CTRL_STRUC {
	struct		struct {
	{
	ULONG RF_ISOLATION_ENABLE:1;		ULONG RF_ISOLATION_ENABLE:1;
	ULONG Reserve2:7;		ULONG Reserve2:7;
	ULONG PCIE_PHY_TX_ATTEN_VALUE:3;		ULONG PCIE_PHY_TX_ATTEN_VALUE:3;
	@@ -152,7 +145,6 @@ typedef union _TX_ATTENUATION_CTRL_STRUC {
	#define FIRMWARE_IMAGE_BASE 0x2000		#define FIRMWARE_IMAGE_BASE 0x2000
	#define MAX_FIRMWARE_IMAGE_SIZE 0x2000 // 8kbyte		#define MAX_FIRMWARE_IMAGE_SIZE 0x2000 // 8kbyte