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

staging: bcm: Replace BOOLEAN with bool

Browse Source 
Remove user-defined BOOLEAN data type with C bool data
type.

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lisa Nguyen 2013-10-28 01:35:59 -07:00 committed by Greg Kroah-Hartman
parent d31d4785e0
commit 3abd6f11cb
21 changed files with 130 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ struct bcm_classifier_rule {
ULONG ulSFID; ULONG ulSFID;
UCHAR ucReserved[2]; UCHAR ucReserved[2];
B_UINT16 uiClassifierRuleIndex; B_UINT16 uiClassifierRuleIndex;
BOOLEAN bUsed; bool bUsed;
USHORT usVCID_Value; USHORT usVCID_Value;
B_UINT8 u8ClassifierRulePriority; /* This field detemines the Classifier Priority */ B_UINT8 u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
U_IP_ADDRESS stSrcIpAddress; U_IP_ADDRESS stSrcIpAddress;
@ -86,14 +86,14 @@ struct bcm_classifier_rule {
USHORT usDestPortRangeHi[MAX_PORT_RANGE]; USHORT usDestPortRangeHi[MAX_PORT_RANGE];
UCHAR ucDestPortRangeLength; UCHAR ucDestPortRangeLength;
BOOLEAN bProtocolValid; bool bProtocolValid;
BOOLEAN bTOSValid; bool bTOSValid;
BOOLEAN bDestIpValid; bool bDestIpValid;
BOOLEAN bSrcIpValid; bool bSrcIpValid;
/* For IPv6 Addressing */ /* For IPv6 Addressing */
UCHAR ucDirection; UCHAR ucDirection;
BOOLEAN bIpv6Protocol; bool bIpv6Protocol;
UINT32 u32PHSRuleID; UINT32 u32PHSRuleID;
struct bcm_phs_rule sPhsRule; struct bcm_phs_rule sPhsRule;
UCHAR u8AssociatedPHSI; UCHAR u8AssociatedPHSI;
@ -113,11 +113,11 @@ struct bcm_classifier_rule {
}; };
struct bcm_fragmented_packet_info { struct bcm_fragmented_packet_info {
BOOLEAN bUsed; bool bUsed;
ULONG ulSrcIpAddress; ULONG ulSrcIpAddress;
USHORT usIpIdentification; USHORT usIpIdentification;
struct bcm_classifier_rule *pstMatchedClassifierEntry; struct bcm_classifier_rule *pstMatchedClassifierEntry;
BOOLEAN bOutOfOrderFragment; bool bOutOfOrderFragment;
}; };
struct bcm_packet_info { struct bcm_packet_info {
@ -128,9 +128,9 @@ struct bcm_packet_info {
/* This field determines the priority of the SF Queues */ /* This field determines the priority of the SF Queues */
B_UINT8 u8TrafficPriority; B_UINT8 u8TrafficPriority;
BOOLEAN bValid; bool bValid;
BOOLEAN bActive; bool bActive;
BOOLEAN bActivateRequestSent; bool bActivateRequestSent;
B_UINT8 u8QueueType; /* BE or rtPS */ B_UINT8 u8QueueType; /* BE or rtPS */
@ -170,17 +170,17 @@ struct bcm_packet_info {
}; };
}; };
BOOLEAN bProtocolValid; bool bProtocolValid;
BOOLEAN bTOSValid; bool bTOSValid;
BOOLEAN bDestIpValid; bool bDestIpValid;
BOOLEAN bSrcIpValid; bool bSrcIpValid;
BOOLEAN bActiveSet; bool bActiveSet;
BOOLEAN bAdmittedSet; bool bAdmittedSet;
BOOLEAN bAuthorizedSet; bool bAuthorizedSet;
BOOLEAN bClassifierPriority; bool bClassifierPriority;
UCHAR ucServiceClassName[MAX_CLASS_NAME_LENGTH]; UCHAR ucServiceClassName[MAX_CLASS_NAME_LENGTH];
BOOLEAN bHeaderSuppressionEnabled; bool bHeaderSuppressionEnabled;
spinlock_t SFQueueLock; spinlock_t SFQueueLock;
void *pstSFIndication; void *pstSFIndication;
struct timeval stLastUpdateTokenAt; struct timeval stLastUpdateTokenAt;
@ -196,8 +196,8 @@ struct bcm_tarang_data {
struct sk_buff *RxAppControlHead; struct sk_buff *RxAppControlHead;
struct sk_buff *RxAppControlTail; struct sk_buff *RxAppControlTail;
int AppCtrlQueueLen; int AppCtrlQueueLen;
BOOLEAN MacTracingEnabled; bool MacTracingEnabled;
BOOLEAN bApplicationToExit; bool bApplicationToExit;
struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs; struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs;
ULONG RxCntrlMsgBitMask; ULONG RxCntrlMsgBitMask;
}; };
@ -205,7 +205,7 @@ struct bcm_tarang_data {
struct bcm_targetdsx_buffer { struct bcm_targetdsx_buffer {
ULONG ulTargetDsxBuffer; ULONG ulTargetDsxBuffer;
B_UINT16 tid; B_UINT16 tid;
BOOLEAN valid; bool valid;
}; };
typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, UINT, PVOID); typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, UINT, PVOID);
@ -221,11 +221,11 @@ struct bcm_mini_adapter {
u32 msg_enable; u32 msg_enable;
CHAR *caDsxReqResp; CHAR *caDsxReqResp;
atomic_t ApplicationRunning; atomic_t ApplicationRunning;
BOOLEAN AppCtrlQueueOverFlow; bool AppCtrlQueueOverFlow;
atomic_t CurrentApplicationCount; atomic_t CurrentApplicationCount;
atomic_t RegisteredApplicationCount; atomic_t RegisteredApplicationCount;
BOOLEAN LinkUpStatus; bool LinkUpStatus;
BOOLEAN TimerActive; bool TimerActive;
u32 StatisticsPointer; u32 StatisticsPointer;
struct sk_buff *RxControlHead; struct sk_buff *RxControlHead;
struct sk_buff *RxControlTail; struct sk_buff *RxControlTail;
@ -249,22 +249,22 @@ struct bcm_mini_adapter {
UINT u32TotalDSD; UINT u32TotalDSD;
struct bcm_packet_info PackInfo[NO_OF_QUEUES]; struct bcm_packet_info PackInfo[NO_OF_QUEUES];
struct bcm_classifier_rule astClassifierTable[MAX_CLASSIFIERS]; struct bcm_classifier_rule astClassifierTable[MAX_CLASSIFIERS];
BOOLEAN TransferMode; bool TransferMode;
/*************** qos ******************/ /*************** qos ******************/
BOOLEAN bETHCSEnabled; bool bETHCSEnabled;
ULONG BEBucketSize; ULONG BEBucketSize;
ULONG rtPSBucketSize; ULONG rtPSBucketSize;
UCHAR LinkStatus; UCHAR LinkStatus;
BOOLEAN AutoLinkUp; bool AutoLinkUp;
BOOLEAN AutoSyncup; bool AutoSyncup;
int major; int major;
int minor; int minor;
wait_queue_head_t tx_packet_wait_queue; wait_queue_head_t tx_packet_wait_queue;
wait_queue_head_t process_rx_cntrlpkt; wait_queue_head_t process_rx_cntrlpkt;
atomic_t process_waiting; atomic_t process_waiting;
BOOLEAN fw_download_done; bool fw_download_done;
char *txctlpacket[MAX_CNTRL_PKTS]; char *txctlpacket[MAX_CNTRL_PKTS];
atomic_t cntrlpktCnt ; atomic_t cntrlpktCnt ;
@ -280,19 +280,19 @@ struct bcm_mini_adapter {
ULONG ulTotalTargetBuffersAvailable; ULONG ulTotalTargetBuffersAvailable;
unsigned long chip_id; unsigned long chip_id;
wait_queue_head_t lowpower_mode_wait_queue; wait_queue_head_t lowpower_mode_wait_queue;
BOOLEAN bFlashBoot; bool bFlashBoot;
BOOLEAN bBinDownloaded; bool bBinDownloaded;
BOOLEAN bCfgDownloaded; bool bCfgDownloaded;
BOOLEAN bSyncUpRequestSent; bool bSyncUpRequestSent;
USHORT usBestEffortQueueIndex; 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; bool waiting_to_fw_download_done;
pid_t fw_download_process_pid; pid_t fw_download_process_pid;
struct bcm_target_params *pstargetparams; struct bcm_target_params *pstargetparams;
BOOLEAN device_removed; bool device_removed;
BOOLEAN DeviceAccess; bool DeviceAccess;
BOOLEAN bIsAutoCorrectEnabled; bool bIsAutoCorrectEnabled;
BOOLEAN bDDRInitDone; bool bDDRInitDone;
int DDRSetting; int DDRSetting;
ULONG ulPowerSaveMode; ULONG ulPowerSaveMode;
spinlock_t txtransmitlock; spinlock_t txtransmitlock;
@ -324,22 +324,22 @@ struct bcm_mini_adapter {
PVOID, PVOID,
int); int);
int (*interface_transmit)(PVOID, PVOID , UINT); int (*interface_transmit)(PVOID, PVOID , UINT);
BOOLEAN IdleMode; bool IdleMode;
BOOLEAN bDregRequestSentInIdleMode; bool bDregRequestSentInIdleMode;
BOOLEAN bTriedToWakeUpFromlowPowerMode; bool bTriedToWakeUpFromlowPowerMode;
BOOLEAN bShutStatus; bool bShutStatus;
BOOLEAN bWakeUpDevice; bool bWakeUpDevice;
unsigned int usIdleModePattern; unsigned int usIdleModePattern;
/* BOOLEAN bTriedToWakeUpFromShutdown; */ /* BOOLEAN bTriedToWakeUpFromShutdown; */
BOOLEAN bLinkDownRequested; bool bLinkDownRequested;
int downloadDDR; int downloadDDR;
struct bcm_phs_extension stBCMPhsContext; struct bcm_phs_extension stBCMPhsContext;
struct bcm_hdr_suppression_contextinfo stPhsTxContextInfo; struct bcm_hdr_suppression_contextinfo stPhsTxContextInfo;
uint8_t ucaPHSPktRestoreBuf[2048]; uint8_t ucaPHSPktRestoreBuf[2048];
uint8_t bPHSEnabled; uint8_t bPHSEnabled;
BOOLEAN AutoFirmDld; bool AutoFirmDld;
BOOLEAN bMipsConfig; bool bMipsConfig;
BOOLEAN bDPLLConfig; bool bDPLLConfig;
UINT32 aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES]; UINT32 aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
UINT32 aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES]; UINT32 aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
struct bcm_fragmented_packet_info astFragmentedPktClassifierTable[MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES]; struct bcm_fragmented_packet_info astFragmentedPktClassifierTable[MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES];
@ -348,8 +348,8 @@ struct bcm_mini_adapter {
enum bcm_nvm_type eNVMType; enum bcm_nvm_type eNVMType;
UINT uiSectorSize; UINT uiSectorSize;
UINT uiSectorSizeInCFG; UINT uiSectorSizeInCFG;
BOOLEAN bSectorSizeOverride; bool bSectorSizeOverride;
BOOLEAN bStatusWrite; bool bStatusWrite;
UINT uiNVMDSDSize; UINT uiNVMDSDSize;
UINT uiVendorExtnFlag; UINT uiVendorExtnFlag;
/* it will always represent chosen DSD at any point of time. /* it will always represent chosen DSD at any point of time.
@ -376,18 +376,18 @@ struct bcm_mini_adapter {
UINT uiActiveDSDOffsetAtFwDld; /* For accessing Active DSD chosen before f/w download */ UINT uiActiveDSDOffsetAtFwDld; /* For accessing Active DSD chosen before f/w download */
UINT uiFlashLayoutMajorVersion; UINT uiFlashLayoutMajorVersion;
UINT uiFlashLayoutMinorVersion; UINT uiFlashLayoutMinorVersion;
BOOLEAN bAllDSDWriteAllow; bool bAllDSDWriteAllow;
BOOLEAN bSigCorrupted; bool bSigCorrupted;
/* this should be set who so ever want to change the Headers. after Wrtie it should be reset immediately. */ /* this should be set who so ever want to change the Headers. after Wrtie it should be reset immediately. */
BOOLEAN bHeaderChangeAllowed; bool bHeaderChangeAllowed;
int SelectedChip; int SelectedChip;
BOOLEAN bEndPointHalted; bool bEndPointHalted;
/* while bFlashRawRead will be true, Driver ignore map lay out and consider flash as of without any map. */ /* while bFlashRawRead will be true, Driver ignore map lay out and consider flash as of without any map. */
BOOLEAN bFlashRawRead; bool bFlashRawRead;
BOOLEAN bPreparingForLowPowerMode; bool bPreparingForLowPowerMode;
BOOLEAN bDoSuspend; bool bDoSuspend;
UINT syscfgBefFwDld; UINT syscfgBefFwDld;
BOOLEAN StopAllXaction; bool StopAllXaction;
UINT32 liTimeSinceLastNetEntry; /* Used to Support extended CAPI requirements from */ UINT32 liTimeSinceLastNetEntry; /* Used to Support extended CAPI requirements from */
struct semaphore LowPowerModeSync; struct semaphore LowPowerModeSync;
ULONG liDrainCalculated; ULONG liDrainCalculated;

6
drivers/staging/bcm/CmHost.c
View File

@ -113,7 +113,7 @@ static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIn
static inline VOID static inline VOID
CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry, CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry,
B_UINT8 u8IpAddressLen, B_UINT8 *pu8IpAddressMaskSrc, B_UINT8 u8IpAddressLen, B_UINT8 *pu8IpAddressMaskSrc,
BOOLEAN bIpVersion6, enum bcm_ipaddr_context eIpAddrContext) bool bIpVersion6, enum bcm_ipaddr_context eIpAddrContext)
{ {
int i = 0; int i = 0;
UINT nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS; UINT nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS;
@ -213,7 +213,7 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry,
} }
} }
void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter, B_UINT16 TID, BOOLEAN bFreeAll) void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter, B_UINT16 TID, bool bFreeAll)
{ {
int i; int i;
@ -1630,7 +1630,7 @@ int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
* for the Connection Management. * for the Connection Management.
* @return - Queue index for the free SFID else returns Invalid Index. * @return - Queue index for the free SFID else returns Invalid Index.
*/ */
BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */
PVOID pvBuffer /* Starting Address of the Buffer, that contains the AddIndication Data */) PVOID pvBuffer /* Starting Address of the Buffer, that contains the AddIndication Data */)
{ {
struct bcm_connect_mgr_params *psfLocalSet = NULL; struct bcm_connect_mgr_params *psfLocalSet = NULL;

2
drivers/staging/bcm/CmHost.h
View File

@ -55,7 +55,7 @@ unsigned long StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, vo
int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter); int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter); int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
unsigned long SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter); unsigned long SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter);
BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, void *pvBuffer); bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, void *pvBuffer);
#pragma pack(pop) #pragma pack(pop)

2
drivers/staging/bcm/DDRInit.c
View File

@ -1106,7 +1106,7 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter)
unsigned long ul_ddr_setting_load_addr = DDR_DUMP_INTERNAL_DEVICE_MEMORY; unsigned long ul_ddr_setting_load_addr = DDR_DUMP_INTERNAL_DEVICE_MEMORY;
UINT value = 0; UINT value = 0;
int retval = STATUS_SUCCESS; int retval = STATUS_SUCCESS;
BOOLEAN bOverrideSelfRefresh = FALSE; bool bOverrideSelfRefresh = FALSE;
switch (Adapter->chip_id) switch (Adapter->chip_id)
{ {

4
drivers/staging/bcm/HandleControlPacket.c
View File

@ -14,10 +14,10 @@
static VOID handle_rx_control_packet(struct bcm_mini_adapter *Adapter, struct sk_buff *skb) static VOID handle_rx_control_packet(struct bcm_mini_adapter *Adapter, struct sk_buff *skb)
{ {
struct bcm_tarang_data *pTarang = NULL; struct bcm_tarang_data *pTarang = NULL;
BOOLEAN HighPriorityMessage = FALSE; bool HighPriorityMessage = FALSE;
struct sk_buff *newPacket = NULL; struct sk_buff *newPacket = NULL;
CHAR cntrl_msg_mask_bit = 0; CHAR cntrl_msg_mask_bit = 0;
BOOLEAN drop_pkt_flag = TRUE; bool drop_pkt_flag = TRUE;
USHORT usStatus = *(PUSHORT)(skb->data); USHORT usStatus = *(PUSHORT)(skb->data);
if (netif_msg_pktdata(Adapter)) if (netif_msg_pktdata(Adapter))

14
drivers/staging/bcm/IPv6Protocol.c
View File

@ -1,13 +1,13 @@
#include "headers.h" #include "headers.h"
static BOOLEAN MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule, static bool MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
struct bcm_ipv6_hdr *pstIpv6Header); struct bcm_ipv6_hdr *pstIpv6Header);
static BOOLEAN MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule, static bool MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
struct bcm_ipv6_hdr *pstIpv6Header); struct bcm_ipv6_hdr *pstIpv6Header);
static VOID DumpIpv6Header(struct bcm_ipv6_hdr *pstIpv6Header); static VOID DumpIpv6Header(struct bcm_ipv6_hdr *pstIpv6Header);
static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload, static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
UCHAR *pucNextHeader, BOOLEAN *bParseDone, USHORT *pusPayloadLength) UCHAR *pucNextHeader, bool *bParseDone, USHORT *pusPayloadLength)
{ {
UCHAR *pucRetHeaderPtr = NULL; UCHAR *pucRetHeaderPtr = NULL;
UCHAR *pucPayloadPtr = NULL; UCHAR *pucPayloadPtr = NULL;
@ -144,7 +144,7 @@ static UCHAR GetIpv6ProtocolPorts(UCHAR *pucPayload, USHORT *pusSrcPort,
USHORT *pusDestPort, USHORT usPayloadLength, UCHAR ucNextHeader) USHORT *pusDestPort, USHORT usPayloadLength, UCHAR ucNextHeader)
{ {
UCHAR *pIpv6HdrScanContext = pucPayload; UCHAR *pIpv6HdrScanContext = pucPayload;
BOOLEAN bDone = FALSE; bool bDone = FALSE;
UCHAR ucHeaderType = 0; UCHAR ucHeaderType = 0;
UCHAR *pucNextHeader = NULL; UCHAR *pucNextHeader = NULL;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
@ -187,7 +187,7 @@ USHORT IpVersion6(struct bcm_mini_adapter *Adapter, PVOID pcIpHeader,
USHORT ushSrcPort = 0; USHORT ushSrcPort = 0;
UCHAR ucNextProtocolAboveIP = 0; UCHAR ucNextProtocolAboveIP = 0;
struct bcm_ipv6_hdr *pstIpv6Header = NULL; struct bcm_ipv6_hdr *pstIpv6Header = NULL;
BOOLEAN bClassificationSucceed = FALSE; bool bClassificationSucceed = FALSE;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
DBG_LVL_ALL, "IpVersion6 ==========>\n"); DBG_LVL_ALL, "IpVersion6 ==========>\n");
@ -288,7 +288,7 @@ USHORT IpVersion6(struct bcm_mini_adapter *Adapter, PVOID pcIpHeader,
} }
static BOOLEAN MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule, static bool MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
struct bcm_ipv6_hdr *pstIpv6Header) struct bcm_ipv6_hdr *pstIpv6Header)
{ {
UINT uiLoopIndex = 0; UINT uiLoopIndex = 0;
@ -344,7 +344,7 @@ static BOOLEAN MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule
return FALSE; return FALSE;
} }
static BOOLEAN MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule, static bool MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
struct bcm_ipv6_hdr *pstIpv6Header) struct bcm_ipv6_hdr *pstIpv6Header)
{ {
UINT uiLoopIndex = 0; UINT uiLoopIndex = 0;

2
drivers/staging/bcm/InterfaceInit.c
View File

@ -430,7 +430,7 @@ static int InterfaceAdapterInit(struct bcm_interface_adapter *psIntfAdapter)
unsigned long value; unsigned long value;
int retval = 0; int retval = 0;
int usedIntOutForBulkTransfer = 0 ; int usedIntOutForBulkTransfer = 0 ;
BOOLEAN bBcm16 = FALSE; bool bBcm16 = FALSE;
UINT uiData = 0; UINT uiData = 0;
int bytes; int bytes;

4
drivers/staging/bcm/InterfaceRx.c
View File

@ -38,7 +38,7 @@ GetBulkInRcb(struct bcm_interface_adapter *psIntfAdapter)
static void read_bulk_callback(struct urb *urb) static void read_bulk_callback(struct urb *urb)
{ {
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
BOOLEAN bHeaderSupressionEnabled = FALSE; bool bHeaderSupressionEnabled = FALSE;
int QueueIndex = NO_OF_QUEUES + 1; int QueueIndex = NO_OF_QUEUES + 1;
UINT uiIndex=0; UINT uiIndex=0;
int process_done = 1; int process_done = 1;
@ -240,7 +240,7 @@ Return: TRUE - If Rx was successful.
Other - If an error occurred. Other - If an error occurred.
*/ */
BOOLEAN InterfaceRx (struct bcm_interface_adapter *psIntfAdapter) bool InterfaceRx (struct bcm_interface_adapter *psIntfAdapter)
{ {
USHORT RxDescCount = NUM_RX_DESC - atomic_read(&psIntfAdapter->uNumRcbUsed); USHORT RxDescCount = NUM_RX_DESC - atomic_read(&psIntfAdapter->uNumRcbUsed);
struct bcm_usb_rcb *pRcb = NULL; struct bcm_usb_rcb *pRcb = NULL;

2
drivers/staging/bcm/InterfaceRx.h
View File

@ -1,7 +1,7 @@
#ifndef _INTERFACE_RX_H #ifndef _INTERFACE_RX_H
#define _INTERFACE_RX_H #define _INTERFACE_RX_H
BOOLEAN InterfaceRx(struct bcm_interface_adapter *Adapter); bool InterfaceRx(struct bcm_interface_adapter *Adapter);
#endif #endif

2
drivers/staging/bcm/InterfaceTx.c
View File

@ -7,7 +7,7 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
struct bcm_interface_adapter *psIntfAdapter = pTcb->psIntfAdapter; struct bcm_interface_adapter *psIntfAdapter = pTcb->psIntfAdapter;
struct bcm_link_request *pControlMsg = (struct bcm_link_request *)urb->transfer_buffer; struct bcm_link_request *pControlMsg = (struct bcm_link_request *)urb->transfer_buffer;
struct bcm_mini_adapter *psAdapter = psIntfAdapter->psAdapter ; struct bcm_mini_adapter *psAdapter = psIntfAdapter->psAdapter ;
BOOLEAN bpowerDownMsg = FALSE ; bool bpowerDownMsg = FALSE ;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
if (unlikely(netif_msg_tx_done(Adapter))) if (unlikely(netif_msg_tx_done(Adapter)))

2
drivers/staging/bcm/LeakyBucket.c
View File

@ -250,7 +250,7 @@ VOID transmit_packets(struct bcm_mini_adapter *Adapter)
UINT uiPrevTotalCount = 0; UINT uiPrevTotalCount = 0;
int iIndex = 0; int iIndex = 0;
BOOLEAN exit_flag = TRUE; bool exit_flag = TRUE;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "=====>"); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "=====>");

18
drivers/staging/bcm/PHSModule.c
View File

@ -8,9 +8,9 @@ static UINT CreateClassifierPHSRule(B_UINT16 uiClsId, struct bcm_phs_classifier
static UINT UpdateClassifierPHSRule(B_UINT16 uiClsId, struct bcm_phs_classifier_entry *pstClassifierEntry, struct bcm_phs_classifier_table *psaClassifiertable, struct bcm_phs_rule *psPhsRule, B_UINT8 u8AssociatedPHSI); static UINT UpdateClassifierPHSRule(B_UINT16 uiClsId, struct bcm_phs_classifier_entry *pstClassifierEntry, struct bcm_phs_classifier_table *psaClassifiertable, struct bcm_phs_rule *psPhsRule, B_UINT8 u8AssociatedPHSI);
static BOOLEAN ValidatePHSRuleComplete(struct bcm_phs_rule *psPhsRule); static bool ValidatePHSRuleComplete(struct bcm_phs_rule *psPhsRule);
static BOOLEAN DerefPhsRule(B_UINT16 uiClsId, struct bcm_phs_classifier_table *psaClassifiertable, struct bcm_phs_rule *pstPhsRule); static bool DerefPhsRule(B_UINT16 uiClsId, struct bcm_phs_classifier_table *psaClassifiertable, struct bcm_phs_rule *pstPhsRule);
static UINT GetClassifierEntry(struct bcm_phs_classifier_table *pstClassifierTable, B_UINT32 uiClsid, enum bcm_phs_classifier_context eClsContext, struct bcm_phs_classifier_entry **ppstClassifierEntry); static UINT GetClassifierEntry(struct bcm_phs_classifier_table *pstClassifierTable, B_UINT32 uiClsid, enum bcm_phs_classifier_context eClsContext, struct bcm_phs_classifier_entry **ppstClassifierEntry);
@ -67,7 +67,7 @@ int PHSTransmit(struct bcm_mini_adapter *Adapter,
struct sk_buff **pPacket, struct sk_buff **pPacket,
USHORT Vcid, USHORT Vcid,
B_UINT16 uiClassifierRuleID, B_UINT16 uiClassifierRuleID,
BOOLEAN bHeaderSuppressionEnabled, bool bHeaderSuppressionEnabled,
UINT *PacketLen, UINT *PacketLen,
UCHAR bEthCSSupport) UCHAR bEthCSSupport)
{ {
@ -81,7 +81,7 @@ int PHSTransmit(struct bcm_mini_adapter *Adapter,
PUCHAR pucPHSPktHdrOutBuf = Adapter->stPhsTxContextInfo.ucaHdrSuppressionOutBuf; PUCHAR pucPHSPktHdrOutBuf = Adapter->stPhsTxContextInfo.ucaHdrSuppressionOutBuf;
UINT usPacketType; UINT usPacketType;
UINT BytesToRemove = 0; UINT BytesToRemove = 0;
BOOLEAN bPHSI = 0; bool bPHSI = 0;
LONG ulPhsStatus = 0; LONG ulPhsStatus = 0;
UINT numBytesCompressed = 0; UINT numBytesCompressed = 0;
struct sk_buff *newPacket = NULL; struct sk_buff *newPacket = NULL;
@ -788,7 +788,7 @@ static void free_phs_serviceflow_rules(struct bcm_phs_table *psServiceFlowRulesT
psServiceFlowRulesTable = NULL; psServiceFlowRulesTable = NULL;
} }
static BOOLEAN ValidatePHSRuleComplete(IN struct bcm_phs_rule *psPhsRule) static bool ValidatePHSRuleComplete(IN struct bcm_phs_rule *psPhsRule)
{ {
if (psPhsRule) { if (psPhsRule) {
if (!psPhsRule->u8PHSI) { if (!psPhsRule->u8PHSI) {
@ -888,7 +888,7 @@ static UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiC
struct bcm_phs_classifier_table *psaClassifiertable = NULL; struct bcm_phs_classifier_table *psaClassifiertable = NULL;
UINT uiStatus = 0; UINT uiStatus = 0;
int iSfIndex; int iSfIndex;
BOOLEAN bFreeEntryFound = FALSE; bool bFreeEntryFound = FALSE;
/* Check for a free entry in SFID table */ /* Check for a free entry in SFID table */
for (iSfIndex = 0; iSfIndex < MAX_SERVICEFLOWS; iSfIndex++) { for (iSfIndex = 0; iSfIndex < MAX_SERVICEFLOWS; iSfIndex++) {
@ -1009,7 +1009,7 @@ static UINT CreateClassifierPHSRule(IN B_UINT16 uiClsId,
B_UINT8 u8AssociatedPHSI) B_UINT8 u8AssociatedPHSI)
{ {
UINT iClassifierIndex = 0; UINT iClassifierIndex = 0;
BOOLEAN bFreeEntryFound = FALSE; bool bFreeEntryFound = FALSE;
struct bcm_phs_classifier_entry *psClassifierRules = NULL; struct bcm_phs_classifier_entry *psClassifierRules = NULL;
UINT nStatus = PHS_SUCCESS; UINT nStatus = PHS_SUCCESS;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
@ -1102,7 +1102,7 @@ static UINT UpdateClassifierPHSRule(IN B_UINT16 uiClsId,
{ {
struct bcm_phs_rule *pstAddPhsRule = NULL; struct bcm_phs_rule *pstAddPhsRule = NULL;
UINT nPhsRuleIndex = 0; UINT nPhsRuleIndex = 0;
BOOLEAN bPHSRuleOrphaned = FALSE; bool bPHSRuleOrphaned = FALSE;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
psPhsRule->u8RefCnt = 0; psPhsRule->u8RefCnt = 0;
@ -1150,7 +1150,7 @@ static UINT UpdateClassifierPHSRule(IN B_UINT16 uiClsId,
return PHS_SUCCESS; return PHS_SUCCESS;
} }
static BOOLEAN DerefPhsRule(IN B_UINT16 uiClsId, struct bcm_phs_classifier_table *psaClassifiertable, struct bcm_phs_rule *pstPhsRule) static bool DerefPhsRule(IN B_UINT16 uiClsId, struct bcm_phs_classifier_table *psaClassifiertable, struct bcm_phs_rule *pstPhsRule)
{ {
if (pstPhsRule == NULL) if (pstPhsRule == NULL)
return FALSE; return FALSE;

4
drivers/staging/bcm/PHSModule.h
View File

@ -5,7 +5,7 @@ int PHSTransmit(struct bcm_mini_adapter *Adapter,
struct sk_buff **pPacket, struct sk_buff **pPacket,
USHORT Vcid, USHORT Vcid,
B_UINT16 uiClassifierRuleID, B_UINT16 uiClassifierRuleID,
BOOLEAN bHeaderSuppressionEnabled, bool bHeaderSuppressionEnabled,
PUINT PacketLen, PUINT PacketLen,
UCHAR bEthCSSupport); UCHAR bEthCSSupport);
@ -39,7 +39,7 @@ ULONG PhsDeleteClassifierRule(void* pvContext, B_UINT16 uiVcid ,B_UINT16 uiClsI
ULONG PhsDeleteSFRules(void* pvContext,B_UINT16 uiVcid) ; ULONG PhsDeleteSFRules(void* pvContext,B_UINT16 uiVcid) ;
BOOLEAN ValidatePHSRule(struct bcm_phs_rule *psPhsRule); bool ValidatePHSRule(struct bcm_phs_rule *psPhsRule);
UINT GetServiceFlowEntry(struct bcm_phs_table *psServiceFlowTable,B_UINT16 uiVcid, struct bcm_phs_entry **ppstServiceFlowEntry); UINT GetServiceFlowEntry(struct bcm_phs_table *psServiceFlowTable,B_UINT16 uiVcid, struct bcm_phs_entry **ppstServiceFlowEntry);

12
drivers/staging/bcm/Prototypes.h
View File

@ -111,7 +111,7 @@ void update_per_cid_rx (struct bcm_mini_adapter *Adapter);
void update_per_sf_desc_cnts( struct bcm_mini_adapter *Adapter); void update_per_sf_desc_cnts( struct bcm_mini_adapter *Adapter);
void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter,B_UINT16 TID,BOOLEAN bFreeAll); void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter,B_UINT16 TID,bool bFreeAll);
void flush_queue(struct bcm_mini_adapter *Adapter, UINT iQIndex); void flush_queue(struct bcm_mini_adapter *Adapter, UINT iQIndex);
@ -138,7 +138,7 @@ INT BeceemEEPROMBulkWrite(
PUCHAR pBuffer, PUCHAR pBuffer,
UINT uiOffset, UINT uiOffset,
UINT uiNumBytes, UINT uiNumBytes,
BOOLEAN bVerify); bool bVerify);
INT ReadBeceemEEPROM(struct bcm_mini_adapter *Adapter,UINT dwAddress, UINT *pdwData); INT ReadBeceemEEPROM(struct bcm_mini_adapter *Adapter,UINT dwAddress, UINT *pdwData);
@ -155,13 +155,13 @@ INT BeceemNVMWrite(
PUINT pBuffer, PUINT pBuffer,
UINT uiOffset, UINT uiOffset,
UINT uiNumBytes, UINT uiNumBytes,
BOOLEAN bVerify); bool bVerify);
INT BcmInitNVM(struct bcm_mini_adapter *Adapter); INT BcmInitNVM(struct bcm_mini_adapter *Adapter);
INT BcmUpdateSectorSize(struct bcm_mini_adapter *Adapter,UINT uiSectorSize); INT BcmUpdateSectorSize(struct bcm_mini_adapter *Adapter,UINT uiSectorSize);
BOOLEAN IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val section); bool IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val section);
INT BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_bitmap *psFlash2xBitMap); INT BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_bitmap *psFlash2xBitMap);
@ -198,7 +198,7 @@ INT BcmCopySection(struct bcm_mini_adapter *Adapter,
UINT numOfBytes); UINT numOfBytes);
BOOLEAN IsNonCDLessDevice(struct bcm_mini_adapter *Adapter); bool IsNonCDLessDevice(struct bcm_mini_adapter *Adapter);
VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter,PUINT puiBuffer); VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter,PUINT puiBuffer);
@ -212,7 +212,7 @@ INT buffDnldVerify(struct bcm_mini_adapter *Adapter, unsigned char *mappedbuffer
VOID putUsbSuspend(struct work_struct *work); VOID putUsbSuspend(struct work_struct *work);
BOOLEAN IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios); bool IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios);
#endif #endif

26
drivers/staging/bcm/Qos.c
View File

@ -5,7 +5,7 @@ This file contains the routines related to Quality of Service.
#include "headers.h" #include "headers.h"
static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter, PVOID pvEthPayload, struct bcm_eth_packet_info *pstEthCsPktInfo); static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter, PVOID pvEthPayload, struct bcm_eth_packet_info *pstEthCsPktInfo);
static BOOLEAN EThCSClassifyPkt(struct bcm_mini_adapter *Adapter, struct sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo, struct bcm_classifier_rule *pstClassifierRule, B_UINT8 EthCSCupport); static bool EThCSClassifyPkt(struct bcm_mini_adapter *Adapter, struct sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo, struct bcm_classifier_rule *pstClassifierRule, B_UINT8 EthCSCupport);
static USHORT IpVersion4(struct bcm_mini_adapter *Adapter, struct iphdr *iphd, static USHORT IpVersion4(struct bcm_mini_adapter *Adapter, struct iphdr *iphd,
struct bcm_classifier_rule *pstClassifierRule); struct bcm_classifier_rule *pstClassifierRule);
@ -24,7 +24,7 @@ static VOID PruneQueue(struct bcm_mini_adapter *Adapter, INT iIndex);
* *
* Returns - TRUE(If address matches) else FAIL . * Returns - TRUE(If address matches) else FAIL .
*********************************************************************/ *********************************************************************/
BOOLEAN MatchSrcIpAddress(struct bcm_classifier_rule *pstClassifierRule, ULONG ulSrcIP) bool MatchSrcIpAddress(struct bcm_classifier_rule *pstClassifierRule, ULONG ulSrcIP)
{ {
UCHAR ucLoopIndex = 0; UCHAR ucLoopIndex = 0;
@ -58,7 +58,7 @@ BOOLEAN MatchSrcIpAddress(struct bcm_classifier_rule *pstClassifierRule, ULONG u
* *
* Returns - TRUE(If address matches) else FAIL . * Returns - TRUE(If address matches) else FAIL .
*********************************************************************/ *********************************************************************/
BOOLEAN MatchDestIpAddress(struct bcm_classifier_rule *pstClassifierRule, ULONG ulDestIP) bool MatchDestIpAddress(struct bcm_classifier_rule *pstClassifierRule, ULONG ulDestIP)
{ {
UCHAR ucLoopIndex = 0; UCHAR ucLoopIndex = 0;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
@ -91,7 +91,7 @@ BOOLEAN MatchDestIpAddress(struct bcm_classifier_rule *pstClassifierRule, ULONG
* *
* Returns - TRUE(If address matches) else FAIL. * Returns - TRUE(If address matches) else FAIL.
**************************************************************************/ **************************************************************************/
BOOLEAN MatchTos(struct bcm_classifier_rule *pstClassifierRule, UCHAR ucTypeOfService) bool MatchTos(struct bcm_classifier_rule *pstClassifierRule, UCHAR ucTypeOfService)
{ {
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
@ -209,7 +209,7 @@ static USHORT IpVersion4(struct bcm_mini_adapter *Adapter,
struct bcm_classifier_rule *pstClassifierRule) struct bcm_classifier_rule *pstClassifierRule)
{ {
struct bcm_transport_header *xprt_hdr = NULL; struct bcm_transport_header *xprt_hdr = NULL;
BOOLEAN bClassificationSucceed = FALSE; bool bClassificationSucceed = FALSE;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "========>"); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "========>");
@ -451,7 +451,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter, struct sk_buff* skb)
struct iphdr *pIpHeader = NULL; struct iphdr *pIpHeader = NULL;
INT uiSfIndex = 0; INT uiSfIndex = 0;
USHORT usIndex = Adapter->usBestEffortQueueIndex; USHORT usIndex = Adapter->usBestEffortQueueIndex;
BOOLEAN bFragmentedPkt = FALSE, bClassificationSucceed = FALSE; bool bFragmentedPkt = FALSE, bClassificationSucceed = FALSE;
USHORT usCurrFragment = 0; USHORT usCurrFragment = 0;
struct bcm_tcp_header *pTcpHeader; struct bcm_tcp_header *pTcpHeader;
@ -649,7 +649,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter, struct sk_buff* skb)
return INVALID_QUEUE_INDEX; return INVALID_QUEUE_INDEX;
} }
static BOOLEAN EthCSMatchSrcMACAddress(struct bcm_classifier_rule *pstClassifierRule, PUCHAR Mac) static bool EthCSMatchSrcMACAddress(struct bcm_classifier_rule *pstClassifierRule, PUCHAR Mac)
{ {
UINT i = 0; UINT i = 0;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
@ -666,7 +666,7 @@ static BOOLEAN EthCSMatchSrcMACAddress(struct bcm_classifier_rule *pstClassifier
return TRUE; return TRUE;
} }
static BOOLEAN EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifierRule, PUCHAR Mac) static bool EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifierRule, PUCHAR Mac)
{ {
UINT i = 0; UINT i = 0;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
@ -683,7 +683,7 @@ static BOOLEAN EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifie
return TRUE; return TRUE;
} }
static BOOLEAN EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule, struct sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo) static bool EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule, struct sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo)
{ {
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
if ((pstClassifierRule->ucEtherTypeLen == 0) || if ((pstClassifierRule->ucEtherTypeLen == 0) ||
@ -718,9 +718,9 @@ static BOOLEAN EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRul
} }
static BOOLEAN EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule, struct sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo) static bool EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule, struct sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo)
{ {
BOOLEAN bClassificationSucceed = FALSE; bool bClassificationSucceed = FALSE;
USHORT usVLANID; USHORT usVLANID;
B_UINT8 uPriority = 0; B_UINT8 uPriority = 0;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
@ -768,12 +768,12 @@ static BOOLEAN EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule
} }
static BOOLEAN EThCSClassifyPkt(struct bcm_mini_adapter *Adapter, struct sk_buff* skb, static bool EThCSClassifyPkt(struct bcm_mini_adapter *Adapter, struct sk_buff* skb,
struct bcm_eth_packet_info *pstEthCsPktInfo, struct bcm_eth_packet_info *pstEthCsPktInfo,
struct bcm_classifier_rule *pstClassifierRule, struct bcm_classifier_rule *pstClassifierRule,
B_UINT8 EthCSCupport) B_UINT8 EthCSCupport)
{ {
BOOLEAN bClassificationSucceed = FALSE; bool bClassificationSucceed = FALSE;
bClassificationSucceed = EthCSMatchSrcMACAddress(pstClassifierRule, ((struct bcm_eth_header *)(skb->data))->au8SourceAddress); bClassificationSucceed = EthCSMatchSrcMACAddress(pstClassifierRule, ((struct bcm_eth_header *)(skb->data))->au8SourceAddress);
if (!bClassificationSucceed) if (!bClassificationSucceed)
return FALSE; return FALSE;

2
drivers/staging/bcm/Transmit.c
View File

@ -84,7 +84,7 @@ int SendControlPacket(struct bcm_mini_adapter *Adapter, char *pControlPacket)
int SetupNextSend(struct bcm_mini_adapter *Adapter, struct sk_buff *Packet, USHORT Vcid) int SetupNextSend(struct bcm_mini_adapter *Adapter, struct sk_buff *Packet, USHORT Vcid)
{ {
int status = 0; int status = 0;
BOOLEAN bHeaderSupressionEnabled = FALSE; bool bHeaderSupressionEnabled = FALSE;
B_UINT16 uiClassifierRuleID; B_UINT16 uiClassifierRuleID;
u16 QueueIndex = skb_get_queue_mapping(Packet); u16 QueueIndex = skb_get_queue_mapping(Packet);
struct bcm_leader Leader = {0}; struct bcm_leader Leader = {0};

2
drivers/staging/bcm/Typedefs.h
View File

@ -9,7 +9,7 @@
#define FALSE 0 #define FALSE 0
#define TRUE 1 #define TRUE 1
typedef char BOOLEAN;
typedef char CHAR; typedef char CHAR;
typedef int INT; typedef int INT;
typedef short SHORT; typedef short SHORT;

10
drivers/staging/bcm/led_control.c
View File

@ -13,7 +13,7 @@ static B_UINT16 CFG_CalculateChecksum(B_UINT8 *pu8Buffer, B_UINT32 u32Size)
return u16CheckSum; return u16CheckSum;
} }
BOOLEAN IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios) bool IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios)
{ {
INT Status; INT Status;
Status = (Adapter->gpioBitMap & gpios) ^ gpios; Status = (Adapter->gpioBitMap & gpios) ^ gpios;
@ -27,7 +27,7 @@ static INT LED_Blink(struct bcm_mini_adapter *Adapter, UINT GPIO_Num, UCHAR uiLe
ULONG timeout, INT num_of_time, enum bcm_led_events currdriverstate) ULONG timeout, INT num_of_time, enum bcm_led_events currdriverstate)
{ {
int Status = STATUS_SUCCESS; int Status = STATUS_SUCCESS;
BOOLEAN bInfinite = FALSE; bool bInfinite = FALSE;
/* Check if num_of_time is -ve. If yes, blink led in infinite loop */ /* Check if num_of_time is -ve. If yes, blink led in infinite loop */
if (num_of_time < 0) { if (num_of_time < 0) {
@ -108,7 +108,7 @@ static INT LED_Proportional_Blink(struct bcm_mini_adapter *Adapter, UCHAR GPIO_N
int Status = STATUS_SUCCESS; int Status = STATUS_SUCCESS;
INT num_of_time = 0, num_of_time_tx = 0, num_of_time_rx = 0; INT num_of_time = 0, num_of_time_tx = 0, num_of_time_rx = 0;
UINT remDelay = 0; UINT remDelay = 0;
BOOLEAN bBlinkBothLED = TRUE; bool bBlinkBothLED = TRUE;
/* UINT GPIO_num = DISABLE_GPIO_NUM; */ /* UINT GPIO_num = DISABLE_GPIO_NUM; */
ulong timeout = 0; ulong timeout = 0;
@ -478,7 +478,7 @@ static int ReadLEDInformationFromEEPROM(struct bcm_mini_adapter *Adapter,
static int ReadConfigFileStructure(struct bcm_mini_adapter *Adapter, static int ReadConfigFileStructure(struct bcm_mini_adapter *Adapter,
BOOLEAN *bEnableThread) bool *bEnableThread)
{ {
int Status = STATUS_SUCCESS; int Status = STATUS_SUCCESS;
/* Array to store GPIO numbers from EEPROM */ /* Array to store GPIO numbers from EEPROM */
@ -860,7 +860,7 @@ static VOID LEDControlThread(struct bcm_mini_adapter *Adapter)
int InitLedSettings(struct bcm_mini_adapter *Adapter) int InitLedSettings(struct bcm_mini_adapter *Adapter)
{ {
int Status = STATUS_SUCCESS; int Status = STATUS_SUCCESS;
BOOLEAN bEnableThread = TRUE; bool bEnableThread = TRUE;
UCHAR uiIndex = 0; UCHAR uiIndex = 0;
/* /*

24
drivers/staging/bcm/nvm.c
View File

@ -45,7 +45,7 @@ static int BeceemFlashBulkWrite(
PUINT pBuffer, PUINT pBuffer,
unsigned int uiOffset, unsigned int uiOffset,
unsigned int uiNumBytes, unsigned int uiNumBytes,
BOOLEAN bVerify); bool bVerify);
static int GetFlashBaseAddr(struct bcm_mini_adapter *Adapter); static int GetFlashBaseAddr(struct bcm_mini_adapter *Adapter);
@ -1034,7 +1034,7 @@ static int BeceemFlashBulkWrite(struct bcm_mini_adapter *Adapter,
PUINT pBuffer, PUINT pBuffer,
unsigned int uiOffset, unsigned int uiOffset,
unsigned int uiNumBytes, unsigned int uiNumBytes,
BOOLEAN bVerify) bool bVerify)
{ {
PCHAR pTempBuff = NULL; PCHAR pTempBuff = NULL;
PUCHAR pcBuffer = (PUCHAR)pBuffer; PUCHAR pcBuffer = (PUCHAR)pBuffer;
@ -1222,7 +1222,7 @@ static int BeceemFlashBulkWriteStatus(struct bcm_mini_adapter *Adapter,
PUINT pBuffer, PUINT pBuffer,
unsigned int uiOffset, unsigned int uiOffset,
unsigned int uiNumBytes, unsigned int uiNumBytes,
BOOLEAN bVerify) bool bVerify)
{ {
PCHAR pTempBuff = NULL; PCHAR pTempBuff = NULL;
PUCHAR pcBuffer = (PUCHAR)pBuffer; PUCHAR pcBuffer = (PUCHAR)pBuffer;
@ -1724,7 +1724,7 @@ int BeceemEEPROMBulkWrite(struct bcm_mini_adapter *Adapter,
PUCHAR pBuffer, PUCHAR pBuffer,
unsigned int uiOffset, unsigned int uiOffset,
unsigned int uiNumBytes, unsigned int uiNumBytes,
BOOLEAN bVerify) bool bVerify)
{ {
unsigned int uiBytesToCopy = uiNumBytes; unsigned int uiBytesToCopy = uiNumBytes;
/* unsigned int uiRdbk = 0; */ /* unsigned int uiRdbk = 0; */
@ -1870,7 +1870,7 @@ int BeceemNVMWrite(struct bcm_mini_adapter *Adapter,
PUINT pBuffer, PUINT pBuffer,
unsigned int uiOffset, unsigned int uiOffset,
unsigned int uiNumBytes, unsigned int uiNumBytes,
BOOLEAN bVerify) bool bVerify)
{ {
int Status = 0; int Status = 0;
unsigned int uiTemp = 0; unsigned int uiTemp = 0;
@ -3105,8 +3105,8 @@ int BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, struct bcm_fl
struct bcm_flash2x_cs_info *psFlash2xCSInfo = Adapter->psFlash2xCSInfo; struct bcm_flash2x_cs_info *psFlash2xCSInfo = Adapter->psFlash2xCSInfo;
enum bcm_flash2x_section_val uiHighestPriDSD = 0; enum bcm_flash2x_section_val uiHighestPriDSD = 0;
enum bcm_flash2x_section_val uiHighestPriISO = 0; enum bcm_flash2x_section_val uiHighestPriISO = 0;
BOOLEAN SetActiveDSDDone = FALSE; bool SetActiveDSDDone = FALSE;
BOOLEAN SetActiveISODone = FALSE; bool SetActiveISODone = FALSE;
/* For 1.x map all the section except DSD0 will be shown as not present /* For 1.x map all the section except DSD0 will be shown as not present
* This part will be used by calibration tool to detect the number of DSD present in Flash. * This part will be used by calibration tool to detect the number of DSD present in Flash.
@ -3536,7 +3536,7 @@ int BcmCopyISO(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_copy_section
enum bcm_flash2x_section_val eISOReadPart = 0, eISOWritePart = 0; enum bcm_flash2x_section_val eISOReadPart = 0, eISOWritePart = 0;
unsigned int uiReadOffsetWithinPart = 0, uiWriteOffsetWithinPart = 0; unsigned int uiReadOffsetWithinPart = 0, uiWriteOffsetWithinPart = 0;
unsigned int uiTotalDataToCopy = 0; unsigned int uiTotalDataToCopy = 0;
BOOLEAN IsThisHeaderSector = FALSE; bool IsThisHeaderSector = FALSE;
unsigned int sigOffset = 0; unsigned int sigOffset = 0;
unsigned int ISOLength = 0; unsigned int ISOLength = 0;
unsigned int Status = STATUS_SUCCESS; unsigned int Status = STATUS_SUCCESS;
@ -4129,7 +4129,7 @@ int BcmCopySection(struct bcm_mini_adapter *Adapter,
int SaveHeaderIfPresent(struct bcm_mini_adapter *Adapter, PUCHAR pBuff, unsigned int uiOffset) int SaveHeaderIfPresent(struct bcm_mini_adapter *Adapter, PUCHAR pBuff, unsigned int uiOffset)
{ {
unsigned int offsetToProtect = 0, HeaderSizeToProtect = 0; unsigned int offsetToProtect = 0, HeaderSizeToProtect = 0;
BOOLEAN bHasHeader = FALSE; bool bHasHeader = FALSE;
PUCHAR pTempBuff = NULL; PUCHAR pTempBuff = NULL;
unsigned int uiSectAlignAddr = 0; unsigned int uiSectAlignAddr = 0;
unsigned int sig = 0; unsigned int sig = 0;
@ -4469,9 +4469,9 @@ int WriteToFlashWithoutSectorErase(struct bcm_mini_adapter *Adapter,
return Status; return Status;
} }
BOOLEAN IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val section) bool IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val section)
{ {
BOOLEAN SectionPresent = FALSE; bool SectionPresent = FALSE;
switch (section) { switch (section) {
case ISO_IMAGE1: case ISO_IMAGE1:
@ -4656,7 +4656,7 @@ static int CorruptISOSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_sect
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
BOOLEAN IsNonCDLessDevice(struct bcm_mini_adapter *Adapter) bool IsNonCDLessDevice(struct bcm_mini_adapter *Adapter)
{ {
if (Adapter->psFlash2xCSInfo->IsCDLessDeviceBootSig == NON_CDLESS_DEVICE_BOOT_SIG) if (Adapter->psFlash2xCSInfo->IsCDLessDeviceBootSig == NON_CDLESS_DEVICE_BOOT_SIG)
return TRUE; return TRUE;

2
drivers/staging/bcm/vendorspecificextn.c
View File

@ -113,7 +113,7 @@ INT vendorextnReadSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_sect
* STATUS_SUCCESS/STATUS_FAILURE * STATUS_SUCCESS/STATUS_FAILURE
*/ */
INT vendorextnWriteSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, INT vendorextnWriteSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
UINT offset, UINT numOfBytes, BOOLEAN bVerify) UINT offset, UINT numOfBytes, bool bVerify)
{ {
return STATUS_FAILURE; return STATUS_FAILURE;
} }

2
drivers/staging/bcm/vendorspecificextn.h
View File

@ -11,7 +11,7 @@ INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg);
INT vendorextnReadSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, INT vendorextnReadSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
UINT offset, UINT numOfBytes); UINT offset, UINT numOfBytes);
INT vendorextnWriteSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, INT vendorextnWriteSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
UINT offset, UINT numOfBytes, BOOLEAN bVerify); UINT offset, UINT numOfBytes, bool bVerify);
INT vendorextnWriteSectionWithoutErase(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, INT vendorextnWriteSectionWithoutErase(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
UINT offset, UINT numOfBytes); UINT offset, UINT numOfBytes);