---

yaml --- r: 126761 b: refs/heads/master c: bd5cd82 h: refs/heads/master i: 126759: bc5331e v: v3
git-mirror · Jan 6, 2009 · 977cad4 · 977cad4
1 parent c3652be
commit 977cad4
Show file tree

Hide file tree

Showing 20 changed files with 321 additions and 432 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba338d462655cbcc436ace8b73afa003cd485928
+refs/heads/master: bd5cd82dc6148aa8f655620e6f3bf62e5e320078
diff --git a/trunk/drivers/staging/epl/user/EplCfgMau.h b/trunk/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/trunk/drivers/staging/epl/user/EplDllu.h b/trunk/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/trunk/drivers/staging/epl/user/EplDlluCal.h b/trunk/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/trunk/drivers/staging/epl/user/EplEventu.h b/trunk/drivers/staging/epl/user/EplEventu.h
@@ -66,15 +66,13 @@
 
   2006/06/12 d.k.:   start of the implementation, version 1.00
 
-
 ****************************************************************************/
 
 #ifndef _EPL_EVENTU_H_
 #define _EPL_EVENTU_H_
 
 #include "../EplEvent.h"
 
-
 //---------------------------------------------------------------------------
 // const defines
 //---------------------------------------------------------------------------
@@ -83,15 +81,15 @@
 // typedef
 //---------------------------------------------------------------------------
 
-
 //---------------------------------------------------------------------------
 // function prototypes
 //---------------------------------------------------------------------------
 // init function
 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_