Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126760
b: refs/heads/master
c: ba338d4
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jan 6, 2009
1 parent bc5331e commit c3652be
Show file tree
Hide file tree
Showing 14 changed files with 145 additions and 200 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9d7164cfdb611c2f864d535ae5794f23db3d84f7
refs/heads/master: ba338d462655cbcc436ace8b73afa003cd485928
52 changes: 23 additions & 29 deletions trunk/drivers/staging/epl/kernel/EplDllk.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
2006/06/08 d.k.: start of the implementation, version 1.00
****************************************************************************/

#ifndef _EPL_DLLK_H_
Expand All @@ -79,34 +78,31 @@
// const defines
//---------------------------------------------------------------------------


//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------

typedef tEplKernel (* tEplDllkCbAsync) (tEplFrameInfo * pFrameInfo_p);
typedef tEplKernel(*tEplDllkCbAsync) (tEplFrameInfo * pFrameInfo_p);

typedef struct
{
BYTE m_be_abSrcMac[6];
typedef struct {
BYTE m_be_abSrcMac[6];

} tEplDllkInitParam;

// forward declaration
struct _tEdrvTxBuffer;

struct _tEplDllkNodeInfo
{
struct _tEplDllkNodeInfo* m_pNextNodeInfo;
struct _tEdrvTxBuffer* m_pPreqTxBuffer;
unsigned int m_uiNodeId;
DWORD m_dwPresTimeout;
unsigned long m_ulDllErrorEvents;
tEplNmtState m_NmtState;
WORD m_wPresPayloadLimit;
BYTE m_be_abMacAddr[6];
BYTE m_bSoaFlag1;
BOOL m_fSoftDelete; // delete node after error and ignore error
struct _tEplDllkNodeInfo {
struct _tEplDllkNodeInfo *m_pNextNodeInfo;
struct _tEdrvTxBuffer *m_pPreqTxBuffer;
unsigned int m_uiNodeId;
DWORD m_dwPresTimeout;
unsigned long m_ulDllErrorEvents;
tEplNmtState m_NmtState;
WORD m_wPresPayloadLimit;
BYTE m_be_abMacAddr[6];
BYTE m_bSoaFlag1;
BOOL m_fSoftDelete; // delete node after error and ignore error

};

Expand Down Expand Up @@ -138,18 +134,18 @@ tEplKernel EplDllkRegAsyncHandler(tEplDllkCbAsync pfnDllkCbAsync_p);
tEplKernel EplDllkDeregAsyncHandler(tEplDllkCbAsync pfnDllkCbAsync_p);

// register C_DLL_MULTICAST_ASND in ethernet driver if any AsndServiceId is registered
tEplKernel EplDllkSetAsndServiceIdFilter(tEplDllAsndServiceId ServiceId_p, tEplDllAsndFilter Filter_p);
tEplKernel EplDllkSetAsndServiceIdFilter(tEplDllAsndServiceId ServiceId_p,
tEplDllAsndFilter Filter_p);

// creates the buffer for a Tx frame and registers it to the ethernet driver
tEplKernel EplDllkCreateTxFrame(unsigned int * puiHandle_p,
tEplFrame ** ppFrame_p,
unsigned int * puiFrameSize_p,
tEplMsgType MsgType_p,
tEplDllAsndServiceId ServiceId_p);
tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p,
tEplFrame ** ppFrame_p,
unsigned int *puiFrameSize_p,
tEplMsgType MsgType_p,
tEplDllAsndServiceId ServiceId_p);

tEplKernel EplDllkDeleteTxFrame(unsigned int uiHandle_p);


#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0)

tEplKernel EplDllkAddNode(tEplDllNodeInfo * pNodeInfo_p);
Expand All @@ -160,12 +156,10 @@ tEplKernel EplDllkSoftDeleteNode(unsigned int uiNodeId_p);

tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, BYTE bSoaFlag1_p);

tEplKernel EplDllkGetFirstNodeInfo(tEplDllkNodeInfo** ppNodeInfo_p);
tEplKernel EplDllkGetFirstNodeInfo(tEplDllkNodeInfo ** ppNodeInfo_p);

#endif //(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0)

#endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLK)) != 0)

#endif // #ifndef _EPL_DLLK_H_


#endif // #ifndef _EPL_DLLK_H_
41 changes: 23 additions & 18 deletions trunk/drivers/staging/epl/kernel/EplDllkCal.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
2006/06/13 d.k.: start of the implementation, version 1.00
****************************************************************************/

#ifndef _EPL_DLLKCAL_H_
Expand All @@ -83,14 +82,13 @@
// typedef
//---------------------------------------------------------------------------

typedef struct
{
unsigned long m_ulCurTxFrameCountGen;
unsigned long m_ulCurTxFrameCountNmt;
unsigned long m_ulCurRxFrameCount;
unsigned long m_ulMaxTxFrameCountGen;
unsigned long m_ulMaxTxFrameCountNmt;
unsigned long m_ulMaxRxFrameCount;
typedef struct {
unsigned long m_ulCurTxFrameCountGen;
unsigned long m_ulCurTxFrameCountNmt;
unsigned long m_ulCurRxFrameCount;
unsigned long m_ulMaxTxFrameCountGen;
unsigned long m_ulMaxTxFrameCountNmt;
unsigned long m_ulMaxRxFrameCount;

} tEplDllkCalStatistics;

Expand All @@ -104,12 +102,16 @@ tEplKernel EplDllkCalAddInstance(void);

tEplKernel EplDllkCalDelInstance(void);

tEplKernel EplDllkCalAsyncGetTxCount(tEplDllAsyncReqPriority * pPriority_p, unsigned int * puiCount_p);
tEplKernel EplDllkCalAsyncGetTxFrame(void * pFrame_p, unsigned int * puiFrameSize_p, tEplDllAsyncReqPriority Priority_p);
tEplKernel EplDllkCalAsyncGetTxCount(tEplDllAsyncReqPriority * pPriority_p,
unsigned int *puiCount_p);
tEplKernel EplDllkCalAsyncGetTxFrame(void *pFrame_p,
unsigned int *puiFrameSize_p,
tEplDllAsyncReqPriority Priority_p);
// only frames with registered AsndServiceIds are passed to CAL
tEplKernel EplDllkCalAsyncFrameReceived(tEplFrameInfo * pFrameInfo_p);

tEplKernel EplDllkCalAsyncSend(tEplFrameInfo * pFrameInfo_p, tEplDllAsyncReqPriority Priority_p);
tEplKernel EplDllkCalAsyncSend(tEplFrameInfo * pFrameInfo_p,
tEplDllAsyncReqPriority Priority_p);

tEplKernel EplDllkCalAsyncClearBuffer(void);

Expand All @@ -121,16 +123,19 @@ tEplKernel EplDllkCalProcess(tEplEvent * pEvent_p);

tEplKernel EplDllkCalAsyncClearQueues(void);

tEplKernel EplDllkCalIssueRequest(tEplDllReqServiceId Service_p, unsigned int uiNodeId_p, BYTE bSoaFlag1_p);
tEplKernel EplDllkCalIssueRequest(tEplDllReqServiceId Service_p,
unsigned int uiNodeId_p, BYTE bSoaFlag1_p);

tEplKernel EplDllkCalAsyncGetSoaRequest(tEplDllReqServiceId* pReqServiceId_p, unsigned int* puiNodeId_p);
tEplKernel EplDllkCalAsyncGetSoaRequest(tEplDllReqServiceId * pReqServiceId_p,
unsigned int *puiNodeId_p);

tEplKernel EplDllkCalAsyncSetPendingRequests(unsigned int uiNodeId_p, tEplDllAsyncReqPriority AsyncReqPrio_p, unsigned int uiCount_p);
tEplKernel EplDllkCalAsyncSetPendingRequests(unsigned int uiNodeId_p,
tEplDllAsyncReqPriority
AsyncReqPrio_p,
unsigned int uiCount_p);

#endif //(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0)

#endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLK)) != 0)

#endif // #ifndef _EPL_DLLKCAL_H_


#endif // #ifndef _EPL_DLLKCAL_H_
6 changes: 1 addition & 5 deletions trunk/drivers/staging/epl/kernel/EplErrorHandlerk.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
2006/10/02 d.k.: start of the implementation, version 1.00
****************************************************************************/

#ifndef _EPL_ERRORHANDLERK_H_
Expand Down Expand Up @@ -98,7 +97,4 @@ tEplKernel PUBLIC EplErrorHandlerkDelInstance(void);
// processes error events
tEplKernel PUBLIC EplErrorHandlerkProcess(tEplEvent * pEvent_p);


#endif // #ifndef _EPL_ERRORHANDLERK_H_


#endif // #ifndef _EPL_ERRORHANDLERK_H_
12 changes: 3 additions & 9 deletions trunk/drivers/staging/epl/kernel/EplEventk.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
2006/06/12 d.k.: start of the implementation, version 1.00
****************************************************************************/

#ifndef _EPL_EVENTK_H_
Expand Down Expand Up @@ -103,12 +102,7 @@ tEplKernel PUBLIC EplEventkPost(tEplEvent * pEvent_p);

// post errorevents from kernelspace
tEplKernel PUBLIC EplEventkPostError(tEplEventSource EventSource_p,
tEplKernel EplError_p,
unsigned int uiArgSize_p,
void* pArg_p);



#endif // #ifndef _EPL_EVENTK_H_

tEplKernel EplError_p,
unsigned int uiArgSize_p, void *pArg_p);

#endif // #ifndef _EPL_EVENTK_H_
21 changes: 8 additions & 13 deletions trunk/drivers/staging/epl/kernel/EplNmtk.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
2006/06/09 k.t.: start of the implementation
****************************************************************************/

#ifndef _EPLNMTK_H_
Expand All @@ -75,36 +74,32 @@
#include "../EplNmt.h"
#include "EplEventk.h"


//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------


//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------


//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTK)) != 0)
EPLDLLEXPORT tEplKernel PUBLIC EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR);

EPLDLLEXPORT tEplKernel PUBLIC EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR);
EPLDLLEXPORT tEplKernel PUBLIC
EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR);

EPLDLLEXPORT tEplKernel PUBLIC EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR);
EPLDLLEXPORT tEplKernel PUBLIC
EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR);

EPLDLLEXPORT tEplKernel PUBLIC EplNmtkProcess(EPL_MCO_DECL_PTR_INSTANCE_PTR_
tEplEvent * pEvent_p);
tEplEvent * pEvent_p);

EPLDLLEXPORT tEplNmtState PUBLIC EplNmtkGetNmtState(EPL_MCO_DECL_PTR_INSTANCE_PTR);
EPLDLLEXPORT tEplNmtState PUBLIC
EplNmtkGetNmtState(EPL_MCO_DECL_PTR_INSTANCE_PTR);

#endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTK)) != 0)



#endif // #ifndef _EPLNMTK_H_


#endif // #ifndef _EPLNMTK_H_
9 changes: 1 addition & 8 deletions trunk/drivers/staging/epl/kernel/EplNmtkCal.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,30 +67,23 @@
2006/06/16 -k.t.: start of the implementation
****************************************************************************/

#include "EplNmtk.h"

#ifndef _EPLNMTKCAL_H_
#define _EPLNMTKCAL_H_


//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------


//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------


//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------


#endif // #ifndef _EPLNMTKCAL_H_


#endif // #ifndef _EPLNMTKCAL_H_
Loading

0 comments on commit c3652be

Please sign in to comment.