diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-19 17:08:04 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:52:37 -0800 |
commit | bd5cd82dc6148aa8f655620e6f3bf62e5e320078 (patch) | |
tree | 6714894529010fcb385fd9235caed79b9dbf36b6 /drivers/staging | |
parent | ba338d462655cbcc436ace8b73afa003cd485928 (diff) |
Staging: epl: run Lindent on all user/*.h files
It's a start, still a mess...
Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/epl/user/EplCfgMau.h | 155 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplDllu.h | 14 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplDlluCal.h | 19 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplEventu.h | 17 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplIdentu.h | 25 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplLedu.h | 23 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtCnu.h | 18 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtMnu.h | 51 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtu.h | 100 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtuCal.h | 8 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplObdu.h | 78 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplObduCal.h | 94 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplPdou.h | 10 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoAsndu.h | 18 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoAsySequ.h | 32 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoComu.h | 27 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoUdpu.h | 21 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplStatusu.h | 19 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplTimeru.h | 22 |
19 files changed, 320 insertions, 431 deletions
diff --git a/drivers/staging/epl/user/EplCfgMau.h b/drivers/staging/epl/user/EplCfgMau.h index 3d96daf889e..d25a1e9d36c 100644 --- a/drivers/staging/epl/user/EplCfgMau.h +++ b/drivers/staging/epl/user/EplCfgMau.h @@ -86,79 +86,70 @@ #define EPL_CFGMA_MAX_TIMEOUT 3 //callbackfunction, called if configuration is finished -typedef void (PUBLIC* tfpEplCfgMaCb) (unsigned int uiNodeId_p, - tEplKernel Errorstate_p); +typedef void (PUBLIC * tfpEplCfgMaCb) (unsigned int uiNodeId_p, + tEplKernel Errorstate_p); //State for configuartion manager Statemachine -typedef enum -{ - // general states - kEplCfgMaIdle = 0x0000, // Configurationsprocess - // is idle - kEplCfgMaWaitForSdocEvent = 0x0001, // wait until the last - // SDOC is finisched - kEplCfgMaSkipMappingSub0 = 0x0002, // write Sub0 of mapping - // parameter with 0 - - kEplCfgMaFinished = 0x0004 // configuartion is finished - +typedef enum { + // general states + kEplCfgMaIdle = 0x0000, // Configurationsprocess + // is idle + kEplCfgMaWaitForSdocEvent = 0x0001, // wait until the last + // SDOC is finisched + kEplCfgMaSkipMappingSub0 = 0x0002, // write Sub0 of mapping + // parameter with 0 + + kEplCfgMaFinished = 0x0004 // configuartion is finished } tEplCfgState; -typedef enum -{ - kEplCfgMaDcfTypSystecSeg = 0x00, - kEplCfgMaDcfTypConDcf = 0x01, - kEplCfgMaDcfTypDcf = 0x02, // not supported - kEplCfgMaDcfTypXdc = 0x03 // not supported - - -}tEplCfgMaDcfTyp; +typedef enum { + kEplCfgMaDcfTypSystecSeg = 0x00, + kEplCfgMaDcfTypConDcf = 0x01, + kEplCfgMaDcfTypDcf = 0x02, // not supported + kEplCfgMaDcfTypXdc = 0x03 // not supported +} tEplCfgMaDcfTyp; -typedef enum -{ - kEplCfgMaCommon = 0, // all other index - kEplCfgMaPdoComm = 1, // communication index - kEplCfgMaPdoMapp = 2, // mapping index - kEplCfgMaPdoCommAfterMapp = 3, // write PDO Cob-Id after mapping subindex 0(set PDO valid) +typedef enum { + kEplCfgMaCommon = 0, // all other index + kEplCfgMaPdoComm = 1, // communication index + kEplCfgMaPdoMapp = 2, // mapping index + kEplCfgMaPdoCommAfterMapp = 3, // write PDO Cob-Id after mapping subindex 0(set PDO valid) } tEplCfgMaIndexType; - //bitcoded answer about the last sdo transfer saved in m_SdocState // also used to singal start of the State Maschine -typedef enum -{ - kEplCfgMaSdocBusy = 0x00, // SDOC activ - kEplCfgMaSdocReady = 0x01, // SDOC finished - kEplCfgMaSdocTimeout = 0x02, // SDOC Timeout - kEplCfgMaSdocAbortReceived = 0x04, // SDOC Abort, see Abortcode - kEplCfgMaSdocStart = 0x08 // start State Mschine -}tEplSdocState; +typedef enum { + kEplCfgMaSdocBusy = 0x00, // SDOC activ + kEplCfgMaSdocReady = 0x01, // SDOC finished + kEplCfgMaSdocTimeout = 0x02, // SDOC Timeout + kEplCfgMaSdocAbortReceived = 0x04, // SDOC Abort, see Abortcode + kEplCfgMaSdocStart = 0x08 // start State Mschine +} tEplSdocState; //internal structure (instancetable for modul configuration manager) -typedef struct -{ - tEplCfgState m_CfgState; // state of the configuration state maschine - tEplSdoComConHdl m_SdoComConHdl; // handle for sdo connection - DWORD m_dwLastAbortCode; - unsigned int m_uiLastIndex; // last index of configuration, to compair with actual index - BYTE* m_pbConcise; // Ptr to concise DCF - BYTE* m_pbActualIndex; // Ptr to actual index in the DCF segment - tfpEplCfgMaCb m_pfnCfgMaCb; // Ptr to CfgMa Callback, is call if configuration finished - tEplKernel m_EplKernelError; // errorcode - DWORD m_dwNumValueCopy; // numeric values are copied in this variable - unsigned int m_uiPdoNodeId; // buffer for PDO node id - BYTE m_bNrOfMappedObject; // number of mapped objects - unsigned int m_uiNodeId; // Epl node addresse - tEplSdocState m_SdocState; // bitcoded state of the SDO transfer - unsigned int m_uiLastSubIndex; // last subindex of configuration - BOOL m_fOneTranferOk; // atleased one transfer was successful - BYTE m_bEventFlag; // for Eventsignaling to the State Maschine - DWORD m_dwCntObjectInDcf; // number of Objects in DCF - tEplCfgMaIndexType m_SkipCfg; // TRUE if a adsitional Configurationprocess - // have to insert e.g. PDO-mapping - WORD m_wTimeOutCnt; // Timeout Counter, break configuration is - // m_wTimeOutCnt == CFGMA_MAX_TIMEOUT +typedef struct { + tEplCfgState m_CfgState; // state of the configuration state maschine + tEplSdoComConHdl m_SdoComConHdl; // handle for sdo connection + DWORD m_dwLastAbortCode; + unsigned int m_uiLastIndex; // last index of configuration, to compair with actual index + BYTE *m_pbConcise; // Ptr to concise DCF + BYTE *m_pbActualIndex; // Ptr to actual index in the DCF segment + tfpEplCfgMaCb m_pfnCfgMaCb; // Ptr to CfgMa Callback, is call if configuration finished + tEplKernel m_EplKernelError; // errorcode + DWORD m_dwNumValueCopy; // numeric values are copied in this variable + unsigned int m_uiPdoNodeId; // buffer for PDO node id + BYTE m_bNrOfMappedObject; // number of mapped objects + unsigned int m_uiNodeId; // Epl node addresse + tEplSdocState m_SdocState; // bitcoded state of the SDO transfer + unsigned int m_uiLastSubIndex; // last subindex of configuration + BOOL m_fOneTranferOk; // atleased one transfer was successful + BYTE m_bEventFlag; // for Eventsignaling to the State Maschine + DWORD m_dwCntObjectInDcf; // number of Objects in DCF + tEplCfgMaIndexType m_SkipCfg; // TRUE if a adsitional Configurationprocess + // have to insert e.g. PDO-mapping + WORD m_wTimeOutCnt; // Timeout Counter, break configuration is + // m_wTimeOutCnt == CFGMA_MAX_TIMEOUT } tEplCfgMaNode; @@ -213,12 +204,11 @@ tEplKernel PUBLIC EplCfgMaDelInstance(); // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaStartConfig(unsigned int uiNodeId_p, - BYTE* pbConcise_p, - tfpEplCfgMaCb fpCfgMaCb_p, - tEplObdSize SizeOfConcise_p, - tEplCfgMaDcfTyp DcfType_p); - +tEplKernel PUBLIC EplCfgMaStartConfig(unsigned int uiNodeId_p, + BYTE * pbConcise_p, + tfpEplCfgMaCb fpCfgMaCb_p, + tEplObdSize SizeOfConcise_p, + tEplCfgMaDcfTyp DcfType_p); //--------------------------------------------------------------------------- // Function: CfgMaStartConfigurationNode() @@ -233,9 +223,8 @@ tEplKernel PUBLIC EplCfgMaStartConfig(unsigned int uiNodeId_p, // Returns: tCopKernel = error code //--------------------------------------------------------------------------- tEplKernel PUBLIC EplCfgMaStartConfigNode(unsigned int uiNodeId_p, - tfpEplCfgMaCb fpCfgMaCb_p, - tEplCfgMaDcfTyp DcfType_p); - + tfpEplCfgMaCb fpCfgMaCb_p, + tEplCfgMaDcfTyp DcfType_p); //--------------------------------------------------------------------------- // Function: EplCfgMaStartConfigNodeDcf() @@ -251,11 +240,11 @@ tEplKernel PUBLIC EplCfgMaStartConfigNode(unsigned int uiNodeId_p, // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, - BYTE* pbConcise_p, - tfpEplCfgMaCb fpCfgMaCb_p, - tEplObdSize SizeOfConcise_p, - tEplCfgMaDcfTyp DcfType_p); +tEplKernel PUBLIC EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, + BYTE * pbConcise_p, + tfpEplCfgMaCb fpCfgMaCb_p, + tEplObdSize SizeOfConcise_p, + tEplCfgMaDcfTyp DcfType_p); //--------------------------------------------------------------------------- // Function: EplCfgMaLinkDcf() @@ -269,10 +258,10 @@ tEplKernel PUBLIC EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaLinkDcf(unsigned int uiNodeId_p, - BYTE* pbConcise_p, - tEplObdSize SizeOfConcise_p, - tEplCfgMaDcfTyp DcfType_p); +tEplKernel PUBLIC EplCfgMaLinkDcf(unsigned int uiNodeId_p, + BYTE * pbConcise_p, + tEplObdSize SizeOfConcise_p, + tEplCfgMaDcfTyp DcfType_p); //--------------------------------------------------------------------------- // Function: EplCfgMaCheckDcf() @@ -285,12 +274,8 @@ tEplKernel PUBLIC EplCfgMaLinkDcf(unsigned int uiNodeId_p, // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaCheckDcf(unsigned int uiNodeId_p, - tEplCfgMaDcfTyp DcfType_p); - - - - +tEplKernel PUBLIC EplCfgMaCheckDcf(unsigned int uiNodeId_p, + tEplCfgMaDcfTyp DcfType_p); #endif // #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_CFGMA)) != 0) diff --git a/drivers/staging/epl/user/EplDllu.h b/drivers/staging/epl/user/EplDllu.h index 2beb39087a1..36f8bb76f7c 100644 --- a/drivers/staging/epl/user/EplDllu.h +++ b/drivers/staging/epl/user/EplDllu.h @@ -66,7 +66,6 @@ 2006/06/20 d.k.: start of the implementation, version 1.00 - ****************************************************************************/ #ifndef _EPL_DLLU_H_ @@ -82,7 +81,7 @@ // typedef //--------------------------------------------------------------------------- -typedef tEplKernel (PUBLIC * tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); +typedef tEplKernel(PUBLIC * tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); //--------------------------------------------------------------------------- // function prototypes @@ -94,15 +93,16 @@ tEplKernel EplDlluAddInstance(void); tEplKernel EplDlluDelInstance(void); -tEplKernel EplDlluRegAsndService(tEplDllAsndServiceId ServiceId_p, tEplDlluCbAsnd pfnDlluCbAsnd_p, tEplDllAsndFilter Filter_p); +tEplKernel EplDlluRegAsndService(tEplDllAsndServiceId ServiceId_p, + tEplDlluCbAsnd pfnDlluCbAsnd_p, + tEplDllAsndFilter Filter_p); -tEplKernel EplDlluAsyncSend(tEplFrameInfo * pFrameInfo_p, tEplDllAsyncReqPriority Priority_p); +tEplKernel EplDlluAsyncSend(tEplFrameInfo * pFrameInfo_p, + tEplDllAsyncReqPriority Priority_p); // processes asynch frames tEplKernel EplDlluProcess(tEplFrameInfo * pFrameInfo_p); #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLU)) != 0) -#endif // #ifndef _EPL_DLLU_H_ - - +#endif // #ifndef _EPL_DLLU_H_ diff --git a/drivers/staging/epl/user/EplDlluCal.h b/drivers/staging/epl/user/EplDlluCal.h index b2b85ba5864..b1dcd060957 100644 --- a/drivers/staging/epl/user/EplDlluCal.h +++ b/drivers/staging/epl/user/EplDlluCal.h @@ -66,7 +66,6 @@ 2006/06/20 d.k.: start of the implementation, version 1.00 - ****************************************************************************/ #ifndef _EPL_DLLUCAL_H_ @@ -83,7 +82,7 @@ // typedef //--------------------------------------------------------------------------- -typedef tEplKernel (PUBLIC * tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); +typedef tEplKernel(PUBLIC * tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); //--------------------------------------------------------------------------- // function prototypes @@ -94,14 +93,14 @@ tEplKernel EplDlluCalAddInstance(void); tEplKernel EplDlluCalDelInstance(void); tEplKernel EplDlluCalRegAsndService(tEplDllAsndServiceId ServiceId_p, - tEplDlluCbAsnd pfnDlluCbAsnd_p, - tEplDllAsndFilter Filter_p); + tEplDlluCbAsnd pfnDlluCbAsnd_p, + tEplDllAsndFilter Filter_p); -tEplKernel EplDlluCalAsyncSend(tEplFrameInfo * pFrameInfo, tEplDllAsyncReqPriority Priority_p); +tEplKernel EplDlluCalAsyncSend(tEplFrameInfo * pFrameInfo, + tEplDllAsyncReqPriority Priority_p); tEplKernel EplDlluCalProcess(tEplEvent * pEvent_p); - #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) tEplKernel EplDlluCalAddNode(tEplDllNodeInfo * pNodeInfo_p); @@ -110,11 +109,9 @@ tEplKernel EplDlluCalDeleteNode(unsigned int uiNodeId_p); tEplKernel EplDlluCalSoftDeleteNode(unsigned int uiNodeId_p); -tEplKernel EplDlluCalIssueRequest(tEplDllReqServiceId Service_p, unsigned int uiNodeId_p, BYTE bSoaFlag1_p); +tEplKernel EplDlluCalIssueRequest(tEplDllReqServiceId Service_p, + unsigned int uiNodeId_p, BYTE bSoaFlag1_p); #endif - -#endif // #ifndef _EPL_DLLUCAL_H_ - - +#endif // #ifndef _EPL_DLLUCAL_H_ diff --git a/drivers/staging/epl/user/EplEventu.h b/drivers/staging/epl/user/EplEventu.h index 57f8b42c5b7..322cffd1187 100644 --- a/drivers/staging/epl/user/EplEventu.h +++ b/drivers/staging/epl/user/EplEventu.h @@ -66,7 +66,6 @@ 2006/06/12 d.k.: start of the implementation, version 1.00 - ****************************************************************************/ #ifndef _EPL_EVENTU_H_ @@ -74,7 +73,6 @@ #include "../EplEvent.h" - //--------------------------------------------------------------------------- // const defines //--------------------------------------------------------------------------- @@ -83,7 +81,6 @@ // typedef //--------------------------------------------------------------------------- - //--------------------------------------------------------------------------- // function prototypes //--------------------------------------------------------------------------- @@ -91,7 +88,8 @@ tEplKernel PUBLIC EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p); // add instance -tEplKernel PUBLIC EplEventuAddInstance(tEplProcessEventCb pfnApiProcessEventCb_p); +tEplKernel PUBLIC EplEventuAddInstance(tEplProcessEventCb + pfnApiProcessEventCb_p); // delete instance tEplKernel PUBLIC EplEventuDelInstance(void); @@ -104,12 +102,7 @@ tEplKernel PUBLIC EplEventuPost(tEplEvent * pEvent_p); // post errorevents from userspace tEplKernel PUBLIC EplEventuPostError(tEplEventSource EventSource_p, - tEplKernel EplError_p, - unsigned int uiArgSize_p, - void* pArg_p); - - - -#endif // #ifndef _EPL_EVENTU_H_ - + tEplKernel EplError_p, + unsigned int uiArgSize_p, void *pArg_p); +#endif // #ifndef _EPL_EVENTU_H_ diff --git a/drivers/staging/epl/user/EplIdentu.h b/drivers/staging/epl/user/EplIdentu.h index b53afa0ef67..e7302106c74 100644 --- a/drivers/staging/epl/user/EplIdentu.h +++ b/drivers/staging/epl/user/EplIdentu.h @@ -66,7 +66,6 @@ 2006/11/15 d.k.: start of the implementation - ****************************************************************************/ #include "../EplDll.h" @@ -74,19 +73,17 @@ #ifndef _EPLIDENTU_H_ #define _EPLIDENTU_H_ - //--------------------------------------------------------------------------- // const defines //--------------------------------------------------------------------------- - //--------------------------------------------------------------------------- // typedef //--------------------------------------------------------------------------- -typedef tEplKernel (PUBLIC * tEplIdentuCbResponse) ( - unsigned int uiNodeId_p, - tEplIdentResponse* pIdentResponse_p); +typedef tEplKernel(PUBLIC * tEplIdentuCbResponse) (unsigned int uiNodeId_p, + tEplIdentResponse * + pIdentResponse_p); //--------------------------------------------------------------------------- // function prototypes @@ -100,14 +97,12 @@ tEplKernel PUBLIC EplIdentuDelInstance(void); tEplKernel PUBLIC EplIdentuReset(void); -tEplKernel PUBLIC EplIdentuGetIdentResponse( - unsigned int uiNodeId_p, - tEplIdentResponse** ppIdentResponse_p); - -tEplKernel PUBLIC EplIdentuRequestIdentResponse( - unsigned int uiNodeId_p, - tEplIdentuCbResponse pfnCbResponse_p); - -#endif // #ifndef _EPLIDENTU_H_ +tEplKernel PUBLIC EplIdentuGetIdentResponse(unsigned int uiNodeId_p, + tEplIdentResponse ** + ppIdentResponse_p); +tEplKernel PUBLIC EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, + tEplIdentuCbResponse + pfnCbResponse_p); +#endif // #ifndef _EPLIDENTU_H_ diff --git a/drivers/staging/epl/user/EplLedu.h b/drivers/staging/epl/user/EplLedu.h index 10a8b6bba38..78e70d06445 100644 --- a/drivers/staging/epl/user/EplLedu.h +++ b/drivers/staging/epl/user/EplLedu.h @@ -66,7 +66,6 @@ 2008/11/17 d.k.: start of the implementation - ****************************************************************************/ #include "../EplLed.h" @@ -76,20 +75,16 @@ #ifndef _EPLLEDU_H_ #define _EPLLEDU_H_ - //--------------------------------------------------------------------------- // const defines //--------------------------------------------------------------------------- - //--------------------------------------------------------------------------- // typedef //--------------------------------------------------------------------------- - -typedef tEplKernel (PUBLIC * tEplLeduStateChangeCallback) ( - tEplLedType LedType_p, BOOL fOn_p); - +typedef tEplKernel(PUBLIC * tEplLeduStateChangeCallback) (tEplLedType LedType_p, + BOOL fOn_p); //--------------------------------------------------------------------------- // function prototypes @@ -99,18 +94,16 @@ typedef tEplKernel (PUBLIC * tEplLeduStateChangeCallback) ( tEplKernel PUBLIC EplLeduInit(tEplLeduStateChangeCallback pfnCbStateChange_p); -tEplKernel PUBLIC EplLeduAddInstance(tEplLeduStateChangeCallback pfnCbStateChange_p); +tEplKernel PUBLIC EplLeduAddInstance(tEplLeduStateChangeCallback + pfnCbStateChange_p); tEplKernel PUBLIC EplLeduDelInstance(void); -tEplKernel PUBLIC EplLeduCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p); - -tEplKernel PUBLIC EplLeduProcessEvent( - tEplEvent* pEplEvent_p); +tEplKernel PUBLIC EplLeduCbNmtStateChange(tEplEventNmtStateChange + NmtStateChange_p); +tEplKernel PUBLIC EplLeduProcessEvent(tEplEvent * pEplEvent_p); #endif // #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) -#endif // #ifndef _EPLLEDU_H_ - - +#endif // #ifndef _EPLLEDU_H_ diff --git a/drivers/staging/epl/user/EplNmtCnu.h b/drivers/staging/epl/user/EplNmtCnu.h index 93a3289b1cb..e508055b5b8 100644 --- a/drivers/staging/epl/user/EplNmtCnu.h +++ b/drivers/staging/epl/user/EplNmtCnu.h @@ -66,7 +66,6 @@ 2006/06/09 k.t.: start of the implementation - ****************************************************************************/ #include "EplNmtu.h" @@ -76,17 +75,14 @@ #ifndef _EPLNMTCNU_H_ #define _EPLNMTCNU_H_ - //--------------------------------------------------------------------------- // const defines //--------------------------------------------------------------------------- - //--------------------------------------------------------------------------- // typedef //--------------------------------------------------------------------------- - //--------------------------------------------------------------------------- // function prototypes //--------------------------------------------------------------------------- @@ -99,14 +95,14 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuAddInstance(unsigned int uiNodeId_p); EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuDelInstance(void); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuSendNmtRequest (unsigned int uiNodeId_p, - tEplNmtCommand NmtCommand_p); +EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, + tEplNmtCommand + NmtCommand_p); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuRegisterCheckEventCb( - tEplNmtuCheckEventCallback pfnEplNmtCheckEventCb_p); +EPLDLLEXPORT tEplKernel PUBLIC +EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback + pfnEplNmtCheckEventCb_p); #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_CN)) != 0) -#endif // #ifndef _EPLNMTCNU_H_ - - +#endif // #ifndef _EPLNMTCNU_H_ diff --git a/drivers/staging/epl/user/EplNmtMnu.h b/drivers/staging/epl/user/EplNmtMnu.h index a101fde74ee..c54efeba303 100644 --- a/drivers/staging/epl/user/EplNmtMnu.h +++ b/drivers/staging/epl/user/EplNmtMnu.h @@ -66,7 +66,6 @@ 2006/06/09 k.t.: start of the implementation - ****************************************************************************/ #include "EplNmtu.h" @@ -74,29 +73,25 @@ #ifndef _EPLNMTMNU_H_ #define _EPLNMTMNU_H_ - //--------------------------------------------------------------------------- // const defines //--------------------------------------------------------------------------- - //--------------------------------------------------------------------------- // typedef //--------------------------------------------------------------------------- -typedef tEplKernel (PUBLIC * tEplNmtMnuCbNodeEvent) ( - unsigned int uiNodeId_p, - tEplNmtNodeEvent NodeEvent_p, - tEplNmtState NmtState_p, - WORD wErrorCode_p, - BOOL fMandatory_p); - - -typedef tEplKernel (PUBLIC * tEplNmtMnuCbBootEvent) ( - tEplNmtBootEvent BootEvent_p, - tEplNmtState NmtState_p, - WORD wErrorCode_p); +typedef tEplKernel(PUBLIC * tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, + tEplNmtNodeEvent + NodeEvent_p, + tEplNmtState NmtState_p, + WORD wErrorCode_p, + BOOL fMandatory_p); +typedef tEplKernel(PUBLIC * + tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p, + tEplNmtState NmtState_p, + WORD wErrorCode_p); //--------------------------------------------------------------------------- // function prototypes @@ -105,32 +100,32 @@ typedef tEplKernel (PUBLIC * tEplNmtMnuCbBootEvent) ( #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) tEplKernel EplNmtMnuInit(tEplNmtMnuCbNodeEvent pfnCbNodeEvent_p, - tEplNmtMnuCbBootEvent pfnCbBootEvent_p); + tEplNmtMnuCbBootEvent pfnCbBootEvent_p); tEplKernel EplNmtMnuAddInstance(tEplNmtMnuCbNodeEvent pfnCbNodeEvent_p, - tEplNmtMnuCbBootEvent pfnCbBootEvent_p); + tEplNmtMnuCbBootEvent pfnCbBootEvent_p); tEplKernel EplNmtMnuDelInstance(void); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtMnuProcessEvent( - tEplEvent* pEvent_p); +EPLDLLEXPORT tEplKernel PUBLIC EplNmtMnuProcessEvent(tEplEvent * pEvent_p); tEplKernel EplNmtMnuSendNmtCommand(unsigned int uiNodeId_p, - tEplNmtCommand NmtCommand_p); + tEplNmtCommand NmtCommand_p); tEplKernel EplNmtMnuTriggerStateChange(unsigned int uiNodeId_p, - tEplNmtNodeCommand NodeCommand_p); + tEplNmtNodeCommand NodeCommand_p); -tEplKernel PUBLIC EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p); +tEplKernel PUBLIC EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange + NmtStateChange_p); tEplKernel PUBLIC EplNmtMnuCbCheckEvent(tEplNmtEvent NmtEvent_p); -tEplKernel PUBLIC EplNmtMnuGetDiagnosticInfo(unsigned int* puiMandatorySlaveCount_p, - unsigned int* puiSignalSlaveCount_p, - WORD* pwFlags_p); +tEplKernel PUBLIC EplNmtMnuGetDiagnosticInfo(unsigned int + *puiMandatorySlaveCount_p, + unsigned int + *puiSignalSlaveCount_p, + WORD * pwFlags_p); #endif -#endif // #ifndef _EPLNMTMNU_H_ - - +#endif // #ifndef _EPLNMTMNU_H_ diff --git a/drivers/staging/epl/user/EplNmtu.h b/drivers/staging/epl/user/EplNmtu.h index 0ed7fffec0e..5a56c583060 100644 --- a/drivers/staging/epl/user/EplNmtu.h +++ b/drivers/staging/epl/user/EplNmtu.h @@ -66,7 +66,6 @@ 2006/06/09 k.t.: start of the implementation - ****************************************************************************/ #include "../EplNmt.h" @@ -75,62 +74,59 @@ #ifndef _EPLNMTU_H_ #define _EPLNMTU_H_ - //--------------------------------------------------------------------------- // const defines //--------------------------------------------------------------------------- - //--------------------------------------------------------------------------- // typedef //--------------------------------------------------------------------------- // nmt commands -typedef enum -{ - // requestable ASnd ServiceIds 0x01..0x1F - kEplNmtCmdIdentResponse = 0x01, - kEplNmtCmdStatusResponse = 0x02, - // plain NMT state commands 0x20..0x3F - kEplNmtCmdStartNode = 0x21, - kEplNmtCmdStopNode = 0x22, - kEplNmtCmdEnterPreOperational2 = 0x23, - kEplNmtCmdEnableReadyToOperate = 0x24, - kEplNmtCmdResetNode = 0x28, - kEplNmtCmdResetCommunication = 0x29, - kEplNmtCmdResetConfiguration = 0x2A, - kEplNmtCmdSwReset = 0x2B, - // extended NMT state commands 0x40..0x5F - kEplNmtCmdStartNodeEx = 0x41, - kEplNmtCmdStopNodeEx = 0x42, - kEplNmtCmdEnterPreOperational2Ex = 0x43, - kEplNmtCmdEnableReadyToOperateEx = 0x44, - kEplNmtCmdResetNodeEx = 0x48, - kEplNmtCmdResetCommunicationEx = 0x49, - kEplNmtCmdResetConfigurationEx = 0x4A, - kEplNmtCmdSwResetEx = 0x4B, - // NMT managing commands 0x60..0x7F - kEplNmtCmdNetHostNameSet = 0x62, - kEplNmtCmdFlushArpEntry = 0x63, - // NMT info services 0x80..0xBF - kEplNmtCmdPublishConfiguredCN = 0x80, - kEplNmtCmdPublishActiveCN = 0x90, - kEplNmtCmdPublishPreOperational1 = 0x91, - kEplNmtCmdPublishPreOperational2 = 0x92, - kEplNmtCmdPublishReadyToOperate = 0x93, - kEplNmtCmdPublishOperational = 0x94, - kEplNmtCmdPublishStopped = 0x95, - kEplNmtCmdPublishEmergencyNew = 0xA0, - kEplNmtCmdPublishTime = 0xB0, - - kEplNmtCmdInvalidService = 0xFF - +typedef enum { + // requestable ASnd ServiceIds 0x01..0x1F + kEplNmtCmdIdentResponse = 0x01, + kEplNmtCmdStatusResponse = 0x02, + // plain NMT state commands 0x20..0x3F + kEplNmtCmdStartNode = 0x21, + kEplNmtCmdStopNode = 0x22, + kEplNmtCmdEnterPreOperational2 = 0x23, + kEplNmtCmdEnableReadyToOperate = 0x24, + kEplNmtCmdResetNode = 0x28, + kEplNmtCmdResetCommunication = 0x29, + kEplNmtCmdResetConfiguration = 0x2A, + kEplNmtCmdSwReset = 0x2B, + // extended NMT state commands 0x40..0x5F + kEplNmtCmdStartNodeEx = 0x41, + kEplNmtCmdStopNodeEx = 0x42, + kEplNmtCmdEnterPreOperational2Ex = 0x43, + kEplNmtCmdEnableReadyToOperateEx = 0x44, + kEplNmtCmdResetNodeEx = 0x48, + kEplNmtCmdResetCommunicationEx = 0x49, + kEplNmtCmdResetConfigurationEx = 0x4A, + kEplNmtCmdSwResetEx = 0x4B, + // NMT managing commands 0x60..0x7F + kEplNmtCmdNetHostNameSet = 0x62, + kEplNmtCmdFlushArpEntry = 0x63, + // NMT info services 0x80..0xBF + kEplNmtCmdPublishConfiguredCN = 0x80, + kEplNmtCmdPublishActiveCN = 0x90, + kEplNmtCmdPublishPreOperational1 = 0x91, + kEplNmtCmdPublishPreOperational2 = 0x92, + kEplNmtCmdPublishReadyToOperate = 0x93, + kEplNmtCmdPublishOperational = 0x94, + kEplNmtCmdPublishStopped = 0x95, + kEplNmtCmdPublishEmergencyNew = 0xA0, + kEplNmtCmdPublishTime = 0xB0, + + kEplNmtCmdInvalidService = 0xFF } tEplNmtCommand; -typedef tEplKernel (PUBLIC * tEplNmtuStateChangeCallback) ( - tEplEventNmtStateChange NmtStateChange_p); +typedef tEplKernel(PUBLIC * + tEplNmtuStateChangeCallback) (tEplEventNmtStateChange + NmtStateChange_p); -typedef tEplKernel (PUBLIC * tEplNmtuCheckEventCallback) ( - tEplNmtEvent NmtEvent_p); +typedef tEplKernel(PUBLIC * + tEplNmtuCheckEventCallback) (tEplNmtEvent NmtEvent_p); //--------------------------------------------------------------------------- // function prototypes @@ -148,14 +144,12 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtuNmtEvent(tEplNmtEvent NmtEvent_p); EPLDLLEXPORT tEplNmtState PUBLIC EplNmtuGetNmtState(void); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuProcessEvent( - tEplEvent* pEplEvent_p); +EPLDLLEXPORT tEplKernel PUBLIC EplNmtuProcessEvent(tEplEvent * pEplEvent_p); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuRegisterStateChangeCb( - tEplNmtuStateChangeCallback pfnEplNmtStateChangeCb_p); +EPLDLLEXPORT tEplKernel PUBLIC +EplNmtuRegisterStateChangeCb(tEplNmtuStateChangeCallback + pfnEplNmtStateChangeCb_p); #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) -#endif // #ifndef _EPLNMTU_H_ - - +#endif // #ifndef _EPLNMTU_H_ diff --git a/drivers/staging/epl/user/EplNmtuCal.h b/drivers/staging/epl/user/EplNmtuCal.h index 6d964bbe0bd..c881582702b 100644 --- a/drivers/staging/epl/user/EplNmtuCal.h +++ b/drivers/staging/epl/user/EplNmtuCal.h @@ -67,7 +67,6 @@ 2006/06/16 -k.t.: start of the implementation - ****************************************************************************/ #include "EplNmtu.h" @@ -76,22 +75,17 @@ #ifndef _EPLNMTUCAL_H_ #define _EPLNMTUCAL_H_ - //--------------------------------------------------------------------------- // const defines //--------------------------------------------------------------------------- - //--------------------------------------------------------------------------- // typedef //--------------------------------------------------------------------------- - //--------------------------------------------------------------------------- // function prototypes //--------------------------------------------------------------------------- EPLDLLEXPORT tEplNmtState PUBLIC EplNmtkCalGetNmtState(void); -#endif // #ifndef _EPLNMTUCAL_H_ - - +#endif // #ifndef _EPLNMTUCAL_H_ diff --git a/drivers/staging/epl/user/EplObdu.h b/drivers/staging/epl/u |