staging: bcm: Replace BOOLEAN with bool

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>

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 1d8bf08b5bfd4e946a892ddc358dfd18387e2aab..d6c9630a8822a9f995d71e0c6f9aa68da3a55a88 100644 (file)
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -63,7 +63,7 @@ struct bcm_classifier_rule {
        ULONG           ulSFID;
        UCHAR           ucReserved[2];
        B_UINT16        uiClassifierRuleIndex;
-       BOOLEAN         bUsed;
+       bool            bUsed;
        USHORT          usVCID_Value;
        B_UINT8         u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
        U_IP_ADDRESS    stSrcIpAddress;
@@ -86,14 +86,14 @@ struct bcm_classifier_rule {
        USHORT          usDestPortRangeHi[MAX_PORT_RANGE];
        UCHAR           ucDestPortRangeLength;
 
-       BOOLEAN         bProtocolValid;
-       BOOLEAN         bTOSValid;
-       BOOLEAN         bDestIpValid;
-       BOOLEAN         bSrcIpValid;
+       bool            bProtocolValid;
+       bool            bTOSValid;
+       bool            bDestIpValid;
+       bool            bSrcIpValid;
 
        /* For IPv6 Addressing */
        UCHAR           ucDirection;
-       BOOLEAN         bIpv6Protocol;
+       bool            bIpv6Protocol;
        UINT32          u32PHSRuleID;
        struct bcm_phs_rule sPhsRule;
        UCHAR           u8AssociatedPHSI;
@@ -113,11 +113,11 @@ struct bcm_classifier_rule {
 };
 
 struct bcm_fragmented_packet_info {
-       BOOLEAN                 bUsed;
+       bool                    bUsed;
        ULONG                   ulSrcIpAddress;
        USHORT                  usIpIdentification;
        struct bcm_classifier_rule *pstMatchedClassifierEntry;
-       BOOLEAN                 bOutOfOrderFragment;
+       bool                    bOutOfOrderFragment;
 };
 
 struct bcm_packet_info {
@@ -128,9 +128,9 @@ struct bcm_packet_info {
        /* This field determines the priority of the SF Queues */
        B_UINT8         u8TrafficPriority;
 
-       BOOLEAN         bValid;
-       BOOLEAN         bActive;
-       BOOLEAN         bActivateRequestSent;
+       bool            bValid;
+       bool            bActive;
+       bool            bActivateRequestSent;
 
        B_UINT8         u8QueueType; /* BE or rtPS */
 
@@ -170,17 +170,17 @@ struct bcm_packet_info {
                };
        };
 
-       BOOLEAN         bProtocolValid;
-       BOOLEAN         bTOSValid;
-       BOOLEAN         bDestIpValid;
-       BOOLEAN         bSrcIpValid;
+       bool            bProtocolValid;
+       bool            bTOSValid;
+       bool            bDestIpValid;
+       bool            bSrcIpValid;
 
-       BOOLEAN         bActiveSet;
-       BOOLEAN         bAdmittedSet;
-       BOOLEAN         bAuthorizedSet;
-       BOOLEAN         bClassifierPriority;
+       bool            bActiveSet;
+       bool            bAdmittedSet;
+       bool            bAuthorizedSet;
+       bool            bClassifierPriority;
        UCHAR           ucServiceClassName[MAX_CLASS_NAME_LENGTH];
-       BOOLEAN         bHeaderSuppressionEnabled;
+       bool            bHeaderSuppressionEnabled;
        spinlock_t      SFQueueLock;
        void            *pstSFIndication;
        struct timeval  stLastUpdateTokenAt;
@@ -196,8 +196,8 @@ struct bcm_tarang_data {
        struct sk_buff          *RxAppControlHead;
        struct sk_buff          *RxAppControlTail;
        int                     AppCtrlQueueLen;
-       BOOLEAN                 MacTracingEnabled;
-       BOOLEAN                 bApplicationToExit;
+       bool                    MacTracingEnabled;
+       bool                    bApplicationToExit;
        struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs;
        ULONG                   RxCntrlMsgBitMask;
 };
@@ -205,7 +205,7 @@ struct bcm_tarang_data {
 struct bcm_targetdsx_buffer {
        ULONG           ulTargetDsxBuffer;
        B_UINT16        tid;
-       BOOLEAN         valid;
+       bool            valid;
 };
 
 typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, UINT, PVOID);
@@ -221,11 +221,11 @@ struct bcm_mini_adapter {
        u32                     msg_enable;
        CHAR                    *caDsxReqResp;
        atomic_t                ApplicationRunning;
-       BOOLEAN                 AppCtrlQueueOverFlow;
+       bool                    AppCtrlQueueOverFlow;
        atomic_t                CurrentApplicationCount;
        atomic_t                RegisteredApplicationCount;
-       BOOLEAN                 LinkUpStatus;
-       BOOLEAN                 TimerActive;
+       bool                    LinkUpStatus;
+       bool                    TimerActive;
        u32                     StatisticsPointer;
        struct sk_buff          *RxControlHead;
        struct sk_buff          *RxControlTail;
@@ -249,22 +249,22 @@ struct bcm_mini_adapter {
        UINT                    u32TotalDSD;
        struct bcm_packet_info  PackInfo[NO_OF_QUEUES];
        struct bcm_classifier_rule astClassifierTable[MAX_CLASSIFIERS];
-       BOOLEAN                 TransferMode;
+       bool                    TransferMode;
 
        /*************** qos ******************/
-       BOOLEAN                 bETHCSEnabled;
+       bool                    bETHCSEnabled;
        ULONG                   BEBucketSize;
        ULONG                   rtPSBucketSize;
        UCHAR                   LinkStatus;
-       BOOLEAN                 AutoLinkUp;
-       BOOLEAN                 AutoSyncup;
+       bool                    AutoLinkUp;
+       bool                    AutoSyncup;
 
        int                     major;
        int                     minor;
        wait_queue_head_t       tx_packet_wait_queue;
        wait_queue_head_t       process_rx_cntrlpkt;
        atomic_t                process_waiting;
-       BOOLEAN                 fw_download_done;
+       bool                    fw_download_done;
 
        char                    *txctlpacket[MAX_CNTRL_PKTS];
        atomic_t                cntrlpktCnt ;
@@ -280,19 +280,19 @@ struct bcm_mini_adapter {
        ULONG                   ulTotalTargetBuffersAvailable;
        unsigned long           chip_id;
        wait_queue_head_t       lowpower_mode_wait_queue;
-       BOOLEAN                 bFlashBoot;
-       BOOLEAN                 bBinDownloaded;
-       BOOLEAN                 bCfgDownloaded;
-       BOOLEAN                 bSyncUpRequestSent;
+       bool                    bFlashBoot;
+       bool                    bBinDownloaded;
+       bool                    bCfgDownloaded;
+       bool                    bSyncUpRequestSent;
        USHORT                  usBestEffortQueueIndex;
        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;
        struct bcm_target_params *pstargetparams;
-       BOOLEAN                 device_removed;
-       BOOLEAN                 DeviceAccess;
-       BOOLEAN                 bIsAutoCorrectEnabled;
-       BOOLEAN                 bDDRInitDone;
+       bool                    device_removed;
+       bool                    DeviceAccess;
+       bool                    bIsAutoCorrectEnabled;
+       bool                    bDDRInitDone;
        int                     DDRSetting;
        ULONG                   ulPowerSaveMode;
        spinlock_t              txtransmitlock;
@@ -324,22 +324,22 @@ struct bcm_mini_adapter {
                        PVOID,
                        int);
        int (*interface_transmit)(PVOID, PVOID , UINT);
-       BOOLEAN                 IdleMode;
-       BOOLEAN                 bDregRequestSentInIdleMode;
-       BOOLEAN                 bTriedToWakeUpFromlowPowerMode;
-       BOOLEAN                 bShutStatus;
-       BOOLEAN                 bWakeUpDevice;
+       bool                    IdleMode;
+       bool                    bDregRequestSentInIdleMode;
+       bool                    bTriedToWakeUpFromlowPowerMode;
+       bool                    bShutStatus;
+       bool                    bWakeUpDevice;
        unsigned int            usIdleModePattern;
        /* BOOLEAN                      bTriedToWakeUpFromShutdown; */
-       BOOLEAN                 bLinkDownRequested;
+       bool                    bLinkDownRequested;
        int                     downloadDDR;
        struct bcm_phs_extension stBCMPhsContext;
        struct bcm_hdr_suppression_contextinfo stPhsTxContextInfo;
        uint8_t                 ucaPHSPktRestoreBuf[2048];
        uint8_t                 bPHSEnabled;
-       BOOLEAN                 AutoFirmDld;
-       BOOLEAN                 bMipsConfig;
-       BOOLEAN                 bDPLLConfig;
+       bool                    AutoFirmDld;
+       bool                    bMipsConfig;
+       bool                    bDPLLConfig;
        UINT32                  aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
        UINT32                  aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
        struct bcm_fragmented_packet_info astFragmentedPktClassifierTable[MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES];
@@ -348,8 +348,8 @@ struct bcm_mini_adapter {
        enum bcm_nvm_type       eNVMType;
        UINT                    uiSectorSize;
        UINT                    uiSectorSizeInCFG;
-       BOOLEAN                 bSectorSizeOverride;
-       BOOLEAN                 bStatusWrite;
+       bool                    bSectorSizeOverride;
+       bool                    bStatusWrite;
        UINT                    uiNVMDSDSize;
        UINT                    uiVendorExtnFlag;
        /* 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                    uiFlashLayoutMajorVersion;
        UINT                    uiFlashLayoutMinorVersion;
-       BOOLEAN                 bAllDSDWriteAllow;
-       BOOLEAN                 bSigCorrupted;
+       bool                    bAllDSDWriteAllow;
+       bool                    bSigCorrupted;
        /* 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;
-       BOOLEAN                 bEndPointHalted;
+       bool                    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;
+       bool                    bFlashRawRead;
+       bool                    bPreparingForLowPowerMode;
+       bool                    bDoSuspend;
        UINT                    syscfgBefFwDld;
-       BOOLEAN                 StopAllXaction;
+       bool                    StopAllXaction;
        UINT32                  liTimeSinceLastNetEntry; /* Used to Support extended CAPI requirements from */
        struct semaphore        LowPowerModeSync;
        ULONG                   liDrainCalculated;

diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 976514502927a116466ca5cc5ec3181148a20b4b..65fd768f7774829c13baffd2400cff757c0f1741 100644 (file)
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -113,7 +113,7 @@ static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIn
 static inline VOID
 CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry,
                B_UINT8 u8IpAddressLen, B_UINT8 *pu8IpAddressMaskSrc,
-               BOOLEAN bIpVersion6, enum bcm_ipaddr_context eIpAddrContext)
+               bool bIpVersion6, enum bcm_ipaddr_context eIpAddrContext)
 {
        int i = 0;
        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;
 
@@ -1630,7 +1630,7 @@ int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
  * for the Connection Management.
  * @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 */)
 {
        struct bcm_connect_mgr_params *psfLocalSet = NULL;

diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 4ddfc3d45bc0145d9be4bb4d1efe936d3c5500e8..0887d3f49e2f5e219bdf2bbfb37e9ac8139cfde7 100644 (file)
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -55,7 +55,7 @@ unsigned long StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, vo
 int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
 int FreeAdapterDsxBuffer(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)
 

diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c
index f5eda96f0f83786d3bb58603db7add394a0e06c5..f9cd7ac0b9e85ed60f7fa05665044369e5ee2adf 100644 (file)
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
@@ -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;
        UINT  value = 0;
        int retval = STATUS_SUCCESS;
-       BOOLEAN bOverrideSelfRefresh = FALSE;
+       bool bOverrideSelfRefresh = FALSE;
 
        switch (Adapter->chip_id)
        {

diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index 1bb53e247a6254bcea91c2d83a62cdf5653b5677..48119ee5aeaa1efc6c92a2ac056072cf4b791361 100644 (file)
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
@@ -14,10 +14,10 @@
 static VOID handle_rx_control_packet(struct bcm_mini_adapter *Adapter, struct sk_buff *skb)
 {
        struct bcm_tarang_data *pTarang = NULL;
-       BOOLEAN HighPriorityMessage = FALSE;
+       bool HighPriorityMessage = FALSE;
        struct sk_buff *newPacket = NULL;
        CHAR cntrl_msg_mask_bit = 0;
-       BOOLEAN drop_pkt_flag = TRUE;
+       bool drop_pkt_flag = TRUE;
        USHORT usStatus = *(PUSHORT)(skb->data);
 
        if (netif_msg_pktdata(Adapter))

diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index 6d803e7b094a819a8d76efe0879d15da4e48eec9..4168fd0127588061f560198084236db85fd73ac2 100644 (file)
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -1,13 +1,13 @@
 #include "headers.h"
 
-static BOOLEAN MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
+static bool MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
        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);
 static VOID DumpIpv6Header(struct bcm_ipv6_hdr *pstIpv6Header);
 
 static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
-       UCHAR *pucNextHeader, BOOLEAN *bParseDone, USHORT *pusPayloadLength)
+       UCHAR *pucNextHeader, bool *bParseDone, USHORT *pusPayloadLength)
 {
        UCHAR *pucRetHeaderPtr = NULL;
        UCHAR *pucPayloadPtr = NULL;
@@ -144,7 +144,7 @@ static UCHAR GetIpv6ProtocolPorts(UCHAR *pucPayload, USHORT *pusSrcPort,
        USHORT *pusDestPort, USHORT usPayloadLength, UCHAR ucNextHeader)
 {
        UCHAR *pIpv6HdrScanContext = pucPayload;
-       BOOLEAN bDone = FALSE;
+       bool bDone = FALSE;
        UCHAR ucHeaderType = 0;
        UCHAR *pucNextHeader = NULL;
        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;
        UCHAR   ucNextProtocolAboveIP = 0;
        struct bcm_ipv6_hdr *pstIpv6Header = NULL;
-       BOOLEAN bClassificationSucceed = FALSE;
+       bool bClassificationSucceed = FALSE;
 
        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
                        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)
 {
        UINT uiLoopIndex = 0;
@@ -344,7 +344,7 @@ static BOOLEAN MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule
        return FALSE;
 }
 
-static BOOLEAN MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
+static bool MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
        struct bcm_ipv6_hdr *pstIpv6Header)
 {
        UINT uiLoopIndex = 0;

diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index 79058ce5b332b00cd344c33d8cba05e3a5f6a134..e95d4b53e72112a070514a9addba24c7317759a9 100644 (file)
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -430,7 +430,7 @@ static int InterfaceAdapterInit(struct bcm_interface_adapter *psIntfAdapter)
        unsigned long value;
        int retval = 0;
        int usedIntOutForBulkTransfer = 0 ;
-       BOOLEAN bBcm16 = FALSE;
+       bool bBcm16 = FALSE;
        UINT uiData = 0;
        int bytes;
 

diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 26f5bc76111c59574d41870d384fd82f039e423a..1bbca9987330fa7a4d4d18486b35e9bac6dbf273 100644 (file)
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -38,7 +38,7 @@ GetBulkInRcb(struct bcm_interface_adapter *psIntfAdapter)
 static void read_bulk_callback(struct urb *urb)
 {
        struct sk_buff *skb = NULL;
-       BOOLEAN bHeaderSupressionEnabled = FALSE;
+       bool bHeaderSupressionEnabled = FALSE;
        int QueueIndex = NO_OF_QUEUES + 1;
        UINT uiIndex=0;
        int process_done = 1;
@@ -240,7 +240,7 @@ Return:                             TRUE  - If Rx was successful.
                                        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);
        struct bcm_usb_rcb *pRcb = NULL;

diff --git a/drivers/staging/bcm/InterfaceRx.h b/drivers/staging/bcm/InterfaceRx.h
index 424645e9e47656ae4794cd68e0cba3948b606f4c..b4e858bcda3435e7f9382dbe4fa733f2681dff0d 100644 (file)
--- a/drivers/staging/bcm/InterfaceRx.h
+++ b/drivers/staging/bcm/InterfaceRx.h
@@ -1,7 +1,7 @@
 #ifndef _INTERFACE_RX_H
 #define _INTERFACE_RX_H
 
-BOOLEAN InterfaceRx(struct bcm_interface_adapter *Adapter);
+bool InterfaceRx(struct bcm_interface_adapter *Adapter);
 
 #endif
 

diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index b8c785556dda8c9f2ce797f1f8402c1a99a38d8e..f7a0f9aa8a3cfb2fa7990f2c834a70fed7dbf51a 100644 (file)
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -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_link_request *pControlMsg = (struct bcm_link_request *)urb->transfer_buffer;
        struct bcm_mini_adapter *psAdapter = psIntfAdapter->psAdapter ;
-       BOOLEAN bpowerDownMsg = FALSE ;
+       bool bpowerDownMsg = FALSE ;
        struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
     if (unlikely(netif_msg_tx_done(Adapter)))

diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index bc486163332d909a54c15dcaf937d2afca4eaabb..0236f81059c8cde6b4b2cc35f6afacc134ff9a0e 100644 (file)
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -250,7 +250,7 @@ VOID transmit_packets(struct bcm_mini_adapter *Adapter)
        UINT uiPrevTotalCount = 0;
        int iIndex = 0;
 
-       BOOLEAN exit_flag = TRUE;
+       bool exit_flag = TRUE;
 
        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "=====>");
 

diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 56c5bee6514e70cd63a69929966e1a931afc8b73..33965d76374226abd0dc1a848ad94e2771a06f18 100644 (file)
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -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 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);
 
@@ -67,7 +67,7 @@ int PHSTransmit(struct bcm_mini_adapter *Adapter,
                struct sk_buff **pPacket,
                USHORT Vcid,
                B_UINT16 uiClassifierRuleID,
-               BOOLEAN bHeaderSuppressionEnabled,
+               bool bHeaderSuppressionEnabled,
                UINT *PacketLen,
                UCHAR bEthCSSupport)
 {
@@ -81,7 +81,7 @@ int PHSTransmit(struct bcm_mini_adapter *Adapter,
        PUCHAR pucPHSPktHdrOutBuf = Adapter->stPhsTxContextInfo.ucaHdrSuppressionOutBuf;
        UINT usPacketType;
        UINT BytesToRemove = 0;
-       BOOLEAN bPHSI = 0;
+       bool bPHSI = 0;
        LONG ulPhsStatus = 0;
        UINT numBytesCompressed = 0;
        struct sk_buff *newPacket = NULL;
@@ -788,7 +788,7 @@ static void free_phs_serviceflow_rules(struct bcm_phs_table *psServiceFlowRulesT
        psServiceFlowRulesTable = NULL;
 }
 
-static BOOLEAN ValidatePHSRuleComplete(IN struct bcm_phs_rule *psPhsRule)
+static bool ValidatePHSRuleComplete(IN struct bcm_phs_rule *psPhsRule)
 {
        if (psPhsRule) {
                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;
        UINT uiStatus = 0;
        int iSfIndex;
-       BOOLEAN bFreeEntryFound = FALSE;
+       bool bFreeEntryFound = FALSE;
 
        /* Check for a free entry in SFID table */
        for (iSfIndex = 0; iSfIndex < MAX_SERVICEFLOWS; iSfIndex++) {
@@ -1009,7 +1009,7 @@ static UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
                                B_UINT8 u8AssociatedPHSI)
 {
        UINT iClassifierIndex = 0;
-       BOOLEAN bFreeEntryFound = FALSE;
+       bool bFreeEntryFound = FALSE;
        struct bcm_phs_classifier_entry *psClassifierRules = NULL;
        UINT nStatus = PHS_SUCCESS;
        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;
        UINT nPhsRuleIndex = 0;
-       BOOLEAN bPHSRuleOrphaned = FALSE;
+       bool bPHSRuleOrphaned = FALSE;
        struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
        psPhsRule->u8RefCnt = 0;
@@ -1150,7 +1150,7 @@ static UINT UpdateClassifierPHSRule(IN B_UINT16  uiClsId,
        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)
                return FALSE;

diff --git a/drivers/staging/bcm/PHSModule.h b/drivers/staging/bcm/PHSModule.h
index 82d8682841809d17858e4f8f43f7db66e9a0383e..d697f9c860cff03457ab182ce950a2d7f14157ff 100644 (file)
--- a/drivers/staging/bcm/PHSModule.h
+++ b/drivers/staging/bcm/PHSModule.h
@@ -5,7 +5,7 @@ int PHSTransmit(struct bcm_mini_adapter *Adapter,
                                        struct sk_buff **pPacket,
                                         USHORT Vcid,
                                         B_UINT16 uiClassifierRuleID,
-                                        BOOLEAN bHeaderSuppressionEnabled,
+                                        bool bHeaderSuppressionEnabled,
                                         PUINT PacketLen,
                                         UCHAR bEthCSSupport);
 
@@ -39,7 +39,7 @@ ULONG PhsDeleteClassifierRule(void* pvContext, B_UINT16 uiVcid ,B_UINT16  uiClsI
 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);
 

diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 2a673b125f008e83f5f8a82b64b176a2f928ea16..fb53a00591ebaaef9b272985e40760c9e27b4dce 100644 (file)
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -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 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);
@@ -138,7 +138,7 @@ INT BeceemEEPROMBulkWrite(
        PUCHAR pBuffer,
        UINT uiOffset,
        UINT uiNumBytes,
-       BOOLEAN bVerify);
+       bool bVerify);
 
 
 INT ReadBeceemEEPROM(struct bcm_mini_adapter *Adapter,UINT dwAddress, UINT *pdwData);
@@ -155,13 +155,13 @@ INT BeceemNVMWrite(
        PUINT pBuffer,
        UINT uiOffset,
        UINT uiNumBytes,
-       BOOLEAN bVerify);
+       bool bVerify);
 
 
 INT BcmInitNVM(struct bcm_mini_adapter *Adapter);
 
 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);
 
@@ -198,7 +198,7 @@ INT BcmCopySection(struct bcm_mini_adapter *Adapter,
                                                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);
@@ -212,7 +212,7 @@ INT buffDnldVerify(struct bcm_mini_adapter *Adapter, unsigned char *mappedbuffer
 
 
 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

diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 2d4a77cca9150b76137d1d84d93cac930b433fda..3d687e577dd32605c0c4831d9fd7bd646bf3cf79 100644 (file)
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -5,7 +5,7 @@ This file contains the routines related to Quality of Service.
 #include "headers.h"
 
 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,
                           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 .
 *********************************************************************/
-BOOLEAN MatchSrcIpAddress(struct bcm_classifier_rule *pstClassifierRule, ULONG ulSrcIP)
+bool MatchSrcIpAddress(struct bcm_classifier_rule *pstClassifierRule, ULONG ulSrcIP)
 {
        UCHAR ucLoopIndex = 0;
 
@@ -58,7 +58,7 @@ BOOLEAN MatchSrcIpAddress(struct bcm_classifier_rule *pstClassifierRule, ULONG u
 *
 * 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;
        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.
 **************************************************************************/
-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);
@@ -209,7 +209,7 @@ static USHORT       IpVersion4(struct bcm_mini_adapter *Adapter,
                           struct bcm_classifier_rule *pstClassifierRule)
 {
        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, "========>");
 
@@ -451,7 +451,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter, struct sk_buff* skb)
        struct iphdr *pIpHeader = NULL;
        INT       uiSfIndex = 0;
        USHORT  usIndex = Adapter->usBestEffortQueueIndex;
-       BOOLEAN bFragmentedPkt = FALSE, bClassificationSucceed = FALSE;
+       bool    bFragmentedPkt = FALSE, bClassificationSucceed = FALSE;
        USHORT  usCurrFragment = 0;
 
        struct bcm_tcp_header *pTcpHeader;
@@ -649,7 +649,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter, struct sk_buff* skb)
                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;
        struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -666,7 +666,7 @@ static BOOLEAN EthCSMatchSrcMACAddress(struct bcm_classifier_rule *pstClassifier
        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;
        struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -683,7 +683,7 @@ static BOOLEAN EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifie
        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);
        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;
        B_UINT8 uPriority = 0;
        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_classifier_rule *pstClassifierRule,
                                B_UINT8 EthCSCupport)
 {
-       BOOLEAN bClassificationSucceed = FALSE;
+       bool bClassificationSucceed = FALSE;
        bClassificationSucceed = EthCSMatchSrcMACAddress(pstClassifierRule, ((struct bcm_eth_header *)(skb->data))->au8SourceAddress);
        if (!bClassificationSucceed)
                return FALSE;

diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index f8dc3e20b47590d4174d01705bf8d0bd29539e63..70a9d4ae7f5924b567e547c614d66dc42d47320d 100644 (file)
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -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     status = 0;
-       BOOLEAN bHeaderSupressionEnabled = FALSE;
+       bool    bHeaderSupressionEnabled = FALSE;
        B_UINT16 uiClassifierRuleID;
        u16     QueueIndex = skb_get_queue_mapping(Packet);
        struct bcm_leader Leader = {0};

diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index a985abf194fd4f63749a4130aba536683a3b0466..69aa16f593003cd37ec062ff5c22945dc384f97c 100644 (file)
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -9,7 +9,7 @@
 #define         FALSE          0
 #define         TRUE           1
 
-typedef char BOOLEAN;
+
 typedef char CHAR;
 typedef int INT;
 typedef short SHORT;

diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 05a948a3698cb15eabdd8b25418ca26e96b79366..194edd7b68903a9460d9d1dd009fbb0b5f4f0fa0 100644 (file)
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -13,7 +13,7 @@ static B_UINT16 CFG_CalculateChecksum(B_UINT8 *pu8Buffer, B_UINT32 u32Size)
        return u16CheckSum;
 }
 
-BOOLEAN IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios)
+bool IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios)
 {
        INT Status;
        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)
 {
        int Status = STATUS_SUCCESS;
-       BOOLEAN bInfinite = FALSE;
+       bool bInfinite = FALSE;
 
        /* Check if num_of_time is -ve. If yes, blink led in infinite loop */
        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 num_of_time = 0, num_of_time_tx = 0, num_of_time_rx = 0;
        UINT remDelay = 0;
-       BOOLEAN bBlinkBothLED = TRUE;
+       bool bBlinkBothLED = TRUE;
        /* UINT GPIO_num = DISABLE_GPIO_NUM; */
        ulong timeout = 0;
 
@@ -478,7 +478,7 @@ static int ReadLEDInformationFromEEPROM(struct bcm_mini_adapter *Adapter,
 
 
 static int ReadConfigFileStructure(struct bcm_mini_adapter *Adapter,
-                                       BOOLEAN *bEnableThread)
+                                       bool *bEnableThread)
 {
        int Status = STATUS_SUCCESS;
        /* 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 Status = STATUS_SUCCESS;
-       BOOLEAN bEnableThread = TRUE;
+       bool bEnableThread = TRUE;
        UCHAR uiIndex = 0;
 
        /*

diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 1f5b62b4b5a189dead3f85bbbe4406918df5301e..59c5bf3ba614fa956cef4acde0560863580c664a 100644 (file)
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -45,7 +45,7 @@ static int BeceemFlashBulkWrite(
        PUINT pBuffer,
        unsigned int uiOffset,
        unsigned int uiNumBytes,
-       BOOLEAN bVerify);
+       bool bVerify);
 
 static int GetFlashBaseAddr(struct bcm_mini_adapter *Adapter);
 
@@ -1034,7 +1034,7 @@ static int BeceemFlashBulkWrite(struct bcm_mini_adapter *Adapter,
                                PUINT pBuffer,
                                unsigned int uiOffset,
                                unsigned int uiNumBytes,
-                               BOOLEAN bVerify)
+                               bool bVerify)
 {
        PCHAR pTempBuff                 = NULL;
        PUCHAR pcBuffer                 = (PUCHAR)pBuffer;
@@ -1222,7 +1222,7 @@ static int BeceemFlashBulkWriteStatus(struct bcm_mini_adapter *Adapter,
                                PUINT pBuffer,
                                unsigned int uiOffset,
                                unsigned int uiNumBytes,
-                               BOOLEAN bVerify)
+                               bool bVerify)
 {
        PCHAR pTempBuff                 = NULL;
        PUCHAR pcBuffer                 = (PUCHAR)pBuffer;
@@ -1724,7 +1724,7 @@ int BeceemEEPROMBulkWrite(struct bcm_mini_adapter *Adapter,
                        PUCHAR pBuffer,
                        unsigned int uiOffset,
                        unsigned int uiNumBytes,
-                       BOOLEAN bVerify)
+                       bool bVerify)
 {
        unsigned int uiBytesToCopy      = uiNumBytes;
        /* unsigned int uiRdbk          = 0; */
@@ -1870,7 +1870,7 @@ int BeceemNVMWrite(struct bcm_mini_adapter *Adapter,
                PUINT pBuffer,
                unsigned int uiOffset,
                unsigned int uiNumBytes,
-               BOOLEAN bVerify)
+               bool bVerify)
 {
        int Status = 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;
        enum bcm_flash2x_section_val uiHighestPriDSD = 0;
        enum bcm_flash2x_section_val uiHighestPriISO = 0;
-       BOOLEAN SetActiveDSDDone = FALSE;
-       BOOLEAN SetActiveISODone = FALSE;
+       bool SetActiveDSDDone = FALSE;
+       bool SetActiveISODone = FALSE;
 
        /* 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.
@@ -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;
        unsigned int uiReadOffsetWithinPart = 0, uiWriteOffsetWithinPart = 0;
        unsigned int uiTotalDataToCopy = 0;
-       BOOLEAN IsThisHeaderSector = FALSE;
+       bool IsThisHeaderSector = FALSE;
        unsigned int sigOffset = 0;
        unsigned int ISOLength = 0;
        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)
 {
        unsigned int offsetToProtect = 0, HeaderSizeToProtect = 0;
-       BOOLEAN bHasHeader = FALSE;
+       bool bHasHeader = FALSE;
        PUCHAR pTempBuff = NULL;
        unsigned int uiSectAlignAddr = 0;
        unsigned int sig = 0;
@@ -4469,9 +4469,9 @@ int WriteToFlashWithoutSectorErase(struct bcm_mini_adapter *Adapter,
        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) {
        case ISO_IMAGE1:
@@ -4656,7 +4656,7 @@ static int CorruptISOSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_sect
        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)
                return TRUE;

diff --git a/drivers/staging/bcm/vendorspecificextn.c b/drivers/staging/bcm/vendorspecificextn.c
index d38a06f762df19765d014498dfbe736e9fb46e77..2c57a16788c0d6eb82488fa0a814d4a80de9a6b5 100644 (file)
--- a/drivers/staging/bcm/vendorspecificextn.c
+++ b/drivers/staging/bcm/vendorspecificextn.c
@@ -113,7 +113,7 @@ INT vendorextnReadSection(PVOID  pContext, PUCHAR pBuffer, enum bcm_flash2x_sect
  *             STATUS_SUCCESS/STATUS_FAILURE
  */
 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;
 }

diff --git a/drivers/staging/bcm/vendorspecificextn.h b/drivers/staging/bcm/vendorspecificextn.h
index 52890d216edf3b9828e7ad040c6df4d0e6195a25..ff57f05704511b259035c06d6e05e64eb6c51add 100644 (file)
--- a/drivers/staging/bcm/vendorspecificextn.h
+++ b/drivers/staging/bcm/vendorspecificextn.h
@@ -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,
                        UINT offset, UINT numOfBytes);
 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,
                        UINT offset, UINT numOfBytes);