Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / epl / kernel / EplDllk.h

diff --git a/drivers/staging/epl/kernel/EplDllk.h b/drivers/staging/epl/kernel/EplDllk.h
index 588e871a922bc35d21c43a4fa59f1f8e20e7f019..a97920ab8841f3fc9b79aa99f5b868afdc9613fb 100644 (file)
--- a/drivers/staging/epl/kernel/EplDllk.h
+++ b/drivers/staging/epl/kernel/EplDllk.h
@@ -74,18 +74,10 @@
 #include "../EplDll.h"
 #include "../EplEvent.h"
 
-//---------------------------------------------------------------------------
-// const defines
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-// typedef
-//---------------------------------------------------------------------------
-
 typedef tEplKernel(*tEplDllkCbAsync) (tEplFrameInfo * pFrameInfo_p);
 
 typedef struct {
-       BYTE m_be_abSrcMac[6];
+       u8 m_be_abSrcMac[6];
 
 } tEplDllkInitParam;
 
@@ -96,22 +88,18 @@ struct _tEplDllkNodeInfo {
        struct _tEplDllkNodeInfo *m_pNextNodeInfo;
        struct _tEdrvTxBuffer *m_pPreqTxBuffer;
        unsigned int m_uiNodeId;
-       DWORD m_dwPresTimeout;
+       u32 m_dwPresTimeout;
        unsigned long m_ulDllErrorEvents;
        tEplNmtState m_NmtState;
-       WORD m_wPresPayloadLimit;
-       BYTE m_be_abMacAddr[6];
-       BYTE m_bSoaFlag1;
+       u16 m_wPresPayloadLimit;
+       u8 m_be_abMacAddr[6];
+       u8 m_bSoaFlag1;
        BOOL m_fSoftDelete;     // delete node after error and ignore error
 
 };
 
 typedef struct _tEplDllkNodeInfo tEplDllkNodeInfo;
 
-//---------------------------------------------------------------------------
-// function prototypes
-//---------------------------------------------------------------------------
-
 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLK)) != 0)
 
 tEplKernel EplDllkAddInstance(tEplDllkInitParam * pInitParam_p);
@@ -154,7 +142,7 @@ tEplKernel EplDllkDeleteNode(unsigned int uiNodeId_p);
 
 tEplKernel EplDllkSoftDeleteNode(unsigned int uiNodeId_p);
 
-tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, BYTE bSoaFlag1_p);
+tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, u8 bSoaFlag1_p);
 
 tEplKernel EplDllkGetFirstNodeInfo(tEplDllkNodeInfo ** ppNodeInfo_p);