Use the normal types.
Remove the now unused typedef.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/bcm/Adapter.h | 72 +++++-----
drivers/staging/bcm/Bcmnet.c | 2 +-
drivers/staging/bcm/CmHost.c | 2 +-
drivers/staging/bcm/InterfaceDld.c | 2 +-
drivers/staging/bcm/Ioctl.h | 10 +-
drivers/staging/bcm/Misc.c | 2 +-
drivers/staging/bcm/PHSModule.c | 8 +-
drivers/staging/bcm/Qos.c | 2 +-
drivers/staging/bcm/Typedefs.h | 1 -
drivers/staging/bcm/cntrl_SignalingInterface.h | 18 ++--
drivers/staging/bcm/led_control.c | 2 +-
drivers/staging/bcm/nvm.c | 4 +-
drivers/staging/bcm/nvm.h | 170 ++++++++++++------------
drivers/staging/bcm/target_params.h | 72 +++++-----
14 files changed, 183 insertions(+), 184 deletions(-)
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 86bfb6b..d1392ca 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -260,57 +260,57 @@ typedef struct _PER_TARANG_DATA {
#ifdef REL_4_1
typedef struct _TARGET_PARAMS {
- B_UINT32 m_u32CfgVersion;
+ unsigned int m_u32CfgVersion;
// Scanning Related Params
- B_UINT32 m_u32CenterFrequency;
- B_UINT32 m_u32BandAScan;
- B_UINT32 m_u32BandBScan;
- B_UINT32 m_u32BandCScan;
+ unsigned int m_u32CenterFrequency;
+ unsigned int m_u32BandAScan;
+ unsigned int m_u32BandBScan;
+ unsigned int m_u32BandCScan;
// QoS Params
- B_UINT32 m_u32minGrantsize; // size of minimum grant is 0 or 6
- B_UINT32 m_u32PHSEnable;
+ unsigned int m_u32minGrantsize; // size of minimum grant is 0 or 6
+ unsigned int m_u32PHSEnable;
// HO Params
- B_UINT32 m_u32HoEnable;
- B_UINT32 m_u32HoReserved1;
- B_UINT32 m_u32HoReserved2;
+ unsigned int m_u32HoEnable;
+ unsigned int m_u32HoReserved1;
+ unsigned int m_u32HoReserved2;
// Power Control Params
- B_UINT32 m_u32MimoEnable;
- B_UINT32 m_u32SecurityEnable;
+ unsigned int m_u32MimoEnable;
+ unsigned int m_u32SecurityEnable;
/*
* bit 1: 1 Idlemode enable;
* bit 2: 1 Sleepmode Enable
*/
- B_UINT32 m_u32PowerSavingModesEnable;
+ unsigned int m_u32PowerSavingModesEnable;
/* PowerSaving Mode Options:
bit 0 = 1: CPE mode - to keep pcmcia if alive;
bit 1 = 1: CINR reporing in Idlemode Msg
bit 2 = 1: Default PSC Enable in sleepmode*/
- B_UINT32 m_u32PowerSavingModeOptions;
+ unsigned int m_u32PowerSavingModeOptions;
- B_UINT32 m_u32ArqEnable;
+ unsigned int m_u32ArqEnable;
// From Version #3, the HARQ section renamed as general
- B_UINT32 m_u32HarqEnable;
+ unsigned int m_u32HarqEnable;
// EEPROM Param Location
- B_UINT32 m_u32EEPROMFlag;
+ unsigned int m_u32EEPROMFlag;
/* BINARY TYPE - 4th MSByte:
* Interface Type - 3rd MSByte:
* Vendor Type - 2nd MSByte
*/
// Unused - LSByte
- B_UINT32 m_u32Customize;
- B_UINT32 m_u32ConfigBW; /* In Hz */
- B_UINT32 m_u32ShutDownTimer;
+ unsigned int m_u32Customize;
+ unsigned int m_u32ConfigBW; /* In Hz */
+ unsigned int m_u32ShutDownTimer;
- B_UINT32 m_u32RadioParameter;
- B_UINT32 m_u32PhyParameter1;
- B_UINT32 m_u32PhyParameter2;
- B_UINT32 m_u32PhyParameter3;
+ unsigned int m_u32RadioParameter;
+ unsigned int m_u32PhyParameter1;
+ unsigned int m_u32PhyParameter2;
+ unsigned int m_u32PhyParameter3;
/* in eval mode only;
* lower 16bits = basic cid for testing;
@@ -319,25 +319,25 @@ typedef struct _TARGET_PARAMS {
* bit 18 test periodic rang
* bit 19 is test harq ack/nack
*/
- B_UINT32 m_u32TestOptions;
+ unsigned int m_u32TestOptions;
- B_UINT32 m_u32MaxMACDataperDLFrame;
- B_UINT32 m_u32MaxMACDataperULFrame;
+ unsigned int m_u32MaxMACDataperDLFrame;
+ unsigned int m_u32MaxMACDataperULFrame;
- B_UINT32 m_u32Corr2MacFlags;
+ unsigned int m_u32Corr2MacFlags;
//adding driver params.
- B_UINT32 HostDrvrConfig1;
- B_UINT32 HostDrvrConfig2;
- B_UINT32 HostDrvrConfig3;
- B_UINT32 HostDrvrConfig4;
- B_UINT32 HostDrvrConfig5;
- B_UINT32 HostDrvrConfig6;
- B_UINT32 m_u32SegmentedPUSCenable;
+ unsigned int HostDrvrConfig1;
+ unsigned int HostDrvrConfig2;
+ unsigned int HostDrvrConfig3;
+ unsigned int HostDrvrConfig4;
+ unsigned int HostDrvrConfig5;
+ unsigned int HostDrvrConfig6;
+ unsigned int m_u32SegmentedPUSCenable;
// BAMC enable - but 4.x does not support this feature
// This is added just to sync 4.x and 5.x CFGs
- B_UINT32 m_u32BandAMCEnable;
+ unsigned int m_u32BandAMCEnable;
} STARGETPARAMS, *PSTARGETPARAMS;
#endif
diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index 75a1d89..3622d0f 100644
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -85,7 +85,7 @@ static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev)
Adapter->PackInfo[qindex].uiCurrentBytesOnHost += skb->len;
Adapter->PackInfo[qindex].uiCurrentPacketsOnHost++;
- *((B_UINT32 *) skb->cb + SKB_CB_LATENCY_OFFSET) = jiffies;
+ *((unsigned int *)skb->cb + SKB_CB_LATENCY_OFFSET) = jiffies;
ENQUEUEPACKET(Adapter->PackInfo[qindex].FirstTxQueue,
Adapter->PackInfo[qindex].LastTxQueue, skb);
atomic_inc(&Adapter->TotalPacketCount);
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index ae05254..4b75db0 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -2444,7 +2444,7 @@ int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, unsigned int uiSFId, v
void OverrideServiceFlowParams(PMINI_ADAPTER Adapter, unsigned int *puiBuffer)
{
- B_UINT32 u32NumofSFsinMsg = ntohl(*(puiBuffer + 1));
+ unsigned int u32NumofSFsinMsg = ntohl(*(puiBuffer + 1));
stIM_SFHostNotify *pHostInfo = NULL;
unsigned int uiSearchRuleIndex = 0;
unsigned long ulSFID = 0;
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index 4157fa8..e743c08 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -152,7 +152,7 @@ exit:
static int bcm_download_config_file(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
{
int retval = STATUS_SUCCESS;
- B_UINT32 value = 0;
+ unsigned int value = 0;
if (Adapter->pstargetparams == NULL) {
Adapter->pstargetparams = kmalloc(sizeof(STARGETPARAMS), GFP_KERNEL);
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index 47f9334..7e12e02 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -259,9 +259,9 @@ typedef enum _FLASH2X_SECTION_VAL
typedef struct _FLASH2X_READWRITE {
FLASH2X_SECTION_VAL Section; //which section has to be read/written
- B_UINT32 offset; //Offset within Section.
- B_UINT32 numOfBytes; //NOB from the offset
- B_UINT32 bVerify;
+ unsigned int offset; //Offset within Section.
+ unsigned int numOfBytes; //NOB from the offset
+ unsigned int bVerify;
void __user *pDataBuff; //Buffer for reading/writing
}FLASH2X_READWRITE, *PFLASH2X_READWRITE;
@@ -280,10 +280,10 @@ typedef struct _FLASH2X_COPY_SECTION {
FLASH2X_SECTION_VAL DstSection;
//Offset within Section. if NOB =0 it will be ignored and data will be coped from offset 0.
- B_UINT32 offset;
+ unsigned int offset;
//NOB from the offset. if NOB = 0 complete src section will be copied to Destination section.
- B_UINT32 numOfBytes;
+ unsigned int numOfBytes;
} FLASH2X_COPY_SECTION, *PFLASH2X_COPY_SECTION;
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 410450a..ffbace9 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -1663,7 +1663,7 @@ static void SendShutModeResponse(PMINI_ADAPTER Adapter)
static void HandleShutDownModeRequest(PMINI_ADAPTER Adapter, unsigned char *pucBuffer)
{
- B_UINT32 uiResetValue = 0;
+ unsigned int uiResetValue = 0;
bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL, "====>\n");
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 1aa82fb..f432318 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -12,9 +12,9 @@ static BOOLEAN ValidatePHSRuleComplete(S_PHS_RULE *psPhsRule);
static BOOLEAN DerefPhsRule(unsigned short uiClsId, S_CLASSIFIER_TABLE *psaClassifiertable, S_PHS_RULE *pstPhsRule);
-static unsigned int GetClassifierEntry(S_CLASSIFIER_TABLE *pstClassifierTable, B_UINT32 uiClsid, E_CLASSIFIER_ENTRY_CONTEXT eClsContext, S_CLASSIFIER_ENTRY **ppstClassifierEntry);
+static unsigned int GetClassifierEntry(S_CLASSIFIER_TABLE *pstClassifierTable, unsigned int uiClsid, E_CLASSIFIER_ENTRY_CONTEXT eClsContext, S_CLASSIFIER_ENTRY **ppstClassifierEntry);
-static unsigned int GetPhsRuleEntry(S_CLASSIFIER_TABLE *pstClassifierTable, B_UINT32 uiPHSI, E_CLASSIFIER_ENTRY_CONTEXT eClsContext, S_PHS_RULE **ppstPhsRule);
+static unsigned int GetPhsRuleEntry(S_CLASSIFIER_TABLE *pstClassifierTable, unsigned int uiPHSI, E_CLASSIFIER_ENTRY_CONTEXT eClsContext, S_PHS_RULE **ppstPhsRule);
static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable);
@@ -901,7 +901,7 @@ unsigned int GetServiceFlowEntry(IN S_SERVICEFLOW_TABLE *psServiceFlowTable,
unsigned int GetClassifierEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
- IN B_UINT32 uiClsid, E_CLASSIFIER_ENTRY_CONTEXT eClsContext,
+ IN unsigned int uiClsid, E_CLASSIFIER_ENTRY_CONTEXT eClsContext,
OUT S_CLASSIFIER_ENTRY **ppstClassifierEntry)
{
int i;
@@ -928,7 +928,7 @@ unsigned int GetClassifierEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
}
static unsigned int GetPhsRuleEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
- IN B_UINT32 uiPHSI, E_CLASSIFIER_ENTRY_CONTEXT eClsContext,
+ IN unsigned int uiPHSI, E_CLASSIFIER_ENTRY_CONTEXT eClsContext,
OUT S_PHS_RULE **ppstPhsRule)
{
int i;
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 70d4be06..25035a8 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -357,7 +357,7 @@ static void PruneQueue(PMINI_ADAPTER Adapter, int iIndex)
if (PacketToDrop == NULL)
break;
if ((Adapter->PackInfo[iIndex].uiCurrentPacketsOnHost < SF_MAX_ALLOWED_PACKETS_TO_BACKUP) &&
- ((1000*(jiffies - *((B_UINT32 *)(PacketToDrop->cb)+SKB_CB_LATENCY_OFFSET))/HZ) <= Adapter->PackInfo[iIndex].uiMaxLatency))
+ ((1000*(jiffies - *((unsigned int *)(PacketToDrop->cb)+SKB_CB_LATENCY_OFFSET))/HZ) <= Adapter->PackInfo[iIndex].uiMaxLatency))
break;
if (PacketToDrop) {
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index cd7e232..d44fa3b 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -11,7 +11,6 @@
typedef char BOOLEAN;
-typedef unsigned int B_UINT32;
typedef unsigned long DWORD;
typedef unsigned long long LARGE_INTEGER;
diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index 1dedb72..294b413 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -148,22 +148,22 @@ typedef struct _stConvergenceSLTypes stConvergenceSLTypes, CConvergenceSLTypes,
typedef struct _stServiceFlowParamSI{
/** 32bitSFID Of The Service Flow*/
- B_UINT32 u32SFID;
+ unsigned int u32SFID;
/** 32bit Maximum Sustained Traffic Rate of the Service Flow*/
- B_UINT32 u32MaxSustainedTrafficRate;
+ unsigned int u32MaxSustainedTrafficRate;
/** 32bit Maximum Traffic Burst allowed for the Service Flow*/
- B_UINT32 u32MaxTrafficBurst;
+ unsigned int u32MaxTrafficBurst;
/** 32bit Minimum Reserved Traffic Rate of the Service Flow*/
- B_UINT32 u32MinReservedTrafficRate;
+ unsigned int u32MinReservedTrafficRate;
/** 32bit Tolerated Jitter of the Service Flow*/
- B_UINT32 u32ToleratedJitter;
+ unsigned int u32ToleratedJitter;
/** 32bit Maximum Latency of the Service Flow*/
- B_UINT32 u32MaximumLatency;
+ unsigned int u32MaximumLatency;
/** 16bitCID Of The Service Flow*/
unsigned short u16CID;
@@ -388,7 +388,7 @@ typedef struct _stLocalSFDeleteRequest{
unsigned char u8Padding; /**< Padding byte*/
unsigned short u16TID; /**< TID*/
/// \brief 32bitSFID
- B_UINT32 u32SFID; /**< SFID*/
+ unsigned int u32SFID; /**< SFID*/
}stLocalSFDeleteRequest, *pstLocalSFDeleteRequest;
/**
@@ -403,7 +403,7 @@ typedef struct stLocalSFDeleteIndication{
/// \brief 16bitVCID
unsigned short u16VCID; /**< VCID */
/// \brief 32bitSFID
- B_UINT32 u32SFID; /**< SFID */
+ unsigned int u32SFID; /**< SFID */
/// \brief 8bit Confirmation code
unsigned char u8ConfirmationCode; /**< Confirmation code */
unsigned char u8Padding1[3]; /**< 3 byte Padding */
@@ -411,7 +411,7 @@ typedef struct stLocalSFDeleteIndication{
typedef struct _stIM_SFHostNotify
{
- B_UINT32 SFID; //SFID of the service flow
+ unsigned int SFID; //SFID of the service flow
unsigned short newCID; //the new/changed CID
unsigned short VCID; //Get new Vcid if the flow has been made active in CID update TLV, but was inactive earlier or the orig vcid
unsigned char RetainSF; //Indication to Host if the SF is to be retained or deleted; if TRUE-retain else delete
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index f89fc60..ed0b6f9 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -3,7 +3,7 @@
#define STATUS_IMAGE_CHECKSUM_MISMATCH -199
#define EVENT_SIGNALED 1
-static unsigned short CFG_CalculateChecksum(unsigned char *pu8Buffer, B_UINT32 u32Size)
+static unsigned short CFG_CalculateChecksum(unsigned char *pu8Buffer, unsigned int u32Size)
{
unsigned short u16CheckSum = 0;
while (u32Size--) {
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 7f32954..0d113c2 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -2620,7 +2620,7 @@ static int IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL
static void UpdateVendorInfo(PMINI_ADAPTER Adapter)
{
- B_UINT32 i = 0;
+ unsigned int i = 0;
unsigned int uiSizeSection = 0;
Adapter->uiVendorExtnFlag = FALSE;
@@ -3268,7 +3268,7 @@ unsigned char IsOffsetWritable(PMINI_ADAPTER Adapter, unsigned int uiOffset)
unsigned int uiSectorNum = 0;
unsigned int uiWordOfSectorPermission = 0;
unsigned int uiBitofSectorePermission = 0;
- B_UINT32 permissionBits = 0;
+ unsigned int permissionBits = 0;
uiSectorNum = uiOffset/Adapter->uiSectorSize;
//calculating the word having this Sector Access permission from SectorAccessBitMap Array
diff --git a/drivers/staging/bcm/nvm.h b/drivers/staging/bcm/nvm.h
index 93fd477..e6b4a98 100644
--- a/drivers/staging/bcm/nvm.h
+++ b/drivers/staging/bcm/nvm.h
@@ -29,72 +29,72 @@ typedef struct _FLASH_SECTOR_INFO {
}FLASH_SECTOR_INFO,*PFLASH_SECTOR_INFO;
typedef struct _FLASH_CS_INFO {
- B_UINT32 MagicNumber;
+ unsigned int MagicNumber;
// let the magic number be 0xBECE-F1A5 - F1A5 for "flas-h"
- B_UINT32 FlashLayoutVersion ;
+ unsigned int FlashLayoutVersion;
// ISO Image/Format/BuildTool versioning
- B_UINT32 ISOImageVersion;
+ unsigned int ISOImageVersion;
// SCSI/Flash BootLoader versioning
- B_UINT32 SCSIFirmwareVersion;
+ unsigned int SCSIFirmwareVersion;
- B_UINT32 OffsetFromZeroForPart1ISOImage;
+ unsigned int OffsetFromZeroForPart1ISOImage;
// typically 0
- B_UINT32 OffsetFromZeroForScsiFirmware;
+ unsigned int OffsetFromZeroForScsiFirmware;
//typically at 12MB
- B_UINT32 SizeOfScsiFirmware ;
+ unsigned int SizeOfScsiFirmware;
//size of the firmware - depends on binary size
- B_UINT32 OffsetFromZeroForPart2ISOImage;
+ unsigned int OffsetFromZeroForPart2ISOImage;
// typically at first Word Aligned offset 12MB + sizeOfScsiFirmware.
- B_UINT32 OffsetFromZeroForCalibrationStart;
+ unsigned int OffsetFromZeroForCalibrationStart;
// typically at 15MB
- B_UINT32 OffsetFromZeroForCalibrationEnd;
+ unsigned int OffsetFromZeroForCalibrationEnd;
// VSA0 offsets
- B_UINT32 OffsetFromZeroForVSAStart;
- B_UINT32 OffsetFromZeroForVSAEnd;
+ unsigned int OffsetFromZeroForVSAStart;
+ unsigned int OffsetFromZeroForVSAEnd;
// Control Section offsets
- B_UINT32 OffsetFromZeroForControlSectionStart;
- B_UINT32 OffsetFromZeroForControlSectionData;
+ unsigned int OffsetFromZeroForControlSectionStart;
+ unsigned int OffsetFromZeroForControlSectionData;
// NO Data Activity timeout to switch from MSC to NW Mode
- B_UINT32 CDLessInactivityTimeout;
+ unsigned int CDLessInactivityTimeout;
// New ISO Image Signature
- B_UINT32 NewImageSignature;
+ unsigned int NewImageSignature;
// Signature to validate the sector size.
- B_UINT32 FlashSectorSizeSig;
+ unsigned int FlashSectorSizeSig;
// Sector Size
- B_UINT32 FlashSectorSize;
+ unsigned int FlashSectorSize;
// Write Size Support
- B_UINT32 FlashWriteSupportSize;
+ unsigned int FlashWriteSupportSize;
// Total Flash Size
- B_UINT32 TotalFlashSize;
+ unsigned int TotalFlashSize;
// Flash Base Address for offset specified
- B_UINT32 FlashBaseAddr;
+ unsigned int FlashBaseAddr;
// Flash Part Max Size
- B_UINT32 FlashPartMaxSize;
+ unsigned int FlashPartMaxSize;
// Is CDLess or Flash Bootloader
- B_UINT32 IsCDLessDeviceBootSig;
+ unsigned int IsCDLessDeviceBootSig;
// MSC Timeout after reset to switch from MSC to NW Mode
- B_UINT32 MassStorageTimeout;
+ unsigned int MassStorageTimeout;
}FLASH_CS_INFO,*PFLASH_CS_INFO;
@@ -105,86 +105,86 @@ typedef struct _FLASH_CS_INFO {
typedef struct _FLASH_2X_CS_INFO {
// magic number as 0xBECE-F1A5 - F1A5 for "flas-h"
- B_UINT32 MagicNumber;
+ unsigned int MagicNumber;
- B_UINT32 FlashLayoutVersion ;
+ unsigned int FlashLayoutVersion ;
// ISO Image/Format/BuildTool versioning
- B_UINT32 ISOImageVersion;
+ unsigned int ISOImageVersion;
// SCSI/Flash BootLoader versioning
- B_UINT32 SCSIFirmwareVersion;
+ unsigned int SCSIFirmwareVersion;
// ISO Image1 Part1/SCSI Firmware/Flash Bootloader Start offset, size
- B_UINT32 OffsetFromZeroForPart1ISOImage;
- B_UINT32 OffsetFromZeroForScsiFirmware;
- B_UINT32 SizeOfScsiFirmware ;
+ unsigned int OffsetFromZeroForPart1ISOImage;
+ unsigned int OffsetFromZeroForScsiFirmware;
+ unsigned int SizeOfScsiFirmware ;
// ISO Image1 Part2 start offset
- B_UINT32 OffsetFromZeroForPart2ISOImage;
+ unsigned int OffsetFromZeroForPart2ISOImage;
// DSD0 offset
- B_UINT32 OffsetFromZeroForDSDStart;
- B_UINT32 OffsetFromZeroForDSDEnd;
+ unsigned int OffsetFromZeroForDSDStart;
+ unsigned int OffsetFromZeroForDSDEnd;
// VSA0 offset
- B_UINT32 OffsetFromZeroForVSAStart;
- B_UINT32 OffsetFromZeroForVSAEnd;
+ unsigned int OffsetFromZeroForVSAStart;
+ unsigned int OffsetFromZeroForVSAEnd;
// Control Section offset
- B_UINT32 OffsetFromZeroForControlSectionStart;
- B_UINT32 OffsetFromZeroForControlSectionData;
+ unsigned int OffsetFromZeroForControlSectionStart;
+ unsigned int OffsetFromZeroForControlSectionData;
// NO Data Activity timeout to switch from MSC to NW Mode
- B_UINT32 CDLessInactivityTimeout;
+ unsigned int CDLessInactivityTimeout;
// New ISO Image Signature
- B_UINT32 NewImageSignature;
+ unsigned int NewImageSignature;
- B_UINT32 FlashSectorSizeSig; // Sector Size Signature
- B_UINT32 FlashSectorSize; // Sector Size
- B_UINT32 FlashWriteSupportSize; // Write Size Support
+ unsigned int FlashSectorSizeSig; // Sector Size Signature
+ unsigned int FlashSectorSize; // Sector Size
+ unsigned int FlashWriteSupportSize; // Write Size Support
- B_UINT32 TotalFlashSize; // Total Flash Size
+ unsigned int TotalFlashSize; // Total Flash Size
// Flash Base Address for offset specified
- B_UINT32 FlashBaseAddr;
- B_UINT32 FlashPartMaxSize; // Flash Part Max Size
+ unsigned int FlashBaseAddr;
+ unsigned int FlashPartMaxSize; // Flash Part Max Size
// Is CDLess or Flash Bootloader
- B_UINT32 IsCDLessDeviceBootSig;
+ unsigned int IsCDLessDeviceBootSig;
// MSC Timeout after reset to switch from MSC to NW Mode
- B_UINT32 MassStorageTimeout;
+ unsigned int MassStorageTimeout;
/* Flash Map 2.0 Field */
- B_UINT32 OffsetISOImage1Part1Start; // ISO Image1 Part1 offset
- B_UINT32 OffsetISOImage1Part1End;
- B_UINT32 OffsetISOImage1Part2Start; // ISO Image1 Part2 offset
- B_UINT32 OffsetISOImage1Part2End;
- B_UINT32 OffsetISOImage1Part3Start; // ISO Image1 Part3 offset
- B_UINT32 OffsetISOImage1Part3End;
+ unsigned int OffsetISOImage1Part1Start; // ISO Image1 Part1 offset
+ unsigned int OffsetISOImage1Part1End;
+ unsigned int OffsetISOImage1Part2Start; // ISO Image1 Part2 offset
+ unsigned int OffsetISOImage1Part2End;
+ unsigned int OffsetISOImage1Part3Start; // ISO Image1 Part3 offset
+ unsigned int OffsetISOImage1Part3End;
- B_UINT32 OffsetISOImage2Part1Start; // ISO Image2 Part1 offset
- B_UINT32 OffsetISOImage2Part1End;
- B_UINT32 OffsetISOImage2Part2Start; // ISO Image2 Part2 offset
- B_UINT32 OffsetISOImage2Part2End;
- B_UINT32 OffsetISOImage2Part3Start; // ISO Image2 Part3 offset
- B_UINT32 OffsetISOImage2Part3End;
+ unsigned int OffsetISOImage2Part1Start; // ISO Image2 Part1 offset
+ unsigned int OffsetISOImage2Part1End;
+ unsigned int OffsetISOImage2Part2Start; // ISO Image2 Part2 offset
+ unsigned int OffsetISOImage2Part2End;
+ unsigned int OffsetISOImage2Part3Start; // ISO Image2 Part3 offset
+ unsigned int OffsetISOImage2Part3End;
// DSD Header offset from start of DSD
- B_UINT32 OffsetFromDSDStartForDSDHeader;
- B_UINT32 OffsetFromZeroForDSD1Start; // DSD 1 offset
- B_UINT32 OffsetFromZeroForDSD1End;
- B_UINT32 OffsetFromZeroForDSD2Start; // DSD 2 offset
- B_UINT32 OffsetFromZeroForDSD2End;
+ unsigned int OffsetFromDSDStartForDSDHeader;
+ unsigned int OffsetFromZeroForDSD1Start; // DSD 1 offset
+ unsigned int OffsetFromZeroForDSD1End;
+ unsigned int OffsetFromZeroForDSD2Start; // DSD 2 offset
+ unsigned int OffsetFromZeroForDSD2End;
- B_UINT32 OffsetFromZeroForVSA1Start; // VSA 1 offset
- B_UINT32 OffsetFromZeroForVSA1End;
- B_UINT32 OffsetFromZeroForVSA2Start; // VSA 2 offset
- B_UINT32 OffsetFromZeroForVSA2End;
+ unsigned int OffsetFromZeroForVSA1Start; // VSA 1 offset
+ unsigned int OffsetFromZeroForVSA1End;
+ unsigned int OffsetFromZeroForVSA2Start; // VSA 2 offset
+ unsigned int OffsetFromZeroForVSA2End;
/*
* ACCESS_BITS_PER_SECTOR 2
@@ -193,43 +193,43 @@ typedef struct _FLASH_2X_CS_INFO {
* ACCESS_RESVD 2
* ACCESS_RESVD 3
* */
- B_UINT32 SectorAccessBitMap[FLASH2X_TOTAL_SIZE/(DEFAULT_SECTOR_SIZE *16)];
+ unsigned int SectorAccessBitMap[FLASH2X_TOTAL_SIZE/(DEFAULT_SECTOR_SIZE *16)];
// All expansions to the control data structure should add here
}FLASH2X_CS_INFO,*PFLASH2X_CS_INFO;
typedef struct _VENDOR_SECTION_INFO {
- B_UINT32 OffsetFromZeroForSectionStart;
- B_UINT32 OffsetFromZeroForSectionEnd;
- B_UINT32 AccessFlags;
- B_UINT32 Reserved[16];
+ unsigned int OffsetFromZeroForSectionStart;
+ unsigned int OffsetFromZeroForSectionEnd;
+ unsigned int AccessFlags;
+ unsigned int Reserved[16];
} VENDOR_SECTION_INFO, *PVENDOR_SECTION_INFO;
typedef struct _FLASH2X_VENDORSPECIFIC_INFO {
VENDOR_SECTION_INFO VendorSection[TOTAL_SECTIONS];
- B_UINT32 Reserved[16];
+ unsigned int Reserved[16];
} FLASH2X_VENDORSPECIFIC_INFO, *PFLASH2X_VENDORSPECIFIC_INFO;
typedef struct _DSD_HEADER {
- B_UINT32 DSDImageSize;
- B_UINT32 DSDImageCRC;
- B_UINT32 DSDImagePriority;
+ unsigned int DSDImageSize;
+ unsigned int DSDImageCRC;
+ unsigned int DSDImagePriority;
//We should not consider right now. Reading reserve is worthless.
- B_UINT32 Reserved[252]; // Resvd for DSD Header
- B_UINT32 DSDImageMagicNumber;
+ unsigned int Reserved[252]; // Resvd for DSD Header
+ unsigned int DSDImageMagicNumber;
}DSD_HEADER, *PDSD_HEADER;
typedef struct _ISO_HEADER {
- B_UINT32 ISOImageMagicNumber;
- B_UINT32 ISOImageSize;
- B_UINT32 ISOImageCRC;
- B_UINT32 ISOImagePriority;
+ unsigned int ISOImageMagicNumber;
+ unsigned int ISOImageSize;
+ unsigned int ISOImageCRC;
+ unsigned int ISOImagePriority;
//We should not consider right now. Reading reserve is worthless.
- B_UINT32 Reserved[60]; //Resvd for ISO Header extension
+ unsigned int Reserved[60]; //Resvd for ISO Header extension
}ISO_HEADER, *PISO_HEADER;
diff --git a/drivers/staging/bcm/target_params.h b/drivers/staging/bcm/target_params.h
index 1c8b1b8..cde4ee7 100644
--- a/drivers/staging/bcm/target_params.h
+++ b/drivers/staging/bcm/target_params.h
@@ -2,78 +2,78 @@
#define TARGET_PARAMS_H
typedef struct _TARGET_PARAMS {
- B_UINT32 m_u32CfgVersion;
+ unsigned int m_u32CfgVersion;
// Scanning Related Params
- B_UINT32 m_u32CenterFrequency;
- B_UINT32 m_u32BandAScan;
- B_UINT32 m_u32BandBScan;
- B_UINT32 m_u32BandCScan;
+ unsigned int m_u32CenterFrequency;
+ unsigned int m_u32BandAScan;
+ unsigned int m_u32BandBScan;
+ unsigned int m_u32BandCScan;
// QoS Params
- B_UINT32 m_u32ErtpsOptions;
+ unsigned int m_u32ErtpsOptions;
- B_UINT32 m_u32PHSEnable;
+ unsigned int m_u32PHSEnable;
// HO Params
- B_UINT32 m_u32HoEnable;
+ unsigned int m_u32HoEnable;
- B_UINT32 m_u32HoReserved1;
- B_UINT32 m_u32HoReserved2;
+ unsigned int m_u32HoReserved1;
+ unsigned int m_u32HoReserved2;
// Power Control Params
- B_UINT32 m_u32MimoEnable;
+ unsigned int m_u32MimoEnable;
- B_UINT32 m_u32SecurityEnable;
+ unsigned int m_u32SecurityEnable;
- B_UINT32 m_u32PowerSavingModesEnable; //bit 1: 1 Idlemode enable; bit2: 1 Sleepmode Enable
+ unsigned int m_u32PowerSavingModesEnable; //bit 1: 1 Idlemode enable; bit2: 1 Sleepmode Enable
/* PowerSaving Mode Options:
bit 0 = 1: CPE mode - to keep pcmcia if alive;
bit 1 = 1: CINR reporing in Idlemode Msg
bit 2 = 1: Default PSC Enable in sleepmode*/
- B_UINT32 m_u32PowerSavingModeOptions;
+ unsigned int m_u32PowerSavingModeOptions;
- B_UINT32 m_u32ArqEnable;
+ unsigned int m_u32ArqEnable;
// From Version #3, the HARQ section renamed as general
- B_UINT32 m_u32HarqEnable;
+ unsigned int m_u32HarqEnable;
// EEPROM Param Location
- B_UINT32 m_u32EEPROMFlag;
+ unsigned int m_u32EEPROMFlag;
// BINARY TYPE - 4th MSByte: Interface Type - 3rd MSByte: Vendor Type - 2nd MSByte
// Unused - LSByte
- B_UINT32 m_u32Customize;
- B_UINT32 m_u32ConfigBW; /* In Hz */
- B_UINT32 m_u32ShutDownInitThresholdTimer;
+ unsigned int m_u32Customize;
+ unsigned int m_u32ConfigBW; /* In Hz */
+ unsigned int m_u32ShutDownInitThresholdTimer;
- B_UINT32 m_u32RadioParameter;
- B_UINT32 m_u32PhyParameter1;
- B_UINT32 m_u32PhyParameter2;
- B_UINT32 m_u32PhyParameter3;
+ unsigned int m_u32RadioParameter;
+ unsigned int m_u32PhyParameter1;
+ unsigned int m_u32PhyParameter2;
+ unsigned int m_u32PhyParameter3;
- B_UINT32 m_u32TestOptions; // in eval mode only; lower 16bits = basic cid for testing; then bit 16 is test cqich, bit 17 test init rang; bit 18 test periodic rang and bit 19 is test harq ack/nack
+ unsigned int m_u32TestOptions; // in eval mode only; lower 16bits = basic cid for testing; then bit 16 is test cqich, bit 17 test init rang; bit 18 test periodic rang and bit 19 is test harq ack/nack
- B_UINT32 m_u32MaxMACDataperDLFrame;
- B_UINT32 m_u32MaxMACDataperULFrame;
+ unsigned int m_u32MaxMACDataperDLFrame;
+ unsigned int m_u32MaxMACDataperULFrame;
- B_UINT32 m_u32Corr2MacFlags;
+ unsigned int m_u32Corr2MacFlags;
//adding driver params.
- B_UINT32 HostDrvrConfig1;
- B_UINT32 HostDrvrConfig2;
- B_UINT32 HostDrvrConfig3;
- B_UINT32 HostDrvrConfig4;
- B_UINT32 HostDrvrConfig5;
- B_UINT32 HostDrvrConfig6;
- B_UINT32 m_u32SegmentedPUSCenable;
+ unsigned int HostDrvrConfig1;
+ unsigned int HostDrvrConfig2;
+ unsigned int HostDrvrConfig3;
+ unsigned int HostDrvrConfig4;
+ unsigned int HostDrvrConfig5;
+ unsigned int HostDrvrConfig6;
+ unsigned int m_u32SegmentedPUSCenable;
// removed SHUT down related 'unused' params from here to sync 4.x and 5.x CFG files..
//BAMC Related Parameters
//Bit 0-15 Band AMC signaling configuration: Bit 1 = 1 – Enable Band AMC signaling.
//bit 16-31 Band AMC Data configuration: Bit 16 = 1 – Band AMC 2x3 support.
- B_UINT32 m_u32BandAMCEnable;
+ unsigned int m_u32BandAMCEnable;
} stTargetParams, TARGET_PARAMS,*PTARGET_PARAMS, STARGETPARAMS, *PSTARGETPARAMS;
--
1.7.8.111.gad25c.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
