Staging: bcm: Fix all whitespace issues in Adapter.h
This patch resolves all whitespace issues as reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kevin McKinney
Greg Kroah-Hartman
parent
c71e0a60aa
commit
90942140bf
|
|
@ -12,31 +12,28 @@ struct _LEADER {
|
|||
USHORT PLength;
|
||||
UCHAR Status;
|
||||
UCHAR Unused[3];
|
||||
}__attribute__((packed));
|
||||
typedef struct _LEADER LEADER,*PLEADER;
|
||||
} __attribute__((packed));
|
||||
typedef struct _LEADER LEADER, *PLEADER;
|
||||
|
||||
struct _PACKETTOSEND {
|
||||
LEADER Leader;
|
||||
UCHAR ucPayload;
|
||||
}__attribute__((packed));
|
||||
} __attribute__((packed));
|
||||
typedef struct _PACKETTOSEND PACKETTOSEND, *PPACKETTOSEND;
|
||||
|
||||
|
||||
struct _CONTROL_PACKET {
|
||||
PVOID ControlBuff;
|
||||
UINT ControlBuffLen;
|
||||
struct _CONTROL_PACKET* next;
|
||||
}__attribute__((packed));
|
||||
typedef struct _CONTROL_PACKET CONTROL_PACKET,*PCONTROL_PACKET;
|
||||
|
||||
struct _CONTROL_PACKET *next;
|
||||
} __attribute__((packed));
|
||||
typedef struct _CONTROL_PACKET CONTROL_PACKET, *PCONTROL_PACKET;
|
||||
|
||||
struct link_request {
|
||||
LEADER Leader;
|
||||
UCHAR szData[4];
|
||||
}__attribute__((packed));
|
||||
} __attribute__((packed));
|
||||
typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;
|
||||
|
||||
|
||||
//classification extension is added
|
||||
typedef struct _ADD_CONNECTION {
|
||||
ULONG SrcIpAddressCount;
|
||||
|
|
@ -55,8 +52,7 @@ typedef struct _ADD_CONNECTION {
|
|||
|
||||
UCHAR SrcTOS;
|
||||
UCHAR SrcProtocol;
|
||||
} ADD_CONNECTION,*PADD_CONNECTION;
|
||||
|
||||
} ADD_CONNECTION, *PADD_CONNECTION;
|
||||
|
||||
typedef struct _CLASSIFICATION_RULE {
|
||||
UCHAR ucIPSrcAddrLen;
|
||||
|
|
@ -68,7 +64,7 @@ typedef struct _CLASSIFICATION_RULE {
|
|||
UCHAR ucDestPortRangeLen;
|
||||
UCHAR ucDestPortRange[4];
|
||||
USHORT usVcid;
|
||||
} CLASSIFICATION_RULE,*PCLASSIFICATION_RULE;
|
||||
} CLASSIFICATION_RULE, *PCLASSIFICATION_RULE;
|
||||
|
||||
typedef struct _CLASSIFICATION_ONLY {
|
||||
USHORT usVcid;
|
||||
|
|
@ -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];
|
||||
|
|
@ -104,16 +98,13 @@ typedef union _U_IP_ADDRESS {
|
|||
UCHAR ucIpv6Address[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
|
||||
UCHAR ucIpv6Mask[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
|
||||
};
|
||||
}U_IP_ADDRESS;
|
||||
} 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;
|
||||
|
||||
} S_HDR_SUPRESSION_CONTEXTINFO;
|
||||
|
||||
typedef struct _S_CLASSIFIER_RULE {
|
||||
ULONG ulSFID;
|
||||
|
|
@ -166,7 +157,7 @@ typedef struct _S_CLASSIFIER_RULE {
|
|||
UCHAR usUserPriority[2];
|
||||
USHORT usVLANID;
|
||||
USHORT usValidityBitMap;
|
||||
}S_CLASSIFIER_RULE;
|
||||
} S_CLASSIFIER_RULE;
|
||||
//typedef struct _S_CLASSIFIER_RULE S_CLASSIFIER_RULE;
|
||||
|
||||
typedef struct _S_FRAGMENTED_PACKET_INFO {
|
||||
|
|
@ -175,7 +166,7 @@ typedef struct _S_FRAGMENTED_PACKET_INFO {
|
|||
USHORT usIpIdentification;
|
||||
S_CLASSIFIER_RULE *pstMatchedClassifierEntry;
|
||||
BOOLEAN bOutOfOrderFragment;
|
||||
}S_FRAGMENTED_PACKET_INFO,*PS_FRAGMENTED_PACKET_INFO;
|
||||
} S_FRAGMENTED_PACKET_INFO, *PS_FRAGMENTED_PACKET_INFO;
|
||||
|
||||
struct _packet_info {
|
||||
//classification extension Rule
|
||||
|
|
@ -218,14 +209,15 @@ struct _packet_info {
|
|||
|
||||
union {
|
||||
struct {
|
||||
struct sk_buff* FirstTxQueue;
|
||||
struct sk_buff* LastTxQueue;
|
||||
struct sk_buff *FirstTxQueue;
|
||||
struct sk_buff *LastTxQueue;
|
||||
};
|
||||
struct {
|
||||
struct sk_buff* ControlHead;
|
||||
struct sk_buff* ControlTail;
|
||||
struct sk_buff *ControlHead;
|
||||
struct sk_buff *ControlTail;
|
||||
};
|
||||
};
|
||||
|
||||
BOOLEAN bProtocolValid;
|
||||
BOOLEAN bTOSValid;
|
||||
BOOLEAN bDestIpValid;
|
||||
|
|
@ -247,12 +239,11 @@ struct _packet_info {
|
|||
};
|
||||
typedef struct _packet_info PacketInfo;
|
||||
|
||||
|
||||
typedef struct _PER_TARANG_DATA {
|
||||
struct _PER_TARANG_DATA * next;
|
||||
struct _MINI_ADAPTER * Adapter;
|
||||
struct sk_buff* RxAppControlHead;
|
||||
struct sk_buff* RxAppControlTail;
|
||||
struct _PER_TARANG_DATA *next;
|
||||
struct _MINI_ADAPTER *Adapter;
|
||||
struct sk_buff *RxAppControlHead;
|
||||
struct sk_buff *RxAppControlTail;
|
||||
volatile INT AppCtrlQueueLen;
|
||||
BOOLEAN MacTracingEnabled;
|
||||
BOOLEAN bApplicationToExit;
|
||||
|
|
@ -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.
|
||||
|
|
@ -348,20 +334,19 @@ typedef struct _STTARGETDSXBUFFER {
|
|||
ULONG ulTargetDsxBuffer;
|
||||
B_UINT16 tid;
|
||||
BOOLEAN valid;
|
||||
}STTARGETDSXBUFFER, *PSTTARGETDSXBUFFER;
|
||||
} STTARGETDSXBUFFER, *PSTTARGETDSXBUFFER;
|
||||
|
||||
typedef INT (*FP_FLASH_WRITE)(struct _MINI_ADAPTER*,UINT,PVOID);
|
||||
typedef INT (*FP_FLASH_WRITE)(struct _MINI_ADAPTER *, UINT, PVOID);
|
||||
|
||||
typedef INT (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER*,UINT,PVOID);
|
||||
typedef INT (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER *, UINT, PVOID);
|
||||
|
||||
/**
|
||||
Driver adapter data structure
|
||||
Driver adapter data structure
|
||||
*/
|
||||
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;
|
||||
|
|
@ -460,19 +438,19 @@ struct _MINI_ADAPTER {
|
|||
LedEventInfo_t DriverState;
|
||||
/* Interface Specific */
|
||||
PVOID pvInterfaceAdapter;
|
||||
int (*bcm_file_download)( PVOID,
|
||||
int (*bcm_file_download)(PVOID,
|
||||
struct file *,
|
||||
unsigned int);
|
||||
int (*bcm_file_readback_from_chip)( PVOID,
|
||||
int (*bcm_file_readback_from_chip)(PVOID,
|
||||
struct file *,
|
||||
unsigned int);
|
||||
INT (*interface_rdm)(PVOID,
|
||||
UINT ,
|
||||
PVOID ,
|
||||
UINT,
|
||||
PVOID,
|
||||
INT);
|
||||
INT (*interface_wrm)(PVOID,
|
||||
UINT ,
|
||||
PVOID ,
|
||||
UINT,
|
||||
PVOID,
|
||||
INT);
|
||||
int (*interface_transmit)(PVOID, PVOID , UINT);
|
||||
BOOLEAN IdleMode;
|
||||
|
|
@ -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,41 +490,37 @@ struct _MINI_ADAPTER {
|
|||
FP_FLASH_WRITE fpFlashWrite;
|
||||
FP_FLASH_WRITE_STATUS fpFlashWriteWithStatusCheck;
|
||||
|
||||
|
||||
struct semaphore NVMRdmWrmLock;
|
||||
|
||||
struct device *pstCreatedClassDevice;
|
||||
|
||||
// BOOLEAN InterfaceUpStatus;
|
||||
// BOOLEAN InterfaceUpStatus;
|
||||
PFLASH2X_CS_INFO psFlash2xCSInfo;
|
||||
PFLASH_CS_INFO psFlashCSInfo ;
|
||||
PFLASH_CS_INFO psFlashCSInfo;
|
||||
PFLASH2X_VENDORSPECIFIC_INFO psFlash2xVendorInfo;
|
||||
UINT uiFlashBaseAdd; //Flash start address
|
||||
UINT uiActiveISOOffset; //Active ISO offset chosen before f/w download
|
||||
FLASH2X_SECTION_VAL eActiveISO; //Active ISO section val
|
||||
FLASH2X_SECTION_VAL eActiveDSD; //Active DSD val chosen before f/w download
|
||||
UINT uiActiveDSDOffsetAtFwDld; //For accessing Active DSD chosen before f/w download
|
||||
UINT uiFlashLayoutMajorVersion ;
|
||||
UINT uiFlashLayoutMajorVersion;
|
||||
UINT uiFlashLayoutMinorVersion;
|
||||
BOOLEAN bAllDSDWriteAllow ;
|
||||
BOOLEAN bSigCorrupted ;
|
||||
BOOLEAN bAllDSDWriteAllow;
|
||||
BOOLEAN bSigCorrupted;
|
||||
//this should be set who so ever want to change the Headers. after Wrtie it should be reset immediately.
|
||||
BOOLEAN bHeaderChangeAllowed ;
|
||||
INT SelectedChip ;
|
||||
BOOLEAN bHeaderChangeAllowed;
|
||||
INT SelectedChip;
|
||||
BOOLEAN bEndPointHalted;
|
||||
//while bFlashRawRead will be true, Driver ignore map lay out and consider flash as of without any map.
|
||||
BOOLEAN bFlashRawRead;
|
||||
BOOLEAN bPreparingForLowPowerMode ;
|
||||
BOOLEAN bDoSuspend ;
|
||||
UINT syscfgBefFwDld ;
|
||||
BOOLEAN StopAllXaction ;
|
||||
BOOLEAN bPreparingForLowPowerMode;
|
||||
BOOLEAN bDoSuspend;
|
||||
UINT syscfgBefFwDld;
|
||||
BOOLEAN StopAllXaction;
|
||||
UINT32 liTimeSinceLastNetEntry; //Used to Support extended CAPI requirements from
|
||||
struct semaphore LowPowerModeSync;
|
||||
ULONG liDrainCalculated;
|
||||
UINT gpioBitMap;
|
||||
|
||||
S_BCM_DEBUG_STATE stDebugState;
|
||||
|
||||
};
|
||||
typedef struct _MINI_ADAPTER MINI_ADAPTER, *PMINI_ADAPTER;
|
||||
|
||||
|
|
@ -557,31 +530,29 @@ struct _ETH_HEADER_STRUC {
|
|||
UCHAR au8DestinationAddress[6];
|
||||
UCHAR au8SourceAddress[6];
|
||||
USHORT u16Etype;
|
||||
}__attribute__((packed));
|
||||
} __attribute__((packed));
|
||||
typedef struct _ETH_HEADER_STRUC ETH_HEADER_STRUC, *PETH_HEADER_STRUC;
|
||||
|
||||
|
||||
typedef struct FirmwareInfo {
|
||||
void __user * pvMappedFirmwareAddress;
|
||||
void __user *pvMappedFirmwareAddress;
|
||||
ULONG u32FirmwareLength;
|
||||
ULONG u32StartingAddress;
|
||||
}__attribute__((packed)) FIRMWARE_INFO, *PFIRMWARE_INFO;
|
||||
} __attribute__((packed)) FIRMWARE_INFO, *PFIRMWARE_INFO;
|
||||
|
||||
// holds the value of net_device structure..
|
||||
extern struct net_device *gblpnetdev;
|
||||
typedef struct _cntl_pkt{
|
||||
typedef struct _cntl_pkt {
|
||||
PMINI_ADAPTER Adapter;
|
||||
PLEADER PLeader;
|
||||
}cntl_pkt;
|
||||
} cntl_pkt;
|
||||
typedef LINK_REQUEST CONTROL_MESSAGE;
|
||||
|
||||
typedef struct _DDR_SETTING {
|
||||
UINT ulRegAddress;
|
||||
UINT ulRegValue;
|
||||
}DDR_SETTING, *PDDR_SETTING;
|
||||
} 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;
|
||||
} INTERFACE_SETTING;
|
||||
|
||||
#endif //__ADAPTER_H__
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue