diff options
Diffstat (limited to 'drivers/staging/epl/user')
-rw-r--r-- | drivers/staging/epl/user/EplCfgMau.h | 47 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplDllu.h | 2 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplDlluCal.h | 2 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplEventu.h | 17 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplIdentu.h | 20 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplLedu.h | 14 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtCnu.h | 13 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtMnu.h | 28 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtu.h | 23 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtuCal.h | 2 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplObdu.h | 76 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplObduCal.h | 76 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplPdou.h | 2 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoAsndu.h | 18 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoAsySequ.h | 26 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoComu.h | 31 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoUdpu.h | 21 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplStatusu.h | 18 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplTimeru.h | 22 |
19 files changed, 213 insertions, 245 deletions
diff --git a/drivers/staging/epl/user/EplCfgMau.h b/drivers/staging/epl/user/EplCfgMau.h index d25a1e9d36c..cafe60f094b 100644 --- a/drivers/staging/epl/user/EplCfgMau.h +++ b/drivers/staging/epl/user/EplCfgMau.h | |||
@@ -86,8 +86,8 @@ | |||
86 | #define EPL_CFGMA_MAX_TIMEOUT 3 | 86 | #define EPL_CFGMA_MAX_TIMEOUT 3 |
87 | 87 | ||
88 | //callbackfunction, called if configuration is finished | 88 | //callbackfunction, called if configuration is finished |
89 | typedef void (PUBLIC * tfpEplCfgMaCb) (unsigned int uiNodeId_p, | 89 | typedef void (* tfpEplCfgMaCb)(unsigned int uiNodeId_p, |
90 | tEplKernel Errorstate_p); | 90 | tEplKernel Errorstate_p); |
91 | 91 | ||
92 | //State for configuartion manager Statemachine | 92 | //State for configuartion manager Statemachine |
93 | typedef enum { | 93 | typedef enum { |
@@ -166,7 +166,7 @@ typedef struct { | |||
166 | // | 166 | // |
167 | // Returns: tEplKernel = error code | 167 | // Returns: tEplKernel = error code |
168 | //--------------------------------------------------------------------------- | 168 | //--------------------------------------------------------------------------- |
169 | tEplKernel PUBLIC EplCfgMaInit(); | 169 | tEplKernel EplCfgMaInit(void); |
170 | 170 | ||
171 | //--------------------------------------------------------------------------- | 171 | //--------------------------------------------------------------------------- |
172 | // Function: EplCfgMaAddInstance() | 172 | // Function: EplCfgMaAddInstance() |
@@ -177,7 +177,7 @@ tEplKernel PUBLIC EplCfgMaInit(); | |||
177 | // | 177 | // |
178 | // Returns: tEplKernel = error code | 178 | // Returns: tEplKernel = error code |
179 | //--------------------------------------------------------------------------- | 179 | //--------------------------------------------------------------------------- |
180 | tEplKernel PUBLIC EplCfgMaAddInstance(); | 180 | tEplKernel EplCfgMaAddInstance(void); |
181 | 181 | ||
182 | //--------------------------------------------------------------------------- | 182 | //--------------------------------------------------------------------------- |
183 | // Function: EplCfgMaDelInstance() | 183 | // Function: EplCfgMaDelInstance() |
@@ -188,7 +188,7 @@ tEplKernel PUBLIC EplCfgMaAddInstance(); | |||
188 | // | 188 | // |
189 | // Returns: tEplKernel = error code | 189 | // Returns: tEplKernel = error code |
190 | //--------------------------------------------------------------------------- | 190 | //--------------------------------------------------------------------------- |
191 | tEplKernel PUBLIC EplCfgMaDelInstance(); | 191 | tEplKernel plCfgMaDelInstance(void); |
192 | 192 | ||
193 | //--------------------------------------------------------------------------- | 193 | //--------------------------------------------------------------------------- |
194 | // Function: EplCfgMaStartConfig() | 194 | // Function: EplCfgMaStartConfig() |
@@ -204,11 +204,11 @@ tEplKernel PUBLIC EplCfgMaDelInstance(); | |||
204 | // | 204 | // |
205 | // Returns: tCopKernel = error code | 205 | // Returns: tCopKernel = error code |
206 | //--------------------------------------------------------------------------- | 206 | //--------------------------------------------------------------------------- |
207 | tEplKernel PUBLIC EplCfgMaStartConfig(unsigned int uiNodeId_p, | 207 | tEplKernel EplCfgMaStartConfig(unsigned int uiNodeId_p, |
208 | BYTE * pbConcise_p, | 208 | BYTE * pbConcise_p, |
209 | tfpEplCfgMaCb fpCfgMaCb_p, | 209 | tfpEplCfgMaCb fpCfgMaCb_p, |
210 | tEplObdSize SizeOfConcise_p, | 210 | tEplObdSize SizeOfConcise_p, |
211 | tEplCfgMaDcfTyp DcfType_p); | 211 | tEplCfgMaDcfTyp DcfType_p); |
212 | 212 | ||
213 | //--------------------------------------------------------------------------- | 213 | //--------------------------------------------------------------------------- |
214 | // Function: CfgMaStartConfigurationNode() | 214 | // Function: CfgMaStartConfigurationNode() |
@@ -222,9 +222,9 @@ tEplKernel PUBLIC EplCfgMaStartConfig(unsigned int uiNodeId_p, | |||
222 | // | 222 | // |
223 | // Returns: tCopKernel = error code | 223 | // Returns: tCopKernel = error code |
224 | //--------------------------------------------------------------------------- | 224 | //--------------------------------------------------------------------------- |
225 | tEplKernel PUBLIC EplCfgMaStartConfigNode(unsigned int uiNodeId_p, | 225 | tEplKernel EplCfgMaStartConfigNode(unsigned int uiNodeId_p, |
226 | tfpEplCfgMaCb fpCfgMaCb_p, | 226 | tfpEplCfgMaCb fpCfgMaCb_p, |
227 | tEplCfgMaDcfTyp DcfType_p); | 227 | tEplCfgMaDcfTyp DcfType_p); |
228 | 228 | ||
229 | //--------------------------------------------------------------------------- | 229 | //--------------------------------------------------------------------------- |
230 | // Function: EplCfgMaStartConfigNodeDcf() | 230 | // Function: EplCfgMaStartConfigNodeDcf() |
@@ -240,11 +240,11 @@ tEplKernel PUBLIC EplCfgMaStartConfigNode(unsigned int uiNodeId_p, | |||
240 | // | 240 | // |
241 | // Returns: tCopKernel = error code | 241 | // Returns: tCopKernel = error code |
242 | //--------------------------------------------------------------------------- | 242 | //--------------------------------------------------------------------------- |
243 | tEplKernel PUBLIC EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, | 243 | tEplKernel EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, |
244 | BYTE * pbConcise_p, | 244 | BYTE * pbConcise_p, |
245 | tfpEplCfgMaCb fpCfgMaCb_p, | 245 | tfpEplCfgMaCb fpCfgMaCb_p, |
246 | tEplObdSize SizeOfConcise_p, | 246 | tEplObdSize SizeOfConcise_p, |
247 | tEplCfgMaDcfTyp DcfType_p); | 247 | tEplCfgMaDcfTyp DcfType_p); |
248 | 248 | ||
249 | //--------------------------------------------------------------------------- | 249 | //--------------------------------------------------------------------------- |
250 | // Function: EplCfgMaLinkDcf() | 250 | // Function: EplCfgMaLinkDcf() |
@@ -258,10 +258,10 @@ tEplKernel PUBLIC EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, | |||
258 | // | 258 | // |
259 | // Returns: tCopKernel = error code | 259 | // Returns: tCopKernel = error code |
260 | //--------------------------------------------------------------------------- | 260 | //--------------------------------------------------------------------------- |
261 | tEplKernel PUBLIC EplCfgMaLinkDcf(unsigned int uiNodeId_p, | 261 | tEplKernel EplCfgMaLinkDcf(unsigned int uiNodeId_p, |
262 | BYTE * pbConcise_p, | 262 | BYTE * pbConcise_p, |
263 | tEplObdSize SizeOfConcise_p, | 263 | tEplObdSize SizeOfConcise_p, |
264 | tEplCfgMaDcfTyp DcfType_p); | 264 | tEplCfgMaDcfTyp DcfType_p); |
265 | 265 | ||
266 | //--------------------------------------------------------------------------- | 266 | //--------------------------------------------------------------------------- |
267 | // Function: EplCfgMaCheckDcf() | 267 | // Function: EplCfgMaCheckDcf() |
@@ -274,8 +274,7 @@ tEplKernel PUBLIC EplCfgMaLinkDcf(unsigned int uiNodeId_p, | |||
274 | // | 274 | // |
275 | // Returns: tCopKernel = error code | 275 | // Returns: tCopKernel = error code |
276 | //--------------------------------------------------------------------------- | 276 | //--------------------------------------------------------------------------- |
277 | tEplKernel PUBLIC EplCfgMaCheckDcf(unsigned int uiNodeId_p, | 277 | tEplKernel EplCfgMaCheckDcf(unsigned int uiNodeId_p, tEplCfgMaDcfTyp DcfType_p); |
278 | tEplCfgMaDcfTyp DcfType_p); | ||
279 | 278 | ||
280 | #endif // #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_CFGMA)) != 0) | 279 | #endif // #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_CFGMA)) != 0) |
281 | 280 | ||
diff --git a/drivers/staging/epl/user/EplDllu.h b/drivers/staging/epl/user/EplDllu.h index 36f8bb76f7c..ea1f2c09d8c 100644 --- a/drivers/staging/epl/user/EplDllu.h +++ b/drivers/staging/epl/user/EplDllu.h | |||
@@ -81,7 +81,7 @@ | |||
81 | // typedef | 81 | // typedef |
82 | //--------------------------------------------------------------------------- | 82 | //--------------------------------------------------------------------------- |
83 | 83 | ||
84 | typedef tEplKernel(PUBLIC * tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); | 84 | typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); |
85 | 85 | ||
86 | //--------------------------------------------------------------------------- | 86 | //--------------------------------------------------------------------------- |
87 | // function prototypes | 87 | // function prototypes |
diff --git a/drivers/staging/epl/user/EplDlluCal.h b/drivers/staging/epl/user/EplDlluCal.h index b1dcd060957..2b2232d02bb 100644 --- a/drivers/staging/epl/user/EplDlluCal.h +++ b/drivers/staging/epl/user/EplDlluCal.h | |||
@@ -82,7 +82,7 @@ | |||
82 | // typedef | 82 | // typedef |
83 | //--------------------------------------------------------------------------- | 83 | //--------------------------------------------------------------------------- |
84 | 84 | ||
85 | typedef tEplKernel(PUBLIC * tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); | 85 | typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); |
86 | 86 | ||
87 | //--------------------------------------------------------------------------- | 87 | //--------------------------------------------------------------------------- |
88 | // function prototypes | 88 | // function prototypes |
diff --git a/drivers/staging/epl/user/EplEventu.h b/drivers/staging/epl/user/EplEventu.h index 322cffd1187..1a72f1f82f5 100644 --- a/drivers/staging/epl/user/EplEventu.h +++ b/drivers/staging/epl/user/EplEventu.h | |||
@@ -85,24 +85,23 @@ | |||
85 | // function prototypes | 85 | // function prototypes |
86 | //--------------------------------------------------------------------------- | 86 | //--------------------------------------------------------------------------- |
87 | // init function | 87 | // init function |
88 | tEplKernel PUBLIC EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p); | 88 | tEplKernel EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p); |
89 | 89 | ||
90 | // add instance | 90 | // add instance |
91 | tEplKernel PUBLIC EplEventuAddInstance(tEplProcessEventCb | 91 | tEplKernel EplEventuAddInstance(tEplProcessEventCb pfnApiProcessEventCb_p); |
92 | pfnApiProcessEventCb_p); | ||
93 | 92 | ||
94 | // delete instance | 93 | // delete instance |
95 | tEplKernel PUBLIC EplEventuDelInstance(void); | 94 | tEplKernel EplEventuDelInstance(void); |
96 | 95 | ||
97 | // Task that dispatches events in userspace | 96 | // Task that dispatches events in userspace |
98 | tEplKernel PUBLIC EplEventuProcess(tEplEvent * pEvent_p); | 97 | tEplKernel EplEventuProcess(tEplEvent * pEvent_p); |
99 | 98 | ||
100 | // post events from userspace | 99 | // post events from userspace |
101 | tEplKernel PUBLIC EplEventuPost(tEplEvent * pEvent_p); | 100 | tEplKernel EplEventuPost(tEplEvent * pEvent_p); |
102 | 101 | ||
103 | // post errorevents from userspace | 102 | // post errorevents from userspace |
104 | tEplKernel PUBLIC EplEventuPostError(tEplEventSource EventSource_p, | 103 | tEplKernel EplEventuPostError(tEplEventSource EventSource_p, |
105 | tEplKernel EplError_p, | 104 | tEplKernel EplError_p, |
106 | unsigned int uiArgSize_p, void *pArg_p); | 105 | unsigned int uiArgSize_p, void *pArg_p); |
107 | 106 | ||
108 | #endif // #ifndef _EPL_EVENTU_H_ | 107 | #endif // #ifndef _EPL_EVENTU_H_ |
diff --git a/drivers/staging/epl/user/EplIdentu.h b/drivers/staging/epl/user/EplIdentu.h index e7302106c74..973e4b34ecd 100644 --- a/drivers/staging/epl/user/EplIdentu.h +++ b/drivers/staging/epl/user/EplIdentu.h | |||
@@ -81,7 +81,7 @@ | |||
81 | // typedef | 81 | // typedef |
82 | //--------------------------------------------------------------------------- | 82 | //--------------------------------------------------------------------------- |
83 | 83 | ||
84 | typedef tEplKernel(PUBLIC * tEplIdentuCbResponse) (unsigned int uiNodeId_p, | 84 | typedef tEplKernel(* tEplIdentuCbResponse) (unsigned int uiNodeId_p, |
85 | tEplIdentResponse * | 85 | tEplIdentResponse * |
86 | pIdentResponse_p); | 86 | pIdentResponse_p); |
87 | 87 | ||
@@ -89,20 +89,18 @@ typedef tEplKernel(PUBLIC * tEplIdentuCbResponse) (unsigned int uiNodeId_p, | |||
89 | // function prototypes | 89 | // function prototypes |
90 | //--------------------------------------------------------------------------- | 90 | //--------------------------------------------------------------------------- |
91 | 91 | ||
92 | tEplKernel PUBLIC EplIdentuInit(void); | 92 | tEplKernel EplIdentuInit(void); |
93 | 93 | ||
94 | tEplKernel PUBLIC EplIdentuAddInstance(void); | 94 | tEplKernel EplIdentuAddInstance(void); |
95 | 95 | ||
96 | tEplKernel PUBLIC EplIdentuDelInstance(void); | 96 | tEplKernel EplIdentuDelInstance(void); |
97 | 97 | ||
98 | tEplKernel PUBLIC EplIdentuReset(void); | 98 | tEplKernel EplIdentuReset(void); |
99 | 99 | ||
100 | tEplKernel PUBLIC EplIdentuGetIdentResponse(unsigned int uiNodeId_p, | 100 | tEplKernel EplIdentuGetIdentResponse(unsigned int uiNodeId_p, |
101 | tEplIdentResponse ** | 101 | tEplIdentResponse **ppIdentResponse_p); |
102 | ppIdentResponse_p); | ||
103 | 102 | ||
104 | tEplKernel PUBLIC EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, | 103 | tEplKernel EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, |
105 | tEplIdentuCbResponse | 104 | tEplIdentuCbResponse pfnCbResponse_p); |
106 | pfnCbResponse_p); | ||
107 | 105 | ||
108 | #endif // #ifndef _EPLIDENTU_H_ | 106 | #endif // #ifndef _EPLIDENTU_H_ |
diff --git a/drivers/staging/epl/user/EplLedu.h b/drivers/staging/epl/user/EplLedu.h index 78e70d06445..87fd02f6819 100644 --- a/drivers/staging/epl/user/EplLedu.h +++ b/drivers/staging/epl/user/EplLedu.h | |||
@@ -83,7 +83,7 @@ | |||
83 | // typedef | 83 | // typedef |
84 | //--------------------------------------------------------------------------- | 84 | //--------------------------------------------------------------------------- |
85 | 85 | ||
86 | typedef tEplKernel(PUBLIC * tEplLeduStateChangeCallback) (tEplLedType LedType_p, | 86 | typedef tEplKernel(* tEplLeduStateChangeCallback) (tEplLedType LedType_p, |
87 | BOOL fOn_p); | 87 | BOOL fOn_p); |
88 | 88 | ||
89 | //--------------------------------------------------------------------------- | 89 | //--------------------------------------------------------------------------- |
@@ -92,17 +92,15 @@ typedef tEplKernel(PUBLIC * tEplLeduStateChangeCallback) (tEplLedType LedType_p, | |||
92 | 92 | ||
93 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) | 93 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) |
94 | 94 | ||
95 | tEplKernel PUBLIC EplLeduInit(tEplLeduStateChangeCallback pfnCbStateChange_p); | 95 | tEplKernel EplLeduInit(tEplLeduStateChangeCallback pfnCbStateChange_p); |
96 | 96 | ||
97 | tEplKernel PUBLIC EplLeduAddInstance(tEplLeduStateChangeCallback | 97 | tEplKernel EplLeduAddInstance(tEplLeduStateChangeCallback pfnCbStateChange_p); |
98 | pfnCbStateChange_p); | ||
99 | 98 | ||
100 | tEplKernel PUBLIC EplLeduDelInstance(void); | 99 | tEplKernel EplLeduDelInstance(void); |
101 | 100 | ||
102 | tEplKernel PUBLIC EplLeduCbNmtStateChange(tEplEventNmtStateChange | 101 | tEplKernel EplLeduCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p); |
103 | NmtStateChange_p); | ||
104 | 102 | ||
105 | tEplKernel PUBLIC EplLeduProcessEvent(tEplEvent * pEplEvent_p); | 103 | tEplKernel EplLeduProcessEvent(tEplEvent * pEplEvent_p); |
106 | 104 | ||
107 | #endif // #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) | 105 | #endif // #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) |
108 | 106 | ||
diff --git a/drivers/staging/epl/user/EplNmtCnu.h b/drivers/staging/epl/user/EplNmtCnu.h index e508055b5b8..d7e74026388 100644 --- a/drivers/staging/epl/user/EplNmtCnu.h +++ b/drivers/staging/epl/user/EplNmtCnu.h | |||
@@ -89,17 +89,16 @@ | |||
89 | 89 | ||
90 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_CN)) != 0) | 90 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_CN)) != 0) |
91 | 91 | ||
92 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuInit(unsigned int uiNodeId_p); | 92 | EPLDLLEXPORT tEplKernel EplNmtCnuInit(unsigned int uiNodeId_p); |
93 | 93 | ||
94 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuAddInstance(unsigned int uiNodeId_p); | 94 | EPLDLLEXPORT tEplKernel EplNmtCnuAddInstance(unsigned int uiNodeId_p); |
95 | 95 | ||
96 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuDelInstance(void); | 96 | EPLDLLEXPORT tEplKernel EplNmtCnuDelInstance(void); |
97 | 97 | ||
98 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, | 98 | EPLDLLEXPORT tEplKernel EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, |
99 | tEplNmtCommand | 99 | tEplNmtCommand NmtCommand_p); |
100 | NmtCommand_p); | ||
101 | 100 | ||
102 | EPLDLLEXPORT tEplKernel PUBLIC | 101 | EPLDLLEXPORT tEplKernel |
103 | EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback | 102 | EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback |
104 | pfnEplNmtCheckEventCb_p); | 103 | pfnEplNmtCheckEventCb_p); |
105 | 104 | ||
diff --git a/drivers/staging/epl/user/EplNmtMnu.h b/drivers/staging/epl/user/EplNmtMnu.h index c54efeba303..478baae2121 100644 --- a/drivers/staging/epl/user/EplNmtMnu.h +++ b/drivers/staging/epl/user/EplNmtMnu.h | |||
@@ -81,17 +81,15 @@ | |||
81 | // typedef | 81 | // typedef |
82 | //--------------------------------------------------------------------------- | 82 | //--------------------------------------------------------------------------- |
83 | 83 | ||
84 | typedef tEplKernel(PUBLIC * tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, | 84 | typedef tEplKernel(* tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, |
85 | tEplNmtNodeEvent | 85 | tEplNmtNodeEvent NodeEvent_p, |
86 | NodeEvent_p, | 86 | tEplNmtState NmtState_p, |
87 | tEplNmtState NmtState_p, | 87 | WORD wErrorCode_p, |
88 | WORD wErrorCode_p, | 88 | BOOL fMandatory_p); |
89 | BOOL fMandatory_p); | 89 | |
90 | 90 | typedef tEplKernel(* tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p, | |
91 | typedef tEplKernel(PUBLIC * | 91 | tEplNmtState NmtState_p, |
92 | tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p, | 92 | WORD wErrorCode_p); |
93 | tEplNmtState NmtState_p, | ||
94 | WORD wErrorCode_p); | ||
95 | 93 | ||
96 | //--------------------------------------------------------------------------- | 94 | //--------------------------------------------------------------------------- |
97 | // function prototypes | 95 | // function prototypes |
@@ -107,7 +105,7 @@ tEplKernel EplNmtMnuAddInstance(tEplNmtMnuCbNodeEvent pfnCbNodeEvent_p, | |||
107 | 105 | ||
108 | tEplKernel EplNmtMnuDelInstance(void); | 106 | tEplKernel EplNmtMnuDelInstance(void); |
109 | 107 | ||
110 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtMnuProcessEvent(tEplEvent * pEvent_p); | 108 | EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent * pEvent_p); |
111 | 109 | ||
112 | tEplKernel EplNmtMnuSendNmtCommand(unsigned int uiNodeId_p, | 110 | tEplKernel EplNmtMnuSendNmtCommand(unsigned int uiNodeId_p, |
113 | tEplNmtCommand NmtCommand_p); | 111 | tEplNmtCommand NmtCommand_p); |
@@ -115,12 +113,12 @@ tEplKernel EplNmtMnuSendNmtCommand(unsigned int uiNodeId_p, | |||
115 | tEplKernel EplNmtMnuTriggerStateChange(unsigned int uiNodeId_p, | 113 | tEplKernel EplNmtMnuTriggerStateChange(unsigned int uiNodeId_p, |
116 | tEplNmtNodeCommand NodeCommand_p); | 114 | tEplNmtNodeCommand NodeCommand_p); |
117 | 115 | ||
118 | tEplKernel PUBLIC EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange | 116 | tEplKernel EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange |
119 | NmtStateChange_p); | 117 | NmtStateChange_p); |
120 | 118 | ||
121 | tEplKernel PUBLIC EplNmtMnuCbCheckEvent(tEplNmtEvent NmtEvent_p); | 119 | tEplKernel EplNmtMnuCbCheckEvent(tEplNmtEvent NmtEvent_p); |
122 | 120 | ||
123 | tEplKernel PUBLIC EplNmtMnuGetDiagnosticInfo(unsigned int | 121 | tEplKernel EplNmtMnuGetDiagnosticInfo(unsigned int |
124 | *puiMandatorySlaveCount_p, | 122 | *puiMandatorySlaveCount_p, |
125 | unsigned int | 123 | unsigned int |
126 | *puiSignalSlaveCount_p, | 124 | *puiSignalSlaveCount_p, |
diff --git a/drivers/staging/epl/user/EplNmtu.h b/drivers/staging/epl/user/EplNmtu.h index 5a56c583060..fd63899d284 100644 --- a/drivers/staging/epl/user/EplNmtu.h +++ b/drivers/staging/epl/user/EplNmtu.h | |||
@@ -121,12 +121,9 @@ typedef enum { | |||
121 | kEplNmtCmdInvalidService = 0xFF | 121 | kEplNmtCmdInvalidService = 0xFF |
122 | } tEplNmtCommand; | 122 | } tEplNmtCommand; |
123 | 123 | ||
124 | typedef tEplKernel(PUBLIC * | 124 | typedef tEplKernel(* tEplNmtuStateChangeCallback) (tEplEventNmtStateChange NmtStateChange_p); |
125 | tEplNmtuStateChangeCallback) (tEplEventNmtStateChange | ||
126 | NmtStateChange_p); | ||
127 | 125 | ||
128 | typedef tEplKernel(PUBLIC * | 126 | typedef tEplKernel(* tEplNmtuCheckEventCallback) (tEplNmtEvent NmtEvent_p); |
129 | tEplNmtuCheckEventCallback) (tEplNmtEvent NmtEvent_p); | ||
130 | 127 | ||
131 | //--------------------------------------------------------------------------- | 128 | //--------------------------------------------------------------------------- |
132 | // function prototypes | 129 | // function prototypes |
@@ -134,21 +131,19 @@ typedef tEplKernel(PUBLIC * | |||
134 | 131 | ||
135 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) | 132 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) |
136 | 133 | ||
137 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtuInit(void); | 134 | EPLDLLEXPORT tEplKernel EplNmtuInit(void); |
138 | 135 | ||
139 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtuAddInstance(void); | 136 | EPLDLLEXPORT tEplKernel EplNmtuAddInstance(void); |
140 | 137 | ||
141 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtuDelInstance(void); | 138 | EPLDLLEXPORT tEplKernel EplNmtuDelInstance(void); |
142 | 139 | ||
143 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtuNmtEvent(tEplNmtEvent NmtEvent_p); | 140 | EPLDLLEXPORT tEplKernel EplNmtuNmtEvent(tEplNmtEvent NmtEvent_p); |
144 | 141 | ||
145 | EPLDLLEXPORT tEplNmtState PUBLIC EplNmtuGetNmtState(void); | 142 | EPLDLLEXPORT tEplNmtState EplNmtuGetNmtState(void); |
146 | 143 | ||
147 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtuProcessEvent(tEplEvent * pEplEvent_p); | 144 | EPLDLLEXPORT tEplKernel EplNmtuProcessEvent(tEplEvent * pEplEvent_p); |
148 | 145 | ||
149 | EPLDLLEXPORT tEplKernel PUBLIC | 146 | EPLDLLEXPORT tEplKernel EplNmtuRegisterStateChangeCb(tEplNmtuStateChangeCallback pfnEplNmtStateChangeCb_p); |
150 | EplNmtuRegisterStateChangeCb(tEplNmtuStateChangeCallback | ||
151 | pfnEplNmtStateChangeCb_p); | ||
152 | 147 | ||
153 | #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) | 148 | #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) |
154 | 149 | ||
diff --git a/drivers/staging/epl/user/EplNmtuCal.h b/drivers/staging/epl/user/EplNmtuCal.h index c881582702b..d8c125e042f 100644 --- a/drivers/staging/epl/user/EplNmtuCal.h +++ b/drivers/staging/epl/user/EplNmtuCal.h | |||
@@ -86,6 +86,6 @@ | |||
86 | //--------------------------------------------------------------------------- | 86 | //--------------------------------------------------------------------------- |
87 | // function prototypes | 87 | // function prototypes |
88 | //--------------------------------------------------------------------------- | 88 | //--------------------------------------------------------------------------- |
89 | EPLDLLEXPORT tEplNmtState PUBLIC EplNmtkCalGetNmtState(void); | 89 | EPLDLLEXPORT tEplNmtState EplNmtkCalGetNmtState(void); |
90 | 90 | ||
91 | #endif // #ifndef _EPLNMTUCAL_H_ | 91 | #endif // #ifndef _EPLNMTUCAL_H_ |
diff --git a/drivers/staging/epl/user/EplObdu.h b/drivers/staging/epl/user/EplObdu.h index bc1e1730301..c9138cb084e 100644 --- a/drivers/staging/epl/user/EplObdu.h +++ b/drivers/staging/epl/user/EplObdu.h | |||
@@ -91,68 +91,64 @@ | |||
91 | #error "EPL OBDu module enabled, but OBD_USE_KERNEL == TRUE" | 91 | #error "EPL OBDu module enabled, but OBD_USE_KERNEL == TRUE" |
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntry(unsigned int uiIndex_p, | 94 | EPLDLLEXPORT tEplKernel EplObduWriteEntry(unsigned int uiIndex_p, |
95 | unsigned int uiSubIndex_p, | 95 | unsigned int uiSubIndex_p, |
96 | void *pSrcData_p, | 96 | void *pSrcData_p, |
97 | tEplObdSize Size_p); | 97 | tEplObdSize Size_p); |
98 | 98 | ||
99 | // --------------------------------------------------------------------- | 99 | // --------------------------------------------------------------------- |
100 | EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntry(unsigned int uiIndex_p, | 100 | EPLDLLEXPORT tEplKernel EplObduReadEntry(unsigned int uiIndex_p, |
101 | unsigned int uiSubIndex_p, | 101 | unsigned int uiSubIndex_p, |
102 | void *pDstData_p, | 102 | void *pDstData_p, |
103 | tEplObdSize * pSize_p); | 103 | tEplObdSize *pSize_p); |
104 | 104 | ||
105 | // --------------------------------------------------------------------- | 105 | // --------------------------------------------------------------------- |
106 | EPLDLLEXPORT tEplKernel PUBLIC EplObduAccessOdPart(tEplObdPart ObdPart_p, | 106 | EPLDLLEXPORT tEplKernel EplObduAccessOdPart(tEplObdPart ObdPart_p, |
107 | tEplObdDir Direction_p); | 107 | tEplObdDir Direction_p); |
108 | 108 | ||
109 | // --------------------------------------------------------------------- | 109 | // --------------------------------------------------------------------- |
110 | EPLDLLEXPORT tEplKernel PUBLIC EplObduDefineVar(tEplVarParam MEM * pVarParam_p); | 110 | EPLDLLEXPORT tEplKernel EplObduDefineVar(tEplVarParam MEM * pVarParam_p); |
111 | 111 | ||
112 | // --------------------------------------------------------------------- | 112 | // --------------------------------------------------------------------- |
113 | EPLDLLEXPORT void *PUBLIC EplObduGetObjectDataPtr(unsigned int uiIndex_p, | 113 | EPLDLLEXPORT void *EplObduGetObjectDataPtr(unsigned int uiIndex_p, |
114 | unsigned int uiSubIndex_p); | 114 | unsigned int uiSubIndex_p); |
115 | // --------------------------------------------------------------------- | 115 | // --------------------------------------------------------------------- |
116 | EPLDLLEXPORT tEplKernel PUBLIC EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p); | 116 | EPLDLLEXPORT tEplKernel EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p); |
117 | 117 | ||
118 | // --------------------------------------------------------------------- | 118 | // --------------------------------------------------------------------- |
119 | EPLDLLEXPORT void PUBLIC EplObduInitVarEntry(tEplObdVarEntry MEM * pVarEntry_p, | 119 | EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry MEM * pVarEntry_p, |
120 | BYTE bType_p, | 120 | BYTE bType_p, tEplObdSize ObdSize_p); |
121 | tEplObdSize ObdSize_p); | ||
122 | 121 | ||
123 | // --------------------------------------------------------------------- | 122 | // --------------------------------------------------------------------- |
124 | EPLDLLEXPORT tEplObdSize PUBLIC EplObduGetDataSize(unsigned int uiIndex_p, | 123 | EPLDLLEXPORT tEplObdSize EplObduGetDataSize(unsigned int uiIndex_p, |
125 | unsigned int uiSubIndex_p); | 124 | unsigned int uiSubIndex_p); |
126 | 125 | ||
127 | // --------------------------------------------------------------------- | 126 | // --------------------------------------------------------------------- |
128 | EPLDLLEXPORT unsigned int PUBLIC EplObduGetNodeId(void); | 127 | EPLDLLEXPORT unsigned int EplObduGetNodeId(void); |
129 | 128 | ||
130 | // --------------------------------------------------------------------- | 129 | // --------------------------------------------------------------------- |
131 | EPLDLLEXPORT tEplKernel PUBLIC EplObduSetNodeId(unsigned int uiNodeId_p, | 130 | EPLDLLEXPORT tEplKernel EplObduSetNodeId(unsigned int uiNodeId_p, |
132 | tEplObdNodeIdType NodeIdType_p); | 131 | tEplObdNodeIdType NodeIdType_p); |
133 | // --------------------------------------------------------------------- | 132 | // --------------------------------------------------------------------- |
134 | EPLDLLEXPORT tEplKernel PUBLIC EplObduGetAccessType(unsigned int uiIndex_p, | 133 | EPLDLLEXPORT tEplKernel EplObduGetAccessType(unsigned int uiIndex_p, |
135 | unsigned int uiSubIndex_p, | 134 | unsigned int uiSubIndex_p, |
136 | tEplObdAccess * | 135 | tEplObdAccess *pAccessTyp_p); |
137 | pAccessTyp_p); | ||
138 | // --------------------------------------------------------------------- | 136 | // --------------------------------------------------------------------- |
139 | EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntryToLe(unsigned int uiIndex_p, | 137 | EPLDLLEXPORT tEplKernel EplObduReadEntryToLe(unsigned int uiIndex_p, |
140 | unsigned int uiSubIndex_p, | 138 | unsigned int uiSubIndex_p, |
141 | void *pDstData_p, | 139 | void *pDstData_p, |
142 | tEplObdSize * pSize_p); | 140 | tEplObdSize *pSize_p); |
143 | // --------------------------------------------------------------------- | 141 | // --------------------------------------------------------------------- |
144 | EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntryFromLe(unsigned int uiIndex_p, | 142 | EPLDLLEXPORT tEplKernel EplObduWriteEntryFromLe(unsigned int uiIndex_p, |
145 | unsigned int | 143 | unsigned int uiSubIndex_p, |
146 | uiSubIndex_p, | 144 | void *pSrcData_p, |
147 | void *pSrcData_p, | 145 | tEplObdSize Size_p); |
148 | tEplObdSize Size_p); | ||
149 | 146 | ||
150 | // --------------------------------------------------------------------- | 147 | // --------------------------------------------------------------------- |
151 | EPLDLLEXPORT tEplKernel PUBLIC EplObduSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ | 148 | EPLDLLEXPORT tEplKernel EplObduSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ |
152 | unsigned int uiIndex_p, | 149 | unsigned int uiIndex_p, |
153 | unsigned int uiSubindex_p, | 150 | unsigned int uiSubindex_p, |
154 | tEplObdVarEntry MEM ** | 151 | tEplObdVarEntry MEM **ppVarEntry_p); |
155 | ppVarEntry_p); | ||
156 | 152 | ||
157 | #elif EPL_OBD_USE_KERNEL != FALSE | 153 | #elif EPL_OBD_USE_KERNEL != FALSE |
158 | #include "../kernel/EplObdk.h" | 154 | #include "../kernel/EplObdk.h" |
diff --git a/drivers/staging/epl/user/EplObduCal.h b/drivers/staging/epl/user/EplObduCal.h index 498e0112fac..367ecc56d15 100644 --- a/drivers/staging/epl/user/EplObduCal.h +++ b/drivers/staging/epl/user/EplObduCal.h | |||
@@ -85,62 +85,52 @@ | |||
85 | //--------------------------------------------------------------------------- | 85 | //--------------------------------------------------------------------------- |
86 | // function prototypes | 86 | // function prototypes |
87 | //--------------------------------------------------------------------------- | 87 | //--------------------------------------------------------------------------- |
88 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntry(unsigned int uiIndex_p, | 88 | EPLDLLEXPORT tEplKernel EplObduCalWriteEntry(unsigned int uiIndex_p, |
89 | unsigned int uiSubIndex_p, | 89 | unsigned int uiSubIndex_p, |
90 | void *pSrcData_p, | 90 | void *pSrcData_p, |
91 | tEplObdSize Size_p); | 91 | tEplObdSize Size_p); |
92 | //--------------------------------------------------------------------------- | 92 | //--------------------------------------------------------------------------- |
93 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntry(unsigned int uiIndex_p, | 93 | EPLDLLEXPORT tEplKernel EplObduCalReadEntry(unsigned int uiIndex_p, |
94 | unsigned int uiSubIndex_p, | 94 | unsigned int uiSubIndex_p, |
95 | void *pDstData_p, | 95 | void *pDstData_p, |
96 | tEplObdSize * pSize_p); | 96 | tEplObdSize * pSize_p); |
97 | //--------------------------------------------------------------------------- | 97 | //--------------------------------------------------------------------------- |
98 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalAccessOdPart(tEplObdPart ObdPart_p, | 98 | EPLDLLEXPORT tEplKernel EplObduCalAccessOdPart(tEplObdPart ObdPart_p, |
99 | tEplObdDir Direction_p); | 99 | tEplObdDir Direction_p); |
100 | //--------------------------------------------------------------------------- | 100 | //--------------------------------------------------------------------------- |
101 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalDefineVar(tEplVarParam MEM * | 101 | EPLDLLEXPORT tEplKernel EplObduCalDefineVar(tEplVarParam MEM *pVarParam_p); |
102 | pVarParam_p); | ||
103 | //--------------------------------------------------------------------------- | 102 | //--------------------------------------------------------------------------- |
104 | EPLDLLEXPORT void *PUBLIC EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, | 103 | EPLDLLEXPORT void *EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, |
105 | unsigned int uiSubIndex_p); | 104 | unsigned int uiSubIndex_p); |
106 | //--------------------------------------------------------------------------- | 105 | //--------------------------------------------------------------------------- |
107 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalRegisterUserOd(tEplObdEntryPtr | 106 | EPLDLLEXPORT tEplKernel EplObduCalRegisterUserOd(tEplObdEntryPtr pUserOd_p); |
108 | pUserOd_p); | ||
109 | //--------------------------------------------------------------------------- | 107 | //--------------------------------------------------------------------------- |
110 | EPLDLLEXPORT void PUBLIC EplObduCalInitVarEntry(tEplObdVarEntry MEM * | 108 | EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry MEM *pVarEntry_p, |
111 | pVarEntry_p, BYTE bType_p, | 109 | BYTE bType_p, tEplObdSize ObdSize_p); |
112 | tEplObdSize ObdSize_p); | ||
113 | //--------------------------------------------------------------------------- | 110 | //--------------------------------------------------------------------------- |
114 | EPLDLLEXPORT tEplObdSize PUBLIC EplObduCalGetDataSize(unsigned int uiIndex_p, | 111 | EPLDLLEXPORT tEplObdSize EplObduCalGetDataSize(unsigned int uiIndex_p, |
115 | unsigned int | 112 | unsigned int uiSubIndex_p); |
116 | uiSubIndex_p); | ||
117 | //--------------------------------------------------------------------------- | 113 | //--------------------------------------------------------------------------- |
118 | EPLDLLEXPORT unsigned int PUBLIC EplObduCalGetNodeId(void); | 114 | EPLDLLEXPORT unsigned int EplObduCalGetNodeId(void); |
119 | //--------------------------------------------------------------------------- | 115 | //--------------------------------------------------------------------------- |
120 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalSetNodeId(unsigned int uiNodeId_p, | 116 | EPLDLLEXPORT tEplKernel EplObduCalSetNodeId(unsigned int uiNodeId_p, |
121 | tEplObdNodeIdType | 117 | tEplObdNodeIdType NodeIdType_p); |
122 | NodeIdType_p); | ||
123 | //--------------------------------------------------------------------------- | 118 | //--------------------------------------------------------------------------- |
124 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalGetAccessType(unsigned int uiIndex_p, | 119 | EPLDLLEXPORT tEplKernel EplObduCalGetAccessType(unsigned int uiIndex_p, |
125 | unsigned int | 120 | unsigned int uiSubIndex_p, |
126 | uiSubIndex_p, | 121 | tEplObdAccess *pAccessTyp_p); |
127 | tEplObdAccess * | ||
128 | pAccessTyp_p); | ||
129 | //--------------------------------------------------------------------------- | 122 | //--------------------------------------------------------------------------- |
130 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntryToLe(unsigned int uiIndex_p, | 123 | EPLDLLEXPORT tEplKernel EplObduCalReadEntryToLe(unsigned int uiIndex_p, |
131 | unsigned int | 124 | unsigned int uiSubIndex_p, |
132 | uiSubIndex_p, | 125 | void *pDstData_p, |
133 | void *pDstData_p, | 126 | tEplObdSize *pSize_p); |
134 | tEplObdSize * pSize_p); | ||
135 | //--------------------------------------------------------------------------- | 127 | //--------------------------------------------------------------------------- |
136 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntryFromLe(unsigned int | 128 | EPLDLLEXPORT tEplKernel EplObduCalWriteEntryFromLe(unsigned int uiIndex_p, |
137 | uiIndex_p, | 129 | unsigned int uiSubIndex_p, |
138 | unsigned int | 130 | void *pSrcData_p, |
139 | uiSubIndex_p, | 131 | tEplObdSize Size_p); |
140 | void *pSrcData_p, | ||
141 | tEplObdSize Size_p); | ||
142 | //--------------------------------------------------------------------------- | 132 | //--------------------------------------------------------------------------- |
143 | EPLDLLEXPORT tEplKernel PUBLIC | 133 | EPLDLLEXPORT tEplKernel |
144 | EplObduCalSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, | 134 | EplObduCalSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
145 | unsigned int uiSubindex_p, | 135 | unsigned int uiSubindex_p, |
146 | tEplObdVarEntry MEM ** ppVarEntry_p); | 136 | tEplObdVarEntry MEM ** ppVarEntry_p); |
diff --git a/drivers/staging/epl/user/EplPdou.h b/drivers/staging/epl/user/EplPdou.h index 11de4862e8b..ebc6cd021f4 100644 --- a/drivers/staging/epl/user/EplPdou.h +++ b/drivers/staging/epl/user/EplPdou.h | |||
@@ -89,7 +89,7 @@ tEplKernel EplPdouAddInstance(void); | |||
89 | tEplKernel EplPdouDelInstance(void); | 89 | tEplKernel EplPdouDelInstance(void); |
90 | 90 | ||
91 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_PDOU)) != 0) | 91 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_PDOU)) != 0) |
92 | tEplKernel PUBLIC EplPdouCbObdAccess(tEplObdCbParam MEM * pParam_p); | 92 | tEplKernel EplPdouCbObdAccess(tEplObdCbParam MEM * pParam_p); |
93 | #else | 93 | #else |
94 | #define EplPdouCbObdAccess NULL | 94 | #define EplPdouCbObdAccess NULL |
95 | #endif | 95 | #endif |
diff --git a/drivers/staging/epl/user/EplSdoAsndu.h b/drivers/staging/epl/user/EplSdoAsndu.h index e34959f4279..6049e5852ed 100644 --- a/drivers/staging/epl/user/EplSdoAsndu.h +++ b/drivers/staging/epl/user/EplSdoAsndu.h | |||
@@ -87,20 +87,20 @@ | |||
87 | //--------------------------------------------------------------------------- | 87 | //--------------------------------------------------------------------------- |
88 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0) | 88 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0) |
89 | 89 | ||
90 | tEplKernel PUBLIC EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p); | 90 | tEplKernel EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p); |
91 | 91 | ||
92 | tEplKernel PUBLIC EplSdoAsnduAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p); | 92 | tEplKernel EplSdoAsnduAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p); |
93 | 93 | ||
94 | tEplKernel PUBLIC EplSdoAsnduDelInstance(void); | 94 | tEplKernel EplSdoAsnduDelInstance(void); |
95 | 95 | ||
96 | tEplKernel PUBLIC EplSdoAsnduInitCon(tEplSdoConHdl * pSdoConHandle_p, | 96 | tEplKernel EplSdoAsnduInitCon(tEplSdoConHdl *pSdoConHandle_p, |
97 | unsigned int uiTargetNodeId_p); | 97 | unsigned int uiTargetNodeId_p); |
98 | 98 | ||
99 | tEplKernel PUBLIC EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, | 99 | tEplKernel EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, |
100 | tEplFrame * pSrcData_p, | 100 | tEplFrame *pSrcData_p, |
101 | DWORD dwDataSize_p); | 101 | DWORD dwDataSize_p); |
102 | 102 | ||
103 | tEplKernel PUBLIC EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p); | 103 | tEplKernel EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p); |
104 | 104 | ||
105 | #endif // end of #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0) | 105 | #endif // end of #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0) |
106 | 106 | ||
diff --git a/drivers/staging/epl/user/EplSdoAsySequ.h b/drivers/staging/epl/user/EplSdoAsySequ.h index 4658b5f8c53..0a957ba2fdd 100644 --- a/drivers/staging/epl/user/EplSdoAsySequ.h +++ b/drivers/staging/epl/user/EplSdoAsySequ.h | |||
@@ -88,24 +88,24 @@ | |||
88 | //--------------------------------------------------------------------------- | 88 | //--------------------------------------------------------------------------- |
89 | // function prototypes | 89 | // function prototypes |
90 | //--------------------------------------------------------------------------- | 90 | //--------------------------------------------------------------------------- |
91 | tEplKernel PUBLIC EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, | 91 | tEplKernel EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, |
92 | tEplSdoComConCb fpSdoComConCb_p); | 92 | tEplSdoComConCb fpSdoComConCb_p); |
93 | 93 | ||
94 | tEplKernel PUBLIC EplSdoAsySeqAddInstance(tEplSdoComReceiveCb fpSdoComCb_p, | 94 | tEplKernel EplSdoAsySeqAddInstance(tEplSdoComReceiveCb fpSdoComCb_p, |
95 | tEplSdoComConCb fpSdoComConCb_p); | 95 | tEplSdoComConCb fpSdoComConCb_p); |
96 | 96 | ||
97 | tEplKernel PUBLIC EplSdoAsySeqDelInstance(void); | 97 | tEplKernel EplSdoAsySeqDelInstance(void); |
98 | 98 | ||
99 | tEplKernel PUBLIC EplSdoAsySeqInitCon(tEplSdoSeqConHdl * pSdoSeqConHdl_p, | 99 | tEplKernel EplSdoAsySeqInitCon(tEplSdoSeqConHdl *pSdoSeqConHdl_p, |
100 | unsigned int uiNodeId_p, | 100 | unsigned int uiNodeId_p, |
101 | tEplSdoType SdoType); | 101 | tEplSdoType SdoType); |
102 | 102 | ||
103 | tEplKernel PUBLIC EplSdoAsySeqSendData(tEplSdoSeqConHdl SdoSeqConHdl_p, | 103 | tEplKernel EplSdoAsySeqSendData(tEplSdoSeqConHdl SdoSeqConHdl_p, |
104 | unsigned int uiDataSize_p, | 104 | unsigned int uiDataSize_p, |
105 | tEplFrame * pData_p); | 105 | tEplFrame *pData_p); |
106 | 106 | ||
107 | tEplKernel PUBLIC EplSdoAsySeqProcessEvent(tEplEvent * pEvent_p); | 107 | tEplKernel EplSdoAsySeqProcessEvent(tEplEvent *pEvent_p); |
108 | 108 | ||
109 | tEplKernel PUBLIC EplSdoAsySeqDelCon(tEplSdoSeqConHdl SdoSeqConHdl_p); | 109 | tEplKernel EplSdoAsySeqDelCon(tEplSdoSeqConHdl SdoSeqConHdl_p); |
110 | 110 | ||
111 | #endif // #ifndef _EPLSDOASYSEQU_H_ | 111 | #endif // #ifndef _EPLSDOASYSEQU_H_ |
diff --git a/drivers/staging/epl/user/EplSdoComu.h b/drivers/staging/epl/user/EplSdoComu.h index 3e454c7a355..9e45e99a978 100644 --- a/drivers/staging/epl/user/EplSdoComu.h +++ b/drivers/staging/epl/user/EplSdoComu.h | |||
@@ -88,38 +88,37 @@ | |||
88 | //--------------------------------------------------------------------------- | 88 | //--------------------------------------------------------------------------- |
89 | // function prototypes | 89 | // function prototypes |
90 | //--------------------------------------------------------------------------- | 90 | //--------------------------------------------------------------------------- |
91 | tEplKernel PUBLIC EplSdoComInit(void); | 91 | tEplKernel EplSdoComInit(void); |
92 | 92 | ||
93 | tEplKernel PUBLIC EplSdoComAddInstance(void); | 93 | tEplKernel EplSdoComAddInstance(void); |
94 | 94 | ||
95 | tEplKernel PUBLIC EplSdoComDelInstance(void); | 95 | tEplKernel EplSdoComDelInstance(void); |
96 | 96 | ||
97 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) | 97 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) |
98 | 98 | ||
99 | tEplKernel PUBLIC EplSdoComDefineCon(tEplSdoComConHdl * pSdoComConHdl_p, | 99 | tEplKernel EplSdoComDefineCon(tEplSdoComConHdl *pSdoComConHdl_p, |
100 | unsigned int uiTargetNodeId_p, | 100 | unsigned int uiTargetNodeId_p, |
101 | tEplSdoType ProtType_p); | 101 | tEplSdoType ProtType_p); |
102 | 102 | ||
103 | tEplKernel PUBLIC EplSdoComInitTransferByIndex(tEplSdoComTransParamByIndex * | 103 | tEplKernel EplSdoComInitTransferByIndex(tEplSdoComTransParamByIndex *pSdoComTransParam_p); |
104 | pSdoComTransParam_p); | ||
105 | 104 | ||
106 | tEplKernel PUBLIC EplSdoComUndefineCon(tEplSdoComConHdl SdoComConHdl_p); | 105 | tEplKernel EplSdoComUndefineCon(tEplSdoComConHdl SdoComConHdl_p); |
107 | 106 | ||
108 | tEplKernel PUBLIC EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, | 107 | tEplKernel EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, |
109 | tEplSdoComFinished * pSdoComFinished_p); | 108 | tEplSdoComFinished *pSdoComFinished_p); |
110 | 109 | ||
111 | tEplKernel PUBLIC EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, | 110 | tEplKernel EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, |
112 | DWORD dwAbortCode_p); | 111 | DWORD dwAbortCode_p); |
113 | 112 | ||
114 | #endif | 113 | #endif |
115 | 114 | ||
116 | // for future extention | 115 | // for future extention |
117 | /* | 116 | /* |
118 | tEplKernel PUBLIC EplSdoComInitTransferAllByIndex(tEplSdoComTransParamAllByIndex* pSdoComTransParam_p); | 117 | tEplKernel EplSdoComInitTransferAllByIndex(tEplSdoComTransParamAllByIndex* pSdoComTransParam_p); |
119 | 118 | ||
120 | tEplKernel PUBLIC EplSdoComInitTransferByName(tEplSdoComTransParamByName* pSdoComTransParam_p); | 119 | tEplKernel EplSdoComInitTransferByName(tEplSdoComTransParamByName* pSdoComTransParam_p); |
121 | 120 | ||
122 | tEplKernel PUBLIC EplSdoComInitTransferFile(tEplSdoComTransParamFile* pSdoComTransParam_p); | 121 | tEplKernel EplSdoComInitTransferFile(tEplSdoComTransParamFile* pSdoComTransParam_p); |
123 | 122 | ||
124 | */ | 123 | */ |
125 | 124 | ||
diff --git a/drivers/staging/epl/user/EplSdoUdpu.h b/drivers/staging/epl/user/EplSdoUdpu.h index 2d77b6fff19..22091d4f317 100644 --- a/drivers/staging/epl/user/EplSdoUdpu.h +++ b/drivers/staging/epl/user/EplSdoUdpu.h | |||
@@ -86,23 +86,22 @@ | |||
86 | //--------------------------------------------------------------------------- | 86 | //--------------------------------------------------------------------------- |
87 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) | 87 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) |
88 | 88 | ||
89 | tEplKernel PUBLIC EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p); | 89 | tEplKernel EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p); |
90 | 90 | ||
91 | tEplKernel PUBLIC EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p); | 91 | tEplKernel EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p); |
92 | 92 | ||
93 | tEplKernel PUBLIC EplSdoUdpuDelInstance(void); | 93 | tEplKernel EplSdoUdpuDelInstance(void); |
94 | 94 | ||
95 | tEplKernel PUBLIC EplSdoUdpuConfig(unsigned long ulIpAddr_p, | 95 | tEplKernel EplSdoUdpuConfig(unsigned long ulIpAddr_p, |
96 | unsigned int uiPort_p); | 96 | unsigned int uiPort_p); |
97 | 97 | ||
98 | tEplKernel PUBLIC EplSdoUdpuInitCon(tEplSdoConHdl * pSdoConHandle_p, | 98 | tEplKernel EplSdoUdpuInitCon(tEplSdoConHdl *pSdoConHandle_p, |
99 | unsigned int uiTargetNodeId_p); | 99 | unsigned int uiTargetNodeId_p); |
100 | 100 | ||
101 | tEplKernel PUBLIC EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, | 101 | tEplKernel EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, |
102 | tEplFrame * pSrcData_p, | 102 | tEplFrame *pSrcData_p, DWORD dwDataSize_p); |
103 | DWORD dwDataSize_p); | ||
104 | 103 | ||
105 | tEplKernel PUBLIC EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p); | 104 | tEplKernel EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p); |
106 | 105 | ||
107 | #endif // end of #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) | 106 | #endif // end of #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) |
108 | 107 | ||
diff --git a/drivers/staging/epl/user/EplStatusu.h b/drivers/staging/epl/user/EplStatusu.h index d211935f0e8..6b98ff9b963 100644 --- a/drivers/staging/epl/user/EplStatusu.h +++ b/drivers/staging/epl/user/EplStatusu.h | |||
@@ -81,24 +81,22 @@ | |||
81 | // typedef | 81 | // typedef |
82 | //--------------------------------------------------------------------------- | 82 | //--------------------------------------------------------------------------- |
83 | 83 | ||
84 | typedef tEplKernel(PUBLIC * tEplStatusuCbResponse) (unsigned int uiNodeId_p, | 84 | typedef tEplKernel(* tEplStatusuCbResponse) (unsigned int uiNodeId_p, |
85 | tEplStatusResponse * | 85 | tEplStatusResponse *pStatusResponse_p); |
86 | pStatusResponse_p); | ||
87 | 86 | ||
88 | //--------------------------------------------------------------------------- | 87 | //--------------------------------------------------------------------------- |
89 | // function prototypes | 88 | // function prototypes |
90 | //--------------------------------------------------------------------------- | 89 | //--------------------------------------------------------------------------- |
91 | 90 | ||
92 | tEplKernel PUBLIC EplStatusuInit(void); | 91 | tEplKernel EplStatusuInit(void); |
93 | 92 | ||
94 | tEplKernel PUBLIC EplStatusuAddInstance(void); | 93 | tEplKernel EplStatusuAddInstance(void); |
95 | 94 | ||
96 | tEplKernel PUBLIC EplStatusuDelInstance(void); | 95 | tEplKernel EplStatusuDelInstance(void); |
97 | 96 | ||
98 | tEplKernel PUBLIC EplStatusuReset(void); | 97 | tEplKernel EplStatusuReset(void); |
99 | 98 | ||
100 | tEplKernel PUBLIC EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, | 99 | tEplKernel EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, |
101 | tEplStatusuCbResponse | 100 | tEplStatusuCbResponse pfnCbResponse_p); |
102 | pfnCbResponse_p); | ||
103 | 101 | ||
104 | #endif // #ifndef _EPLSTATUSU_H_ | 102 | #endif // #ifndef _EPLSTATUSU_H_ |
diff --git a/drivers/staging/epl/user/EplTimeru.h b/drivers/staging/epl/user/EplTimeru.h index 404495501b8..65273e5f9c8 100644 --- a/drivers/staging/epl/user/EplTimeru.h +++ b/drivers/staging/epl/user/EplTimeru.h | |||
@@ -86,22 +86,22 @@ | |||
86 | // function prototypes | 86 | // function prototypes |
87 | //--------------------------------------------------------------------------- | 87 | //--------------------------------------------------------------------------- |
88 | 88 | ||
89 | tEplKernel PUBLIC EplTimeruInit(void); | 89 | tEplKernel EplTimeruInit(void); |
90 | 90 | ||
91 | tEplKernel PUBLIC EplTimeruAddInstance(void); | 91 | tEplKernel EplTimeruAddInstance(void); |
92 | 92 | ||
93 | tEplKernel PUBLIC EplTimeruDelInstance(void); | 93 | tEplKernel EplTimeruDelInstance(void); |
94 | 94 | ||
95 | tEplKernel PUBLIC EplTimeruSetTimerMs(tEplTimerHdl * pTimerHdl_p, | 95 | tEplKernel EplTimeruSetTimerMs(tEplTimerHdl *pTimerHdl_p, |
96 | unsigned long ulTime_p, | 96 | unsigned long ulTime_p, |
97 | tEplTimerArg Argument_p); | 97 | tEplTimerArg Argument_p); |
98 | 98 | ||
99 | tEplKernel PUBLIC EplTimeruModifyTimerMs(tEplTimerHdl * pTimerHdl_p, | 99 | tEplKernel EplTimeruModifyTimerMs(tEplTimerHdl *pTimerHdl_p, |
100 | unsigned long ulTime_p, | 100 | unsigned long ulTime_p, |
101 | tEplTimerArg Argument_p); | 101 | tEplTimerArg Argument_p); |
102 | 102 | ||
103 | tEplKernel PUBLIC EplTimeruDeleteTimer(tEplTimerHdl * pTimerHdl_p); | 103 | tEplKernel EplTimeruDeleteTimer(tEplTimerHdl *pTimerHdl_p); |
104 | 104 | ||
105 | BOOL PUBLIC EplTimeruIsTimerActive(tEplTimerHdl TimerHdl_p); | 105 | BOOL EplTimeruIsTimerActive(tEplTimerHdl TimerHdl_p); |
106 | 106 | ||
107 | #endif // #ifndef _EPLTIMERU_H_ | 107 | #endif // #ifndef _EPLTIMERU_H_ |