leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

beceem: clean up adapter structure

Browse Source 
Remove dead fields, change fields that only have true/false to boolean;
and rearrange to save space.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
This commit is contained in:
Stephen Hemminger 2010-11-01 11:12:56 -04:00
parent 9e0a3169a3
commit 3349d95b3f
1 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/staging/bcm/Adapter.h
View File

@ -384,17 +384,18 @@ struct _MINI_ADAPTER
struct _MINI_ADAPTER *next; struct _MINI_ADAPTER *next;
CHAR *caDsxReqResp; CHAR *caDsxReqResp;
atomic_t ApplicationRunning; atomic_t ApplicationRunning;
volatile INT CtrlQueueLen; volatile INT CtrlQueueLen;
atomic_t AppCtrlQueueLen; atomic_t AppCtrlQueueLen;
BOOLEAN AppCtrlQueueOverFlow; BOOLEAN AppCtrlQueueOverFlow;
atomic_t CurrentApplicationCount; atomic_t CurrentApplicationCount;
atomic_t RegisteredApplicationCount; atomic_t RegisteredApplicationCount;
BOOLEAN TimerActive; BOOLEAN LinkUpStatus;
ULONG StatisticsPointer; BOOLEAN TimerActive;
u32 StatisticsPointer;
struct sk_buff *RxControlHead; struct sk_buff *RxControlHead;
struct sk_buff *RxControlTail; struct sk_buff *RxControlTail;
// spinlock_t RxControlQueuelock;
struct semaphore RxAppControlQueuelock; struct semaphore RxAppControlQueuelock;
struct semaphore fw_download_sema; struct semaphore fw_download_sema;
@ -421,14 +422,14 @@ struct _MINI_ADAPTER
atomic_t GoodTxByteCount; atomic_t GoodTxByteCount;
atomic_t TxTotalPacketCount; atomic_t TxTotalPacketCount;
atomic_t TxDroppedPacketCount; atomic_t TxDroppedPacketCount;
ULONG LinkUpStatus;
BOOLEAN TransferMode;
UINT u32TotalDSD; UINT u32TotalDSD;
PacketInfo PackInfo[NO_OF_QUEUES]; PacketInfo PackInfo[NO_OF_QUEUES];
S_CLASSIFIER_RULE astClassifierTable[MAX_CLASSIFIERS]; S_CLASSIFIER_RULE astClassifierTable[MAX_CLASSIFIERS];
BOOLEAN TransferMode;
/*************** qos ******************/ /*************** qos ******************/
UINT bETHCSEnabled; BOOLEAN bETHCSEnabled;
ULONG BEBucketSize; ULONG BEBucketSize;
ULONG rtPSBucketSize; ULONG rtPSBucketSize;
@ -444,8 +445,6 @@ struct _MINI_ADAPTER
atomic_t process_waiting; atomic_t process_waiting;
BOOLEAN fw_download_done; BOOLEAN fw_download_done;
unsigned int ctrlpkt_present;
BOOLEAN packets_given_to_all;
char *txctlpacket[MAX_CNTRL_PKTS]; char *txctlpacket[MAX_CNTRL_PKTS];
atomic_t cntrlpktCnt ; atomic_t cntrlpktCnt ;
atomic_t index_app_read_cntrlpkt; atomic_t index_app_read_cntrlpkt;
@ -455,33 +454,30 @@ struct _MINI_ADAPTER
struct semaphore rdmwrmsync; struct semaphore rdmwrmsync;
STTARGETDSXBUFFER astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS]; STTARGETDSXBUFFER astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS];
ULONG ulFreeTargetBufferCnt; ULONG ulFreeTargetBufferCnt;
ULONG ulCurrentTargetBuffer; ULONG ulCurrentTargetBuffer;
ULONG ulTotalTargetBuffersAvailable; ULONG ulTotalTargetBuffersAvailable;
unsigned int timeout;
int irq;
unsigned long chip_id; unsigned long chip_id;
unsigned int bFlashBoot;
// spinlock_t sleeper_lock;
atomic_t rdm_wrm_access;
atomic_t tx_rx_access;
wait_queue_head_t lowpower_mode_wait_queue; wait_queue_head_t lowpower_mode_wait_queue;
atomic_t bAbortedByHost;
BOOLEAN bBinDownloaded; BOOLEAN bFlashBoot;
BOOLEAN bCfgDownloaded; BOOLEAN bBinDownloaded;
USHORT usBestEffortQueueIndex; BOOLEAN bCfgDownloaded;
BOOLEAN bSyncUpRequestSent; BOOLEAN bSyncUpRequestSent;
// struct semaphore data_packet_queue_lock; USHORT usBestEffortQueueIndex;
wait_queue_head_t ioctl_fw_dnld_wait_queue; wait_queue_head_t ioctl_fw_dnld_wait_queue;
BOOLEAN waiting_to_fw_download_done; BOOLEAN waiting_to_fw_download_done;
pid_t fw_download_process_pid; pid_t fw_download_process_pid;
PSTARGETPARAMS pstargetparams; PSTARGETPARAMS pstargetparams;
BOOLEAN device_removed; BOOLEAN device_removed;
BOOLEAN DeviceAccess; BOOLEAN DeviceAccess;
INT DDRSetting;
BOOLEAN bDDRInitDone;
ULONG ulPowerSaveMode;
BOOLEAN bIsAutoCorrectEnabled; BOOLEAN bIsAutoCorrectEnabled;
BOOLEAN bDDRInitDone;
INT DDRSetting;
ULONG ulPowerSaveMode;
spinlock_t txtransmitlock; spinlock_t txtransmitlock;
B_UINT8 txtransmit_running; B_UINT8 txtransmit_running;
/* Thread for control packet handling */ /* Thread for control packet handling */
@ -525,7 +521,7 @@ struct _MINI_ADAPTER
S_HDR_SUPRESSION_CONTEXTINFO stPhsTxContextInfo; S_HDR_SUPRESSION_CONTEXTINFO stPhsTxContextInfo;
uint8_t ucaPHSPktRestoreBuf[2048]; uint8_t ucaPHSPktRestoreBuf[2048];
uint8_t bPHSEnabled; uint8_t bPHSEnabled;
int AutoFirmDld; BOOLEAN AutoFirmDld;
BOOLEAN bMipsConfig; BOOLEAN bMipsConfig;
BOOLEAN bDPLLConfig; BOOLEAN bDPLLConfig;
UINT32 aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES]; UINT32 aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];