[PATCH 20/34] staging: bcm: Convert typedef UINT to unsigned int
Joe Perches
joe at perches.com
Tue Jan 10 16:54:14 UTC 2012
Use the normal types.
Remove now unused typedef.
Signed-off-by: Joe Perches <joe at perches.com>
---
drivers/staging/bcm/Adapter.h | 84 +++---
drivers/staging/bcm/Bcmchar.c | 104 ++++----
drivers/staging/bcm/CmHost.c | 56 ++--
drivers/staging/bcm/CmHost.h | 2 +-
drivers/staging/bcm/DDRInit.c | 44 ++--
drivers/staging/bcm/Debug.h | 6 +-
drivers/staging/bcm/HostMIBSInterface.h | 36 ++--
drivers/staging/bcm/IPv6Protocol.c | 20 +-
drivers/staging/bcm/InterfaceAdapter.h | 8 +-
drivers/staging/bcm/InterfaceDld.c | 6 +-
drivers/staging/bcm/InterfaceIdleMode.c | 2 +-
drivers/staging/bcm/InterfaceInit.c | 6 +-
drivers/staging/bcm/InterfaceMisc.c | 10 +-
drivers/staging/bcm/InterfaceMisc.h | 8 +-
drivers/staging/bcm/InterfaceRx.c | 4 +-
drivers/staging/bcm/InterfaceTx.c | 4 +-
drivers/staging/bcm/InterfaceTx.h | 2 +-
drivers/staging/bcm/Ioctl.h | 24 +-
drivers/staging/bcm/LeakyBucket.c | 4 +-
drivers/staging/bcm/Misc.c | 58 ++--
drivers/staging/bcm/PHSModule.c | 110 ++++----
drivers/staging/bcm/PHSModule.h | 8 +-
drivers/staging/bcm/Prototypes.h | 62 +++---
drivers/staging/bcm/Qos.c | 22 +-
drivers/staging/bcm/Transmit.c | 2 +-
drivers/staging/bcm/Typedefs.h | 1 -
drivers/staging/bcm/hostmibs.c | 4 +-
drivers/staging/bcm/led_control.c | 24 +-
drivers/staging/bcm/led_control.h | 4 +-
drivers/staging/bcm/nvm.c | 412 +++++++++++++++---------------
drivers/staging/bcm/nvm.h | 4 +-
drivers/staging/bcm/vendorspecificextn.c | 8 +-
drivers/staging/bcm/vendorspecificextn.h | 8 +-
33 files changed, 578 insertions(+), 579 deletions(-)
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 30603fe..8e0ddb5 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -21,7 +21,7 @@ typedef struct _PACKETTOSEND PACKETTOSEND, *PPACKETTOSEND;
struct _CONTROL_PACKET {
void *ControlBuff;
- UINT ControlBuffLen;
+ unsigned int ControlBuffLen;
struct _CONTROL_PACKET* next;
}__attribute__((packed));
typedef struct _CONTROL_PACKET CONTROL_PACKET,*PCONTROL_PACKET;
@@ -178,7 +178,7 @@ struct _packet_info {
//classification extension Rule
ULONG ulSFID;
unsigned short usVCID_Value;
- UINT uiThreshold;
+ unsigned int uiThreshold;
// This field determines the priority of the SF Queues
B_UINT8 u8TrafficPriority;
@@ -188,29 +188,29 @@ struct _packet_info {
B_UINT8 u8QueueType;//BE or rtPS
- UINT uiMaxBucketSize;//maximum size of the bucket for the queue
- UINT uiCurrentQueueDepthOnTarget;
- UINT uiCurrentBytesOnHost;
- UINT uiCurrentPacketsOnHost;
- UINT uiDroppedCountBytes;
- UINT uiDroppedCountPackets;
- UINT uiSentBytes;
- UINT uiSentPackets;
- UINT uiCurrentDrainRate;
- UINT uiThisPeriodSentBytes;
+ unsigned int uiMaxBucketSize;//maximum size of the bucket for the queue
+ unsigned int uiCurrentQueueDepthOnTarget;
+ unsigned int uiCurrentBytesOnHost;
+ unsigned int uiCurrentPacketsOnHost;
+ unsigned int uiDroppedCountBytes;
+ unsigned int uiDroppedCountPackets;
+ unsigned int uiSentBytes;
+ unsigned int uiSentPackets;
+ unsigned int uiCurrentDrainRate;
+ unsigned int uiThisPeriodSentBytes;
LARGE_INTEGER liDrainCalculated;
- UINT uiCurrentTokenCount;
+ unsigned int uiCurrentTokenCount;
LARGE_INTEGER liLastUpdateTokenAt;
- UINT uiMaxAllowedRate;
- UINT NumOfPacketsSent;
+ unsigned int uiMaxAllowedRate;
+ unsigned int NumOfPacketsSent;
unsigned char ucDirection;
unsigned short usCID;
S_MIBS_EXTSERVICEFLOW_PARAMETERS stMibsExtServiceFlowTable;
- UINT uiCurrentRxRate;
- UINT uiThisPeriodRxBytes;
- UINT uiTotalRxBytes;
- UINT uiTotalTxBytes;
- UINT uiPendedLast;
+ unsigned int uiCurrentRxRate;
+ unsigned int uiThisPeriodRxBytes;
+ unsigned int uiTotalRxBytes;
+ unsigned int uiTotalTxBytes;
+ unsigned int uiPendedLast;
unsigned char ucIpVersion;
union {
@@ -238,7 +238,7 @@ struct _packet_info {
void *pstSFIndication;
struct timeval stLastUpdateTokenAt;
atomic_t uiPerSFTxResourceCount;
- UINT uiMaxLatency;
+ unsigned int uiMaxLatency;
unsigned char bIPCSSupport;
unsigned char bEthCSSupport;
};
@@ -347,9 +347,9 @@ typedef struct _STTARGETDSXBUFFER {
BOOLEAN valid;
}STTARGETDSXBUFFER, *PSTTARGETDSXBUFFER;
-typedef int (*FP_FLASH_WRITE)(struct _MINI_ADAPTER*, UINT, void *);
+typedef int (*FP_FLASH_WRITE)(struct _MINI_ADAPTER*, unsigned int, void *);
-typedef int (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER*, UINT, void *);
+typedef int (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER*, unsigned int, void *);
/**
Driver adapter data structure
@@ -389,7 +389,7 @@ struct _MINI_ADAPTER {
// to keep track the no of byte received
unsigned short PrevNumRecvDescs;
unsigned short CurrNumRecvDescs;
- UINT u32TotalDSD;
+ unsigned int u32TotalDSD;
PacketInfo PackInfo[NO_OF_QUEUES];
S_CLASSIFIER_RULE astClassifierTable[MAX_CLASSIFIERS];
BOOLEAN TransferMode;
@@ -415,7 +415,7 @@ struct _MINI_ADAPTER {
atomic_t index_app_read_cntrlpkt;
atomic_t index_wr_txcntrlpkt;
atomic_t index_rd_txcntrlpkt;
- UINT index_datpkt;
+ unsigned int index_datpkt;
struct semaphore rdmwrmsync;
STTARGETDSXBUFFER astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS];
@@ -464,14 +464,14 @@ struct _MINI_ADAPTER {
struct file *,
unsigned int);
int (*interface_rdm)(void *,
- UINT ,
+ unsigned int ,
void *,
int);
int (*interface_wrm)(void *,
- UINT ,
+ unsigned int ,
void *,
int);
- int (*interface_transmit)(void *, void *, UINT);
+ int (*interface_transmit)(void *, void *, unsigned int);
BOOLEAN IdleMode;
BOOLEAN bDregRequestSentInIdleMode;
BOOLEAN bTriedToWakeUpFromlowPowerMode;
@@ -495,15 +495,15 @@ struct _MINI_ADAPTER {
atomic_t uiMBupdate;
UINT32 PmuMode;
NVM_TYPE eNVMType;
- UINT uiSectorSize;
- UINT uiSectorSizeInCFG;
+ unsigned int uiSectorSize;
+ unsigned int uiSectorSizeInCFG;
BOOLEAN bSectorSizeOverride;
BOOLEAN bStatusWrite;
- UINT uiNVMDSDSize;
- UINT uiVendorExtnFlag;
+ unsigned int uiNVMDSDSize;
+ unsigned int uiVendorExtnFlag;
//it will always represent chosen DSD at any point of time.
// Generally it is Active DSD but in case of NVM RD/WR it might be different.
- UINT ulFlashCalStart;
+ unsigned int ulFlashCalStart;
ULONG ulFlashControlSectionStart;
ULONG ulFlashWriteSize;
ULONG ulFlashID;
@@ -519,13 +519,13 @@ struct _MINI_ADAPTER {
PFLASH2X_CS_INFO psFlash2xCSInfo;
PFLASH_CS_INFO psFlashCSInfo ;
PFLASH2X_VENDORSPECIFIC_INFO psFlash2xVendorInfo;
- UINT uiFlashBaseAdd; //Flash start address
- UINT uiActiveISOOffset; //Active ISO offset chosen before f/w download
+ unsigned int uiFlashBaseAdd; //Flash start address
+ unsigned int uiActiveISOOffset; //Active ISO offset chosen before f/w download
FLASH2X_SECTION_VAL eActiveISO; //Active ISO section val
FLASH2X_SECTION_VAL eActiveDSD; //Active DSD val chosen before f/w download
- UINT uiActiveDSDOffsetAtFwDld; //For accessing Active DSD chosen before f/w download
- UINT uiFlashLayoutMajorVersion ;
- UINT uiFlashLayoutMinorVersion;
+ unsigned int uiActiveDSDOffsetAtFwDld; //For accessing Active DSD chosen before f/w download
+ unsigned int uiFlashLayoutMajorVersion ;
+ unsigned int uiFlashLayoutMinorVersion;
BOOLEAN bAllDSDWriteAllow ;
BOOLEAN bSigCorrupted ;
//this should be set who so ever want to change the Headers. after Wrtie it should be reset immediately.
@@ -536,12 +536,12 @@ struct _MINI_ADAPTER {
BOOLEAN bFlashRawRead;
BOOLEAN bPreparingForLowPowerMode ;
BOOLEAN bDoSuspend ;
- UINT syscfgBefFwDld ;
+ unsigned int syscfgBefFwDld ;
BOOLEAN StopAllXaction ;
UINT32 liTimeSinceLastNetEntry; //Used to Support extended CAPI requirements from
struct semaphore LowPowerModeSync;
ULONG liDrainCalculated;
- UINT gpioBitMap;
+ unsigned int gpioBitMap;
S_BCM_DEBUG_STATE stDebugState;
@@ -573,8 +573,8 @@ typedef struct _cntl_pkt {
typedef LINK_REQUEST CONTROL_MESSAGE;
typedef struct _DDR_SETTING {
- UINT ulRegAddress;
- UINT ulRegValue;
+ unsigned int ulRegAddress;
+ unsigned int ulRegValue;
}DDR_SETTING, *PDDR_SETTING;
typedef DDR_SETTING DDR_SET_NODE, *PDDR_SET_NODE;
int
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index d5d3da1..dfc0cbe 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -149,7 +149,7 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size,
return PktLen;
}
-static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
+static long bcm_char_ioctl(struct file *filp, unsigned int cmd, ULONG arg)
{
PPER_TARANG_DATA pTarang = filp->private_data;
void __user *argp = (void __user *)arg;
@@ -203,7 +203,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
case IOCTL_BCM_REGISTER_READ_PRIVATE: {
RDM_BUFFER sRdmBuffer = {0};
char *temp_buff;
- UINT Bufflen;
+ unsigned int Bufflen;
u16 temp_value;
/* Copy Ioctl Buffer structure */
@@ -229,7 +229,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
if (!temp_buff)
return -ENOMEM;
- bytes = rdmalt(Adapter, (UINT)sRdmBuffer.Register,
+ bytes = rdmalt(Adapter, (unsigned int)sRdmBuffer.Register,
(PUINT)temp_buff, Bufflen);
if (bytes > 0) {
Status = STATUS_SUCCESS;
@@ -247,7 +247,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
case IOCTL_BCM_REGISTER_WRITE_PRIVATE: {
WRM_BUFFER sWrmBuffer = {0};
- UINT uiTempVar = 0;
+ unsigned int uiTempVar = 0;
/* Copy Ioctl Buffer structure */
if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
@@ -271,7 +271,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
return -EFAULT;
}
- Status = wrmalt(Adapter, (UINT)sWrmBuffer.Register,
+ Status = wrmalt(Adapter, (unsigned int)sWrmBuffer.Register,
(PUINT)sWrmBuffer.Data, sizeof(ULONG));
if (Status == STATUS_SUCCESS) {
@@ -287,7 +287,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
case IOCTL_BCM_EEPROM_REGISTER_READ: {
RDM_BUFFER sRdmBuffer = {0};
char *temp_buff = NULL;
- UINT uiTempVar = 0;
+ unsigned int uiTempVar = 0;
if ((Adapter->IdleMode == TRUE) ||
(Adapter->bShutStatus == TRUE) ||
(Adapter->bPreparingForLowPowerMode == TRUE)) {
@@ -326,7 +326,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}
uiTempVar = sRdmBuffer.Register & EEPROM_REJECT_MASK;
- bytes = rdmaltWithLock(Adapter, (UINT)sRdmBuffer.Register, (PUINT)temp_buff, IoBuffer.OutputLength);
+ bytes = rdmaltWithLock(Adapter, (unsigned int)sRdmBuffer.Register, (PUINT)temp_buff, IoBuffer.OutputLength);
if (bytes > 0) {
Status = STATUS_SUCCESS;
@@ -344,7 +344,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
case IOCTL_BCM_REGISTER_WRITE:
case IOCTL_BCM_EEPROM_REGISTER_WRITE: {
WRM_BUFFER sWrmBuffer = {0};
- UINT uiTempVar = 0;
+ unsigned int uiTempVar = 0;
if ((Adapter->IdleMode == TRUE) ||
(Adapter->bShutStatus == TRUE) ||
(Adapter->bPreparingForLowPowerMode == TRUE)) {
@@ -384,7 +384,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
return -EFAULT;
}
- Status = wrmaltWithLock(Adapter, (UINT)sWrmBuffer.Register,
+ Status = wrmaltWithLock(Adapter, (unsigned int)sWrmBuffer.Register,
(PUINT)sWrmBuffer.Data, sWrmBuffer.Length);
if (Status == STATUS_SUCCESS) {
@@ -397,9 +397,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}
case IOCTL_BCM_GPIO_SET_REQUEST: {
unsigned char ucResetValue[4];
- UINT value = 0;
- UINT uiBit = 0;
- UINT uiOperation = 0;
+ unsigned int value = 0;
+ unsigned int uiBit = 0;
+ unsigned int uiOperation = 0;
GPIO_INFO gpio_info = {0};
if ((Adapter->IdleMode == TRUE) ||
@@ -435,7 +435,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
/* Set - setting 1 */
if (uiOperation) {
/* Set the gpio output register */
- Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG, (PUINT)(&value), sizeof(UINT));
+ Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG, (PUINT)(&value), sizeof(unsigned int));
if (Status == STATUS_SUCCESS) {
bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
@@ -447,7 +447,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}
} else {
/* Set the gpio output register */
- Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG, (PUINT)(&value), sizeof(UINT));
+ Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG, (PUINT)(&value), sizeof(unsigned int));
if (Status == STATUS_SUCCESS) {
bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
@@ -460,7 +460,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}
}
- bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
+ bytes = rdmaltWithLock(Adapter, (unsigned int)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(unsigned int));
if (bytes < 0) {
Status = bytes;
bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
@@ -471,9 +471,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}
/* Set the gpio mode register to output */
- *(UINT *)ucResetValue |= (1<<uiBit);
+ *(unsigned int *)ucResetValue |= (1<<uiBit);
Status = wrmaltWithLock(Adapter, GPIO_MODE_REGISTER,
- (PUINT)ucResetValue, sizeof(UINT));
+ (PUINT)ucResetValue, sizeof(unsigned int));
if (Status == STATUS_SUCCESS) {
bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
@@ -550,8 +550,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
uiBit = gpio_info.uiGpioNumber;
/* Set the gpio output register */
- bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER,
- (PUINT)ucRead, sizeof(UINT));
+ bytes = rdmaltWithLock(Adapter, (unsigned int)GPIO_PIN_STATE_REGISTER,
+ (PUINT)ucRead, sizeof(unsigned int));
if (bytes < 0) {
Status = bytes;
@@ -597,11 +597,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
if ((pgpio_multi_info[WIMAX_IDX].uiGPIOMask) &
(pgpio_multi_info[WIMAX_IDX].uiGPIOCommand)) {
/* Set 1's in GPIO OUTPUT REGISTER */
- *(UINT *)ucResetValue = pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
+ *(unsigned int *)ucResetValue = pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
pgpio_multi_info[WIMAX_IDX].uiGPIOCommand &
pgpio_multi_info[WIMAX_IDX].uiGPIOValue;
- if (*(UINT *) ucResetValue)
+ if (*(unsigned int *)ucResetValue)
Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG,
(PUINT)ucResetValue, sizeof(ULONG));
@@ -611,11 +611,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}
/* Clear to 0's in GPIO OUTPUT REGISTER */
- *(UINT *)ucResetValue = (pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
+ *(unsigned int *)ucResetValue = (pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
pgpio_multi_info[WIMAX_IDX].uiGPIOCommand &
(~(pgpio_multi_info[WIMAX_IDX].uiGPIOValue)));
- if (*(UINT *) ucResetValue)
+ if (*(unsigned int *)ucResetValue)
Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG, (PUINT)ucResetValue, sizeof(ULONG));
if (Status != STATUS_SUCCESS) {
@@ -625,7 +625,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}
if (pgpio_multi_info[WIMAX_IDX].uiGPIOMask) {
- bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
+ bytes = rdmaltWithLock(Adapter, (unsigned int)GPIO_PIN_STATE_REGISTER, (PUINT)ucResetValue, sizeof(unsigned int));
if (bytes < 0) {
Status = bytes;
@@ -635,7 +635,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
Status = STATUS_SUCCESS;
}
- pgpio_multi_info[WIMAX_IDX].uiGPIOValue = (*(UINT *)ucResetValue &
+ pgpio_multi_info[WIMAX_IDX].uiGPIOValue = (*(unsigned int *)ucResetValue &
pgpio_multi_info[WIMAX_IDX].uiGPIOMask);
}
@@ -667,7 +667,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
if (copy_from_user(&gpio_multi_mode, IoBuffer.InputBuffer, IoBuffer.InputLength))
return -EFAULT;
- bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
+ bytes = rdmaltWithLock(Adapter, (unsigned int)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(unsigned int));
if (bytes < 0) {
Status = bytes;
@@ -689,17 +689,17 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
if (pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) {
/* write all OUT's (1's) */
- *(UINT *) ucResetValue |= (pgpio_multi_mode[WIMAX_IDX].uiGPIOMode &
+ *(unsigned int *)ucResetValue |= (pgpio_multi_mode[WIMAX_IDX].uiGPIOMode &
pgpio_multi_mode[WIMAX_IDX].uiGPIOMask);
/* write all IN's (0's) */
- *(UINT *) ucResetValue &= ~((~pgpio_multi_mode[WIMAX_IDX].uiGPIOMode) &
+ *(unsigned int *)ucResetValue &= ~((~pgpio_multi_mode[WIMAX_IDX].uiGPIOMode) &
pgpio_multi_mode[WIMAX_IDX].uiGPIOMask);
/* Currently implemented return the modes of all GPIO's
* else needs to bit AND with mask
*/
- pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(UINT *)ucResetValue;
+ pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(unsigned int *)ucResetValue;
Status = wrmaltWithLock(Adapter, GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(ULONG));
if (Status == STATUS_SUCCESS) {
@@ -712,7 +712,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}
} else {
/* if uiGPIOMask is 0 then return mode register configuration */
- pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(UINT *)ucResetValue;
+ pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(unsigned int *)ucResetValue;
}
Status = copy_to_user(IoBuffer.OutputBuffer, &gpio_multi_mode, IoBuffer.OutputLength);
@@ -994,8 +994,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
break;
case IOCTL_BCM_SWITCH_TRANSFER_MODE: {
- UINT uiData = 0;
- if (copy_from_user(&uiData, argp, sizeof(UINT)))
+ unsigned int uiData = 0;
+ if (copy_from_user(&uiData, argp, sizeof(unsigned int)))
return -EFAULT;
if (uiData) {
@@ -1056,13 +1056,13 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}
case IOCTL_BCM_SET_MAC_TRACING: {
- UINT tracing_flag;
+ unsigned int tracing_flag;
/* copy ioctl Buffer structure */
if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
return -EFAULT;
- if (copy_from_user(&tracing_flag, IoBuffer.InputBuffer, sizeof(UINT)))
+ if (copy_from_user(&tracing_flag, IoBuffer.InputBuffer, sizeof(unsigned int)))
return -EFAULT;
if (tracing_flag)
@@ -1137,7 +1137,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
case IOCTL_BCM_BULK_WRM: {
PBULKWRM_BUFFER pBulkBuffer;
- UINT uiTempVar = 0;
+ unsigned int uiTempVar = 0;
char *pvBuffer = NULL;
if ((Adapter->IdleMode == TRUE) ||
@@ -1192,9 +1192,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}
if (pBulkBuffer->SwapEndian == FALSE)
- Status = wrmWithLock(Adapter, (UINT)pBulkBuffer->Register, (char *)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));
+ Status = wrmWithLock(Adapter, (unsigned int)pBulkBuffer->Register, (char *)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));
else
- Status = wrmaltWithLock(Adapter, (UINT)pBulkBuffer->Register, (PUINT)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));
+ Status = wrmaltWithLock(Adapter, (unsigned int)pBulkBuffer->Register, (PUINT)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));
if (Status != STATUS_SUCCESS)
pr_info("WRM Failed\n");
@@ -1208,7 +1208,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
return -EFAULT;
if (Adapter->eNVMType == NVM_EEPROM || Adapter->eNVMType == NVM_FLASH) {
- if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiNVMDSDSize, sizeof(UINT)))
+ if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiNVMDSDSize, sizeof(unsigned int)))
return -EFAULT;
}
@@ -1216,21 +1216,21 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
break;
case IOCTL_BCM_CAL_INIT: {
- UINT uiSectorSize = 0 ;
+ unsigned int uiSectorSize = 0;
if (Adapter->eNVMType == NVM_FLASH) {
if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
return -EFAULT;
- if (copy_from_user(&uiSectorSize, IoBuffer.InputBuffer, sizeof(UINT)))
+ if (copy_from_user(&uiSectorSize, IoBuffer.InputBuffer, sizeof(unsigned int)))
return -EFAULT;
if ((uiSectorSize < MIN_SECTOR_SIZE) || (uiSectorSize > MAX_SECTOR_SIZE)) {
if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiSectorSize,
- sizeof(UINT)))
+ sizeof(unsigned int)))
return -EFAULT;
} else {
if (IsFlash2x(Adapter)) {
- if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiSectorSize, sizeof(UINT)))
+ if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiSectorSize, sizeof(unsigned int)))
return -EFAULT;
} else {
if ((TRUE == Adapter->bShutStatus) || (TRUE == Adapter->IdleMode)) {
@@ -1444,10 +1444,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
case IOCTL_BCM_FLASH2X_SECTION_READ: {
FLASH2X_READWRITE sFlash2xRead = {0};
unsigned char *pReadBuff = NULL;
- UINT NOB = 0;
- UINT BuffSize = 0;
- UINT ReadBytes = 0;
- UINT ReadOffset = 0;
+ unsigned int NOB = 0;
+ unsigned int BuffSize = 0;
+ unsigned int ReadBytes = 0;
+ unsigned int ReadOffset = 0;
void __user *OutPutBuff;
if (IsFlash2x(Adapter) != TRUE) {
@@ -1547,10 +1547,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
FLASH2X_READWRITE sFlash2xWrite = {0};
unsigned char *pWriteBuff;
void __user *InputAddr;
- UINT NOB = 0;
- UINT BuffSize = 0;
- UINT WriteOffset = 0;
- UINT WriteBytes = 0;
+ unsigned int NOB = 0;
+ unsigned int BuffSize = 0;
+ unsigned int WriteOffset = 0;
+ unsigned int WriteBytes = 0;
if (IsFlash2x(Adapter) != TRUE) {
pr_info("Flash Does not have 2.x map\n");
@@ -1875,7 +1875,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
break;
case IOCTL_BCM_SELECT_DSD: {
- UINT SectOfset = 0;
+ unsigned int SectOfset = 0;
FLASH2X_SECTION_VAL eFlash2xSectionVal;
eFlash2xSectionVal = NO_SECTION_VAL;
bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
@@ -1927,7 +1927,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
int NOB;
int BuffSize;
int ReadOffset = 0;
- UINT ReadBytes = 0 ;
+ unsigned int ReadBytes = 0;
unsigned char *pReadBuff;
void __user *OutPutBuff;
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index a37ef33..d65f3a0 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -30,7 +30,7 @@ static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid);
* Returns - Queue index for this SFID(If matched)
Else Invalid Queue Index(If Not matched)
************************************************************/
-int SearchSfid(PMINI_ADAPTER Adapter, UINT uiSfid)
+int SearchSfid(PMINI_ADAPTER Adapter, unsigned int uiSfid)
{
int iIndex = 0;
for (iIndex = (NO_OF_QUEUES - 1); iIndex >= 0; iIndex--)
@@ -51,7 +51,7 @@ int SearchSfid(PMINI_ADAPTER Adapter, UINT uiSfid)
****************************************************************/
static int SearchFreeSfid(PMINI_ADAPTER Adapter)
{
- UINT uiIndex=0;
+ unsigned int uiIndex = 0;
for (uiIndex = 0; uiIndex < (NO_OF_QUEUES - 1); uiIndex++)
if (Adapter->PackInfo[uiIndex].ulSFID==0)
@@ -96,7 +96,7 @@ static int SearchFreeClsid(PMINI_ADAPTER Adapter /**Adapter Context*/
return MAX_CLASSIFIERS+1;
}
-static void deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
+static void deleteSFBySfid(PMINI_ADAPTER Adapter, unsigned int uiSearchRuleIndex)
{
//deleting all the packet held in the SF
flush_queue(Adapter, uiSearchRuleIndex);
@@ -113,8 +113,8 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
B_UINT8 u8IpAddressLen , B_UINT8 *pu8IpAddressMaskSrc ,
BOOLEAN bIpVersion6 , E_IPADDR_CONTEXT eIpAddrContext)
{
- UINT ucLoopIndex=0;
- UINT nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS;
+ unsigned int ucLoopIndex = 0;
+ unsigned int nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS;
unsigned char *ptrClassifierIpAddress = NULL;
unsigned char *ptrClassifierIpMask = NULL;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -259,11 +259,11 @@ void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN bFreeAll)
@ingroup ctrl_pkt_functions
copy classifier rule into the specified SF index
*/
-static inline void CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSLTypes *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)
+static inline void CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSLTypes *psfCSType, unsigned int uiSearchRuleIndex, unsigned int nClassifierIndex)
{
S_CLASSIFIER_RULE *pstClassifierEntry = NULL;
//void *pvPhsContext = NULL;
- UINT ucLoopIndex=0;
+ unsigned int ucLoopIndex = 0;
//unsigned char ucProtocolLength=0;
//ULONG ulPhsStatus;
@@ -420,7 +420,7 @@ static inline void CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSL
/**
@ingroup ctrl_pkt_functions
*/
-static inline void DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex, UINT nClassifierIndex)
+static inline void DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, unsigned int uiSearchRuleIndex, unsigned int nClassifierIndex)
{
S_CLASSIFIER_RULE *pstClassifierEntry = NULL;
B_UINT16 u16PacketClassificationRuleIndex;
@@ -456,10 +456,10 @@ static inline void DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSear
/**
@ingroup ctrl_pkt_functions
*/
-void DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
+void DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, unsigned int uiSearchRuleIndex)
{
S_CLASSIFIER_RULE *pstClassifierEntry = NULL;
- UINT nClassifierIndex;
+ unsigned int nClassifierIndex;
//B_UINT16 u16PacketClassificationRuleIndex;
unsigned short ulVCID;
//void *pvPhsContext = NULL;
@@ -496,20 +496,20 @@ void DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
static void CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the Adapter structure*/
register pstServiceFlowParamSI psfLocalSet, /**<Pointer to the ServiceFlowParamSI structure*/
- register UINT uiSearchRuleIndex, /**<Index of Queue, to which this data belongs*/
+ register unsigned int uiSearchRuleIndex, /**<Index of Queue, to which this data belongs*/
register unsigned char ucDsxType,
stLocalSFAddIndicationAlt *pstAddIndication)
{
//unsigned char ucProtocolLength=0;
ULONG ulSFID;
- UINT nClassifierIndex = 0;
+ unsigned int nClassifierIndex = 0;
E_CLASSIFIER_ACTION eClassifierAction = eInvalidClassifierAction;
B_UINT16 u16PacketClassificationRuleIndex=0;
- UINT nIndex=0;
+ unsigned int nIndex = 0;
stConvergenceSLTypes *psfCSType = NULL;
S_PHS_RULE sPhsRule;
unsigned short uVCID = Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
- UINT UGIValue = 0;
+ unsigned int UGIValue = 0;
Adapter->PackInfo[uiSearchRuleIndex].bValid=TRUE;
@@ -888,7 +888,7 @@ static void CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the A
(DEFAULT_UGI_FACTOR*Adapter->PackInfo[uiSearchRuleIndex].uiMaxAllowedRate*UGIValue)/1000;
if (Adapter->PackInfo[uiSearchRuleIndex].uiMaxBucketSize < WIMAX_MAX_MTU*8) {
- UINT UGIFactor = 0;
+ unsigned int UGIFactor = 0;
/* Special Handling to ensure the biggest size of packet can go out from host to FW as follows:
1. Any packet from Host to FW can go out in different packet size.
2. So in case the Bucket count is smaller than MTU, the packets of size (Size > TokenCount), will get dropped.
@@ -950,10 +950,10 @@ static void CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the A
*************************************************************************/
static void DumpCmControlPacket(void *pvBuffer)
{
- UINT uiLoopIndex;
- UINT nIndex;
+ unsigned int uiLoopIndex;
+ unsigned int nIndex;
stLocalSFAddIndicationAlt *pstAddIndication;
- UINT nCurClassifierCnt;
+ unsigned int nCurClassifierCnt;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
pstAddIndication = (stLocalSFAddIndicationAlt *)pvBuffer;
@@ -1775,7 +1775,7 @@ static void DumpCmControlPacket(void *pvBuffer)
static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG ulAddrSFParamSet, unsigned char *pucDestBuffer)
{
- UINT nBytesToRead = sizeof(stServiceFlowParamSI);
+ unsigned int nBytesToRead = sizeof(stServiceFlowParamSI);
if (ulAddrSFParamSet == 0 || NULL == pucDestBuffer) {
bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
@@ -1794,7 +1794,7 @@ static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG ulAddrSFParamSet
static ULONG StoreSFParam(PMINI_ADAPTER Adapter, unsigned char *pucSrcBuffer, ULONG ulAddrSFParamSet)
{
- UINT nBytesToWrite = sizeof(stServiceFlowParamSI);
+ unsigned int nBytesToWrite = sizeof(stServiceFlowParamSI);
int ret = 0;
if (ulAddrSFParamSet == 0 || NULL == pucSrcBuffer) {
@@ -1810,12 +1810,12 @@ static ULONG StoreSFParam(PMINI_ADAPTER Adapter, unsigned char *pucSrcBuffer, UL
return 1;
}
-ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffer, UINT *puBufferLength)
+ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffer, unsigned int *puBufferLength)
{
stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL;
stLocalSFAddIndication * pstAddIndication = NULL;
stLocalSFDeleteRequest *pstDeletionRequest;
- UINT uiSearchRuleIndex;
+ unsigned int uiSearchRuleIndex;
ULONG ulSFID;
pstAddIndicationAlt = (stLocalSFAddIndicationAlt *)(pvBuffer);
@@ -2040,7 +2040,7 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
DSX_MESSAGE_EXCHANGE_BUFFER);
Status = rdmalt(Adapter, DSX_MESSAGE_EXCHANGE_BUFFER,
- (PUINT)&ulTargetDsxBuffersBase, sizeof(UINT));
+ (PUINT)&ulTargetDsxBuffersBase, sizeof(unsigned int));
if (Status < 0) {
bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "RDM failed!!\n");
return 0;
@@ -2201,7 +2201,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
}//no break here..we should go down.
case DSA_ACK: {
- UINT uiSearchRuleIndex=0;
+ unsigned int uiSearchRuleIndex = 0;
bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "VCID:0x%X\n",
ntohs(pstAddIndication->u16VCID));
@@ -2322,7 +2322,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK;
}
case DSC_ACK: {
- UINT uiSearchRuleIndex=0;
+ unsigned int uiSearchRuleIndex = 0;
pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication;
uiSearchRuleIndex=SearchSfid(Adapter, ntohl(pstChangeIndication->sfActiveSet.u32SFID));
@@ -2381,7 +2381,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
}
break;
case DSD_REQ: {
- UINT uiSearchRuleIndex;
+ unsigned int uiSearchRuleIndex;
ULONG ulSFID;
pLeader->PLength = sizeof(stLocalSFDeleteIndication);
@@ -2419,7 +2419,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
return TRUE;
}
-int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __user *user_buffer)
+int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, unsigned int uiSFId, void __user *user_buffer)
{
int status = 0;
struct _packet_info *psSfInfo=NULL;
@@ -2446,7 +2446,7 @@ void OverrideServiceFlowParams(PMINI_ADAPTER Adapter, PUINT puiBuffer)
{
B_UINT32 u32NumofSFsinMsg = ntohl(*(puiBuffer + 1));
stIM_SFHostNotify *pHostInfo = NULL;
- UINT uiSearchRuleIndex = 0;
+ unsigned int uiSearchRuleIndex = 0;
ULONG ulSFID = 0;
puiBuffer+=2;
diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 99a06ec..5043001 100644
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -148,7 +148,7 @@ typedef struct stLocalSFChangeIndicationAlt{
}stLocalSFChangeIndicationAlt;
-ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffer, UINT *puBufferLength);
+ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffer, unsigned int *puBufferLength);
int AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter);
diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c
index 1789d08..bdbbfe2 100644
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
@@ -776,9 +776,9 @@ int ddr_init(MINI_ADAPTER *Adapter)
{
PDDR_SETTING psDDRSetting=NULL;
ULONG RegCount=0;
- UINT value = 0;
- UINT uiResetValue = 0;
- UINT uiClockSetting = 0;
+ unsigned int value = 0;
+ unsigned int uiResetValue = 0;
+ unsigned int uiClockSetting = 0;
int retval = STATUS_SUCCESS;
switch (Adapter->chip_id) {
@@ -820,7 +820,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
if ( (Adapter->chip_id != BCS220_2) &&
(Adapter->chip_id != BCS220_2BC) &&
(Adapter->chip_id != BCS220_3) ) {
- retval= rdmalt(Adapter, (UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue));
+ retval= rdmalt(Adapter, (unsigned int)0x0f000830, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
@@ -828,7 +828,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
return retval;
}
uiResetValue |= 0x44;
- retval = wrmalt(Adapter, (UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue));
+ retval = wrmalt(Adapter, (unsigned int)0x0f000830, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, WRM, ALL,
"%s:%d WRM failed\n",
@@ -969,7 +969,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
(Adapter->chip_id != BCS220_3)) {
/* drive MDDR to half in case of UMA-B: */
uiResetValue = 0x01010001;
- retval = wrmalt(Adapter, (UINT)0x0F007018, &uiResetValue, sizeof(uiResetValue));
+ retval = wrmalt(Adapter, (unsigned int)0x0F007018, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
@@ -977,7 +977,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
return retval;
}
uiResetValue = 0x00040020;
- retval = wrmalt(Adapter, (UINT)0x0F007094, &uiResetValue, sizeof(uiResetValue));
+ retval = wrmalt(Adapter, (unsigned int)0x0F007094, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
@@ -985,7 +985,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
return retval;
}
uiResetValue = 0x01020101;
- retval = wrmalt(Adapter, (UINT)0x0F00701c, &uiResetValue, sizeof(uiResetValue));
+ retval = wrmalt(Adapter, (unsigned int)0x0F00701c, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
@@ -993,7 +993,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
return retval;
}
uiResetValue = 0x01010000;
- retval = wrmalt(Adapter, (UINT)0x0F007018, &uiResetValue, sizeof(uiResetValue));
+ retval = wrmalt(Adapter, (unsigned int)0x0F007018, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
@@ -1010,14 +1010,14 @@ int ddr_init(MINI_ADAPTER *Adapter)
* we will change this when we will have internal PMU.
*/
if (Adapter->PmuMode == HYBRID_MODE_7C) {
- retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
+ retval = rdmalt(Adapter, (unsigned int)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
__func__, __LINE__);
return retval;
}
- retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
+ retval = rdmalt(Adapter, (unsigned int)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
@@ -1025,20 +1025,20 @@ int ddr_init(MINI_ADAPTER *Adapter)
return retval;
}
uiResetValue = 0x1322a8;
- retval = wrmalt(Adapter, (UINT)0x0f000d1c, &uiResetValue, sizeof(uiResetValue));
+ retval = wrmalt(Adapter, (unsigned int)0x0f000d1c, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
__func__, __LINE__);
return retval;
}
- retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
+ retval = rdmalt(Adapter, (unsigned int)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
pr_info("%s:%d RDM failed\n",
__func__, __LINE__);
return retval;
}
- retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
+ retval = rdmalt(Adapter, (unsigned int)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
@@ -1046,7 +1046,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
return retval;
}
uiResetValue = 0x132296;
- retval = wrmalt(Adapter, (UINT)0x0f000d14, &uiResetValue, sizeof(uiResetValue));
+ retval = wrmalt(Adapter, (unsigned int)0x0f000d14, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
@@ -1055,14 +1055,14 @@ int ddr_init(MINI_ADAPTER *Adapter)
}
} else if (Adapter->PmuMode == HYBRID_MODE_6 ) {
- retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
+ retval = rdmalt(Adapter, (unsigned int)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
__func__, __LINE__);
return retval;
}
- retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
+ retval = rdmalt(Adapter, (unsigned int)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
@@ -1070,21 +1070,21 @@ int ddr_init(MINI_ADAPTER *Adapter)
return retval;
}
uiResetValue = 0x6003229a;
- retval = wrmalt(Adapter, (UINT)0x0f000d14, &uiResetValue, sizeof(uiResetValue));
+ retval = wrmalt(Adapter, (unsigned int)0x0f000d14, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
__func__, __LINE__);
return retval;
}
- retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
+ retval = rdmalt(Adapter, (unsigned int)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
__func__, __LINE__);
return retval;
}
- retval = rdmalt(Adapter, (UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
+ retval = rdmalt(Adapter, (unsigned int)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
@@ -1092,7 +1092,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
return retval;
}
uiResetValue = 0x1322a8;
- retval = wrmalt(Adapter, (UINT)0x0f000d1c, &uiResetValue, sizeof(uiResetValue));
+ retval = wrmalt(Adapter, (unsigned int)0x0f000d1c, &uiResetValue, sizeof(uiResetValue));
if (retval < 0) {
bcm_dbg(Adapter, CMHOST, RDM, ALL,
"%s:%d RDM failed\n",
@@ -1111,7 +1111,7 @@ int download_ddr_settings(PMINI_ADAPTER Adapter)
PDDR_SET_NODE psDDRSetting=NULL;
ULONG RegCount=0;
unsigned long ul_ddr_setting_load_addr = DDR_DUMP_INTERNAL_DEVICE_MEMORY;
- UINT value = 0;
+ unsigned int value = 0;
int retval = STATUS_SUCCESS;
BOOLEAN bOverrideSelfRefresh = FALSE;
diff --git a/drivers/staging/bcm/Debug.h b/drivers/staging/bcm/Debug.h
index ac539c6..63510bb 100644
--- a/drivers/staging/bcm/Debug.h
+++ b/drivers/staging/bcm/Debug.h
@@ -197,14 +197,14 @@ typedef struct {
//---Kernel-space mapping of Debug State
typedef struct _S_BCM_DEBUG_STATE {
- UINT type;
+ unsigned int type;
/* A bitmap of 32 bits for Subtype per Type.
* Valid indexes in 'subtype' array are *only* 1,2,4 and 8,
* corresponding to valid Type values. Hence we use the 'Type' field
* as the index value, ignoring the array entries 0,3,5,6,7 !
*/
- UINT subtype[(NUMTYPES*2)+1];
- UINT debug_level;
+ unsigned int subtype[(NUMTYPES * 2) + 1];
+ unsigned int debug_level;
} S_BCM_DEBUG_STATE;
/* Instantiated in the Adapter structure */
/* We'll reuse the debug level parameter to include a bit (the MSB) to indicate whether or not
diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index 127c5f2..9810c28 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -160,7 +160,7 @@ typedef struct _S_MIBS_SERVICEFLOW_TABLE {
//classification extension Rule
ULONG ulSFID;
unsigned short usVCID_Value;
- UINT uiThreshold;
+ unsigned int uiThreshold;
// This field determines the priority of the SF Queues
B_UINT8 u8TrafficPriority;
@@ -170,28 +170,28 @@ typedef struct _S_MIBS_SERVICEFLOW_TABLE {
//BE or rtPS
B_UINT8 u8QueueType;
//maximum size of the bucket for the queue
- UINT uiMaxBucketSize;
- UINT uiCurrentQueueDepthOnTarget;
- UINT uiCurrentBytesOnHost;
- UINT uiCurrentPacketsOnHost;
- UINT uiDroppedCountBytes;
- UINT uiDroppedCountPackets;
- UINT uiSentBytes;
- UINT uiSentPackets;
- UINT uiCurrentDrainRate;
- UINT uiThisPeriodSentBytes;
+ unsigned int uiMaxBucketSize;
+ unsigned int uiCurrentQueueDepthOnTarget;
+ unsigned int uiCurrentBytesOnHost;
+ unsigned int uiCurrentPacketsOnHost;
+ unsigned int uiDroppedCountBytes;
+ unsigned int uiDroppedCountPackets;
+ unsigned int uiSentBytes;
+ unsigned int uiSentPackets;
+ unsigned int uiCurrentDrainRate;
+ unsigned int uiThisPeriodSentBytes;
LARGE_INTEGER liDrainCalculated;
- UINT uiCurrentTokenCount;
+ unsigned int uiCurrentTokenCount;
LARGE_INTEGER liLastUpdateTokenAt;
- UINT uiMaxAllowedRate;
- UINT NumOfPacketsSent;
+ unsigned int uiMaxAllowedRate;
+ unsigned int NumOfPacketsSent;
unsigned char ucDirection;
unsigned short usCID;
S_MIBS_EXTSERVICEFLOW_PARAMETERS stMibsExtServiceFlowTable;
- UINT uiCurrentRxRate;
- UINT uiThisPeriodRxBytes;
- UINT uiTotalRxBytes;
- UINT uiTotalTxBytes;
+ unsigned int uiCurrentRxRate;
+ unsigned int uiThisPeriodRxBytes;
+ unsigned int uiTotalRxBytes;
+ unsigned int uiTotalTxBytes;
}S_MIBS_SERVICEFLOW_TABLE;
typedef struct _S_MIBS_DROPPED_APP_CNTRL_MESSAGES {
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index decd53d..3141b91 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -249,16 +249,16 @@ unsigned short IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver cont
static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule, IPV6Header *pstIpv6Header)
{
- UINT uiLoopIndex=0;
- UINT uiIpv6AddIndex=0;
- UINT uiIpv6AddrNoLongWords = 4;
+ unsigned int uiLoopIndex = 0;
+ unsigned int uiIpv6AddIndex = 0;
+ unsigned int uiIpv6AddrNoLongWords = 4;
ULONG aulSrcIP[4];
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
/*
//This is the no. of Src Addresses ie Range of IP Addresses contained
//in the classifier rule for which we need to match
*/
- UINT uiCountIPSrcAddresses = (UINT)pstClassifierRule->ucIPSourceAddressLength;
+ unsigned int uiCountIPSrcAddresses = (unsigned int)pstClassifierRule->ucIPSourceAddressLength;
if (0 == uiCountIPSrcAddresses)
@@ -301,16 +301,16 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule, IPV6Hea
static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule, IPV6Header *pstIpv6Header)
{
- UINT uiLoopIndex=0;
- UINT uiIpv6AddIndex=0;
- UINT uiIpv6AddrNoLongWords = 4;
+ unsigned int uiLoopIndex = 0;
+ unsigned int uiIpv6AddIndex = 0;
+ unsigned int uiIpv6AddrNoLongWords = 4;
ULONG aulDestIP[4];
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
/*
//This is the no. of Destination Addresses ie Range of IP Addresses contained
//in the classifier rule for which we need to match
*/
- UINT uiCountIPDestinationAddresses = (UINT)pstClassifierRule->ucIPDestinationAddressLength;
+ unsigned int uiCountIPDestinationAddresses = (unsigned int)pstClassifierRule->ucIPDestinationAddressLength;
if (0 == uiCountIPDestinationAddresses)
@@ -354,8 +354,8 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule, IPV6He
void DumpIpv6Address(ULONG *puIpv6Address)
{
- UINT uiIpv6AddrNoLongWords = 4;
- UINT uiIpv6AddIndex=0;
+ unsigned int uiIpv6AddrNoLongWords = 4;
+ unsigned int uiIpv6AddIndex = 0;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) {
bcm_dbg(Adapter, TX, IPV6_DBG, ALL, ":%lx\n",
diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h
index cc1d0c0..c411b1b 100644
--- a/drivers/staging/bcm/InterfaceAdapter.h
+++ b/drivers/staging/bcm/InterfaceAdapter.h
@@ -5,7 +5,7 @@ typedef struct _BULK_ENDP_IN {
char *bulk_in_buffer;
size_t bulk_in_size;
unsigned char bulk_in_endpointAddr;
- UINT bulk_in_pipe;
+ unsigned int bulk_in_pipe;
}BULK_ENDP_IN, *PBULK_ENDP_IN;
@@ -13,7 +13,7 @@ typedef struct _BULK_ENDP_OUT {
unsigned char bulk_out_buffer;
size_t bulk_out_size;
unsigned char bulk_out_endpointAddr;
- UINT bulk_out_pipe;
+ unsigned int bulk_out_pipe;
//this is used when int out endpoint is used as bulk out end point
unsigned char int_out_interval;
}BULK_ENDP_OUT, *PBULK_ENDP_OUT;
@@ -23,7 +23,7 @@ typedef struct _INTR_ENDP_IN {
size_t int_in_size;
unsigned char int_in_endpointAddr;
unsigned char int_in_interval;
- UINT int_in_pipe;
+ unsigned int int_in_pipe;
}INTR_ENDP_IN, *PINTR_ENDP_IN;
typedef struct _INTR_ENDP_OUT {
@@ -31,7 +31,7 @@ typedef struct _INTR_ENDP_OUT {
size_t int_out_size;
unsigned char int_out_endpointAddr;
unsigned char int_out_interval;
- UINT int_out_pipe;
+ unsigned int int_out_pipe;
}INTR_ENDP_OUT, *PINTR_ENDP_OUT;
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index f23bc0f..b9c9617 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -307,7 +307,7 @@ error:
return retval;
}
-static int buffDnld(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, UINT u32FirmwareLength, ULONG u32StartingAddress)
+static int buffDnld(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength, ULONG u32StartingAddress)
{
unsigned int len = 0;
int retval = STATUS_SUCCESS;
@@ -329,9 +329,9 @@ static int buffDnld(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, UINT u32
return retval;
}
-static int buffRdbkVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, UINT u32FirmwareLength, ULONG u32StartingAddress)
+static int buffRdbkVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength, ULONG u32StartingAddress)
{
- UINT len = u32FirmwareLength;
+ unsigned int len = u32FirmwareLength;
int retval = STATUS_SUCCESS;
unsigned char *readbackbuff = kzalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
int bytes;
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c
index 2964522..02c6ebf 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -213,7 +213,7 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
timeout= jiffies + msecs_to_jiffies(50) ;
while ( timeout > jiffies ) {
itr++ ;
- rdmalt(Adapter, CHIP_ID_REG, &chip_id, sizeof(UINT));
+ rdmalt(Adapter, CHIP_ID_REG, &chip_id, sizeof(unsigned int));
if (0xbece3200==(chip_id&~(0xF0))) {
chip_id = chip_id&~(0xF0);
}
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index c63701e..60b4e48 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -310,7 +310,7 @@ static int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter)
static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter)
{
int value = 0;
- UINT status = STATUS_SUCCESS;
+ unsigned int status = STATUS_SUCCESS;
status = InitCardAndDownloadFirmware(psIntfAdapter->psAdapter);
if (status != STATUS_SUCCESS) {
@@ -426,7 +426,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
int retval = 0;
int usedIntOutForBulkTransfer = 0 ;
BOOLEAN bBcm16 = FALSE;
- UINT uiData = 0;
+ unsigned int uiData = 0;
int bytes;
/* Store the usb dev into interface adapter */
@@ -498,7 +498,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
}
if ((psIntfAdapter->bHighSpeedDevice == FALSE) && bcm_usb_endpoint_is_bulk_out(endpoint)) {
/* Once BULK is selected in FS mode. Revert it back to int. Else USB_IF will fail. */
- UINT _uiData = ntohl(EP2_CFG_INT);
+ unsigned int _uiData = ntohl(EP2_CFG_INT);
bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
"Reverting Bulk to int as it is in Full Speed mode.\n");
BeceemEEPROMBulkWrite(psIntfAdapter->psAdapter, (unsigned char *)&_uiData, 0x136, 4, TRUE);
diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c
index 1bfd597..38c8f9d 100644
--- a/drivers/staging/bcm/InterfaceMisc.c
+++ b/drivers/staging/bcm/InterfaceMisc.c
@@ -1,7 +1,7 @@
#include "headers.h"
int InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
- UINT addr,
+ unsigned int addr,
void *buff,
int len)
{
@@ -63,7 +63,7 @@ int InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
}
int InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
- UINT addr,
+ unsigned int addr,
void *buff,
int len)
{
@@ -128,7 +128,7 @@ int InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
}
int BcmRDM(void *arg,
- UINT addr,
+ unsigned int addr,
void *buff,
int len)
{
@@ -136,7 +136,7 @@ int BcmRDM(void *arg,
}
int BcmWRM(void *arg,
- UINT addr,
+ unsigned int addr,
void *buff,
int len)
{
@@ -191,7 +191,7 @@ int Bcm_clear_halt_of_endpoints(PMINI_ADAPTER Adapter)
void Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
{
struct urb *tempUrb = NULL;
- UINT i;
+ unsigned int i;
/*
* usb_kill_urb - cancel a transfer request and wait for it to finish
diff --git a/drivers/staging/bcm/InterfaceMisc.h b/drivers/staging/bcm/InterfaceMisc.h
index 29ae8c3..8ff1950 100644
--- a/drivers/staging/bcm/InterfaceMisc.h
+++ b/drivers/staging/bcm/InterfaceMisc.h
@@ -3,13 +3,13 @@
int
InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
- UINT addr,
+ unsigned int addr,
void *buff,
int len);
int
InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
- UINT addr,
+ unsigned int addr,
void *buff,
int len);
@@ -24,12 +24,12 @@ int InterfaceFileReadbackFromChip( void *psIntfAdapter,
int BcmRDM(void *arg,
- UINT addr,
+ unsigned int addr,
void *buff,
int len);
int BcmWRM(void *arg,
- UINT addr,
+ unsigned int addr,
void *buff,
int len);
diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 336ca4a..3bc25a2 100644
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -16,7 +16,7 @@ static PUSB_RCB
GetBulkInRcb(PS_INTERFACE_ADAPTER psIntfAdapter)
{
PUSB_RCB pRcb = NULL;
- UINT index = 0;
+ unsigned int index = 0;
if ((atomic_read(&psIntfAdapter->uNumRcbUsed) < MAXIMUM_USB_RCB) &&
(psIntfAdapter->psAdapter->StopAllXaction == FALSE)) {
@@ -40,7 +40,7 @@ static void read_bulk_callback(struct urb *urb)
struct sk_buff *skb = NULL;
BOOLEAN bHeaderSupressionEnabled = FALSE;
int QueueIndex = NO_OF_QUEUES + 1;
- UINT uiIndex=0;
+ unsigned int uiIndex=0;
int process_done = 1;
//int idleflag = 0 ;
PUSB_RCB pRcb = (PUSB_RCB)urb->context;
diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index b1f5f70..715f365 100644
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -105,7 +105,7 @@ err_exit :
static PUSB_TCB GetBulkOutTcb(PS_INTERFACE_ADAPTER psIntfAdapter)
{
PUSB_TCB pTcb = NULL;
- UINT index = 0;
+ unsigned int index = 0;
if ((atomic_read(&psIntfAdapter->uNumTcbUsed) < MAXIMUM_USB_TCB) &&
(psIntfAdapter->psAdapter->StopAllXaction ==FALSE)) {
@@ -171,7 +171,7 @@ static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, void *
return retval;
}
-int InterfaceTransmitPacket(void *arg, void *data, UINT len)
+int InterfaceTransmitPacket(void *arg, void *data, unsigned int len)
{
PUSB_TCB pTcb= NULL;
diff --git a/drivers/staging/bcm/InterfaceTx.h b/drivers/staging/bcm/InterfaceTx.h
index 8a6b4f1..1b6b5ab 100644
--- a/drivers/staging/bcm/InterfaceTx.h
+++ b/drivers/staging/bcm/InterfaceTx.h
@@ -1,6 +1,6 @@
#ifndef _INTERFACE_TX_H
#define _INTERFACE_TX_H
-int InterfaceTransmitPacket(void *arg, void *data, UINT len);
+int InterfaceTransmitPacket(void *arg, void *data, unsigned int len);
#endif
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index fd7e21a..5709afa 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -22,14 +22,14 @@ typedef struct ioctlbuffer {
}__attribute__((packed)) IOCTL_BUFFER, *PIOCTL_BUFFER;
typedef struct stGPIOInfo {
- UINT uiGpioNumber ; /* valid numbers 0-15 */
- UINT uiGpioValue; /* 1 set ; 0 not set */
+ unsigned int uiGpioNumber; /* valid numbers 0-15 */
+ unsigned int uiGpioValue; /* 1 set ; 0 not set */
}__attribute__((packed))GPIO_INFO,*PGPIO_INFO;
typedef struct stUserThreadReq {
//0->Inactivate LED thread.
//1->Activate the LED thread
- UINT ThreadState;
+ unsigned int ThreadState;
}__attribute__((packed))USER_THREAD_REQ,*PUSER_THREAD_REQ;
#define LED_THREAD_ACTIVATION_REQ 1
@@ -194,11 +194,11 @@ typedef enum _BCM_INTERFACE_TYPE
typedef struct _DEVICE_DRIVER_INFO {
NVM_TYPE u32NVMType;
- UINT MaxRDMBufferSize;
+ unsigned int MaxRDMBufferSize;
BCM_INTERFACE_TYPE u32InterfaceType;
- UINT u32DSDStartOffset;
- UINT u32RxAlignmentCorrection;
- UINT u32Reserved[10];
+ unsigned int u32DSDStartOffset;
+ unsigned int u32RxAlignmentCorrection;
+ unsigned int u32Reserved[10];
} DEVICE_DRIVER_INFO;
typedef struct _NVM_READWRITE {
@@ -335,14 +335,14 @@ enum {
};
typedef struct stGPIOMultiInfo {
- UINT uiGPIOCommand; /* 1 for set and 0 for get*/
- UINT uiGPIOMask; /* set the correspondig bit to 1 to access GPIO*/
- UINT uiGPIOValue; /* 0 or 1; value to be set when command is 1.*/
+ unsigned int uiGPIOCommand; /* 1 for set and 0 for get*/
+ unsigned int uiGPIOMask; /* set the correspondig bit to 1 to access GPIO*/
+ unsigned int uiGPIOValue; /* 0 or 1; value to be set when command is 1.*/
}__attribute__((packed))GPIO_MULTI_INFO , *PGPIO_MULTI_INFO;
typedef struct stGPIOMultiMode {
- UINT uiGPIOMode; /* 1 for OUT mode, 0 for IN mode*/
- UINT uiGPIOMask; /* GPIO mask to set mode*/
+ unsigned int uiGPIOMode; /* 1 for OUT mode, 0 for IN mode*/
+ unsigned int uiGPIOMask; /* GPIO mask to set mode*/
}__attribute__((packed))GPIO_MULTI_MODE, *PGPIO_MULTI_MODE;
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index 08d5f31..5a67422 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -112,7 +112,7 @@ static int SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
struct sk_buff* Packet) /**<Pointer to the packet to be sent*/
{
int Status = STATUS_FAILURE;
- UINT uiIndex =0, PktLen = 0;
+ unsigned int uiIndex = 0, PktLen = 0;
bcm_dbg(Adapter, TX, SEND_QUEUE, ALL, "=====>\n");
if (!Adapter || !Packet || !psSF) {
@@ -264,7 +264,7 @@ static void CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
********************************************************************/
void transmit_packets(PMINI_ADAPTER Adapter)
{
- UINT uiPrevTotalCount = 0;
+ unsigned int uiPrevTotalCount = 0;
int iIndex = 0;
BOOLEAN exit_flag = TRUE ;
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index d543eaf..9ece84c 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -8,7 +8,7 @@ static void beceem_protocol_reset(PMINI_ADAPTER Adapter);
static void default_wimax_protocol_initialize(PMINI_ADAPTER Adapter)
{
- UINT uiLoopIndex;
+ unsigned int uiLoopIndex;
for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES - 1; uiLoopIndex++) {
Adapter->PackInfo[uiLoopIndex].uiThreshold = TX_PACKET_THRESHOLD;
@@ -253,7 +253,7 @@ int CopyBufferToControlPacket(PMINI_ADAPTER Adapter, void *ioBuffer)
PLEADER pLeader = NULL;
int Status = 0;
unsigned char *ctrl_buff = NULL;
- UINT pktlen = 0;
+ unsigned int pktlen = 0;
PLINK_REQUEST pLinkReq = NULL;
unsigned char *pucAddIndication = NULL;
@@ -533,7 +533,7 @@ void StatisticsResponse(PMINI_ADAPTER Adapter, void *pvBuffer)
bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "%s====>\n", __func__);
Adapter->StatisticsPointer = ntohl(*(__be32 *)pvBuffer);
bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
- "Stats at %x\n", (UINT)Adapter->StatisticsPointer);
+ "Stats at %x\n", (unsigned int)Adapter->StatisticsPointer);
bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "%s <====\n", __func__);
return;
}
@@ -732,9 +732,9 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
*******************************************************************/
void DumpPackInfo(PMINI_ADAPTER Adapter)
{
- UINT uiLoopIndex = 0;
- UINT uiIndex = 0;
- UINT uiClsfrIndex = 0;
+ unsigned int uiLoopIndex = 0;
+ unsigned int uiIndex = 0;
+ unsigned int uiClsfrIndex = 0;
S_CLASSIFIER_RULE *pstClassifierEntry = NULL;
for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES; uiLoopIndex++) {
@@ -1123,7 +1123,7 @@ int run_card_proc(PMINI_ADAPTER ps_adapter)
int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
{
int status;
- UINT value = 0;
+ unsigned int value = 0;
/*
* Create the threads first and then download the
* Firm/DDR Settings..
@@ -1306,7 +1306,7 @@ static int bcm_parse_target_params(PMINI_ADAPTER Adapter)
void beceem_parse_target_struct(PMINI_ADAPTER Adapter)
{
- UINT uiHostDrvrCfg6 = 0, uiEEPROMFlag = 0;
+ unsigned int uiHostDrvrCfg6 = 0, uiEEPROMFlag = 0;
if (ntohl(Adapter->pstargetparams->m_u32PhyParameter2) & AUTO_SYNC_DISABLE) {
pr_info("AutoSyncup is Disabled\n");
@@ -1364,7 +1364,7 @@ void beceem_parse_target_struct(PMINI_ADAPTER Adapter)
static void doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
{
- UINT reporting_mode;
+ unsigned int reporting_mode;
reporting_mode = ntohl(psAdapter->pstargetparams->m_u32PowerSavingModeOptions) & 0x02;
psAdapter->bIsAutoCorrectEnabled = !((char)(psAdapter->ulPowerSaveMode >> 3) & 0x1);
@@ -1410,7 +1410,7 @@ static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress)
}
dwAddress |= 0x5b000000;
- status = wrmalt(Adapter, EEPROM_COMMAND_Q_REG, (PUINT)&dwAddress, sizeof(UINT));
+ status = wrmalt(Adapter, EEPROM_COMMAND_Q_REG, (PUINT)&dwAddress, sizeof(unsigned int));
if (status != STATUS_SUCCESS) {
pr_info("wrm Failed..\n");
kfree(pucmacaddr);
@@ -1436,15 +1436,15 @@ OUT:
}
#endif
-static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount)
+static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, unsigned int uiByteCount)
{
- UINT uiIndex = 0;
+ unsigned int uiIndex = 0;
if (RWM_WRITE == rwFlag) {
- for (uiIndex = 0; uiIndex < (uiByteCount/sizeof(UINT)); uiIndex++)
+ for (uiIndex = 0; uiIndex < (uiByteCount/sizeof(unsigned int)); uiIndex++)
puiBuffer[uiIndex] = htonl(puiBuffer[uiIndex]);
} else {
- for (uiIndex = 0; uiIndex < (uiByteCount/sizeof(UINT)); uiIndex++)
+ for (uiIndex = 0; uiIndex < (uiByteCount/sizeof(unsigned int)); uiIndex++)
puiBuffer[uiIndex] = ntohl(puiBuffer[uiIndex]);
}
}
@@ -1452,13 +1452,13 @@ static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount)
#define CACHE_ADDRESS_MASK 0x80000000
#define UNCACHE_ADDRESS_MASK 0xa0000000
-int rdm(PMINI_ADAPTER Adapter, UINT uiAddress, char *pucBuff, size_t sSize)
+int rdm(PMINI_ADAPTER Adapter, unsigned int uiAddress, char *pucBuff, size_t sSize)
{
return Adapter->interface_rdm(Adapter->pvInterfaceAdapter,
uiAddress, pucBuff, sSize);
}
-int wrm(PMINI_ADAPTER Adapter, UINT uiAddress, char *pucBuff, size_t sSize)
+int wrm(PMINI_ADAPTER Adapter, unsigned int uiAddress, char *pucBuff, size_t sSize)
{
int iRetVal;
@@ -1467,13 +1467,13 @@ int wrm(PMINI_ADAPTER Adapter, UINT uiAddress, char *pucBuff, size_t sSize)
return iRetVal;
}
-int wrmalt(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
+int wrmalt(PMINI_ADAPTER Adapter, unsigned int uiAddress, PUINT pucBuff, size_t size)
{
convertEndian(RWM_WRITE, pucBuff, size);
return wrm(Adapter, uiAddress, (unsigned char *)pucBuff, size);
}
-int rdmalt(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
+int rdmalt(PMINI_ADAPTER Adapter, unsigned int uiAddress, PUINT pucBuff, size_t size)
{
int uiRetVal = 0;
@@ -1483,7 +1483,7 @@ int rdmalt(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
return uiRetVal;
}
-int wrmWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, char *pucBuff, size_t sSize)
+int wrmWithLock(PMINI_ADAPTER Adapter, unsigned int uiAddress, char *pucBuff, size_t sSize)
{
int status = STATUS_SUCCESS;
down(&Adapter->rdmwrmsync);
@@ -1502,7 +1502,7 @@ exit:
return status;
}
-int wrmaltWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
+int wrmaltWithLock(PMINI_ADAPTER Adapter, unsigned int uiAddress, PUINT pucBuff, size_t size)
{
int iRetVal = STATUS_SUCCESS;
@@ -1522,7 +1522,7 @@ exit:
return iRetVal;
}
-int rdmaltWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
+int rdmaltWithLock(PMINI_ADAPTER Adapter, unsigned int uiAddress, PUINT pucBuff, size_t size)
{
int uiRetVal = STATUS_SUCCESS;
@@ -1576,8 +1576,8 @@ static void HandleShutDownModeWakeup(PMINI_ADAPTER Adapter)
static void SendShutModeResponse(PMINI_ADAPTER Adapter)
{
CONTROL_MESSAGE stShutdownResponse;
- UINT NVMAccess = 0, lowPwrAbortMsg = 0;
- UINT Status = 0;
+ unsigned int NVMAccess = 0, lowPwrAbortMsg = 0;
+ unsigned int Status = 0;
memset(&stShutdownResponse, 0, sizeof(CONTROL_MESSAGE));
stShutdownResponse.Leader.Status = LINK_UP_CONTROL_REQ;
@@ -1709,7 +1709,7 @@ void ResetCounters(PMINI_ADAPTER Adapter)
S_CLASSIFIER_RULE *GetFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short usIpIdentification, ULONG SrcIP)
{
- UINT uiIndex = 0;
+ unsigned int uiIndex = 0;
for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {
if ((Adapter->astFragmentedPktClassifierTable[uiIndex].bUsed) &&
(Adapter->astFragmentedPktClassifierTable[uiIndex].usIpIdentification == usIpIdentification) &&
@@ -1723,7 +1723,7 @@ S_CLASSIFIER_RULE *GetFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short usIpI
void AddFragIPClsEntry(PMINI_ADAPTER Adapter, PS_FRAGMENTED_PACKET_INFO psFragPktInfo)
{
- UINT uiIndex = 0;
+ unsigned int uiIndex = 0;
for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {
if (!Adapter->astFragmentedPktClassifierTable[uiIndex].bUsed) {
memcpy(&Adapter->astFragmentedPktClassifierTable[uiIndex], psFragPktInfo, sizeof(S_FRAGMENTED_PACKET_INFO));
@@ -1734,7 +1734,7 @@ void AddFragIPClsEntry(PMINI_ADAPTER Adapter, PS_FRAGMENTED_PACKET_INFO psFragPk
void DelFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short usIpIdentification, ULONG SrcIp)
{
- UINT uiIndex = 0;
+ unsigned int uiIndex = 0;
for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {
if ((Adapter->astFragmentedPktClassifierTable[uiIndex].bUsed) &&
(Adapter->astFragmentedPktClassifierTable[uiIndex].usIpIdentification == usIpIdentification) &&
@@ -1746,7 +1746,7 @@ void DelFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short usIpIdentification,
void update_per_cid_rx(PMINI_ADAPTER Adapter)
{
- UINT qindex = 0;
+ unsigned int qindex = 0;
if ((jiffies - Adapter->liDrainCalculated) < XSECONDS)
return;
@@ -1777,7 +1777,7 @@ void update_per_sf_desc_cnts(PMINI_ADAPTER Adapter)
if (!atomic_read(&Adapter->uiMBupdate))
return;
- bytes = rdmaltWithLock(Adapter, TARGET_SFID_TXDESC_MAP_LOC, (PUINT)uibuff, sizeof(UINT) * MAX_TARGET_DSX_BUFFERS);
+ bytes = rdmaltWithLock(Adapter, TARGET_SFID_TXDESC_MAP_LOC, (PUINT)uibuff, sizeof(unsigned int) * MAX_TARGET_DSX_BUFFERS);
if (bytes < 0) {
pr_info("rdm failed\n");
return;
@@ -1795,7 +1795,7 @@ void update_per_sf_desc_cnts(PMINI_ADAPTER Adapter)
atomic_set(&Adapter->uiMBupdate, FALSE);
}
-void flush_queue(PMINI_ADAPTER Adapter, UINT iQIndex)
+void flush_queue(PMINI_ADAPTER Adapter, unsigned int iQIndex)
{
struct sk_buff *PacketToDrop = NULL;
struct net_device_stats *netstats = &Adapter->dev->stats;
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 0177db4..ba06a72 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -1,32 +1,32 @@
#include "headers.h"
-static UINT CreateSFToClassifierRuleMapping(B_UINT16 uiVcid, B_UINT16 uiClsId, S_SERVICEFLOW_TABLE *psServiceFlowTable, S_PHS_RULE *psPhsRule, B_UINT8 u8AssociatedPHSI);
+static unsigned int CreateSFToClassifierRuleMapping(B_UINT16 uiVcid, B_UINT16 uiClsId, S_SERVICEFLOW_TABLE *psServiceFlowTable, S_PHS_RULE *psPhsRule, B_UINT8 u8AssociatedPHSI);
-static UINT CreateClassiferToPHSRuleMapping(B_UINT16 uiVcid, B_UINT16 uiClsId, S_SERVICEFLOW_ENTRY *pstServiceFlowEntry, S_PHS_RULE *psPhsRule, B_UINT8 u8AssociatedPHSI);
+static unsigned int CreateClassiferToPHSRuleMapping(B_UINT16 uiVcid, B_UINT16 uiClsId, S_SERVICEFLOW_ENTRY *pstServiceFlowEntry, S_PHS_RULE *psPhsRule, B_UINT8 u8AssociatedPHSI);
-static UINT CreateClassifierPHSRule(B_UINT16 uiClsId, S_CLASSIFIER_TABLE *psaClassifiertable , S_PHS_RULE *psPhsRule, E_CLASSIFIER_ENTRY_CONTEXT eClsContext, B_UINT8 u8AssociatedPHSI);
+static unsigned int CreateClassifierPHSRule(B_UINT16 uiClsId, S_CLASSIFIER_TABLE *psaClassifiertable , S_PHS_RULE *psPhsRule, E_CLASSIFIER_ENTRY_CONTEXT eClsContext, B_UINT8 u8AssociatedPHSI);
-static UINT UpdateClassifierPHSRule(B_UINT16 uiClsId, S_CLASSIFIER_ENTRY *pstClassifierEntry, S_CLASSIFIER_TABLE *psaClassifiertable , S_PHS_RULE *psPhsRule, B_UINT8 u8AssociatedPHSI);
+static unsigned int UpdateClassifierPHSRule(B_UINT16 uiClsId, S_CLASSIFIER_ENTRY *pstClassifierEntry, S_CLASSIFIER_TABLE *psaClassifiertable , S_PHS_RULE *psPhsRule, B_UINT8 u8AssociatedPHSI);
static BOOLEAN ValidatePHSRuleComplete(S_PHS_RULE *psPhsRule);
static BOOLEAN DerefPhsRule(B_UINT16 uiClsId, S_CLASSIFIER_TABLE *psaClassifiertable, S_PHS_RULE *pstPhsRule);
-static UINT 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, B_UINT32 uiClsid, E_CLASSIFIER_ENTRY_CONTEXT eClsContext, S_CLASSIFIER_ENTRY **ppstClassifierEntry);
-static UINT 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, B_UINT32 uiPHSI, E_CLASSIFIER_ENTRY_CONTEXT eClsContext, S_PHS_RULE **ppstPhsRule);
static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable);
static int phs_compress(S_PHS_RULE *phs_members, unsigned char *in_buf,
- unsigned char *out_buf, unsigned int *header_size, UINT *new_header_size );
+ unsigned char *out_buf, unsigned int *header_size, unsigned int *new_header_size );
static int verify_suppress_phsf(unsigned char *in_buffer, unsigned char *out_buffer,
- unsigned char *phsf, unsigned char *phsm, unsigned int phss, unsigned int phsv, UINT *new_header_size );
+ unsigned char *phsf, unsigned char *phsm, unsigned int phss, unsigned int phsv, unsigned int *new_header_size );
static int phs_decompress(unsigned char *in_buf, unsigned char *out_buf,\
- S_PHS_RULE *phs_rules, UINT *header_size);
+ S_PHS_RULE *phs_rules, unsigned int *header_size);
static ULONG PhsCompress(void* pvContext,
@@ -34,15 +34,15 @@ static ULONG PhsCompress(void* pvContext,
B_UINT16 uiClsId,
void *pvInputBuffer,
void *pvOutputBuffer,
- UINT *pOldHeaderSize,
- UINT *pNewHeaderSize );
+ unsigned int *pOldHeaderSize,
+ unsigned int *pNewHeaderSize);
static ULONG PhsDeCompress(void* pvContext,
B_UINT16 uiVcid,
void *pvInputBuffer,
void *pvOutputBuffer,
- UINT *pInHeaderSize,
- UINT *pOutHeaderSize);
+ unsigned int *pInHeaderSize,
+ unsigned int *pOutHeaderSize);
@@ -74,25 +74,25 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
unsigned short Vcid,
B_UINT16 uiClassifierRuleID,
BOOLEAN bHeaderSuppressionEnabled,
- UINT *PacketLen,
+ unsigned int *PacketLen,
unsigned char bEthCSSupport)
{
//PHS Sepcific
- UINT unPHSPktHdrBytesCopied = 0;
- UINT unPhsOldHdrSize = 0;
- UINT unPHSNewPktHeaderLen = 0;
+ unsigned int unPHSPktHdrBytesCopied = 0;
+ unsigned int unPhsOldHdrSize = 0;
+ unsigned int unPHSNewPktHeaderLen = 0;
/* Pointer to PHS IN Hdr Buffer */
unsigned char *pucPHSPktHdrInBuf =
Adapter->stPhsTxContextInfo.ucaHdrSupressionInBuf;
/* Pointer to PHS OUT Hdr Buffer */
unsigned char *pucPHSPktHdrOutBuf =
Adapter->stPhsTxContextInfo.ucaHdrSupressionOutBuf;
- UINT usPacketType;
- UINT BytesToRemove=0;
+ unsigned int usPacketType;
+ unsigned int BytesToRemove = 0;
BOOLEAN bPHSI = 0;
LONG ulPhsStatus = 0;
- UINT numBytesCompressed = 0;
+ unsigned int numBytesCompressed = 0;
struct sk_buff *newPacket = NULL;
struct sk_buff *Packet = *pPacket;
@@ -204,15 +204,15 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
int PHSReceive(PMINI_ADAPTER Adapter,
unsigned short usVcid,
struct sk_buff *packet,
- UINT *punPacketLen,
+ unsigned int *punPacketLen,
unsigned char *pucEthernetHdr,
- UINT bHeaderSuppressionEnabled)
+ unsigned int bHeaderSuppressionEnabled)
{
u32 nStandardPktHdrLen = 0;
u32 nTotalsupressedPktHdrBytes = 0;
int ulPhsStatus = 0;
unsigned char *pucInBuff = NULL;
- UINT TotalBytesAdded = 0;
+ unsigned int TotalBytesAdded = 0;
if (!bHeaderSuppressionEnabled) {
bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
"Phs Disabled for incoming packet\n");
@@ -258,7 +258,7 @@ int PHSReceive(PMINI_ADAPTER Adapter,
return STATUS_SUCCESS;
}
-void DumpFullPacket(unsigned char *pBuf, UINT nPktLen)
+void DumpFullPacket(unsigned char *pBuf, unsigned int nPktLen)
{
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Dumping Data Packet\n");
@@ -381,7 +381,7 @@ ULONG PhsUpdateClassifierRule(IN void* pvContext,
IN B_UINT8 u8AssociatedPHSI)
{
ULONG lStatus =0;
- UINT nSFIndex =0 ;
+ unsigned int nSFIndex = 0;
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -443,7 +443,7 @@ ULONG PhsUpdateClassifierRule(IN void* pvContext,
ULONG PhsDeletePHSRule(IN void* pvContext, IN B_UINT16 uiVcid, IN B_UINT8 u8PHSI)
{
ULONG lStatus =0;
- UINT nSFIndex =0, nClsidIndex =0 ;
+ unsigned int nSFIndex = 0, nClsidIndex = 0;
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -505,7 +505,7 @@ ULONG PhsDeletePHSRule(IN void* pvContext, IN B_UINT16 uiVcid, IN B_UINT8 u8PHSI
ULONG PhsDeleteClassifierRule(IN void* pvContext, IN B_UINT16 uiVcid , IN B_UINT16 uiClsId)
{
ULONG lStatus =0;
- UINT nSFIndex =0, nClsidIndex =0 ;
+ unsigned int nSFIndex = 0, nClsidIndex = 0;
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -565,7 +565,7 @@ ULONG PhsDeleteSFRules(IN void* pvContext, IN B_UINT16 uiVcid)
{
ULONG lStatus =0;
- UINT nSFIndex =0, nClsidIndex =0 ;
+ unsigned int nSFIndex = 0, nClsidIndex = 0;
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -630,11 +630,11 @@ ULONG PhsDeleteSFRules(IN void* pvContext, IN B_UINT16 uiVcid)
Arguments:
IN void* pvContext - PHS Driver Specific Context.
IN B_UINT16 uiVcid - The Service Flow ID to which current packet header compression applies.
- IN UINT uiClsId - The Classifier ID to which current packet header compression applies.
+ IN unsigned int uiClsId - The Classifier ID to which current packet header compression applies.
IN void *pvInputBuffer - The Input buffer containg packet header data
IN void *pvOutputBuffer - The output buffer returned by this function after PHS
- IN UINT *pOldHeaderSize - The actual size of the header before PHS
- IN UINT *pNewHeaderSize - The new size of the header after applying PHS
+ IN unsigned int *pOldHeaderSize - The actual size of the header before PHS
+ IN unsigned int *pNewHeaderSize - The new size of the header after applying PHS
Return Value:
@@ -647,10 +647,10 @@ ULONG PhsCompress(IN void* pvContext,
IN B_UINT16 uiClsId,
IN void *pvInputBuffer,
OUT void *pvOutputBuffer,
- OUT UINT *pOldHeaderSize,
- OUT UINT *pNewHeaderSize )
+ OUT unsigned int *pOldHeaderSize,
+ OUT unsigned int *pNewHeaderSize )
{
- UINT nSFIndex =0, nClsidIndex =0 ;
+ unsigned int nSFIndex = 0, nClsidIndex = 0;
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
S_PHS_RULE *pstPhsRule = NULL;
@@ -727,7 +727,7 @@ ULONG PhsCompress(IN void* pvContext,
IN B_UINT16 uiVcid - The Service Flow ID to which current packet header restoration applies.
IN void *pvInputBuffer - The Input buffer containg suppressed packet header data
OUT void *pvOutputBuffer - The output buffer returned by this function after restoration
- OUT UINT *pHeaderSize - The packet header size after restoration is returned in this parameter.
+ OUT unsigned int *pHeaderSize - The packet header size after restoration is returned in this parameter.
Return Value:
@@ -739,13 +739,13 @@ ULONG PhsDeCompress(IN void* pvContext,
IN B_UINT16 uiVcid,
IN void *pvInputBuffer,
OUT void *pvOutputBuffer,
- OUT UINT *pInHeaderSize,
- OUT UINT *pOutHeaderSize )
+ OUT unsigned int *pInHeaderSize,
+ OUT unsigned int *pOutHeaderSize)
{
- UINT nSFIndex =0, nPhsRuleIndex =0 ;
+ unsigned int nSFIndex = 0, nPhsRuleIndex = 0;
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
S_PHS_RULE *pstPhsRule = NULL;
- UINT phsi;
+ unsigned int phsi;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
PPHS_DEVICE_EXTENSION pDeviceExtension=
(PPHS_DEVICE_EXTENSION)pvContext;
@@ -882,7 +882,7 @@ static BOOLEAN ValidatePHSRuleComplete(IN S_PHS_RULE *psPhsRule)
}
}
-UINT GetServiceFlowEntry(IN S_SERVICEFLOW_TABLE *psServiceFlowTable,
+unsigned int GetServiceFlowEntry(IN S_SERVICEFLOW_TABLE *psServiceFlowTable,
IN B_UINT16 uiVcid, S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry)
{
int i;
@@ -900,7 +900,7 @@ UINT GetServiceFlowEntry(IN S_SERVICEFLOW_TABLE *psServiceFlowTable,
}
-UINT GetClassifierEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
+unsigned int GetClassifierEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
IN B_UINT32 uiClsid, E_CLASSIFIER_ENTRY_CONTEXT eClsContext,
OUT S_CLASSIFIER_ENTRY **ppstClassifierEntry)
{
@@ -927,7 +927,7 @@ UINT GetClassifierEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
return PHS_INVALID_TABLE_INDEX;
}
-static UINT GetPhsRuleEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
+static unsigned int GetPhsRuleEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
IN B_UINT32 uiPHSI, E_CLASSIFIER_ENTRY_CONTEXT eClsContext,
OUT S_PHS_RULE **ppstPhsRule)
{
@@ -952,13 +952,13 @@ static UINT GetPhsRuleEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
return PHS_INVALID_TABLE_INDEX;
}
-UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId,
+unsigned int CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId,
IN S_SERVICEFLOW_TABLE *psServiceFlowTable, S_PHS_RULE *psPhsRule,
B_UINT8 u8AssociatedPHSI)
{
S_CLASSIFIER_TABLE *psaClassifiertable = NULL;
- UINT uiStatus = 0;
+ unsigned int uiStatus = 0;
int iSfIndex;
BOOLEAN bFreeEntryFound =FALSE;
//Check for a free entry in SFID table
@@ -986,13 +986,13 @@ UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId,
}
-UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
+unsigned int CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
IN B_UINT16 uiClsId, IN S_SERVICEFLOW_ENTRY *pstServiceFlowEntry,
S_PHS_RULE *psPhsRule, B_UINT8 u8AssociatedPHSI)
{
S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
- UINT uiStatus =PHS_SUCCESS;
- UINT nClassifierIndex = 0;
+ unsigned int uiStatus = PHS_SUCCESS;
+ unsigned int nClassifierIndex = 0;
S_CLASSIFIER_TABLE *psaClassifiertable = NULL;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
psaClassifiertable = pstServiceFlowEntry->pstClassifierTable;
@@ -1068,14 +1068,14 @@ UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
return uiStatus;
}
-static UINT CreateClassifierPHSRule(IN B_UINT16 uiClsId,
+static unsigned int CreateClassifierPHSRule(IN B_UINT16 uiClsId,
S_CLASSIFIER_TABLE *psaClassifiertable , S_PHS_RULE *psPhsRule,
E_CLASSIFIER_ENTRY_CONTEXT eClsContext, B_UINT8 u8AssociatedPHSI)
{
- UINT iClassifierIndex = 0;
+ unsigned int iClassifierIndex = 0;
BOOLEAN bFreeEntryFound = FALSE;
S_CLASSIFIER_ENTRY *psClassifierRules = NULL;
- UINT nStatus = PHS_SUCCESS;
+ unsigned int nStatus = PHS_SUCCESS;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
"Inside CreateClassifierPHSRule\n");
@@ -1162,13 +1162,13 @@ static UINT CreateClassifierPHSRule(IN B_UINT16 uiClsId,
}
-static UINT UpdateClassifierPHSRule(IN B_UINT16 uiClsId,
+static unsigned int UpdateClassifierPHSRule(IN B_UINT16 uiClsId,
IN S_CLASSIFIER_ENTRY *pstClassifierEntry,
S_CLASSIFIER_TABLE *psaClassifiertable , S_PHS_RULE *psPhsRule,
B_UINT8 u8AssociatedPHSI)
{
S_PHS_RULE *pstAddPhsRule = NULL;
- UINT nPhsRuleIndex = 0;
+ unsigned int nPhsRuleIndex = 0;
BOOLEAN bPHSRuleOrphaned = FALSE;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
psPhsRule->u8RefCnt =0;
@@ -1328,7 +1328,7 @@ void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension)
//-----------------------------------------------------------------------------
int phs_decompress(unsigned char *in_buf, unsigned char *out_buf,
- S_PHS_RULE *decomp_phs_rules, UINT *header_size)
+ S_PHS_RULE *decomp_phs_rules, unsigned int *header_size)
{
int phss, size=0;
S_PHS_RULE *tmp_memb;
@@ -1410,7 +1410,7 @@ int phs_decompress(unsigned char *in_buf, unsigned char *out_buf,
// 0 -If PHS rule is NULL.If PHSV field is not set.If the verification fails.
//-----------------------------------------------------------------------------
static int phs_compress(S_PHS_RULE *phs_rule, unsigned char *in_buf
- , unsigned char *out_buf, UINT *header_size, UINT *new_header_size)
+ , unsigned char *out_buf, unsigned int *header_size, unsigned int *new_header_size)
{
unsigned char *old_addr = out_buf;
int supress = 0;
@@ -1468,7 +1468,7 @@ static int phs_compress(S_PHS_RULE *phs_rule, unsigned char *in_buf
static int verify_suppress_phsf(unsigned char *in_buffer, unsigned char *out_buffer,
unsigned char *phsf, unsigned char *phsm, unsigned int phss,
- unsigned int phsv, UINT* new_header_size)
+ unsigned int phsv, unsigned int* new_header_size)
{
unsigned int size=0;
int bit, i=0;
diff --git a/drivers/staging/bcm/PHSModule.h b/drivers/staging/bcm/PHSModule.h
index 0e11653..3f63aab 100644
--- a/drivers/staging/bcm/PHSModule.h
+++ b/drivers/staging/bcm/PHSModule.h
@@ -12,15 +12,15 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
int PHSReceive(PMINI_ADAPTER Adapter,
unsigned short usVcid,
struct sk_buff *packet,
- UINT *punPacketLen,
+ unsigned int *punPacketLen,
unsigned char *pucEthernetHdr,
- UINT
+ unsigned int
);
void DumpDataPacketHeader(unsigned char *pPkt);
-void DumpFullPacket(unsigned char *pBuf, UINT nPktLen);
+void DumpFullPacket(unsigned char *pBuf, unsigned int nPktLen);
void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension);
@@ -41,7 +41,7 @@ ULONG PhsDeleteSFRules(void* pvContext, B_UINT16 uiVcid) ;
BOOLEAN ValidatePHSRule(S_PHS_RULE *psPhsRule);
-UINT GetServiceFlowEntry(S_SERVICEFLOW_TABLE *psServiceFlowTable, B_UINT16 uiVcid, S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry);
+unsigned int GetServiceFlowEntry(S_SERVICEFLOW_TABLE *psServiceFlowTable, B_UINT16 uiVcid, S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry);
void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension);
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index cac016f..be026f0 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -9,7 +9,7 @@ void IdleModeResponse(PMINI_ADAPTER Adapter, PUINT puiBuffer);
int control_packet_handler (PMINI_ADAPTER Adapter);
-void DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex);
+void DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, unsigned int uiSearchRuleIndex);
void flush_all_queues(PMINI_ADAPTER Adapter);
@@ -29,7 +29,7 @@ void flush_all_queues(PMINI_ADAPTER Adapter);
void PruneQueueAllSF(PMINI_ADAPTER Adapter);
-int SearchSfid(PMINI_ADAPTER Adapter, UINT uiSfid);
+int SearchSfid(PMINI_ADAPTER Adapter, unsigned int uiSfid);
unsigned short ClassifyPacket(PMINI_ADAPTER Adapter, struct sk_buff* skb);
@@ -75,15 +75,15 @@ int register_control_device_interface(PMINI_ADAPTER ps_adapter);
void DumpPackInfo(PMINI_ADAPTER Adapter);
-int rdm(PMINI_ADAPTER Adapter, UINT uiAddress, char *pucBuff, size_t size);
+int rdm(PMINI_ADAPTER Adapter, unsigned int uiAddress, char *pucBuff, size_t size);
-int wrm(PMINI_ADAPTER Adapter, UINT uiAddress, char *pucBuff, size_t size);
+int wrm(PMINI_ADAPTER Adapter, unsigned int uiAddress, char *pucBuff, size_t size);
-int wrmalt (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
+int wrmalt (PMINI_ADAPTER Adapter, unsigned int uiAddress, PUINT pucBuff, size_t sSize);
-int rdmalt (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
+int rdmalt (PMINI_ADAPTER Adapter, unsigned int uiAddress, PUINT pucBuff, size_t sSize);
-int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __user * user_buffer);
+int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, unsigned int uiSFId, void __user * user_buffer);
void SendIdleModeResponse(PMINI_ADAPTER Adapter);
@@ -95,7 +95,7 @@ void beceem_parse_target_struct(PMINI_ADAPTER Adapter);
int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo);
void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter,
- CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex);
+ CServiceFlowParamSI *psfLocalSet, unsigned int uiSearchRuleIndex);
void ResetCounters(PMINI_ADAPTER Adapter);
@@ -114,7 +114,7 @@ void update_per_sf_desc_cnts( PMINI_ADAPTER Adapter);
void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN bFreeAll);
-void flush_queue(PMINI_ADAPTER Adapter, UINT iQIndex);
+void flush_queue(PMINI_ADAPTER Adapter, unsigned int iQIndex);
int flushAllAppQ(void);
@@ -123,12 +123,12 @@ int flushAllAppQ(void);
int BeceemEEPROMBulkRead(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes);
+ unsigned int uiOffset,
+ unsigned int uiNumBytes);
-int WriteBeceemEEPROM(PMINI_ADAPTER Adapter, UINT uiEEPROMOffset, UINT uiData);
+int WriteBeceemEEPROM(PMINI_ADAPTER Adapter, unsigned int uiEEPROMOffset, unsigned int uiData);
int PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter);
@@ -136,31 +136,31 @@ int PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter);
int BeceemEEPROMBulkWrite(
PMINI_ADAPTER Adapter,
unsigned char *pBuffer,
- UINT uiOffset,
- UINT uiNumBytes,
+ unsigned int uiOffset,
+ unsigned int uiNumBytes,
BOOLEAN bVerify);
-int ReadBeceemEEPROM(PMINI_ADAPTER Adapter, UINT dwAddress, UINT *pdwData);
+int ReadBeceemEEPROM(PMINI_ADAPTER Adapter, unsigned int dwAddress, unsigned int *pdwData);
int BeceemNVMRead(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes);
+ unsigned int uiOffset,
+ unsigned int uiNumBytes);
int BeceemNVMWrite(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes,
+ unsigned int uiOffset,
+ unsigned int uiNumBytes,
BOOLEAN bVerify);
int BcmInitNVM(PMINI_ADAPTER Adapter);
-int BcmUpdateSectorSize(PMINI_ADAPTER Adapter, UINT uiSectorSize);
+int BcmUpdateSectorSize(PMINI_ADAPTER Adapter, unsigned int uiSectorSize);
BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section);
int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2xBitMap);
@@ -169,16 +169,16 @@ int BcmFlash2xBulkWrite(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
FLASH2X_SECTION_VAL eFlashSectionVal,
- UINT uiOffset,
- UINT uiNumBytes,
- UINT bVerify);
+ unsigned int uiOffset,
+ unsigned int uiNumBytes,
+ unsigned int bVerify);
int BcmFlash2xBulkRead(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
FLASH2X_SECTION_VAL eFlashSectionVal,
- UINT uiOffsetWithinSectionVal,
- UINT uiNumBytes);
+ unsigned int uiOffsetWithinSectionVal,
+ unsigned int uiNumBytes);
int BcmGetSectionValStartOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionVal);
@@ -194,8 +194,8 @@ int IsFlash2x(PMINI_ADAPTER Adapter);
int BcmCopySection(PMINI_ADAPTER Adapter,
FLASH2X_SECTION_VAL SrcSection,
FLASH2X_SECTION_VAL DstSection,
- UINT offset,
- UINT numOfBytes);
+ unsigned int offset,
+ unsigned int numOfBytes);
BOOLEAN IsNonCDLessDevice(PMINI_ADAPTER Adapter);
@@ -203,16 +203,16 @@ BOOLEAN IsNonCDLessDevice(PMINI_ADAPTER Adapter);
void OverrideServiceFlowParams(PMINI_ADAPTER Adapter, PUINT puiBuffer);
-int wrmaltWithLock (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
-int rdmaltWithLock (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
+int wrmaltWithLock (PMINI_ADAPTER Adapter, unsigned int uiAddress, PUINT pucBuff, size_t sSize);
+int rdmaltWithLock (PMINI_ADAPTER Adapter, unsigned int uiAddress, PUINT pucBuff, size_t sSize);
-int wrmWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, char *pucBuff, size_t size);
+int wrmWithLock(PMINI_ADAPTER Adapter, unsigned int uiAddress, char *pucBuff, size_t size);
int buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
unsigned long u32StartingAddress);
void putUsbSuspend(struct work_struct *work);
-BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios);
+BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, unsigned int gpios);
#endif
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index e30a875..9817dbf 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -36,9 +36,9 @@ BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule, ULONG ulSrcIP)
for (ucLoopIndex = 0; ucLoopIndex < (pstClassifierRule->ucIPSourceAddressLength); ucLoopIndex++) {
bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
"Src Ip Address Mask:0x%x PacketIp:0x%x and Classification:0x%x\n",
- (UINT)pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex],
- (UINT)ulSrcIP,
- (UINT)pstClassifierRule->stSrcIpAddress.ulIpv6Addr[ucLoopIndex]);
+ (unsigned int)pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex],
+ (unsigned int)ulSrcIP,
+ (unsigned int)pstClassifierRule->stSrcIpAddress.ulIpv6Addr[ucLoopIndex]);
if ((pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex] & ulSrcIP)==
(pstClassifierRule->stSrcIpAddress.ulIpv4Addr[ucLoopIndex] & pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex] )) {
return TRUE;
@@ -70,9 +70,9 @@ BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule, ULONG ulDestIP)
return TRUE;
bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
"Destination Ip Address 0x%x 0x%x 0x%x\n",
- (UINT)ulDestIP,
- (UINT)pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex],
- (UINT)pstClassifierRule->stDestIpAddress.ulIpv4Addr[ucLoopIndex]);
+ (unsigned int)ulDestIP,
+ (unsigned int)pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex],
+ (unsigned int)pstClassifierRule->stDestIpAddress.ulIpv4Addr[ucLoopIndex]);
for (ucLoopIndex = 0; ucLoopIndex < (pstClassifierRule->ucIPDestinationAddressLength); ucLoopIndex++) {
if ((pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex] & ulDestIP)==
@@ -308,7 +308,7 @@ static unsigned short IpVersion4(PMINI_ADAPTER Adapter,
void PruneQueueAllSF(PMINI_ADAPTER Adapter)
{
- UINT iIndex = 0;
+ unsigned int iIndex = 0;
for (iIndex = 0; iIndex < HiPriority; iIndex++) {
if (!Adapter->PackInfo[iIndex].bValid)
@@ -345,7 +345,7 @@ static void PruneQueue(PMINI_ADAPTER Adapter, int iIndex)
spin_lock_bh(&Adapter->PackInfo[iIndex].SFQueueLock);
while (1) {
-// while ((UINT)Adapter->PackInfo[iIndex].uiCurrentPacketsOnHost >
+// while ((unsigned int)Adapter->PackInfo[iIndex].uiCurrentPacketsOnHost >
// SF_MAX_ALLOWED_PACKETS_TO_BACKUP) {
bcm_dbg(Adapter, TX, PRUNE_QUEUE, ALL,
"uiCurrentBytesOnHost:%x uiMaxBucketSize :%x\n",
@@ -398,7 +398,7 @@ static void PruneQueue(PMINI_ADAPTER Adapter, int iIndex)
void flush_all_queues(PMINI_ADAPTER Adapter)
{
int iQIndex;
- UINT uiTotalPacketLength;
+ unsigned int uiTotalPacketLength;
struct sk_buff* PacketToDrop=NULL;
bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "=====>\n");
@@ -652,7 +652,7 @@ unsigned short ClassifyPacket(PMINI_ADAPTER Adapter, struct sk_buff* skb)
static BOOLEAN EthCSMatchSrcMACAddress(S_CLASSIFIER_RULE *pstClassifierRule, unsigned char *Mac)
{
- UINT i=0;
+ unsigned int i = 0;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
if (pstClassifierRule->ucEthCSSrcMACLen==0)
return TRUE;
@@ -671,7 +671,7 @@ static BOOLEAN EthCSMatchSrcMACAddress(S_CLASSIFIER_RULE *pstClassifierRule, uns
static BOOLEAN EthCSMatchDestMACAddress(S_CLASSIFIER_RULE *pstClassifierRule, unsigned char *Mac)
{
- UINT i=0;
+ unsigned int i = 0;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
if (pstClassifierRule->ucEthCSDestMACLen==0)
return TRUE;
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index f6c3c75..1a37b2f 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -112,7 +112,7 @@ int SetupNextSend(PMINI_ADAPTER Adapter, struct sk_buff *Packet, unsigned short
}
status = PHSTransmit(Adapter, &Packet, Vcid, uiClassifierRuleID, bHeaderSupressionEnabled,
- (UINT *)&Packet->len, Adapter->PackInfo[QueueIndex].bEthCSSupport);
+ (unsigned int *)&Packet->len, Adapter->PackInfo[QueueIndex].bEthCSSupport);
if (status != STATUS_SUCCESS) {
bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index da6c4fd..557fd5b 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -14,7 +14,6 @@ typedef long LONG;
typedef unsigned char B_UINT8;
typedef unsigned short B_UINT16;
-typedef unsigned int UINT;
typedef unsigned int B_UINT32;
typedef unsigned long ULONG;
typedef unsigned long DWORD;
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index a5ccd6a..64cfd38 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -17,7 +17,7 @@ int ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMib
S_CLASSIFIER_ENTRY *pstClassifierRule = NULL;
PPHS_DEVICE_EXTENSION pDeviceExtension = (PPHS_DEVICE_EXTENSION) &Adapter->stBCMPhsContext;
- UINT nClassifierIndex = 0, nPhsTableIndex = 0, nSfIndex = 0, uiIndex = 0;
+ unsigned int nClassifierIndex = 0, nPhsTableIndex = 0, nSfIndex = 0, uiIndex = 0;
if (pDeviceExtension == NULL) {
bcm_dbg(Adapter, OTHERS, HOST_MIBS, ALL,
@@ -100,7 +100,7 @@ void GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, const PPER_T
sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
}
-void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter, CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex)
+void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter, CServiceFlowParamSI *psfLocalSet, unsigned int uiSearchRuleIndex)
{
S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 5f2a666..7c18b8a1 100644
--- 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(PMINI_ADAPTER Adapter, UINT gpios)
+BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, unsigned int gpios)
{
int Status;
Status = (Adapter->gpioBitMap & gpios) ^ gpios;
@@ -23,7 +23,7 @@ BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios)
return TRUE;
}
-static int LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, unsigned char uiLedIndex,
+static int LED_Blink(PMINI_ADAPTER Adapter, unsigned int GPIO_Num, unsigned char uiLedIndex,
ULONG timeout, int num_of_time, LedEventInfo_t currdriverstate)
{
int Status = STATUS_SUCCESS;
@@ -106,9 +106,9 @@ static int LED_Proportional_Blink(PMINI_ADAPTER Adapter, unsigned char GPIO_Num_
ULONG64 rate_of_transfer_tx = 0, rate_of_transfer_rx = 0;
int Status = STATUS_SUCCESS;
int num_of_time = 0, num_of_time_tx = 0, num_of_time_rx = 0;
- UINT remDelay = 0;
+ unsigned int remDelay = 0;
BOOLEAN bBlinkBothLED = TRUE;
- /* UINT GPIO_num = DISABLE_GPIO_NUM; */
+ /* unsigned int GPIO_num = DISABLE_GPIO_NUM; */
ulong timeout = 0;
/* Read initial value of packets sent/received */
@@ -440,7 +440,7 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
* Read the GPIO values for 32 GPIOs from EEPROM and map the function
* number to GPIO pin number to GPIO_Array
*/
- BeceemNVMRead(Adapter, (UINT *)ucGPIOInfo, dwReadValue, 32);
+ BeceemNVMRead(Adapter, (unsigned int *)ucGPIOInfo, dwReadValue, 32);
for (ucIndex = 0; ucIndex < 32; ucIndex++) {
switch (ucGPIOInfo[ucIndex]) {
@@ -478,8 +478,8 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,
int Status = STATUS_SUCCESS;
/* Array to store GPIO numbers from EEPROM */
unsigned char GPIO_Array[NUM_OF_LEDS+1];
- UINT uiIndex = 0;
- UINT uiNum_of_LED_Type = 0;
+ unsigned int uiIndex = 0;
+ unsigned int uiNum_of_LED_Type = 0;
unsigned char *puCFGData = NULL;
unsigned char bData = 0;
memset(GPIO_Array, DISABLE_GPIO_NUM, NUM_OF_LEDS+1);
@@ -577,8 +577,8 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,
*/
static void LedGpioInit(PMINI_ADAPTER Adapter)
{
- UINT uiResetValue = 0;
- UINT uiIndex = 0;
+ unsigned int uiResetValue = 0;
+ unsigned int uiIndex = 0;
/* Set all LED GPIO Mode to output mode */
if (rdmalt(Adapter, GPIO_MODE_REGISTER, &uiResetValue,
@@ -604,7 +604,7 @@ static int BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, unsigned char *GPIO_num_tx,
unsigned char *GPIO_num_rx, unsigned char *uiLedTxIndex, unsigned char *uiLedRxIndex,
LedEventInfo_t currdriverstate)
{
- UINT uiIndex = 0;
+ unsigned int uiIndex = 0;
*GPIO_num_tx = DISABLE_GPIO_NUM;
*GPIO_num_rx = DISABLE_GPIO_NUM;
@@ -642,10 +642,10 @@ static int BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, unsigned char *GPIO_num_tx,
}
static void LEDControlThread(PMINI_ADAPTER Adapter)
{
- UINT uiIndex = 0;
+ unsigned int uiIndex = 0;
unsigned char GPIO_num = 0;
unsigned char uiLedIndex = 0;
- UINT uiResetValue = 0;
+ unsigned int uiResetValue = 0;
LedEventInfo_t currdriverstate = 0;
ulong timeout = 0;
diff --git a/drivers/staging/bcm/led_control.h b/drivers/staging/bcm/led_control.h
index 608d29e..ee5b7ae 100644
--- a/drivers/staging/bcm/led_control.h
+++ b/drivers/staging/bcm/led_control.h
@@ -27,14 +27,14 @@
#define MAX_FILE_NAME_BUFFER_SIZE 100
#define TURN_ON_LED(GPIO, index) do{ \
- UINT gpio_val = GPIO; \
+ unsigned int gpio_val = GPIO; \
(Adapter->LEDInfo.LEDState[index].BitPolarity == 1) ? \
wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG, &gpio_val , sizeof(gpio_val)) : \
wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG, &gpio_val, sizeof(gpio_val)); \
}while (0);
#define TURN_OFF_LED(GPIO, index) do { \
- UINT gpio_val = GPIO; \
+ unsigned int gpio_val = GPIO; \
(Adapter->LEDInfo.LEDState[index].BitPolarity == 1) ? \
wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG,&gpio_val , sizeof(gpio_val)) : \
wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG,&gpio_val , sizeof(gpio_val)); \
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 93c4b67..142c25c 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -2,21 +2,21 @@
#define DWORD unsigned int
-static int BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset);
+static int BcmDoChipSelect(PMINI_ADAPTER Adapter, unsigned int offset);
static int BcmGetActiveDSD(PMINI_ADAPTER Adapter);
static int BcmGetActiveISO(PMINI_ADAPTER Adapter);
-static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter);
+static unsigned int BcmGetEEPROMSize(PMINI_ADAPTER Adapter);
static int BcmGetFlashCSInfo(PMINI_ADAPTER Adapter);
-static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig, UINT FlashSectorSize);
+static unsigned int BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, unsigned int FlashSectorSizeSig, unsigned int FlashSectorSize);
static void BcmValidateNvmType(PMINI_ADAPTER Adapter);
static int BcmGetNvmSize(PMINI_ADAPTER Adapter);
-static UINT BcmGetFlashSize(PMINI_ADAPTER Adapter);
+static unsigned int BcmGetFlashSize(PMINI_ADAPTER Adapter);
static NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter);
static int BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
-static B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, UINT uiOffset);
+static B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, unsigned int uiOffset);
static int IsSectionWritable(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL Section);
static int IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section);
@@ -27,29 +27,29 @@ static int ReadISOSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso);
static int CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
static int CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
-static int SaveHeaderIfPresent(PMINI_ADAPTER Adapter, unsigned char *pBuff, UINT uiSectAlignAddr);
+static int SaveHeaderIfPresent(PMINI_ADAPTER Adapter, unsigned char *pBuff, unsigned int uiSectAlignAddr);
static int WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter, PUINT pBuff,
FLASH2X_SECTION_VAL eFlash2xSectionVal,
- UINT uiOffset, UINT uiNumBytes);
+ unsigned int uiOffset, unsigned int uiNumBytes);
static FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter);
static FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter);
static int BeceemFlashBulkRead(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes);
+ unsigned int uiOffset,
+ unsigned int uiNumBytes);
static int BeceemFlashBulkWrite(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes,
+ unsigned int uiOffset,
+ unsigned int uiNumBytes,
BOOLEAN bVerify);
static int GetFlashBaseAddr(PMINI_ADAPTER Adapter);
-static int ReadBeceemEEPROMBulk(PMINI_ADAPTER Adapter, UINT dwAddress, UINT *pdwData, UINT dwNumData);
+static int ReadBeceemEEPROMBulk(PMINI_ADAPTER Adapter, unsigned int dwAddress, unsigned int *pdwData, unsigned int dwNumData);
// Procedure: ReadEEPROMStatusRegister
//
@@ -66,9 +66,9 @@ static unsigned char ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )
{
unsigned char uiData = 0;
DWORD dwRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY;
- UINT uiStatus = 0;
- UINT value = 0;
- UINT value1 = 0;
+ unsigned int uiStatus = 0;
+ unsigned int value = 0;
+ unsigned int value1 = 0;
/* Read the EEPROM status register */
value = EEPROM_READ_STATUS_REGISTER ;
@@ -134,9 +134,9 @@ int ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,
{
DWORD dwIndex = 0;
DWORD dwRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY;
- UINT uiStatus = 0;
- UINT value= 0;
- UINT value1 = 0;
+ unsigned int uiStatus = 0;
+ unsigned int value = 0;
+ unsigned int value1 = 0;
unsigned char *pvalue;
/* Flush the read and cmd queue. */
@@ -251,9 +251,9 @@ int ReadBeceemEEPROM( PMINI_ADAPTER Adapter,
DWORD *pBuffer
)
{
- UINT uiData[8] = {0};
- UINT uiByteOffset = 0;
- UINT uiTempOffset = 0;
+ unsigned int uiData[8] = {0};
+ unsigned int uiByteOffset = 0;
+ unsigned int uiTempOffset = 0;
bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "====>\n");
@@ -310,16 +310,16 @@ int ReadMacAddressFromNVM(PMINI_ADAPTER Adapter)
int BeceemEEPROMBulkRead(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes)
+ unsigned int uiOffset,
+ unsigned int uiNumBytes)
{
- UINT uiData[4] = {0};
- //UINT uiAddress = 0;
- UINT uiBytesRemaining = uiNumBytes;
- UINT uiIndex = 0;
- UINT uiTempOffset = 0;
- UINT uiExtraBytes = 0;
- UINT uiFailureRetries = 0;
+ unsigned int uiData[4] = {0};
+ //unsigned int uiAddress = 0;
+ unsigned int uiBytesRemaining = uiNumBytes;
+ unsigned int uiIndex = 0;
+ unsigned int uiTempOffset = 0;
+ unsigned int uiExtraBytes = 0;
+ unsigned int uiFailureRetries = 0;
unsigned char *pcBuff = (unsigned char *)pBuffer;
@@ -409,13 +409,13 @@ int BeceemEEPROMBulkRead(
static int BeceemFlashBulkRead(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes)
+ unsigned int uiOffset,
+ unsigned int uiNumBytes)
{
- UINT uiIndex = 0;
- UINT uiBytesToRead = uiNumBytes;
+ unsigned int uiIndex = 0;
+ unsigned int uiBytesToRead = uiNumBytes;
int Status = 0;
- UINT uiPartOffset = 0;
+ unsigned int uiPartOffset = 0;
int bytes;
if (Adapter->device_removed ) {
@@ -482,11 +482,11 @@ static int BeceemFlashBulkRead(
// Adapter - ptr to Adapter object instance
//
// Returns:
-// UINT - size of the FLASH Storage.
+// unsigned int - size of the FLASH Storage.
//
//-----------------------------------------------------------------------------
-static UINT BcmGetFlashSize(PMINI_ADAPTER Adapter)
+static unsigned int BcmGetFlashSize(PMINI_ADAPTER Adapter)
{
if (IsFlash2x(Adapter))
return (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER));
@@ -505,14 +505,14 @@ static UINT BcmGetFlashSize(PMINI_ADAPTER Adapter)
// Adapter - ptr to Adapter object instance
//
// Returns:
-// UINT - size of the EEPROM Storage.
+// unsigned int - size of the EEPROM Storage.
//
//-----------------------------------------------------------------------------
-static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
+static unsigned int BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
{
- UINT uiData = 0;
- UINT uiIndex = 0;
+ unsigned int uiData = 0;
+ unsigned int uiIndex = 0;
//
// if EEPROM is present and already Calibrated, it will have
@@ -568,12 +568,12 @@ static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
static int FlashSectorErase(PMINI_ADAPTER Adapter,
- UINT addr,
- UINT numOfSectors)
+ unsigned int addr,
+ unsigned int numOfSectors)
{
- UINT iIndex = 0, iRetries = 0;
- UINT uiStatus = 0;
- UINT value;
+ unsigned int iIndex = 0, iRetries = 0;
+ unsigned int uiStatus = 0;
+ unsigned int value;
int bytes;
for (iIndex = 0; iIndex < numOfSectors; iIndex++) {
@@ -630,14 +630,14 @@ static int FlashSectorErase(PMINI_ADAPTER Adapter,
static int flashByteWrite(
PMINI_ADAPTER Adapter,
- UINT uiOffset,
+ unsigned int uiOffset,
void *pData)
{
- UINT uiStatus = 0;
+ unsigned int uiStatus = 0;
int iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; //3
- UINT value;
+ unsigned int value;
ULONG ulData = *(unsigned char *)pData;
int bytes;
@@ -714,19 +714,19 @@ static int flashByteWrite(
static int flashWrite(
PMINI_ADAPTER Adapter,
- UINT uiOffset,
+ unsigned int uiOffset,
void *pData)
{
- //UINT uiStatus = 0;
+ //unsigned int uiStatus = 0;
//int iRetries = 0;
- //UINT uiReadBack = 0;
+ //unsigned int uiReadBack = 0;
- UINT uiStatus = 0;
+ unsigned int uiStatus = 0;
int iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; //3
- UINT value;
- UINT uiErasePattern[4] = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF};
+ unsigned int value;
+ unsigned int uiErasePattern[4] = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF};
int bytes;
//
// need not write 0xFFFFFFFF because write requires an erase and erase will
@@ -795,13 +795,13 @@ static int flashWrite(
//-----------------------------------------------------------------------------
static int flashByteWriteStatus(
PMINI_ADAPTER Adapter,
- UINT uiOffset,
+ unsigned int uiOffset,
void *pData)
{
- UINT uiStatus = 0;
+ unsigned int uiStatus = 0;
int iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; //3
ULONG ulData = *(unsigned char *)pData;
- UINT value;
+ unsigned int value;
int bytes;
//
@@ -876,14 +876,14 @@ static int flashByteWriteStatus(
static int flashWriteStatus(
PMINI_ADAPTER Adapter,
- UINT uiOffset,
+ unsigned int uiOffset,
void *pData)
{
- UINT uiStatus = 0;
+ unsigned int uiStatus = 0;
int iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; //3
- //UINT uiReadBack = 0;
- UINT value;
- UINT uiErasePattern[4] = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF};
+ //unsigned int uiReadBack = 0;
+ unsigned int value;
+ unsigned int uiErasePattern[4] = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF};
int bytes;
//
@@ -951,7 +951,7 @@ static int flashWriteStatus(
static void BcmRestoreBlockProtectStatus(PMINI_ADAPTER Adapter, ULONG ulWriteStatus)
{
- UINT value;
+ unsigned int value;
value = (FLASH_CMD_WRITE_ENABLE<< 24);
wrmalt(Adapter, FLASH_SPI_CMDQ_REG, &value, sizeof(value));
@@ -972,11 +972,11 @@ static void BcmRestoreBlockProtectStatus(PMINI_ADAPTER Adapter, ULONG ulWriteSta
// ULONG - Status value before UnProtect.
//
//-----------------------------------------------------------------------------
-static ULONG BcmFlashUnProtectBlock(PMINI_ADAPTER Adapter, UINT uiOffset, UINT uiLength)
+static ULONG BcmFlashUnProtectBlock(PMINI_ADAPTER Adapter, unsigned int uiOffset, unsigned int uiLength)
{
ULONG ulStatus = 0;
ULONG ulWriteStatus = 0;
- UINT value;
+ unsigned int value;
uiOffset = uiOffset&0x000FFFFF;
//
@@ -1072,24 +1072,24 @@ static ULONG BcmFlashUnProtectBlock(PMINI_ADAPTER Adapter, UINT uiOffset, UINT u
static int BeceemFlashBulkWrite(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes,
+ unsigned int uiOffset,
+ unsigned int uiNumBytes,
BOOLEAN bVerify)
{
char *pTempBuff = NULL;
unsigned char *pcBuffer = (unsigned char *)pBuffer;
- UINT uiIndex = 0;
- UINT uiOffsetFromSectStart = 0;
- UINT uiSectAlignAddr = 0;
- UINT uiCurrSectOffsetAddr = 0;
- UINT uiSectBoundary = 0;
- UINT uiNumSectTobeRead = 0;
+ unsigned int uiIndex = 0;
+ unsigned int uiOffsetFromSectStart = 0;
+ unsigned int uiSectAlignAddr = 0;
+ unsigned int uiCurrSectOffsetAddr = 0;
+ unsigned int uiSectBoundary = 0;
+ unsigned int uiNumSectTobeRead = 0;
unsigned char ucReadBk[16] = {0};
ULONG ulStatus = 0;
int Status = STATUS_SUCCESS;
- UINT uiTemp = 0;
- UINT index = 0;
- UINT uiPartOffset = 0;
+ unsigned int uiTemp = 0;
+ unsigned int index = 0;
+ unsigned int uiPartOffset = 0;
#if defined(BCM_SHM_INTERFACE) && !defined(FLASH_DIRECT_ACCESS)
Status = bcmflash_raw_write((uiOffset/FLASH_PART_SIZE), (uiOffset % FLASH_PART_SIZE), ( unsigned char *)pBuffer, uiNumBytes);
@@ -1207,7 +1207,7 @@ static int BeceemFlashBulkWrite(
for (uiIndex = 0; uiIndex < Adapter->uiSectorSize; uiIndex += MAX_RW_SIZE) {
if (STATUS_SUCCESS == BeceemFlashBulkRead(Adapter, (PUINT)ucReadBk, uiOffsetFromSectStart+uiIndex, MAX_RW_SIZE)) {
if (Adapter->ulFlashWriteSize == 1) {
- UINT uiReadIndex = 0;
+ unsigned int uiReadIndex = 0;
for (uiReadIndex = 0; uiReadIndex < 16; uiReadIndex++) {
if (ucReadBk[uiReadIndex] != pTempBuff[uiIndex+uiReadIndex]) {
if (STATUS_SUCCESS != (*Adapter->fpFlashWriteWithStatusCheck)(Adapter, uiPartOffset+uiIndex+uiReadIndex,&pTempBuff[uiIndex+uiReadIndex])) {
@@ -1286,24 +1286,24 @@ BeceemFlashBulkWrite_EXIT:
static int BeceemFlashBulkWriteStatus(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes,
+ unsigned int uiOffset,
+ unsigned int uiNumBytes,
BOOLEAN bVerify)
{
char *pTempBuff = NULL;
unsigned char *pcBuffer = (unsigned char *)pBuffer;
- UINT uiIndex = 0;
- UINT uiOffsetFromSectStart = 0;
- UINT uiSectAlignAddr = 0;
- UINT uiCurrSectOffsetAddr = 0;
- UINT uiSectBoundary = 0;
- UINT uiNumSectTobeRead = 0;
+ unsigned int uiIndex = 0;
+ unsigned int uiOffsetFromSectStart = 0;
+ unsigned int uiSectAlignAddr = 0;
+ unsigned int uiCurrSectOffsetAddr = 0;
+ unsigned int uiSectBoundary = 0;
+ unsigned int uiNumSectTobeRead = 0;
unsigned char ucReadBk[16] = {0};
ULONG ulStatus = 0;
- UINT Status = STATUS_SUCCESS;
- UINT uiTemp = 0;
- UINT index = 0;
- UINT uiPartOffset = 0;
+ unsigned int Status = STATUS_SUCCESS;
+ unsigned int uiTemp = 0;
+ unsigned int index = 0;
+ unsigned int uiPartOffset = 0;
uiOffsetFromSectStart = uiOffset & ~(Adapter->uiSectorSize - 1);
@@ -1447,12 +1447,12 @@ BeceemFlashBulkWriteStatus_EXIT:
int PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
{
char *pBuff = kmalloc(BUFFER_4K, GFP_KERNEL);
- UINT uiEepromSize = 0;
- UINT uiIndex = 0;
- UINT uiBytesToCopy = 0;
- UINT uiCalStartAddr = EEPROM_CALPARAM_START;
- UINT uiMemoryLoc = EEPROM_CAL_DATA_INTERNAL_LOC;
- UINT value;
+ unsigned int uiEepromSize = 0;
+ unsigned int uiIndex = 0;
+ unsigned int uiBytesToCopy = 0;
+ unsigned int uiCalStartAddr = EEPROM_CALPARAM_START;
+ unsigned int uiMemoryLoc = EEPROM_CAL_DATA_INTERNAL_LOC;
+ unsigned int value;
int Status = 0;
if (pBuff == NULL) {
return -1;
@@ -1511,12 +1511,12 @@ int PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
int PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
{
char *pBuff, *pPtr;
- UINT uiEepromSize = 0;
- UINT uiBytesToCopy = 0;
- //UINT uiIndex = 0;
- UINT uiCalStartAddr = EEPROM_CALPARAM_START;
- UINT uiMemoryLoc = EEPROM_CAL_DATA_INTERNAL_LOC;
- UINT value;
+ unsigned int uiEepromSize = 0;
+ unsigned int uiBytesToCopy = 0;
+ //unsigned int uiIndex = 0;
+ unsigned int uiCalStartAddr = EEPROM_CALPARAM_START;
+ unsigned int uiMemoryLoc = EEPROM_CAL_DATA_INTERNAL_LOC;
+ unsigned int value;
int Status = 0;
//
// Write the signature first. This will ensure firmware does not access EEPROM.
@@ -1590,13 +1590,13 @@ int PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
static int BeceemEEPROMReadBackandVerify(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes)
+ unsigned int uiOffset,
+ unsigned int uiNumBytes)
{
- UINT uiRdbk = 0;
- UINT uiIndex = 0;
- UINT uiData = 0;
- UINT auiData[4] = {0};
+ unsigned int uiRdbk = 0;
+ unsigned int uiIndex = 0;
+ unsigned int uiData = 0;
+ unsigned int auiData[4] = {0};
while (uiNumBytes) {
if (Adapter->device_removed ) {
@@ -1639,7 +1639,7 @@ static int BeceemEEPROMReadBackandVerify(
} else
{ // Handle the reads less than 4 bytes...
uiData = 0;
- memcpy(&uiData, ((unsigned char *)pBuffer)+(uiIndex*sizeof(UINT)), uiNumBytes);
+ memcpy(&uiData, ((unsigned char *)pBuffer)+(uiIndex*sizeof(unsigned int)), uiNumBytes);
BeceemEEPROMBulkRead(Adapter,&uiRdbk, uiOffset, 4);
if (memcmp(&uiData, &uiRdbk, uiNumBytes))
@@ -1653,9 +1653,9 @@ static int BeceemEEPROMReadBackandVerify(
return 0;
}
-static void BcmSwapWord(UINT *ptr1) {
+static void BcmSwapWord(unsigned int *ptr1) {
- UINT tempval = (UINT)*ptr1;
+ unsigned int tempval = (unsigned int)*ptr1;
char *ptr2 = (char *)&tempval;
char *ptr = (char *)ptr1;
@@ -1678,12 +1678,12 @@ static void BcmSwapWord(UINT *ptr1) {
// OSAL_STATUS_CODE
//
//-----------------------------------------------------------------------------
-static int BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiOffset )
+static int BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, unsigned int uiData[], unsigned int uiOffset )
{
- UINT uiRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY;
- UINT uiStatus = 0;
+ unsigned int uiRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY;
+ unsigned int uiStatus = 0;
unsigned char uiEpromStatus = 0;
- UINT value =0 ;
+ unsigned int value = 0;
/* Flush the Write/Read/Cmd queues. */
value = ( EEPROM_WRITE_QUEUE_FLUSH | EEPROM_CMD_QUEUE_FLUSH | EEPROM_READ_QUEUE_FLUSH );
@@ -1815,16 +1815,16 @@ static int BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiO
int BeceemEEPROMBulkWrite(
PMINI_ADAPTER Adapter,
unsigned char *pBuffer,
- UINT uiOffset,
- UINT uiNumBytes,
+ unsigned int uiOffset,
+ unsigned int uiNumBytes,
BOOLEAN bVerify)
{
- UINT uiBytesToCopy = uiNumBytes;
- //UINT uiRdbk = 0;
- UINT uiData[4] = {0};
- UINT uiIndex = 0;
- UINT uiTempOffset = 0;
- UINT uiExtraBytes = 0;
+ unsigned int uiBytesToCopy = uiNumBytes;
+ //unsigned int uiRdbk = 0;
+ unsigned int uiData[4] = {0};
+ unsigned int uiIndex = 0;
+ unsigned int uiTempOffset = 0;
+ unsigned int uiExtraBytes = 0;
//PUINT puiBuffer = (PUINT)pBuffer;
//int value;
@@ -1908,12 +1908,12 @@ int BeceemEEPROMBulkWrite(
int BeceemNVMRead(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes)
+ unsigned int uiOffset,
+ unsigned int uiNumBytes)
{
int Status = 0;
#if !defined(BCM_SHM_INTERFACE) || defined(FLASH_DIRECT_ACCESS)
- UINT uiTemp = 0, value;
+ unsigned int uiTemp = 0, value;
#endif
if (Adapter->eNVMType == NVM_FLASH) {
@@ -1965,18 +1965,18 @@ int BeceemNVMRead(
int BeceemNVMWrite(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
- UINT uiOffset,
- UINT uiNumBytes,
+ unsigned int uiOffset,
+ unsigned int uiNumBytes,
BOOLEAN bVerify)
{
int Status = 0;
- UINT uiTemp = 0;
- UINT uiMemoryLoc = EEPROM_CAL_DATA_INTERNAL_LOC;
- UINT uiIndex = 0;
+ unsigned int uiTemp = 0;
+ unsigned int uiMemoryLoc = EEPROM_CAL_DATA_INTERNAL_LOC;
+ unsigned int uiIndex = 0;
#if !defined(BCM_SHM_INTERFACE) || defined(FLASH_DIRECT_ACCESS)
- UINT value;
+ unsigned int value;
#endif
- UINT uiFlashOffset = 0;
+ unsigned int uiFlashOffset = 0;
if (Adapter->eNVMType == NVM_FLASH) {
if (IsSectionExistInVendorInfo(Adapter, Adapter->eActiveDSD))
@@ -2075,16 +2075,16 @@ int BeceemNVMWrite(
// <FAILURE> - if failed.
//-----------------------------------------------------------------------------
-int BcmUpdateSectorSize(PMINI_ADAPTER Adapter, UINT uiSectorSize)
+int BcmUpdateSectorSize(PMINI_ADAPTER Adapter, unsigned int uiSectorSize)
{
int Status = -1;
FLASH_CS_INFO sFlashCsInfo = {0};
- UINT uiTemp = 0;
+ unsigned int uiTemp = 0;
- UINT uiSectorSig = 0;
- UINT uiCurrentSectorSize = 0;
+ unsigned int uiSectorSig = 0;
+ unsigned int uiCurrentSectorSize = 0;
- UINT value;
+ unsigned int value;
@@ -2143,14 +2143,14 @@ Restore :
// Adapter - ptr to Adapter object instance
//
// Returns:
-// UINT - sector size.
+// unsigned int - sector size.
//
//-----------------------------------------------------------------------------
-static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig, UINT FlashSectorSize)
+static unsigned int BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, unsigned int FlashSectorSizeSig, unsigned int FlashSectorSize)
{
- UINT uiSectorSize = 0;
- UINT uiSectorSig = 0;
+ unsigned int uiSectorSize = 0;
+ unsigned int uiSectorSig = 0;
if (Adapter->bSectorSizeOverride &&
(Adapter->uiSectorSizeInCFG <= MAX_SECTOR_SIZE &&
@@ -2207,7 +2207,7 @@ static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig
static int BcmInitEEPROMQueues(PMINI_ADAPTER Adapter)
{
- UINT value = 0;
+ unsigned int value = 0;
/* CHIP Bug : Clear the Avail bits on the Read queue. The default
* value on this register is supposed to be 0x00001102.
* But we get 0x00001122. */
@@ -2321,7 +2321,7 @@ static void BcmValidateNvmType(PMINI_ADAPTER Adapter)
static ULONG BcmReadFlashRDID(PMINI_ADAPTER Adapter)
{
ULONG ulRDID = 0;
- UINT value;
+ unsigned int value;
//
// Read ID Instruction.
//
@@ -2385,7 +2385,7 @@ int BcmDeAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
static int BcmDumpFlash2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo, PMINI_ADAPTER Adapter)
{
- UINT Index = 0;
+ unsigned int Index = 0;
bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
"**********************FLASH2X CS Structure *******************\n");
bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Signature is :%x\n",
@@ -2525,7 +2525,7 @@ static int BcmDumpFlash2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo, PMINI_ADA
static int ConvertEndianOf2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo)
{
- UINT Index = 0;
+ unsigned int Index = 0;
psFlash2xCSInfo->MagicNumber = ntohl(psFlash2xCSInfo->MagicNumber);
psFlash2xCSInfo->FlashLayoutVersion= ntohl(psFlash2xCSInfo->FlashLayoutVersion);
//psFlash2xCSInfo->FlashLayoutMinorVersion = ntohs(psFlash2xCSInfo->FlashLayoutMinorVersion);
@@ -2580,7 +2580,7 @@ static int ConvertEndianOf2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo)
static int ConvertEndianOfCSStructure(PFLASH_CS_INFO psFlashCSInfo)
{
- //UINT Index = 0;
+ //unsigned int Index = 0;
psFlashCSInfo->MagicNumber =ntohl(psFlashCSInfo->MagicNumber);
psFlashCSInfo->FlashLayoutVersion =ntohl(psFlashCSInfo->FlashLayoutVersion);
psFlashCSInfo->ISOImageVersion = ntohl(psFlashCSInfo->ISOImageVersion);
@@ -2621,7 +2621,7 @@ static int IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL
static void UpdateVendorInfo(PMINI_ADAPTER Adapter)
{
B_UINT32 i = 0;
- UINT uiSizeSection = 0;
+ unsigned int uiSizeSection = 0;
Adapter->uiVendorExtnFlag = FALSE;
@@ -2711,9 +2711,9 @@ static int BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
//FLASH_CS_INFO sFlashCsInfo = {0};
#if !defined(BCM_SHM_INTERFACE) || defined(FLASH_DIRECT_ACCESS)
- UINT value;
+ unsigned int value;
#endif
- UINT uiFlashLayoutMajorVersion;
+ unsigned int uiFlashLayoutMajorVersion;
Adapter->uiFlashLayoutMinorVersion = 0;
Adapter->uiFlashLayoutMajorVersion = 0;
Adapter->ulFlashControlSectionStart = FLASH_CS_INFO_START_ADDR;
@@ -2843,7 +2843,7 @@ static int BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
static NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter)
{
- UINT uiData = 0;
+ unsigned int uiData = 0;
BeceemEEPROMBulkRead(Adapter,&uiData, 0x0, 4);
if (uiData == BECM) {
@@ -3065,14 +3065,14 @@ int BcmFlash2xBulkRead(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
FLASH2X_SECTION_VAL eFlash2xSectionVal,
- UINT uiOffsetWithinSectionVal,
- UINT uiNumBytes)
+ unsigned int uiOffsetWithinSectionVal,
+ unsigned int uiNumBytes)
{
int Status = STATUS_SUCCESS;
int SectionStartOffset = 0;
- UINT uiAbsoluteOffset = 0 ;
- UINT uiTemp =0, value =0 ;
+ unsigned int uiAbsoluteOffset = 0;
+ unsigned int uiTemp = 0, value = 0;
if (Adapter == NULL) {
pr_info("Adapter structure is NULL\n");
return -EINVAL;
@@ -3131,14 +3131,14 @@ int BcmFlash2xBulkWrite(
PMINI_ADAPTER Adapter,
PUINT pBuffer,
FLASH2X_SECTION_VAL eFlash2xSectVal,
- UINT uiOffset,
- UINT uiNumBytes,
- UINT bVerify)
+ unsigned int uiOffset,
+ unsigned int uiNumBytes,
+ unsigned int bVerify)
{
int Status = STATUS_SUCCESS;
- UINT FlashSectValStartOffset = 0;
- UINT uiTemp = 0, value = 0;
+ unsigned int FlashSectValStartOffset = 0;
+ unsigned int uiTemp = 0, value = 0;
if (Adapter == NULL) {
pr_info("Adapter structure is NULL\n");
return -EINVAL;
@@ -3263,11 +3263,11 @@ static int BcmGetActiveISO(PMINI_ADAPTER Adapter)
* Failure:-FALSE, offset is RO
*
**/
-B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, UINT uiOffset)
+B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, unsigned int uiOffset)
{
- UINT uiSectorNum = 0;
- UINT uiWordOfSectorPermission =0;
- UINT uiBitofSectorePermission = 0;
+ unsigned int uiSectorNum = 0;
+ unsigned int uiWordOfSectorPermission = 0;
+ unsigned int uiBitofSectorePermission = 0;
B_UINT32 permissionBits = 0;
uiSectorNum = uiOffset/Adapter->uiSectorSize;
@@ -3805,14 +3805,14 @@ int BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
char *Buff = NULL;
FLASH2X_SECTION_VAL eISOReadPart = 0, eISOWritePart = 0;
- UINT uiReadOffsetWithinPart = 0, uiWriteOffsetWithinPart = 0;
- UINT uiTotalDataToCopy = 0;
+ unsigned int uiReadOffsetWithinPart = 0, uiWriteOffsetWithinPart = 0;
+ unsigned int uiTotalDataToCopy = 0;
BOOLEAN IsThisHeaderSector = FALSE ;
- UINT sigOffset = 0;
- UINT ISOLength = 0;
- UINT Status = STATUS_SUCCESS;
- UINT SigBuff[MAX_RW_SIZE];
- UINT i = 0;
+ unsigned int sigOffset = 0;
+ unsigned int ISOLength = 0;
+ unsigned int Status = STATUS_SUCCESS;
+ unsigned int SigBuff[MAX_RW_SIZE];
+ unsigned int i = 0;
if (ReadISOSignature(Adapter, sCopySectStrut.SrcSection) != ISO_IMAGE_MAGIC_NUMBER) {
pr_info("error as Source ISO Section does not have valid signature\n");
@@ -4135,8 +4135,8 @@ int BcmFlash2xCorruptSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
int BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionVal)
{
- UINT uiSignature = 0 ;
- UINT uiOffset = 0;
+ unsigned int uiSignature = 0;
+ unsigned int uiOffset = 0;
//DSD_HEADER dsdHeader = {0};
if (Adapter->bSigCorrupted == FALSE) {
@@ -4199,9 +4199,9 @@ int BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionV
**/
int validateFlash2xReadWrite(PMINI_ADAPTER Adapter, PFLASH2X_READWRITE psFlash2xReadWrite)
{
- UINT uiNumOfBytes = 0 ;
- UINT uiSectStartOffset = 0 ;
- UINT uiSectEndOffset = 0;
+ unsigned int uiNumOfBytes = 0;
+ unsigned int uiSectStartOffset = 0;
+ unsigned int uiSectEndOffset = 0;
uiNumOfBytes = psFlash2xReadWrite->numOfBytes;
if (IsSectionExistInFlash(Adapter, psFlash2xReadWrite->Section) != TRUE) {
@@ -4278,7 +4278,7 @@ int IsFlash2x(PMINI_ADAPTER Adapter)
static int GetFlashBaseAddr(PMINI_ADAPTER Adapter)
{
- UINT uiBaseAddr = 0;
+ unsigned int uiBaseAddr = 0;
if (Adapter->bDDRInitDone) {
/*
@@ -4326,11 +4326,11 @@ static int GetFlashBaseAddr(PMINI_ADAPTER Adapter)
int BcmCopySection(PMINI_ADAPTER Adapter,
FLASH2X_SECTION_VAL SrcSection,
FLASH2X_SECTION_VAL DstSection,
- UINT offset,
- UINT numOfBytes)
+ unsigned int offset,
+ unsigned int numOfBytes)
{
- UINT BuffSize = 0 ;
- UINT BytesToBeCopied = 0;
+ unsigned int BuffSize = 0;
+ unsigned int BytesToBeCopied = 0;
unsigned char *pBuff = NULL;
int Status = STATUS_SUCCESS ;
if (SrcSection == DstSection) {
@@ -4433,13 +4433,13 @@ int BcmCopySection(PMINI_ADAPTER Adapter,
**/
-int SaveHeaderIfPresent(PMINI_ADAPTER Adapter, unsigned char *pBuff, UINT uiOffset)
+int SaveHeaderIfPresent(PMINI_ADAPTER Adapter, unsigned char *pBuff, unsigned int uiOffset)
{
- UINT offsetToProtect = 0, HeaderSizeToProtect =0;
+ unsigned int offsetToProtect = 0, HeaderSizeToProtect = 0;
BOOLEAN bHasHeader = FALSE ;
unsigned char *pTempBuff = NULL;
- UINT uiSectAlignAddr = 0;
- UINT sig = 0;
+ unsigned int uiSectAlignAddr = 0;
+ unsigned int sig = 0;
//making the offset sector aligned
uiSectAlignAddr = uiOffset & ~(Adapter->uiSectorSize - 1);
@@ -4503,12 +4503,12 @@ int SaveHeaderIfPresent(PMINI_ADAPTER Adapter, unsigned char *pBuff, UINT uiOffs
OutPut:-
Select the Appropriate chip and retrn status Success
**/
-static int BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
+static int BcmDoChipSelect(PMINI_ADAPTER Adapter, unsigned int offset)
{
- UINT FlashConfig = 0;
+ unsigned int FlashConfig = 0;
int ChipNum = 0;
- UINT GPIOConfig = 0;
- UINT PartNum = 0;
+ unsigned int GPIOConfig = 0;
+ unsigned int PartNum = 0;
ChipNum = offset / FLASH_PART_SIZE ;
@@ -4580,8 +4580,8 @@ static int BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
}
int ReadDSDSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd)
{
- UINT uiDSDsig = 0;
- //UINT sigoffsetInMap = 0;
+ unsigned int uiDSDsig = 0;
+ //unsigned int sigoffsetInMap = 0;
//DSD_HEADER dsdHeader = {0};
@@ -4605,7 +4605,7 @@ int ReadDSDSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd)
}
int ReadDSDPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd)
{
- //UINT priOffsetInMap = 0 ;
+ //unsigned int priOffsetInMap = 0;
unsigned int uiDSDPri = STATUS_FAILURE;
//DSD_HEADER dsdHeader = {0};
//priOffsetInMap = (unsigned char *)&(dsdHeader.DSDImagePriority) -(unsigned char *)&dsdHeader;
@@ -4658,8 +4658,8 @@ FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter)
int ReadISOSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso)
{
- UINT uiISOsig = 0;
- //UINT sigoffsetInMap = 0;
+ unsigned int uiISOsig = 0;
+ //unsigned int sigoffsetInMap = 0;
//ISO_HEADER ISOHeader = {0};
@@ -4727,16 +4727,16 @@ FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter)
int WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter,
PUINT pBuff,
FLASH2X_SECTION_VAL eFlash2xSectionVal,
- UINT uiOffset,
- UINT uiNumBytes
+ unsigned int uiOffset,
+ unsigned int uiNumBytes
)
{
#if !defined(BCM_SHM_INTERFACE) || defined(FLASH_DIRECT_ACCESS)
- UINT uiTemp = 0, value = 0 ;
- UINT i = 0;
- UINT uiPartOffset = 0;
+ unsigned int uiTemp = 0, value = 0;
+ unsigned int i = 0;
+ unsigned int uiPartOffset = 0;
#endif
- UINT uiStartOffset = 0;
+ unsigned int uiStartOffset = 0;
//Adding section start address
int Status = STATUS_SUCCESS;
unsigned char *pcBuff = (unsigned char *)pBuff;
@@ -4866,10 +4866,10 @@ static int CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
{
unsigned char *pBuff = NULL;
- UINT sig = 0;
- UINT uiOffset = 0;
- UINT BlockStatus = 0;
- UINT uiSectAlignAddr = 0;
+ unsigned int sig = 0;
+ unsigned int uiOffset = 0;
+ unsigned int BlockStatus = 0;
+ unsigned int uiSectAlignAddr = 0;
Adapter->bSigCorrupted = FALSE;
@@ -4929,8 +4929,8 @@ static int CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
{
unsigned char *pBuff = NULL;
- UINT sig = 0;
- UINT uiOffset = 0;
+ unsigned int sig = 0;
+ unsigned int uiOffset = 0;
Adapter->bSigCorrupted = FALSE;
diff --git a/drivers/staging/bcm/nvm.h b/drivers/staging/bcm/nvm.h
index c8e38e9..93fd477 100644
--- a/drivers/staging/bcm/nvm.h
+++ b/drivers/staging/bcm/nvm.h
@@ -23,8 +23,8 @@
#define _NVM_H_
typedef struct _FLASH_SECTOR_INFO {
- UINT uiSectorSig;
- UINT uiSectorSize;
+ unsigned int uiSectorSig;
+ unsigned int uiSectorSize;
}FLASH_SECTOR_INFO,*PFLASH_SECTOR_INFO;
diff --git a/drivers/staging/bcm/vendorspecificextn.c b/drivers/staging/bcm/vendorspecificextn.c
index 2929f68..60ba23c 100644
--- a/drivers/staging/bcm/vendorspecificextn.c
+++ b/drivers/staging/bcm/vendorspecificextn.c
@@ -65,7 +65,7 @@ int vendorextnExit(PMINI_ADAPTER Adapter)
// STATUS_SUCCESS/STATUS_FAILURE as per the IOCTL return value
//
//--------------------------------------------------------------------------
-int vendorextnIoctl(PMINI_ADAPTER Adapter, UINT cmd, ULONG arg)
+int vendorextnIoctl(PMINI_ADAPTER Adapter, unsigned int cmd, ULONG arg)
{
return CONTINUE_COMMON_PATH;
}
@@ -90,7 +90,7 @@ int vendorextnIoctl(PMINI_ADAPTER Adapter, UINT cmd, ULONG arg)
//------------------------------------------------------------------
int vendorextnReadSection(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal,
- UINT offset, UINT numOfBytes)
+ unsigned int offset, unsigned int numOfBytes)
{
return STATUS_FAILURE;
}
@@ -115,7 +115,7 @@ int vendorextnReadSection(void *pContext, unsigned char *pBuffer, FLASH2X_SECTIO
//
//------------------------------------------------------------------
int vendorextnWriteSection(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal,
- UINT offset, UINT numOfBytes, BOOLEAN bVerify)
+ unsigned int offset, unsigned int numOfBytes, BOOLEAN bVerify)
{
return STATUS_FAILURE;
}
@@ -139,7 +139,7 @@ int vendorextnWriteSection(void *pContext, unsigned char *pBuffer, FLASH2X_SECTI
//
//------------------------------------------------------------------
int vendorextnWriteSectionWithoutErase(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal,
- UINT offset, UINT numOfBytes)
+ unsigned int offset, unsigned int numOfBytes)
{
return STATUS_FAILURE;
}
diff --git a/drivers/staging/bcm/vendorspecificextn.h b/drivers/staging/bcm/vendorspecificextn.h
index 26ce151..afd6b4c 100644
--- a/drivers/staging/bcm/vendorspecificextn.h
+++ b/drivers/staging/bcm/vendorspecificextn.h
@@ -7,12 +7,12 @@
int vendorextnGetSectionInfo(void *pContext, PFLASH2X_VENDORSPECIFIC_INFO pVendorInfo);
int vendorextnExit(PMINI_ADAPTER Adapter);
int vendorextnInit(PMINI_ADAPTER Adapter);
-int vendorextnIoctl(PMINI_ADAPTER Adapter, UINT cmd, ULONG arg);
+int vendorextnIoctl(PMINI_ADAPTER Adapter, unsigned int cmd, ULONG arg);
int vendorextnReadSection(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal,
- UINT offset, UINT numOfBytes);
+ unsigned int offset, unsigned int numOfBytes);
int vendorextnWriteSection(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal,
- UINT offset, UINT numOfBytes, BOOLEAN bVerify);
+ unsigned int offset, unsigned int numOfBytes, BOOLEAN bVerify);
int vendorextnWriteSectionWithoutErase(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal,
- UINT offset, UINT numOfBytes);
+ unsigned int offset, unsigned int numOfBytes);
#endif /* */
--
1.7.8.111.gad25c.dirty
More information about the devel
mailing list