Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / staging / bcm / PHSDefines.h

diff --git a/drivers/staging/bcm/PHSDefines.h b/drivers/staging/bcm/PHSDefines.h
index ec29ee7480ebeaad70d2e3ddebdb532e265bc428..cd78ee4ffa220bd9c54adb80e8fef38e8d434a61 100644 (file)
--- a/drivers/staging/bcm/PHSDefines.h
+++ b/drivers/staging/bcm/PHSDefines.h
@@ -37,58 +37,58 @@
 #define ERR_CLSID_MATCH_FAIL                   0x808
 #define ERR_PHSRULE_MATCH_FAIL                 0x809
 
-typedef struct _S_PHS_RULE {
-       B_UINT8 u8PHSI;
-       B_UINT8 u8PHSFLength;
-       B_UINT8 u8PHSF[MAX_PHS_LENGTHS];
-       B_UINT8 u8PHSMLength;
-       B_UINT8 u8PHSM[MAX_PHS_LENGTHS];
-       B_UINT8 u8PHSS;
-       B_UINT8 u8PHSV;
-       B_UINT8 u8RefCnt;
-       B_UINT8 bUnclassifiedPHSRule;
-       B_UINT8 u8Reserved[3];
-       LONG    PHSModifiedBytes;
-       ULONG   PHSModifiedNumPackets;
-       ULONG   PHSErrorNumPackets;
-} S_PHS_RULE;
+struct bcm_phs_rule {
+       u8 u8PHSI;
+       u8 u8PHSFLength;
+       u8 u8PHSF[MAX_PHS_LENGTHS];
+       u8 u8PHSMLength;
+       u8 u8PHSM[MAX_PHS_LENGTHS];
+       u8 u8PHSS;
+       u8 u8PHSV;
+       u8 u8RefCnt;
+       u8 bUnclassifiedPHSRule;
+       u8 u8Reserved[3];
+       long PHSModifiedBytes;
+       unsigned long PHSModifiedNumPackets;
+       unsigned long PHSErrorNumPackets;
+};
 
-typedef enum _E_CLASSIFIER_ENTRY_CONTEXT {
+enum bcm_phs_classifier_context {
        eActiveClassifierRuleContext,
        eOldClassifierRuleContext
-} E_CLASSIFIER_ENTRY_CONTEXT;
+};
 
-typedef struct _S_CLASSIFIER_ENTRY {
-       B_UINT8  bUsed;
-       B_UINT16 uiClassifierRuleId;
-       B_UINT8  u8PHSI;
-       S_PHS_RULE *pstPhsRule;
-       B_UINT8  bUnclassifiedPHSRule;
-} S_CLASSIFIER_ENTRY;
+struct bcm_phs_classifier_entry {
+       u8  bUsed;
+       u16 uiClassifierRuleId;
+       u8  u8PHSI;
+       struct bcm_phs_rule *pstPhsRule;
+       u8  bUnclassifiedPHSRule;
+};
 
-typedef struct _S_CLASSIFIER_TABLE {
-       B_UINT16 uiTotalClassifiers;
-       S_CLASSIFIER_ENTRY stActivePhsRulesList[MAX_PHSRULE_PER_SF];
-       S_CLASSIFIER_ENTRY stOldPhsRulesList[MAX_PHSRULE_PER_SF];
-       B_UINT16 uiOldestPhsRuleIndex;
-} S_CLASSIFIER_TABLE;
+struct bcm_phs_classifier_table {
+       u16 uiTotalClassifiers;
+       struct bcm_phs_classifier_entry stActivePhsRulesList[MAX_PHSRULE_PER_SF];
+       struct bcm_phs_classifier_entry stOldPhsRulesList[MAX_PHSRULE_PER_SF];
+       u16 uiOldestPhsRuleIndex;
+};
 
-typedef struct _S_SERVICEFLOW_ENTRY {
-       B_UINT8  bUsed;
-       B_UINT16 uiVcid;
-       S_CLASSIFIER_TABLE  *pstClassifierTable;
-} S_SERVICEFLOW_ENTRY;
+struct bcm_phs_entry {
+       u8  bUsed;
+       u16 uiVcid;
+       struct bcm_phs_classifier_table *pstClassifierTable;
+};
 
-typedef struct _S_SERVICEFLOW_TABLE {
-       B_UINT16 uiTotalServiceFlows;
-       S_SERVICEFLOW_ENTRY stSFList[MAX_SERVICEFLOWS];
-} S_SERVICEFLOW_TABLE;
+struct bcm_phs_table {
+       u16 uiTotalServiceFlows;
+       struct bcm_phs_entry stSFList[MAX_SERVICEFLOWS];
+};
 
-typedef struct _PHS_DEVICE_EXTENSION {
+struct bcm_phs_extension {
        /* PHS Specific data */
-       S_SERVICEFLOW_TABLE *pstServiceFlowPhsRulesTable;
+       struct bcm_phs_table *pstServiceFlowPhsRulesTable;
        void *CompressedTxBuffer;
        void *UnCompressedRxBuffer;
-} PHS_DEVICE_EXTENSION, *PPHS_DEVICE_EXTENSION;
+};
 
 #endif