Use the normal types.
Delete the now unused typdef.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/staging/bcm/Adapter.h | 60 +++++++++++++++---------------
drivers/staging/bcm/Bcmchar.c | 36 +++++++++---------
drivers/staging/bcm/CmHost.c | 60 +++++++++++++++---------------
drivers/staging/bcm/CmHost.h | 4 +-
drivers/staging/bcm/DDRInit.c | 14 +++---
drivers/staging/bcm/HostMIBSInterface.h | 50 ++++++++++++------------
drivers/staging/bcm/IPv6Protocol.c | 6 +-
drivers/staging/bcm/IPv6ProtocolHdr.h | 16 ++++----
drivers/staging/bcm/InterfaceAdapter.h | 2 +-
drivers/staging/bcm/InterfaceDld.c | 4 +-
drivers/staging/bcm/InterfaceIdleMode.c | 2 +-
drivers/staging/bcm/Ioctl.h | 18 ++++----
drivers/staging/bcm/LeakyBucket.c | 8 ++--
drivers/staging/bcm/Misc.c | 10 ++--
drivers/staging/bcm/PHSDefines.h | 4 +-
drivers/staging/bcm/PHSModule.c | 26 ++++++------
drivers/staging/bcm/PHSModule.h | 8 ++--
drivers/staging/bcm/Protocol.h | 4 +-
drivers/staging/bcm/Prototypes.h | 4 +-
drivers/staging/bcm/Qos.c | 4 +-
drivers/staging/bcm/Typedefs.h | 1 -
drivers/staging/bcm/led_control.c | 18 ++++----
drivers/staging/bcm/nvm.c | 24 ++++++------
drivers/staging/bcm/vendorspecificextn.c | 2 +-
drivers/staging/bcm/vendorspecificextn.h | 2 +-
25 files changed, 193 insertions(+), 194 deletions(-)
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 8e0ddb5..8de4da0 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -36,13 +36,13 @@ typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;
//classification extension is added
typedef struct _ADD_CONNECTION {
- ULONG SrcIpAddressCount;
- ULONG SrcIpAddress[MAX_CONNECTIONS];
- ULONG SrcIpMask[MAX_CONNECTIONS];
+ unsigned long SrcIpAddressCount;
+ unsigned long SrcIpAddress[MAX_CONNECTIONS];
+ unsigned long SrcIpMask[MAX_CONNECTIONS];
- ULONG DestIpAddressCount;
- ULONG DestIpAddress[MAX_CONNECTIONS];
- ULONG DestIpMask[MAX_CONNECTIONS];
+ unsigned long DestIpAddressCount;
+ unsigned long DestIpAddress[MAX_CONNECTIONS];
+ unsigned long DestIpMask[MAX_CONNECTIONS];
unsigned short SrcPortBegin;
unsigned short SrcPortEnd;
@@ -69,8 +69,8 @@ typedef struct _CLASSIFICATION_RULE {
typedef struct _CLASSIFICATION_ONLY {
unsigned short usVcid;
- ULONG DestIpAddress;
- ULONG DestIpMask;
+ unsigned long DestIpAddress;
+ unsigned long DestIpMask;
unsigned short usPortLo;
unsigned short usPortHi;
BOOLEAN bIpVersion;
@@ -85,12 +85,12 @@ typedef struct _CLASSIFICATION_ONLY {
typedef union _U_IP_ADDRESS {
struct {
- ULONG ulIpv4Addr[MAX_IP_RANGE_LENGTH];//Source Ip Address
Range
- ULONG ulIpv4Mask[MAX_IP_RANGE_LENGTH];//Source Ip Mask
Address Range
+ unsigned long ulIpv4Addr[MAX_IP_RANGE_LENGTH];//Source Ip
Address Range
+ unsigned long ulIpv4Mask[MAX_IP_RANGE_LENGTH];//Source Ip
Mask Address Range
};
struct {
- ULONG ulIpv6Addr[MAX_IP_RANGE_LENGTH * 4];//Source Ip Address
Range
- ULONG ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4];//Source Ip Mask
Address Range
+ unsigned long ulIpv6Addr[MAX_IP_RANGE_LENGTH * 4];//Source Ip
Address Range
+ unsigned long ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4];//Source Ip
Mask Address Range
};
struct {
@@ -113,7 +113,7 @@ typedef struct _S_HDR_SUPRESSION_CONTEXTINFO {
typedef struct _S_CLASSIFIER_RULE {
- ULONG ulSFID;
+ unsigned long ulSFID;
unsigned char ucReserved[2];
B_UINT16 uiClassifierRuleIndex;
BOOLEAN bUsed;
@@ -168,7 +168,7 @@ typedef struct _S_CLASSIFIER_RULE {
typedef struct _S_FRAGMENTED_PACKET_INFO {
BOOLEAN bUsed;
- ULONG ulSrcIpAddress;
+ unsigned long ulSrcIpAddress;
unsigned short usIpIdentification;
S_CLASSIFIER_RULE *pstMatchedClassifierEntry;
BOOLEAN bOutOfOrderFragment;
@@ -176,7 +176,7 @@ typedef struct _S_FRAGMENTED_PACKET_INFO {
struct _packet_info {
//classification extension Rule
- ULONG ulSFID;
+ unsigned long ulSFID;
unsigned short usVCID_Value;
unsigned int uiThreshold;
// This field determines the priority of the SF Queues
@@ -254,7 +254,7 @@ typedef struct _PER_TARANG_DATA {
BOOLEAN MacTracingEnabled;
BOOLEAN bApplicationToExit;
S_MIBS_DROPPED_APP_CNTRL_MESSAGES stDroppedAppCntrlMsgs;
- ULONG RxCntrlMsgBitMask;
+ unsigned long RxCntrlMsgBitMask;
} PER_TARANG_DATA, *PPER_TARANG_DATA;
@@ -342,7 +342,7 @@ typedef struct _TARGET_PARAMS {
#endif
typedef struct _STTARGETDSXBUFFER {
- ULONG ulTargetDsxBuffer;
+ unsigned long ulTargetDsxBuffer;
B_UINT16 tid;
BOOLEAN valid;
}STTARGETDSXBUFFER, *PSTTARGETDSXBUFFER;
@@ -397,8 +397,8 @@ struct _MINI_ADAPTER {
/*************** qos ******************/
BOOLEAN bETHCSEnabled;
- ULONG BEBucketSize;
- ULONG rtPSBucketSize;
+ unsigned long BEBucketSize;
+ unsigned long rtPSBucketSize;
unsigned char LinkStatus;
BOOLEAN AutoLinkUp;
BOOLEAN AutoSyncup;
@@ -419,11 +419,11 @@ struct _MINI_ADAPTER {
struct semaphore rdmwrmsync;
STTARGETDSXBUFFER astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS];
- ULONG ulFreeTargetBufferCnt;
- ULONG ulCurrentTargetBuffer;
- ULONG ulTotalTargetBuffersAvailable;
+ unsigned long ulFreeTargetBufferCnt;
+ unsigned long ulCurrentTargetBuffer;
+ unsigned long ulTotalTargetBuffersAvailable;
- unsigned long chip_id;
+ unsigned long chip_id;
wait_queue_head_t lowpower_mode_wait_queue;
@@ -442,7 +442,7 @@ struct _MINI_ADAPTER {
BOOLEAN bIsAutoCorrectEnabled;
BOOLEAN bDDRInitDone;
int DDRSetting;
- ULONG ulPowerSaveMode;
+ unsigned long ulPowerSaveMode;
spinlock_t txtransmitlock;
B_UINT8 txtransmit_running;
/* Thread for control packet handling */
@@ -504,9 +504,9 @@ struct _MINI_ADAPTER {
//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.
unsigned int ulFlashCalStart;
- ULONG ulFlashControlSectionStart;
- ULONG ulFlashWriteSize;
- ULONG ulFlashID;
+ unsigned long ulFlashControlSectionStart;
+ unsigned long ulFlashWriteSize;
+ unsigned long ulFlashID;
FP_FLASH_WRITE fpFlashWrite;
FP_FLASH_WRITE_STATUS fpFlashWriteWithStatusCheck;
@@ -540,7 +540,7 @@ struct _MINI_ADAPTER {
BOOLEAN StopAllXaction ;
UINT32 liTimeSinceLastNetEntry; //Used to Support extended CAPI
requirements from
struct semaphore LowPowerModeSync;
- ULONG liDrainCalculated;
+ unsigned long liDrainCalculated;
unsigned int gpioBitMap;
S_BCM_DEBUG_STATE stDebugState;
@@ -560,8 +560,8 @@ typedef struct _ETH_HEADER_STRUC ETH_HEADER_STRUC,
*PETH_HEADER_STRUC;
typedef struct FirmwareInfo {
void __user * pvMappedFirmwareAddress;
- ULONG u32FirmwareLength;
- ULONG u32StartingAddress;
+ unsigned long u32FirmwareLength;
+ unsigned long u32StartingAddress;
}__attribute__((packed)) FIRMWARE_INFO, *PFIRMWARE_INFO;
// holds the value of net_device structure..
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 89a7611..61b0e52 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, unsigned int cmd, ULONG arg)
+static long bcm_char_ioctl(struct file *filp, unsigned int cmd, unsigned long
arg)
{
PPER_TARANG_DATA pTarang = filp->private_data;
void __user *argp = (void __user *)arg;
@@ -272,7 +272,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned int
cmd, ULONG arg)
}
Status = wrmalt(Adapter, (unsigned int)sWrmBuffer.Register,
- (unsigned int *)sWrmBuffer.Data, sizeof(ULONG));
+ (unsigned int *)sWrmBuffer.Data,
sizeof(unsigned long));
if (Status == STATUS_SUCCESS) {
bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL, "WRM Done\n");
@@ -315,8 +315,8 @@ static long bcm_char_ioctl(struct file *filp, unsigned int
cmd, ULONG arg)
if (!temp_buff)
return STATUS_FAILURE;
- if ((((ULONG)sRdmBuffer.Register & 0x0F000000) != 0x0F000000) ||
- ((ULONG)sRdmBuffer.Register & 0x3)) {
+ if ((((unsigned long)sRdmBuffer.Register & 0x0F000000) !=
0x0F000000) ||
+ ((unsigned long)sRdmBuffer.Register & 0x3)) {
pr_info("RDM Done On invalid Address : %x Access
Denied\n",
(int)sRdmBuffer.Register);
@@ -364,8 +364,8 @@ static long bcm_char_ioctl(struct file *filp, unsigned int
cmd, ULONG arg)
if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer,
IoBuffer.InputLength))
return -EFAULT;
- if ((((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||
- ((ULONG)sWrmBuffer.Register & 0x3)) {
+ if ((((unsigned long)sWrmBuffer.Register & 0x0F000000) !=
0x0F000000) ||
+ ((unsigned long)sWrmBuffer.Register & 0x3)) {
pr_info("WRM Done On invalid Address : %x Access
Denied\n",
(int)sWrmBuffer.Register);
@@ -529,7 +529,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned int
cmd, ULONG arg)
break;
case IOCTL_BCM_GPIO_STATUS_REQUEST: {
- ULONG uiBit = 0;
+ unsigned long uiBit = 0;
unsigned char ucRead[4];
GPIO_INFO gpio_info = {0};
@@ -603,7 +603,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned int
cmd, ULONG arg)
if (*(unsigned int *)ucResetValue)
Status = wrmaltWithLock(Adapter,
BCM_GPIO_OUTPUT_SET_REG,
- (unsigned int
*)ucResetValue, sizeof(ULONG));
+ (unsigned int
*)ucResetValue, sizeof(unsigned long));
if (Status != STATUS_SUCCESS) {
pr_info("WRM to BCM_GPIO_OUTPUT_SET_REG
Failed\n");
@@ -616,7 +616,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned int
cmd, ULONG arg)
(~(pgpio_multi_info[WIMAX_IDX].uiGPIOValue)));
if (*(unsigned int *)ucResetValue)
- Status = wrmaltWithLock(Adapter,
BCM_GPIO_OUTPUT_CLR_REG, (unsigned int *)ucResetValue, sizeof(ULONG));
+ Status = wrmaltWithLock(Adapter,
BCM_GPIO_OUTPUT_CLR_REG, (unsigned int *)ucResetValue, sizeof(unsigned long));
if (Status != STATUS_SUCCESS) {
pr_info("WRM to BCM_GPIO_OUTPUT_CLR_REG
Failed\n");
@@ -701,7 +701,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned int
cmd, ULONG arg)
*/
pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(unsigned int
*)ucResetValue;
- Status = wrmaltWithLock(Adapter, GPIO_MODE_REGISTER,
(unsigned int *)ucResetValue, sizeof(ULONG));
+ Status = wrmaltWithLock(Adapter, GPIO_MODE_REGISTER,
(unsigned int *)ucResetValue, sizeof(unsigned long));
if (Status == STATUS_SUCCESS) {
bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
"WRM to GPIO_MODE_REGISTER Done\n");
@@ -1073,7 +1073,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned
int cmd, ULONG arg)
}
case IOCTL_BCM_GET_DSX_INDICATION: {
- ULONG ulSFId = 0;
+ unsigned long ulSFId = 0;
if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
return -EFAULT;
@@ -1153,7 +1153,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned
int cmd, ULONG arg)
if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
return -EFAULT;
- if (IoBuffer.InputLength < sizeof(ULONG) * 2)
+ if (IoBuffer.InputLength < sizeof(unsigned long) * 2)
return -EINVAL;
pvBuffer = kmalloc(IoBuffer.InputLength, GFP_KERNEL);
@@ -1168,8 +1168,8 @@ static long bcm_char_ioctl(struct file *filp, unsigned
int cmd, ULONG arg)
pBulkBuffer = (PBULKWRM_BUFFER)pvBuffer;
- if (((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
- ((ULONG)pBulkBuffer->Register & 0x3)) {
+ if (((unsigned long)pBulkBuffer->Register & 0x0F000000) !=
0x0F000000 ||
+ ((unsigned long)pBulkBuffer->Register & 0x3)) {
kfree(pvBuffer);
pr_info("WRM Done On invalid Address : %x Access
Denied\n",
(int)pBulkBuffer->Register);
@@ -1192,9 +1192,9 @@ static long bcm_char_ioctl(struct file *filp, unsigned
int cmd, ULONG arg)
}
if (pBulkBuffer->SwapEndian == FALSE)
- Status = wrmWithLock(Adapter, (unsigned
int)pBulkBuffer->Register, (char *)pBulkBuffer->Values, IoBuffer.InputLength -
2*sizeof(ULONG));
+ Status = wrmWithLock(Adapter, (unsigned
int)pBulkBuffer->Register, (char *)pBulkBuffer->Values, IoBuffer.InputLength -
2*sizeof(unsigned long));
else
- Status = wrmaltWithLock(Adapter, (unsigned
int)pBulkBuffer->Register, (unsigned int *)pBulkBuffer->Values,
IoBuffer.InputLength - 2*sizeof(ULONG));
+ Status = wrmaltWithLock(Adapter, (unsigned
int)pBulkBuffer->Register, (unsigned int *)pBulkBuffer->Values,
IoBuffer.InputLength - 2*sizeof(unsigned long));
if (Status != STATUS_SUCCESS)
pr_info("WRM Failed\n");
@@ -1289,7 +1289,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned
int cmd, ULONG arg)
case IOCTL_BCM_NVM_WRITE: {
NVM_READWRITE stNVMReadWrite;
unsigned char *pReadData = NULL;
- ULONG ulDSDMagicNumInUsrBuff = 0;
+ unsigned long ulDSDMagicNumInUsrBuff = 0;
struct timeval tv0, tv1;
memset(&tv0, 0, sizeof(struct timeval));
memset(&tv1, 0, sizeof(struct timeval));
@@ -2014,7 +2014,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned
int cmd, ULONG arg)
}
case IOCTL_BCM_CNTRLMSG_MASK: {
- ULONG RxCntrlMsgBitMask = 0;
+ unsigned long RxCntrlMsgBitMask = 0;
/* Copy Ioctl Buffer structure */
Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 95f4678..96fa166 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -16,7 +16,7 @@ typedef enum _E_CLASSIFIER_ACTION
eDeleteClassifier
}E_CLASSIFIER_ACTION;
-static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid);
+static unsigned long GetNextTargetBufferLocation(PMINI_ADAPTER Adapter,
B_UINT16 tid);
/************************************************************
* Function - SearchSfid
@@ -68,7 +68,7 @@ static int SearchFreeSfid(PMINI_ADAPTER Adapter)
Return: int :Classifier table index of
matching entry
*/
-static int SearchClsid(PMINI_ADAPTER Adapter, ULONG ulSFID, B_UINT16
uiClassifierID)
+static int SearchClsid(PMINI_ADAPTER Adapter, unsigned long ulSFID, B_UINT16
uiClassifierID)
{
unsigned int uiClassifierIndex = 0;
for (uiClassifierIndex = 0; uiClassifierIndex < MAX_CLASSIFIERS;
uiClassifierIndex++) {
@@ -241,7 +241,7 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE
*pstClassifierEntry ,
void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN
bFreeAll)
{
- ULONG ulIndex;
+ unsigned long ulIndex;
for (ulIndex = 0; ulIndex < Adapter->ulTotalTargetBuffersAvailable;
ulIndex++) {
if (Adapter->astTargetDsxBuffer[ulIndex].valid)
continue;
@@ -265,7 +265,7 @@ static inline void CopyClassifierRuleToSF(PMINI_ADAPTER
Adapter, stConvergenceSL
//void *pvPhsContext = NULL;
unsigned int ucLoopIndex = 0;
//unsigned char ucProtocolLength=0;
- //ULONG ulPhsStatus;
+ //unsigned long ulPhsStatus;
if (Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value == 0 ||
@@ -426,7 +426,7 @@ static inline void DeleteClassifierRuleFromSF(PMINI_ADAPTER
Adapter, unsigned in
B_UINT16 u16PacketClassificationRuleIndex;
unsigned short usVCID;
//void *pvPhsContext = NULL;
- //ULONG ulPhsStatus;
+ //unsigned long ulPhsStatus;
usVCID = Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
@@ -463,7 +463,7 @@ void DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter,
unsigned int uiSearchRuleI
//B_UINT16 u16PacketClassificationRuleIndex;
unsigned short ulVCID;
//void *pvPhsContext = NULL;
- //ULONG ulPhsStatus;
+ //unsigned long ulPhsStatus;
ulVCID = Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
@@ -501,7 +501,7 @@ static void CopyToAdapter( register PMINI_ADAPTER Adapter,
/**<Pointer to the A
stLocalSFAddIndicationAlt *pstAddIndication)
{
//unsigned char ucProtocolLength=0;
- ULONG ulSFID;
+ unsigned long ulSFID;
unsigned int nClassifierIndex = 0;
E_CLASSIFIER_ACTION eClassifierAction = eInvalidClassifierAction;
B_UINT16 u16PacketClassificationRuleIndex=0;
@@ -1773,7 +1773,7 @@ static void DumpCmControlPacket(void *pvBuffer)
}
-static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG
ulAddrSFParamSet, unsigned char *pucDestBuffer)
+static inline unsigned long RestoreSFParam(PMINI_ADAPTER Adapter, unsigned
long ulAddrSFParamSet, unsigned char *pucDestBuffer)
{
unsigned int nBytesToRead = sizeof(stServiceFlowParamSI);
@@ -1792,7 +1792,7 @@ static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter,
ULONG ulAddrSFParamSet
}
-static ULONG StoreSFParam(PMINI_ADAPTER Adapter, unsigned char *pucSrcBuffer,
ULONG ulAddrSFParamSet)
+static unsigned long StoreSFParam(PMINI_ADAPTER Adapter, unsigned char
*pucSrcBuffer, unsigned long ulAddrSFParamSet)
{
unsigned int nBytesToWrite = sizeof(stServiceFlowParamSI);
int ret = 0;
@@ -1810,13 +1810,13 @@ static ULONG StoreSFParam(PMINI_ADAPTER Adapter,
unsigned char *pucSrcBuffer, UL
return 1;
}
-ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffer,
unsigned int *puBufferLength)
+unsigned long StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void
*pvBuffer, unsigned int *puBufferLength)
{
stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL;
stLocalSFAddIndication * pstAddIndication = NULL;
stLocalSFDeleteRequest *pstDeletionRequest;
unsigned int uiSearchRuleIndex;
- ULONG ulSFID;
+ unsigned long ulSFID;
pstAddIndicationAlt = (stLocalSFAddIndicationAlt *)(pvBuffer);
@@ -1856,11 +1856,11 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER
Adapter, void *pvBuffer, unsig
return 0;
if (StoreSFParam(Adapter, (unsigned char
*)&pstAddIndicationAlt->sfAuthorizedSet,
- (ULONG)pstAddIndication->psfAuthorizedSet)!= 1)
+ (unsigned long)pstAddIndication->psfAuthorizedSet)!= 1)
return 0;
/* this can't possibly be right */
- pstAddIndication->psfAuthorizedSet = (stServiceFlowParamSI
*)ntohl((ULONG)pstAddIndication->psfAuthorizedSet);
+ pstAddIndication->psfAuthorizedSet = (stServiceFlowParamSI
*)ntohl((unsigned long)pstAddIndication->psfAuthorizedSet);
if (pstAddIndicationAlt->u8Type == DSA_REQ) {
stLocalSFAddRequest AddRequest;
@@ -1892,10 +1892,10 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER
Adapter, void *pvBuffer, unsig
GetNextTargetBufferLocation(Adapter,
pstAddIndicationAlt->u16TID);
if (!pstAddIndication->psfAdmittedSet)
return 0;
- if (StoreSFParam(Adapter, (unsigned char
*)&pstAddIndicationAlt->sfAdmittedSet, (ULONG)pstAddIndication->psfAdmittedSet)
!= 1)
+ if (StoreSFParam(Adapter, (unsigned char
*)&pstAddIndicationAlt->sfAdmittedSet, (unsigned
long)pstAddIndication->psfAdmittedSet) != 1)
return 0;
- pstAddIndication->psfAdmittedSet = (stServiceFlowParamSI
*)ntohl((ULONG)pstAddIndication->psfAdmittedSet);
+ pstAddIndication->psfAdmittedSet = (stServiceFlowParamSI
*)ntohl((unsigned long)pstAddIndication->psfAdmittedSet);
/* ACTIVE SET */
@@ -1903,10 +1903,10 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER
Adapter, void *pvBuffer, unsig
GetNextTargetBufferLocation(Adapter,
pstAddIndicationAlt->u16TID);
if (!pstAddIndication->psfActiveSet)
return 0;
- if (StoreSFParam(Adapter, (unsigned char
*)&pstAddIndicationAlt->sfActiveSet, (ULONG)pstAddIndication->psfActiveSet) !=
1)
+ if (StoreSFParam(Adapter, (unsigned char
*)&pstAddIndicationAlt->sfActiveSet, (unsigned
long)pstAddIndication->psfActiveSet) != 1)
return 0;
- pstAddIndication->psfActiveSet = (stServiceFlowParamSI
*)ntohl((ULONG)pstAddIndication->psfActiveSet);
+ pstAddIndication->psfActiveSet = (stServiceFlowParamSI
*)ntohl((unsigned long)pstAddIndication->psfActiveSet);
(*puBufferLength) = sizeof(stLocalSFAddIndication);
*(stLocalSFAddIndication *)pvBuffer = *pstAddIndication;
@@ -1918,7 +1918,7 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER
Adapter, void *pvBuffer, unsig
static inline stLocalSFAddIndicationAlt
*RestoreCmControlResponseMessage(register PMINI_ADAPTER Adapter, register void
*pvBuffer)
{
- ULONG ulStatus=0;
+ unsigned long ulStatus = 0;
stLocalSFAddIndication *pstAddIndication = NULL;
stLocalSFAddIndicationAlt *pstAddIndicationDest = NULL;
pstAddIndication = (stLocalSFAddIndication *)(pvBuffer);
@@ -1976,7 +1976,7 @@ static inline stLocalSFAddIndicationAlt
pstAddIndicationDest->u8CC = pstAddIndication->u8CC;
bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "Restoring Active Set\n");
- ulStatus=RestoreSFParam(Adapter, (ULONG)pstAddIndication->psfActiveSet,
(unsigned char *)&pstAddIndicationDest->sfActiveSet);
+ ulStatus = RestoreSFParam(Adapter, (unsigned
long)pstAddIndication->psfActiveSet, (unsigned char
*)&pstAddIndicationDest->sfActiveSet);
if (ulStatus != 1) {
goto failed_restore_sf_param;
}
@@ -1984,7 +1984,7 @@ static inline stLocalSFAddIndicationAlt
pstAddIndicationDest->sfActiveSet.u8TotalClassifiers =
MAX_CLASSIFIERS_IN_SF;
bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "Restoring Admitted Set\n");
- ulStatus=RestoreSFParam(Adapter,
(ULONG)pstAddIndication->psfAdmittedSet, (unsigned char
*)&pstAddIndicationDest->sfAdmittedSet);
+ ulStatus = RestoreSFParam(Adapter, (unsigned
long)pstAddIndication->psfAdmittedSet, (unsigned char
*)&pstAddIndicationDest->sfAdmittedSet);
if (ulStatus != 1) {
goto failed_restore_sf_param;
}
@@ -1992,7 +1992,7 @@ static inline stLocalSFAddIndicationAlt
pstAddIndicationDest->sfAdmittedSet.u8TotalClassifiers =
MAX_CLASSIFIERS_IN_SF;
bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "Restoring Authorized Set\n");
- ulStatus=RestoreSFParam(Adapter,
(ULONG)pstAddIndication->psfAuthorizedSet, (unsigned char
*)&pstAddIndicationDest->sfAuthorizedSet);
+ ulStatus = RestoreSFParam(Adapter, (unsigned
long)pstAddIndication->psfAuthorizedSet, (unsigned char
*)&pstAddIndicationDest->sfAuthorizedSet);
if (ulStatus != 1) {
goto failed_restore_sf_param;
}
@@ -2016,11 +2016,11 @@ failed_restore_sf_param:
return NULL;
}
-ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
+unsigned long SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
{
- ULONG ulTargetDsxBuffersBase = 0;
- ULONG ulCntTargetBuffers;
- ULONG ulIndex=0;
+ unsigned long ulTargetDsxBuffersBase = 0;
+ unsigned long ulCntTargetBuffers;
+ unsigned long ulIndex = 0;
int Status;
if (!Adapter) {
@@ -2077,10 +2077,10 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
return 1;
}
-static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid)
+static unsigned long GetNextTargetBufferLocation(PMINI_ADAPTER Adapter,
B_UINT16 tid)
{
- ULONG ulTargetDSXBufferAddress;
- ULONG ulTargetDsxBufferIndexToUse, ulMaxTry;
+ unsigned long ulTargetDSXBufferAddress;
+ unsigned long ulTargetDsxBufferIndexToUse, ulMaxTry;
if ((Adapter->ulTotalTargetBuffersAvailable == 0)||
(Adapter->ulFreeTargetBufferCnt == 0)) {
@@ -2382,7 +2382,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,
/**<Pointer to the Adap
break;
case DSD_REQ: {
unsigned int uiSearchRuleIndex;
- ULONG ulSFID;
+ unsigned long ulSFID;
pLeader->PLength = sizeof(stLocalSFDeleteIndication);
*((stLocalSFDeleteIndication*)&(Adapter->caDsxReqResp[LEADER_SIZE])) =
*((stLocalSFDeleteIndication*)pstAddIndication);
@@ -2447,7 +2447,7 @@ void OverrideServiceFlowParams(PMINI_ADAPTER Adapter,
unsigned int *puiBuffer)
B_UINT32 u32NumofSFsinMsg = ntohl(*(puiBuffer + 1));
stIM_SFHostNotify *pHostInfo = NULL;
unsigned int uiSearchRuleIndex = 0;
- ULONG ulSFID = 0;
+ unsigned long ulSFID = 0;
puiBuffer+=2;
diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 5043001..fe884de 100644
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -148,12 +148,12 @@ typedef struct stLocalSFChangeIndicationAlt{
}stLocalSFChangeIndicationAlt;
-ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffer,
unsigned int *puBufferLength);
+unsigned long StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void
*pvBuffer, unsigned int *puBufferLength);
int AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter);
int FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter);
-ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter);
+unsigned long SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter);
BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffer);
diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c
index bdbbfe2..e20c5a3 100644
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
@@ -775,7 +775,7 @@ static DDR_SET_NODE asT3LPB_DDRSetting80MHz[]= {// # DPLL
Clock Setting
int ddr_init(MINI_ADAPTER *Adapter)
{
PDDR_SETTING psDDRSetting=NULL;
- ULONG RegCount=0;
+ unsigned long RegCount = 0;
unsigned int value = 0;
unsigned int uiResetValue = 0;
unsigned int uiClockSetting = 0;
@@ -1109,7 +1109,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
int download_ddr_settings(PMINI_ADAPTER Adapter)
{
PDDR_SET_NODE psDDRSetting=NULL;
- ULONG RegCount=0;
+ unsigned long RegCount = 0;
unsigned long ul_ddr_setting_load_addr =
DDR_DUMP_INTERNAL_DEVICE_MEMORY;
unsigned int value = 0;
int retval = STATUS_SUCCESS;
@@ -1239,7 +1239,7 @@ int download_ddr_settings(PMINI_ADAPTER Adapter)
return retval;
}
- ul_ddr_setting_load_addr+=sizeof(ULONG);
+ ul_ddr_setting_load_addr += sizeof(unsigned long);
/*signature */
value =(0x1d1e0dd0);
retval = wrmalt(Adapter, ul_ddr_setting_load_addr, &value,
sizeof(value));
@@ -1248,13 +1248,13 @@ int download_ddr_settings(PMINI_ADAPTER Adapter)
return retval;
}
- ul_ddr_setting_load_addr+=sizeof(ULONG);
- RegCount*=(sizeof(DDR_SETTING)/sizeof(ULONG));
+ ul_ddr_setting_load_addr += sizeof(unsigned long);
+ RegCount *= (sizeof(DDR_SETTING)/sizeof(unsigned long));
while (RegCount && !retval) {
value = psDDRSetting->ulRegAddress ;
retval = wrmalt( Adapter, ul_ddr_setting_load_addr, &value,
sizeof(value));
- ul_ddr_setting_load_addr+=sizeof(ULONG);
+ ul_ddr_setting_load_addr += sizeof(unsigned long);
if (!retval) {
if (bOverrideSelfRefresh && (psDDRSetting->ulRegAddress
== 0x0F007018)) {
value = (psDDRSetting->ulRegValue |(1<<8));
@@ -1273,7 +1273,7 @@ int download_ddr_settings(PMINI_ADAPTER Adapter)
}
}
}
- ul_ddr_setting_load_addr+=sizeof(ULONG);
+ ul_ddr_setting_load_addr += sizeof(unsigned long);
RegCount--;
psDDRSetting++;
}
diff --git a/drivers/staging/bcm/HostMIBSInterface.h
b/drivers/staging/bcm/HostMIBSInterface.h
index 2d326df..35d1e63 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -25,15 +25,15 @@
typedef union _U_MIBS_IP_ADDRESS {
struct {
//Source Ip Address Range
- ULONG ulIpv4Addr[MIBS_MAX_IP_RANGE_LENGTH];
+ unsigned long ulIpv4Addr[MIBS_MAX_IP_RANGE_LENGTH];
//Source Ip Mask Address Range
- ULONG ulIpv4Mask[MIBS_MAX_IP_RANGE_LENGTH];
+ unsigned long ulIpv4Mask[MIBS_MAX_IP_RANGE_LENGTH];
};
struct {
//Source Ip Address Range
- ULONG ulIpv6Addr[MIBS_MAX_IP_RANGE_LENGTH * 4];
+ unsigned long ulIpv6Addr[MIBS_MAX_IP_RANGE_LENGTH * 4];
//Source Ip Mask Address Range
- ULONG ulIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * 4];
+ unsigned long ulIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * 4];
};
struct {
@@ -53,17 +53,17 @@ typedef struct _S_MIBS_HOST_INFO {
ULONG64 GoodTransmits;
ULONG64 GoodReceives;
// this to keep track of the Tx and Rx MailBox Registers.
- ULONG NumDesUsed;
- ULONG CurrNumFreeDesc;
- ULONG PrevNumFreeDesc;
+ unsigned long NumDesUsed;
+ unsigned long CurrNumFreeDesc;
+ unsigned long PrevNumFreeDesc;
// to keep track the no of byte received
- ULONG PrevNumRcevBytes;
- ULONG CurrNumRcevBytes;
+ unsigned long PrevNumRcevBytes;
+ unsigned long CurrNumRcevBytes;
/* QOS Related */
- ULONG BEBucketSize;
- ULONG rtPSBucketSize;
- ULONG LastTxQueueIndex;
+ unsigned long BEBucketSize;
+ unsigned long rtPSBucketSize;
+ unsigned long LastTxQueueIndex;
BOOLEAN TxOutofDescriptors;
BOOLEAN TimerActive;
UINT32 u32TotalDSD;
@@ -72,7 +72,7 @@ typedef struct _S_MIBS_HOST_INFO {
}S_MIBS_HOST_INFO;
typedef struct _S_MIBS_CLASSIFIER_RULE {
- ULONG ulSFID;
+ unsigned long ulSFID;
unsigned char ucReserved[2];
B_UINT16 uiClassifierRuleIndex;
BOOLEAN bUsed;
@@ -109,7 +109,7 @@ typedef struct _S_MIBS_CLASSIFIER_RULE {
typedef struct _S_MIBS_PHS_RULE {
- ULONG ulSFID;
+ unsigned long ulSFID;
/// brief 8bit PHSI Of The Service Flow
B_UINT8 u8PHSI;
/// brief PHSF Of The Service Flow
@@ -126,8 +126,8 @@ typedef struct _S_MIBS_PHS_RULE {
B_UINT8 reserved[5];
long PHSModifiedBytes;
- ULONG PHSModifiedNumPackets;
- ULONG PHSErrorNumPackets;
+ unsigned long PHSModifiedNumPackets;
+ unsigned long PHSErrorNumPackets;
}S_MIBS_PHS_RULE;
typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS {
@@ -158,7 +158,7 @@ typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS {
typedef struct _S_MIBS_SERVICEFLOW_TABLE {
//classification extension Rule
- ULONG ulSFID;
+ unsigned long ulSFID;
unsigned short usVCID_Value;
unsigned int uiThreshold;
// This field determines the priority of the SF Queues
@@ -195,14 +195,14 @@ typedef struct _S_MIBS_SERVICEFLOW_TABLE {
}S_MIBS_SERVICEFLOW_TABLE;
typedef struct _S_MIBS_DROPPED_APP_CNTRL_MESSAGES {
- ULONG cm_responses;
- ULONG cm_control_newdsx_multiclassifier_resp;
- ULONG link_control_resp;
- ULONG status_rsp;
- ULONG stats_pointer_resp;
- ULONG idle_mode_status;
- ULONG auth_ss_host_msg;
- ULONG low_priority_message;
+ unsigned long cm_responses;
+ unsigned long cm_control_newdsx_multiclassifier_resp;
+ unsigned long link_control_resp;
+ unsigned long status_rsp;
+ unsigned long stats_pointer_resp;
+ unsigned long idle_mode_status;
+ unsigned long auth_ss_host_msg;
+ unsigned long low_priority_message;
}S_MIBS_DROPPED_APP_CNTRL_MESSAGES;
diff --git a/drivers/staging/bcm/IPv6Protocol.c
b/drivers/staging/bcm/IPv6Protocol.c
index 3141b91..3a93be3 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -252,7 +252,7 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE
*pstClassifierRule, IPV6Hea
unsigned int uiLoopIndex = 0;
unsigned int uiIpv6AddIndex = 0;
unsigned int uiIpv6AddrNoLongWords = 4;
- ULONG aulSrcIP[4];
+ unsigned long aulSrcIP[4];
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
/*
//This is the no. of Src Addresses ie Range of IP Addresses contained
@@ -304,7 +304,7 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE
*pstClassifierRule, IPV6He
unsigned int uiLoopIndex = 0;
unsigned int uiIpv6AddIndex = 0;
unsigned int uiIpv6AddrNoLongWords = 4;
- ULONG aulDestIP[4];
+ unsigned long aulDestIP[4];
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
/*
//This is the no. of Destination Addresses ie Range of IP Addresses
contained
@@ -352,7 +352,7 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE
*pstClassifierRule, IPV6He
}
-void DumpIpv6Address(ULONG *puIpv6Address)
+void DumpIpv6Address(unsigned long *puIpv6Address)
{
unsigned int uiIpv6AddrNoLongWords = 4;
unsigned int uiIpv6AddIndex = 0;
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h
b/drivers/staging/bcm/IPv6ProtocolHdr.h
index d781b29..c23ffdb0 100644
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -23,7 +23,7 @@
*/
#define IPV6_DESTOPTS_HDR_OPTIONSIZE 0x8
-//typedef unsigned long int ULONG;
+//typedef unsigned long int unsigned long;
typedef struct IPV6HeaderFormatTag {
unsigned char ucVersionPrio;
@@ -31,8 +31,8 @@ typedef struct IPV6HeaderFormatTag {
unsigned short usPayloadLength;
unsigned char ucNextHeader;
unsigned char ucHopLimit;
- ULONG ulSrcIpAddress[4];
- ULONG ulDestIpAddress[4];
+ unsigned long ulSrcIpAddress[4];
+ unsigned long ulDestIpAddress[4];
}IPV6Header;
typedef struct IPV6RoutingHeaderFormatTag {
@@ -40,7 +40,7 @@ typedef struct IPV6RoutingHeaderFormatTag {
unsigned char ucRoutingType;
unsigned char ucNumAddresses;
unsigned char ucNextAddress;
- ULONG ulReserved;
+ unsigned long ulReserved;
//unsigned char aucAddressList[0];
}IPV6RoutingHeader;
@@ -49,7 +49,7 @@ typedef struct IPV6FragmentHeaderFormatTag {
unsigned char ucNextHeader;
unsigned char ucReserved;
unsigned short usFragmentOffset;
- ULONG ulIdentification;
+ unsigned long ulIdentification;
}IPV6FragmentHeader;
typedef struct IPV6DestOptionsHeaderFormatTag {
@@ -62,14 +62,14 @@ typedef struct IPV6DestOptionsHeaderFormatTag {
typedef struct IPV6HopByHopOptionsHeaderFormatTag {
unsigned char ucNextHeader;
unsigned char ucMisc[3];
- ULONG ulJumboPayloadLen;
+ unsigned long ulJumboPayloadLen;
}IPV6HopByHopOptionsHeader;
typedef struct IPV6AuthenticationHeaderFormatTag {
unsigned char ucNextHeader;
unsigned char ucLength;
unsigned short usReserved;
- ULONG ulSecurityParametersIndex;
+ unsigned long ulSecurityParametersIndex;
//unsigned char ucAuthenticationData[0];
}IPV6AuthenticationHeader;
@@ -97,7 +97,7 @@ unsigned short IpVersion6(PMINI_ADAPTER Adapter, /**<
Pointer to the driver cont
void *pcIpHeader, /**<Pointer to the IP Hdr of the packet*/
S_CLASSIFIER_RULE *pstClassifierRule );
-void DumpIpv6Address(ULONG *puIpv6Address);
+void DumpIpv6Address(unsigned long *puIpv6Address);
extern BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule, unsigned
short ushSrcPort);
extern BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule, unsigned
short ushSrcPort);
diff --git a/drivers/staging/bcm/InterfaceAdapter.h
b/drivers/staging/bcm/InterfaceAdapter.h
index c411b1b..abfe87c 100644
--- a/drivers/staging/bcm/InterfaceAdapter.h
+++ b/drivers/staging/bcm/InterfaceAdapter.h
@@ -67,7 +67,7 @@ typedef struct _S_INTERFACE_ADAPTER {
- ULONG ulInterruptData[2];
+ unsigned long ulInterruptData[2];
struct urb *psInterruptUrb;
diff --git a/drivers/staging/bcm/InterfaceDld.c
b/drivers/staging/bcm/InterfaceDld.c
index b9c9617..4157fa8 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,
unsigned int u32FirmwareLength, ULONG u32StartingAddress)
+static int buffDnld(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer,
unsigned int u32FirmwareLength, unsigned long u32StartingAddress)
{
unsigned int len = 0;
int retval = STATUS_SUCCESS;
@@ -329,7 +329,7 @@ static int buffDnld(PMINI_ADAPTER Adapter, unsigned char
*mappedbuffer, unsigned
return retval;
}
-static int buffRdbkVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer,
unsigned int u32FirmwareLength, ULONG u32StartingAddress)
+static int buffRdbkVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer,
unsigned int u32FirmwareLength, unsigned long u32StartingAddress)
{
unsigned int len = u32FirmwareLength;
int retval = STATUS_SUCCESS;
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c
b/drivers/staging/bcm/InterfaceIdleMode.c
index 02c6ebf..2d82d08 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -239,7 +239,7 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter,
unsigned int Pattern)
}
int InterfaceIdleModeWakeup(PMINI_ADAPTER Adapter)
{
- ULONG Status = 0;
+ unsigned long Status = 0;
if (Adapter->bTriedToWakeUpFromlowPowerMode) {
bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
"Wake up already attempted.. ignoring\n");
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index 5709afa..5a8f4f5 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -2,23 +2,23 @@
#define _IOCTL_H_
typedef struct rdmbuffer {
- ULONG Register;
- ULONG Length;
+ unsigned long Register;
+ unsigned long Length;
}__attribute__((packed)) RDM_BUFFER, *PRDM_BUFFER;
typedef struct wrmbuffer {
- ULONG Register;
- ULONG Length;
+ unsigned long Register;
+ unsigned long Length;
unsigned char Data[4];
}__attribute__((packed)) WRM_BUFFER, *PWRM_BUFFER;
typedef struct ioctlbuffer {
void __user *InputBuffer;
- ULONG InputLength;
+ unsigned long InputLength;
void __user *OutputBuffer;
- ULONG OutputLength;
+ unsigned long OutputLength;
}__attribute__((packed)) IOCTL_BUFFER, *PIOCTL_BUFFER;
typedef struct stGPIOInfo {
@@ -218,9 +218,9 @@ typedef struct _NVM_READWRITE {
} NVM_READWRITE,*PNVM_READWRITE;
typedef struct bulkwrmbuffer {
- ULONG Register;
- ULONG SwapEndian;
- ULONG Values[1];
+ unsigned long Register;
+ unsigned long SwapEndian;
+ unsigned long Values[1];
}BULKWRM_BUFFER,*PBULKWRM_BUFFER;
diff --git a/drivers/staging/bcm/LeakyBucket.c
b/drivers/staging/bcm/LeakyBucket.c
index 5a67422..27e49cc 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -17,7 +17,7 @@
static void UpdateTokenCount(register PMINI_ADAPTER Adapter)
{
- ULONG liCurrentTime;
+ unsigned long liCurrentTime;
int i = 0;
struct timeval tv;
@@ -37,9 +37,9 @@ static void UpdateTokenCount(register PMINI_ADAPTER Adapter)
(tv.tv_usec-Adapter->PackInfo[i].stLastUpdateTokenAt.tv_usec)/
1000);
if (0!=liCurrentTime) {
- Adapter->PackInfo[i].uiCurrentTokenCount +=
(ULONG)
+ Adapter->PackInfo[i].uiCurrentTokenCount +=
(unsigned long)
((Adapter->PackInfo[i].uiMaxAllowedRate) *
- ((ULONG)((liCurrentTime)))/1000);
+ ((unsigned
long)((liCurrentTime)))/1000);
memcpy(&Adapter->PackInfo[i].stLastUpdateTokenAt,
&tv, sizeof(struct timeval));
Adapter->PackInfo[i].liLastUpdateTokenAt =
liCurrentTime;
@@ -71,7 +71,7 @@ static void UpdateTokenCount(register PMINI_ADAPTER Adapter)
* Returns - The number of bytes allowed for transmission.
*
***********************************************************************/
-static ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF)
+static unsigned long GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF)
{
bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL,
"IsPacketAllowedForFlow ===>\n");
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 8ebb7f3..984c64c 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -454,7 +454,7 @@ static void SendStatisticsPointerRequest(PMINI_ADAPTER
Adapter, PLINK_REQUEST ps
{
bcm_dbg(Adapter, RX, RX_DPC, ALL, "======>\n");
pstStatisticsPtrRequest->Leader.Status = STATS_POINTER_REQ_STATUS;
- pstStatisticsPtrRequest->Leader.PLength = sizeof(ULONG); /* minimum 4
bytes */
+ pstStatisticsPtrRequest->Leader.PLength = sizeof(unsigned long); /*
minimum 4 bytes */
pstStatisticsPtrRequest->szData[0] = STATISTICS_POINTER_REQ;
CopyBufferToControlPacket(Adapter, pstStatisticsPtrRequest);
bcm_dbg(Adapter, RX, RX_DPC, ALL, "<=====\n");
@@ -490,7 +490,7 @@ void LinkMessage(PMINI_ADAPTER Adapter)
pstLinkRequest->szData[0] = LINK_UP_REQ_PAYLOAD;
pstLinkRequest->szData[1] = LINK_SYNC_UP_SUBTYPE;
pstLinkRequest->Leader.Status = LINK_UP_CONTROL_REQ;
- pstLinkRequest->Leader.PLength = sizeof(ULONG);
+ pstLinkRequest->Leader.PLength = sizeof(unsigned long);
Adapter->bSyncUpRequestSent = TRUE;
} else if (Adapter->LinkStatus == PHY_SYNC_ACHIVED &&
Adapter->AutoLinkUp) {
@@ -506,7 +506,7 @@ void LinkMessage(PMINI_ADAPTER Adapter)
pstLinkRequest->szData[0] = LINK_UP_REQ_PAYLOAD;
pstLinkRequest->szData[1] = LINK_NET_ENTRY;
pstLinkRequest->Leader.Status = LINK_UP_CONTROL_REQ;
- pstLinkRequest->Leader.PLength = sizeof(ULONG);
+ pstLinkRequest->Leader.PLength = sizeof(unsigned long);
}
if (pstLinkRequest) {
bcm_dbg(Adapter, OTHERS, LINK_UP_MSG, ALL,
@@ -1707,7 +1707,7 @@ void ResetCounters(PMINI_ADAPTER Adapter)
Adapter->bShutStatus = FALSE;
}
-S_CLASSIFIER_RULE *GetFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short
usIpIdentification, ULONG SrcIP)
+S_CLASSIFIER_RULE *GetFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short
usIpIdentification, unsigned long SrcIP)
{
unsigned int uiIndex = 0;
for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES;
uiIndex++) {
@@ -1732,7 +1732,7 @@ void AddFragIPClsEntry(PMINI_ADAPTER Adapter,
PS_FRAGMENTED_PACKET_INFO psFragPk
}
}
-void DelFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short
usIpIdentification, ULONG SrcIp)
+void DelFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short
usIpIdentification, unsigned long SrcIp)
{
unsigned int uiIndex = 0;
for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES;
uiIndex++) {
diff --git a/drivers/staging/bcm/PHSDefines.h b/drivers/staging/bcm/PHSDefines.h
index 365e933..d528bc0 100644
--- a/drivers/staging/bcm/PHSDefines.h
+++ b/drivers/staging/bcm/PHSDefines.h
@@ -65,8 +65,8 @@ typedef struct _S_PHS_RULE {
B_UINT8 u8Reserved[3];
long PHSModifiedBytes;
- ULONG PHSModifiedNumPackets;
- ULONG PHSErrorNumPackets;
+ unsigned long PHSModifiedNumPackets;
+ unsigned long PHSErrorNumPackets;
}S_PHS_RULE;
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 48864ab..3b660bb 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -29,7 +29,7 @@ static int phs_decompress(unsigned char *in_buf, unsigned
char *out_buf,\
S_PHS_RULE *phs_rules, unsigned int *header_size);
-static ULONG PhsCompress(void* pvContext,
+static unsigned long PhsCompress(void* pvContext,
B_UINT16 uiVcid,
B_UINT16 uiClsId,
void *pvInputBuffer,
@@ -37,7 +37,7 @@ static ULONG PhsCompress(void* pvContext,
unsigned int *pOldHeaderSize,
unsigned int *pNewHeaderSize);
-static ULONG PhsDeCompress(void* pvContext,
+static unsigned long PhsDeCompress(void* pvContext,
B_UINT16 uiVcid,
void *pvInputBuffer,
void *pvOutputBuffer,
@@ -374,13 +374,13 @@ int PhsCleanup(IN PPHS_DEVICE_EXTENSION pPHSDeviceExt)
>0 Error.
--*/
-ULONG PhsUpdateClassifierRule(IN void* pvContext,
+unsigned long PhsUpdateClassifierRule(IN void* pvContext,
IN B_UINT16 uiVcid ,
IN B_UINT16 uiClsId ,
IN S_PHS_RULE *psPhsRule,
IN B_UINT8 u8AssociatedPHSI)
{
- ULONG lStatus =0;
+ unsigned long lStatus = 0;
unsigned int nSFIndex = 0;
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -440,9 +440,9 @@ ULONG PhsUpdateClassifierRule(IN void* pvContext,
--*/
-ULONG PhsDeletePHSRule(IN void* pvContext, IN B_UINT16 uiVcid, IN B_UINT8
u8PHSI)
+unsigned long PhsDeletePHSRule(IN void* pvContext, IN B_UINT16 uiVcid, IN
B_UINT8 u8PHSI)
{
- ULONG lStatus =0;
+ unsigned long lStatus = 0;
unsigned int nSFIndex = 0, nClsidIndex = 0;
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL;
@@ -502,9 +502,9 @@ ULONG PhsDeletePHSRule(IN void* pvContext, IN B_UINT16
uiVcid, IN B_UINT8 u8PHSI
>0 Error.
--*/
-ULONG PhsDeleteClassifierRule(IN void* pvContext, IN B_UINT16 uiVcid , IN
B_UINT16 uiClsId)
+unsigned long PhsDeleteClassifierRule(IN void* pvContext, IN B_UINT16 uiVcid ,
IN B_UINT16 uiClsId)
{
- ULONG lStatus =0;
+ unsigned long lStatus = 0;
unsigned int nSFIndex = 0, nClsidIndex = 0;
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
@@ -561,10 +561,10 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext, IN
B_UINT16 uiVcid , IN B_UINT
>0 Error.
--*/
-ULONG PhsDeleteSFRules(IN void* pvContext, IN B_UINT16 uiVcid)
+unsigned long PhsDeleteSFRules(IN void* pvContext, IN B_UINT16 uiVcid)
{
- ULONG lStatus =0;
+ unsigned long lStatus = 0;
unsigned int nSFIndex = 0, nClsidIndex = 0;
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL;
@@ -642,7 +642,7 @@ ULONG PhsDeleteSFRules(IN void* pvContext, IN B_UINT16
uiVcid)
>0 Error.
--*/
-ULONG PhsCompress(IN void* pvContext,
+unsigned long PhsCompress(IN void* pvContext,
IN B_UINT16 uiVcid,
IN B_UINT16 uiClsId,
IN void *pvInputBuffer,
@@ -654,7 +654,7 @@ ULONG PhsCompress(IN void* pvContext,
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
S_PHS_RULE *pstPhsRule = NULL;
- ULONG lStatus =0;
+ unsigned long lStatus = 0;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -735,7 +735,7 @@ ULONG PhsCompress(IN void* pvContext,
>0 Error.
--*/
-ULONG PhsDeCompress(IN void* pvContext,
+unsigned long PhsDeCompress(IN void* pvContext,
IN B_UINT16 uiVcid,
IN void *pvInputBuffer,
OUT void *pvOutputBuffer,
diff --git a/drivers/staging/bcm/PHSModule.h b/drivers/staging/bcm/PHSModule.h
index 054d36d..9ac3535 100644
--- a/drivers/staging/bcm/PHSModule.h
+++ b/drivers/staging/bcm/PHSModule.h
@@ -30,13 +30,13 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,
PMINI_ADAPTER Adapter);
int PhsCleanup(PPHS_DEVICE_EXTENSION pPHSDeviceExt);
//Utility Functions
-ULONG PhsUpdateClassifierRule(void* pvContext, B_UINT16 uiVcid, B_UINT16
uiClsId, S_PHS_RULE *psPhsRule, B_UINT8 u8AssociatedPHSI );
+unsigned long PhsUpdateClassifierRule(void* pvContext, B_UINT16 uiVcid,
B_UINT16 uiClsId, S_PHS_RULE *psPhsRule, B_UINT8 u8AssociatedPHSI );
-ULONG PhsDeletePHSRule(void* pvContext, B_UINT16 uiVcid, B_UINT8 u8PHSI);
+unsigned long PhsDeletePHSRule(void* pvContext, B_UINT16 uiVcid, B_UINT8
u8PHSI);
-ULONG PhsDeleteClassifierRule(void* pvContext, B_UINT16 uiVcid , B_UINT16
uiClsId);
+unsigned long PhsDeleteClassifierRule(void* pvContext, B_UINT16 uiVcid ,
B_UINT16 uiClsId);
-ULONG PhsDeleteSFRules(void* pvContext, B_UINT16 uiVcid) ;
+unsigned long PhsDeleteSFRules(void* pvContext, B_UINT16 uiVcid) ;
BOOLEAN ValidatePHSRule(S_PHS_RULE *psPhsRule);
diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h
index f399c06..dc4004d 100644
--- a/drivers/staging/bcm/Protocol.h
+++ b/drivers/staging/bcm/Protocol.h
@@ -127,8 +127,8 @@ typedef enum _E_SERVICEFLOW_CS_SPEC_
typedef struct _TCP_HEADER {
unsigned short usSrcPort;
unsigned short usDestPort;
- ULONG ulSeqNumber;
- ULONG ulAckNumber;
+ unsigned long ulSeqNumber;
+ unsigned long ulAckNumber;
unsigned char HeaderLength;
unsigned char ucFlags;
unsigned short usWindowsSize;
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 876430e..67e5919 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -101,11 +101,11 @@ void ResetCounters(PMINI_ADAPTER Adapter);
int InitLedSettings(PMINI_ADAPTER Adapter);
-S_CLASSIFIER_RULE *GetFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short
usIpIdentification, ULONG SrcIP);
+S_CLASSIFIER_RULE *GetFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short
usIpIdentification, unsigned long SrcIP);
void AddFragIPClsEntry(PMINI_ADAPTER Adapter, PS_FRAGMENTED_PACKET_INFO
psFragPktInfo);
-void DelFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short
usIpIdentification, ULONG SrcIp);
+void DelFragIPClsEntry(PMINI_ADAPTER Adapter, unsigned short
usIpIdentification, unsigned long SrcIp);
void update_per_cid_rx (PMINI_ADAPTER Adapter);
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 9817dbf..8d4d023 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -24,7 +24,7 @@ static void PruneQueue(PMINI_ADAPTER Adapter, int iIndex);
*
* Returns - TRUE(If address matches) else FAIL .
*********************************************************************/
-BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule, ULONG ulSrcIP)
+BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule, unsigned long
ulSrcIP)
{
unsigned char ucLoopIndex=0;
@@ -60,7 +60,7 @@ BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE
*pstClassifierRule, ULONG ulSrcIP)
*
* Returns - TRUE(If address matches) else FAIL .
*********************************************************************/
-BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule, ULONG
ulDestIP)
+BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule, unsigned long
ulDestIP)
{
unsigned char ucLoopIndex = 0;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index 17d8661..6e8da32 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -14,7 +14,6 @@ typedef char BOOLEAN;
typedef unsigned char B_UINT8;
typedef unsigned short B_UINT16;
typedef unsigned int B_UINT32;
-typedef unsigned long ULONG;
typedef unsigned long DWORD;
typedef unsigned long* PULONG;
diff --git a/drivers/staging/bcm/led_control.c
b/drivers/staging/bcm/led_control.c
index 077099d..0722cf5 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -24,7 +24,7 @@ BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, unsigned
int gpios)
}
static int LED_Blink(PMINI_ADAPTER Adapter, unsigned int GPIO_Num, unsigned
char uiLedIndex,
- ULONG timeout, int num_of_time, LedEventInfo_t
currdriverstate)
+ unsigned long timeout, int num_of_time, LedEventInfo_t
currdriverstate)
{
int Status = STATUS_SUCCESS;
BOOLEAN bInfinite = FALSE;
@@ -72,7 +72,7 @@ static int LED_Blink(PMINI_ADAPTER Adapter, unsigned int
GPIO_Num, unsigned char
return Status;
}
-static int ScaleRateofTransfer(ULONG rate)
+static int ScaleRateofTransfer(unsigned long rate)
{
if (rate <= 3)
return rate;
@@ -116,8 +116,8 @@ static int LED_Proportional_Blink(PMINI_ADAPTER Adapter,
unsigned char GPIO_Num_
Initial_num_of_packts_rx = Adapter->dev->stats.rx_packets;
/* Scale the rate of transfer to no of blinks. */
- num_of_time_tx = ScaleRateofTransfer((ULONG)rate_of_transfer_tx);
- num_of_time_rx = ScaleRateofTransfer((ULONG)rate_of_transfer_rx);
+ num_of_time_tx = ScaleRateofTransfer((unsigned
long)rate_of_transfer_tx);
+ num_of_time_rx = ScaleRateofTransfer((unsigned
long)rate_of_transfer_rx);
while ((Adapter->device_removed == FALSE)) {
timeout = 50;
@@ -235,9 +235,9 @@ static int LED_Proportional_Blink(PMINI_ADAPTER Adapter,
unsigned char GPIO_Num_
/* Scale the rate of transfer to no of blinks. */
num_of_time_tx =
- ScaleRateofTransfer((ULONG)rate_of_transfer_tx);
+ ScaleRateofTransfer((unsigned long)rate_of_transfer_tx);
num_of_time_rx =
- ScaleRateofTransfer((ULONG)rate_of_transfer_rx);
+ ScaleRateofTransfer((unsigned long)rate_of_transfer_rx);
}
return Status;
@@ -259,7 +259,7 @@ static int LED_Proportional_Blink(PMINI_ADAPTER Adapter,
unsigned char GPIO_Num_
* <OSAL_STATUS_CODE>
*
-----------------------------------------------------------------------------
*/
-static int ValidateDSDParamsChecksum(PMINI_ADAPTER Adapter, ULONG
ulParamOffset,
+static int ValidateDSDParamsChecksum(PMINI_ADAPTER Adapter, unsigned long
ulParamOffset,
unsigned short usParamLen)
{
int Status = STATUS_SUCCESS;
@@ -341,7 +341,7 @@ exit:
* <OSAL_STATUS_CODE>
*
-----------------------------------------------------------------------------
*/
-static int ValidateHWParmStructure(PMINI_ADAPTER Adapter, ULONG
ulHwParamOffset)
+static int ValidateHWParmStructure(PMINI_ADAPTER Adapter, unsigned long
ulHwParamOffset)
{
int Status = STATUS_SUCCESS;
@@ -370,7 +370,7 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER
Adapter,
{
int Status = STATUS_SUCCESS;
- ULONG dwReadValue = 0;
+ unsigned long dwReadValue = 0;
unsigned short usHwParamData = 0;
unsigned short usEEPROMVersion = 0;
unsigned char ucIndex = 0;
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 8977dbe..58691be 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -638,7 +638,7 @@ static int flashByteWrite(
int iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; //3
unsigned int value;
- ULONG ulData = *(unsigned char *)pData;
+ unsigned long ulData = *(unsigned char *)pData;
int bytes;
//
@@ -800,7 +800,7 @@ static int flashByteWriteStatus(
{
unsigned int uiStatus = 0;
int iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; //3
- ULONG ulData = *(unsigned char *)pData;
+ unsigned long ulData = *(unsigned char *)pData;
unsigned int value;
int bytes;
@@ -949,7 +949,7 @@ static int flashWriteStatus(
//
//-----------------------------------------------------------------------------
-static void BcmRestoreBlockProtectStatus(PMINI_ADAPTER Adapter, ULONG
ulWriteStatus)
+static void BcmRestoreBlockProtectStatus(PMINI_ADAPTER Adapter, unsigned long
ulWriteStatus)
{
unsigned int value;
value = (FLASH_CMD_WRITE_ENABLE<< 24);
@@ -969,13 +969,13 @@ static void BcmRestoreBlockProtectStatus(PMINI_ADAPTER
Adapter, ULONG ulWriteSta
// Adapter - ptr to Adapter object instance
// uiOffset - Offset of the flash where data needs to be written
to. This should be Sector aligned.
// Returns:
-// ULONG - Status value before UnProtect.
+// unsigned long - Status value before UnProtect.
//
//-----------------------------------------------------------------------------
-static ULONG BcmFlashUnProtectBlock(PMINI_ADAPTER Adapter, unsigned int
uiOffset, unsigned int uiLength)
+static unsigned long BcmFlashUnProtectBlock(PMINI_ADAPTER Adapter, unsigned
int uiOffset, unsigned int uiLength)
{
- ULONG ulStatus = 0;
- ULONG ulWriteStatus = 0;
+ unsigned long ulStatus = 0;
+ unsigned long ulWriteStatus = 0;
unsigned int value;
uiOffset = uiOffset&0x000FFFFF;
@@ -1085,7 +1085,7 @@ static int BeceemFlashBulkWrite(
unsigned int uiSectBoundary = 0;
unsigned int uiNumSectTobeRead = 0;
unsigned char ucReadBk[16] = {0};
- ULONG ulStatus = 0;
+ unsigned long ulStatus = 0;
int Status = STATUS_SUCCESS;
unsigned int uiTemp = 0;
unsigned int index = 0;
@@ -1299,7 +1299,7 @@ static int BeceemFlashBulkWriteStatus(
unsigned int uiSectBoundary = 0;
unsigned int uiNumSectTobeRead = 0;
unsigned char ucReadBk[16] = {0};
- ULONG ulStatus = 0;
+ unsigned long ulStatus = 0;
unsigned int Status = STATUS_SUCCESS;
unsigned int uiTemp = 0;
unsigned int index = 0;
@@ -2024,7 +2024,7 @@ int BeceemNVMWrite(
}
} else {
if ((uiOffset+uiNumBytes) > EEPROM_CALPARAM_START) {
- ULONG ulBytesTobeSkipped = 0;
+ unsigned long ulBytesTobeSkipped = 0;
unsigned char *pcBuffer = (unsigned char
*)pBuffer;// char pointer to take care of odd byte cases.
uiNumBytes -= (EEPROM_CALPARAM_START -
uiOffset);
ulBytesTobeSkipped += (EEPROM_CALPARAM_START -
uiOffset);
@@ -2318,9 +2318,9 @@ static void BcmValidateNvmType(PMINI_ADAPTER Adapter)
// Returns:
// Flash ID
//-----------------------------------------------------------------------------
-static ULONG BcmReadFlashRDID(PMINI_ADAPTER Adapter)
+static unsigned long BcmReadFlashRDID(PMINI_ADAPTER Adapter)
{
- ULONG ulRDID = 0;
+ unsigned long ulRDID = 0;
unsigned int value;
//
// Read ID Instruction.
diff --git a/drivers/staging/bcm/vendorspecificextn.c
b/drivers/staging/bcm/vendorspecificextn.c
index 60ba23c..5d3adf2 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, unsigned int cmd, ULONG arg)
+int vendorextnIoctl(PMINI_ADAPTER Adapter, unsigned int cmd, unsigned long arg)
{
return CONTINUE_COMMON_PATH;
}
diff --git a/drivers/staging/bcm/vendorspecificextn.h
b/drivers/staging/bcm/vendorspecificextn.h
index afd6b4c..c515ca7 100644
--- a/drivers/staging/bcm/vendorspecificextn.h
+++ b/drivers/staging/bcm/vendorspecificextn.h
@@ -7,7 +7,7 @@
int vendorextnGetSectionInfo(void *pContext, PFLASH2X_VENDORSPECIFIC_INFO
pVendorInfo);
int vendorextnExit(PMINI_ADAPTER Adapter);
int vendorextnInit(PMINI_ADAPTER Adapter);
-int vendorextnIoctl(PMINI_ADAPTER Adapter, unsigned int cmd, ULONG arg);
+int vendorextnIoctl(PMINI_ADAPTER Adapter, unsigned int cmd, unsigned long
arg);
int vendorextnReadSection(void *pContext, unsigned char *pBuffer,
FLASH2X_SECTION_VAL SectionVal,
unsigned int offset, unsigned int numOfBytes);
int vendorextnWriteSection(void *pContext, unsigned char *pBuffer,
FLASH2X_SECTION_VAL SectionVal,
--
1.7.8.111.gad25c.dirty
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
