diff options
Diffstat (limited to 'drivers/staging')
64 files changed, 848 insertions, 1036 deletions
diff --git a/drivers/staging/epl/Edrv8139.c b/drivers/staging/epl/Edrv8139.c index 296354aaa9c..b00e17e70b5 100644 --- a/drivers/staging/epl/Edrv8139.c +++ b/drivers/staging/epl/Edrv8139.c | |||
@@ -234,8 +234,8 @@ | |||
234 | 234 | ||
235 | // TracePoint support for realtime-debugging | 235 | // TracePoint support for realtime-debugging |
236 | #ifdef _DBG_TRACE_POINTS_ | 236 | #ifdef _DBG_TRACE_POINTS_ |
237 | void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); | 237 | void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); |
238 | void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); | 238 | void TgtDbgPostTraceValue(DWORD dwTraceValue_p); |
239 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) | 239 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) |
240 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) | 240 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) |
241 | #else | 241 | #else |
diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h index be60f771b63..6e5910d1915 100644 --- a/drivers/staging/epl/Epl.h +++ b/drivers/staging/epl/Epl.h | |||
@@ -131,9 +131,9 @@ typedef union { | |||
131 | 131 | ||
132 | } tEplApiEventArg; | 132 | } tEplApiEventArg; |
133 | 133 | ||
134 | typedef tEplKernel(PUBLIC ROM * tEplApiCbEvent) (tEplApiEventType EventType_p, // IN: event type (enum) | 134 | typedef tEplKernel(ROM *tEplApiCbEvent) (tEplApiEventType EventType_p, // IN: event type (enum) |
135 | tEplApiEventArg * pEventArg_p, // IN: event argument (union) | 135 | tEplApiEventArg *pEventArg_p, // IN: event argument (union) |
136 | void GENERIC * pUserArg_p); | 136 | void GENERIC *pUserArg_p); |
137 | 137 | ||
138 | typedef struct { | 138 | typedef struct { |
139 | unsigned int m_uiSizeOfStruct; | 139 | unsigned int m_uiSizeOfStruct; |
@@ -212,62 +212,61 @@ typedef struct { | |||
212 | // function prototypes | 212 | // function prototypes |
213 | //--------------------------------------------------------------------------- | 213 | //--------------------------------------------------------------------------- |
214 | 214 | ||
215 | tEplKernel PUBLIC EplApiInitialize(tEplApiInitParam * pInitParam_p); | 215 | tEplKernel EplApiInitialize(tEplApiInitParam *pInitParam_p); |
216 | 216 | ||
217 | tEplKernel PUBLIC EplApiShutdown(void); | 217 | tEplKernel EplApiShutdown(void); |
218 | 218 | ||
219 | tEplKernel PUBLIC EplApiReadObject(tEplSdoComConHdl * pSdoComConHdl_p, | 219 | tEplKernel EplApiReadObject(tEplSdoComConHdl *pSdoComConHdl_p, |
220 | unsigned int uiNodeId_p, | 220 | unsigned int uiNodeId_p, |
221 | unsigned int uiIndex_p, | 221 | unsigned int uiIndex_p, |
222 | unsigned int uiSubindex_p, | 222 | unsigned int uiSubindex_p, |
223 | void *pDstData_le_p, | 223 | void *pDstData_le_p, |
224 | unsigned int *puiSize_p, | 224 | unsigned int *puiSize_p, |
225 | tEplSdoType SdoType_p, void *pUserArg_p); | 225 | tEplSdoType SdoType_p, void *pUserArg_p); |
226 | 226 | ||
227 | tEplKernel PUBLIC EplApiWriteObject(tEplSdoComConHdl * pSdoComConHdl_p, | 227 | tEplKernel EplApiWriteObject(tEplSdoComConHdl *pSdoComConHdl_p, |
228 | unsigned int uiNodeId_p, | 228 | unsigned int uiNodeId_p, |
229 | unsigned int uiIndex_p, | 229 | unsigned int uiIndex_p, |
230 | unsigned int uiSubindex_p, | 230 | unsigned int uiSubindex_p, |
231 | void *pSrcData_le_p, | 231 | void *pSrcData_le_p, |
232 | unsigned int uiSize_p, | 232 | unsigned int uiSize_p, |
233 | tEplSdoType SdoType_p, void *pUserArg_p); | 233 | tEplSdoType SdoType_p, void *pUserArg_p); |
234 | 234 | ||
235 | tEplKernel PUBLIC EplApiFreeSdoChannel(tEplSdoComConHdl SdoComConHdl_p); | 235 | tEplKernel EplApiFreeSdoChannel(tEplSdoComConHdl SdoComConHdl_p); |
236 | 236 | ||
237 | tEplKernel PUBLIC EplApiReadLocalObject(unsigned int uiIndex_p, | 237 | tEplKernel EplApiReadLocalObject(unsigned int uiIndex_p, |
238 | unsigned int uiSubindex_p, | 238 | unsigned int uiSubindex_p, |
239 | void *pDstData_p, | 239 | void *pDstData_p, |
240 | unsigned int *puiSize_p); | 240 | unsigned int *puiSize_p); |
241 | 241 | ||
242 | tEplKernel PUBLIC EplApiWriteLocalObject(unsigned int uiIndex_p, | 242 | tEplKernel EplApiWriteLocalObject(unsigned int uiIndex_p, |
243 | unsigned int uiSubindex_p, | 243 | unsigned int uiSubindex_p, |
244 | void *pSrcData_p, | 244 | void *pSrcData_p, |
245 | unsigned int uiSize_p); | 245 | unsigned int uiSize_p); |
246 | 246 | ||
247 | tEplKernel PUBLIC EplApiCbObdAccess(tEplObdCbParam MEM * pParam_p); | 247 | tEplKernel EplApiCbObdAccess(tEplObdCbParam MEM *pParam_p); |
248 | 248 | ||
249 | tEplKernel PUBLIC EplApiLinkObject(unsigned int uiObjIndex_p, | 249 | tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, |
250 | void *pVar_p, | 250 | void *pVar_p, |
251 | unsigned int *puiVarEntries_p, | 251 | unsigned int *puiVarEntries_p, |
252 | tEplObdSize * pEntrySize_p, | 252 | tEplObdSize *pEntrySize_p, |
253 | unsigned int uiFirstSubindex_p); | 253 | unsigned int uiFirstSubindex_p); |
254 | 254 | ||
255 | tEplKernel PUBLIC EplApiExecNmtCommand(tEplNmtEvent NmtEvent_p); | 255 | tEplKernel EplApiExecNmtCommand(tEplNmtEvent NmtEvent_p); |
256 | 256 | ||
257 | tEplKernel PUBLIC EplApiProcess(void); | 257 | tEplKernel EplApiProcess(void); |
258 | 258 | ||
259 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) | 259 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) |
260 | tEplKernel PUBLIC EplApiMnTriggerStateChange(unsigned int uiNodeId_p, | 260 | tEplKernel EplApiMnTriggerStateChange(unsigned int uiNodeId_p, |
261 | tEplNmtNodeCommand NodeCommand_p); | 261 | tEplNmtNodeCommand NodeCommand_p); |
262 | #endif | 262 | #endif |
263 | 263 | ||
264 | tEplKernel PUBLIC EplApiGetIdentResponse(unsigned int uiNodeId_p, | 264 | tEplKernel EplApiGetIdentResponse(unsigned int uiNodeId_p, |
265 | tEplIdentResponse ** | 265 | tEplIdentResponse **ppIdentResponse_p); |
266 | ppIdentResponse_p); | ||
267 | 266 | ||
268 | // functions for process image will be implemented in separate file | 267 | // functions for process image will be implemented in separate file |
269 | tEplKernel PUBLIC EplApiProcessImageSetup(void); | 268 | tEplKernel EplApiProcessImageSetup(void); |
270 | tEplKernel PUBLIC EplApiProcessImageExchangeIn(tEplApiProcessImage * pPI_p); | 269 | tEplKernel EplApiProcessImageExchangeIn(tEplApiProcessImage *pPI_p); |
271 | tEplKernel PUBLIC EplApiProcessImageExchangeOut(tEplApiProcessImage * pPI_p); | 270 | tEplKernel EplApiProcessImageExchangeOut(tEplApiProcessImage *pPI_p); |
272 | 271 | ||
273 | #endif // #ifndef _EPL_API_H_ | 272 | #endif // #ifndef _EPL_API_H_ |
diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h index 6fa04a4f0a1..04aeed68f4c 100644 --- a/drivers/staging/epl/EplAmi.h +++ b/drivers/staging/epl/EplAmi.h | |||
@@ -131,16 +131,16 @@ extern "C" { | |||
131 | // | 131 | // |
132 | // To save code space the function AmiSetByte is replaced by | 132 | // To save code space the function AmiSetByte is replaced by |
133 | // an macro. | 133 | // an macro. |
134 | // void PUBLIC AmiSetByte (void FAR* pAddr_p, BYTE bByteVal_p); | 134 | // void AmiSetByte (void FAR* pAddr_p, BYTE bByteVal_p); |
135 | 135 | ||
136 | #define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} | 136 | #define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} |
137 | #define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} | 137 | #define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} |
138 | 138 | ||
139 | #if !defined(INLINE_ENABLED) | 139 | #if !defined(INLINE_ENABLED) |
140 | void PUBLIC AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p); | 140 | void AmiSetWordToBe(void FAR *pAddr_p, WORD wWordVal_p); |
141 | void PUBLIC AmiSetDwordToBe(void FAR * pAddr_p, DWORD dwDwordVal_p); | 141 | void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p); |
142 | void PUBLIC AmiSetWordToLe(void FAR * pAddr_p, WORD wWordVal_p); | 142 | void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p); |
143 | void PUBLIC AmiSetDwordToLe(void FAR * pAddr_p, DWORD dwDwordVal_p); | 143 | void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); |
144 | #endif | 144 | #endif |
145 | 145 | ||
146 | //--------------------------------------------------------------------------- | 146 | //--------------------------------------------------------------------------- |
@@ -149,17 +149,17 @@ extern "C" { | |||
149 | // | 149 | // |
150 | // To save code space the function AmiGetByte is replaced by | 150 | // To save code space the function AmiGetByte is replaced by |
151 | // an macro. | 151 | // an macro. |
152 | // BYTE PUBLIC AmiGetByte (void FAR* pAddr_p); | 152 | // BYTE AmiGetByte (void FAR* pAddr_p); |
153 | 153 | ||
154 | #define AmiGetByteFromBe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) | 154 | #define AmiGetByteFromBe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) |
155 | #define AmiGetByteFromLe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) | 155 | #define AmiGetByteFromLe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) |
156 | 156 | ||
157 | #if !defined(INLINE_ENABLED) | 157 | #if !defined(INLINE_ENABLED) |
158 | 158 | ||
159 | WORD PUBLIC AmiGetWordFromBe(void FAR * pAddr_p); | 159 | WORD AmiGetWordFromBe(void FAR *pAddr_p); |
160 | DWORD PUBLIC AmiGetDwordFromBe(void FAR * pAddr_p); | 160 | DWORD AmiGetDwordFromBe(void FAR *pAddr_p); |
161 | WORD PUBLIC AmiGetWordFromLe(void FAR * pAddr_p); | 161 | WORD AmiGetWordFromLe(void FAR *pAddr_p); |
162 | DWORD PUBLIC AmiGetDwordFromLe(void FAR * pAddr_p); | 162 | DWORD AmiGetDwordFromLe(void FAR *pAddr_p); |
163 | 163 | ||
164 | //--------------------------------------------------------------------------- | 164 | //--------------------------------------------------------------------------- |
165 | // | 165 | // |
@@ -174,8 +174,8 @@ extern "C" { | |||
174 | // | 174 | // |
175 | //--------------------------------------------------------------------------- | 175 | //--------------------------------------------------------------------------- |
176 | 176 | ||
177 | void PUBLIC AmiSetDword24ToBe(void FAR * pAddr_p, DWORD dwDwordVal_p); | 177 | void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p); |
178 | void PUBLIC AmiSetDword24ToLe(void FAR * pAddr_p, DWORD dwDwordVal_p); | 178 | void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); |
179 | 179 | ||
180 | //--------------------------------------------------------------------------- | 180 | //--------------------------------------------------------------------------- |
181 | // | 181 | // |
@@ -189,8 +189,8 @@ extern "C" { | |||
189 | // | 189 | // |
190 | //--------------------------------------------------------------------------- | 190 | //--------------------------------------------------------------------------- |
191 | 191 | ||
192 | DWORD PUBLIC AmiGetDword24FromBe(void FAR * pAddr_p); | 192 | DWORD AmiGetDword24FromBe(void FAR *pAddr_p); |
193 | DWORD PUBLIC AmiGetDword24FromLe(void FAR * pAddr_p); | 193 | DWORD AmiGetDword24FromLe(void FAR *pAddr_p); |
194 | 194 | ||
195 | //#ifdef USE_VAR64 | 195 | //#ifdef USE_VAR64 |
196 | 196 | ||
@@ -207,8 +207,8 @@ extern "C" { | |||
207 | // | 207 | // |
208 | //--------------------------------------------------------------------------- | 208 | //--------------------------------------------------------------------------- |
209 | 209 | ||
210 | void PUBLIC AmiSetQword40ToBe(void FAR * pAddr_p, QWORD qwQwordVal_p); | 210 | void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); |
211 | void PUBLIC AmiSetQword40ToLe(void FAR * pAddr_p, QWORD qwQwordVal_p); | 211 | void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); |
212 | 212 | ||
213 | //--------------------------------------------------------------------------- | 213 | //--------------------------------------------------------------------------- |
214 | // | 214 | // |
@@ -222,8 +222,8 @@ extern "C" { | |||
222 | // | 222 | // |
223 | //--------------------------------------------------------------------------- | 223 | //--------------------------------------------------------------------------- |
224 | 224 | ||
225 | QWORD PUBLIC AmiGetQword40FromBe(void FAR * pAddr_p); | 225 | QWORD AmiGetQword40FromBe(void FAR *pAddr_p); |
226 | QWORD PUBLIC AmiGetQword40FromLe(void FAR * pAddr_p); | 226 | QWORD AmiGetQword40FromLe(void FAR *pAddr_p); |
227 | 227 | ||
228 | //--------------------------------------------------------------------------- | 228 | //--------------------------------------------------------------------------- |
229 | // | 229 | // |
@@ -238,8 +238,8 @@ extern "C" { | |||
238 | // | 238 | // |
239 | //--------------------------------------------------------------------------- | 239 | //--------------------------------------------------------------------------- |
240 | 240 | ||
241 | void PUBLIC AmiSetQword48ToBe(void FAR * pAddr_p, QWORD qwQwordVal_p); | 241 | void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); |
242 | void PUBLIC AmiSetQword48ToLe(void FAR * pAddr_p, QWORD qwQwordVal_p); | 242 | void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); |
243 | 243 | ||
244 | //--------------------------------------------------------------------------- | 244 | //--------------------------------------------------------------------------- |
245 | // | 245 | // |
@@ -253,8 +253,8 @@ extern "C" { | |||
253 | // | 253 | // |
254 | //--------------------------------------------------------------------------- | 254 | //--------------------------------------------------------------------------- |
255 | 255 | ||
256 | QWORD PUBLIC AmiGetQword48FromBe(void FAR * pAddr_p); | 256 | QWORD AmiGetQword48FromBe(void FAR *pAddr_p); |
257 | QWORD PUBLIC AmiGetQword48FromLe(void FAR * pAddr_p); | 257 | QWORD AmiGetQword48FromLe(void FAR *pAddr_p); |
258 | 258 | ||
259 | //--------------------------------------------------------------------------- | 259 | //--------------------------------------------------------------------------- |
260 | // | 260 | // |
@@ -269,8 +269,8 @@ extern "C" { | |||
269 | // | 269 | // |
270 | //--------------------------------------------------------------------------- | 270 | //--------------------------------------------------------------------------- |
271 | 271 | ||
272 | void PUBLIC AmiSetQword56ToBe(void FAR * pAddr_p, QWORD qwQwordVal_p); | 272 | void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); |
273 | void PUBLIC AmiSetQword56ToLe(void FAR * pAddr_p, QWORD qwQwordVal_p); | 273 | void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); |
274 | 274 | ||
275 | //--------------------------------------------------------------------------- | 275 | //--------------------------------------------------------------------------- |
276 | // | 276 | // |
@@ -284,8 +284,8 @@ extern "C" { | |||
284 | // | 284 | // |
285 | //--------------------------------------------------------------------------- | 285 | //--------------------------------------------------------------------------- |
286 | 286 | ||
287 | QWORD PUBLIC AmiGetQword56FromBe(void FAR * pAddr_p); | 287 | QWORD AmiGetQword56FromBe(void FAR *pAddr_p); |
288 | QWORD PUBLIC AmiGetQword56FromLe(void FAR * pAddr_p); | 288 | QWORD AmiGetQword56FromLe(void FAR *pAddr_p); |
289 | 289 | ||
290 | //--------------------------------------------------------------------------- | 290 | //--------------------------------------------------------------------------- |
291 | // | 291 | // |
@@ -300,8 +300,8 @@ extern "C" { | |||
300 | // | 300 | // |
301 | //--------------------------------------------------------------------------- | 301 | //--------------------------------------------------------------------------- |
302 | 302 | ||
303 | void PUBLIC AmiSetQword64ToBe(void FAR * pAddr_p, QWORD qwQwordVal_p); | 303 | void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); |
304 | void PUBLIC AmiSetQword64ToLe(void FAR * pAddr_p, QWORD qwQwordVal_p); | 304 | void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); |
305 | 305 | ||
306 | //--------------------------------------------------------------------------- | 306 | //--------------------------------------------------------------------------- |
307 | // | 307 | // |
@@ -315,8 +315,8 @@ extern "C" { | |||
315 | // | 315 | // |
316 | //--------------------------------------------------------------------------- | 316 | //--------------------------------------------------------------------------- |
317 | 317 | ||
318 | QWORD PUBLIC AmiGetQword64FromBe(void FAR * pAddr_p); | 318 | QWORD AmiGetQword64FromBe(void FAR *pAddr_p); |
319 | QWORD PUBLIC AmiGetQword64FromLe(void FAR * pAddr_p); | 319 | QWORD AmiGetQword64FromLe(void FAR *pAddr_p); |
320 | 320 | ||
321 | //--------------------------------------------------------------------------- | 321 | //--------------------------------------------------------------------------- |
322 | // | 322 | // |
@@ -330,9 +330,7 @@ extern "C" { | |||
330 | // Return: void | 330 | // Return: void |
331 | // | 331 | // |
332 | //--------------------------------------------------------------------------- | 332 | //--------------------------------------------------------------------------- |
333 | 333 | void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p); | |
334 | void PUBLIC AmiSetTimeOfDay(void FAR * pAddr_p, | ||
335 | tTimeOfDay FAR * pTimeOfDay_p); | ||
336 | 334 | ||
337 | //--------------------------------------------------------------------------- | 335 | //--------------------------------------------------------------------------- |
338 | // | 336 | // |
@@ -346,9 +344,7 @@ extern "C" { | |||
346 | // Return: void | 344 | // Return: void |
347 | // | 345 | // |
348 | //--------------------------------------------------------------------------- | 346 | //--------------------------------------------------------------------------- |
349 | 347 | void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p); | |
350 | void PUBLIC AmiGetTimeOfDay(void FAR * pAddr_p, | ||
351 | tTimeOfDay FAR * pTimeOfDay_p); | ||
352 | 348 | ||
353 | #endif | 349 | #endif |
354 | 350 | ||
diff --git a/drivers/staging/epl/EplApiGeneric.c b/drivers/staging/epl/EplApiGeneric.c index ae19e34cd7b..e174562ddf8 100644 --- a/drivers/staging/epl/EplApiGeneric.c +++ b/drivers/staging/epl/EplApiGeneric.c | |||
@@ -162,44 +162,41 @@ static tEplApiInstance EplApiInstance_g; | |||
162 | //--------------------------------------------------------------------------- | 162 | //--------------------------------------------------------------------------- |
163 | 163 | ||
164 | // NMT state change event callback function | 164 | // NMT state change event callback function |
165 | static tEplKernel PUBLIC EplApiCbNmtStateChange(tEplEventNmtStateChange | 165 | static tEplKernel EplApiCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p); |
166 | NmtStateChange_p); | ||
167 | 166 | ||
168 | // update DLL configuration from OD | 167 | // update DLL configuration from OD |
169 | static tEplKernel PUBLIC EplApiUpdateDllConfig(BOOL fUpdateIdentity_p); | 168 | static tEplKernel EplApiUpdateDllConfig(BOOL fUpdateIdentity_p); |
170 | 169 | ||
171 | // update OD from init param | 170 | // update OD from init param |
172 | static tEplKernel PUBLIC EplApiUpdateObd(void); | 171 | static tEplKernel EplApiUpdateObd(void); |
173 | 172 | ||
174 | // process events from user event queue | 173 | // process events from user event queue |
175 | static tEplKernel PUBLIC EplApiProcessEvent(tEplEvent * pEplEvent_p); | 174 | static tEplKernel EplApiProcessEvent(tEplEvent *pEplEvent_p); |
176 | 175 | ||
177 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) | 176 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) |
178 | // callback function of SDO module | 177 | // callback function of SDO module |
179 | static tEplKernel PUBLIC EplApiCbSdoCon(tEplSdoComFinished * pSdoComFinished_p); | 178 | static tEplKernel EplApiCbSdoCon(tEplSdoComFinished *pSdoComFinished_p); |
180 | #endif | 179 | #endif |
181 | 180 | ||
182 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) | 181 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) |
183 | // callback functions of NmtMnu module | 182 | // callback functions of NmtMnu module |
184 | static tEplKernel PUBLIC EplApiCbNodeEvent(unsigned int uiNodeId_p, | 183 | static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p, |
185 | tEplNmtNodeEvent NodeEvent_p, | 184 | tEplNmtNodeEvent NodeEvent_p, |
186 | tEplNmtState NmtState_p, | 185 | tEplNmtState NmtState_p, |
187 | WORD wErrorCode_p, | 186 | WORD wErrorCode_p, BOOL fMandatory_p); |
188 | BOOL fMandatory_p); | 187 | |
189 | 188 | static tEplKernel EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, | |
190 | static tEplKernel PUBLIC EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, | 189 | tEplNmtState NmtState_p, |
191 | tEplNmtState NmtState_p, | 190 | WORD wErrorCode_p); |
192 | WORD wErrorCode_p); | ||
193 | #endif | 191 | #endif |
194 | 192 | ||
195 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) | 193 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) |
196 | // callback function of Ledu module | 194 | // callback function of Ledu module |
197 | static tEplKernel PUBLIC EplApiCbLedStateChange(tEplLedType LedType_p, | 195 | static tEplKernel EplApiCbLedStateChange(tEplLedType LedType_p, BOOL fOn_p); |
198 | BOOL fOn_p); | ||
199 | #endif | 196 | #endif |
200 | 197 | ||
201 | // OD initialization function (implemented in Objdict.c) | 198 | // OD initialization function (implemented in Objdict.c) |
202 | tEplKernel PUBLIC EplObdInitRam(tEplObdInitParam MEM * pInitParam_p); | 199 | tEplKernel EplObdInitRam(tEplObdInitParam MEM *pInitParam_p); |
203 | 200 | ||
204 | //=========================================================================// | 201 | //=========================================================================// |
205 | // // | 202 | // // |
@@ -226,7 +223,7 @@ tEplKernel PUBLIC EplObdInitRam(tEplObdInitParam MEM * pInitParam_p); | |||
226 | // | 223 | // |
227 | //--------------------------------------------------------------------------- | 224 | //--------------------------------------------------------------------------- |
228 | 225 | ||
229 | tEplKernel PUBLIC EplApiInitialize(tEplApiInitParam * pInitParam_p) | 226 | tEplKernel EplApiInitialize(tEplApiInitParam *pInitParam_p) |
230 | { | 227 | { |
231 | tEplKernel Ret = kEplSuccessful; | 228 | tEplKernel Ret = kEplSuccessful; |
232 | tEplObdInitParam ObdInitParam; | 229 | tEplObdInitParam ObdInitParam; |
@@ -415,7 +412,7 @@ tEplKernel PUBLIC EplApiInitialize(tEplApiInitParam * pInitParam_p) | |||
415 | // | 412 | // |
416 | //--------------------------------------------------------------------------- | 413 | //--------------------------------------------------------------------------- |
417 | 414 | ||
418 | tEplKernel PUBLIC EplApiShutdown(void) | 415 | tEplKernel EplApiShutdown(void) |
419 | { | 416 | { |
420 | tEplKernel Ret = kEplSuccessful; | 417 | tEplKernel Ret = kEplSuccessful; |
421 | 418 | ||
@@ -523,7 +520,7 @@ tEplKernel PUBLIC EplApiShutdown(void) | |||
523 | // State: | 520 | // State: |
524 | //---------------------------------------------------------------------------- | 521 | //---------------------------------------------------------------------------- |
525 | 522 | ||
526 | tEplKernel PUBLIC EplApiExecNmtCommand(tEplNmtEvent NmtEvent_p) | 523 | tEplKernel EplApiExecNmtCommand(tEplNmtEvent NmtEvent_p) |
527 | { | 524 | { |
528 | tEplKernel Ret = kEplSuccessful; | 525 | tEplKernel Ret = kEplSuccessful; |
529 | 526 | ||
@@ -553,11 +550,11 @@ tEplKernel PUBLIC EplApiExecNmtCommand(tEplNmtEvent NmtEvent_p) | |||
553 | // State: | 550 | // State: |
554 | //---------------------------------------------------------------------------- | 551 | //---------------------------------------------------------------------------- |
555 | 552 | ||
556 | tEplKernel PUBLIC EplApiLinkObject(unsigned int uiObjIndex_p, | 553 | tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, |
557 | void *pVar_p, | 554 | void *pVar_p, |
558 | unsigned int *puiVarEntries_p, | 555 | unsigned int *puiVarEntries_p, |
559 | tEplObdSize * pEntrySize_p, | 556 | tEplObdSize *pEntrySize_p, |
560 | unsigned int uiFirstSubindex_p) | 557 | unsigned int uiFirstSubindex_p) |
561 | { | 558 | { |
562 | BYTE bVarEntries; | 559 | BYTE bVarEntries; |
563 | BYTE bIndexEntries; | 560 | BYTE bIndexEntries; |
@@ -677,13 +674,13 @@ tEplKernel PUBLIC EplApiLinkObject(unsigned int uiObjIndex_p, | |||
677 | // | 674 | // |
678 | // ---------------------------------------------------------------------------- | 675 | // ---------------------------------------------------------------------------- |
679 | 676 | ||
680 | tEplKernel PUBLIC EplApiReadObject(tEplSdoComConHdl * pSdoComConHdl_p, | 677 | tEplKernel EplApiReadObject(tEplSdoComConHdl *pSdoComConHdl_p, |
681 | unsigned int uiNodeId_p, | 678 | unsigned int uiNodeId_p, |
682 | unsigned int uiIndex_p, | 679 | unsigned int uiIndex_p, |
683 | unsigned int uiSubindex_p, | 680 | unsigned int uiSubindex_p, |
684 | void *pDstData_le_p, | 681 | void *pDstData_le_p, |
685 | unsigned int *puiSize_p, | 682 | unsigned int *puiSize_p, |
686 | tEplSdoType SdoType_p, void *pUserArg_p) | 683 | tEplSdoType SdoType_p, void *pUserArg_p) |
687 | { | 684 | { |
688 | tEplKernel Ret = kEplSuccessful; | 685 | tEplKernel Ret = kEplSuccessful; |
689 | 686 | ||
@@ -765,13 +762,13 @@ tEplKernel PUBLIC EplApiReadObject(tEplSdoComConHdl * pSdoComConHdl_p, | |||
765 | // | 762 | // |
766 | // ---------------------------------------------------------------------------- | 763 | // ---------------------------------------------------------------------------- |
767 | 764 | ||
768 | tEplKernel PUBLIC EplApiWriteObject(tEplSdoComConHdl * pSdoComConHdl_p, | 765 | tEplKernel EplApiWriteObject(tEplSdoComConHdl *pSdoComConHdl_p, |
769 | unsigned int uiNodeId_p, | 766 | unsigned int uiNodeId_p, |
770 | unsigned int uiIndex_p, | 767 | unsigned int uiIndex_p, |
771 | unsigned int uiSubindex_p, | 768 | unsigned int uiSubindex_p, |
772 | void *pSrcData_le_p, | 769 | void *pSrcData_le_p, |
773 | unsigned int uiSize_p, | 770 | unsigned int uiSize_p, |
774 | tEplSdoType SdoType_p, void *pUserArg_p) | 771 | tEplSdoType SdoType_p, void *pUserArg_p) |
775 | { | 772 | { |
776 | tEplKernel Ret = kEplSuccessful; | 773 | tEplKernel Ret = kEplSuccessful; |
777 | 774 | ||
@@ -850,7 +847,7 @@ tEplKernel PUBLIC EplApiWriteObject(tEplSdoComConHdl * pSdoComConHdl_p, | |||
850 | // | 847 | // |
851 | // ---------------------------------------------------------------------------- | 848 | // ---------------------------------------------------------------------------- |
852 | 849 | ||
853 | tEplKernel PUBLIC EplApiFreeSdoChannel(tEplSdoComConHdl SdoComConHdl_p) | 850 | tEplKernel EplApiFreeSdoChannel(tEplSdoComConHdl SdoComConHdl_p) |
854 | { | 851 | { |
855 | tEplKernel Ret = kEplSuccessful; | 852 | tEplKernel Ret = kEplSuccessful; |
856 | 853 | ||
@@ -881,10 +878,9 @@ tEplKernel PUBLIC EplApiFreeSdoChannel(tEplSdoComConHdl SdoComConHdl_p) | |||
881 | // | 878 | // |
882 | // ---------------------------------------------------------------------------- | 879 | // ---------------------------------------------------------------------------- |
883 | 880 | ||
884 | tEplKernel PUBLIC EplApiReadLocalObject(unsigned int uiIndex_p, | 881 | tEplKernel EplApiReadLocalObject(unsigned int uiIndex_p, |
885 | unsigned int uiSubindex_p, | 882 | unsigned int uiSubindex_p, |
886 | void *pDstData_p, | 883 | void *pDstData_p, unsigned int *puiSize_p) |
887 | unsigned int *puiSize_p) | ||
888 | { | 884 | { |
889 | tEplKernel Ret = kEplSuccessful; | 885 | tEplKernel Ret = kEplSuccessful; |
890 | tEplObdSize ObdSize; | 886 | tEplObdSize ObdSize; |
@@ -911,10 +907,10 @@ tEplKernel PUBLIC EplApiReadLocalObject(unsigned int uiIndex_p, | |||
911 | // | 907 | // |
912 | // ---------------------------------------------------------------------------- | 908 | // ---------------------------------------------------------------------------- |
913 | 909 | ||
914 | tEplKernel PUBLIC EplApiWriteLocalObject(unsigned int uiIndex_p, | 910 | tEplKernel EplApiWriteLocalObject(unsigned int uiIndex_p, |
915 | unsigned int uiSubindex_p, | 911 | unsigned int uiSubindex_p, |
916 | void *pSrcData_p, | 912 | void *pSrcData_p, |
917 | unsigned int uiSize_p) | 913 | unsigned int uiSize_p) |
918 | { | 914 | { |
919 | tEplKernel Ret = kEplSuccessful; | 915 | tEplKernel Ret = kEplSuccessful; |
920 | 916 | ||
@@ -939,8 +935,8 @@ tEplKernel PUBLIC EplApiWriteLocalObject(unsigned int uiIndex_p, | |||
939 | // | 935 | // |
940 | // ---------------------------------------------------------------------------- | 936 | // ---------------------------------------------------------------------------- |
941 | 937 | ||
942 | tEplKernel PUBLIC EplApiMnTriggerStateChange(unsigned int uiNodeId_p, | 938 | tEplKernel EplApiMnTriggerStateChange(unsigned int uiNodeId_p, |
943 | tEplNmtNodeCommand NodeCommand_p) | 939 | tEplNmtNodeCommand NodeCommand_p) |
944 | { | 940 | { |
945 | tEplKernel Ret = kEplSuccessful; | 941 | tEplKernel Ret = kEplSuccessful; |
946 | 942 | ||
@@ -966,7 +962,7 @@ tEplKernel PUBLIC EplApiMnTriggerStateChange(unsigned int uiNodeId_p, | |||
966 | // | 962 | // |
967 | //--------------------------------------------------------------------------- | 963 | //--------------------------------------------------------------------------- |
968 | 964 | ||
969 | tEplKernel PUBLIC EplApiCbObdAccess(tEplObdCbParam MEM * pParam_p) | 965 | tEplKernel EplApiCbObdAccess(tEplObdCbParam MEM *pParam_p) |
970 | { | 966 | { |
971 | tEplKernel Ret = kEplSuccessful; | 967 | tEplKernel Ret = kEplSuccessful; |
972 | 968 | ||
@@ -1115,7 +1111,7 @@ tEplKernel PUBLIC EplApiCbObdAccess(tEplObdCbParam MEM * pParam_p) | |||
1115 | // | 1111 | // |
1116 | //--------------------------------------------------------------------------- | 1112 | //--------------------------------------------------------------------------- |
1117 | 1113 | ||
1118 | static tEplKernel PUBLIC EplApiProcessEvent(tEplEvent * pEplEvent_p) | 1114 | static tEplKernel EplApiProcessEvent(tEplEvent *pEplEvent_p) |
1119 | { | 1115 | { |
1120 | tEplKernel Ret; | 1116 | tEplKernel Ret; |
1121 | tEplEventError *pEventError; | 1117 | tEplEventError *pEventError; |
@@ -1188,8 +1184,7 @@ static tEplKernel PUBLIC EplApiProcessEvent(tEplEvent * pEplEvent_p) | |||
1188 | // | 1184 | // |
1189 | //--------------------------------------------------------------------------- | 1185 | //--------------------------------------------------------------------------- |
1190 | 1186 | ||
1191 | static tEplKernel PUBLIC EplApiCbNmtStateChange(tEplEventNmtStateChange | 1187 | static tEplKernel EplApiCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p) |
1192 | NmtStateChange_p) | ||
1193 | { | 1188 | { |
1194 | tEplKernel Ret = kEplSuccessful; | 1189 | tEplKernel Ret = kEplSuccessful; |
1195 | BYTE bNmtState; | 1190 | BYTE bNmtState; |
@@ -1411,7 +1406,7 @@ static tEplKernel PUBLIC EplApiCbNmtStateChange(tEplEventNmtStateChange | |||
1411 | // | 1406 | // |
1412 | //--------------------------------------------------------------------------- | 1407 | //--------------------------------------------------------------------------- |
1413 | 1408 | ||
1414 | static tEplKernel PUBLIC EplApiUpdateDllConfig(BOOL fUpdateIdentity_p) | 1409 | static tEplKernel EplApiUpdateDllConfig(BOOL fUpdateIdentity_p) |
1415 | { | 1410 | { |
1416 | tEplKernel Ret = kEplSuccessful; | 1411 | tEplKernel Ret = kEplSuccessful; |
1417 | tEplDllConfigParam DllConfigParam; | 1412 | tEplDllConfigParam DllConfigParam; |
@@ -1634,7 +1629,7 @@ static tEplKernel PUBLIC EplApiUpdateDllConfig(BOOL fUpdateIdentity_p) | |||
1634 | // | 1629 | // |
1635 | //--------------------------------------------------------------------------- | 1630 | //--------------------------------------------------------------------------- |
1636 | 1631 | ||
1637 | static tEplKernel PUBLIC EplApiUpdateObd(void) | 1632 | static tEplKernel EplApiUpdateObd(void) |
1638 | { | 1633 | { |
1639 | tEplKernel Ret = kEplSuccessful; | 1634 | tEplKernel Ret = kEplSuccessful; |
1640 | WORD wTemp; | 1635 | WORD wTemp; |
@@ -1905,7 +1900,7 @@ static tEplKernel PUBLIC EplApiUpdateObd(void) | |||
1905 | //--------------------------------------------------------------------------- | 1900 | //--------------------------------------------------------------------------- |
1906 | 1901 | ||
1907 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) | 1902 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) |
1908 | static tEplKernel PUBLIC EplApiCbSdoCon(tEplSdoComFinished * pSdoComFinished_p) | 1903 | static tEplKernel EplApiCbSdoCon(tEplSdoComFinished *pSdoComFinished_p) |
1909 | { | 1904 | { |
1910 | tEplKernel Ret; | 1905 | tEplKernel Ret; |
1911 | tEplApiEventArg EventArg; | 1906 | tEplApiEventArg EventArg; |
@@ -1946,10 +1941,10 @@ static tEplKernel PUBLIC EplApiCbSdoCon(tEplSdoComFinished * pSdoComFinished_p) | |||
1946 | // | 1941 | // |
1947 | //--------------------------------------------------------------------------- | 1942 | //--------------------------------------------------------------------------- |
1948 | 1943 | ||
1949 | static tEplKernel PUBLIC EplApiCbNodeEvent(unsigned int uiNodeId_p, | 1944 | static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p, |
1950 | tEplNmtNodeEvent NodeEvent_p, | 1945 | tEplNmtNodeEvent NodeEvent_p, |
1951 | tEplNmtState NmtState_p, | 1946 | tEplNmtState NmtState_p, |
1952 | WORD wErrorCode_p, BOOL fMandatory_p) | 1947 | WORD wErrorCode_p, BOOL fMandatory_p) |
1953 | { | 1948 | { |
1954 | tEplKernel Ret; | 1949 | tEplKernel Ret; |
1955 | tEplApiEventArg EventArg; | 1950 | tEplApiEventArg EventArg; |
@@ -1990,9 +1985,9 @@ static tEplKernel PUBLIC EplApiCbNodeEvent(unsigned int uiNodeId_p, | |||
1990 | // | 1985 | // |
1991 | //--------------------------------------------------------------------------- | 1986 | //--------------------------------------------------------------------------- |
1992 | 1987 | ||
1993 | static tEplKernel PUBLIC EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, | 1988 | static tEplKernel EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, |
1994 | tEplNmtState NmtState_p, | 1989 | tEplNmtState NmtState_p, |
1995 | WORD wErrorCode_p) | 1990 | WORD wErrorCode_p) |
1996 | { | 1991 | { |
1997 | tEplKernel Ret; | 1992 | tEplKernel Ret; |
1998 | tEplApiEventArg EventArg; | 1993 | tEplApiEventArg EventArg; |
@@ -2033,8 +2028,7 @@ static tEplKernel PUBLIC EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, | |||
2033 | // | 2028 | // |
2034 | //--------------------------------------------------------------------------- | 2029 | //--------------------------------------------------------------------------- |
2035 | 2030 | ||
2036 | static tEplKernel PUBLIC EplApiCbLedStateChange(tEplLedType LedType_p, | 2031 | static tEplKernel EplApiCbLedStateChange(tEplLedType LedType_p, BOOL fOn_p) |
2037 | BOOL fOn_p) | ||
2038 | { | 2032 | { |
2039 | tEplKernel Ret; | 2033 | tEplKernel Ret; |
2040 | tEplApiEventArg EventArg; | 2034 | tEplApiEventArg EventArg; |
diff --git a/drivers/staging/epl/EplApiLinuxKernel.c b/drivers/staging/epl/EplApiLinuxKernel.c index 05ca0628d6a..8d4a218c324 100644 --- a/drivers/staging/epl/EplApiLinuxKernel.c +++ b/drivers/staging/epl/EplApiLinuxKernel.c | |||
@@ -139,7 +139,7 @@ MODULE_DESCRIPTION("EPL API driver"); | |||
139 | 139 | ||
140 | // TracePoint support for realtime-debugging | 140 | // TracePoint support for realtime-debugging |
141 | #ifdef _DBG_TRACE_POINTS_ | 141 | #ifdef _DBG_TRACE_POINTS_ |
142 | void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); | 142 | void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); |
143 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) | 143 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) |
144 | #else | 144 | #else |
145 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) | 145 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) |
@@ -204,11 +204,11 @@ typedef struct { | |||
204 | // Prototypes of internal functions | 204 | // Prototypes of internal functions |
205 | //--------------------------------------------------------------------------- | 205 | //--------------------------------------------------------------------------- |
206 | 206 | ||
207 | tEplKernel PUBLIC EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) | 207 | tEplKernel EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) |
208 | tEplApiEventArg * pEventArg_p, // IN: event argument (union) | 208 | tEplApiEventArg *pEventArg_p, // IN: event argument (union) |
209 | void GENERIC * pUserArg_p); | 209 | void GENERIC *pUserArg_p); |
210 | 210 | ||
211 | tEplKernel PUBLIC EplLinCbSync(void); | 211 | tEplKernel EplLinCbSync(void); |
212 | 212 | ||
213 | static int __init EplLinInit(void); | 213 | static int __init EplLinInit(void); |
214 | static void __exit EplLinExit(void); | 214 | static void __exit EplLinExit(void); |
@@ -1158,9 +1158,9 @@ static int EplLinIoctl(struct inode *pDeviceFile_p, // information about the dev | |||
1158 | // // | 1158 | // // |
1159 | //=========================================================================// | 1159 | //=========================================================================// |
1160 | 1160 | ||
1161 | tEplKernel PUBLIC EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) | 1161 | tEplKernel EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) |
1162 | tEplApiEventArg * pEventArg_p, // IN: event argument (union) | 1162 | tEplApiEventArg *pEventArg_p, // IN: event argument (union) |
1163 | void GENERIC * pUserArg_p) | 1163 | void GENERIC *pUserArg_p) |
1164 | { | 1164 | { |
1165 | tEplKernel EplRet = kEplSuccessful; | 1165 | tEplKernel EplRet = kEplSuccessful; |
1166 | int iErr; | 1166 | int iErr; |
@@ -1224,7 +1224,7 @@ tEplKernel PUBLIC EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type | |||
1224 | return EplRet; | 1224 | return EplRet; |
1225 | } | 1225 | } |
1226 | 1226 | ||
1227 | tEplKernel PUBLIC EplLinCbSync(void) | 1227 | tEplKernel EplLinCbSync(void) |
1228 | { | 1228 | { |
1229 | tEplKernel EplRet = kEplSuccessful; | 1229 | tEplKernel EplRet = kEplSuccessful; |
1230 | int iErr; | 1230 | int iErr; |
diff --git a/drivers/staging/epl/EplApiProcessImage.c b/drivers/staging/epl/EplApiProcessImage.c index 2b2fdf229a7..4fbb7289e0b 100644 --- a/drivers/staging/epl/EplApiProcessImage.c +++ b/drivers/staging/epl/EplApiProcessImage.c | |||
@@ -169,7 +169,7 @@ static tEplApiProcessImageInstance EplApiProcessImageInstance_g; | |||
169 | // | 169 | // |
170 | //--------------------------------------------------------------------------- | 170 | //--------------------------------------------------------------------------- |
171 | 171 | ||
172 | tEplKernel PUBLIC EplApiProcessImageSetup(void) | 172 | tEplKernel EplApiProcessImageSetup(void) |
173 | { | 173 | { |
174 | tEplKernel Ret = kEplSuccessful; | 174 | tEplKernel Ret = kEplSuccessful; |
175 | #if ((EPL_API_PROCESS_IMAGE_SIZE_IN > 0) || (EPL_API_PROCESS_IMAGE_SIZE_OUT > 0)) | 175 | #if ((EPL_API_PROCESS_IMAGE_SIZE_IN > 0) || (EPL_API_PROCESS_IMAGE_SIZE_OUT > 0)) |
@@ -280,7 +280,7 @@ tEplKernel PUBLIC EplApiProcessImageSetup(void) | |||
280 | // State: | 280 | // State: |
281 | //---------------------------------------------------------------------------- | 281 | //---------------------------------------------------------------------------- |
282 | 282 | ||
283 | tEplKernel PUBLIC EplApiProcessImageExchangeIn(tEplApiProcessImage * pPI_p) | 283 | tEplKernel EplApiProcessImageExchangeIn(tEplApiProcessImage *pPI_p) |
284 | { | 284 | { |
285 | tEplKernel Ret = kEplSuccessful; | 285 | tEplKernel Ret = kEplSuccessful; |
286 | 286 | ||
@@ -315,7 +315,7 @@ tEplKernel PUBLIC EplApiProcessImageExchangeIn(tEplApiProcessImage * pPI_p) | |||
315 | // State: | 315 | // State: |
316 | //---------------------------------------------------------------------------- | 316 | //---------------------------------------------------------------------------- |
317 | 317 | ||
318 | tEplKernel PUBLIC EplApiProcessImageExchangeOut(tEplApiProcessImage * pPI_p) | 318 | tEplKernel EplApiProcessImageExchangeOut(tEplApiProcessImage *pPI_p) |
319 | { | 319 | { |
320 | tEplKernel Ret = kEplSuccessful; | 320 | tEplKernel Ret = kEplSuccessful; |
321 | 321 | ||
diff --git a/drivers/staging/epl/EplDllk.c b/drivers/staging/epl/EplDllk.c index 9e22641055c..8fafe752442 100644 --- a/drivers/staging/epl/EplDllk.c +++ b/drivers/staging/epl/EplDllk.c | |||
@@ -121,8 +121,8 @@ | |||
121 | 121 | ||
122 | // TracePoint support for realtime-debugging | 122 | // TracePoint support for realtime-debugging |
123 | #ifdef _DBG_TRACE_POINTS_ | 123 | #ifdef _DBG_TRACE_POINTS_ |
124 | void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); | 124 | void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); |
125 | void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); | 125 | void TgtDbgPostTraceValue(DWORD dwTraceValue_p); |
126 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) | 126 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) |
127 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) | 127 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) |
128 | #else | 128 | #else |
@@ -257,7 +257,7 @@ static tEplKernel EplDllkCheckFrame(tEplFrame * pFrame_p, | |||
257 | 257 | ||
258 | // called by high resolution timer module to monitor EPL cycle as CN | 258 | // called by high resolution timer module to monitor EPL cycle as CN |
259 | #if EPL_TIMER_USE_HIGHRES != FALSE | 259 | #if EPL_TIMER_USE_HIGHRES != FALSE |
260 | static tEplKernel PUBLIC EplDllkCbCnTimer(tEplTimerEventArg * pEventArg_p); | 260 | static tEplKernel EplDllkCbCnTimer(tEplTimerEventArg *pEventArg_p); |
261 | #endif | 261 | #endif |
262 | 262 | ||
263 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) | 263 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) |
@@ -278,10 +278,9 @@ static tEplKernel EplDllkAsyncFrameNotReceived(tEplDllReqServiceId | |||
278 | ReqServiceId_p, | 278 | ReqServiceId_p, |
279 | unsigned int uiNodeId_p); | 279 | unsigned int uiNodeId_p); |
280 | 280 | ||
281 | static tEplKernel PUBLIC EplDllkCbMnTimerCycle(tEplTimerEventArg * pEventArg_p); | 281 | static tEplKernel EplDllkCbMnTimerCycle(tEplTimerEventArg *pEventArg_p); |
282 | 282 | ||
283 | static tEplKernel PUBLIC EplDllkCbMnTimerResponse(tEplTimerEventArg * | 283 | static tEplKernel EplDllkCbMnTimerResponse(tEplTimerEventArg *pEventArg_p); |
284 | pEventArg_p); | ||
285 | 284 | ||
286 | #endif | 285 | #endif |
287 | 286 | ||
@@ -3546,7 +3545,7 @@ static tEplKernel EplDllkCheckFrame(tEplFrame * pFrame_p, | |||
3546 | //--------------------------------------------------------------------------- | 3545 | //--------------------------------------------------------------------------- |
3547 | 3546 | ||
3548 | #if EPL_TIMER_USE_HIGHRES != FALSE | 3547 | #if EPL_TIMER_USE_HIGHRES != FALSE |
3549 | static tEplKernel PUBLIC EplDllkCbCnTimer(tEplTimerEventArg * pEventArg_p) | 3548 | static tEplKernel EplDllkCbCnTimer(tEplTimerEventArg *pEventArg_p) |
3550 | { | 3549 | { |
3551 | tEplKernel Ret = kEplSuccessful; | 3550 | tEplKernel Ret = kEplSuccessful; |
3552 | tEplNmtState NmtState; | 3551 | tEplNmtState NmtState; |
@@ -3617,7 +3616,7 @@ static tEplKernel PUBLIC EplDllkCbCnTimer(tEplTimerEventArg * pEventArg_p) | |||
3617 | // | 3616 | // |
3618 | //--------------------------------------------------------------------------- | 3617 | //--------------------------------------------------------------------------- |
3619 | 3618 | ||
3620 | static tEplKernel PUBLIC EplDllkCbMnTimerCycle(tEplTimerEventArg * pEventArg_p) | 3619 | static tEplKernel EplDllkCbMnTimerCycle(tEplTimerEventArg *pEventArg_p) |
3621 | { | 3620 | { |
3622 | tEplKernel Ret = kEplSuccessful; | 3621 | tEplKernel Ret = kEplSuccessful; |
3623 | tEplNmtState NmtState; | 3622 | tEplNmtState NmtState; |
@@ -3670,8 +3669,7 @@ static tEplKernel PUBLIC EplDllkCbMnTimerCycle(tEplTimerEventArg * pEventArg_p) | |||
3670 | // | 3669 | // |
3671 | //--------------------------------------------------------------------------- | 3670 | //--------------------------------------------------------------------------- |
3672 | 3671 | ||
3673 | static tEplKernel PUBLIC EplDllkCbMnTimerResponse(tEplTimerEventArg * | 3672 | static tEplKernel EplDllkCbMnTimerResponse(tEplTimerEventArg *pEventArg_p) |
3674 | pEventArg_p) | ||
3675 | { | 3673 | { |
3676 | tEplKernel Ret = kEplSuccessful; | 3674 | tEplKernel Ret = kEplSuccessful; |
3677 | tEplNmtState NmtState; | 3675 | tEplNmtState NmtState; |
diff --git a/drivers/staging/epl/EplErrorHandlerk.c b/drivers/staging/epl/EplErrorHandlerk.c index d12521fc99a..25a44d961c0 100644 --- a/drivers/staging/epl/EplErrorHandlerk.c +++ b/drivers/staging/epl/EplErrorHandlerk.c | |||
@@ -176,7 +176,7 @@ static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p, | |||
176 | // State: | 176 | // State: |
177 | // | 177 | // |
178 | //--------------------------------------------------------------------------- | 178 | //--------------------------------------------------------------------------- |
179 | tEplKernel PUBLIC EplErrorHandlerkInit(void) | 179 | tEplKernel EplErrorHandlerkInit(void) |
180 | { | 180 | { |
181 | tEplKernel Ret; | 181 | tEplKernel Ret; |
182 | 182 | ||
@@ -203,7 +203,7 @@ tEplKernel PUBLIC EplErrorHandlerkInit(void) | |||
203 | // State: | 203 | // State: |
204 | // | 204 | // |
205 | //--------------------------------------------------------------------------- | 205 | //--------------------------------------------------------------------------- |
206 | tEplKernel PUBLIC EplErrorHandlerkAddInstance(void) | 206 | tEplKernel EplErrorHandlerkAddInstance(void) |
207 | { | 207 | { |
208 | tEplKernel Ret; | 208 | tEplKernel Ret; |
209 | 209 | ||
@@ -306,7 +306,7 @@ tEplKernel PUBLIC EplErrorHandlerkAddInstance(void) | |||
306 | // State: | 306 | // State: |
307 | // | 307 | // |
308 | //--------------------------------------------------------------------------- | 308 | //--------------------------------------------------------------------------- |
309 | tEplKernel PUBLIC EplErrorHandlerkDelInstance() | 309 | tEplKernel EplErrorHandlerkDelInstance(void) |
310 | { | 310 | { |
311 | tEplKernel Ret; | 311 | tEplKernel Ret; |
312 | 312 | ||
@@ -333,7 +333,7 @@ tEplKernel PUBLIC EplErrorHandlerkDelInstance() | |||
333 | // State: | 333 | // State: |
334 | // | 334 | // |
335 | //--------------------------------------------------------------------------- | 335 | //--------------------------------------------------------------------------- |
336 | tEplKernel PUBLIC EplErrorHandlerkProcess(tEplEvent * pEvent_p) | 336 | tEplKernel EplErrorHandlerkProcess(tEplEvent *pEvent_p) |
337 | { | 337 | { |
338 | tEplKernel Ret; | 338 | tEplKernel Ret; |
339 | unsigned long ulDllErrorEvents; | 339 | unsigned long ulDllErrorEvents; |
diff --git a/drivers/staging/epl/EplEvent.h b/drivers/staging/epl/EplEvent.h index b6dc1b9b2ab..c3c317df96c 100644 --- a/drivers/staging/epl/EplEvent.h +++ b/drivers/staging/epl/EplEvent.h | |||
@@ -267,10 +267,10 @@ typedef struct { | |||
267 | } tEplErrorHandlerkEvent; | 267 | } tEplErrorHandlerkEvent; |
268 | 268 | ||
269 | // callback function to get informed about sync event | 269 | // callback function to get informed about sync event |
270 | typedef tEplKernel(PUBLIC * tEplSyncCb) (void); | 270 | typedef tEplKernel(*tEplSyncCb) (void); |
271 | 271 | ||
272 | // callback function for generic events | 272 | // callback function for generic events |
273 | typedef tEplKernel(PUBLIC * tEplProcessEventCb) (tEplEvent * pEplEvent_p); | 273 | typedef tEplKernel(*tEplProcessEventCb) (tEplEvent *pEplEvent_p); |
274 | 274 | ||
275 | //--------------------------------------------------------------------------- | 275 | //--------------------------------------------------------------------------- |
276 | // function prototypes | 276 | // function prototypes |
diff --git a/drivers/staging/epl/EplEventk.c b/drivers/staging/epl/EplEventk.c index 8068a6c5a0d..165d7e9ef4a 100644 --- a/drivers/staging/epl/EplEventk.c +++ b/drivers/staging/epl/EplEventk.c | |||
@@ -100,8 +100,8 @@ | |||
100 | 100 | ||
101 | // TracePoint support for realtime-debugging | 101 | // TracePoint support for realtime-debugging |
102 | #ifdef _DBG_TRACE_POINTS_ | 102 | #ifdef _DBG_TRACE_POINTS_ |
103 | void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); | 103 | void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); |
104 | void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); | 104 | void TgtDbgPostTraceValue(DWORD dwTraceValue_p); |
105 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) | 105 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) |
106 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) | 106 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) |
107 | #else | 107 | #else |
@@ -172,7 +172,7 @@ static void EplEventkRxSignalHandlerCb(tShbInstance pShbRxInstance_p, | |||
172 | // | 172 | // |
173 | //--------------------------------------------------------------------------- | 173 | //--------------------------------------------------------------------------- |
174 | 174 | ||
175 | tEplKernel PUBLIC EplEventkInit(tEplSyncCb pfnCbSync_p) | 175 | tEplKernel EplEventkInit(tEplSyncCb pfnCbSync_p) |
176 | { | 176 | { |
177 | tEplKernel Ret; | 177 | tEplKernel Ret; |
178 | 178 | ||
@@ -196,7 +196,7 @@ tEplKernel PUBLIC EplEventkInit(tEplSyncCb pfnCbSync_p) | |||
196 | // | 196 | // |
197 | //--------------------------------------------------------------------------- | 197 | //--------------------------------------------------------------------------- |
198 | 198 | ||
199 | tEplKernel PUBLIC EplEventkAddInstance(tEplSyncCb pfnCbSync_p) | 199 | tEplKernel EplEventkAddInstance(tEplSyncCb pfnCbSync_p) |
200 | { | 200 | { |
201 | tEplKernel Ret; | 201 | tEplKernel Ret; |
202 | #ifndef EPL_NO_FIFO | 202 | #ifndef EPL_NO_FIFO |
@@ -275,7 +275,7 @@ tEplKernel PUBLIC EplEventkAddInstance(tEplSyncCb pfnCbSync_p) | |||
275 | // | 275 | // |
276 | //--------------------------------------------------------------------------- | 276 | //--------------------------------------------------------------------------- |
277 | 277 | ||
278 | tEplKernel PUBLIC EplEventkDelInstance() | 278 | tEplKernel EplEventkDelInstance(void) |
279 | { | 279 | { |
280 | tEplKernel Ret; | 280 | tEplKernel Ret; |
281 | #ifndef EPL_NO_FIFO | 281 | #ifndef EPL_NO_FIFO |
@@ -339,7 +339,7 @@ tEplKernel PUBLIC EplEventkDelInstance() | |||
339 | // | 339 | // |
340 | //--------------------------------------------------------------------------- | 340 | //--------------------------------------------------------------------------- |
341 | 341 | ||
342 | tEplKernel PUBLIC EplEventkProcess(tEplEvent * pEvent_p) | 342 | tEplKernel EplEventkProcess(tEplEvent *pEvent_p) |
343 | { | 343 | { |
344 | tEplKernel Ret; | 344 | tEplKernel Ret; |
345 | tEplEventSource EventSource; | 345 | tEplEventSource EventSource; |
@@ -562,7 +562,7 @@ tEplKernel PUBLIC EplEventkProcess(tEplEvent * pEvent_p) | |||
562 | // | 562 | // |
563 | //--------------------------------------------------------------------------- | 563 | //--------------------------------------------------------------------------- |
564 | 564 | ||
565 | tEplKernel PUBLIC EplEventkPost(tEplEvent * pEvent_p) | 565 | tEplKernel EplEventkPost(tEplEvent *pEvent_p) |
566 | { | 566 | { |
567 | tEplKernel Ret; | 567 | tEplKernel Ret; |
568 | #ifndef EPL_NO_FIFO | 568 | #ifndef EPL_NO_FIFO |
@@ -755,9 +755,9 @@ tEplKernel PUBLIC EplEventkPost(tEplEvent * pEvent_p) | |||
755 | // | 755 | // |
756 | //--------------------------------------------------------------------------- | 756 | //--------------------------------------------------------------------------- |
757 | 757 | ||
758 | tEplKernel PUBLIC EplEventkPostError(tEplEventSource EventSource_p, | 758 | tEplKernel EplEventkPostError(tEplEventSource EventSource_p, |
759 | tEplKernel EplError_p, | 759 | tEplKernel EplError_p, |
760 | unsigned int uiArgSize_p, void *pArg_p) | 760 | unsigned int uiArgSize_p, void *pArg_p) |
761 | { | 761 | { |
762 | tEplKernel Ret; | 762 | tEplKernel Ret; |
763 | BYTE abBuffer[EPL_MAX_EVENT_ARG_SIZE]; | 763 | BYTE abBuffer[EPL_MAX_EVENT_ARG_SIZE]; |
diff --git a/drivers/staging/epl/EplEventu.c b/drivers/staging/epl/EplEventu.c index 815f9a87abf..d26e95a923a 100644 --- a/drivers/staging/epl/EplEventu.c +++ b/drivers/staging/epl/EplEventu.c | |||
@@ -96,8 +96,8 @@ | |||
96 | 96 | ||
97 | // TracePoint support for realtime-debugging | 97 | // TracePoint support for realtime-debugging |
98 | #ifdef _DBG_TRACE_POINTS_ | 98 | #ifdef _DBG_TRACE_POINTS_ |
99 | void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); | 99 | void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); |
100 | void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); | 100 | void TgtDbgPostTraceValue(DWORD dwTraceValue_p); |
101 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) | 101 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) |
102 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) | 102 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) |
103 | #else | 103 | #else |
@@ -172,7 +172,7 @@ static void EplEventuRxSignalHandlerCb(tShbInstance pShbRxInstance_p, | |||
172 | // State: | 172 | // State: |
173 | // | 173 | // |
174 | //--------------------------------------------------------------------------- | 174 | //--------------------------------------------------------------------------- |
175 | tEplKernel PUBLIC EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p) | 175 | tEplKernel EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p) |
176 | { | 176 | { |
177 | tEplKernel Ret; | 177 | tEplKernel Ret; |
178 | 178 | ||
@@ -199,8 +199,7 @@ tEplKernel PUBLIC EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p) | |||
199 | // State: | 199 | // State: |
200 | // | 200 | // |
201 | //--------------------------------------------------------------------------- | 201 | //--------------------------------------------------------------------------- |
202 | tEplKernel PUBLIC EplEventuAddInstance(tEplProcessEventCb | 202 | tEplKernel EplEventuAddInstance(tEplProcessEventCb pfnApiProcessEventCb_p) |
203 | pfnApiProcessEventCb_p) | ||
204 | { | 203 | { |
205 | tEplKernel Ret; | 204 | tEplKernel Ret; |
206 | #ifndef EPL_NO_FIFO | 205 | #ifndef EPL_NO_FIFO |
@@ -280,7 +279,7 @@ tEplKernel PUBLIC EplEventuAddInstance(tEplProcessEventCb | |||
280 | // State: | 279 | // State: |
281 | // | 280 | // |
282 | //--------------------------------------------------------------------------- | 281 | //--------------------------------------------------------------------------- |
283 | tEplKernel PUBLIC EplEventuDelInstance() | 282 | tEplKernel EplEventuDelInstance(void) |
284 | { | 283 | { |
285 | tEplKernel Ret; | 284 | tEplKernel Ret; |
286 | #ifndef EPL_NO_FIFO | 285 | #ifndef EPL_NO_FIFO |
@@ -348,7 +347,7 @@ tEplKernel PUBLIC EplEventuDelInstance() | |||
348 | // State: | 347 | // State: |
349 | // | 348 | // |
350 | //--------------------------------------------------------------------------- | 349 | //--------------------------------------------------------------------------- |
351 | tEplKernel PUBLIC EplEventuProcess(tEplEvent * pEvent_p) | 350 | tEplKernel EplEventuProcess(tEplEvent *pEvent_p) |
352 | { | 351 | { |
353 | tEplKernel Ret; | 352 | tEplKernel Ret; |
354 | tEplEventSource EventSource; | 353 | tEplEventSource EventSource; |
@@ -515,7 +514,7 @@ tEplKernel PUBLIC EplEventuProcess(tEplEvent * pEvent_p) | |||
515 | // State: | 514 | // State: |
516 | // | 515 | // |
517 | //--------------------------------------------------------------------------- | 516 | //--------------------------------------------------------------------------- |
518 | tEplKernel PUBLIC EplEventuPost(tEplEvent * pEvent_p) | 517 | tEplKernel EplEventuPost(tEplEvent *pEvent_p) |
519 | { | 518 | { |
520 | tEplKernel Ret; | 519 | tEplKernel Ret; |
521 | #ifndef EPL_NO_FIFO | 520 | #ifndef EPL_NO_FIFO |
@@ -689,9 +688,9 @@ tEplKernel PUBLIC EplEventuPost(tEplEvent * pEvent_p) | |||
689 | // State: | 688 | // State: |
690 | // | 689 | // |
691 | //--------------------------------------------------------------------------- | 690 | //--------------------------------------------------------------------------- |
692 | tEplKernel PUBLIC EplEventuPostError(tEplEventSource EventSource_p, | 691 | tEplKernel EplEventuPostError(tEplEventSource EventSource_p, |
693 | tEplKernel EplError_p, | 692 | tEplKernel EplError_p, |
694 | unsigned int uiArgSize_p, void *pArg_p) | 693 | unsigned int uiArgSize_p, void *pArg_p) |
695 | { | 694 | { |
696 | tEplKernel Ret; | 695 | tEplKernel Ret; |
697 | BYTE abBuffer[EPL_MAX_EVENT_ARG_SIZE]; | 696 | BYTE abBuffer[EPL_MAX_EVENT_ARG_SIZE]; |
diff --git a/drivers/staging/epl/EplIdentu.c b/drivers/staging/epl/EplIdentu.c index ce59ef09ccd..75f941d97cc 100644 --- a/drivers/staging/epl/EplIdentu.c +++ b/drivers/staging/epl/EplIdentu.c | |||
@@ -138,7 +138,7 @@ static tEplIdentuInstance EplIdentuInstance_g; | |||
138 | // local function prototypes | 138 | // local function prototypes |
139 | //--------------------------------------------------------------------------- | 139 | //--------------------------------------------------------------------------- |
140 | 140 | ||
141 | static tEplKernel PUBLIC EplIdentuCbIdentResponse(tEplFrameInfo * pFrameInfo_p); | 141 | static tEplKernel EplIdentuCbIdentResponse(tEplFrameInfo *pFrameInfo_p); |
142 | 142 | ||
143 | //=========================================================================// | 143 | //=========================================================================// |
144 | // // | 144 | // // |
@@ -164,7 +164,7 @@ static tEplKernel PUBLIC EplIdentuCbIdentResponse(tEplFrameInfo * pFrameInfo_p); | |||
164 | // | 164 | // |
165 | //--------------------------------------------------------------------------- | 165 | //--------------------------------------------------------------------------- |
166 | 166 | ||
167 | EPLDLLEXPORT tEplKernel PUBLIC EplIdentuInit() | 167 | EPLDLLEXPORT tEplKernel EplIdentuInit(void) |
168 | { | 168 | { |
169 | tEplKernel Ret; | 169 | tEplKernel Ret; |
170 | 170 | ||
@@ -191,7 +191,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplIdentuInit() | |||
191 | // | 191 | // |
192 | //--------------------------------------------------------------------------- | 192 | //--------------------------------------------------------------------------- |
193 | 193 | ||
194 | EPLDLLEXPORT tEplKernel PUBLIC EplIdentuAddInstance() | 194 | EPLDLLEXPORT tEplKernel EplIdentuAddInstance(void) |
195 | { | 195 | { |
196 | tEplKernel Ret; | 196 | tEplKernel Ret; |
197 | 197 | ||
@@ -228,7 +228,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplIdentuAddInstance() | |||
228 | // | 228 | // |
229 | //--------------------------------------------------------------------------- | 229 | //--------------------------------------------------------------------------- |
230 | 230 | ||
231 | EPLDLLEXPORT tEplKernel PUBLIC EplIdentuDelInstance() | 231 | EPLDLLEXPORT tEplKernel EplIdentuDelInstance(void) |
232 | { | 232 | { |
233 | tEplKernel Ret; | 233 | tEplKernel Ret; |
234 | 234 | ||
@@ -263,7 +263,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplIdentuDelInstance() | |||
263 | // | 263 | // |
264 | //--------------------------------------------------------------------------- | 264 | //--------------------------------------------------------------------------- |
265 | 265 | ||
266 | EPLDLLEXPORT tEplKernel PUBLIC EplIdentuReset() | 266 | EPLDLLEXPORT tEplKernel EplIdentuReset(void) |
267 | { | 267 | { |
268 | tEplKernel Ret; | 268 | tEplKernel Ret; |
269 | int iIndex; | 269 | int iIndex; |
@@ -300,9 +300,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplIdentuReset() | |||
300 | // | 300 | // |
301 | //--------------------------------------------------------------------------- | 301 | //--------------------------------------------------------------------------- |
302 | 302 | ||
303 | tEplKernel PUBLIC EplIdentuGetIdentResponse(unsigned int uiNodeId_p, | 303 | tEplKernel EplIdentuGetIdentResponse(unsigned int uiNodeId_p, |
304 | tEplIdentResponse ** | 304 | tEplIdentResponse **ppIdentResponse_p) |
305 | ppIdentResponse_p) | ||
306 | { | 305 | { |
307 | tEplKernel Ret; | 306 | tEplKernel Ret; |
308 | 307 | ||
@@ -338,9 +337,8 @@ tEplKernel PUBLIC EplIdentuGetIdentResponse(unsigned int uiNodeId_p, | |||
338 | // | 337 | // |
339 | //--------------------------------------------------------------------------- | 338 | //--------------------------------------------------------------------------- |
340 | 339 | ||
341 | tEplKernel PUBLIC EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, | 340 | tEplKernel EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, |
342 | tEplIdentuCbResponse | 341 | tEplIdentuCbResponse pfnCbResponse_p) |
343 | pfnCbResponse_p) | ||
344 | { | 342 | { |
345 | tEplKernel Ret; | 343 | tEplKernel Ret; |
346 | 344 | ||
@@ -388,7 +386,7 @@ tEplKernel PUBLIC EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, | |||
388 | // | 386 | // |
389 | //--------------------------------------------------------------------------- | 387 | //--------------------------------------------------------------------------- |
390 | 388 | ||
391 | EPLDLLEXPORT DWORD PUBLIC EplIdentuGetRunningRequests(void) | 389 | EPLDLLEXPORT DWORD EplIdentuGetRunningRequests(void) |
392 | { | 390 | { |
393 | DWORD dwReqs = 0; | 391 | DWORD dwReqs = 0; |
394 | unsigned int uiIndex; | 392 | unsigned int uiIndex; |
@@ -426,7 +424,7 @@ EPLDLLEXPORT DWORD PUBLIC EplIdentuGetRunningRequests(void) | |||
426 | // | 424 | // |
427 | //--------------------------------------------------------------------------- | 425 | //--------------------------------------------------------------------------- |
428 | 426 | ||
429 | static tEplKernel PUBLIC EplIdentuCbIdentResponse(tEplFrameInfo * pFrameInfo_p) | 427 | static tEplKernel EplIdentuCbIdentResponse(tEplFrameInfo *pFrameInfo_p) |
430 | { | 428 | { |
431 | tEplKernel Ret = kEplSuccessful; | 429 | tEplKernel Ret = kEplSuccessful; |
432 | unsigned int uiNodeId; | 430 | unsigned int uiNodeId; |
diff --git a/drivers/staging/epl/EplNmtCnu.c b/drivers/staging/epl/EplNmtCnu.c index f2f46da08c7..2c391167539 100644 --- a/drivers/staging/epl/EplNmtCnu.c +++ b/drivers/staging/epl/EplNmtCnu.c | |||
@@ -110,7 +110,7 @@ static tEplNmtCommand EplNmtCnuGetNmtCommand(tEplFrameInfo * pFrameInfo_p); | |||
110 | 110 | ||
111 | static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p); | 111 | static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p); |
112 | 112 | ||
113 | static tEplKernel PUBLIC EplNmtCnuCommandCb(tEplFrameInfo * pFrameInfo_p); | 113 | static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p); |
114 | 114 | ||
115 | //=========================================================================// | 115 | //=========================================================================// |
116 | // // | 116 | // // |
@@ -135,7 +135,7 @@ static tEplKernel PUBLIC EplNmtCnuCommandCb(tEplFrameInfo * pFrameInfo_p); | |||
135 | // State: | 135 | // State: |
136 | // | 136 | // |
137 | //--------------------------------------------------------------------------- | 137 | //--------------------------------------------------------------------------- |
138 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuInit(unsigned int uiNodeId_p) | 138 | EPLDLLEXPORT tEplKernel EplNmtCnuInit(unsigned int uiNodeId_p) |
139 | { | 139 | { |
140 | tEplKernel Ret; | 140 | tEplKernel Ret; |
141 | 141 | ||
@@ -161,7 +161,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuInit(unsigned int uiNodeId_p) | |||
161 | // State: | 161 | // State: |
162 | // | 162 | // |
163 | //--------------------------------------------------------------------------- | 163 | //--------------------------------------------------------------------------- |
164 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuAddInstance(unsigned int uiNodeId_p) | 164 | EPLDLLEXPORT tEplKernel EplNmtCnuAddInstance(unsigned int uiNodeId_p) |
165 | { | 165 | { |
166 | tEplKernel Ret; | 166 | tEplKernel Ret; |
167 | 167 | ||
@@ -201,7 +201,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuAddInstance(unsigned int uiNodeId_p) | |||
201 | // State: | 201 | // State: |
202 | // | 202 | // |
203 | //--------------------------------------------------------------------------- | 203 | //--------------------------------------------------------------------------- |
204 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuDelInstance() | 204 | EPLDLLEXPORT tEplKernel EplNmtCnuDelInstance(void) |
205 | { | 205 | { |
206 | tEplKernel Ret; | 206 | tEplKernel Ret; |
207 | 207 | ||
@@ -234,9 +234,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuDelInstance() | |||
234 | // State: | 234 | // State: |
235 | // | 235 | // |
236 | //--------------------------------------------------------------------------- | 236 | //--------------------------------------------------------------------------- |
237 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, | 237 | EPLDLLEXPORT tEplKernel EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, |
238 | tEplNmtCommand | 238 | tEplNmtCommand NmtCommand_p) |
239 | NmtCommand_p) | ||
240 | { | 239 | { |
241 | tEplKernel Ret; | 240 | tEplKernel Ret; |
242 | tEplFrameInfo NmtRequestFrameInfo; | 241 | tEplFrameInfo NmtRequestFrameInfo; |
@@ -297,9 +296,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, | |||
297 | // | 296 | // |
298 | //--------------------------------------------------------------------------- | 297 | //--------------------------------------------------------------------------- |
299 | 298 | ||
300 | EPLDLLEXPORT tEplKernel PUBLIC | 299 | EPLDLLEXPORT tEplKernel EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback pfnEplNmtCheckEventCb_p) |
301 | EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback | ||
302 | pfnEplNmtCheckEventCb_p) | ||
303 | { | 300 | { |
304 | tEplKernel Ret; | 301 | tEplKernel Ret; |
305 | 302 | ||
@@ -335,7 +332,7 @@ EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback | |||
335 | // State: | 332 | // State: |
336 | // | 333 | // |
337 | //--------------------------------------------------------------------------- | 334 | //--------------------------------------------------------------------------- |
338 | static tEplKernel PUBLIC EplNmtCnuCommandCb(tEplFrameInfo * pFrameInfo_p) | 335 | static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p) |
339 | { | 336 | { |
340 | tEplKernel Ret = kEplSuccessful; | 337 | tEplKernel Ret = kEplSuccessful; |
341 | tEplNmtCommand NmtCommand; | 338 | tEplNmtCommand NmtCommand; |
diff --git a/drivers/staging/epl/EplNmtMnu.c b/drivers/staging/epl/EplNmtMnu.c index 4ed0b6ce487..79ffdbf7fad 100644 --- a/drivers/staging/epl/EplNmtMnu.c +++ b/drivers/staging/epl/EplNmtMnu.c | |||
@@ -94,8 +94,8 @@ | |||
94 | 94 | ||
95 | // TracePoint support for realtime-debugging | 95 | // TracePoint support for realtime-debugging |
96 | #ifdef _DBG_TRACE_POINTS_ | 96 | #ifdef _DBG_TRACE_POINTS_ |
97 | void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); | 97 | void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); |
98 | void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); | 98 | void TgtDbgPostTraceValue(DWORD dwTraceValue_p); |
99 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) | 99 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) |
100 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) | 100 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) |
101 | #else | 101 | #else |
@@ -241,15 +241,13 @@ static tEplNmtMnuInstance EplNmtMnuInstance_g; | |||
241 | // local function prototypes | 241 | // local function prototypes |
242 | //--------------------------------------------------------------------------- | 242 | //--------------------------------------------------------------------------- |
243 | 243 | ||
244 | static tEplKernel PUBLIC EplNmtMnuCbNmtRequest(tEplFrameInfo * pFrameInfo_p); | 244 | static tEplKernel EplNmtMnuCbNmtRequest(tEplFrameInfo *pFrameInfo_p); |
245 | 245 | ||
246 | static tEplKernel PUBLIC EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, | 246 | static tEplKernel EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, |
247 | tEplIdentResponse * | 247 | tEplIdentResponse *pIdentResponse_p); |
248 | pIdentResponse_p); | ||
249 | 248 | ||
250 | static tEplKernel PUBLIC EplNmtMnuCbStatusResponse(unsigned int uiNodeId_p, | 249 | static tEplKernel EplNmtMnuCbStatusResponse(unsigned int uiNodeId_p, |
251 | tEplStatusResponse * | 250 | tEplStatusResponse *pStatusResponse_p); |
252 | pStatusResponse_p); | ||
253 | 251 | ||
254 | static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p, | 252 | static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p, |
255 | tEplNmtMnuNodeInfo * pNodeInfo_p, | 253 | tEplNmtMnuNodeInfo * pNodeInfo_p, |
@@ -645,8 +643,7 @@ tEplKernel EplNmtMnuTriggerStateChange(unsigned int uiNodeId_p, | |||
645 | // | 643 | // |
646 | //--------------------------------------------------------------------------- | 644 | //--------------------------------------------------------------------------- |
647 | 645 | ||
648 | tEplKernel PUBLIC EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange | 646 | tEplKernel EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p) |
649 | NmtStateChange_p) | ||
650 | { | 647 | { |
651 | tEplKernel Ret = kEplSuccessful; | 648 | tEplKernel Ret = kEplSuccessful; |
652 | 649 | ||
@@ -928,7 +925,7 @@ tEplKernel PUBLIC EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange | |||
928 | // | 925 | // |
929 | //--------------------------------------------------------------------------- | 926 | //--------------------------------------------------------------------------- |
930 | 927 | ||
931 | tEplKernel PUBLIC EplNmtMnuCbCheckEvent(tEplNmtEvent NmtEvent_p) | 928 | tEplKernel EplNmtMnuCbCheckEvent(tEplNmtEvent NmtEvent_p) |
932 | { | 929 | { |
933 | tEplKernel Ret = kEplSuccessful; | 930 | tEplKernel Ret = kEplSuccessful; |
934 | 931 | ||
@@ -949,7 +946,7 @@ tEplKernel PUBLIC EplNmtMnuCbCheckEvent(tEplNmtEvent NmtEvent_p) | |||
949 | // | 946 | // |
950 | //--------------------------------------------------------------------------- | 947 | //--------------------------------------------------------------------------- |
951 | 948 | ||
952 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtMnuProcessEvent(tEplEvent * pEvent_p) | 949 | EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent *pEvent_p) |
953 | { | 950 | { |
954 | tEplKernel Ret; | 951 | tEplKernel Ret; |
955 | 952 | ||
@@ -1258,11 +1255,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtMnuProcessEvent(tEplEvent * pEvent_p) | |||
1258 | // | 1255 | // |
1259 | //--------------------------------------------------------------------------- | 1256 | //--------------------------------------------------------------------------- |
1260 | 1257 | ||
1261 | tEplKernel PUBLIC EplNmtMnuGetDiagnosticInfo(unsigned int | 1258 | tEplKernel EplNmtMnuGetDiagnosticInfo(unsigned int *puiMandatorySlaveCount_p, |
1262 | *puiMandatorySlaveCount_p, | 1259 | unsigned int *puiSignalSlaveCount_p, |
1263 | unsigned int | 1260 | WORD *pwFlags_p) |
1264 | *puiSignalSlaveCount_p, | ||
1265 | WORD * pwFlags_p) | ||
1266 | { | 1261 | { |
1267 | tEplKernel Ret = kEplSuccessful; | 1262 | tEplKernel Ret = kEplSuccessful; |
1268 | 1263 | ||
@@ -1347,7 +1342,7 @@ Exit: | |||
1347 | // | 1342 | // |
1348 | //--------------------------------------------------------------------------- | 1343 | //--------------------------------------------------------------------------- |
1349 | 1344 | ||
1350 | static tEplKernel PUBLIC EplNmtMnuCbNmtRequest(tEplFrameInfo * pFrameInfo_p) | 1345 | static tEplKernel EplNmtMnuCbNmtRequest(tEplFrameInfo *pFrameInfo_p) |
1351 | { | 1346 | { |
1352 | tEplKernel Ret = kEplSuccessful; | 1347 | tEplKernel Ret = kEplSuccessful; |
1353 | 1348 | ||
@@ -1371,9 +1366,8 @@ static tEplKernel PUBLIC EplNmtMnuCbNmtRequest(tEplFrameInfo * pFrameInfo_p) | |||
1371 | // | 1366 | // |
1372 | //--------------------------------------------------------------------------- | 1367 | //--------------------------------------------------------------------------- |
1373 | 1368 | ||
1374 | static tEplKernel PUBLIC EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, | 1369 | static tEplKernel EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, |
1375 | tEplIdentResponse * | 1370 | tEplIdentResponse *pIdentResponse_p) |
1376 | pIdentResponse_p) | ||
1377 | { | 1371 | { |
1378 | tEplKernel Ret = kEplSuccessful; | 1372 | tEplKernel Ret = kEplSuccessful; |
1379 | 1373 | ||
@@ -1431,9 +1425,8 @@ static tEplKernel PUBLIC EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, | |||
1431 | // | 1425 | // |
1432 | //--------------------------------------------------------------------------- | 1426 | //--------------------------------------------------------------------------- |
1433 | 1427 | ||
1434 | static tEplKernel PUBLIC EplNmtMnuCbStatusResponse(unsigned int uiNodeId_p, | 1428 | static tEplKernel EplNmtMnuCbStatusResponse(unsigned int uiNodeId_p, |
1435 | tEplStatusResponse * | 1429 | tEplStatusResponse *pStatusResponse_p) |
1436 | pStatusResponse_p) | ||
1437 | { | 1430 | { |
1438 | tEplKernel Ret = kEplSuccessful; | 1431 | tEplKernel Ret = kEplSuccessful; |
1439 | 1432 | ||
diff --git a/drivers/staging/epl/EplNmtk.c b/drivers/staging/epl/EplNmtk.c index 4e2d0e15e94..ad85d8e8511 100644 --- a/drivers/staging/epl/EplNmtk.c +++ b/drivers/staging/epl/EplNmtk.c | |||
@@ -88,8 +88,8 @@ | |||
88 | 88 | ||
89 | // TracePoint support for realtime-debugging | 89 | // TracePoint support for realtime-debugging |
90 | #ifdef _DBG_TRACE_POINTS_ | 90 | #ifdef _DBG_TRACE_POINTS_ |
91 | void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); | 91 | void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); |
92 | void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); | 92 | void TgtDbgPostTraceValue(DWORD dwTraceValue_p); |
93 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) | 93 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) |
94 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) | 94 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) |
95 | #else | 95 | #else |
@@ -163,7 +163,7 @@ EPL_MCO_DEFINE_INSTANCE_FCT() | |||
163 | // State: | 163 | // State: |
164 | // | 164 | // |
165 | //--------------------------------------------------------------------------- | 165 | //--------------------------------------------------------------------------- |
166 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR) | 166 | EPLDLLEXPORT tEplKernel EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR) |
167 | { | 167 | { |
168 | tEplKernel Ret; | 168 | tEplKernel Ret; |
169 | 169 | ||
@@ -189,7 +189,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR) | |||
189 | // State: | 189 | // State: |
190 | // | 190 | // |
191 | //--------------------------------------------------------------------------- | 191 | //--------------------------------------------------------------------------- |
192 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) | 192 | EPLDLLEXPORT tEplKernel EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) |
193 | { | 193 | { |
194 | EPL_MCO_DECL_INSTANCE_PTR_LOCAL tEplKernel Ret; | 194 | EPL_MCO_DECL_INSTANCE_PTR_LOCAL tEplKernel Ret; |
195 | //tEplEvent Event; | 195 | //tEplEvent Event; |
@@ -258,7 +258,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) | |||
258 | // | 258 | // |
259 | //--------------------------------------------------------------------------- | 259 | //--------------------------------------------------------------------------- |
260 | #if (EPL_USE_DELETEINST_FUNC != FALSE) | 260 | #if (EPL_USE_DELETEINST_FUNC != FALSE) |
261 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) | 261 | EPLDLLEXPORT tEplKernel EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) |
262 | { | 262 | { |
263 | tEplKernel Ret = kEplSuccessful; | 263 | tEplKernel Ret = kEplSuccessful; |
264 | // check for all API function if instance is valid | 264 | // check for all API function if instance is valid |
@@ -296,8 +296,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) | |||
296 | // State: | 296 | // State: |
297 | // | 297 | // |
298 | //--------------------------------------------------------------------------- | 298 | //--------------------------------------------------------------------------- |
299 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtkProcess(EPL_MCO_DECL_PTR_INSTANCE_PTR_ | 299 | EPLDLLEXPORT tEplKernel EplNmtkProcess(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplEvent *pEvent_p) |
300 | tEplEvent * pEvent_p) | ||
301 | { | 300 | { |
302 | tEplKernel Ret; | 301 | tEplKernel Ret; |
303 | tEplNmtState OldNmtState; | 302 | tEplNmtState OldNmtState; |
@@ -1804,8 +1803,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtkProcess(EPL_MCO_DECL_PTR_INSTANCE_PTR_ | |||
1804 | // State: | 1803 | // State: |
1805 | // | 1804 | // |
1806 | //--------------------------------------------------------------------------- | 1805 | //--------------------------------------------------------------------------- |
1807 | EPLDLLEXPORT tEplNmtState PUBLIC | 1806 | EPLDLLEXPORT tEplNmtState EplNmtkGetNmtState(EPL_MCO_DECL_PTR_INSTANCE_PTR) |
1808 | EplNmtkGetNmtState(EPL_MCO_DECL_PTR_INSTANCE_PTR) | ||
1809 | { | 1807 | { |
1810 | tEplNmtState NmtState; | 1808 | tEplNmtState NmtState; |
1811 | 1809 | ||
diff --git a/drivers/staging/epl/EplNmtu.c b/drivers/staging/epl/EplNmtu.c index 3de16a1eff5..3c6452fb304 100644 --- a/drivers/staging/epl/EplNmtu.c +++ b/drivers/staging/epl/EplNmtu.c | |||
@@ -132,7 +132,7 @@ static tEplNmtuInstance EplNmtuInstance_g; | |||
132 | // State: | 132 | // State: |
133 | // | 133 | // |
134 | //--------------------------------------------------------------------------- | 134 | //--------------------------------------------------------------------------- |
135 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtuInit() | 135 | EPLDLLEXPORT tEplKernel EplNmtuInit(void) |
136 | { | 136 | { |
137 | tEplKernel Ret; | 137 | tEplKernel Ret; |
138 | 138 | ||
@@ -158,7 +158,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtuInit() | |||
158 | // State: | 158 | // State: |
159 | // | 159 | // |
160 | //--------------------------------------------------------------------------- | 160 | //--------------------------------------------------------------------------- |
161 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtuAddInstance() | 161 | EPLDLLEXPORT tEplKernel EplNmtuAddInstance(void) |
162 | { | 162 | { |
163 | tEplKernel Ret; | 163 | tEplKernel Ret; |
164 | 164 | ||
@@ -187,7 +187,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtuAddInstance() | |||
187 | // State: | 187 | // State: |
188 | // | 188 | // |
189 | //--------------------------------------------------------------------------- | 189 | //--------------------------------------------------------------------------- |
190 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtuDelInstance() | 190 | EPLDLLEXPORT tEplKernel EplNmtuDelInstance(void) |
191 | { | 191 | { |
192 | tEplKernel Ret; | 192 | tEplKernel Ret; |
193 | 193 | ||
@@ -219,7 +219,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtuDelInstance() | |||
219 | // State: | 219 | // State: |
220 | // | 220 | // |
221 | //--------------------------------------------------------------------------- | 221 | //--------------------------------------------------------------------------- |
222 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtuNmtEvent(tEplNmtEvent NmtEvent_p) | 222 | EPLDLLEXPORT tEplKernel EplNmtuNmtEvent(tEplNmtEvent NmtEvent_p) |
223 | { | 223 | { |
224 | tEplKernel Ret; | 224 | tEplKernel Ret; |
225 | tEplEvent Event; | 225 | tEplEvent Event; |
@@ -253,7 +253,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtuNmtEvent(tEplNmtEvent NmtEvent_p) | |||
253 | // State: | 253 | // State: |
254 | // | 254 | // |
255 | //--------------------------------------------------------------------------- | 255 | //--------------------------------------------------------------------------- |
256 | EPLDLLEXPORT tEplNmtState PUBLIC EplNmtuGetNmtState() | 256 | EPLDLLEXPORT tEplNmtState EplNmtuGetNmtState(void) |
257 | { | 257 | { |
258 | tEplNmtState NmtState; | 258 | tEplNmtState NmtState; |
259 | 259 | ||
@@ -284,7 +284,7 @@ EPLDLLEXPORT tEplNmtState PUBLIC EplNmtuGetNmtState() | |||
284 | // State: | 284 | // State: |
285 | // | 285 | // |
286 | //--------------------------------------------------------------------------- | 286 | //--------------------------------------------------------------------------- |
287 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtuProcessEvent(tEplEvent * pEplEvent_p) | 287 | EPLDLLEXPORT tEplKernel EplNmtuProcessEvent(tEplEvent *pEplEvent_p) |
288 | { | 288 | { |
289 | tEplKernel Ret; | 289 | tEplKernel Ret; |
290 | 290 | ||
@@ -664,9 +664,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtuProcessEvent(tEplEvent * pEplEvent_p) | |||
664 | // State: | 664 | // State: |
665 | // | 665 | // |
666 | //--------------------------------------------------------------------------- | 666 | //--------------------------------------------------------------------------- |
667 | EPLDLLEXPORT tEplKernel PUBLIC | 667 | EPLDLLEXPORT tEplKernel EplNmtuRegisterStateChangeCb(tEplNmtuStateChangeCallback pfnEplNmtStateChangeCb_p) |
668 | EplNmtuRegisterStateChangeCb(tEplNmtuStateChangeCallback | ||
669 | pfnEplNmtStateChangeCb_p) | ||
670 | { | 668 | { |
671 | tEplKernel Ret; | 669 | tEplKernel Ret; |
672 | 670 | ||
diff --git a/drivers/staging/epl/EplNmtuCal.c b/drivers/staging/epl/EplNmtuCal.c index 4a29ef58bf9..db823b919a5 100644 --- a/drivers/staging/epl/EplNmtuCal.c +++ b/drivers/staging/epl/EplNmtuCal.c | |||
@@ -119,7 +119,7 @@ | |||
119 | // State: | 119 | // State: |
120 | // | 120 | // |
121 | //--------------------------------------------------------------------------- | 121 | //--------------------------------------------------------------------------- |
122 | EPLDLLEXPORT tEplNmtState PUBLIC EplNmtkCalGetNmtState() | 122 | EPLDLLEXPORT tEplNmtState EplNmtkCalGetNmtState(void) |
123 | { | 123 | { |
124 | tEplNmtState NmtState; | 124 | tEplNmtState NmtState; |
125 | // for test direkt call for EplNmtkGetNmtState() | 125 | // for test direkt call for EplNmtkGetNmtState() |
diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c index efbb1967a5d..a07582cec50 100644 --- a/drivers/staging/epl/EplObd.c +++ b/drivers/staging/epl/EplObd.c | |||
@@ -189,24 +189,22 @@ void *EplObdGetObjectDataPtrIntern(tEplObdSubEntryPtr pSubindexEntry_p); | |||
189 | static tEplKernel EplObdIsNumericalIntern(tEplObdSubEntryPtr pObdSubEntry_p, | 189 | static tEplKernel EplObdIsNumericalIntern(tEplObdSubEntryPtr pObdSubEntry_p, |
190 | BOOL * pfEntryNumerical_p); | 190 | BOOL * pfEntryNumerical_p); |
191 | 191 | ||
192 | static tEplKernel PUBLIC EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ | 192 | static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
193 | unsigned int uiIndex_p, | 193 | unsigned int uiSubIndex_p, |
194 | unsigned int uiSubIndex_p, | 194 | void *pSrcData_p, |
195 | void *pSrcData_p, | 195 | void **ppDstData_p, |
196 | void **ppDstData_p, | 196 | tEplObdSize Size_p, |
197 | tEplObdSize Size_p, | 197 | tEplObdEntryPtr *ppObdEntry_p, |
198 | tEplObdEntryPtr * ppObdEntry_p, | 198 | tEplObdSubEntryPtr *ppSubEntry_p, |
199 | tEplObdSubEntryPtr * ppSubEntry_p, | 199 | tEplObdCbParam MEM *pCbParam_p, |
200 | tEplObdCbParam MEM * pCbParam_p, | 200 | tEplObdSize *pObdSize_p); |
201 | tEplObdSize * pObdSize_p); | 201 | |
202 | 202 | static tEplKernel EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPtr pObdEntry_p, | |
203 | static tEplKernel PUBLIC EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ | 203 | tEplObdSubEntryPtr pSubEntry_p, |
204 | tEplObdEntryPtr pObdEntry_p, | 204 | tEplObdCbParam MEM *pCbParam_p, |
205 | tEplObdSubEntryPtr pSubEntry_p, | 205 | void *pSrcData_p, |
206 | tEplObdCbParam MEM * pCbParam_p, | 206 | void *pDstData_p, |
207 | void *pSrcData_p, | 207 | tEplObdSize ObdSize_p); |
208 | void *pDstData_p, | ||
209 | tEplObdSize ObdSize_p); | ||
210 | 208 | ||
211 | //=========================================================================// | 209 | //=========================================================================// |
212 | // // | 210 | // // |
@@ -228,8 +226,7 @@ static tEplKernel PUBLIC EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ | |||
228 | // | 226 | // |
229 | //--------------------------------------------------------------------------- | 227 | //--------------------------------------------------------------------------- |
230 | 228 | ||
231 | EPLDLLEXPORT tEplKernel PUBLIC EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ | 229 | EPLDLLEXPORT tEplKernel EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p) |
232 | tEplObdInitParam MEM * pInitParam_p) | ||
233 | { | 230 | { |
234 | 231 | ||
235 | tEplKernel Ret; | 232 | tEplKernel Ret; |
@@ -261,9 +258,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ | |||
261 | // | 258 | // |
262 | //--------------------------------------------------------------------------- | 259 | //--------------------------------------------------------------------------- |
263 | 260 | ||
264 | EPLDLLEXPORT tEplKernel PUBLIC EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ | 261 | EPLDLLEXPORT tEplKernel EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p) |
265 | tEplObdInitParam MEM * | ||
266 | pInitParam_p) | ||
267 | { | 262 | { |
268 | 263 | ||
269 | EPL_MCO_DECL_INSTANCE_PTR_LOCAL tEplKernel Ret; | 264 | EPL_MCO_DECL_INSTANCE_PTR_LOCAL tEplKernel Ret; |
@@ -308,7 +303,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ | |||
308 | // | 303 | // |
309 | //--------------------------------------------------------------------------- | 304 | //--------------------------------------------------------------------------- |
310 | #if (EPL_USE_DELETEINST_FUNC != FALSE) | 305 | #if (EPL_USE_DELETEINST_FUNC != FALSE) |
311 | EPLDLLEXPORT tEplKernel PUBLIC EplObdDeleteInstance(EPL_MCO_DECL_INSTANCE_PTR) | 306 | EPLDLLEXPORT tEplKernel EplObdDeleteInstance(EPL_MCO_DECL_INSTANCE_PTR) |
312 | { | 307 | { |
313 | // check for all API function if instance is valid | 308 | // check for all API function if instance is valid |
314 | EPL_MCO_CHECK_INSTANCE_STATE(); | 309 | EPL_MCO_CHECK_INSTANCE_STATE(); |
@@ -341,11 +336,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdDeleteInstance(EPL_MCO_DECL_INSTANCE_PTR) | |||
341 | // | 336 | // |
342 | //--------------------------------------------------------------------------- | 337 | //--------------------------------------------------------------------------- |
343 | 338 | ||
344 | EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntry(EPL_MCO_DECL_INSTANCE_PTR_ | 339 | EPLDLLEXPORT tEplKernel EplObdWriteEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
345 | unsigned int uiIndex_p, | 340 | unsigned int uiSubIndex_p, |
346 | unsigned int uiSubIndex_p, | 341 | void *pSrcData_p, |
347 | void *pSrcData_p, | 342 | tEplObdSize Size_p) |
348 | tEplObdSize Size_p) | ||
349 | { | 343 | { |
350 | 344 | ||
351 | tEplKernel Ret; | 345 | tEplKernel Ret; |
@@ -402,11 +396,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntry(EPL_MCO_DECL_INSTANCE_PTR_ | |||
402 | // | 396 | // |
403 | //--------------------------------------------------------------------------- | 397 | //--------------------------------------------------------------------------- |
404 | 398 | ||
405 | EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntry(EPL_MCO_DECL_INSTANCE_PTR_ | 399 | EPLDLLEXPORT tEplKernel EplObdReadEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
406 | unsigned int uiIndex_p, | 400 | unsigned int uiSubIndex_p, |
407 | unsigned int uiSubIndex_p, | 401 | void *pDstData_p, |
408 | void *pDstData_p, | 402 | tEplObdSize *pSize_p) |
409 | tEplObdSize * pSize_p) | ||
410 | { | 403 | { |
411 | 404 | ||
412 | tEplKernel Ret; | 405 | tEplKernel Ret; |
@@ -487,9 +480,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntry(EPL_MCO_DECL_INSTANCE_PTR_ | |||
487 | // | 480 | // |
488 | //--------------------------------------------------------------------------- | 481 | //--------------------------------------------------------------------------- |
489 | 482 | ||
490 | EPLDLLEXPORT tEplKernel PUBLIC EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ | 483 | EPLDLLEXPORT tEplKernel EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdPart ObdPart_p, |
491 | tEplObdPart ObdPart_p, | 484 | tEplObdDir Direction_p) |
492 | tEplObdDir Direction_p) | ||
493 | { | 485 | { |
494 | 486 | ||
495 | tEplKernel Ret = kEplSuccessful; | 487 | tEplKernel Ret = kEplSuccessful; |
@@ -587,8 +579,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ | |||
587 | // | 579 | // |
588 | //--------------------------------------------------------------------------- | 580 | //--------------------------------------------------------------------------- |
589 | 581 | ||
590 | EPLDLLEXPORT tEplKernel PUBLIC EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ | 582 | EPLDLLEXPORT tEplKernel EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ tEplVarParam MEM *pVarParam_p) |
591 | tEplVarParam MEM * pVarParam_p) | ||
592 | { | 583 | { |
593 | 584 | ||
594 | tEplKernel Ret; | 585 | tEplKernel Ret; |
@@ -674,9 +665,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ | |||
674 | // | 665 | // |
675 | //--------------------------------------------------------------------------- | 666 | //--------------------------------------------------------------------------- |
676 | 667 | ||
677 | EPLDLLEXPORT void *PUBLIC EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ | 668 | EPLDLLEXPORT void *EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
678 | unsigned int uiIndex_p, | 669 | unsigned int uiSubIndex_p) |
679 | unsigned int uiSubIndex_p) | ||
680 | { | 670 | { |
681 | tEplKernel Ret; | 671 | tEplKernel Ret; |
682 | void *pData; | 672 | void *pData; |
@@ -719,8 +709,7 @@ EPLDLLEXPORT void *PUBLIC EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ | |||
719 | // State: | 709 | // State: |
720 | // | 710 | // |
721 | //--------------------------------------------------------------------------- | 711 | //--------------------------------------------------------------------------- |
722 | EPLDLLEXPORT tEplKernel PUBLIC EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ | 712 | EPLDLLEXPORT tEplKernel EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPtr pUserOd_p) |
723 | tEplObdEntryPtr pUserOd_p) | ||
724 | { | 713 | { |
725 | 714 | ||
726 | EPL_MCO_CHECK_INSTANCE_STATE(); | 715 | EPL_MCO_CHECK_INSTANCE_STATE(); |
@@ -749,10 +738,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ | |||
749 | // | 738 | // |
750 | //--------------------------------------------------------------------------- | 739 | //--------------------------------------------------------------------------- |
751 | 740 | ||
752 | EPLDLLEXPORT void PUBLIC EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ | 741 | EPLDLLEXPORT void EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdVarEntry MEM *pVarEntry_p, |
753 | tEplObdVarEntry MEM * pVarEntry_p, | 742 | tEplObdType Type_p, tEplObdSize ObdSize_p) |
754 | tEplObdType Type_p, | ||
755 | tEplObdSize ObdSize_p) | ||
756 | { | 743 | { |
757 | /* | 744 | /* |
758 | #if (EPL_PDO_USE_STATIC_MAPPING == FALSE) | 745 | #if (EPL_PDO_USE_STATIC_MAPPING == FALSE) |
@@ -803,9 +790,8 @@ EPLDLLEXPORT void PUBLIC EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ | |||
803 | // State: | 790 | // State: |
804 | // | 791 | // |
805 | //--------------------------------------------------------------------------- | 792 | //--------------------------------------------------------------------------- |
806 | EPLDLLEXPORT tEplObdSize PUBLIC EplObdGetDataSize(EPL_MCO_DECL_INSTANCE_PTR_ | 793 | EPLDLLEXPORT tEplObdSize EplObdGetDataSize(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
807 | unsigned int uiIndex_p, | 794 | unsigned int uiSubIndex_p) |
808 | unsigned int uiSubIndex_p) | ||
809 | { | 795 | { |
810 | tEplKernel Ret; | 796 | tEplKernel Ret; |
811 | tEplObdSize ObdSize; | 797 | tEplObdSize ObdSize; |
@@ -845,7 +831,7 @@ EPLDLLEXPORT tEplObdSize PUBLIC EplObdGetDataSize(EPL_MCO_DECL_INSTANCE_PTR_ | |||
845 | // State: | 831 | // State: |
846 | // | 832 | // |
847 | //--------------------------------------------------------------------------- | 833 | //--------------------------------------------------------------------------- |
848 | EPLDLLEXPORT unsigned int PUBLIC EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR) | 834 | EPLDLLEXPORT unsigned int EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR) |
849 | { | 835 | { |
850 | tEplKernel Ret; | 836 | tEplKernel Ret; |
851 | tEplObdSize ObdSize; | 837 | tEplObdSize ObdSize; |
@@ -882,9 +868,8 @@ EPLDLLEXPORT unsigned int PUBLIC EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR) | |||
882 | // State: | 868 | // State: |
883 | // | 869 | // |
884 | //--------------------------------------------------------------------------- | 870 | //--------------------------------------------------------------------------- |
885 | EPLDLLEXPORT tEplKernel PUBLIC EplObdSetNodeId(EPL_MCO_DECL_PTR_INSTANCE_PTR_ | 871 | EPLDLLEXPORT tEplKernel EplObdSetNodeId(EPL_MCO_DECL_PTR_INSTANCE_PTR_ unsigned int uiNodeId_p, |
886 | unsigned int uiNodeId_p, | 872 | tEplObdNodeIdType NodeIdType_p) |
887 | tEplObdNodeIdType NodeIdType_p) | ||
888 | { | 873 | { |
889 | tEplKernel Ret; | 874 | tEplKernel Ret; |
890 | tEplObdSize ObdSize; | 875 | tEplObdSize ObdSize; |
@@ -966,10 +951,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdSetNodeId(EPL_MCO_DECL_PTR_INSTANCE_PTR_ | |||
966 | // State: | 951 | // State: |
967 | // | 952 | // |
968 | //--------------------------------------------------------------------------- | 953 | //--------------------------------------------------------------------------- |
969 | EPLDLLEXPORT tEplKernel PUBLIC EplObdIsNumerical(EPL_MCO_DECL_INSTANCE_PTR_ | 954 | EPLDLLEXPORT tEplKernel EplObdIsNumerical(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
970 | unsigned int uiIndex_p, | 955 | unsigned int uiSubIndex_p, |
971 | unsigned int uiSubIndex_p, | 956 | BOOL *pfEntryNumerical_p) |
972 | BOOL * pfEntryNumerical_p) | ||
973 | { | 957 | { |
974 | tEplKernel Ret; | 958 | tEplKernel Ret; |
975 | tEplObdEntryPtr pObdEntry; | 959 | tEplObdEntryPtr pObdEntry; |
@@ -1018,11 +1002,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdIsNumerical(EPL_MCO_DECL_INSTANCE_PTR_ | |||
1018 | // State: | 1002 | // State: |
1019 | // | 1003 | // |
1020 | //--------------------------------------------------------------------------- | 1004 | //--------------------------------------------------------------------------- |
1021 | EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ | 1005 | EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
1022 | unsigned int uiIndex_p, | 1006 | unsigned int uiSubIndex_p, |
1023 | unsigned int uiSubIndex_p, | 1007 | void *pDstData_p, |
1024 | void *pDstData_p, | 1008 | tEplObdSize *pSize_p) |
1025 | tEplObdSize * pSize_p) | ||
1026 | { | 1009 | { |
1027 | tEplKernel Ret; | 1010 | tEplKernel Ret; |
1028 | tEplObdEntryPtr pObdEntry; | 1011 | tEplObdEntryPtr pObdEntry; |
@@ -1199,11 +1182,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ | |||
1199 | // State: | 1182 | // State: |
1200 | // | 1183 | // |
1201 | //--------------------------------------------------------------------------- | 1184 | //--------------------------------------------------------------------------- |
1202 | EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ | 1185 | EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
1203 | unsigned int uiIndex_p, | 1186 | unsigned int uiSubIndex_p, |
1204 | unsigned int uiSubIndex_p, | 1187 | void *pSrcData_p, |
1205 | void *pSrcData_p, | 1188 | tEplObdSize Size_p) |
1206 | tEplObdSize Size_p) | ||
1207 | { | 1189 | { |
1208 | tEplKernel Ret; | 1190 | tEplKernel Ret; |
1209 | tEplObdEntryPtr pObdEntry; | 1191 | tEplObdEntryPtr pObdEntry; |
@@ -1345,10 +1327,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ | |||
1345 | // State: | 1327 | // State: |
1346 | // | 1328 | // |
1347 | //--------------------------------------------------------------------------- | 1329 | //--------------------------------------------------------------------------- |
1348 | EPLDLLEXPORT tEplKernel PUBLIC EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ | 1330 | EPLDLLEXPORT tEplKernel EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
1349 | unsigned int uiIndex_p, | 1331 | unsigned int uiSubIndex_p, |
1350 | unsigned int uiSubIndex_p, | 1332 | tEplObdAccess *pAccessTyp_p) |
1351 | tEplObdAccess * pAccessTyp_p) | ||
1352 | { | 1333 | { |
1353 | tEplKernel Ret; | 1334 | tEplKernel Ret; |
1354 | tEplObdEntryPtr pObdEntry; | 1335 | tEplObdEntryPtr pObdEntry; |
@@ -1388,10 +1369,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ | |||
1388 | // | 1369 | // |
1389 | //--------------------------------------------------------------------------- | 1370 | //--------------------------------------------------------------------------- |
1390 | 1371 | ||
1391 | tEplKernel PUBLIC EplObdSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ | 1372 | tEplKernel EplObdSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
1392 | unsigned int uiIndex_p, | 1373 | unsigned int uiSubindex_p, |
1393 | unsigned int uiSubindex_p, | 1374 | tEplObdVarEntry MEM **ppVarEntry_p) |
1394 | tEplObdVarEntry MEM ** ppVarEntry_p) | ||
1395 | { | 1375 | { |
1396 | 1376 | ||
1397 | tEplKernel Ret; | 1377 | tEplKernel Ret; |
@@ -1870,16 +1850,15 @@ static tEplKernel EplObdCheckObjectRange(tEplObdSubEntryPtr pSubindexEntry_p, | |||
1870 | // | 1850 | // |
1871 | //--------------------------------------------------------------------------- | 1851 | //--------------------------------------------------------------------------- |
1872 | 1852 | ||
1873 | static tEplKernel PUBLIC EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ | 1853 | static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
1874 | unsigned int uiIndex_p, | 1854 | unsigned int uiSubIndex_p, |
1875 | unsigned int uiSubIndex_p, | 1855 | void *pSrcData_p, |
1876 | void *pSrcData_p, | 1856 | void **ppDstData_p, |
1877 | void **ppDstData_p, | 1857 | tEplObdSize Size_p, |
1878 | tEplObdSize Size_p, | 1858 | tEplObdEntryPtr *ppObdEntry_p, |
1879 | tEplObdEntryPtr * ppObdEntry_p, | 1859 | tEplObdSubEntryPtr *ppSubEntry_p, |
1880 | tEplObdSubEntryPtr * ppSubEntry_p, | 1860 | tEplObdCbParam MEM *pCbParam_p, |
1881 | tEplObdCbParam MEM * pCbParam_p, | 1861 | tEplObdSize *pObdSize_p) |
1882 | tEplObdSize * pObdSize_p) | ||
1883 | { | 1862 | { |
1884 | 1863 | ||
1885 | tEplKernel Ret; | 1864 | tEplKernel Ret; |
@@ -2064,13 +2043,12 @@ static tEplKernel PUBLIC EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ | |||
2064 | // | 2043 | // |
2065 | //--------------------------------------------------------------------------- | 2044 | //--------------------------------------------------------------------------- |
2066 | 2045 | ||
2067 | static tEplKernel PUBLIC EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ | 2046 | static tEplKernel EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPtr pObdEntry_p, |
2068 | tEplObdEntryPtr pObdEntry_p, | 2047 | tEplObdSubEntryPtr pSubEntry_p, |
2069 | tEplObdSubEntryPtr pSubEntry_p, | 2048 | tEplObdCbParam MEM *pCbParam_p, |
2070 | tEplObdCbParam MEM * pCbParam_p, | 2049 | void *pSrcData_p, |
2071 | void *pSrcData_p, | 2050 | void *pDstData_p, |
2072 | void *pDstData_p, | 2051 | tEplObdSize ObdSize_p) |
2073 | tEplObdSize ObdSize_p) | ||
2074 | { | 2052 | { |
2075 | 2053 | ||
2076 | tEplKernel Ret; | 2054 | tEplKernel Ret; |
@@ -2762,9 +2740,7 @@ static tEplKernel EplObdGetSubindexIntern(tEplObdEntryPtr pObdEntry_p, | |||
2762 | // | 2740 | // |
2763 | //--------------------------------------------------------------------------- | 2741 | //--------------------------------------------------------------------------- |
2764 | #if (EPL_OBD_USE_STORE_RESTORE != FALSE) | 2742 | #if (EPL_OBD_USE_STORE_RESTORE != FALSE) |
2765 | EPLDLLEXPORT tEplKernel PUBLIC | 2743 | EPLDLLEXPORT tEplKernel EplObdSetStoreLoadObjCallback(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdStoreLoadObjCallback fpCallback_p) |
2766 | EplObdSetStoreLoadObjCallback(EPL_MCO_DECL_INSTANCE_PTR_ | ||
2767 | tEplObdStoreLoadObjCallback fpCallback_p) | ||
2768 | { | 2744 | { |
2769 | 2745 | ||
2770 | EPL_MCO_CHECK_INSTANCE_STATE(); | 2746 | EPL_MCO_CHECK_INSTANCE_STATE(); |
diff --git a/drivers/staging/epl/EplObd.h b/drivers/staging/epl/EplObd.h index 88cc11e34cc..6e450d84be8 100644 --- a/drivers/staging/epl/EplObd.h +++ b/drivers/staging/epl/EplObd.h | |||
@@ -283,8 +283,7 @@ typedef enum { | |||
283 | kVarValidAll = 0x03 // currently only size and data are implemented and used | 283 | kVarValidAll = 0x03 // currently only size and data are implemented and used |
284 | } tEplVarParamValid; | 284 | } tEplVarParamValid; |
285 | 285 | ||
286 | typedef tEplKernel(PUBLIC ROM * tEplVarCallback) (CCM_DECL_INSTANCE_HDL_ | 286 | typedef tEplKernel(ROM *tEplVarCallback) (CCM_DECL_INSTANCE_HDL_ void *pParam_p); |
287 | void *pParam_p); | ||
288 | 287 | ||
289 | typedef struct { | 288 | typedef struct { |
290 | tEplVarParamValid m_ValidFlag; | 289 | tEplVarParamValid m_ValidFlag; |
@@ -376,9 +375,7 @@ typedef struct { | |||
376 | } tEplObdCbParam; | 375 | } tEplObdCbParam; |
377 | 376 | ||
378 | // define type for callback function: pParam_p points to tEplObdCbParam | 377 | // define type for callback function: pParam_p points to tEplObdCbParam |
379 | typedef tEplKernel(PUBLIC ROM * tEplObdCallback) (CCM_DECL_INSTANCE_HDL_ | 378 | typedef tEplKernel(ROM *tEplObdCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbParam MEM * pParam_p); |
380 | tEplObdCbParam MEM * | ||
381 | pParam_p); | ||
382 | 379 | ||
383 | // do not change the order for this struct!!! | 380 | // do not change the order for this struct!!! |
384 | 381 | ||
@@ -422,14 +419,10 @@ typedef struct { | |||
422 | 419 | ||
423 | } tEplObdCbStoreParam; | 420 | } tEplObdCbStoreParam; |
424 | 421 | ||
425 | typedef tEplKernel(PUBLIC ROM * tInitTabEntryCallback) (void MEM * pTabEntry_p, | 422 | typedef tEplKernel(ROM *tInitTabEntryCallback) (void MEM * pTabEntry_p, |
426 | unsigned int | 423 | unsigned int uiObjIndex_p); |
427 | uiObjIndex_p); | ||
428 | 424 | ||
429 | typedef tEplKernel(PUBLIC ROM * | 425 | typedef tEplKernel(ROM * tEplObdStoreLoadObjCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbStoreParam MEM *pCbStoreParam_p); |
430 | tEplObdStoreLoadObjCallback) (CCM_DECL_INSTANCE_HDL_ | ||
431 | tEplObdCbStoreParam MEM * | ||
432 | pCbStoreParam_p); | ||
433 | 426 | ||
434 | // ------------------------------------------------------------------------- | 427 | // ------------------------------------------------------------------------- |
435 | // this stucture is used for parameters for function ObdInitModuleTab() | 428 | // this stucture is used for parameters for function ObdInitModuleTab() |
diff --git a/drivers/staging/epl/EplObdu.c b/drivers/staging/epl/EplObdu.c index 218d152897c..60f590bfbea 100644 --- a/drivers/staging/epl/EplObdu.c +++ b/drivers/staging/epl/EplObdu.c | |||
@@ -121,10 +121,9 @@ | |||
121 | // State: | 121 | // State: |
122 | // | 122 | // |
123 | //--------------------------------------------------------------------------- | 123 | //--------------------------------------------------------------------------- |
124 | EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntry(unsigned int uiIndex_p, | 124 | EPLDLLEXPORT tEplKernel EplObduWriteEntry(unsigned int uiIndex_p, |
125 | unsigned int uiSubIndex_p, | 125 | unsigned int uiSubIndex_p, |
126 | void *pSrcData_p, | 126 | void *pSrcData_p, tEplObdSize Size_p) |
127 | tEplObdSize Size_p) | ||
128 | { | 127 | { |
129 | tEplKernel Ret; | 128 | tEplKernel Ret; |
130 | 129 | ||
@@ -153,10 +152,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntry(unsigned int uiIndex_p, | |||
153 | // State: | 152 | // State: |
154 | // | 153 | // |
155 | //--------------------------------------------------------------------------- | 154 | //--------------------------------------------------------------------------- |
156 | EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntry(unsigned int uiIndex_p, | 155 | EPLDLLEXPORT tEplKernel EplObduReadEntry(unsigned int uiIndex_p, |
157 | unsigned int uiSubIndex_p, | 156 | unsigned int uiSubIndex_p, |
158 | void *pDstData_p, | 157 | void *pDstData_p, |
159 | tEplObdSize * pSize_p) | 158 | tEplObdSize *pSize_p) |
160 | { | 159 | { |
161 | tEplKernel Ret; | 160 | tEplKernel Ret; |
162 | 161 | ||
@@ -179,8 +178,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntry(unsigned int uiIndex_p, | |||
179 | // State: | 178 | // State: |
180 | // | 179 | // |
181 | //--------------------------------------------------------------------------- | 180 | //--------------------------------------------------------------------------- |
182 | EPLDLLEXPORT tEplKernel PUBLIC EplObduAccessOdPart(tEplObdPart ObdPart_p, | 181 | EPLDLLEXPORT tEplKernel EplObduAccessOdPart(tEplObdPart ObdPart_p, |
183 | tEplObdDir Direction_p) | 182 | tEplObdDir Direction_p) |
184 | { | 183 | { |
185 | tEplKernel Ret; | 184 | tEplKernel Ret; |
186 | 185 | ||
@@ -202,7 +201,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduAccessOdPart(tEplObdPart ObdPart_p, | |||
202 | // State: | 201 | // State: |
203 | // | 202 | // |
204 | //--------------------------------------------------------------------------- | 203 | //--------------------------------------------------------------------------- |
205 | EPLDLLEXPORT tEplKernel PUBLIC EplObduDefineVar(tEplVarParam MEM * pVarParam_p) | 204 | EPLDLLEXPORT tEplKernel EplObduDefineVar(tEplVarParam MEM *pVarParam_p) |
206 | { | 205 | { |
207 | tEplKernel Ret; | 206 | tEplKernel Ret; |
208 | 207 | ||
@@ -226,8 +225,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduDefineVar(tEplVarParam MEM * pVarParam_p) | |||
226 | // State: | 225 | // State: |
227 | // | 226 | // |
228 | //--------------------------------------------------------------------------- | 227 | //--------------------------------------------------------------------------- |
229 | EPLDLLEXPORT void *PUBLIC EplObduGetObjectDataPtr(unsigned int uiIndex_p, | 228 | EPLDLLEXPORT void *EplObduGetObjectDataPtr(unsigned int uiIndex_p, |
230 | unsigned int uiSubIndex_p) | 229 | unsigned int uiSubIndex_p) |
231 | { | 230 | { |
232 | void *pData; | 231 | void *pData; |
233 | 232 | ||
@@ -250,7 +249,7 @@ EPLDLLEXPORT void *PUBLIC EplObduGetObjectDataPtr(unsigned int uiIndex_p, | |||
250 | // | 249 | // |
251 | //--------------------------------------------------------------------------- | 250 | //--------------------------------------------------------------------------- |
252 | #if (defined (EPL_OBD_USER_OD) && (EPL_OBD_USER_OD != FALSE)) | 251 | #if (defined (EPL_OBD_USER_OD) && (EPL_OBD_USER_OD != FALSE)) |
253 | EPLDLLEXPORT tEplKernel PUBLIC EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p) | 252 | EPLDLLEXPORT tEplKernel EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p) |
254 | { | 253 | { |
255 | tEplKernel Ret; | 254 | tEplKernel Ret; |
256 | 255 | ||
@@ -275,9 +274,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p) | |||
275 | // State: | 274 | // State: |
276 | // | 275 | // |
277 | //--------------------------------------------------------------------------- | 276 | //--------------------------------------------------------------------------- |
278 | EPLDLLEXPORT void PUBLIC EplObduInitVarEntry(tEplObdVarEntry MEM * pVarEntry_p, | 277 | EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry MEM *pVarEntry_p, |
279 | BYTE bType_p, | 278 | BYTE bType_p, tEplObdSize ObdSize_p) |
280 | tEplObdSize ObdSize_p) | ||
281 | { | 279 | { |
282 | EplObduCalInitVarEntry(pVarEntry_p, bType_p, ObdSize_p); | 280 | EplObduCalInitVarEntry(pVarEntry_p, bType_p, ObdSize_p); |
283 | } | 281 | } |
@@ -299,8 +297,8 @@ EPLDLLEXPORT void PUBLIC EplObduInitVarEntry(tEplObdVarEntry MEM * pVarEntry_p, | |||
299 | // State: | 297 | // State: |
300 | // | 298 | // |
301 | //--------------------------------------------------------------------------- | 299 | //--------------------------------------------------------------------------- |
302 | EPLDLLEXPORT tEplObdSize PUBLIC EplObduGetDataSize(unsigned int uiIndex_p, | 300 | EPLDLLEXPORT tEplObdSize EplObduGetDataSize(unsigned int uiIndex_p, |
303 | unsigned int uiSubIndex_p) | 301 | unsigned int uiSubIndex_p) |
304 | { | 302 | { |
305 | tEplObdSize Size; | 303 | tEplObdSize Size; |
306 | 304 | ||
@@ -323,7 +321,7 @@ EPLDLLEXPORT tEplObdSize PUBLIC EplObduGetDataSize(unsigned int uiIndex_p, | |||
323 | // State: | 321 | // State: |
324 | // | 322 | // |
325 | //--------------------------------------------------------------------------- | 323 | //--------------------------------------------------------------------------- |
326 | EPLDLLEXPORT unsigned int PUBLIC EplObduGetNodeId() | 324 | EPLDLLEXPORT unsigned int EplObduGetNodeId(void) |
327 | { | 325 | { |
328 | unsigned int uiNodeId; | 326 | unsigned int uiNodeId; |
329 | 327 | ||
@@ -347,8 +345,8 @@ EPLDLLEXPORT unsigned int PUBLIC EplObduGetNodeId() | |||
347 | // State: | 345 | // State: |
348 | // | 346 | // |
349 | //--------------------------------------------------------------------------- | 347 | //--------------------------------------------------------------------------- |
350 | EPLDLLEXPORT tEplKernel PUBLIC EplObduSetNodeId(unsigned int uiNodeId_p, | 348 | EPLDLLEXPORT tEplKernel EplObduSetNodeId(unsigned int uiNodeId_p, |
351 | tEplObdNodeIdType NodeIdType_p) | 349 | tEplObdNodeIdType NodeIdType_p) |
352 | { | 350 | { |
353 | tEplKernel Ret; | 351 | tEplKernel Ret; |
354 | 352 | ||
@@ -373,10 +371,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduSetNodeId(unsigned int uiNodeId_p, | |||
373 | // State: | 371 | // State: |
374 | // | 372 | // |
375 | //--------------------------------------------------------------------------- | 373 | //--------------------------------------------------------------------------- |
376 | EPLDLLEXPORT tEplKernel PUBLIC EplObduGetAccessType(unsigned int uiIndex_p, | 374 | EPLDLLEXPORT tEplKernel EplObduGetAccessType(unsigned int uiIndex_p, |
377 | unsigned int uiSubIndex_p, | 375 | unsigned int uiSubIndex_p, |
378 | tEplObdAccess * | 376 | tEplObdAccess *pAccessTyp_p) |
379 | pAccessTyp_p) | ||
380 | { | 377 | { |
381 | tEplObdAccess AccessType; | 378 | tEplObdAccess AccessType; |
382 | 379 | ||
@@ -410,10 +407,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduGetAccessType(unsigned int uiIndex_p, | |||
410 | // State: | 407 | // State: |
411 | // | 408 | // |
412 | //--------------------------------------------------------------------------- | 409 | //--------------------------------------------------------------------------- |
413 | EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntryToLe(unsigned int uiIndex_p, | 410 | EPLDLLEXPORT tEplKernel EplObduReadEntryToLe(unsigned int uiIndex_p, |
414 | unsigned int uiSubIndex_p, | 411 | unsigned int uiSubIndex_p, |
415 | void *pDstData_p, | 412 | void *pDstData_p, |
416 | tEplObdSize * pSize_p) | 413 | tEplObdSize *pSize_p) |
417 | { | 414 | { |
418 | tEplKernel Ret; | 415 | tEplKernel Ret; |
419 | 416 | ||
@@ -445,11 +442,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntryToLe(unsigned int uiIndex_p, | |||
445 | // State: | 442 | // State: |
446 | // | 443 | // |
447 | //--------------------------------------------------------------------------- | 444 | //--------------------------------------------------------------------------- |
448 | EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntryFromLe(unsigned int uiIndex_p, | 445 | EPLDLLEXPORT tEplKernel EplObduWriteEntryFromLe(unsigned int uiIndex_p, |
449 | unsigned int | 446 | unsigned int uiSubIndex_p, |
450 | uiSubIndex_p, | 447 | void *pSrcData_p, |
451 | void *pSrcData_p, | 448 | tEplObdSize Size_p) |
452 | tEplObdSize Size_p) | ||
453 | { | 449 | { |
454 | tEplKernel Ret; | 450 | tEplKernel Ret; |
455 | 451 | ||
@@ -475,11 +471,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntryFromLe(unsigned int uiIndex_p, | |||
475 | // State: | 471 | // State: |
476 | // | 472 | // |
477 | //--------------------------------------------------------------------------- | 473 | //--------------------------------------------------------------------------- |
478 | EPLDLLEXPORT tEplKernel PUBLIC EplObduSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ | 474 | EPLDLLEXPORT tEplKernel EplObduSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
479 | unsigned int uiIndex_p, | 475 | unsigned int uiSubindex_p, |
480 | unsigned int uiSubindex_p, | 476 | tEplObdVarEntry MEM **ppVarEntry_p) |
481 | tEplObdVarEntry MEM ** | ||
482 | ppVarEntry_p) | ||
483 | { | 477 | { |
484 | tEplKernel Ret; | 478 | tEplKernel Ret; |
485 | 479 | ||
diff --git a/drivers/staging/epl/EplObduCal.c b/drivers/staging/epl/EplObduCal.c index 85b3df0886b..980d382d49a 100644 --- a/drivers/staging/epl/EplObduCal.c +++ b/drivers/staging/epl/EplObduCal.c | |||
@@ -121,10 +121,10 @@ | |||
121 | // State: | 121 | // State: |
122 | // | 122 | // |
123 | //--------------------------------------------------------------------------- | 123 | //--------------------------------------------------------------------------- |
124 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntry(unsigned int uiIndex_p, | 124 | EPLDLLEXPORT tEplKernel EplObduCalWriteEntry(unsigned int uiIndex_p, |
125 | unsigned int uiSubIndex_p, | 125 | unsigned int uiSubIndex_p, |
126 | void *pSrcData_p, | 126 | void *pSrcData_p, |
127 | tEplObdSize Size_p) | 127 | tEplObdSize Size_p) |
128 | { | 128 | { |
129 | tEplKernel Ret; | 129 | tEplKernel Ret; |
130 | 130 | ||
@@ -155,10 +155,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntry(unsigned int uiIndex_p, | |||
155 | // State: | 155 | // State: |
156 | // | 156 | // |
157 | //--------------------------------------------------------------------------- | 157 | //--------------------------------------------------------------------------- |
158 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntry(unsigned int uiIndex_p, | 158 | EPLDLLEXPORT tEplKernel EplObduCalReadEntry(unsigned int uiIndex_p, |
159 | unsigned int uiSubIndex_p, | 159 | unsigned int uiSubIndex_p, |
160 | void *pDstData_p, | 160 | void *pDstData_p, |
161 | tEplObdSize * pSize_p) | 161 | tEplObdSize *pSize_p) |
162 | { | 162 | { |
163 | tEplKernel Ret; | 163 | tEplKernel Ret; |
164 | 164 | ||
@@ -185,8 +185,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntry(unsigned int uiIndex_p, | |||
185 | // State: | 185 | // State: |
186 | // | 186 | // |
187 | //--------------------------------------------------------------------------- | 187 | //--------------------------------------------------------------------------- |
188 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalAccessOdPart(tEplObdPart ObdPart_p, | 188 | EPLDLLEXPORT tEplKernel EplObduCalAccessOdPart(tEplObdPart ObdPart_p, |
189 | tEplObdDir Direction_p) | 189 | tEplObdDir Direction_p) |
190 | { | 190 | { |
191 | tEplKernel Ret; | 191 | tEplKernel Ret; |
192 | 192 | ||
@@ -212,8 +212,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalAccessOdPart(tEplObdPart ObdPart_p, | |||
212 | // State: | 212 | // State: |
213 | // | 213 | // |
214 | //--------------------------------------------------------------------------- | 214 | //--------------------------------------------------------------------------- |
215 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalDefineVar(tEplVarParam MEM * | 215 | EPLDLLEXPORT tEplKernel EplObduCalDefineVar(tEplVarParam MEM *pVarParam_p) |
216 | pVarParam_p) | ||
217 | { | 216 | { |
218 | tEplKernel Ret; | 217 | tEplKernel Ret; |
219 | 218 | ||
@@ -240,8 +239,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalDefineVar(tEplVarParam MEM * | |||
240 | // State: | 239 | // State: |
241 | // | 240 | // |
242 | //--------------------------------------------------------------------------- | 241 | //--------------------------------------------------------------------------- |
243 | EPLDLLEXPORT void *PUBLIC EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, | 242 | EPLDLLEXPORT void *EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, |
244 | unsigned int uiSubIndex_p) | 243 | unsigned int uiSubIndex_p) |
245 | { | 244 | { |
246 | void *pData; | 245 | void *pData; |
247 | 246 | ||
@@ -268,8 +267,7 @@ EPLDLLEXPORT void *PUBLIC EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, | |||
268 | // | 267 | // |
269 | //--------------------------------------------------------------------------- | 268 | //--------------------------------------------------------------------------- |
270 | #if (defined (EPL_OBD_USER_OD) && (EPL_OBD_USER_OD != FALSE)) | 269 | #if (defined (EPL_OBD_USER_OD) && (EPL_OBD_USER_OD != FALSE)) |
271 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalRegisterUserOd(tEplObdEntryPtr | 270 | EPLDLLEXPORT tEplKernel EplObduCalRegisterUserOd(tEplObdEntryPtr pUserOd_p) |
272 | pUserOd_p) | ||
273 | { | 271 | { |
274 | tEplKernel Ret; | 272 | tEplKernel Ret; |
275 | 273 | ||
@@ -298,9 +296,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalRegisterUserOd(tEplObdEntryPtr | |||
298 | // State: | 296 | // State: |
299 | // | 297 | // |
300 | //--------------------------------------------------------------------------- | 298 | //--------------------------------------------------------------------------- |
301 | EPLDLLEXPORT void PUBLIC EplObduCalInitVarEntry(tEplObdVarEntry MEM * | 299 | EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry MEM *pVarEntry_p, |
302 | pVarEntry_p, BYTE bType_p, | 300 | BYTE bType_p, tEplObdSize ObdSize_p) |
303 | tEplObdSize ObdSize_p) | ||
304 | { | 301 | { |
305 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) | 302 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) |
306 | EplObdInitVarEntry(pVarEntry_p, bType_p, ObdSize_p); | 303 | EplObdInitVarEntry(pVarEntry_p, bType_p, ObdSize_p); |
@@ -324,8 +321,8 @@ EPLDLLEXPORT void PUBLIC EplObduCalInitVarEntry(tEplObdVarEntry MEM * | |||
324 | // State: | 321 | // State: |
325 | // | 322 | // |
326 | //--------------------------------------------------------------------------- | 323 | //--------------------------------------------------------------------------- |
327 | EPLDLLEXPORT tEplObdSize PUBLIC EplObduCalGetDataSize(unsigned int uiIndex_p, | 324 | EPLDLLEXPORT tEplObdSize EplObduCalGetDataSize(unsigned int uiIndex_p, |
328 | unsigned int uiSubIndex_p) | 325 | unsigned int uiSubIndex_p) |
329 | { | 326 | { |
330 | tEplObdSize Size; | 327 | tEplObdSize Size; |
331 | 328 | ||
@@ -352,7 +349,7 @@ EPLDLLEXPORT tEplObdSize PUBLIC EplObduCalGetDataSize(unsigned int uiIndex_p, | |||
352 | // State: | 349 | // State: |
353 | // | 350 | // |
354 | //--------------------------------------------------------------------------- | 351 | //--------------------------------------------------------------------------- |
355 | EPLDLLEXPORT unsigned int PUBLIC EplObduCalGetNodeId() | 352 | EPLDLLEXPORT unsigned int EplObduCalGetNodeId(void) |
356 | { | 353 | { |
357 | unsigned int uiNodeId; | 354 | unsigned int uiNodeId; |
358 | 355 | ||
@@ -380,9 +377,8 @@ EPLDLLEXPORT unsigned int PUBLIC EplObduCalGetNodeId() | |||
380 | // State: | 377 | // State: |
381 | // | 378 | // |
382 | //--------------------------------------------------------------------------- | 379 | //--------------------------------------------------------------------------- |
383 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalSetNodeId(unsigned int uiNodeId_p, | 380 | EPLDLLEXPORT tEplKernel EplObduCalSetNodeId(unsigned int uiNodeId_p, |
384 | tEplObdNodeIdType | 381 | tEplObdNodeIdType NodeIdType_p) |
385 | NodeIdType_p) | ||
386 | { | 382 | { |
387 | tEplKernel Ret; | 383 | tEplKernel Ret; |
388 | 384 | ||
@@ -411,11 +407,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalSetNodeId(unsigned int uiNodeId_p, | |||
411 | // State: | 407 | // State: |
412 | // | 408 | // |
413 | //--------------------------------------------------------------------------- | 409 | //--------------------------------------------------------------------------- |
414 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalGetAccessType(unsigned int uiIndex_p, | 410 | EPLDLLEXPORT tEplKernel EplObduCalGetAccessType(unsigned int uiIndex_p, |
415 | unsigned int | 411 | unsigned int uiSubIndex_p, |
416 | uiSubIndex_p, | 412 | tEplObdAccess *pAccessTyp_p) |
417 | tEplObdAccess * | ||
418 | pAccessTyp_p) | ||
419 | { | 413 | { |
420 | tEplObdAccess AccesType; | 414 | tEplObdAccess AccesType; |
421 | 415 | ||
@@ -447,11 +441,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalGetAccessType(unsigned int uiIndex_p, | |||
447 | // State: | 441 | // State: |
448 | // | 442 | // |
449 | //--------------------------------------------------------------------------- | 443 | //--------------------------------------------------------------------------- |
450 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntryToLe(unsigned int uiIndex_p, | 444 | EPLDLLEXPORT tEplKernel EplObduCalReadEntryToLe(unsigned int uiIndex_p, |
451 | unsigned int | 445 | unsigned int uiSubIndex_p, |
452 | uiSubIndex_p, | 446 | void *pDstData_p, |
453 | void *pDstData_p, | 447 | tEplObdSize *pSize_p) |
454 | tEplObdSize * pSize_p) | ||
455 | { | 448 | { |
456 | tEplKernel Ret; | 449 | tEplKernel Ret; |
457 | 450 | ||
@@ -481,12 +474,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntryToLe(unsigned int uiIndex_p, | |||
481 | // State: | 474 | // State: |
482 | // | 475 | // |
483 | //--------------------------------------------------------------------------- | 476 | //--------------------------------------------------------------------------- |
484 | EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntryFromLe(unsigned int | 477 | EPLDLLEXPORT tEplKernel EplObduCalWriteEntryFromLe(unsigned int uiIndex_p, |
485 | uiIndex_p, | 478 | unsigned int uiSubIndex_p, |
486 | unsigned int | 479 | void *pSrcData_p, |
487 | uiSubIndex_p, | 480 | tEplObdSize Size_p) |
488 | void *pSrcData_p, | ||
489 | tEplObdSize Size_p) | ||
490 | { | 481 | { |
491 | tEplKernel Ret; | 482 | tEplKernel Ret; |
492 | 483 | ||
@@ -514,10 +505,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntryFromLe(unsigned int | |||
514 | // State: | 505 | // State: |
515 | // | 506 | // |
516 | //--------------------------------------------------------------------------- | 507 | //--------------------------------------------------------------------------- |
517 | EPLDLLEXPORT tEplKernel PUBLIC | 508 | EPLDLLEXPORT tEplKernel EplObduCalSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
518 | EplObduCalSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, | 509 | unsigned int uiSubindex_p, |
519 | unsigned int uiSubindex_p, | 510 | tEplObdVarEntry MEM **ppVarEntry_p) |
520 | tEplObdVarEntry MEM ** ppVarEntry_p) | ||
521 | { | 511 | { |
522 | tEplKernel Ret; | 512 | tEplKernel Ret; |
523 | 513 | ||
diff --git a/drivers/staging/epl/EplObjDef.h b/drivers/staging/epl/EplObjDef.h index 7713125a3e8..4a6fac56ef6 100644 --- a/drivers/staging/epl/EplObjDef.h +++ b/drivers/staging/epl/EplObjDef.h | |||
@@ -165,8 +165,7 @@ | |||
165 | // | 165 | // |
166 | // ---------------------------------------------------------------------------- | 166 | // ---------------------------------------------------------------------------- |
167 | 167 | ||
168 | EPLDLLEXPORT tEplKernel PUBLIC EPL_OBD_INIT_RAM_NAME(tEplObdInitParam MEM * | 168 | EPLDLLEXPORT tEplKernel EPL_OBD_INIT_RAM_NAME(tEplObdInitParam MEM *pInitParam_p) |
169 | pInitParam_p) | ||
170 | { | 169 | { |
171 | 170 | ||
172 | tEplObdInitParam MEM *pInitParam = pInitParam_p; | 171 | tEplObdInitParam MEM *pInitParam = pInitParam_p; |
diff --git a/drivers/staging/epl/EplPdou.c b/drivers/staging/epl/EplPdou.c index e7b10653a0e..dfaabb4b949 100644 --- a/drivers/staging/epl/EplPdou.c +++ b/drivers/staging/epl/EplPdou.c | |||
@@ -226,7 +226,7 @@ tEplKernel EplPdouDelInstance(void) | |||
226 | // | 226 | // |
227 | //--------------------------------------------------------------------------- | 227 | //--------------------------------------------------------------------------- |
228 | 228 | ||
229 | tEplKernel PUBLIC EplPdouCbObdAccess(tEplObdCbParam MEM * pParam_p) | 229 | tEplKernel EplPdouCbObdAccess(tEplObdCbParam MEM *pParam_p) |
230 | { | 230 | { |
231 | tEplKernel Ret = kEplSuccessful; | 231 | tEplKernel Ret = kEplSuccessful; |
232 | unsigned int uiPdoId; | 232 | unsigned int uiPdoId; |
diff --git a/drivers/staging/epl/EplSdo.h b/drivers/staging/epl/EplSdo.h index 1cb3f2de4a3..a09d1eb0539 100644 --- a/drivers/staging/epl/EplSdo.h +++ b/drivers/staging/epl/EplSdo.h | |||
@@ -116,20 +116,18 @@ typedef unsigned int tEplSdoConHdl; | |||
116 | 116 | ||
117 | // callback function pointer for Protocol Abstraction Layer to call | 117 | // callback function pointer for Protocol Abstraction Layer to call |
118 | // asynchronuus SDO Sequence Layer | 118 | // asynchronuus SDO Sequence Layer |
119 | typedef tEplKernel(PUBLIC * tEplSequLayerReceiveCb) (tEplSdoConHdl ConHdl_p, | 119 | typedef tEplKernel(*tEplSequLayerReceiveCb) (tEplSdoConHdl ConHdl_p, |
120 | tEplAsySdoSeq * | 120 | tEplAsySdoSeq *pSdoSeqData_p, |
121 | pSdoSeqData_p, | 121 | unsigned int uiDataSize_p); |
122 | unsigned int uiDataSize_p); | ||
123 | 122 | ||
124 | // handle between asynchronuus SDO Sequence Layer and SDO Command layer | 123 | // handle between asynchronuus SDO Sequence Layer and SDO Command layer |
125 | typedef unsigned int tEplSdoSeqConHdl; | 124 | typedef unsigned int tEplSdoSeqConHdl; |
126 | 125 | ||
127 | // callback function pointer for asynchronuus SDO Sequence Layer to call | 126 | // callback function pointer for asynchronuus SDO Sequence Layer to call |
128 | // SDO Command layer for received data | 127 | // SDO Command layer for received data |
129 | typedef tEplKernel(PUBLIC * | 128 | typedef tEplKernel(* tEplSdoComReceiveCb) (tEplSdoSeqConHdl SdoSeqConHdl_p, |
130 | tEplSdoComReceiveCb) (tEplSdoSeqConHdl SdoSeqConHdl_p, | 129 | tEplAsySdoCom *pAsySdoCom_p, |
131 | tEplAsySdoCom * pAsySdoCom_p, | 130 | unsigned int uiDataSize_p); |
132 | unsigned int uiDataSize_p); | ||
133 | 131 | ||
134 | // status of connection | 132 | // status of connection |
135 | typedef enum { | 133 | typedef enum { |
@@ -143,9 +141,8 @@ typedef enum { | |||
143 | 141 | ||
144 | // callback function pointer for asynchronuus SDO Sequence Layer to call | 142 | // callback function pointer for asynchronuus SDO Sequence Layer to call |
145 | // SDO Command layer for connection status | 143 | // SDO Command layer for connection status |
146 | typedef tEplKernel(PUBLIC * tEplSdoComConCb) (tEplSdoSeqConHdl SdoSeqConHdl_p, | 144 | typedef tEplKernel(* tEplSdoComConCb) (tEplSdoSeqConHdl SdoSeqConHdl_p, |
147 | tEplAsySdoConState | 145 | tEplAsySdoConState AsySdoConState_p); |
148 | AsySdoConState_p); | ||
149 | 146 | ||
150 | // handle between SDO Command layer and application | 147 | // handle between SDO Command layer and application |
151 | typedef unsigned int tEplSdoComConHdl; | 148 | typedef unsigned int tEplSdoComConHdl; |
@@ -221,8 +218,7 @@ typedef struct { | |||
221 | } tEplSdoComFinished; | 218 | } tEplSdoComFinished; |
222 | 219 | ||
223 | // callback function pointer to inform application about connection | 220 | // callback function pointer to inform application about connection |
224 | typedef tEplKernel(PUBLIC * tEplSdoFinishedCb) (tEplSdoComFinished * | 221 | typedef tEplKernel(* tEplSdoFinishedCb) (tEplSdoComFinished *pSdoComFinished_p); |
225 | pSdoComFinished_p); | ||
226 | 222 | ||
227 | // structure to init SDO transfer to Read or Write by Index | 223 | // structure to init SDO transfer to Read or Write by Index |
228 | typedef struct { | 224 | typedef struct { |
diff --git a/drivers/staging/epl/EplSdoAsndu.c b/drivers/staging/epl/EplSdoAsndu.c index 05a00c9a731..a6596a51f1e 100644 --- a/drivers/staging/epl/EplSdoAsndu.c +++ b/drivers/staging/epl/EplSdoAsndu.c | |||
@@ -110,7 +110,7 @@ static tEplSdoAsndInstance SdoAsndInstance_g; | |||
110 | // local function prototypes | 110 | // local function prototypes |
111 | //--------------------------------------------------------------------------- | 111 | //--------------------------------------------------------------------------- |
112 | 112 | ||
113 | tEplKernel PUBLIC EplSdoAsnduCb(tEplFrameInfo * pFrameInfo_p); | 113 | tEplKernel EplSdoAsnduCb(tEplFrameInfo *pFrameInfo_p); |
114 | 114 | ||
115 | /***************************************************************************/ | 115 | /***************************************************************************/ |
116 | /* */ | 116 | /* */ |
@@ -149,7 +149,7 @@ tEplKernel PUBLIC EplSdoAsnduCb(tEplFrameInfo * pFrameInfo_p); | |||
149 | // State: | 149 | // State: |
150 | // | 150 | // |
151 | //--------------------------------------------------------------------------- | 151 | //--------------------------------------------------------------------------- |
152 | tEplKernel PUBLIC EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p) | 152 | tEplKernel EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p) |
153 | { | 153 | { |
154 | tEplKernel Ret; | 154 | tEplKernel Ret; |
155 | 155 | ||
@@ -176,7 +176,7 @@ tEplKernel PUBLIC EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p) | |||
176 | // State: | 176 | // State: |
177 | // | 177 | // |
178 | //--------------------------------------------------------------------------- | 178 | //--------------------------------------------------------------------------- |
179 | tEplKernel PUBLIC EplSdoAsnduAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) | 179 | tEplKernel EplSdoAsnduAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) |
180 | { | 180 | { |
181 | tEplKernel Ret; | 181 | tEplKernel Ret; |
182 | 182 | ||
@@ -218,7 +218,7 @@ tEplKernel PUBLIC EplSdoAsnduAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) | |||
218 | // State: | 218 | // State: |
219 | // | 219 | // |
220 | //--------------------------------------------------------------------------- | 220 | //--------------------------------------------------------------------------- |
221 | tEplKernel PUBLIC EplSdoAsnduDelInstance() | 221 | tEplKernel EplSdoAsnduDelInstance(void) |
222 | { | 222 | { |
223 | tEplKernel Ret; | 223 | tEplKernel Ret; |
224 | 224 | ||
@@ -251,8 +251,8 @@ tEplKernel PUBLIC EplSdoAsnduDelInstance() | |||
251 | // State: | 251 | // State: |
252 | // | 252 | // |
253 | //--------------------------------------------------------------------------- | 253 | //--------------------------------------------------------------------------- |
254 | tEplKernel PUBLIC EplSdoAsnduInitCon(tEplSdoConHdl * pSdoConHandle_p, | 254 | tEplKernel EplSdoAsnduInitCon(tEplSdoConHdl *pSdoConHandle_p, |
255 | unsigned int uiTargetNodeId_p) | 255 | unsigned int uiTargetNodeId_p) |
256 | { | 256 | { |
257 | tEplKernel Ret; | 257 | tEplKernel Ret; |
258 | unsigned int uiCount; | 258 | unsigned int uiCount; |
@@ -319,9 +319,9 @@ tEplKernel PUBLIC EplSdoAsnduInitCon(tEplSdoConHdl * pSdoConHandle_p, | |||
319 | // State: | 319 | // State: |
320 | // | 320 | // |
321 | //--------------------------------------------------------------------------- | 321 | //--------------------------------------------------------------------------- |
322 | tEplKernel PUBLIC EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, | 322 | tEplKernel EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, |
323 | tEplFrame * pSrcData_p, | 323 | tEplFrame *pSrcData_p, |
324 | DWORD dwDataSize_p) | 324 | DWORD dwDataSize_p) |
325 | { | 325 | { |
326 | tEplKernel Ret; | 326 | tEplKernel Ret; |
327 | unsigned int uiArray; | 327 | unsigned int uiArray; |
@@ -379,7 +379,7 @@ tEplKernel PUBLIC EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, | |||
379 | // State: | 379 | // State: |
380 | // | 380 | // |
381 | //--------------------------------------------------------------------------- | 381 | //--------------------------------------------------------------------------- |
382 | tEplKernel PUBLIC EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p) | 382 | tEplKernel EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p) |
383 | { | 383 | { |
384 | tEplKernel Ret; | 384 | tEplKernel Ret; |
385 | unsigned int uiArray; | 385 | unsigned int uiArray; |
@@ -422,7 +422,7 @@ tEplKernel PUBLIC EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p) | |||
422 | // State: | 422 | // State: |
423 | // | 423 | // |
424 | //--------------------------------------------------------------------------- | 424 | //--------------------------------------------------------------------------- |
425 | tEplKernel PUBLIC EplSdoAsnduCb(tEplFrameInfo * pFrameInfo_p) | 425 | tEplKernel EplSdoAsnduCb(tEplFrameInfo *pFrameInfo_p) |
426 | { | 426 | { |
427 | tEplKernel Ret = kEplSuccessful; | 427 | tEplKernel Ret = kEplSuccessful; |
428 | unsigned int uiCount; | 428 | unsigned int uiCount; |
diff --git a/drivers/staging/epl/EplSdoAsySequ.c b/drivers/staging/epl/EplSdoAsySequ.c index 6b6a9975d78..9048905dcde 100644 --- a/drivers/staging/epl/EplSdoAsySequ.c +++ b/drivers/staging/epl/EplSdoAsySequ.c | |||
@@ -203,9 +203,9 @@ static tEplKernel EplSdoAsySeqSendLowerLayer(tEplAsySdoSeqCon * pAsySdoSeqCon_p, | |||
203 | unsigned int uiDataSize_p, | 203 | unsigned int uiDataSize_p, |
204 | tEplFrame * pEplFrame_p); | 204 | tEplFrame * pEplFrame_p); |
205 | 205 | ||
206 | tEplKernel PUBLIC EplSdoAsyReceiveCb(tEplSdoConHdl ConHdl_p, | 206 | tEplKernel EplSdoAsyReceiveCb(tEplSdoConHdl ConHdl_p, |
207 | tEplAsySdoSeq * pSdoSeqData_p, | 207 | tEplAsySdoSeq *pSdoSeqData_p, |
208 | unsigned int uiDataSize_p); | 208 | unsigned int uiDataSize_p); |
209 | 209 | ||
210 | static tEplKernel EplSdoAsyInitHistory(void); | 210 | static tEplKernel EplSdoAsyInitHistory(void); |
211 | 211 | ||
@@ -267,8 +267,8 @@ static tEplKernel EplSdoAsySeqSetTimer(tEplAsySdoSeqCon * pAsySdoSeqCon_p, | |||
267 | // State: | 267 | // State: |
268 | // | 268 | // |
269 | //--------------------------------------------------------------------------- | 269 | //--------------------------------------------------------------------------- |
270 | tEplKernel PUBLIC EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, | 270 | tEplKernel EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, |
271 | tEplSdoComConCb fpSdoComConCb_p) | 271 | tEplSdoComConCb fpSdoComConCb_p) |
272 | { | 272 | { |
273 | tEplKernel Ret; | 273 | tEplKernel Ret; |
274 | 274 | ||
@@ -297,8 +297,8 @@ tEplKernel PUBLIC EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, | |||
297 | // State: | 297 | // State: |
298 | // | 298 | // |
299 | //--------------------------------------------------------------------------- | 299 | //--------------------------------------------------------------------------- |
300 | tEplKernel PUBLIC EplSdoAsySeqAddInstance(tEplSdoComReceiveCb fpSdoComCb_p, | 300 | tEplKernel EplSdoAsySeqAddInstance(tEplSdoComReceiveCb fpSdoComCb_p, |
301 | tEplSdoComConCb fpSdoComConCb_p) | 301 | tEplSdoComConCb fpSdoComConCb_p) |
302 | { | 302 | { |
303 | tEplKernel Ret; | 303 | tEplKernel Ret; |
304 | 304 | ||
@@ -380,7 +380,7 @@ tEplKernel PUBLIC EplSdoAsySeqAddInstance(tEplSdoComReceiveCb fpSdoComCb_p, | |||
380 | // State: | 380 | // State: |
381 | // | 381 | // |
382 | //--------------------------------------------------------------------------- | 382 | //--------------------------------------------------------------------------- |
383 | tEplKernel PUBLIC EplSdoAsySeqDelInstance() | 383 | tEplKernel EplSdoAsySeqDelInstance(void) |
384 | { | 384 | { |
385 | tEplKernel Ret; | 385 | tEplKernel Ret; |
386 | unsigned int uiCount; | 386 | unsigned int uiCount; |
@@ -439,9 +439,9 @@ tEplKernel PUBLIC EplSdoAsySeqDelInstance() | |||
439 | // State: | 439 | // State: |
440 | // | 440 | // |
441 | //--------------------------------------------------------------------------- | 441 | //--------------------------------------------------------------------------- |
442 | tEplKernel PUBLIC EplSdoAsySeqInitCon(tEplSdoSeqConHdl * pSdoSeqConHdl_p, | 442 | tEplKernel EplSdoAsySeqInitCon(tEplSdoSeqConHdl *pSdoSeqConHdl_p, |
443 | unsigned int uiNodeId_p, | 443 | unsigned int uiNodeId_p, |
444 | tEplSdoType SdoType) | 444 | tEplSdoType SdoType) |
445 | { | 445 | { |
446 | tEplKernel Ret; | 446 | tEplKernel Ret; |
447 | unsigned int uiCount; | 447 | unsigned int uiCount; |
@@ -594,9 +594,9 @@ tEplKernel PUBLIC EplSdoAsySeqInitCon(tEplSdoSeqConHdl * pSdoSeqConHdl_p, | |||
594 | // State: | 594 | // State: |
595 | // | 595 | // |
596 | //--------------------------------------------------------------------------- | 596 | //--------------------------------------------------------------------------- |
597 | tEplKernel PUBLIC EplSdoAsySeqSendData(tEplSdoSeqConHdl SdoSeqConHdl_p, | 597 | tEplKernel EplSdoAsySeqSendData(tEplSdoSeqConHdl SdoSeqConHdl_p, |
598 | unsigned int uiDataSize_p, | 598 | unsigned int uiDataSize_p, |
599 | tEplFrame * pabData_p) | 599 | tEplFrame *pabData_p) |
600 | { | 600 | { |
601 | tEplKernel Ret; | 601 | tEplKernel Ret; |
602 | unsigned int uiHandle; | 602 | unsigned int uiHandle; |
@@ -640,7 +640,7 @@ tEplKernel PUBLIC EplSdoAsySeqSendData(tEplSdoSeqConHdl SdoSeqConHdl_p, | |||
640 | // State: | 640 | // State: |
641 | // | 641 | // |
642 | //--------------------------------------------------------------------------- | 642 | //--------------------------------------------------------------------------- |
643 | tEplKernel PUBLIC EplSdoAsySeqProcessEvent(tEplEvent * pEvent_p) | 643 | tEplKernel EplSdoAsySeqProcessEvent(tEplEvent *pEvent_p) |
644 | { | 644 | { |
645 | tEplKernel Ret; | 645 | tEplKernel Ret; |
646 | tEplTimerEventArg *pTimerEventArg; | 646 | tEplTimerEventArg *pTimerEventArg; |
@@ -714,7 +714,7 @@ tEplKernel PUBLIC EplSdoAsySeqProcessEvent(tEplEvent * pEvent_p) | |||
714 | // State: | 714 | // State: |
715 | // | 715 | // |
716 | //--------------------------------------------------------------------------- | 716 | //--------------------------------------------------------------------------- |
717 | tEplKernel PUBLIC EplSdoAsySeqDelCon(tEplSdoSeqConHdl SdoSeqConHdl_p) | 717 | tEplKernel EplSdoAsySeqDelCon(tEplSdoSeqConHdl SdoSeqConHdl_p) |
718 | { | 718 | { |
719 | tEplKernel Ret = kEplSuccessful; | 719 | tEplKernel Ret = kEplSuccessful; |
720 | unsigned int uiHandle; | 720 | unsigned int uiHandle; |
@@ -2139,9 +2139,9 @@ static tEplKernel EplSdoAsySeqSendLowerLayer(tEplAsySdoSeqCon * pAsySdoSeqCon_p, | |||
2139 | // State: | 2139 | // State: |
2140 | // | 2140 | // |
2141 | //--------------------------------------------------------------------------- | 2141 | //--------------------------------------------------------------------------- |
2142 | tEplKernel PUBLIC EplSdoAsyReceiveCb(tEplSdoConHdl ConHdl_p, | 2142 | tEplKernel EplSdoAsyReceiveCb(tEplSdoConHdl ConHdl_p, |
2143 | tEplAsySdoSeq * pSdoSeqData_p, | 2143 | tEplAsySdoSeq *pSdoSeqData_p, |
2144 | unsigned int uiDataSize_p) | 2144 | unsigned int uiDataSize_p) |
2145 | { | 2145 | { |
2146 | tEplKernel Ret; | 2146 | tEplKernel Ret; |
2147 | unsigned int uiCount = 0; | 2147 | unsigned int uiCount = 0; |
diff --git a/drivers/staging/epl/EplSdoComu.c b/drivers/staging/epl/EplSdoComu.c index ce0eb33f4c4..af3d1b14674 100644 --- a/drivers/staging/epl/EplSdoComu.c +++ b/drivers/staging/epl/EplSdoComu.c | |||
@@ -205,12 +205,12 @@ static tEplSdoComInstance SdoComInstance_g; | |||
205 | //--------------------------------------------------------------------------- | 205 | //--------------------------------------------------------------------------- |
206 | // local function prototypes | 206 | // local function prototypes |
207 | //--------------------------------------------------------------------------- | 207 | //--------------------------------------------------------------------------- |
208 | tEplKernel PUBLIC EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p, | 208 | tEplKernel EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p, |
209 | tEplAsySdoCom * pAsySdoCom_p, | 209 | tEplAsySdoCom *pAsySdoCom_p, |
210 | unsigned int uiDataSize_p); | 210 | unsigned int uiDataSize_p); |
211 | 211 | ||
212 | tEplKernel PUBLIC EplSdoComConCb(tEplSdoSeqConHdl SdoSeqConHdl_p, | 212 | tEplKernel EplSdoComConCb(tEplSdoSeqConHdl SdoSeqConHdl_p, |
213 | tEplAsySdoConState AsySdoConState_p); | 213 | tEplAsySdoConState AsySdoConState_p); |
214 | 214 | ||
215 | static tEplKernel EplSdoComSearchConIntern(tEplSdoSeqConHdl SdoSeqConHdl_p, | 215 | static tEplKernel EplSdoComSearchConIntern(tEplSdoSeqConHdl SdoSeqConHdl_p, |
216 | tEplSdoComConEvent SdoComConEvent_p, | 216 | tEplSdoComConEvent SdoComConEvent_p, |
@@ -285,7 +285,7 @@ static tEplKernel EplSdoComClientSendAbort(tEplSdoComCon * pSdoComCon_p, | |||
285 | // State: | 285 | // State: |
286 | // | 286 | // |
287 | //--------------------------------------------------------------------------- | 287 | //--------------------------------------------------------------------------- |
288 | tEplKernel PUBLIC EplSdoComInit(void) | 288 | tEplKernel EplSdoComInit(void) |
289 | { | 289 | { |
290 | tEplKernel Ret; | 290 | tEplKernel Ret; |
291 | 291 | ||
@@ -312,7 +312,7 @@ tEplKernel PUBLIC EplSdoComInit(void) | |||
312 | // State: | 312 | // State: |
313 | // | 313 | // |
314 | //--------------------------------------------------------------------------- | 314 | //--------------------------------------------------------------------------- |
315 | tEplKernel PUBLIC EplSdoComAddInstance(void) | 315 | tEplKernel EplSdoComAddInstance(void) |
316 | { | 316 | { |
317 | tEplKernel Ret; | 317 | tEplKernel Ret; |
318 | 318 | ||
@@ -354,7 +354,7 @@ tEplKernel PUBLIC EplSdoComAddInstance(void) | |||
354 | // State: | 354 | // State: |
355 | // | 355 | // |
356 | //--------------------------------------------------------------------------- | 356 | //--------------------------------------------------------------------------- |
357 | tEplKernel PUBLIC EplSdoComDelInstance(void) | 357 | tEplKernel EplSdoComDelInstance(void) |
358 | { | 358 | { |
359 | tEplKernel Ret; | 359 | tEplKernel Ret; |
360 | 360 | ||
@@ -398,9 +398,9 @@ tEplKernel PUBLIC EplSdoComDelInstance(void) | |||
398 | // | 398 | // |
399 | //--------------------------------------------------------------------------- | 399 | //--------------------------------------------------------------------------- |
400 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) | 400 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) |
401 | tEplKernel PUBLIC EplSdoComDefineCon(tEplSdoComConHdl * pSdoComConHdl_p, | 401 | tEplKernel EplSdoComDefineCon(tEplSdoComConHdl *pSdoComConHdl_p, |
402 | unsigned int uiTargetNodeId_p, | 402 | unsigned int uiTargetNodeId_p, |
403 | tEplSdoType ProtType_p) | 403 | tEplSdoType ProtType_p) |
404 | { | 404 | { |
405 | tEplKernel Ret; | 405 | tEplKernel Ret; |
406 | unsigned int uiCount; | 406 | unsigned int uiCount; |
@@ -511,8 +511,7 @@ tEplKernel PUBLIC EplSdoComDefineCon(tEplSdoComConHdl * pSdoComConHdl_p, | |||
511 | // | 511 | // |
512 | //--------------------------------------------------------------------------- | 512 | //--------------------------------------------------------------------------- |
513 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) | 513 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) |
514 | tEplKernel PUBLIC EplSdoComInitTransferByIndex(tEplSdoComTransParamByIndex * | 514 | tEplKernel EplSdoComInitTransferByIndex(tEplSdoComTransParamByIndex *pSdoComTransParam_p) |
515 | pSdoComTransParam_p) | ||
516 | { | 515 | { |
517 | tEplKernel Ret; | 516 | tEplKernel Ret; |
518 | tEplSdoComCon *pSdoComCon; | 517 | tEplSdoComCon *pSdoComCon; |
@@ -603,7 +602,7 @@ tEplKernel PUBLIC EplSdoComInitTransferByIndex(tEplSdoComTransParamByIndex * | |||
603 | // | 602 | // |
604 | //--------------------------------------------------------------------------- | 603 | //--------------------------------------------------------------------------- |
605 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) | 604 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) |
606 | tEplKernel PUBLIC EplSdoComUndefineCon(tEplSdoComConHdl SdoComConHdl_p) | 605 | tEplKernel EplSdoComUndefineCon(tEplSdoComConHdl SdoComConHdl_p) |
607 | { | 606 | { |
608 | tEplKernel Ret; | 607 | tEplKernel Ret; |
609 | tEplSdoComCon *pSdoComCon; | 608 | tEplSdoComCon *pSdoComCon; |
@@ -669,8 +668,8 @@ tEplKernel PUBLIC EplSdoComUndefineCon(tEplSdoComConHdl SdoComConHdl_p) | |||
669 | // | 668 | // |
670 | //--------------------------------------------------------------------------- | 669 | //--------------------------------------------------------------------------- |
671 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) | 670 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) |
672 | tEplKernel PUBLIC EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, | 671 | tEplKernel EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, |
673 | tEplSdoComFinished * pSdoComFinished_p) | 672 | tEplSdoComFinished *pSdoComFinished_p) |
674 | { | 673 | { |
675 | tEplKernel Ret; | 674 | tEplKernel Ret; |
676 | tEplSdoComCon *pSdoComCon; | 675 | tEplSdoComCon *pSdoComCon; |
@@ -747,8 +746,8 @@ tEplKernel PUBLIC EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, | |||
747 | // | 746 | // |
748 | //--------------------------------------------------------------------------- | 747 | //--------------------------------------------------------------------------- |
749 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) | 748 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) |
750 | tEplKernel PUBLIC EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, | 749 | tEplKernel EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, |
751 | DWORD dwAbortCode_p) | 750 | DWORD dwAbortCode_p) |
752 | { | 751 | { |
753 | tEplKernel Ret; | 752 | tEplKernel Ret; |
754 | tEplSdoComCon *pSdoComCon; | 753 | tEplSdoComCon *pSdoComCon; |
@@ -803,9 +802,9 @@ tEplKernel PUBLIC EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, | |||
803 | // State: | 802 | // State: |
804 | // | 803 | // |
805 | //--------------------------------------------------------------------------- | 804 | //--------------------------------------------------------------------------- |
806 | tEplKernel PUBLIC EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p, | 805 | tEplKernel EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p, |
807 | tEplAsySdoCom * pAsySdoCom_p, | 806 | tEplAsySdoCom *pAsySdoCom_p, |
808 | unsigned int uiDataSize_p) | 807 | unsigned int uiDataSize_p) |
809 | { | 808 | { |
810 | tEplKernel Ret; | 809 | tEplKernel Ret; |
811 | 810 | ||
@@ -840,8 +839,8 @@ tEplKernel PUBLIC EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p, | |||
840 | // State: | 839 | // State: |
841 | // | 840 | // |
842 | //--------------------------------------------------------------------------- | 841 | //--------------------------------------------------------------------------- |
843 | tEplKernel PUBLIC EplSdoComConCb(tEplSdoSeqConHdl SdoSeqConHdl_p, | 842 | tEplKernel EplSdoComConCb(tEplSdoSeqConHdl SdoSeqConHdl_p, |
844 | tEplAsySdoConState AsySdoConState_p) | 843 | tEplAsySdoConState AsySdoConState_p) |
845 | { | 844 | { |
846 | tEplKernel Ret; | 845 | tEplKernel Ret; |
847 | tEplSdoComConEvent SdoComConEvent = kEplSdoComConEventSendFirst; | 846 | tEplSdoComConEvent SdoComConEvent = kEplSdoComConEventSendFirst; |
diff --git a/drivers/staging/epl/EplSdoUdpu.c b/drivers/staging/epl/EplSdoUdpu.c index be52233b3ee..74fe25968e2 100644 --- a/drivers/staging/epl/EplSdoUdpu.c +++ b/drivers/staging/epl/EplSdoUdpu.c | |||
@@ -134,7 +134,7 @@ static tEplSdoUdpInstance SdoUdpInstance_g; | |||
134 | //--------------------------------------------------------------------------- | 134 | //--------------------------------------------------------------------------- |
135 | 135 | ||
136 | #if (TARGET_SYSTEM == _WIN32_) | 136 | #if (TARGET_SYSTEM == _WIN32_) |
137 | static DWORD PUBLIC EplSdoUdpThread(LPVOID lpParameter); | 137 | static DWORD EplSdoUdpThread(LPVOID lpParameter); |
138 | 138 | ||
139 | #elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) | 139 | #elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) |
140 | static int EplSdoUdpThread(void *pArg_p); | 140 | static int EplSdoUdpThread(void *pArg_p); |
@@ -177,7 +177,7 @@ static int EplSdoUdpThread(void *pArg_p); | |||
177 | // State: | 177 | // State: |
178 | // | 178 | // |
179 | //--------------------------------------------------------------------------- | 179 | //--------------------------------------------------------------------------- |
180 | tEplKernel PUBLIC EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p) | 180 | tEplKernel EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p) |
181 | { | 181 | { |
182 | tEplKernel Ret; | 182 | tEplKernel Ret; |
183 | 183 | ||
@@ -205,7 +205,7 @@ tEplKernel PUBLIC EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p) | |||
205 | // State: | 205 | // State: |
206 | // | 206 | // |
207 | //--------------------------------------------------------------------------- | 207 | //--------------------------------------------------------------------------- |
208 | tEplKernel PUBLIC EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) | 208 | tEplKernel EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) |
209 | { | 209 | { |
210 | tEplKernel Ret; | 210 | tEplKernel Ret; |
211 | 211 | ||
@@ -273,7 +273,7 @@ tEplKernel PUBLIC EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) | |||
273 | // State: | 273 | // State: |
274 | // | 274 | // |
275 | //--------------------------------------------------------------------------- | 275 | //--------------------------------------------------------------------------- |
276 | tEplKernel PUBLIC EplSdoUdpuDelInstance() | 276 | tEplKernel EplSdoUdpuDelInstance(void) |
277 | { | 277 | { |
278 | tEplKernel Ret; | 278 | tEplKernel Ret; |
279 | 279 | ||
@@ -340,8 +340,7 @@ tEplKernel PUBLIC EplSdoUdpuDelInstance() | |||
340 | // State: | 340 | // State: |
341 | // | 341 | // |
342 | //--------------------------------------------------------------------------- | 342 | //--------------------------------------------------------------------------- |
343 | tEplKernel PUBLIC EplSdoUdpuConfig(unsigned long ulIpAddr_p, | 343 | tEplKernel EplSdoUdpuConfig(unsigned long ulIpAddr_p, unsigned int uiPort_p) |
344 | unsigned int uiPort_p) | ||
345 | { | 344 | { |
346 | tEplKernel Ret; | 345 | tEplKernel Ret; |
347 | struct sockaddr_in Addr; | 346 | struct sockaddr_in Addr; |
@@ -459,8 +458,8 @@ tEplKernel PUBLIC EplSdoUdpuConfig(unsigned long ulIpAddr_p, | |||
459 | // State: | 458 | // State: |
460 | // | 459 | // |
461 | //--------------------------------------------------------------------------- | 460 | //--------------------------------------------------------------------------- |
462 | tEplKernel PUBLIC EplSdoUdpuInitCon(tEplSdoConHdl * pSdoConHandle_p, | 461 | tEplKernel EplSdoUdpuInitCon(tEplSdoConHdl *pSdoConHandle_p, |
463 | unsigned int uiTargetNodeId_p) | 462 | unsigned int uiTargetNodeId_p) |
464 | { | 463 | { |
465 | tEplKernel Ret; | 464 | tEplKernel Ret; |
466 | unsigned int uiCount; | 465 | unsigned int uiCount; |
@@ -526,8 +525,8 @@ tEplKernel PUBLIC EplSdoUdpuInitCon(tEplSdoConHdl * pSdoConHandle_p, | |||
526 | // State: | 525 | // State: |
527 | // | 526 | // |
528 | //--------------------------------------------------------------------------- | 527 | //--------------------------------------------------------------------------- |
529 | tEplKernel PUBLIC EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, | 528 | tEplKernel EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, |
530 | tEplFrame * pSrcData_p, DWORD dwDataSize_p) | 529 | tEplFrame *pSrcData_p, DWORD dwDataSize_p) |
531 | { | 530 | { |
532 | tEplKernel Ret; | 531 | tEplKernel Ret; |
533 | int iError; | 532 | int iError; |
@@ -603,7 +602,7 @@ tEplKernel PUBLIC EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, | |||
603 | // State: | 602 | // State: |
604 | // | 603 | // |
605 | //--------------------------------------------------------------------------- | 604 | //--------------------------------------------------------------------------- |
606 | tEplKernel PUBLIC EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p) | 605 | tEplKernel EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p) |
607 | { | 606 | { |
608 | tEplKernel Ret; | 607 | tEplKernel Ret; |
609 | unsigned int uiArray; | 608 | unsigned int uiArray; |
@@ -649,7 +648,7 @@ tEplKernel PUBLIC EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p) | |||
649 | // | 648 | // |
650 | //--------------------------------------------------------------------------- | 649 | //--------------------------------------------------------------------------- |
651 | #if (TARGET_SYSTEM == _WIN32_) | 650 | #if (TARGET_SYSTEM == _WIN32_) |
652 | static DWORD PUBLIC EplSdoUdpThread(LPVOID lpParameter) | 651 | static DWORD EplSdoUdpThread(LPVOID lpParameter) |
653 | #elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) | 652 | #elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) |
654 | static int EplSdoUdpThread(void *pArg_p) | 653 | static int EplSdoUdpThread(void *pArg_p) |
655 | #endif | 654 | #endif |
diff --git a/drivers/staging/epl/EplStatusu.c b/drivers/staging/epl/EplStatusu.c index 689f9124ae2..5dcabdf6191 100644 --- a/drivers/staging/epl/EplStatusu.c +++ b/drivers/staging/epl/EplStatusu.c | |||
@@ -137,8 +137,7 @@ static tEplStatusuInstance EplStatusuInstance_g; | |||
137 | // local function prototypes | 137 | // local function prototypes |
138 | //--------------------------------------------------------------------------- | 138 | //--------------------------------------------------------------------------- |
139 | 139 | ||
140 | static tEplKernel PUBLIC EplStatusuCbStatusResponse(tEplFrameInfo * | 140 | static tEplKernel EplStatusuCbStatusResponse(tEplFrameInfo *pFrameInfo_p); |
141 | pFrameInfo_p); | ||
142 | 141 | ||
143 | //=========================================================================// | 142 | //=========================================================================// |
144 | // // | 143 | // // |
@@ -164,7 +163,7 @@ static tEplKernel PUBLIC EplStatusuCbStatusResponse(tEplFrameInfo * | |||
164 | // | 163 | // |
165 | //--------------------------------------------------------------------------- | 164 | //--------------------------------------------------------------------------- |
166 | 165 | ||
167 | EPLDLLEXPORT tEplKernel PUBLIC EplStatusuInit() | 166 | EPLDLLEXPORT tEplKernel EplStatusuInit(void) |
168 | { | 167 | { |
169 | tEplKernel Ret; | 168 | tEplKernel Ret; |
170 | 169 | ||
@@ -191,7 +190,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuInit() | |||
191 | // | 190 | // |
192 | //--------------------------------------------------------------------------- | 191 | //--------------------------------------------------------------------------- |
193 | 192 | ||
194 | EPLDLLEXPORT tEplKernel PUBLIC EplStatusuAddInstance() | 193 | EPLDLLEXPORT tEplKernel EplStatusuAddInstance(void) |
195 | { | 194 | { |
196 | tEplKernel Ret; | 195 | tEplKernel Ret; |
197 | 196 | ||
@@ -228,7 +227,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuAddInstance() | |||
228 | // | 227 | // |
229 | //--------------------------------------------------------------------------- | 228 | //--------------------------------------------------------------------------- |
230 | 229 | ||
231 | EPLDLLEXPORT tEplKernel PUBLIC EplStatusuDelInstance() | 230 | EPLDLLEXPORT tEplKernel EplStatusuDelInstance(void) |
232 | { | 231 | { |
233 | tEplKernel Ret; | 232 | tEplKernel Ret; |
234 | 233 | ||
@@ -258,7 +257,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuDelInstance() | |||
258 | // | 257 | // |
259 | //--------------------------------------------------------------------------- | 258 | //--------------------------------------------------------------------------- |
260 | 259 | ||
261 | EPLDLLEXPORT tEplKernel PUBLIC EplStatusuReset() | 260 | EPLDLLEXPORT tEplKernel EplStatusuReset(void) |
262 | { | 261 | { |
263 | tEplKernel Ret; | 262 | tEplKernel Ret; |
264 | 263 | ||
@@ -287,9 +286,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuReset() | |||
287 | // | 286 | // |
288 | //--------------------------------------------------------------------------- | 287 | //--------------------------------------------------------------------------- |
289 | 288 | ||
290 | tEplKernel PUBLIC EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, | 289 | tEplKernel EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, |
291 | tEplStatusuCbResponse | 290 | tEplStatusuCbResponse pfnCbResponse_p) |
292 | pfnCbResponse_p) | ||
293 | { | 291 | { |
294 | tEplKernel Ret; | 292 | tEplKernel Ret; |
295 | 293 | ||
@@ -342,8 +340,7 @@ tEplKernel PUBLIC EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, | |||
342 | // State: | 340 | // State: |
343 | // | 341 | // |
344 | //--------------------------------------------------------------------------- | 342 | //--------------------------------------------------------------------------- |
345 | static tEplKernel PUBLIC EplStatusuCbStatusResponse(tEplFrameInfo * | 343 | static tEplKernel EplStatusuCbStatusResponse(tEplFrameInfo *pFrameInfo_p) |
346 | pFrameInfo_p) | ||
347 | { | 344 | { |
348 | tEplKernel Ret = kEplSuccessful; | 345 | tEplKernel Ret = kEplSuccessful; |
349 | unsigned int uiNodeId; | 346 | unsigned int uiNodeId; |
diff --git a/drivers/staging/epl/EplTarget.h b/drivers/staging/epl/EplTarget.h index b2b66f82c03..462c6d0c0a1 100644 --- a/drivers/staging/epl/EplTarget.h +++ b/drivers/staging/epl/EplTarget.h | |||
@@ -217,17 +217,15 @@ void trace(const char *fmt, ...); | |||
217 | 217 | ||
218 | // currently no Timer functions are needed by EPL stack | 218 | // currently no Timer functions are needed by EPL stack |
219 | // so they are not implemented yet | 219 | // so they are not implemented yet |
220 | //void PUBLIC TgtTimerInit(void); | 220 | //void TgtTimerInit(void); |
221 | //DWORD PUBLIC TgtGetTickCount(void); | 221 | //DWORD TgtGetTickCount(void); |
222 | //void PUBLIC TgtGetNetTime(tEplNetTime * pNetTime_p); | 222 | //void TgtGetNetTime(tEplNetTime * pNetTime_p); |
223 | 223 | ||
224 | // functions for ethernet driver | 224 | // functions for ethernet driver |
225 | tEplKernel PUBLIC TgtInitEthIsr(void); | 225 | tEplKernel TgtInitEthIsr(void); |
226 | void PUBLIC TgtFreeEthIsr(void); | 226 | void TgtFreeEthIsr(void); |
227 | void PUBLIC TgtEnableGlobalInterrupt(BYTE fEnable_p); | 227 | void TgtEnableGlobalInterrupt(BYTE fEnable_p); |
228 | void PUBLIC TgtEnableEthInterrupt0(BYTE fEnable_p, | 228 | void TgtEnableEthInterrupt0(BYTE fEnable_p, unsigned int uiInterruptMask_p); |
229 | unsigned int uiInterruptMask_p); | 229 | void TgtEnableEthInterrupt1(BYTE fEnable_p, unsigned int uiInterruptMask_p); |
230 | void PUBLIC TgtEnableEthInterrupt1(BYTE fEnable_p, | ||
231 | unsigned int uiInterruptMask_p); | ||
232 | 230 | ||
233 | #endif // #ifndef _EPLTARGET_H_ | 231 | #endif // #ifndef _EPLTARGET_H_ |
diff --git a/drivers/staging/epl/EplTimer.h b/drivers/staging/epl/EplTimer.h index facbfd8740e..d1a73eaf65c 100644 --- a/drivers/staging/epl/EplTimer.h +++ b/drivers/staging/epl/EplTimer.h | |||
@@ -107,8 +107,7 @@ typedef struct { | |||
107 | 107 | ||
108 | } tEplTimerEventArg; | 108 | } tEplTimerEventArg; |
109 | 109 | ||
110 | typedef tEplKernel(PUBLIC * tEplTimerkCallback) (tEplTimerEventArg * | 110 | typedef tEplKernel(* tEplTimerkCallback) (tEplTimerEventArg *pEventArg_p); |
111 | pEventArg_p); | ||
112 | 111 | ||
113 | //--------------------------------------------------------------------------- | 112 | //--------------------------------------------------------------------------- |
114 | // function prototypes | 113 | // function prototypes |
diff --git a/drivers/staging/epl/EplTimeruLinuxKernel.c b/drivers/staging/epl/EplTimeruLinuxKernel.c index 08820d18405..ff80fc80d02 100644 --- a/drivers/staging/epl/EplTimeruLinuxKernel.c +++ b/drivers/staging/epl/EplTimeruLinuxKernel.c | |||
@@ -99,7 +99,7 @@ typedef struct { | |||
99 | //--------------------------------------------------------------------------- | 99 | //--------------------------------------------------------------------------- |
100 | // local function prototypes | 100 | // local function prototypes |
101 | //--------------------------------------------------------------------------- | 101 | //--------------------------------------------------------------------------- |
102 | static void PUBLIC EplTimeruCbMs(unsigned long ulParameter_p); | 102 | static void EplTimeruCbMs(unsigned long ulParameter_p); |
103 | 103 | ||
104 | /***************************************************************************/ | 104 | /***************************************************************************/ |
105 | /* */ | 105 | /* */ |
@@ -134,7 +134,7 @@ static void PUBLIC EplTimeruCbMs(unsigned long ulParameter_p); | |||
134 | // | 134 | // |
135 | //--------------------------------------------------------------------------- | 135 | //--------------------------------------------------------------------------- |
136 | 136 | ||
137 | tEplKernel PUBLIC EplTimeruInit() | 137 | tEplKernel EplTimeruInit(void) |
138 | { | 138 | { |
139 | tEplKernel Ret; | 139 | tEplKernel Ret; |
140 | 140 | ||
@@ -157,7 +157,7 @@ tEplKernel PUBLIC EplTimeruInit() | |||
157 | // | 157 | // |
158 | //--------------------------------------------------------------------------- | 158 | //--------------------------------------------------------------------------- |
159 | 159 | ||
160 | tEplKernel PUBLIC EplTimeruAddInstance() | 160 | tEplKernel EplTimeruAddInstance(void) |
161 | { | 161 | { |
162 | tEplKernel Ret; | 162 | tEplKernel Ret; |
163 | 163 | ||
@@ -182,7 +182,7 @@ tEplKernel PUBLIC EplTimeruAddInstance() | |||
182 | // | 182 | // |
183 | //--------------------------------------------------------------------------- | 183 | //--------------------------------------------------------------------------- |
184 | 184 | ||
185 | tEplKernel PUBLIC EplTimeruDelInstance() | 185 | tEplKernel EplTimeruDelInstance(void) |
186 | { | 186 | { |
187 | tEplKernel Ret; | 187 | tEplKernel Ret; |
188 | 188 | ||
@@ -207,9 +207,9 @@ tEplKernel PUBLIC EplTimeruDelInstance() | |||
207 | // | 207 | // |
208 | //--------------------------------------------------------------------------- | 208 | //--------------------------------------------------------------------------- |
209 | 209 | ||
210 | tEplKernel PUBLIC EplTimeruSetTimerMs(tEplTimerHdl * pTimerHdl_p, | 210 | tEplKernel EplTimeruSetTimerMs(tEplTimerHdl *pTimerHdl_p, |
211 | unsigned long ulTime_p, | 211 | unsigned long ulTime_p, |
212 | tEplTimerArg Argument_p) | 212 | tEplTimerArg Argument_p) |
213 | { | 213 | { |
214 | tEplKernel Ret = kEplSuccessful; | 214 | tEplKernel Ret = kEplSuccessful; |
215 | tEplTimeruData *pData; | 215 | tEplTimeruData *pData; |
@@ -257,9 +257,9 @@ tEplKernel PUBLIC EplTimeruSetTimerMs(tEplTimerHdl * pTimerHdl_p, | |||
257 | // | 257 | // |
258 | //--------------------------------------------------------------------------- | 258 | //--------------------------------------------------------------------------- |
259 | 259 | ||
260 | tEplKernel PUBLIC EplTimeruModifyTimerMs(tEplTimerHdl * pTimerHdl_p, | 260 | tEplKernel EplTimeruModifyTimerMs(tEplTimerHdl *pTimerHdl_p, |
261 | unsigned long ulTime_p, | 261 | unsigned long ulTime_p, |
262 | tEplTimerArg Argument_p) | 262 | tEplTimerArg Argument_p) |
263 | { | 263 | { |
264 | tEplKernel Ret = kEplSuccessful; | 264 | tEplKernel Ret = kEplSuccessful; |
265 | tEplTimeruData *pData; | 265 | tEplTimeruData *pData; |
@@ -315,7 +315,7 @@ tEplKernel PUBLIC EplTimeruModifyTimerMs(tEplTimerHdl * pTimerHdl_p, | |||
315 | // | 315 | // |
316 | //--------------------------------------------------------------------------- | 316 | //--------------------------------------------------------------------------- |
317 | 317 | ||
318 | tEplKernel PUBLIC EplTimeruDeleteTimer(tEplTimerHdl * pTimerHdl_p) | 318 | tEplKernel EplTimeruDeleteTimer(tEplTimerHdl *pTimerHdl_p) |
319 | { | 319 | { |
320 | tEplKernel Ret = kEplSuccessful; | 320 | tEplKernel Ret = kEplSuccessful; |
321 | tEplTimeruData *pData; | 321 | tEplTimeruData *pData; |
@@ -370,7 +370,7 @@ tEplKernel PUBLIC EplTimeruDeleteTimer(tEplTimerHdl * pTimerHdl_p) | |||
370 | // | 370 | // |
371 | //--------------------------------------------------------------------------- | 371 | //--------------------------------------------------------------------------- |
372 | 372 | ||
373 | BOOL PUBLIC EplTimeruIsTimerActive(tEplTimerHdl TimerHdl_p) | 373 | BOOL EplTimeruIsTimerActive(tEplTimerHdl TimerHdl_p) |
374 | { | 374 | { |
375 | BOOL fActive = FALSE; | 375 | BOOL fActive = FALSE; |
376 | tEplTimeruData *pData; | 376 | tEplTimeruData *pData; |
@@ -417,7 +417,7 @@ BOOL PUBLIC EplTimeruIsTimerActive(tEplTimerHdl TimerHdl_p) | |||
417 | // State: | 417 | // State: |
418 | // | 418 | // |
419 | //--------------------------------------------------------------------------- | 419 | //--------------------------------------------------------------------------- |
420 | static void PUBLIC EplTimeruCbMs(unsigned long ulParameter_p) | 420 | static void EplTimeruCbMs(unsigned long ulParameter_p) |
421 | { | 421 | { |
422 | tEplKernel Ret = kEplSuccessful; | 422 | tEplKernel Ret = kEplSuccessful; |
423 | tEplTimeruData *pData; | 423 | tEplTimeruData *pData; |
diff --git a/drivers/staging/epl/TimerHighReskX86.c b/drivers/staging/epl/TimerHighReskX86.c index 82eee4702aa..11ae8192323 100644 --- a/drivers/staging/epl/TimerHighReskX86.c +++ b/drivers/staging/epl/TimerHighReskX86.c | |||
@@ -103,8 +103,8 @@ | |||
103 | 103 | ||
104 | // TracePoint support for realtime-debugging | 104 | // TracePoint support for realtime-debugging |
105 | #ifdef _DBG_TRACE_POINTS_ | 105 | #ifdef _DBG_TRACE_POINTS_ |
106 | void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); | 106 | void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); |
107 | void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); | 107 | void TgtDbgPostTraceValue(DWORD dwTraceValue_p); |
108 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) | 108 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) |
109 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) | 109 | #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) |
110 | #else | 110 | #else |
@@ -172,7 +172,7 @@ enum hrtimer_restart EplTimerHighReskCallback(struct hrtimer *pTimer_p); | |||
172 | // | 172 | // |
173 | //--------------------------------------------------------------------------- | 173 | //--------------------------------------------------------------------------- |
174 | 174 | ||
175 | tEplKernel PUBLIC EplTimerHighReskInit(void) | 175 | tEplKernel EplTimerHighReskInit(void) |
176 | { | 176 | { |
177 | tEplKernel Ret; | 177 | tEplKernel Ret; |
178 | 178 | ||
@@ -196,7 +196,7 @@ tEplKernel PUBLIC EplTimerHighReskInit(void) | |||
196 | // | 196 | // |
197 | //--------------------------------------------------------------------------- | 197 | //--------------------------------------------------------------------------- |
198 | 198 | ||
199 | tEplKernel PUBLIC EplTimerHighReskAddInstance(void) | 199 | tEplKernel EplTimerHighReskAddInstance(void) |
200 | { | 200 | { |
201 | tEplKernel Ret; | 201 | tEplKernel Ret; |
202 | unsigned int uiIndex; | 202 | unsigned int uiIndex; |
@@ -244,7 +244,7 @@ tEplKernel PUBLIC EplTimerHighReskAddInstance(void) | |||
244 | // | 244 | // |
245 | //--------------------------------------------------------------------------- | 245 | //--------------------------------------------------------------------------- |
246 | 246 | ||
247 | tEplKernel PUBLIC EplTimerHighReskDelInstance(void) | 247 | tEplKernel EplTimerHighReskDelInstance(void) |
248 | { | 248 | { |
249 | tEplTimerHighReskTimerInfo *pTimerInfo; | 249 | tEplTimerHighReskTimerInfo *pTimerInfo; |
250 | tEplKernel Ret; | 250 | tEplKernel Ret; |
@@ -298,12 +298,11 @@ tEplKernel PUBLIC EplTimerHighReskDelInstance(void) | |||
298 | // | 298 | // |
299 | //--------------------------------------------------------------------------- | 299 | //--------------------------------------------------------------------------- |
300 | 300 | ||
301 | tEplKernel PUBLIC EplTimerHighReskModifyTimerNs(tEplTimerHdl * pTimerHdl_p, | 301 | tEplKernel EplTimerHighReskModifyTimerNs(tEplTimerHdl *pTimerHdl_p, |
302 | unsigned long long ullTimeNs_p, | 302 | unsigned long long ullTimeNs_p, |
303 | tEplTimerkCallback | 303 | tEplTimerkCallback pfnCallback_p, |
304 | pfnCallback_p, | 304 | unsigned long ulArgument_p, |
305 | unsigned long ulArgument_p, | 305 | BOOL fContinuously_p) |
306 | BOOL fContinuously_p) | ||
307 | { | 306 | { |
308 | tEplKernel Ret; | 307 | tEplKernel Ret; |
309 | unsigned int uiIndex; | 308 | unsigned int uiIndex; |
@@ -396,7 +395,7 @@ tEplKernel PUBLIC EplTimerHighReskModifyTimerNs(tEplTimerHdl * pTimerHdl_p, | |||
396 | // | 395 | // |
397 | //--------------------------------------------------------------------------- | 396 | //--------------------------------------------------------------------------- |
398 | 397 | ||
399 | tEplKernel PUBLIC EplTimerHighReskDeleteTimer(tEplTimerHdl * pTimerHdl_p) | 398 | tEplKernel EplTimerHighReskDeleteTimer(tEplTimerHdl *pTimerHdl_p) |
400 | { | 399 | { |
401 | tEplKernel Ret = kEplSuccessful; | 400 | tEplKernel Ret = kEplSuccessful; |
402 | unsigned int uiIndex; | 401 | unsigned int uiIndex; |
diff --git a/drivers/staging/epl/VirtualEthernetLinux.c b/drivers/staging/epl/VirtualEthernetLinux.c index 5d838dbf73a..445b9e620c2 100644 --- a/drivers/staging/epl/VirtualEthernetLinux.c +++ b/drivers/staging/epl/VirtualEthernetLinux.c | |||
@@ -285,7 +285,7 @@ static tEplKernel VEthRecvFrame(tEplFrameInfo * pFrameInfo_p) | |||
285 | return Ret; | 285 | return Ret; |
286 | } | 286 | } |
287 | 287 | ||
288 | tEplKernel PUBLIC VEthAddInstance(tEplDllkInitParam * pInitParam_p) | 288 | tEplKernel VEthAddInstance(tEplDllkInitParam *pInitParam_p) |
289 | { | 289 | { |
290 | tEplKernel Ret = kEplSuccessful; | 290 | tEplKernel Ret = kEplSuccessful; |
291 | 291 | ||
@@ -324,7 +324,7 @@ tEplKernel PUBLIC VEthAddInstance(tEplDllkInitParam * pInitParam_p) | |||
324 | return Ret; | 324 | return Ret; |
325 | } | 325 | } |
326 | 326 | ||
327 | tEplKernel PUBLIC VEthDelInstance(void) | 327 | tEplKernel VEthDelInstance(void) |
328 | { | 328 | { |
329 | tEplKernel Ret = kEplSuccessful; | 329 | tEplKernel Ret = kEplSuccessful; |
330 | 330 | ||
diff --git a/drivers/staging/epl/amix86.c b/drivers/staging/epl/amix86.c index 9f742384dac..a2e54b6755a 100644 --- a/drivers/staging/epl/amix86.c +++ b/drivers/staging/epl/amix86.c | |||
@@ -119,7 +119,7 @@ typedef struct { | |||
119 | 119 | ||
120 | //------------< write BYTE in big endian >-------------------------- | 120 | //------------< write BYTE in big endian >-------------------------- |
121 | /* | 121 | /* |
122 | void PUBLIC AmiSetByteToBe (void FAR* pAddr_p, BYTE bByteVal_p) | 122 | void AmiSetByteToBe (void FAR* pAddr_p, BYTE bByteVal_p) |
123 | { | 123 | { |
124 | 124 | ||
125 | *(BYTE FAR*)pAddr_p = bByteVal_p; | 125 | *(BYTE FAR*)pAddr_p = bByteVal_p; |
@@ -129,7 +129,7 @@ void PUBLIC AmiSetByteToBe (void FAR* pAddr_p, BYTE bByteVal_p) | |||
129 | 129 | ||
130 | //------------< write WORD in big endian >-------------------------- | 130 | //------------< write WORD in big endian >-------------------------- |
131 | 131 | ||
132 | INLINE_FUNCTION void PUBLIC AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p) | 132 | INLINE_FUNCTION void AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p) |
133 | { | 133 | { |
134 | twStruct FAR *pwStruct; | 134 | twStruct FAR *pwStruct; |
135 | twStruct wValue; | 135 | twStruct wValue; |
@@ -144,8 +144,7 @@ INLINE_FUNCTION void PUBLIC AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p) | |||
144 | 144 | ||
145 | //------------< write DWORD in big endian >------------------------- | 145 | //------------< write DWORD in big endian >------------------------- |
146 | 146 | ||
147 | INLINE_FUNCTION void PUBLIC AmiSetDwordToBe(void FAR * pAddr_p, | 147 | INLINE_FUNCTION void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) |
148 | DWORD dwDwordVal_p) | ||
149 | { | 148 | { |
150 | tdwStruct FAR *pdwStruct; | 149 | tdwStruct FAR *pdwStruct; |
151 | tdwStruct dwValue; | 150 | tdwStruct dwValue; |
@@ -178,7 +177,7 @@ INLINE_FUNCTION void PUBLIC AmiSetDwordToBe(void FAR * pAddr_p, | |||
178 | 177 | ||
179 | //------------< write BYTE in little endian >-------------------------- | 178 | //------------< write BYTE in little endian >-------------------------- |
180 | /* | 179 | /* |
181 | void PUBLIC AmiSetByteToLe (void FAR* pAddr_p, BYTE bByteVal_p) | 180 | void AmiSetByteToLe (void FAR* pAddr_p, BYTE bByteVal_p) |
182 | { | 181 | { |
183 | 182 | ||
184 | *(BYTE FAR*)pAddr_p = bByteVal_p; | 183 | *(BYTE FAR*)pAddr_p = bByteVal_p; |
@@ -188,7 +187,7 @@ void PUBLIC AmiSetByteToLe (void FAR* pAddr_p, BYTE bByteVal_p) | |||
188 | 187 | ||
189 | //------------< write WORD in little endian >-------------------------- | 188 | //------------< write WORD in little endian >-------------------------- |
190 | 189 | ||
191 | INLINE_FUNCTION void PUBLIC AmiSetWordToLe(void FAR * pAddr_p, WORD wWordVal_p) | 190 | INLINE_FUNCTION void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p) |
192 | { | 191 | { |
193 | twStruct FAR *pwStruct; | 192 | twStruct FAR *pwStruct; |
194 | 193 | ||
@@ -199,8 +198,7 @@ INLINE_FUNCTION void PUBLIC AmiSetWordToLe(void FAR * pAddr_p, WORD wWordVal_p) | |||
199 | 198 | ||
200 | //------------< write DWORD in little endian >------------------------- | 199 | //------------< write DWORD in little endian >------------------------- |
201 | 200 | ||
202 | INLINE_FUNCTION void PUBLIC AmiSetDwordToLe(void FAR * pAddr_p, | 201 | INLINE_FUNCTION void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) |
203 | DWORD dwDwordVal_p) | ||
204 | { | 202 | { |
205 | tdwStruct FAR *pdwStruct; | 203 | tdwStruct FAR *pdwStruct; |
206 | 204 | ||
@@ -226,7 +224,7 @@ INLINE_FUNCTION void PUBLIC AmiSetDwordToLe(void FAR * pAddr_p, | |||
226 | 224 | ||
227 | //------------< read BYTE in big endian >--------------------------- | 225 | //------------< read BYTE in big endian >--------------------------- |
228 | /* | 226 | /* |
229 | BYTE PUBLIC AmiGetByteFromBe (void FAR* pAddr_p) | 227 | BYTE AmiGetByteFromBe (void FAR* pAddr_p) |
230 | { | 228 | { |
231 | 229 | ||
232 | return ( *(BYTE FAR*)pAddr_p ); | 230 | return ( *(BYTE FAR*)pAddr_p ); |
@@ -236,7 +234,7 @@ BYTE PUBLIC AmiGetByteFromBe (void FAR* pAddr_p) | |||
236 | 234 | ||
237 | //------------< read WORD in big endian >--------------------------- | 235 | //------------< read WORD in big endian >--------------------------- |
238 | 236 | ||
239 | INLINE_FUNCTION WORD PUBLIC AmiGetWordFromBe(void FAR * pAddr_p) | 237 | INLINE_FUNCTION WORD AmiGetWordFromBe(void FAR *pAddr_p) |
240 | { | 238 | { |
241 | twStruct FAR *pwStruct; | 239 | twStruct FAR *pwStruct; |
242 | twStruct wValue; | 240 | twStruct wValue; |
@@ -252,7 +250,7 @@ INLINE_FUNCTION WORD PUBLIC AmiGetWordFromBe(void FAR * pAddr_p) | |||
252 | 250 | ||
253 | //------------< read DWORD in big endian >-------------------------- | 251 | //------------< read DWORD in big endian >-------------------------- |
254 | 252 | ||
255 | INLINE_FUNCTION DWORD PUBLIC AmiGetDwordFromBe(void FAR * pAddr_p) | 253 | INLINE_FUNCTION DWORD AmiGetDwordFromBe(void FAR *pAddr_p) |
256 | { | 254 | { |
257 | tdwStruct FAR *pdwStruct; | 255 | tdwStruct FAR *pdwStruct; |
258 | tdwStruct dwValue; | 256 | tdwStruct dwValue; |
@@ -285,7 +283,7 @@ INLINE_FUNCTION DWORD PUBLIC AmiGetDwordFromBe(void FAR * pAddr_p) | |||
285 | 283 | ||
286 | //------------< read BYTE in little endian >--------------------------- | 284 | //------------< read BYTE in little endian >--------------------------- |
287 | /* | 285 | /* |
288 | BYTE PUBLIC AmiGetByteFromLe (void FAR* pAddr_p) | 286 | BYTE AmiGetByteFromLe (void FAR* pAddr_p) |
289 | { | 287 | { |
290 | 288 | ||
291 | return ( *(BYTE FAR*)pAddr_p ); | 289 | return ( *(BYTE FAR*)pAddr_p ); |
@@ -295,24 +293,22 @@ BYTE PUBLIC AmiGetByteFromLe (void FAR* pAddr_p) | |||
295 | 293 | ||
296 | //------------< read WORD in little endian >--------------------------- | 294 | //------------< read WORD in little endian >--------------------------- |
297 | 295 | ||
298 | INLINE_FUNCTION WORD PUBLIC AmiGetWordFromLe(void FAR * pAddr_p) | 296 | INLINE_FUNCTION WORD AmiGetWordFromLe(void FAR *pAddr_p) |
299 | { | 297 | { |
300 | twStruct FAR *pwStruct; | 298 | twStruct FAR *pwStruct; |
301 | 299 | ||
302 | pwStruct = (twStruct FAR *) pAddr_p; | 300 | pwStruct = (twStruct FAR *) pAddr_p; |
303 | return (pwStruct->m_wWord); | 301 | return (pwStruct->m_wWord); |
304 | |||
305 | } | 302 | } |
306 | 303 | ||
307 | //------------< read DWORD in little endian >-------------------------- | 304 | //------------< read DWORD in little endian >-------------------------- |
308 | 305 | ||
309 | INLINE_FUNCTION DWORD PUBLIC AmiGetDwordFromLe(void FAR * pAddr_p) | 306 | INLINE_FUNCTION DWORD AmiGetDwordFromLe(void FAR *pAddr_p) |
310 | { | 307 | { |
311 | tdwStruct FAR *pdwStruct; | 308 | tdwStruct FAR *pdwStruct; |
312 | 309 | ||
313 | pdwStruct = (tdwStruct FAR *) pAddr_p; | 310 | pdwStruct = (tdwStruct FAR *) pAddr_p; |
314 | return (pdwStruct->m_dwDword); | 311 | return (pdwStruct->m_dwDword); |
315 | |||
316 | } | 312 | } |
317 | 313 | ||
318 | //--------------------------------------------------------------------------- | 314 | //--------------------------------------------------------------------------- |
@@ -330,14 +326,11 @@ INLINE_FUNCTION DWORD PUBLIC AmiGetDwordFromLe(void FAR * pAddr_p) | |||
330 | // | 326 | // |
331 | //--------------------------------------------------------------------------- | 327 | //--------------------------------------------------------------------------- |
332 | 328 | ||
333 | INLINE_FUNCTION void PUBLIC AmiSetDword24ToBe(void FAR * pAddr_p, | 329 | INLINE_FUNCTION void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) |
334 | DWORD dwDwordVal_p) | ||
335 | { | 330 | { |
336 | |||
337 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[2]; | 331 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[2]; |
338 | ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; | 332 | ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; |
339 | ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & dwDwordVal_p)[0]; | 333 | ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & dwDwordVal_p)[0]; |
340 | |||
341 | } | 334 | } |
342 | 335 | ||
343 | //--------------------------------------------------------------------------- | 336 | //--------------------------------------------------------------------------- |
@@ -355,14 +348,11 @@ INLINE_FUNCTION void PUBLIC AmiSetDword24ToBe(void FAR * pAddr_p, | |||
355 | // | 348 | // |
356 | //--------------------------------------------------------------------------- | 349 | //--------------------------------------------------------------------------- |
357 | 350 | ||
358 | INLINE_FUNCTION void PUBLIC AmiSetDword24ToLe(void FAR * pAddr_p, | 351 | INLINE_FUNCTION void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) |
359 | DWORD dwDwordVal_p) | ||
360 | { | 352 | { |
361 | |||
362 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[0]; | 353 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[0]; |
363 | ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; | 354 | ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; |
364 | ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & dwDwordVal_p)[2]; | 355 | ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & dwDwordVal_p)[2]; |
365 | |||
366 | } | 356 | } |
367 | 357 | ||
368 | //--------------------------------------------------------------------------- | 358 | //--------------------------------------------------------------------------- |
@@ -378,17 +368,14 @@ INLINE_FUNCTION void PUBLIC AmiSetDword24ToLe(void FAR * pAddr_p, | |||
378 | // State: not tested | 368 | // State: not tested |
379 | // | 369 | // |
380 | //--------------------------------------------------------------------------- | 370 | //--------------------------------------------------------------------------- |
381 | 371 | INLINE_FUNCTION DWORD AmiGetDword24FromBe(void FAR *pAddr_p) | |
382 | INLINE_FUNCTION DWORD PUBLIC AmiGetDword24FromBe(void FAR * pAddr_p) | ||
383 | { | 372 | { |
384 | |||
385 | tdwStruct dwStruct; | 373 | tdwStruct dwStruct; |
386 | 374 | ||
387 | dwStruct.m_dwDword = AmiGetDwordFromBe(pAddr_p); | 375 | dwStruct.m_dwDword = AmiGetDwordFromBe(pAddr_p); |
388 | dwStruct.m_dwDword >>= 8; | 376 | dwStruct.m_dwDword >>= 8; |
389 | 377 | ||
390 | return (dwStruct.m_dwDword); | 378 | return (dwStruct.m_dwDword); |
391 | |||
392 | } | 379 | } |
393 | 380 | ||
394 | //--------------------------------------------------------------------------- | 381 | //--------------------------------------------------------------------------- |
@@ -404,17 +391,14 @@ INLINE_FUNCTION DWORD PUBLIC AmiGetDword24FromBe(void FAR * pAddr_p) | |||
404 | // State: not tested | 391 | // State: not tested |
405 | // | 392 | // |
406 | //--------------------------------------------------------------------------- | 393 | //--------------------------------------------------------------------------- |
407 | 394 | INLINE_FUNCTION DWORD AmiGetDword24FromLe(void FAR *pAddr_p) | |
408 | INLINE_FUNCTION DWORD PUBLIC AmiGetDword24FromLe(void FAR * pAddr_p) | ||
409 | { | 395 | { |
410 | |||
411 | tdwStruct dwStruct; | 396 | tdwStruct dwStruct; |
412 | 397 | ||
413 | dwStruct.m_dwDword = AmiGetDwordFromLe(pAddr_p); | 398 | dwStruct.m_dwDword = AmiGetDwordFromLe(pAddr_p); |
414 | dwStruct.m_dwDword &= 0x00FFFFFF; | 399 | dwStruct.m_dwDword &= 0x00FFFFFF; |
415 | 400 | ||
416 | return (dwStruct.m_dwDword); | 401 | return (dwStruct.m_dwDword); |
417 | |||
418 | } | 402 | } |
419 | 403 | ||
420 | //#ifdef USE_VAR64 | 404 | //#ifdef USE_VAR64 |
@@ -433,11 +417,8 @@ INLINE_FUNCTION DWORD PUBLIC AmiGetDword24FromLe(void FAR * pAddr_p) | |||
433 | // State: not tested | 417 | // State: not tested |
434 | // | 418 | // |
435 | //--------------------------------------------------------------------------- | 419 | //--------------------------------------------------------------------------- |
436 | 420 | INLINE_FUNCTION void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) | |
437 | INLINE_FUNCTION void PUBLIC AmiSetQword64ToBe(void FAR * pAddr_p, | ||
438 | QWORD qwQwordVal_p) | ||
439 | { | 421 | { |
440 | |||
441 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[7]; | 422 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[7]; |
442 | ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[6]; | 423 | ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[6]; |
443 | ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & qwQwordVal_p)[5]; | 424 | ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & qwQwordVal_p)[5]; |
@@ -446,7 +427,6 @@ INLINE_FUNCTION void PUBLIC AmiSetQword64ToBe(void FAR * pAddr_p, | |||
446 | ((BYTE FAR *) pAddr_p)[5] = ((BYTE FAR *) & qwQwordVal_p)[2]; | 427 | ((BYTE FAR *) pAddr_p)[5] = ((BYTE FAR *) & qwQwordVal_p)[2]; |
447 | ((BYTE FAR *) pAddr_p)[6] = ((BYTE FAR *) & qwQwordVal_p)[1]; | 428 | ((BYTE FAR *) pAddr_p)[6] = ((BYTE FAR *) & qwQwordVal_p)[1]; |
448 | ((BYTE FAR *) pAddr_p)[7] = ((BYTE FAR *) & qwQwordVal_p)[0]; | 429 | ((BYTE FAR *) pAddr_p)[7] = ((BYTE FAR *) & qwQwordVal_p)[0]; |
449 | |||
450 | } | 430 | } |
451 | 431 | ||
452 | //--------------------------------------------------------------------------- | 432 | //--------------------------------------------------------------------------- |
@@ -463,16 +443,12 @@ INLINE_FUNCTION void PUBLIC AmiSetQword64ToBe(void FAR * pAddr_p, | |||
463 | // State: not tested | 443 | // State: not tested |
464 | // | 444 | // |
465 | //--------------------------------------------------------------------------- | 445 | //--------------------------------------------------------------------------- |
466 | 446 | INLINE_FUNCTION void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) | |
467 | INLINE_FUNCTION void PUBLIC AmiSetQword64ToLe(void FAR * pAddr_p, | ||
468 | QWORD qwQwordVal_p) | ||
469 | { | 447 | { |
470 | |||
471 | QWORD FAR *pqwDst; | 448 | QWORD FAR *pqwDst; |
472 | 449 | ||
473 | pqwDst = (QWORD FAR *) pAddr_p; | 450 | pqwDst = (QWORD FAR *) pAddr_p; |
474 | *pqwDst = qwQwordVal_p; | 451 | *pqwDst = qwQwordVal_p; |
475 | |||
476 | } | 452 | } |
477 | 453 | ||
478 | //--------------------------------------------------------------------------- | 454 | //--------------------------------------------------------------------------- |
@@ -488,10 +464,8 @@ INLINE_FUNCTION void PUBLIC AmiSetQword64ToLe(void FAR * pAddr_p, | |||
488 | // State: not tested | 464 | // State: not tested |
489 | // | 465 | // |
490 | //--------------------------------------------------------------------------- | 466 | //--------------------------------------------------------------------------- |
491 | 467 | INLINE_FUNCTION QWORD AmiGetQword64FromBe(void FAR *pAddr_p) | |
492 | INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromBe(void FAR * pAddr_p) | ||
493 | { | 468 | { |
494 | |||
495 | tqwStruct qwStruct; | 469 | tqwStruct qwStruct; |
496 | 470 | ||
497 | ((BYTE FAR *) & qwStruct.m_qwQword)[0] = ((BYTE FAR *) pAddr_p)[7]; | 471 | ((BYTE FAR *) & qwStruct.m_qwQword)[0] = ((BYTE FAR *) pAddr_p)[7]; |
@@ -504,7 +478,6 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromBe(void FAR * pAddr_p) | |||
504 | ((BYTE FAR *) & qwStruct.m_qwQword)[7] = ((BYTE FAR *) pAddr_p)[0]; | 478 | ((BYTE FAR *) & qwStruct.m_qwQword)[7] = ((BYTE FAR *) pAddr_p)[0]; |
505 | 479 | ||
506 | return (qwStruct.m_qwQword); | 480 | return (qwStruct.m_qwQword); |
507 | |||
508 | } | 481 | } |
509 | 482 | ||
510 | //--------------------------------------------------------------------------- | 483 | //--------------------------------------------------------------------------- |
@@ -520,10 +493,8 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromBe(void FAR * pAddr_p) | |||
520 | // State: not tested | 493 | // State: not tested |
521 | // | 494 | // |
522 | //--------------------------------------------------------------------------- | 495 | //--------------------------------------------------------------------------- |
523 | 496 | INLINE_FUNCTION QWORD AmiGetQword64FromLe(void FAR *pAddr_p) | |
524 | INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromLe(void FAR * pAddr_p) | ||
525 | { | 497 | { |
526 | |||
527 | tqwStruct FAR *pqwStruct; | 498 | tqwStruct FAR *pqwStruct; |
528 | tqwStruct qwStruct; | 499 | tqwStruct qwStruct; |
529 | 500 | ||
@@ -531,7 +502,6 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromLe(void FAR * pAddr_p) | |||
531 | qwStruct.m_qwQword = pqwStruct->m_qwQword; | 502 | qwStruct.m_qwQword = pqwStruct->m_qwQword; |
532 | 503 | ||
533 | return (qwStruct.m_qwQword); | 504 | return (qwStruct.m_qwQword); |
534 | |||
535 | } | 505 | } |
536 | 506 | ||
537 | //--------------------------------------------------------------------------- | 507 | //--------------------------------------------------------------------------- |
@@ -549,8 +519,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromLe(void FAR * pAddr_p) | |||
549 | // | 519 | // |
550 | //--------------------------------------------------------------------------- | 520 | //--------------------------------------------------------------------------- |
551 | 521 | ||
552 | INLINE_FUNCTION void PUBLIC AmiSetQword40ToBe(void FAR * pAddr_p, | 522 | INLINE_FUNCTION void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) |
553 | QWORD qwQwordVal_p) | ||
554 | { | 523 | { |
555 | 524 | ||
556 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[4]; | 525 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[4]; |
@@ -576,8 +545,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword40ToBe(void FAR * pAddr_p, | |||
576 | // | 545 | // |
577 | //--------------------------------------------------------------------------- | 546 | //--------------------------------------------------------------------------- |
578 | 547 | ||
579 | INLINE_FUNCTION void PUBLIC AmiSetQword40ToLe(void FAR * pAddr_p, | 548 | INLINE_FUNCTION void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) |
580 | QWORD qwQwordVal_p) | ||
581 | { | 549 | { |
582 | 550 | ||
583 | ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; | 551 | ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; |
@@ -599,7 +567,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword40ToLe(void FAR * pAddr_p, | |||
599 | // | 567 | // |
600 | //--------------------------------------------------------------------------- | 568 | //--------------------------------------------------------------------------- |
601 | 569 | ||
602 | INLINE_FUNCTION QWORD PUBLIC AmiGetQword40FromBe(void FAR * pAddr_p) | 570 | INLINE_FUNCTION QWORD AmiGetQword40FromBe(void FAR *pAddr_p) |
603 | { | 571 | { |
604 | 572 | ||
605 | tqwStruct qwStruct; | 573 | tqwStruct qwStruct; |
@@ -625,7 +593,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword40FromBe(void FAR * pAddr_p) | |||
625 | // | 593 | // |
626 | //--------------------------------------------------------------------------- | 594 | //--------------------------------------------------------------------------- |
627 | 595 | ||
628 | INLINE_FUNCTION QWORD PUBLIC AmiGetQword40FromLe(void FAR * pAddr_p) | 596 | INLINE_FUNCTION QWORD AmiGetQword40FromLe(void FAR *pAddr_p) |
629 | { | 597 | { |
630 | 598 | ||
631 | tqwStruct qwStruct; | 599 | tqwStruct qwStruct; |
@@ -652,8 +620,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword40FromLe(void FAR * pAddr_p) | |||
652 | // | 620 | // |
653 | //--------------------------------------------------------------------------- | 621 | //--------------------------------------------------------------------------- |
654 | 622 | ||
655 | INLINE_FUNCTION void PUBLIC AmiSetQword48ToBe(void FAR * pAddr_p, | 623 | INLINE_FUNCTION void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) |
656 | QWORD qwQwordVal_p) | ||
657 | { | 624 | { |
658 | 625 | ||
659 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[5]; | 626 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[5]; |
@@ -680,8 +647,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword48ToBe(void FAR * pAddr_p, | |||
680 | // | 647 | // |
681 | //--------------------------------------------------------------------------- | 648 | //--------------------------------------------------------------------------- |
682 | 649 | ||
683 | INLINE_FUNCTION void PUBLIC AmiSetQword48ToLe(void FAR * pAddr_p, | 650 | INLINE_FUNCTION void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) |
684 | QWORD qwQwordVal_p) | ||
685 | { | 651 | { |
686 | 652 | ||
687 | ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; | 653 | ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; |
@@ -703,7 +669,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword48ToLe(void FAR * pAddr_p, | |||
703 | // | 669 | // |
704 | //--------------------------------------------------------------------------- | 670 | //--------------------------------------------------------------------------- |
705 | 671 | ||
706 | INLINE_FUNCTION QWORD PUBLIC AmiGetQword48FromBe(void FAR * pAddr_p) | 672 | INLINE_FUNCTION QWORD AmiGetQword48FromBe(void FAR *pAddr_p) |
707 | { | 673 | { |
708 | 674 | ||
709 | tqwStruct qwStruct; | 675 | tqwStruct qwStruct; |
@@ -729,7 +695,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword48FromBe(void FAR * pAddr_p) | |||
729 | // | 695 | // |
730 | //--------------------------------------------------------------------------- | 696 | //--------------------------------------------------------------------------- |
731 | 697 | ||
732 | INLINE_FUNCTION QWORD PUBLIC AmiGetQword48FromLe(void FAR * pAddr_p) | 698 | INLINE_FUNCTION QWORD AmiGetQword48FromLe(void FAR *pAddr_p) |
733 | { | 699 | { |
734 | 700 | ||
735 | tqwStruct qwStruct; | 701 | tqwStruct qwStruct; |
@@ -756,8 +722,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword48FromLe(void FAR * pAddr_p) | |||
756 | // | 722 | // |
757 | //--------------------------------------------------------------------------- | 723 | //--------------------------------------------------------------------------- |
758 | 724 | ||
759 | INLINE_FUNCTION void PUBLIC AmiSetQword56ToBe(void FAR * pAddr_p, | 725 | INLINE_FUNCTION void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) |
760 | QWORD qwQwordVal_p) | ||
761 | { | 726 | { |
762 | 727 | ||
763 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[6]; | 728 | ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[6]; |
@@ -785,8 +750,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword56ToBe(void FAR * pAddr_p, | |||
785 | // | 750 | // |
786 | //--------------------------------------------------------------------------- | 751 | //--------------------------------------------------------------------------- |
787 | 752 | ||
788 | INLINE_FUNCTION void PUBLIC AmiSetQword56ToLe(void FAR * pAddr_p, | 753 | INLINE_FUNCTION void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) |
789 | QWORD qwQwordVal_p) | ||
790 | { | 754 | { |
791 | 755 | ||
792 | ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; | 756 | ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; |
@@ -809,7 +773,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword56ToLe(void FAR * pAddr_p, | |||
809 | // | 773 | // |
810 | //--------------------------------------------------------------------------- | 774 | //--------------------------------------------------------------------------- |
811 | 775 | ||
812 | INLINE_FUNCTION QWORD PUBLIC AmiGetQword56FromBe(void FAR * pAddr_p) | 776 | INLINE_FUNCTION QWORD AmiGetQword56FromBe(void FAR *pAddr_p) |
813 | { | 777 | { |
814 | 778 | ||
815 | tqwStruct qwStruct; | 779 | tqwStruct qwStruct; |
@@ -835,7 +799,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword56FromBe(void FAR * pAddr_p) | |||
835 | // | 799 | // |
836 | //--------------------------------------------------------------------------- | 800 | //--------------------------------------------------------------------------- |
837 | 801 | ||
838 | INLINE_FUNCTION QWORD PUBLIC AmiGetQword56FromLe(void FAR * pAddr_p) | 802 | INLINE_FUNCTION QWORD AmiGetQword56FromLe(void FAR *pAddr_p) |
839 | { | 803 | { |
840 | 804 | ||
841 | tqwStruct qwStruct; | 805 | tqwStruct qwStruct; |
@@ -862,8 +826,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword56FromLe(void FAR * pAddr_p) | |||
862 | // | 826 | // |
863 | //--------------------------------------------------------------------------- | 827 | //--------------------------------------------------------------------------- |
864 | 828 | ||
865 | INLINE_FUNCTION void PUBLIC AmiSetTimeOfDay(void FAR * pAddr_p, | 829 | INLINE_FUNCTION void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) |
866 | tTimeOfDay FAR * pTimeOfDay_p) | ||
867 | { | 830 | { |
868 | 831 | ||
869 | AmiSetDwordToLe(((BYTE FAR *) pAddr_p), | 832 | AmiSetDwordToLe(((BYTE FAR *) pAddr_p), |
@@ -887,8 +850,7 @@ INLINE_FUNCTION void PUBLIC AmiSetTimeOfDay(void FAR * pAddr_p, | |||
887 | // | 850 | // |
888 | //--------------------------------------------------------------------------- | 851 | //--------------------------------------------------------------------------- |
889 | 852 | ||
890 | INLINE_FUNCTION void PUBLIC AmiGetTimeOfDay(void FAR * pAddr_p, | 853 | INLINE_FUNCTION void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) |
891 | tTimeOfDay FAR * pTimeOfDay_p) | ||
892 | { | 854 | { |
893 | 855 | ||
894 | pTimeOfDay_p->m_dwMs = | 856 | pTimeOfDay_p->m_dwMs = |
diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c index 263fa042291..6be30d6b4a2 100644 --- a/drivers/staging/epl/demo_main.c +++ b/drivers/staging/epl/demo_main.c | |||
@@ -118,7 +118,7 @@ MODULE_DESCRIPTION("EPL MN demo"); | |||
118 | 118 | ||
119 | // TracePoint support for realtime-debugging | 119 | // TracePoint support for realtime-debugging |
120 | #ifdef _DBG_TRACE_POINTS_ | 120 | #ifdef _DBG_TRACE_POINTS_ |
121 | void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); | 121 | void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); |
122 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) | 122 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) |
123 | #else | 123 | #else |
124 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) | 124 | #define TGT_DBG_SIGNAL_TRACE_POINT(p) |
@@ -188,13 +188,13 @@ module_param_named(cyclelen, uiCycleLen_g, uint, 0); | |||
188 | // this function prototype here. If you want to use more than one Epl | 188 | // this function prototype here. If you want to use more than one Epl |
189 | // instances then the function name of each object dictionary has to differ. | 189 | // instances then the function name of each object dictionary has to differ. |
190 | 190 | ||
191 | tEplKernel PUBLIC EplObdInitRam(tEplObdInitParam MEM * pInitParam_p); | 191 | tEplKernel EplObdInitRam(tEplObdInitParam MEM * pInitParam_p); |
192 | 192 | ||
193 | tEplKernel PUBLIC AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) | 193 | tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) |
194 | tEplApiEventArg * pEventArg_p, // IN: event argument (union) | 194 | tEplApiEventArg *pEventArg_p, // IN: event argument (union) |
195 | void GENERIC * pUserArg_p); | 195 | void GENERIC *pUserArg_p); |
196 | 196 | ||
197 | tEplKernel PUBLIC AppCbSync(void); | 197 | tEplKernel AppCbSync(void); |
198 | 198 | ||
199 | static int __init EplLinInit(void); | 199 | static int __init EplLinInit(void); |
200 | static void __exit EplLinExit(void); | 200 | static void __exit EplLinExit(void); |
@@ -484,9 +484,9 @@ static void __exit EplLinExit(void) | |||
484 | // | 484 | // |
485 | //--------------------------------------------------------------------------- | 485 | //--------------------------------------------------------------------------- |
486 | 486 | ||
487 | tEplKernel PUBLIC AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) | 487 | tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) |
488 | tEplApiEventArg * pEventArg_p, // IN: event argument (union) | 488 | tEplApiEventArg *pEventArg_p, // IN: event argument (union) |
489 | void GENERIC * pUserArg_p) | 489 | void GENERIC *pUserArg_p) |
490 | { | 490 | { |
491 | tEplKernel EplRet = kEplSuccessful; | 491 | tEplKernel EplRet = kEplSuccessful; |
492 | 492 | ||
@@ -802,7 +802,7 @@ tEplKernel PUBLIC AppCbEvent(tEplApiEventType EventType_p, // IN: event type (en | |||
802 | // | 802 | // |
803 | //--------------------------------------------------------------------------- | 803 | //--------------------------------------------------------------------------- |
804 | 804 | ||
805 | tEplKernel PUBLIC AppCbSync(void) | 805 | tEplKernel AppCbSync(void) |
806 | { | 806 | { |
807 | tEplKernel EplRet = kEplSuccessful; | 807 | tEplKernel EplRet = kEplSuccessful; |
808 | 808 | ||
diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 4eb64ecab0f..9cd6b890ee0 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h | |||
@@ -180,7 +180,6 @@ | |||
180 | #endif | 180 | #endif |
181 | 181 | ||
182 | #define REENTRANT | 182 | #define REENTRANT |
183 | #define PUBLIC | ||
184 | 183 | ||
185 | #define TRACE printk | 184 | #define TRACE printk |
186 | 185 | ||
diff --git a/drivers/staging/epl/kernel/EplErrorHandlerk.h b/drivers/staging/epl/kernel/EplErrorHandlerk.h index 4a67ef88b97..b9d53dc6085 100644 --- a/drivers/staging/epl/kernel/EplErrorHandlerk.h +++ b/drivers/staging/epl/kernel/EplErrorHandlerk.h | |||
@@ -86,15 +86,15 @@ | |||
86 | //--------------------------------------------------------------------------- | 86 | //--------------------------------------------------------------------------- |
87 | 87 | ||
88 | // init function | 88 | // init function |
89 | tEplKernel PUBLIC EplErrorHandlerkInit(void); | 89 | tEplKernel EplErrorHandlerkInit(void); |
90 | 90 | ||
91 | // add instance | 91 | // add instance |
92 | tEplKernel PUBLIC EplErrorHandlerkAddInstance(void); | 92 | tEplKernel EplErrorHandlerkAddInstance(void); |
93 | 93 | ||
94 | // delete instance | 94 | // delete instance |
95 | tEplKernel PUBLIC EplErrorHandlerkDelInstance(void); | 95 | tEplKernel EplErrorHandlerkDelInstance(void); |
96 | 96 | ||
97 | // processes error events | 97 | // processes error events |
98 | tEplKernel PUBLIC EplErrorHandlerkProcess(tEplEvent * pEvent_p); | 98 | tEplKernel EplErrorHandlerkProcess(tEplEvent *pEvent_p); |
99 | 99 | ||
100 | #endif // #ifndef _EPL_ERRORHANDLERK_H_ | 100 | #endif // #ifndef _EPL_ERRORHANDLERK_H_ |
diff --git a/drivers/staging/epl/kernel/EplEventk.h b/drivers/staging/epl/kernel/EplEventk.h index 1d25aaa2ed4..29c3e94de08 100644 --- a/drivers/staging/epl/kernel/EplEventk.h +++ b/drivers/staging/epl/kernel/EplEventk.h | |||
@@ -86,23 +86,23 @@ | |||
86 | //--------------------------------------------------------------------------- | 86 | //--------------------------------------------------------------------------- |
87 | 87 | ||
88 | // init function | 88 | // init function |
89 | tEplKernel PUBLIC EplEventkInit(tEplSyncCb fpSyncCb); | 89 | tEplKernel EplEventkInit(tEplSyncCb fpSyncCb); |
90 | 90 | ||
91 | // add instance | 91 | // add instance |
92 | tEplKernel PUBLIC EplEventkAddInstance(tEplSyncCb fpSyncCb); | 92 | tEplKernel EplEventkAddInstance(tEplSyncCb fpSyncCb); |
93 | 93 | ||
94 | // delete instance | 94 | // delete instance |
95 | tEplKernel PUBLIC EplEventkDelInstance(void); | 95 | tEplKernel EplEventkDelInstance(void); |
96 | 96 | ||
97 | // Kernelthread that dispatches events in kernelspace | 97 | // Kernelthread that dispatches events in kernelspace |
98 | tEplKernel PUBLIC EplEventkProcess(tEplEvent * pEvent_p); | 98 | tEplKernel EplEventkProcess(tEplEvent *pEvent_p); |
99 | 99 | ||
100 | // post events from kernelspace | 100 | // post events from kernelspace |
101 | tEplKernel PUBLIC EplEventkPost(tEplEvent * pEvent_p); | 101 | tEplKernel EplEventkPost(tEplEvent *pEvent_p); |
102 | 102 | ||
103 | // post errorevents from kernelspace | 103 | // post errorevents from kernelspace |
104 | tEplKernel PUBLIC EplEventkPostError(tEplEventSource EventSource_p, | 104 | tEplKernel EplEventkPostError(tEplEventSource EventSource_p, |
105 | tEplKernel EplError_p, | 105 | tEplKernel EplError_p, |
106 | unsigned int uiArgSize_p, void *pArg_p); | 106 | unsigned int uiArgSize_p, void *pArg_p); |
107 | 107 | ||
108 | #endif // #ifndef _EPL_EVENTK_H_ | 108 | #endif // #ifndef _EPL_EVENTK_H_ |
diff --git a/drivers/staging/epl/kernel/EplNmtk.h b/drivers/staging/epl/kernel/EplNmtk.h index 53409cc8992..599ee8c246b 100644 --- a/drivers/staging/epl/kernel/EplNmtk.h +++ b/drivers/staging/epl/kernel/EplNmtk.h | |||
@@ -86,19 +86,15 @@ | |||
86 | // function prototypes | 86 | // function prototypes |
87 | //--------------------------------------------------------------------------- | 87 | //--------------------------------------------------------------------------- |
88 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTK)) != 0) | 88 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTK)) != 0) |
89 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR); | 89 | EPLDLLEXPORT tEplKernel EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR); |
90 | 90 | ||
91 | EPLDLLEXPORT tEplKernel PUBLIC | 91 | EPLDLLEXPORT tEplKernel EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR); |
92 | EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR); | ||
93 | 92 | ||
94 | EPLDLLEXPORT tEplKernel PUBLIC | 93 | EPLDLLEXPORT tEplKernel EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR); |
95 | EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR); | ||
96 | 94 | ||
97 | EPLDLLEXPORT tEplKernel PUBLIC EplNmtkProcess(EPL_MCO_DECL_PTR_INSTANCE_PTR_ | 95 | EPLDLLEXPORT tEplKernel EplNmtkProcess(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplEvent *pEvent_p); |
98 | tEplEvent * pEvent_p); | ||
99 | 96 | ||
100 | EPLDLLEXPORT tEplNmtState PUBLIC | 97 | EPLDLLEXPORT tEplNmtState EplNmtkGetNmtState(EPL_MCO_DECL_PTR_INSTANCE_PTR); |
101 | EplNmtkGetNmtState(EPL_MCO_DECL_PTR_INSTANCE_PTR); | ||
102 | 98 | ||
103 | #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTK)) != 0) | 99 | #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTK)) != 0) |
104 | 100 | ||
diff --git a/drivers/staging/epl/kernel/EplObdk.h b/drivers/staging/epl/kernel/EplObdk.h index cf9f5837dd3..eafd0bf54be 100644 --- a/drivers/staging/epl/kernel/EplObdk.h +++ b/drivers/staging/epl/kernel/EplObdk.h | |||
@@ -92,104 +92,83 @@ extern BYTE MEM abEplObdTrashObject_g[8]; | |||
92 | //--------------------------------------------------------------------------- | 92 | //--------------------------------------------------------------------------- |
93 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) | 93 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) |
94 | // --------------------------------------------------------------------- | 94 | // --------------------------------------------------------------------- |
95 | EPLDLLEXPORT tEplKernel PUBLIC EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ | 95 | EPLDLLEXPORT tEplKernel EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p); |
96 | tEplObdInitParam MEM * pInitParam_p); | ||
97 | 96 | ||
98 | // --------------------------------------------------------------------- | 97 | // --------------------------------------------------------------------- |
99 | EPLDLLEXPORT tEplKernel PUBLIC EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ | 98 | EPLDLLEXPORT tEplKernel EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p); |
100 | tEplObdInitParam MEM * | ||
101 | pInitParam_p); | ||
102 | 99 | ||
103 | // --------------------------------------------------------------------- | 100 | // --------------------------------------------------------------------- |
104 | EPLDLLEXPORT tEplKernel PUBLIC EplObdDeleteInstance(EPL_MCO_DECL_INSTANCE_PTR); | 101 | EPLDLLEXPORT tEplKernel EplObdDeleteInstance(EPL_MCO_DECL_INSTANCE_PTR); |
105 | 102 | ||
106 | // --------------------------------------------------------------------- | 103 | // --------------------------------------------------------------------- |
107 | EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntry(EPL_MCO_DECL_INSTANCE_PTR_ | 104 | EPLDLLEXPORT tEplKernel EplObdWriteEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
108 | unsigned int uiIndex_p, | 105 | unsigned int uiSubIndex_p, |
109 | unsigned int uiSubIndex_p, | 106 | void *pSrcData_p, |
110 | void *pSrcData_p, | 107 | tEplObdSize Size_p); |
111 | tEplObdSize Size_p); | ||
112 | 108 | ||
113 | // --------------------------------------------------------------------- | 109 | // --------------------------------------------------------------------- |
114 | EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntry(EPL_MCO_DECL_INSTANCE_PTR_ | 110 | EPLDLLEXPORT tEplKernel EplObdReadEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
115 | unsigned int uiIndex_p, | 111 | unsigned int uiSubIndex_p, |
116 | unsigned int uiSubIndex_p, | 112 | void *pDstData_p, |
117 | void *pDstData_p, | 113 | tEplObdSize *pSize_p); |
118 | tEplObdSize * pSize_p); | ||
119 | 114 | ||
120 | // --------------------------------------------------------------------- | 115 | // --------------------------------------------------------------------- |
121 | EPLDLLEXPORT tEplKernel PUBLIC | 116 | EPLDLLEXPORT tEplKernel EplObdSetStoreLoadObjCallback(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdStoreLoadObjCallback fpCallback_p); |
122 | EplObdSetStoreLoadObjCallback(EPL_MCO_DECL_INSTANCE_PTR_ | ||
123 | tEplObdStoreLoadObjCallback fpCallback_p); | ||
124 | 117 | ||
125 | // --------------------------------------------------------------------- | 118 | // --------------------------------------------------------------------- |
126 | EPLDLLEXPORT tEplKernel PUBLIC EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ | 119 | EPLDLLEXPORT tEplKernel EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdPart ObdPart_p, |
127 | tEplObdPart ObdPart_p, | 120 | tEplObdDir Direction_p); |
128 | tEplObdDir Direction_p); | ||
129 | 121 | ||
130 | // --------------------------------------------------------------------- | 122 | // --------------------------------------------------------------------- |
131 | EPLDLLEXPORT tEplKernel PUBLIC EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ | 123 | EPLDLLEXPORT tEplKernel EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ tEplVarParam MEM *pVarParam_p); |
132 | tEplVarParam MEM * pVarParam_p); | ||
133 | 124 | ||
134 | // --------------------------------------------------------------------- | 125 | // --------------------------------------------------------------------- |
135 | EPLDLLEXPORT void *PUBLIC EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ | 126 | EPLDLLEXPORT void *EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
136 | unsigned int uiIndex_p, | 127 | unsigned int uiSubIndex_p); |
137 | unsigned int uiSubIndex_p); | ||
138 | // --------------------------------------------------------------------- | 128 | // --------------------------------------------------------------------- |
139 | EPLDLLEXPORT tEplKernel PUBLIC EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ | 129 | EPLDLLEXPORT tEplKernel EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPtr pUserOd_p); |
140 | tEplObdEntryPtr pUserOd_p); | ||
141 | 130 | ||
142 | // --------------------------------------------------------------------- | 131 | // --------------------------------------------------------------------- |
143 | EPLDLLEXPORT void PUBLIC EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ | 132 | EPLDLLEXPORT void EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdVarEntry MEM *pVarEntry_p, |
144 | tEplObdVarEntry MEM * pVarEntry_p, | 133 | tEplObdType Type_p, |
145 | tEplObdType Type_p, | 134 | tEplObdSize ObdSize_p); |
146 | tEplObdSize ObdSize_p); | ||
147 | 135 | ||
148 | // --------------------------------------------------------------------- | 136 | // --------------------------------------------------------------------- |
149 | EPLDLLEXPORT tEplObdSize PUBLIC EplObdGetDataSize(EPL_MCO_DECL_INSTANCE_PTR_ | 137 | EPLDLLEXPORT tEplObdSize EplObdGetDataSize(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
150 | unsigned int uiIndex_p, | 138 | unsigned int uiSubIndex_p); |
151 | unsigned int uiSubIndex_p); | ||
152 | 139 | ||
153 | // --------------------------------------------------------------------- | 140 | // --------------------------------------------------------------------- |
154 | EPLDLLEXPORT unsigned int PUBLIC EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR); | 141 | EPLDLLEXPORT unsigned int EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR); |
155 | 142 | ||
156 | // --------------------------------------------------------------------- | 143 | // --------------------------------------------------------------------- |
157 | EPLDLLEXPORT tEplKernel PUBLIC EplObdSetNodeId(EPL_MCO_DECL_INSTANCE_PTR_ | 144 | EPLDLLEXPORT tEplKernel EplObdSetNodeId(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiNodeId_p, |
158 | unsigned int uiNodeId_p, | 145 | tEplObdNodeIdType NodeIdType_p); |
159 | tEplObdNodeIdType NodeIdType_p); | ||
160 | 146 | ||
161 | // --------------------------------------------------------------------- | 147 | // --------------------------------------------------------------------- |
162 | EPLDLLEXPORT tEplKernel PUBLIC EplObdIsNumerical(EPL_MCO_DECL_INSTANCE_PTR_ | 148 | EPLDLLEXPORT tEplKernel EplObdIsNumerical(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
163 | unsigned int uiIndex_p, | 149 | unsigned int uiSubIndex_p, |
164 | unsigned int uiSubIndex_p, | 150 | BOOL *pfEntryNumerical); |
165 | BOOL * pfEntryNumerical); | ||
166 | // --------------------------------------------------------------------- | 151 | // --------------------------------------------------------------------- |
167 | EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ | 152 | EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
168 | unsigned int uiIndex_p, | 153 | unsigned int uiSubIndex_p, |
169 | unsigned int uiSubIndex_p, | 154 | void *pSrcData_p, |
170 | void *pSrcData_p, | 155 | tEplObdSize Size_p); |
171 | tEplObdSize Size_p); | ||
172 | 156 | ||
173 | // --------------------------------------------------------------------- | 157 | // --------------------------------------------------------------------- |
174 | EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ | 158 | EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
175 | unsigned int uiIndex_p, | 159 | unsigned int uiSubIndex_p, |
176 | unsigned int uiSubIndex_p, | 160 | void *pDstData_p, |
177 | void *pDstData_p, | 161 | tEplObdSize *pSize_p); |
178 | tEplObdSize * pSize_p); | ||
179 | 162 | ||
180 | // --------------------------------------------------------------------- | 163 | // --------------------------------------------------------------------- |
181 | EPLDLLEXPORT tEplKernel PUBLIC EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ | 164 | EPLDLLEXPORT tEplKernel EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
182 | unsigned int uiIndex_p, | 165 | unsigned int uiSubIndex_p, |
183 | unsigned int uiSubIndex_p, | 166 | tEplObdAccess *pAccessTyp_p); |
184 | tEplObdAccess * | ||
185 | pAccessTyp_p); | ||
186 | 167 | ||
187 | // --------------------------------------------------------------------- | 168 | // --------------------------------------------------------------------- |
188 | EPLDLLEXPORT tEplKernel PUBLIC EplObdSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ | 169 | EPLDLLEXPORT tEplKernel EplObdSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, |
189 | unsigned int uiIndex_p, | 170 | unsigned int uiSubindex_p, |
190 | unsigned int uiSubindex_p, | 171 | tEplObdVarEntry MEM **ppVarEntry_p); |
191 | tEplObdVarEntry MEM ** | ||
192 | ppVarEntry_p); | ||
193 | 172 | ||
194 | #endif // end of #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) | 173 | #endif // end of #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) |
195 | 174 | ||
diff --git a/drivers/staging/epl/kernel/EplTimerHighResk.h b/drivers/staging/epl/kernel/EplTimerHighResk.h index d5d046d4d37..64fb52bef81 100644 --- a/drivers/staging/epl/kernel/EplTimerHighResk.h +++ b/drivers/staging/epl/kernel/EplTimerHighResk.h | |||
@@ -85,25 +85,24 @@ | |||
85 | // function prototypes | 85 | // function prototypes |
86 | //--------------------------------------------------------------------------- | 86 | //--------------------------------------------------------------------------- |
87 | 87 | ||
88 | tEplKernel PUBLIC EplTimerHighReskInit(void); | 88 | tEplKernel EplTimerHighReskInit(void); |
89 | 89 | ||
90 | tEplKernel PUBLIC EplTimerHighReskAddInstance(void); | 90 | tEplKernel EplTimerHighReskAddInstance(void); |
91 | 91 | ||
92 | tEplKernel PUBLIC EplTimerHighReskDelInstance(void); | 92 | tEplKernel EplTimerHighReskDelInstance(void); |
93 | 93 | ||
94 | tEplKernel PUBLIC EplTimerHighReskSetTimerNs(tEplTimerHdl * pTimerHdl_p, | 94 | tEplKernel EplTimerHighReskSetTimerNs(tEplTimerHdl *pTimerHdl_p, |
95 | unsigned long long ullTimeNs_p, | 95 | unsigned long long ullTimeNs_p, |
96 | tEplTimerkCallback pfnCallback_p, | 96 | tEplTimerkCallback pfnCallback_p, |
97 | unsigned long ulArgument_p, | 97 | unsigned long ulArgument_p, |
98 | BOOL fContinuously_p); | 98 | BOOL fContinuously_p); |
99 | 99 | ||
100 | tEplKernel PUBLIC EplTimerHighReskModifyTimerNs(tEplTimerHdl * pTimerHdl_p, | 100 | tEplKernel EplTimerHighReskModifyTimerNs(tEplTimerHdl *pTimerHdl_p, |
101 | unsigned long long ullTimeNs_p, | 101 | unsigned long long ullTimeNs_p, |
102 | tEplTimerkCallback | 102 | tEplTimerkCallback pfnCallback_p, |
103 | pfnCallback_p, | 103 | unsigned long ulArgument_p, |
104 | unsigned long ulArgument_p, | 104 | BOOL fContinuously_p); |
105 | BOOL fContinuously_p); | ||
106 | 105 | ||
107 | tEplKernel PUBLIC EplTimerHighReskDeleteTimer(tEplTimerHdl * pTimerHdl_p); | 106 | tEplKernel EplTimerHighReskDeleteTimer(tEplTimerHdl *pTimerHdl_p); |
108 | 107 | ||
109 | #endif // #ifndef _EPLTIMERHIGHRESK_H_ | 108 | #endif // #ifndef _EPLTIMERHIGHRESK_H_ |
diff --git a/drivers/staging/epl/kernel/EplTimerk.h b/drivers/staging/epl/kernel/EplTimerk.h index 9160e7260de..c3d4ef7071d 100644 --- a/drivers/staging/epl/kernel/EplTimerk.h +++ b/drivers/staging/epl/kernel/EplTimerk.h | |||
@@ -99,20 +99,20 @@ | |||
99 | // function prototypes | 99 | // function prototypes |
100 | //--------------------------------------------------------------------------- | 100 | //--------------------------------------------------------------------------- |
101 | #if EPL_TIMER_USE_USER == FALSE | 101 | #if EPL_TIMER_USE_USER == FALSE |
102 | tEplKernel PUBLIC EplTimerkInit(void); | 102 | tEplKernel EplTimerkInit(void); |
103 | 103 | ||
104 | tEplKernel PUBLIC EplTimerkAddInstance(void); | 104 | tEplKernel EplTimerkAddInstance(void); |
105 | 105 | ||
106 | tEplKernel PUBLIC EplTimerkDelInstance(void); | 106 | tEplKernel EplTimerkDelInstance(void); |
107 | 107 | ||
108 | tEplKernel PUBLIC EplTimerkSetTimerMs(tEplTimerHdl * pTimerHdl_p, | 108 | tEplKernel EplTimerkSetTimerMs(tEplTimerHdl *pTimerHdl_p, |
109 | unsigned long ulTime_p, | 109 | unsigned long ulTime_p, |
110 | tEplTimerArg Argument_p); | 110 | tEplTimerArg Argument_p); |
111 | 111 | ||
112 | tEplKernel PUBLIC EplTimerkModifyTimerMs(tEplTimerHdl * pTimerHdl_p, | 112 | tEplKernel EplTimerkModifyTimerMs(tEplTimerHdl *pTimerHdl_p, |
113 | unsigned long ulTime_p, | 113 | unsigned long ulTime_p, |
114 | tEplTimerArg Argument_p); | 114 | tEplTimerArg Argument_p); |
115 | 115 | ||
116 | tEplKernel PUBLIC EplTimerkDeleteTimer(tEplTimerHdl * pTimerHdl_p); | 116 | tEplKernel EplTimerkDeleteTimer(tEplTimerHdl *pTimerHdl_p); |
117 | #endif | 117 | #endif |
118 | #endif // #ifndef _EPLTIMERK_H_ | 118 | #endif // #ifndef _EPLTIMERK_H_ |
diff --git a/drivers/staging/epl/kernel/VirtualEthernet.h b/drivers/staging/epl/kernel/VirtualEthernet.h index deff8720e37..c6c5433fe9f 100644 --- a/drivers/staging/epl/kernel/VirtualEthernet.h +++ b/drivers/staging/epl/kernel/VirtualEthernet.h | |||
@@ -87,9 +87,9 @@ | |||
87 | 87 | ||
88 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0) | 88 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0) |
89 | 89 | ||
90 | tEplKernel PUBLIC VEthAddInstance(tEplDllkInitParam * pInitParam_p); | 90 | tEplKernel VEthAddInstance(tEplDllkInitParam *pInitParam_p); |
91 | 91 | ||
92 | tEplKernel PUBLIC VEthDelInstance(void); | 92 | tEplKernel VEthDelInstance(void); |
93 | 93 | ||
94 | #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0) | 94 | #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0) |
95 | 95 | ||
diff --git a/drivers/staging/epl/proc_fs.c b/drivers/staging/epl/proc_fs.c index f4910332d3c..c08453d5490 100644 --- a/drivers/staging/epl/proc_fs.c +++ b/drivers/staging/epl/proc_fs.c | |||
@@ -145,10 +145,10 @@ static int EplLinProcRead(char *pcBuffer_p, char **ppcStart_p, off_t Offset_p, | |||
145 | static int EplLinProcWrite(struct file *file, const char __user * buffer, | 145 | static int EplLinProcWrite(struct file *file, const char __user * buffer, |
146 | unsigned long count, void *data); | 146 | unsigned long count, void *data); |
147 | 147 | ||
148 | void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); | 148 | void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); |
149 | void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); | 149 | void TgtDbgPostTraceValue(DWORD dwTraceValue_p); |
150 | 150 | ||
151 | EPLDLLEXPORT DWORD PUBLIC EplIdentuGetRunningRequests(void); | 151 | EPLDLLEXPORT DWORD EplIdentuGetRunningRequests(void); |
152 | 152 | ||
153 | //=========================================================================// | 153 | //=========================================================================// |
154 | // // | 154 | // // |
@@ -191,7 +191,7 @@ tEplKernel EplLinProcFree(void) | |||
191 | //--------------------------------------------------------------------------- | 191 | //--------------------------------------------------------------------------- |
192 | 192 | ||
193 | #ifdef _DBG_TRACE_POINTS_ | 193 | #ifdef _DBG_TRACE_POINTS_ |
194 | void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p) | 194 | void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p) |
195 | { | 195 | { |
196 | 196 | ||
197 | if (bTracePointNumber_p >= | 197 | if (bTracePointNumber_p >= |
@@ -207,7 +207,7 @@ void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p) | |||
207 | 207 | ||
208 | } | 208 | } |
209 | 209 | ||
210 | void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p) | 210 | void TgtDbgPostTraceValue(DWORD dwTraceValue_p) |
211 | { | 211 | { |
212 | 212 | ||
213 | spin_lock_irqsave(&spinlockDbgTraceValue_l, ulDbTraceValueFlags_l); | 213 | spin_lock_irqsave(&spinlockDbgTraceValue_l, ulDbTraceValueFlags_l); |
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_ |