Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90942140 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: Fix all whitespace issues in Adapter.h 



This patch resolves all whitespace issues as reported
by checkpatch.pl.

Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c71e0a60

drivers/staging/bcm/Adapter.h

+342 −374
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ struct _PACKETTOSEND { 
} __attribute__((packed));

typedef struct _PACKETTOSEND PACKETTOSEND, *PPACKETTOSEND;





struct _CONTROL_PACKET {

	PVOID	ControlBuff;

	UINT	ControlBuffLen;
@@ -29,14 +28,12 @@ struct _CONTROL_PACKET { 
} __attribute__((packed));

typedef struct _CONTROL_PACKET CONTROL_PACKET, *PCONTROL_PACKET;





struct link_request {

	LEADER	Leader;

	UCHAR	szData[4];

} __attribute__((packed));

typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;





//classification extension is added

typedef struct _ADD_CONNECTION {

	ULONG	SrcIpAddressCount;
@@ -57,7 +54,6 @@ typedef struct _ADD_CONNECTION { 
	UCHAR	SrcProtocol;

} ADD_CONNECTION, *PADD_CONNECTION;





typedef struct _CLASSIFICATION_RULE {

	UCHAR	ucIPSrcAddrLen;

	UCHAR	ucIPSrcAddr[32];
@@ -80,7 +76,6 @@ typedef struct _CLASSIFICATION_ONLY { 
	UCHAR	ucDestinationAddress[16];

} CLASSIFICATION_ONLY, *PCLASSIFICATION_ONLY;





#define MAX_IP_RANGE_LENGTH 4

#define MAX_PORT_RANGE 4

#define MAX_PROTOCOL_LENGTH   32
@@ -94,7 +89,6 @@ typedef union _U_IP_ADDRESS { 
	struct {

		ULONG ulIpv6Addr[MAX_IP_RANGE_LENGTH * 4];//Source Ip Address Range

		ULONG ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4];//Source Ip Mask Address Range



	};

	struct {

		UCHAR ucIpv4Address[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
@@ -108,13 +102,10 @@ typedef union _U_IP_ADDRESS { 
struct _packet_info;



typedef struct _S_HDR_SUPRESSION_CONTEXTINFO {



	UCHAR ucaHdrSupressionInBuf[MAX_PHS_LENGTHS]; //Intermediate buffer to accumulate pkt Header for PHS

	UCHAR ucaHdrSupressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; //Intermediate buffer containing pkt Header after PHS



} S_HDR_SUPRESSION_CONTEXTINFO;





typedef struct _S_CLASSIFIER_RULE {

	ULONG		ulSFID;

	UCHAR		ucReserved[2];
@@ -226,6 +217,7 @@ struct _packet_info { 
			struct sk_buff *ControlTail;

		};

	};



	BOOLEAN		bProtocolValid;

	BOOLEAN		bTOSValid;

	BOOLEAN		bDestIpValid;
@@ -247,7 +239,6 @@ struct _packet_info { 
};

typedef struct _packet_info PacketInfo;





typedef struct _PER_TARANG_DATA {

	struct _PER_TARANG_DATA	*next;

	struct _MINI_ADAPTER	*Adapter;
@@ -260,7 +251,6 @@ typedef struct _PER_TARANG_DATA { 
	ULONG			RxCntrlMsgBitMask;

} PER_TARANG_DATA, *PPER_TARANG_DATA;





#ifdef REL_4_1

typedef struct _TARGET_PARAMS {

	B_UINT32 m_u32CfgVersion;
@@ -308,8 +298,6 @@ typedef struct _TARGET_PARAMS { 
	B_UINT32 m_u32Customize;

	B_UINT32 m_u32ConfigBW;  /* In Hz */

	B_UINT32 m_u32ShutDownTimer;





	B_UINT32 m_u32RadioParameter;

	B_UINT32 m_u32PhyParameter1;

	B_UINT32 m_u32PhyParameter2;
@@ -323,10 +311,8 @@ typedef struct _TARGET_PARAMS { 
	 * bit 19 is test harq ack/nack

	 */

	B_UINT32 m_u32TestOptions;



	B_UINT32 m_u32MaxMACDataperDLFrame;

	B_UINT32 m_u32MaxMACDataperULFrame;



	B_UINT32 m_u32Corr2MacFlags;



	//adding driver params.
@@ -361,7 +347,6 @@ struct _MINI_ADAPTER { 
	struct _MINI_ADAPTER	*next;

	struct net_device	*dev;

	u32			msg_enable;



	CHAR			*caDsxReqResp;

	atomic_t		ApplicationRunning;

	volatile INT		CtrlQueueLen;
@@ -374,10 +359,8 @@ struct _MINI_ADAPTER { 
	u32			StatisticsPointer;

	struct sk_buff		*RxControlHead;

	struct sk_buff		*RxControlTail;



	struct semaphore	RxAppControlQueuelock;

	struct semaphore	fw_download_sema;



	PPER_TARANG_DATA	pTarangs;

	spinlock_t		control_queue_lock;

	wait_queue_head_t	process_read_wait_queue;
@@ -399,7 +382,6 @@ struct _MINI_ADAPTER { 


	/*************** qos ******************/

	BOOLEAN			bETHCSEnabled;



	ULONG			BEBucketSize;

	ULONG			rtPSBucketSize;

	UCHAR			LinkStatus;
@@ -425,17 +407,13 @@ struct _MINI_ADAPTER { 
	ULONG			ulFreeTargetBufferCnt;

	ULONG			ulCurrentTargetBuffer;

	ULONG			ulTotalTargetBuffersAvailable;



	unsigned long		chip_id;



	wait_queue_head_t	lowpower_mode_wait_queue;



	BOOLEAN			bFlashBoot;

	BOOLEAN			bBinDownloaded;

	BOOLEAN			bCfgDownloaded;

	BOOLEAN			bSyncUpRequestSent;

	USHORT			usBestEffortQueueIndex;



	wait_queue_head_t	ioctl_fw_dnld_wait_queue;

	BOOLEAN			waiting_to_fw_download_done;

	pid_t			fw_download_process_pid;
@@ -483,7 +461,6 @@ struct _MINI_ADAPTER { 
	unsigned int		usIdleModePattern;

	//BOOLEAN			bTriedToWakeUpFromShutdown;

	BOOLEAN			bLinkDownRequested;



	int			downloadDDR;

	PHS_DEVICE_EXTENSION	stBCMPhsContext;

	S_HDR_SUPRESSION_CONTEXTINFO stPhsTxContextInfo;
@@ -513,9 +490,7 @@ struct _MINI_ADAPTER { 
	FP_FLASH_WRITE		fpFlashWrite;

	FP_FLASH_WRITE_STATUS	fpFlashWriteWithStatusCheck;





	struct semaphore	NVMRdmWrmLock;



	struct device		*pstCreatedClassDevice;



	//	BOOLEAN				InterfaceUpStatus;
@@ -545,9 +520,7 @@ struct _MINI_ADAPTER { 
	struct semaphore	LowPowerModeSync;

	ULONG			liDrainCalculated;

	UINT			gpioBitMap;



	S_BCM_DEBUG_STATE	stDebugState;



};

typedef struct _MINI_ADAPTER MINI_ADAPTER, *PMINI_ADAPTER;
@@ -560,7 +533,6 @@ struct _ETH_HEADER_STRUC { 
} __attribute__((packed));

typedef struct _ETH_HEADER_STRUC ETH_HEADER_STRUC, *PETH_HEADER_STRUC;





typedef struct FirmwareInfo {

	void	__user *pvMappedFirmwareAddress;

	ULONG	u32FirmwareLength;
@@ -580,8 +552,7 @@ typedef struct _DDR_SETTING { 
	UINT ulRegValue;

} DDR_SETTING, *PDDR_SETTING;

typedef DDR_SETTING DDR_SET_NODE, *PDDR_SET_NODE;

INT

InitAdapter(PMINI_ADAPTER psAdapter);

INT InitAdapter(PMINI_ADAPTER psAdapter);



// =====================================================================

// Beceem vendor request codes for EP0
@@ -604,7 +575,6 @@ InitAdapter(PMINI_ADAPTER psAdapter); 
#define ISO_MPS_REG	0x0F0110C8

#define ISO_MPS		0x00000000





#define EP1 0

#define EP2 1

#define EP3 2
@@ -612,11 +582,9 @@ InitAdapter(PMINI_ADAPTER psAdapter); 
#define EP5 4

#define EP6 5





typedef enum eInterface_setting {

	DEFAULT_SETTING_0  = 0,

	ALTERNATE_SETTING_1 = 1,

} INTERFACE_SETTING;



#endif	//__ADAPTER_H__