Use the normal types.
Remove the now unused typedef.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/bcm/Adapter.h | 8 +-
drivers/staging/bcm/CmHost.c | 2 +-
drivers/staging/bcm/CmHost.h | 36 +++---
drivers/staging/bcm/HostMIBSInterface.h | 22 ++--
drivers/staging/bcm/Misc.c | 2 +-
drivers/staging/bcm/PHSDefines.h | 28 ++--
drivers/staging/bcm/PHSModule.c | 22 ++--
drivers/staging/bcm/PHSModule.h | 4 +-
drivers/staging/bcm/Qos.c | 6 +-
drivers/staging/bcm/Typedefs.h | 1 -
drivers/staging/bcm/cntrl_SignalingInterface.h | 172 ++++++++++++------------
drivers/staging/bcm/led_control.c | 4 +-
drivers/staging/bcm/nvm.c | 4 +-
13 files changed, 155 insertions(+), 156 deletions(-)
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 8de4da0..14e0b76 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -118,7 +118,7 @@ typedef struct _S_CLASSIFIER_RULE {
B_UINT16 uiClassifierRuleIndex;
BOOLEAN bUsed;
unsigned short usVCID_Value;
- B_UINT8 u8ClassifierRulePriority; //This field detemines the Classifier Priority
+ unsigned char u8ClassifierRulePriority; //This field detemines the Classifier Priority
U_IP_ADDRESS stSrcIpAddress;
unsigned char ucIPSourceAddressLength;//Ip Source Address Length
@@ -180,13 +180,13 @@ struct _packet_info {
unsigned short usVCID_Value;
unsigned int uiThreshold;
// This field determines the priority of the SF Queues
- B_UINT8 u8TrafficPriority;
+ unsigned char u8TrafficPriority;
BOOLEAN bValid;
BOOLEAN bActive;
BOOLEAN bActivateRequestSent;
- B_UINT8 u8QueueType;//BE or rtPS
+ unsigned char u8QueueType;//BE or rtPS
unsigned int uiMaxBucketSize;//maximum size of the bucket for the queue
unsigned int uiCurrentQueueDepthOnTarget;
@@ -444,7 +444,7 @@ struct _MINI_ADAPTER {
int DDRSetting;
unsigned long ulPowerSaveMode;
spinlock_t txtransmitlock;
- B_UINT8 txtransmit_running;
+ unsigned char txtransmit_running;
/* Thread for control packet handling */
struct task_struct *control_packet_handler;
/* thread for transmitting packets. */
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 4ad81a8..923e5a8 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -110,7 +110,7 @@ static void deleteSFBySfid(PMINI_ADAPTER Adapter, unsigned int uiSearchRuleIndex
static inline void
CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
- B_UINT8 u8IpAddressLen , B_UINT8 *pu8IpAddressMaskSrc ,
+ unsigned char u8IpAddressLen, unsigned char *pu8IpAddressMaskSrc,
BOOLEAN bIpVersion6 , E_IPADDR_CONTEXT eIpAddrContext)
{
unsigned int ucLoopIndex = 0;
diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index fe884de..5dc2240 100644
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -25,8 +25,8 @@
/// \brief structure stLocalSFAddRequest
typedef struct stLocalSFAddRequestAlt{
- B_UINT8 u8Type;
- B_UINT8 u8Direction;
+ unsigned char u8Type;
+ unsigned char u8Direction;
B_UINT16 u16TID;
/// \brief 16bitCID
@@ -43,8 +43,8 @@ typedef struct stLocalSFAddRequestAlt{
/// \brief structure stLocalSFAddIndication
typedef struct stLocalSFAddIndicationAlt{
- B_UINT8 u8Type;
- B_UINT8 u8Direction;
+ unsigned char u8Type;
+ unsigned char u8Direction;
B_UINT16 u16TID;
/// \brief 16bitCID
B_UINT16 u16CID;
@@ -57,16 +57,16 @@ typedef struct stLocalSFAddIndicationAlt{
/// \brief structure ActiveSet
stServiceFlowParamSI sfActiveSet;
- B_UINT8 u8CC; /**< Confirmation Code*/
- B_UINT8 u8Padd; /**< 8-bit Padding */
+ unsigned char u8CC; /**< Confirmation Code*/
+ unsigned char u8Padd; /**< 8-bit Padding */
B_UINT16 u16Padd; /**< 16 bit Padding */
// USE_MEMORY_MANAGER();
}stLocalSFAddIndicationAlt;
/// \brief structure stLocalSFAddConfirmation
typedef struct stLocalSFAddConfirmationAlt{
- B_UINT8 u8Type;
- B_UINT8 u8Direction;
+ unsigned char u8Type;
+ unsigned char u8Direction;
B_UINT16 u16TID;
/// \brief 16bitCID
B_UINT16 u16CID;
@@ -83,8 +83,8 @@ typedef struct stLocalSFAddConfirmationAlt{
/// \brief structure stLocalSFChangeRequest
typedef struct stLocalSFChangeRequestAlt{
- B_UINT8 u8Type;
- B_UINT8 u8Direction;
+ unsigned char u8Type;
+ unsigned char u8Direction;
B_UINT16 u16TID;
/// \brief 16bitCID
B_UINT16 u16CID;
@@ -102,16 +102,16 @@ typedef struct stLocalSFChangeRequestAlt{
/// \brief structure ParameterSet
stServiceFlowParamSI sfActiveSet;
- B_UINT8 u8CC; /**< Confirmation Code*/
- B_UINT8 u8Padd; /**< 8-bit Padding */
+ unsigned char u8CC; /**< Confirmation Code*/
+ unsigned char u8Padd; /**< 8-bit Padding */
B_UINT16 u16Padd; /**< 16 bit */
}stLocalSFChangeRequestAlt;
/// \brief structure stLocalSFChangeConfirmation
typedef struct stLocalSFChangeConfirmationAlt{
- B_UINT8 u8Type;
- B_UINT8 u8Direction;
+ unsigned char u8Type;
+ unsigned char u8Direction;
B_UINT16 u16TID;
/// \brief 16bitCID
B_UINT16 u16CID;
@@ -128,8 +128,8 @@ typedef struct stLocalSFChangeConfirmationAlt{
/// \brief structure stLocalSFChangeIndication
typedef struct stLocalSFChangeIndicationAlt{
- B_UINT8 u8Type;
- B_UINT8 u8Direction;
+ unsigned char u8Type;
+ unsigned char u8Direction;
B_UINT16 u16TID;
/// \brief 16bitCID
B_UINT16 u16CID;
@@ -142,8 +142,8 @@ typedef struct stLocalSFChangeIndicationAlt{
/// \brief structure ActiveSet
stServiceFlowParamSI sfActiveSet;
- B_UINT8 u8CC; /**< Confirmation Code*/
- B_UINT8 u8Padd; /**< 8-bit Padding */
+ unsigned char u8CC; /**< Confirmation Code*/
+ unsigned char u8Padd; /**< 8-bit Padding */
B_UINT16 u16Padd; /**< 16 bit */
}stLocalSFChangeIndicationAlt;
diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index 217e45d..d61ce74 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -78,7 +78,7 @@ typedef struct _S_MIBS_CLASSIFIER_RULE {
BOOLEAN bUsed;
unsigned short usVCID_Value;
// This field detemines the Classifier Priority
- B_UINT8 u8ClassifierRulePriority;
+ unsigned char u8ClassifierRulePriority;
U_MIBS_IP_ADDRESS stSrcIpAddress;
/*IP Source Address Length*/
unsigned char ucIPSourceAddressLength;
@@ -111,19 +111,19 @@ typedef struct _S_MIBS_CLASSIFIER_RULE {
typedef struct _S_MIBS_PHS_RULE {
unsigned long ulSFID;
/// brief 8bit PHSI Of The Service Flow
- B_UINT8 u8PHSI;
+ unsigned char u8PHSI;
/// brief PHSF Of The Service Flow
- B_UINT8 u8PHSFLength;
- B_UINT8 u8PHSF[MIBS_MAX_PHS_LENGTHS];
+ unsigned char u8PHSFLength;
+ unsigned char u8PHSF[MIBS_MAX_PHS_LENGTHS];
/// brief PHSM Of The Service Flow
- B_UINT8 u8PHSMLength;
- B_UINT8 u8PHSM[MIBS_MAX_PHS_LENGTHS];
+ unsigned char u8PHSMLength;
+ unsigned char u8PHSM[MIBS_MAX_PHS_LENGTHS];
/// brief 8bit PHSS Of The Service Flow
- B_UINT8 u8PHSS;
+ unsigned char u8PHSS;
/// brief 8bit PHSV Of The Service Flow
- B_UINT8 u8PHSV;
+ unsigned char u8PHSV;
// Reserved bytes are 5, so that it is similar to S_PHS_RULE structure.
- B_UINT8 reserved[5];
+ unsigned char reserved[5];
long PHSModifiedBytes;
unsigned long PHSModifiedNumPackets;
@@ -162,13 +162,13 @@ typedef struct _S_MIBS_SERVICEFLOW_TABLE {
unsigned short usVCID_Value;
unsigned int uiThreshold;
// This field determines the priority of the SF Queues
- B_UINT8 u8TrafficPriority;
+ unsigned char u8TrafficPriority;
BOOLEAN bValid;
BOOLEAN bActive;
BOOLEAN bActivateRequestSent;
//BE or rtPS
- B_UINT8 u8QueueType;
+ unsigned char u8QueueType;
//maximum size of the bucket for the queue
unsigned int uiMaxBucketSize;
unsigned int uiCurrentQueueDepthOnTarget;
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 984c64c..410450a 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -1436,7 +1436,7 @@ OUT:
}
#endif
-static void convertEndian(B_UINT8 rwFlag, unsigned int *puiBuffer, unsigned int uiByteCount)
+static void convertEndian(unsigned char rwFlag, unsigned int *puiBuffer, unsigned int uiByteCount)
{
unsigned int uiIndex = 0;
diff --git a/drivers/staging/bcm/PHSDefines.h b/drivers/staging/bcm/PHSDefines.h
index d528bc0..3a058d6 100644
--- a/drivers/staging/bcm/PHSDefines.h
+++ b/drivers/staging/bcm/PHSDefines.h
@@ -46,23 +46,23 @@
typedef struct _S_PHS_RULE {
/// brief 8bit PHSI Of The Service Flow
- B_UINT8 u8PHSI;
+ unsigned char u8PHSI;
/// brief PHSF Of The Service Flow
- B_UINT8 u8PHSFLength;
- B_UINT8 u8PHSF[MAX_PHS_LENGTHS];
+ unsigned char u8PHSFLength;
+ unsigned char u8PHSF[MAX_PHS_LENGTHS];
/// brief PHSM Of The Service Flow
- B_UINT8 u8PHSMLength;
- B_UINT8 u8PHSM[MAX_PHS_LENGTHS];
+ unsigned char u8PHSMLength;
+ unsigned char u8PHSM[MAX_PHS_LENGTHS];
/// brief 8bit PHSS Of The Service Flow
- B_UINT8 u8PHSS;
+ unsigned char u8PHSS;
/// brief 8bit PHSV Of The Service Flow
- B_UINT8 u8PHSV;
+ unsigned char u8PHSV;
//Reference Count for this PHS Rule
- B_UINT8 u8RefCnt;
+ unsigned char u8RefCnt;
//Flag to Store Unclassified PHS rules only in DL
- B_UINT8 bUnclassifiedPHSRule;
+ unsigned char bUnclassifiedPHSRule;
- B_UINT8 u8Reserved[3];
+ unsigned char u8Reserved[3];
long PHSModifiedBytes;
unsigned long PHSModifiedNumPackets;
@@ -77,11 +77,11 @@ typedef enum _E_CLASSIFIER_ENTRY_CONTEXT
}E_CLASSIFIER_ENTRY_CONTEXT;
typedef struct _S_CLASSIFIER_ENTRY {
- B_UINT8 bUsed;
+ unsigned char bUsed;
B_UINT16 uiClassifierRuleId;
- B_UINT8 u8PHSI;
+ unsigned char u8PHSI;
S_PHS_RULE *pstPhsRule;
- B_UINT8 bUnclassifiedPHSRule;
+ unsigned char bUnclassifiedPHSRule;
}S_CLASSIFIER_ENTRY;
@@ -96,7 +96,7 @@ typedef struct _S_CLASSIFIER_TABLE {
typedef struct _S_SERVICEFLOW_ENTRY {
- B_UINT8 bUsed;
+ unsigned char bUsed;
B_UINT16 uiVcid;
S_CLASSIFIER_TABLE *pstClassifierTable;
}S_SERVICEFLOW_ENTRY;
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 3b660bb..5f30b5c 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -1,12 +1,12 @@
#include "headers.h"
-static unsigned int 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, unsigned char u8AssociatedPHSI);
-static unsigned int 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, unsigned char 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 unsigned int CreateClassifierPHSRule(B_UINT16 uiClsId, S_CLASSIFIER_TABLE *psaClassifiertable , S_PHS_RULE *psPhsRule, E_CLASSIFIER_ENTRY_CONTEXT eClsContext, unsigned char u8AssociatedPHSI);
-static unsigned int 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, unsigned char u8AssociatedPHSI);
static BOOLEAN ValidatePHSRuleComplete(S_PHS_RULE *psPhsRule);
@@ -378,7 +378,7 @@ unsigned long PhsUpdateClassifierRule(IN void* pvContext,
IN B_UINT16 uiVcid ,
IN B_UINT16 uiClsId ,
IN S_PHS_RULE *psPhsRule,
- IN B_UINT8 u8AssociatedPHSI)
+ IN unsigned char u8AssociatedPHSI)
{
unsigned long lStatus = 0;
unsigned int nSFIndex = 0;
@@ -431,7 +431,7 @@ unsigned long PhsUpdateClassifierRule(IN void* pvContext,
Arguments:
IN void* pvContext - PHS Driver Specific Context
IN B_UINT16 uiVcid - The Service Flow ID for which the PHS rule applies
- IN B_UINT8 u8PHSI - the PHS Index identifying PHS rule to be deleted.
+ IN unsigned char u8PHSI - the PHS Index identifying PHS rule to be deleted.
Return Value:
@@ -440,7 +440,7 @@ unsigned long PhsUpdateClassifierRule(IN void* pvContext,
--*/
-unsigned long PhsDeletePHSRule(IN void* pvContext, IN B_UINT16 uiVcid, IN B_UINT8 u8PHSI)
+unsigned long PhsDeletePHSRule(IN void* pvContext, IN B_UINT16 uiVcid, IN unsigned char u8PHSI)
{
unsigned long lStatus = 0;
unsigned int nSFIndex = 0, nClsidIndex = 0;
@@ -954,7 +954,7 @@ static unsigned int GetPhsRuleEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
unsigned int CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId,
IN S_SERVICEFLOW_TABLE *psServiceFlowTable, S_PHS_RULE *psPhsRule,
- B_UINT8 u8AssociatedPHSI)
+ unsigned char u8AssociatedPHSI)
{
S_CLASSIFIER_TABLE *psaClassifiertable = NULL;
@@ -988,7 +988,7 @@ unsigned int CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 ui
unsigned int CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
IN B_UINT16 uiClsId, IN S_SERVICEFLOW_ENTRY *pstServiceFlowEntry,
- S_PHS_RULE *psPhsRule, B_UINT8 u8AssociatedPHSI)
+ S_PHS_RULE *psPhsRule, unsigned char u8AssociatedPHSI)
{
S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
unsigned int uiStatus = PHS_SUCCESS;
@@ -1070,7 +1070,7 @@ unsigned int CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
static unsigned int CreateClassifierPHSRule(IN B_UINT16 uiClsId,
S_CLASSIFIER_TABLE *psaClassifiertable , S_PHS_RULE *psPhsRule,
- E_CLASSIFIER_ENTRY_CONTEXT eClsContext, B_UINT8 u8AssociatedPHSI)
+ E_CLASSIFIER_ENTRY_CONTEXT eClsContext, unsigned char u8AssociatedPHSI)
{
unsigned int iClassifierIndex = 0;
BOOLEAN bFreeEntryFound = FALSE;
@@ -1165,7 +1165,7 @@ static unsigned int CreateClassifierPHSRule(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)
+ unsigned char u8AssociatedPHSI)
{
S_PHS_RULE *pstAddPhsRule = NULL;
unsigned int nPhsRuleIndex = 0;
diff --git a/drivers/staging/bcm/PHSModule.h b/drivers/staging/bcm/PHSModule.h
index 9ac3535..3915747 100644
--- a/drivers/staging/bcm/PHSModule.h
+++ b/drivers/staging/bcm/PHSModule.h
@@ -30,9 +30,9 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension, PMINI_ADAPTER Adapter);
int PhsCleanup(PPHS_DEVICE_EXTENSION pPHSDeviceExt);
//Utility Functions
-unsigned long 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, unsigned char u8AssociatedPHSI );
-unsigned long PhsDeletePHSRule(void* pvContext, B_UINT16 uiVcid, B_UINT8 u8PHSI);
+unsigned long PhsDeletePHSRule(void* pvContext, B_UINT16 uiVcid, unsigned char u8PHSI);
unsigned long PhsDeleteClassifierRule(void* pvContext, B_UINT16 uiVcid , B_UINT16 uiClsId);
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 8d4d023..70d4be06 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -5,7 +5,7 @@
#include "headers.h"
static void EThCSGetPktInfo(PMINI_ADAPTER Adapter, void *pvEthPayload, PS_ETHCS_PKT_INFO pstEthCsPktInfo);
-static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter, struct sk_buff* skb, PS_ETHCS_PKT_INFO pstEthCsPktInfo, S_CLASSIFIER_RULE *pstClassifierRule, B_UINT8 EthCSCupport);
+static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter, struct sk_buff* skb, PS_ETHCS_PKT_INFO pstEthCsPktInfo, S_CLASSIFIER_RULE *pstClassifierRule, unsigned char EthCSCupport);
static unsigned short IpVersion4(PMINI_ADAPTER Adapter, struct iphdr *iphd,
S_CLASSIFIER_RULE *pstClassifierRule);
@@ -736,7 +736,7 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule, struct
{
BOOLEAN bClassificationSucceed = FALSE;
unsigned short usVLANID;
- B_UINT8 uPriority = 0;
+ unsigned char uPriority = 0;
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
@@ -791,7 +791,7 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule, struct
static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter, struct sk_buff* skb,
PS_ETHCS_PKT_INFO pstEthCsPktInfo,
S_CLASSIFIER_RULE *pstClassifierRule,
- B_UINT8 EthCSCupport)
+ unsigned char EthCSCupport)
{
BOOLEAN bClassificationSucceed = FALSE;
bClassificationSucceed = EthCSMatchSrcMACAddress(pstClassifierRule, ((ETH_HEADER_STRUC *)(skb->data))->au8SourceAddress);
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index 07e73e8..0d49f07 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -11,7 +11,6 @@
typedef char BOOLEAN;
-typedef unsigned char B_UINT8;
typedef unsigned short B_UINT16;
typedef unsigned int B_UINT32;
typedef unsigned long DWORD;
diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index 942787f..1069c0b 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -52,53 +52,53 @@ struct _stCPacketClassificationRuleSI{
/** 16bit Packet Classification RuleIndex Of The Service Flow*/
B_UINT16 u16PacketClassificationRuleIndex;
/** 8bit Classifier Rule Priority Of The Service Flow*/
- B_UINT8 u8ClassifierRulePriority;
+ unsigned char u8ClassifierRulePriority;
/** Length of IP TypeOfService field*/
- B_UINT8 u8IPTypeOfServiceLength;
+ unsigned char u8IPTypeOfServiceLength;
/** 3bytes IP TypeOfService */
- B_UINT8 u8IPTypeOfService[TYPE_OF_SERVICE_LENGTH];
+ unsigned char u8IPTypeOfService[TYPE_OF_SERVICE_LENGTH];
/** Protocol used in classification of Service Flow*/
- B_UINT8 u8Protocol;
+ unsigned char u8Protocol;
/** Length of IP Masked Source Address */
- B_UINT8 u8IPMaskedSourceAddressLength;
+ unsigned char u8IPMaskedSourceAddressLength;
/** IP Masked Source Address used in classification for the Service Flow*/
- B_UINT8 u8IPMaskedSourceAddress[IP_MASKED_SRC_ADDRESS_LENGTH];
+ unsigned char u8IPMaskedSourceAddress[IP_MASKED_SRC_ADDRESS_LENGTH];
/** Length of IP Destination Address */
- B_UINT8 u8IPDestinationAddressLength;
+ unsigned char u8IPDestinationAddressLength;
/** IP Destination Address used in classification for the Service Flow*/
- B_UINT8 u8IPDestinationAddress[IP_MASKED_DEST_ADDRESS_LENGTH];
+ unsigned char u8IPDestinationAddress[IP_MASKED_DEST_ADDRESS_LENGTH];
/** Length of Protocol Source Port Range */
- B_UINT8 u8ProtocolSourcePortRangeLength;
+ unsigned char u8ProtocolSourcePortRangeLength;
/** Protocol Source Port Range used in the Service Flow*/
- B_UINT8 u8ProtocolSourcePortRange[PROTOCOL_SRC_PORT_RANGE_LENGTH];
+ unsigned char u8ProtocolSourcePortRange[PROTOCOL_SRC_PORT_RANGE_LENGTH];
/** Length of Protocol Dest Port Range */
- B_UINT8 u8ProtocolDestPortRangeLength;
+ unsigned char u8ProtocolDestPortRangeLength;
/** Protocol Dest Port Range used in the Service Flow*/
- B_UINT8 u8ProtocolDestPortRange[PROTOCOL_DEST_PORT_RANGE_LENGTH];
+ unsigned char u8ProtocolDestPortRange[PROTOCOL_DEST_PORT_RANGE_LENGTH];
/** Length of Ethernet Destination MAC Address */
- B_UINT8 u8EthernetDestMacAddressLength;
+ unsigned char u8EthernetDestMacAddressLength;
/** Ethernet Destination MAC Address used in classification of the Service Flow*/
- B_UINT8 u8EthernetDestMacAddress[ETHERNET_DEST_MAC_ADDR_LENGTH];
+ unsigned char u8EthernetDestMacAddress[ETHERNET_DEST_MAC_ADDR_LENGTH];
/** Length of Ethernet Source MAC Address */
- B_UINT8 u8EthernetSourceMACAddressLength;
+ unsigned char u8EthernetSourceMACAddressLength;
/** Ethernet Source MAC Address used in classification of the Service Flow*/
- B_UINT8 u8EthernetSourceMACAddress[ETHERNET_SRC_MAC_ADDR_LENGTH];
+ unsigned char u8EthernetSourceMACAddress[ETHERNET_SRC_MAC_ADDR_LENGTH];
/** Length of Ethertype */
- B_UINT8 u8EthertypeLength;
+ unsigned char u8EthertypeLength;
/** 3bytes Ethertype Of The Service Flow*/
- B_UINT8 u8Ethertype[NUM_ETHERTYPE_BYTES];
+ unsigned char u8Ethertype[NUM_ETHERTYPE_BYTES];
/** 8bit Associated PHSI Of The Service Flow*/
- B_UINT8 u8AssociatedPHSI;
+ unsigned char u8AssociatedPHSI;
/** Length of Vendor Specific Classifier Param length Of The Service Flow*/
- B_UINT8 u8VendorSpecificClassifierParamLength;
+ unsigned char u8VendorSpecificClassifierParamLength;
/** Vendor Specific Classifier Param Of The Service Flow*/
- B_UINT8 u8VendorSpecificClassifierParam[VENDOR_CLASSIFIER_PARAM_LENGTH];
+ unsigned char u8VendorSpecificClassifierParam[VENDOR_CLASSIFIER_PARAM_LENGTH];
/** Length Of IPv6 Flow Lable of the Service Flow*/
- B_UINT8 u8IPv6FlowLableLength;
+ unsigned char u8IPv6FlowLableLength;
/** IPv6 Flow Lable Of The Service Flow*/
- B_UINT8 u8IPv6FlowLable[NUM_IPV6_FLOWLABLE_BYTES];
+ unsigned char u8IPv6FlowLable[NUM_IPV6_FLOWLABLE_BYTES];
/** Action associated with the classifier rule*/
- B_UINT8 u8ClassifierActionRule;
+ unsigned char u8ClassifierActionRule;
B_UINT16 u16ValidityBitMap;
};
typedef struct _stCPacketClassificationRuleSI CCPacketClassificationRuleSI, stCPacketClassificationRuleSI, *pstCPacketClassificationRuleSI;
@@ -106,36 +106,36 @@ typedef struct _stCPacketClassificationRuleSI CCPacketClassificationRuleSI, stCP
/// \brief class CPhsRuleSI
typedef struct _stPhsRuleSI {
/** 8bit PHS Index Of The Service Flow*/
- B_UINT8 u8PHSI;
+ unsigned char u8PHSI;
/** PHSF Length Of The Service Flow*/
- B_UINT8 u8PHSFLength;
+ unsigned char u8PHSFLength;
/** String of bytes containing header information to be suppressed by the sending CS and reconstructed by the receiving CS*/
- B_UINT8 u8PHSF[MAX_PHS_LENGTHS];
+ unsigned char u8PHSF[MAX_PHS_LENGTHS];
/** PHSM Length Of The Service Flow*/
- B_UINT8 u8PHSMLength;
+ unsigned char u8PHSMLength;
/** PHS Mask for the SF*/
- B_UINT8 u8PHSM[MAX_PHS_LENGTHS];
+ unsigned char u8PHSM[MAX_PHS_LENGTHS];
/** 8bit Total number of bytes to be suppressed for the Service Flow*/
- B_UINT8 u8PHSS;
+ unsigned char u8PHSS;
/** 8bit Indicates whether or not Packet Header contents need to be verified prior to supression */
- B_UINT8 u8PHSV;
+ unsigned char u8PHSV;
/** Vendor Specific PHS param Length Of The Service Flow*/
- B_UINT8 u8VendorSpecificPHSParamsLength;
+ unsigned char u8VendorSpecificPHSParamsLength;
/** Vendor Specific PHS param Of The Service Flow*/
- B_UINT8 u8VendorSpecificPHSParams[VENDOR_PHS_PARAM_LENGTH];
+ unsigned char u8VendorSpecificPHSParams[VENDOR_PHS_PARAM_LENGTH];
- B_UINT8 u8Padding[2];
+ unsigned char u8Padding[2];
}stPhsRuleSI,*pstPhsRuleSI;
typedef stPhsRuleSI CPhsRuleSI;
/// \brief structure cConvergenceSLTypes
struct _stConvergenceSLTypes{
/** 8bit Phs Classfier Action Of The Service Flow*/
- B_UINT8 u8ClassfierDSCAction;
+ unsigned char u8ClassfierDSCAction;
/** 8bit Phs DSC Action Of The Service Flow*/
- B_UINT8 u8PhsDSCAction;
+ unsigned char u8PhsDSCAction;
/** 16bit Padding */
- B_UINT8 u8Padding[2];
+ unsigned char u8Padding[2];
/// \brief class cCPacketClassificationRule
stCPacketClassificationRuleSI cCPacketClassificationRule;
/// \brief class CPhsRuleSI
@@ -212,105 +212,105 @@ typedef struct _stServiceFlowParamSI{
B_UINT16 u16MBSContentsID[MBS_CONTENTS_ID_LENGTH];
/** MBS contents Identifier length*/
- B_UINT8 u8MBSContentsIDLength;
+ unsigned char u8MBSContentsIDLength;
/** ServiceClassName Length Of The Service Flow*/
- B_UINT8 u8ServiceClassNameLength;
+ unsigned char u8ServiceClassNameLength;
/** 32bytes ServiceClassName Of The Service Flow*/
- B_UINT8 u8ServiceClassName[32];
+ unsigned char u8ServiceClassName[32];
/** 8bit Indicates whether or not MBS service is requested for this Serivce Flow*/
- B_UINT8 u8MBSService;
+ unsigned char u8MBSService;
/** 8bit QOS Parameter Set specifies proper application of QoS paramters to Provisioned, Admitted and Active sets*/
- B_UINT8 u8QosParamSet;
+ unsigned char u8QosParamSet;
/** 8bit Traffic Priority Of the Service Flow */
- B_UINT8 u8TrafficPriority;
+ unsigned char u8TrafficPriority;
/** 8bit Uplink Grant Scheduling Type of The Service Flow */
- B_UINT8 u8ServiceFlowSchedulingType;
+ unsigned char u8ServiceFlowSchedulingType;
/** 8bit Request transmission Policy of the Service Flow*/
- B_UINT8 u8RequesttransmissionPolicy;
+ unsigned char u8RequesttransmissionPolicy;
/** 8bit Specifies whether SDUs for this Service flow are of FixedLength or Variable length */
- B_UINT8 u8FixedLengthVSVariableLengthSDUIndicator;
+ unsigned char u8FixedLengthVSVariableLengthSDUIndicator;
/** 8bit Length of the SDU for a fixed length SDU service flow*/
- B_UINT8 u8SDUSize;
+ unsigned char u8SDUSize;
/** 8bit Indicates whether or not ARQ is requested for this connection*/
- B_UINT8 u8ARQEnable;
+ unsigned char u8ARQEnable;
/**< 8bit Indicates whether or not data has tobe delivered in order to higher layer*/
- B_UINT8 u8ARQDeliverInOrder;
+ unsigned char u8ARQDeliverInOrder;
/** 8bit Receiver ARQ ACK processing time */
- B_UINT8 u8RxARQAckProcessingTime;
+ unsigned char u8RxARQAckProcessingTime;
/** 8bit Convergence Sublayer Specification Of The Service Flow*/
- B_UINT8 u8CSSpecification;
+ unsigned char u8CSSpecification;
/** 8 bit Type of data delivery service*/
- B_UINT8 u8TypeOfDataDeliveryService;
+ unsigned char u8TypeOfDataDeliveryService;
/** 8bit Specifies whether a service flow may generate Paging */
- B_UINT8 u8PagingPreference;
+ unsigned char u8PagingPreference;
/** 8bit Indicates the MBS Zone through which the connection or virtual connection is valid */
- B_UINT8 u8MBSZoneIdentifierassignment;
+ unsigned char u8MBSZoneIdentifierassignment;
/** 8bit Specifies whether traffic on SF should generate MOB_TRF_IND to MS in sleep mode*/
- B_UINT8 u8TrafficIndicationPreference;
+ unsigned char u8TrafficIndicationPreference;
/** 8bit Speciifes the length of predefined Global QoS parameter set encoding for this SF */
- B_UINT8 u8GlobalServicesClassNameLength;
+ unsigned char u8GlobalServicesClassNameLength;
/** 6 byte Speciifes the predefined Global QoS parameter set encoding for this SF */
- B_UINT8 u8GlobalServicesClassName[GLOBAL_SF_CLASSNAME_LENGTH];
+ unsigned char u8GlobalServicesClassName[GLOBAL_SF_CLASSNAME_LENGTH];
/** 8bit Indicates whether or not SN feedback is enabled for the conn */
- B_UINT8 u8SNFeedbackEnabled;
+ unsigned char u8SNFeedbackEnabled;
/** Indicates the size of the Fragment Sequence Number for the connection */
- B_UINT8 u8FSNSize;
+ unsigned char u8FSNSize;
/** 8bit Number of CIDs in active BS list */
- B_UINT8 u8CIDAllocation4activeBSsLength;
+ unsigned char u8CIDAllocation4activeBSsLength;
/** CIDs of BS in the active list */
- B_UINT8 u8CIDAllocation4activeBSs[MAX_NUM_ACTIVE_BS];
+ unsigned char u8CIDAllocation4activeBSs[MAX_NUM_ACTIVE_BS];
/** Specifies if PDU extended subheader should be applied on every PDU on this conn*/
- B_UINT8 u8PDUSNExtendedSubheader4HarqReordering;
+ unsigned char u8PDUSNExtendedSubheader4HarqReordering;
/** 8bit Specifies whether the connection uses HARQ or not */
- B_UINT8 u8HARQServiceFlows;
+ unsigned char u8HARQServiceFlows;
/** Specifies the length of Authorization token*/
- B_UINT8 u8AuthTokenLength;
+ unsigned char u8AuthTokenLength;
/** Specifies the Authorization token*/
- B_UINT8 u8AuthToken[AUTH_TOKEN_LENGTH];
+ unsigned char u8AuthToken[AUTH_TOKEN_LENGTH];
/** specifes Number of HARQ channels used to carry data length*/
- B_UINT8 u8HarqChannelMappingLength;
+ unsigned char u8HarqChannelMappingLength;
/** specifes HARQ channels used to carry data*/
- B_UINT8 u8HARQChannelMapping[NUM_HARQ_CHANNELS];
+ unsigned char u8HARQChannelMapping[NUM_HARQ_CHANNELS];
/** 8bit Length of Vendor Specific QoS Params */
- B_UINT8 u8VendorSpecificQoSParamLength;
+ unsigned char u8VendorSpecificQoSParamLength;
/** 1byte Vendor Specific QoS Param Of The Service Flow*/
- B_UINT8 u8VendorSpecificQoSParam[VENDOR_SPECIF_QOS_PARAM];
+ unsigned char u8VendorSpecificQoSParam[VENDOR_SPECIF_QOS_PARAM];
// indicates total classifiers in the SF
- B_UINT8 u8TotalClassifiers; /**< Total number of valid classifiers*/
- B_UINT8 bValid; /**< Validity flag */
- B_UINT8 u8Padding; /**< Padding byte*/
+ unsigned char u8TotalClassifiers; /**< Total number of valid classifiers*/
+ unsigned char bValid; /**< Validity flag */
+ unsigned char u8Padding; /**< Padding byte*/
/**
Structure for Convergence SubLayer Types with a maximum of 4 classifiers
@@ -325,8 +325,8 @@ typedef stServiceFlowParamSI CServiceFlowParamSI;
*/
typedef struct _stLocalSFAddRequest{
- B_UINT8 u8Type; /**< Type*/
- B_UINT8 eConnectionDir; /**< Connection direction*/
+ unsigned char u8Type; /**< Type*/
+ unsigned char eConnectionDir; /**< Connection direction*/
/// \brief 16 bit TID
B_UINT16 u16TID; /**< 16bit TID*/
/// \brief 16bitCID
@@ -345,8 +345,8 @@ typedef struct _stLocalSFAddRequest{
*/
typedef struct _stLocalSFAddIndication{
- B_UINT8 u8Type; /**< Type*/
- B_UINT8 eConnectionDir; /**< Connection Direction*/
+ unsigned char u8Type; /**< Type*/
+ unsigned char eConnectionDir; /**< Connection Direction*/
/// \brief 16 bit TID
B_UINT16 u16TID; /**< TID*/
/// \brief 16bitCID
@@ -362,8 +362,8 @@ typedef struct _stLocalSFAddIndication{
stServiceFlowParamSI *psfAdmittedSet; /**< AdmittedSet of type stServiceFlowParamSI*/
/// \brief structure ActiveSet
stServiceFlowParamSI *psfActiveSet; /**< sfActiveSet of type stServiceFlowParamSI*/
- B_UINT8 u8CC; /**< Confirmation Code*/
- B_UINT8 u8Padd; /**< 8-bit Padding */
+ unsigned char u8CC; /**< Confirmation Code*/
+ unsigned char u8Padd; /**< 8-bit Padding */
B_UINT16 u16Padd; /**< 16 bit Padding */
@@ -384,8 +384,8 @@ typedef struct _stLocalSFAddIndication stLocalSFChangeIndication, *pstLocalSFCha
structure stLocalSFDeleteRequest
*/
typedef struct _stLocalSFDeleteRequest{
- B_UINT8 u8Type; /**< Type*/
- B_UINT8 u8Padding; /**< Padding byte*/
+ unsigned char u8Type; /**< Type*/
+ unsigned char u8Padding; /**< Padding byte*/
B_UINT16 u16TID; /**< TID*/
/// \brief 32bitSFID
B_UINT32 u32SFID; /**< SFID*/
@@ -395,8 +395,8 @@ typedef struct _stLocalSFDeleteRequest{
structure stLocalSFDeleteIndication
*/
typedef struct stLocalSFDeleteIndication{
- B_UINT8 u8Type; /**< Type */
- B_UINT8 u8Padding; /**< Padding */
+ unsigned char u8Type; /**< Type */
+ unsigned char u8Padding; /**< Padding */
B_UINT16 u16TID; /**< TID */
/// \brief 16bitCID
B_UINT16 u16CID; /**< CID */
@@ -405,8 +405,8 @@ typedef struct stLocalSFDeleteIndication{
/// \brief 32bitSFID
B_UINT32 u32SFID; /**< SFID */
/// \brief 8bit Confirmation code
- B_UINT8 u8ConfirmationCode; /**< Confirmation code */
- B_UINT8 u8Padding1[3]; /**< 3 byte Padding */
+ unsigned char u8ConfirmationCode; /**< Confirmation code */
+ unsigned char u8Padding1[3]; /**< 3 byte Padding */
}stLocalSFDeleteIndication;
typedef struct _stIM_SFHostNotify
@@ -414,8 +414,8 @@ typedef struct _stIM_SFHostNotify
B_UINT32 SFID; //SFID of the service flow
B_UINT16 newCID; //the new/changed CID
B_UINT16 VCID; //Get new Vcid if the flow has been made active in CID update TLV, but was inactive earlier or the orig vcid
- B_UINT8 RetainSF; //Indication to Host if the SF is to be retained or deleted; if TRUE-retain else delete
- B_UINT8 QoSParamSet; //QoS paramset of the retained SF
+ unsigned char RetainSF; //Indication to Host if the SF is to be retained or deleted; if TRUE-retain else delete
+ unsigned char QoSParamSet; //QoS paramset of the retained SF
B_UINT16 u16reserved; //For byte alignment
} stIM_SFHostNotify;
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index f9a8426..e2de26f 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -3,11 +3,11 @@
#define STATUS_IMAGE_CHECKSUM_MISMATCH -199
#define EVENT_SIGNALED 1
-static B_UINT16 CFG_CalculateChecksum(B_UINT8 *pu8Buffer, B_UINT32 u32Size)
+static B_UINT16 CFG_CalculateChecksum(unsigned char *pu8Buffer, B_UINT32 u32Size)
{
B_UINT16 u16CheckSum = 0;
while (u32Size--) {
- u16CheckSum += (B_UINT8)~(*pu8Buffer);
+ u16CheckSum += (unsigned char)~(*pu8Buffer);
pu8Buffer++;
}
return u16CheckSum;
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 9cd3a1cd..7f32954 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -16,7 +16,7 @@ static NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter);
static int BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
-static B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, unsigned int uiOffset);
+static unsigned char 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);
@@ -3263,7 +3263,7 @@ static int BcmGetActiveISO(PMINI_ADAPTER Adapter)
* Failure:-FALSE, offset is RO
*
**/
-B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, unsigned int uiOffset)
+unsigned char IsOffsetWritable(PMINI_ADAPTER Adapter, unsigned int uiOffset)
{
unsigned int uiSectorNum = 0;
unsigned int uiWordOfSectorPermission = 0;
--
1.7.8.111.gad25c.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
