[PATCH 28/34] staging: bcm: Convert typedef B_UINT16 to unsigned short

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Use the normal types.
Remove the now unused typedef.

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
 drivers/staging/bcm/Adapter.h                  |    4 +-
 drivers/staging/bcm/CmHost.c                   |   16 +++---
 drivers/staging/bcm/CmHost.h                   |   42 ++++++++--------
 drivers/staging/bcm/HostMIBSInterface.h        |    2 +-
 drivers/staging/bcm/PHSDefines.h               |   10 ++--
 drivers/staging/bcm/PHSModule.c                |   66 ++++++++++++------------
 drivers/staging/bcm/PHSModule.h                |   12 ++--
 drivers/staging/bcm/Prototypes.h               |    2 +-
 drivers/staging/bcm/Transmit.c                 |    2 +-
 drivers/staging/bcm/Typedefs.h                 |    1 -
 drivers/staging/bcm/cntrl_SignalingInterface.h |   66 ++++++++++++------------
 drivers/staging/bcm/led_control.c              |    4 +-
 12 files changed, 113 insertions(+), 114 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 14e0b76..86bfb6b 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -115,7 +115,7 @@ typedef struct _S_HDR_SUPRESSION_CONTEXTINFO {
 typedef struct _S_CLASSIFIER_RULE {
 	unsigned long	ulSFID;
 	unsigned char	ucReserved[2];
-	B_UINT16        uiClassifierRuleIndex;
+	unsigned short	uiClassifierRuleIndex;
 	BOOLEAN			bUsed;
 	unsigned short	usVCID_Value;
 	unsigned char	u8ClassifierRulePriority; //This field detemines the Classifier Priority
@@ -343,7 +343,7 @@ typedef struct _TARGET_PARAMS {
 
 typedef struct _STTARGETDSXBUFFER {
 	unsigned long ulTargetDsxBuffer;
-	B_UINT16 tid;
+	unsigned short tid;
 	BOOLEAN valid;
 }STTARGETDSXBUFFER, *PSTTARGETDSXBUFFER;
 
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 923e5a8..ae05254 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 unsigned long GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid);
+static unsigned long GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, unsigned short tid);
 
 /************************************************************
  * Function	  -	SearchSfid
@@ -64,11 +64,11 @@ static int SearchFreeSfid(PMINI_ADAPTER Adapter)
   Description:			This routinue would search Classifier  having specified ClassifierID as input parameter
   Input parameters:		PMINI_ADAPTER Adapter - Adapter Context
   unsigned int uiSfid   - The SF in which the classifier is to searched
-  B_UINT16  uiClassifierID - The classifier ID to be searched
+  unsigned short  uiClassifierID - The classifier ID to be searched
   Return:					int :Classifier table index of matching entry
 */
 
-static int SearchClsid(PMINI_ADAPTER Adapter, unsigned long ulSFID, B_UINT16  uiClassifierID)
+static int SearchClsid(PMINI_ADAPTER Adapter, unsigned long ulSFID, unsigned short  uiClassifierID)
 {
 	unsigned int uiClassifierIndex = 0;
 	for (uiClassifierIndex = 0; uiClassifierIndex < MAX_CLASSIFIERS; uiClassifierIndex++) {
@@ -239,7 +239,7 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 }
 
 
-void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN bFreeAll)
+void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, unsigned short TID, BOOLEAN bFreeAll)
 {
 	unsigned long ulIndex;
 	for (ulIndex = 0; ulIndex < Adapter->ulTotalTargetBuffersAvailable; ulIndex++) {
@@ -423,7 +423,7 @@ static inline void CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSL
 static inline void DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, unsigned int uiSearchRuleIndex, unsigned int nClassifierIndex)
 {
 	S_CLASSIFIER_RULE *pstClassifierEntry = NULL;
-	B_UINT16  u16PacketClassificationRuleIndex;
+	unsigned short	u16PacketClassificationRuleIndex;
 	unsigned short	usVCID;
 	//void *pvPhsContext = NULL;
 	//unsigned long ulPhsStatus;
@@ -460,7 +460,7 @@ void DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, unsigned int uiSearchRuleI
 {
 	S_CLASSIFIER_RULE *pstClassifierEntry = NULL;
 	unsigned int nClassifierIndex;
-	//B_UINT16  u16PacketClassificationRuleIndex;
+	//unsigned short  u16PacketClassificationRuleIndex;
 	unsigned short	ulVCID;
 	//void	  *pvPhsContext = NULL;
 	//unsigned long	   ulPhsStatus;
@@ -504,7 +504,7 @@ static void CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 	unsigned long	ulSFID;
 	unsigned int nClassifierIndex = 0;
 	E_CLASSIFIER_ACTION eClassifierAction = eInvalidClassifierAction;
-	B_UINT16  u16PacketClassificationRuleIndex=0;
+	unsigned short u16PacketClassificationRuleIndex = 0;
 	unsigned int nIndex = 0;
 	stConvergenceSLTypes *psfCSType = NULL;
 	S_PHS_RULE sPhsRule;
@@ -2077,7 +2077,7 @@ unsigned long SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
 	return 1;
 }
 
-static unsigned long GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid)
+static unsigned long GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, unsigned short tid)
 {
 	unsigned long  ulTargetDSXBufferAddress;
 	unsigned long  ulTargetDsxBufferIndexToUse, ulMaxTry;
diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 5dc2240..d69a6e0 100644
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -28,11 +28,11 @@ typedef struct stLocalSFAddRequestAlt{
 	unsigned char	u8Type;
 	unsigned char	u8Direction;
 
-	B_UINT16                        u16TID;
+	unsigned short	u16TID;
 	/// \brief 16bitCID
-	B_UINT16                        u16CID;
+	unsigned short	u16CID;
 	/// \brief 16bitVCID
-	B_UINT16                        u16VCID;
+	unsigned short	u16VCID;
 
 
 	/// \brief structure ParameterSet
@@ -45,11 +45,11 @@ typedef struct stLocalSFAddRequestAlt{
 typedef struct stLocalSFAddIndicationAlt{
 	unsigned char	u8Type;
 	unsigned char	u8Direction;
-	B_UINT16                         u16TID;
+	unsigned short	u16TID;
 	/// \brief 16bitCID
-	B_UINT16                        u16CID;
+	unsigned short	u16CID;
 	/// \brief 16bitVCID
-	B_UINT16                        u16VCID;
+	unsigned short	u16VCID;
 	/// \brief structure AuthorizedSet
 	stServiceFlowParamSI              sfAuthorizedSet;
 	/// \brief structure AdmittedSet
@@ -59,7 +59,7 @@ typedef struct stLocalSFAddIndicationAlt{
 
 	unsigned char	u8CC;	/**<  Confirmation Code*/
 	unsigned char	u8Padd;	/**<  8-bit Padding */
-	B_UINT16						u16Padd;	/**< 16 bit Padding */
+	unsigned short	u16Padd;	/**< 16 bit Padding */
 //    USE_MEMORY_MANAGER();
 }stLocalSFAddIndicationAlt;
 
@@ -67,11 +67,11 @@ typedef struct stLocalSFAddIndicationAlt{
 typedef struct stLocalSFAddConfirmationAlt{
 	unsigned char	u8Type;
 	unsigned char	u8Direction;
-	B_UINT16					u16TID;
+	unsigned short	u16TID;
 	/// \brief 16bitCID
-	B_UINT16                        u16CID;
+	unsigned short	u16CID;
 	/// \brief 16bitVCID
-	B_UINT16                        u16VCID;
+	unsigned short	u16VCID;
 	/// \brief structure AuthorizedSet
 	stServiceFlowParamSI              sfAuthorizedSet;
 	/// \brief structure AdmittedSet
@@ -85,11 +85,11 @@ typedef struct stLocalSFAddConfirmationAlt{
 typedef struct stLocalSFChangeRequestAlt{
 	unsigned char	u8Type;
 	unsigned char	u8Direction;
-	B_UINT16					u16TID;
+	unsigned short	u16TID;
 	/// \brief 16bitCID
-	B_UINT16                        u16CID;
+	unsigned short	u16CID;
 	/// \brief 16bitVCID
-	B_UINT16                        u16VCID;
+	unsigned short	u16VCID;
 	/*
 	//Pointer location at which following Service Flow param Structure can be read
 	//from the target. We get only the address location and we need to read out the
@@ -104,7 +104,7 @@ typedef struct stLocalSFChangeRequestAlt{
 
 	unsigned char	u8CC;	/**<  Confirmation Code*/
 	unsigned char	u8Padd;	/**<  8-bit Padding */
-	B_UINT16						u16Padd;	/**< 16 bit */
+	unsigned short	u16Padd;	/**< 16 bit */
 
 }stLocalSFChangeRequestAlt;
 
@@ -112,11 +112,11 @@ typedef struct stLocalSFChangeRequestAlt{
 typedef struct stLocalSFChangeConfirmationAlt{
 	unsigned char	u8Type;
 	unsigned char	u8Direction;
-	B_UINT16						u16TID;
+	unsigned short	u16TID;
 	/// \brief 16bitCID
-	B_UINT16                        u16CID;
+	unsigned short	u16CID;
 	/// \brief 16bitVCID
-	B_UINT16                        u16VCID;
+	unsigned short	u16VCID;
 	/// \brief structure AuthorizedSet
 	stServiceFlowParamSI              sfAuthorizedSet;
 	/// \brief structure AdmittedSet
@@ -130,11 +130,11 @@ typedef struct stLocalSFChangeConfirmationAlt{
 typedef struct stLocalSFChangeIndicationAlt{
 	unsigned char	u8Type;
 	unsigned char	u8Direction;
-	B_UINT16						u16TID;
+	unsigned short	u16TID;
 	/// \brief 16bitCID
-	B_UINT16                        u16CID;
+	unsigned short	u16CID;
 	/// \brief 16bitVCID
-	B_UINT16                        u16VCID;
+	unsigned short	u16VCID;
 	/// \brief structure AuthorizedSet
 	stServiceFlowParamSI              sfAuthorizedSet;
 	/// \brief structure AdmittedSet
@@ -144,7 +144,7 @@ typedef struct stLocalSFChangeIndicationAlt{
 
 	unsigned char	u8CC;	/**<  Confirmation Code*/
 	unsigned char	u8Padd;	/**<  8-bit Padding */
-	B_UINT16						u16Padd;	/**< 16 bit */
+	unsigned short	u16Padd;	/**< 16 bit */
 
 }stLocalSFChangeIndicationAlt;
 
diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index d61ce74..8e98c76 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -74,7 +74,7 @@ typedef struct _S_MIBS_HOST_INFO {
 typedef struct _S_MIBS_CLASSIFIER_RULE {
 	unsigned long	ulSFID;
 	unsigned char	ucReserved[2];
-	B_UINT16            uiClassifierRuleIndex;
+	unsigned short	uiClassifierRuleIndex;
 	BOOLEAN				bUsed;
 	unsigned short	usVCID_Value;
 	// This field detemines the Classifier Priority
diff --git a/drivers/staging/bcm/PHSDefines.h b/drivers/staging/bcm/PHSDefines.h
index 3a058d6..6403070 100644
--- a/drivers/staging/bcm/PHSDefines.h
+++ b/drivers/staging/bcm/PHSDefines.h
@@ -78,7 +78,7 @@ typedef enum _E_CLASSIFIER_ENTRY_CONTEXT
 
 typedef struct _S_CLASSIFIER_ENTRY {
 	unsigned char  bUsed;
-	B_UINT16 uiClassifierRuleId;
+	unsigned short uiClassifierRuleId;
 	unsigned char  u8PHSI;
 	S_PHS_RULE *pstPhsRule;
 	unsigned char	bUnclassifiedPHSRule;
@@ -87,22 +87,22 @@ typedef struct _S_CLASSIFIER_ENTRY {
 
 
 typedef struct _S_CLASSIFIER_TABLE {
-	B_UINT16 uiTotalClassifiers;
+	unsigned short uiTotalClassifiers;
 	S_CLASSIFIER_ENTRY stActivePhsRulesList[MAX_PHSRULE_PER_SF];
 	S_CLASSIFIER_ENTRY stOldPhsRulesList[MAX_PHSRULE_PER_SF];
-	B_UINT16    uiOldestPhsRuleIndex;
+	unsigned short uiOldestPhsRuleIndex;
 
 }S_CLASSIFIER_TABLE;
 
 
 typedef struct _S_SERVICEFLOW_ENTRY {
 	unsigned char	bUsed;
-	B_UINT16    uiVcid;
+	unsigned short	uiVcid;
 	S_CLASSIFIER_TABLE  *pstClassifierTable;
 }S_SERVICEFLOW_ENTRY;
 
 typedef struct _S_SERVICEFLOW_TABLE {
-	B_UINT16 uiTotalServiceFlows;
+	unsigned short uiTotalServiceFlows;
 	S_SERVICEFLOW_ENTRY stSFList[MAX_SERVICEFLOWS];
 
 }S_SERVICEFLOW_TABLE;
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 5f30b5c..1aa82fb 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -1,16 +1,16 @@
 #include "headers.h"
 
-static unsigned int CreateSFToClassifierRuleMapping(B_UINT16 uiVcid, B_UINT16  uiClsId, S_SERVICEFLOW_TABLE *psServiceFlowTable, S_PHS_RULE *psPhsRule, unsigned char u8AssociatedPHSI);
+static unsigned int CreateSFToClassifierRuleMapping(unsigned short uiVcid, unsigned short  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, unsigned char u8AssociatedPHSI);
+static unsigned int CreateClassiferToPHSRuleMapping(unsigned short uiVcid, unsigned short  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, unsigned char u8AssociatedPHSI);
+static unsigned int CreateClassifierPHSRule(unsigned short  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, unsigned char u8AssociatedPHSI);
+static unsigned int UpdateClassifierPHSRule(unsigned short  uiClsId, S_CLASSIFIER_ENTRY *pstClassifierEntry, S_CLASSIFIER_TABLE *psaClassifiertable , S_PHS_RULE *psPhsRule, unsigned char u8AssociatedPHSI);
 
 static BOOLEAN ValidatePHSRuleComplete(S_PHS_RULE *psPhsRule);
 
-static BOOLEAN DerefPhsRule(B_UINT16  uiClsId, S_CLASSIFIER_TABLE *psaClassifiertable, S_PHS_RULE *pstPhsRule);
+static BOOLEAN DerefPhsRule(unsigned short  uiClsId, S_CLASSIFIER_TABLE *psaClassifiertable, S_PHS_RULE *pstPhsRule);
 
 static unsigned int GetClassifierEntry(S_CLASSIFIER_TABLE *pstClassifierTable, B_UINT32 uiClsid, E_CLASSIFIER_ENTRY_CONTEXT eClsContext, S_CLASSIFIER_ENTRY **ppstClassifierEntry);
 
@@ -30,15 +30,15 @@ static int phs_decompress(unsigned char *in_buf, unsigned char *out_buf,\
 
 
 static unsigned long PhsCompress(void* pvContext,
-			 B_UINT16 uiVcid,
-			 B_UINT16 uiClsId,
+			 unsigned short uiVcid,
+			 unsigned short uiClsId,
 			 void *pvInputBuffer,
 			 void *pvOutputBuffer,
 			 unsigned int *pOldHeaderSize,
 			 unsigned int *pNewHeaderSize);
 
 static unsigned long PhsDeCompress(void* pvContext,
-			   B_UINT16 uiVcid,
+			   unsigned short uiVcid,
 			   void *pvInputBuffer,
 			   void *pvOutputBuffer,
 			   unsigned int *pInHeaderSize,
@@ -62,7 +62,7 @@ static unsigned long PhsDeCompress(void* pvContext,
   IN Packet				- NDIS packet containing data to be transmitted
   IN unsigned short Vcid        - vcid pertaining to connection on which the packet is being sent.Used to
   identify PHS rule to be applied.
-  B_UINT16 uiClassifierRuleID - Classifier Rule ID
+  unsigned short uiClassifierRuleID - Classifier Rule ID
   BOOLEAN bHeaderSuppressionEnabled - indicates if header suprression is enabled for SF.
 
   Return:					STATUS_SUCCESS - If the send was successful.
@@ -72,7 +72,7 @@ static unsigned long PhsDeCompress(void* pvContext,
 int PHSTransmit(PMINI_ADAPTER Adapter,
 		struct sk_buff	**pPacket,
 		unsigned short Vcid,
-		B_UINT16 uiClassifierRuleID,
+		unsigned short uiClassifierRuleID,
 		BOOLEAN bHeaderSuppressionEnabled,
 		unsigned int *PacketLen,
 		unsigned char bEthCSSupport)
@@ -364,8 +364,8 @@ int PhsCleanup(IN PPHS_DEVICE_EXTENSION pPHSDeviceExt)
 
   Arguments:
   IN void* pvContext - PHS Driver Specific Context
-  IN B_UINT16 uiVcid    - The Service Flow ID for which the PHS rule applies
-  IN B_UINT16  uiClsId   - The Classifier ID within the Service Flow for which the PHS rule applies.
+  IN unsigned short uiVcid    - The Service Flow ID for which the PHS rule applies
+  IN unsigned short  uiClsId   - The Classifier ID within the Service Flow for which the PHS rule applies.
   IN S_PHS_RULE *psPhsRule - The PHS Rule strcuture to be added to the PHS Rule table.
 
   Return Value:
@@ -375,8 +375,8 @@ int PhsCleanup(IN PPHS_DEVICE_EXTENSION pPHSDeviceExt)
 
   --*/
 unsigned long PhsUpdateClassifierRule(IN void* pvContext,
-			      IN B_UINT16  uiVcid ,
-			      IN B_UINT16  uiClsId   ,
+			      IN unsigned short  uiVcid ,
+			      IN unsigned short  uiClsId   ,
 			      IN S_PHS_RULE *psPhsRule,
 			      IN unsigned char  u8AssociatedPHSI)
 {
@@ -430,7 +430,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 unsigned short  uiVcid    - The Service Flow ID for which the PHS rule applies
   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 unsigned char u8PHSI)
+unsigned long PhsDeletePHSRule(IN void* pvContext, IN unsigned short uiVcid, IN unsigned char u8PHSI)
 {
 	unsigned long lStatus = 0;
 	unsigned int nSFIndex = 0, nClsidIndex = 0;
@@ -493,8 +493,8 @@ unsigned long PhsDeletePHSRule(IN void* pvContext, IN B_UINT16 uiVcid, IN unsign
 
   Arguments:
   IN void* pvContext - PHS Driver Specific Context
-  IN B_UINT16  uiVcid    - The Service Flow ID for which the PHS rule applies
-  IN B_UINT16  uiClsId   - The Classifier ID within the Service Flow for which the PHS rule applies.
+  IN unsigned short  uiVcid    - The Service Flow ID for which the PHS rule applies
+  IN unsigned short  uiClsId   - The Classifier ID within the Service Flow for which the PHS rule applies.
 
   Return Value:
 
@@ -502,7 +502,7 @@ unsigned long PhsDeletePHSRule(IN void* pvContext, IN B_UINT16 uiVcid, IN unsign
   >0 Error.
 
   --*/
-unsigned long PhsDeleteClassifierRule(IN void* pvContext, IN B_UINT16 uiVcid , IN B_UINT16  uiClsId)
+unsigned long PhsDeleteClassifierRule(IN void* pvContext, IN unsigned short uiVcid , IN unsigned short  uiClsId)
 {
 	unsigned long lStatus = 0;
 	unsigned int nSFIndex = 0, nClsidIndex = 0;
@@ -553,7 +553,7 @@ unsigned long PhsDeleteClassifierRule(IN void* pvContext, IN B_UINT16 uiVcid , I
 
   Arguments:
   IN void* pvContext - PHS Driver Specific Context
-  IN B_UINT16 uiVcid   - The Service Flow ID for which the PHS rules need to be deleted
+  IN unsigned short uiVcid   - The Service Flow ID for which the PHS rules need to be deleted
 
   Return Value:
 
@@ -561,7 +561,7 @@ unsigned long PhsDeleteClassifierRule(IN void* pvContext, IN B_UINT16 uiVcid , I
   >0 Error.
 
   --*/
-unsigned long PhsDeleteSFRules(IN void* pvContext, IN B_UINT16 uiVcid)
+unsigned long PhsDeleteSFRules(IN void* pvContext, IN unsigned short uiVcid)
 {
 
 	unsigned long lStatus = 0;
@@ -629,7 +629,7 @@ unsigned long 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 unsigned short uiVcid    - The Service Flow 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
@@ -643,8 +643,8 @@ unsigned long PhsDeleteSFRules(IN void* pvContext, IN B_UINT16 uiVcid)
 
   --*/
 unsigned long PhsCompress(IN void* pvContext,
-		  IN B_UINT16 uiVcid,
-		  IN B_UINT16 uiClsId,
+		  IN unsigned short uiVcid,
+		  IN unsigned short uiClsId,
 		  IN void *pvInputBuffer,
 		  OUT void *pvOutputBuffer,
 		  OUT unsigned int *pOldHeaderSize,
@@ -724,7 +724,7 @@ unsigned long PhsCompress(IN void* pvContext,
 
   Arguments:
   IN void* pvContext - PHS Driver Specific Context.
-  IN B_UINT16 uiVcid    - The Service Flow ID to which current packet header restoration applies.
+  IN unsigned short 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 unsigned int *pHeaderSize   - The packet header size after restoration is returned in this parameter.
@@ -736,7 +736,7 @@ unsigned long PhsCompress(IN void* pvContext,
 
   --*/
 unsigned long PhsDeCompress(IN void* pvContext,
-		    IN B_UINT16 uiVcid,
+		    IN unsigned short uiVcid,
 		    IN void *pvInputBuffer,
 		    OUT void *pvOutputBuffer,
 		    OUT unsigned int *pInHeaderSize,
@@ -883,7 +883,7 @@ static BOOLEAN ValidatePHSRuleComplete(IN S_PHS_RULE *psPhsRule)
 }
 
 unsigned int GetServiceFlowEntry(IN S_SERVICEFLOW_TABLE *psServiceFlowTable,
-			 IN B_UINT16 uiVcid, S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry)
+			 IN unsigned short uiVcid, S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry)
 {
 	int  i;
 	for (i = 0; i < MAX_SERVICEFLOWS; i++) {
@@ -952,7 +952,7 @@ static unsigned int GetPhsRuleEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
 	return PHS_INVALID_TABLE_INDEX;
 }
 
-unsigned int CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16  uiClsId,
+unsigned int CreateSFToClassifierRuleMapping(IN unsigned short uiVcid, IN unsigned short  uiClsId,
 				     IN S_SERVICEFLOW_TABLE *psServiceFlowTable, S_PHS_RULE *psPhsRule,
 				     unsigned char u8AssociatedPHSI)
 {
@@ -986,8 +986,8 @@ 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,
+unsigned int CreateClassiferToPHSRuleMapping(IN unsigned short uiVcid,
+				     IN unsigned short  uiClsId, IN S_SERVICEFLOW_ENTRY *pstServiceFlowEntry,
 				     S_PHS_RULE *psPhsRule, unsigned char u8AssociatedPHSI)
 {
 	S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
@@ -1068,7 +1068,7 @@ unsigned int CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
 	return uiStatus;
 }
 
-static unsigned int CreateClassifierPHSRule(IN B_UINT16  uiClsId,
+static unsigned int CreateClassifierPHSRule(IN unsigned short  uiClsId,
 				    S_CLASSIFIER_TABLE *psaClassifiertable , S_PHS_RULE *psPhsRule,
 				    E_CLASSIFIER_ENTRY_CONTEXT eClsContext, unsigned char u8AssociatedPHSI)
 {
@@ -1162,7 +1162,7 @@ static unsigned int CreateClassifierPHSRule(IN B_UINT16  uiClsId,
 }
 
 
-static unsigned int UpdateClassifierPHSRule(IN B_UINT16  uiClsId,
+static unsigned int UpdateClassifierPHSRule(IN unsigned short  uiClsId,
 				    IN S_CLASSIFIER_ENTRY *pstClassifierEntry,
 				    S_CLASSIFIER_TABLE *psaClassifiertable , S_PHS_RULE *psPhsRule,
 				    unsigned char u8AssociatedPHSI)
@@ -1219,7 +1219,7 @@ static unsigned int UpdateClassifierPHSRule(IN B_UINT16  uiClsId,
 
 }
 
-static BOOLEAN DerefPhsRule(IN B_UINT16  uiClsId, S_CLASSIFIER_TABLE *psaClassifiertable, S_PHS_RULE *pstPhsRule)
+static BOOLEAN DerefPhsRule(IN unsigned short  uiClsId, S_CLASSIFIER_TABLE *psaClassifiertable, S_PHS_RULE *pstPhsRule)
 {
 	if (pstPhsRule==NULL)
 		return FALSE;
diff --git a/drivers/staging/bcm/PHSModule.h b/drivers/staging/bcm/PHSModule.h
index 3915747..5fe0e9f 100644
--- a/drivers/staging/bcm/PHSModule.h
+++ b/drivers/staging/bcm/PHSModule.h
@@ -4,7 +4,7 @@
 int PHSTransmit(PMINI_ADAPTER Adapter,
 		struct sk_buff **pPacket,
 		unsigned short Vcid,
-		B_UINT16 uiClassifierRuleID,
+		unsigned short uiClassifierRuleID,
 		BOOLEAN bHeaderSuppressionEnabled,
 		unsigned int *PacketLen,
 		unsigned char bEthCSSupport);
@@ -30,18 +30,18 @@ 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, unsigned char  u8AssociatedPHSI );
+unsigned long PhsUpdateClassifierRule(void* pvContext, unsigned short uiVcid, unsigned short uiClsId, S_PHS_RULE *psPhsRule, unsigned char  u8AssociatedPHSI );
 
-unsigned long PhsDeletePHSRule(void* pvContext, B_UINT16 uiVcid, unsigned char u8PHSI);
+unsigned long PhsDeletePHSRule(void* pvContext, unsigned short uiVcid, unsigned char u8PHSI);
 
-unsigned long PhsDeleteClassifierRule(void* pvContext, B_UINT16 uiVcid , B_UINT16  uiClsId);
+unsigned long PhsDeleteClassifierRule(void* pvContext, unsigned short uiVcid , unsigned short  uiClsId);
 
-unsigned long PhsDeleteSFRules(void* pvContext, B_UINT16 uiVcid) ;
+unsigned long PhsDeleteSFRules(void* pvContext, unsigned short uiVcid) ;
 
 
 BOOLEAN ValidatePHSRule(S_PHS_RULE *psPhsRule);
 
-unsigned int GetServiceFlowEntry(S_SERVICEFLOW_TABLE *psServiceFlowTable, B_UINT16 uiVcid, S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry);
+unsigned int GetServiceFlowEntry(S_SERVICEFLOW_TABLE *psServiceFlowTable, unsigned short 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 67e5919..40b1206 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -111,7 +111,7 @@ void update_per_cid_rx (PMINI_ADAPTER Adapter);
 
 void update_per_sf_desc_cnts( PMINI_ADAPTER Adapter);
 
-void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN bFreeAll);
+void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, unsigned short TID, BOOLEAN bFreeAll);
 
 
 void flush_queue(PMINI_ADAPTER Adapter, unsigned int iQIndex);
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index 1a37b2f..cda60c3 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -91,7 +91,7 @@ int SetupNextSend(PMINI_ADAPTER Adapter, struct sk_buff *Packet, unsigned short
 {
 	int		status=0;
 	BOOLEAN bHeaderSupressionEnabled = FALSE;
-	B_UINT16            uiClassifierRuleID;
+	unsigned short uiClassifierRuleID;
 	u16	QueueIndex = skb_get_queue_mapping(Packet);
 	LEADER Leader={0};
 
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index 0d49f07..cd7e232 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -11,7 +11,6 @@
 
 typedef char BOOLEAN;
 
-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 1069c0b..1dedb72 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -46,11 +46,11 @@
 struct _stCPacketClassificationRuleSI{
 
 	/**  16bit UserPriority Of The Service Flow*/
-	B_UINT16                        u16UserPriority;
+	unsigned short	u16UserPriority;
 	/**  16bit VLANID Of The Service Flow*/
-	B_UINT16                        u16VLANID;
+	unsigned short	u16VLANID;
 	/**  16bit Packet Classification RuleIndex Of The Service Flow*/
-	B_UINT16                        u16PacketClassificationRuleIndex;
+	unsigned short	u16PacketClassificationRuleIndex;
 	/**  8bit Classifier Rule Priority Of The Service Flow*/
 	unsigned char	u8ClassifierRulePriority;
 	/**  Length of IP TypeOfService field*/
@@ -99,7 +99,7 @@ struct _stCPacketClassificationRuleSI{
 	unsigned char	u8IPv6FlowLable[NUM_IPV6_FLOWLABLE_BYTES];
 	/**  Action associated with the classifier rule*/
 	unsigned char	u8ClassifierActionRule;
-	B_UINT16							u16ValidityBitMap;
+	unsigned short	u16ValidityBitMap;
 };
 typedef struct _stCPacketClassificationRuleSI CCPacketClassificationRuleSI, stCPacketClassificationRuleSI, *pstCPacketClassificationRuleSI;
 
@@ -166,50 +166,50 @@ typedef struct _stServiceFlowParamSI{
 	B_UINT32                        u32MaximumLatency;
 
 	/**  16bitCID Of The Service Flow*/
-	B_UINT16                        u16CID;
+	unsigned short	u16CID;
 
 	/**  16bit SAID on which the service flow being set up shall be mapped*/
-	B_UINT16                        u16TargetSAID;
+	unsigned short	u16TargetSAID;
 
 	/** 16bit  ARQ window size negotiated*/
-	B_UINT16                        u16ARQWindowSize;
+	unsigned short	u16ARQWindowSize;
 
 	/**  16bit Total Tx delay incl sending, receiving & processing delays	*/
-	B_UINT16                        u16ARQRetryTxTimeOut;
+	unsigned short	u16ARQRetryTxTimeOut;
 
 	/**  16bit Total Rx delay incl sending, receiving & processing delays	*/
-	B_UINT16                        u16ARQRetryRxTimeOut;
+	unsigned short	u16ARQRetryRxTimeOut;
 
 	/**  16bit ARQ block lifetime	*/
-	B_UINT16                        u16ARQBlockLifeTime;
+	unsigned short	u16ARQBlockLifeTime;
 
 	/**  16bit ARQ Sync loss timeout*/
-	B_UINT16                        u16ARQSyncLossTimeOut;
+	unsigned short	u16ARQSyncLossTimeOut;
 
 	/**  16bit ARQ Purge timeout */
-	B_UINT16                        u16ARQRxPurgeTimeOut;
+	unsigned short	u16ARQRxPurgeTimeOut;
 //TODO::Remove this once we move to a new CORR2 driver
 	/// \brief Size of an ARQ block
-	B_UINT16                        u16ARQBlockSize;
+	unsigned short	u16ARQBlockSize;
 
 //#endif
 	/**  16bit Nominal interval b/w consecutive SDU arrivals at MAC SAP*/
-	B_UINT16                        u16SDUInterArrivalTime;
+	unsigned short	u16SDUInterArrivalTime;
 
 	/**  16bit Specifies the time base for rate measurement	*/
-	B_UINT16                        u16TimeBase;
+	unsigned short	u16TimeBase;
 
 	/** 16bit Interval b/w Successive Grant oppurtunities*/
-	B_UINT16                        u16UnsolicitedGrantInterval;
+	unsigned short	u16UnsolicitedGrantInterval;
 
 	/** 16bit Interval b/w Successive Polling grant oppurtunities*/
-	B_UINT16						u16UnsolicitedPollingInterval;
+	unsigned short	u16UnsolicitedPollingInterval;
 
 	/**   internal var to get the overhead */
-	B_UINT16						u16MacOverhead;
+	unsigned short	u16MacOverhead;
 
 	/**  MBS contents Identifier*/
-	B_UINT16						u16MBSContentsID[MBS_CONTENTS_ID_LENGTH];
+	unsigned short	u16MBSContentsID[MBS_CONTENTS_ID_LENGTH];
 
 	/**  MBS contents Identifier length*/
 	unsigned char	u8MBSContentsIDLength;
@@ -328,11 +328,11 @@ typedef struct _stLocalSFAddRequest{
 	unsigned char	u8Type;	/**<  Type*/
 	unsigned char	eConnectionDir;		/**<  Connection direction*/
 	/// \brief 16 bit TID
-	B_UINT16                        u16TID;	/**<  16bit TID*/
+	unsigned short	u16TID;	/**<  16bit TID*/
 	/// \brief 16bitCID
-	B_UINT16                        u16CID;	/**<  16bit CID*/
+	unsigned short	u16CID;	/**<  16bit CID*/
 	/// \brief 16bitVCID
-	B_UINT16                        u16VCID;	/**<  16bit VCID*/
+	unsigned short	u16VCID;	/**<  16bit VCID*/
 	/// \brief structure ParameterSet
 
 	stServiceFlowParamSI	*psfParameterSet;	/**<  structure ParameterSet*/
@@ -348,11 +348,11 @@ typedef struct _stLocalSFAddIndication{
 	unsigned char	u8Type;	/**<  Type*/
 	unsigned char	eConnectionDir;	/**<  Connection Direction*/
 	/// \brief 16 bit TID
-	B_UINT16                         u16TID;	/**<  TID*/
+	unsigned short	u16TID;	/**<  TID*/
 	/// \brief 16bitCID
-	B_UINT16                        u16CID;		/**<  16bitCID*/
+	unsigned short	u16CID;		/**<  16bitCID*/
 	/// \brief 16bitVCID
-	B_UINT16                        u16VCID;	 /**<  16bitVCID*/
+	unsigned short	u16VCID;	 /**<  16bitVCID*/
 
 
 	/// \brief structure AuthorizedSet
@@ -365,7 +365,7 @@ typedef struct _stLocalSFAddIndication{
 	unsigned char	u8CC;	/**<  Confirmation Code*/
 	unsigned char	u8Padd;		/**<  8-bit Padding */
 
-	B_UINT16               u16Padd;	/**< 16 bit Padding */
+	unsigned short	u16Padd;	/**< 16 bit Padding */
 
 }stLocalSFAddIndication;
 
@@ -386,7 +386,7 @@ typedef struct _stLocalSFAddIndication stLocalSFChangeIndication, *pstLocalSFCha
 typedef struct _stLocalSFDeleteRequest{
 	unsigned char	u8Type;	 /**< Type*/
 	unsigned char	u8Padding;	 /**<  Padding byte*/
-	B_UINT16			u16TID;		 /**<  TID*/
+	unsigned short	u16TID;		 /**<  TID*/
 	/// \brief 32bitSFID
 	B_UINT32                        u32SFID;	 /**<  SFID*/
 }stLocalSFDeleteRequest, *pstLocalSFDeleteRequest;
@@ -397,11 +397,11 @@ typedef struct _stLocalSFDeleteRequest{
 typedef struct stLocalSFDeleteIndication{
 	unsigned char	u8Type;	/**< Type */
 	unsigned char	u8Padding;	/**< Padding  */
-	B_UINT16			u16TID;			/**< TID */
+	unsigned short	u16TID;			/**< TID */
 	/// \brief 16bitCID
-	B_UINT16                        u16CID;			/**< CID */
+	unsigned short	u16CID;			/**< CID */
 	/// \brief 16bitVCID
-	B_UINT16                        u16VCID;		/**< VCID */
+	unsigned short	u16VCID;		/**< VCID */
 	/// \brief 32bitSFID
 	B_UINT32                        u32SFID;		/**< SFID */
 	/// \brief 8bit Confirmation code
@@ -412,11 +412,11 @@ typedef struct stLocalSFDeleteIndication{
 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
+	unsigned short	newCID;   //the new/changed CID
+	unsigned short	VCID;             //Get new Vcid if the flow has been made active in CID update TLV, but was inactive earlier or the orig vcid
 	unsigned char	RetainSF;        //Indication to Host if the SF is to be retained or deleted; if TRUE-retain else delete
 	unsigned char	QoSParamSet; //QoS paramset of the retained SF
-	B_UINT16	u16reserved;  //For byte alignment
+	unsigned short	u16reserved;  //For byte alignment
 
 } stIM_SFHostNotify;
 
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index e2de26f..f89fc60 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -3,9 +3,9 @@
 #define STATUS_IMAGE_CHECKSUM_MISMATCH -199
 #define EVENT_SIGNALED 1
 
-static B_UINT16 CFG_CalculateChecksum(unsigned char *pu8Buffer, B_UINT32 u32Size)
+static unsigned short CFG_CalculateChecksum(unsigned char *pu8Buffer, B_UINT32 u32Size)
 {
-	B_UINT16 u16CheckSum = 0;
+	unsigned short u16CheckSum = 0;
 	while (u32Size--) {
 		u16CheckSum += (unsigned char)~(*pu8Buffer);
 		pu8Buffer++;
-- 
1.7.8.111.gad25c.dirty

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel


[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux