Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / epl / EplErrorHandlerk.c

diff --git a/drivers/staging/epl/EplErrorHandlerk.c b/drivers/staging/epl/EplErrorHandlerk.c
index d12521fc99a4001b4b4f5cc16e54a6e49363e246..6baed04ef11cc09687cf4f691ad90d7619e7df05 100644 (file)
--- a/drivers/staging/epl/EplErrorHandlerk.c
+++ b/drivers/staging/epl/EplErrorHandlerk.c
@@ -97,9 +97,9 @@
 //---------------------------------------------------------------------------
 
 typedef struct {
-       DWORD m_dwCumulativeCnt;        // subindex 1
-       DWORD m_dwThresholdCnt; // subindex 2
-       DWORD m_dwThreshold;    // subindex 3
+       u32 m_dwCumulativeCnt;  // subindex 1
+       u32 m_dwThresholdCnt;   // subindex 2
+       u32 m_dwThreshold;      // subindex 3
 
 } tEplErrorHandlerkErrorCounter;
 
@@ -112,9 +112,9 @@ typedef struct {
 #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0)
        tEplErrorHandlerkErrorCounter m_MnCrcErr;       // object 0x1C00
        tEplErrorHandlerkErrorCounter m_MnCycTimeExceed;        // object 0x1C02
-       DWORD m_adwMnCnLossPresCumCnt[254];     // object 0x1C07
-       DWORD m_adwMnCnLossPresThrCnt[254];     // object 0x1C08
-       DWORD m_adwMnCnLossPresThreshold[254];  // object 0x1C09
+       u32 m_adwMnCnLossPresCumCnt[254];       // object 0x1C07
+       u32 m_adwMnCnLossPresThrCnt[254];       // object 0x1C08
+       u32 m_adwMnCnLossPresThreshold[254];    // object 0x1C09
        BOOL m_afMnCnLossPresEvent[254];
 #endif
 
@@ -135,7 +135,7 @@ static tEplKernel EplErrorHandlerkLinkErrorCounter(tEplErrorHandlerkErrorCounter
                                                   unsigned int uiIndex_p);
 
 #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0)
-static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p,
+static tEplKernel EplErrorHandlerkLinkArray(u32 * pdwValue_p,
                                            unsigned int uiValueCount_p,
                                            unsigned int uiIndex_p);
 #endif
@@ -176,7 +176,7 @@ static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p,
 // State:
 //
 //---------------------------------------------------------------------------
-tEplKernel PUBLIC EplErrorHandlerkInit(void)
+tEplKernel EplErrorHandlerkInit(void)
 {
        tEplKernel Ret;
 
@@ -203,7 +203,7 @@ tEplKernel PUBLIC EplErrorHandlerkInit(void)
 // State:
 //
 //---------------------------------------------------------------------------
-tEplKernel PUBLIC EplErrorHandlerkAddInstance(void)
+tEplKernel EplErrorHandlerkAddInstance(void)
 {
        tEplKernel Ret;
 
@@ -306,7 +306,7 @@ tEplKernel PUBLIC EplErrorHandlerkAddInstance(void)
 // State:
 //
 //---------------------------------------------------------------------------
-tEplKernel PUBLIC EplErrorHandlerkDelInstance()
+tEplKernel EplErrorHandlerkDelInstance(void)
 {
        tEplKernel Ret;
 
@@ -333,7 +333,7 @@ tEplKernel PUBLIC EplErrorHandlerkDelInstance()
 // State:
 //
 //---------------------------------------------------------------------------
-tEplKernel PUBLIC EplErrorHandlerkProcess(tEplEvent * pEvent_p)
+tEplKernel EplErrorHandlerkProcess(tEplEvent *pEvent_p)
 {
        tEplKernel Ret;
        unsigned long ulDllErrorEvents;
@@ -713,7 +713,7 @@ static tEplKernel EplErrorHandlerkLinkErrorCounter(tEplErrorHandlerkErrorCounter
        tEplVarParam VarParam;
 
        VarParam.m_pData = &pErrorCounter_p->m_dwCumulativeCnt;
-       VarParam.m_Size = sizeof(DWORD);
+       VarParam.m_Size = sizeof(u32);
        VarParam.m_uiIndex = uiIndex_p;
        VarParam.m_uiSubindex = 0x01;
        VarParam.m_ValidFlag = kVarValidAll;
@@ -723,7 +723,7 @@ static tEplKernel EplErrorHandlerkLinkErrorCounter(tEplErrorHandlerkErrorCounter
        }
 
        VarParam.m_pData = &pErrorCounter_p->m_dwThresholdCnt;
-       VarParam.m_Size = sizeof(DWORD);
+       VarParam.m_Size = sizeof(u32);
        VarParam.m_uiIndex = uiIndex_p;
        VarParam.m_uiSubindex = 0x02;
        VarParam.m_ValidFlag = kVarValidAll;
@@ -733,7 +733,7 @@ static tEplKernel EplErrorHandlerkLinkErrorCounter(tEplErrorHandlerkErrorCounter
        }
 
        VarParam.m_pData = &pErrorCounter_p->m_dwThreshold;
-       VarParam.m_Size = sizeof(DWORD);
+       VarParam.m_Size = sizeof(u32);
        VarParam.m_uiIndex = uiIndex_p;
        VarParam.m_uiSubindex = 0x03;
        VarParam.m_ValidFlag = kVarValidAll;
@@ -763,18 +763,18 @@ static tEplKernel EplErrorHandlerkLinkErrorCounter(tEplErrorHandlerkErrorCounter
 //---------------------------------------------------------------------------
 
 #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0)
-static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p,
+static tEplKernel EplErrorHandlerkLinkArray(u32 * pdwValue_p,
                                            unsigned int uiValueCount_p,
                                            unsigned int uiIndex_p)
 {
        tEplKernel Ret = kEplSuccessful;
        tEplVarParam VarParam;
        tEplObdSize EntrySize;
-       BYTE bIndexEntries;
+       u8 bIndexEntries;
 
        EntrySize = (tEplObdSize) sizeof(bIndexEntries);
        Ret = EplObdReadEntry(uiIndex_p,
-                             0x00, (void GENERIC *)&bIndexEntries, &EntrySize);
+                             0x00, (void *)&bIndexEntries, &EntrySize);
 
        if ((Ret != kEplSuccessful) || (bIndexEntries == 0x00)) {
                // Object doesn't exist or invalid entry number
@@ -786,7 +786,7 @@ static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p,
                uiValueCount_p = bIndexEntries;
        }
 
-       VarParam.m_Size = sizeof(DWORD);
+       VarParam.m_Size = sizeof(u32);
        VarParam.m_uiIndex = uiIndex_p;
        VarParam.m_ValidFlag = kVarValidAll;