diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-23 16:38:43 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:54:22 -0400 |
commit | 046f45fa714046ac400e22f48ec8ac77e7faf5cc (patch) | |
tree | 452221adc1c1237af391ed662742c7f54abef8d5 | |
parent | d9068d622f6e8aeaba4049b6d4953cebc2b90938 (diff) |
Staging: epl: fix up epl/user/*.h files
Only include a file if it's needed.
Also remove some unused comments from the boilerplate text.
Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/epl/user/EplCfgMau.h | 11 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplDllu.h | 12 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplDlluCal.h | 11 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplEventu.h | 11 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplIdentu.h | 14 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplLedu.h | 18 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtCnu.h | 18 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtMnu.h | 14 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtu.h | 15 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplNmtuCal.h | 15 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplObdu.h | 14 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplObduCal.h | 13 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplPdou.h | 12 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoAsndu.h | 15 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoAsySequ.h | 17 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoComu.h | 17 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplSdoUdpu.h | 13 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplStatusu.h | 14 | ||||
-rw-r--r-- | drivers/staging/epl/user/EplTimeru.h | 16 |
19 files changed, 28 insertions, 242 deletions
diff --git a/drivers/staging/epl/user/EplCfgMau.h b/drivers/staging/epl/user/EplCfgMau.h index b5ee972b90b0..4ac770f1310c 100644 --- a/drivers/staging/epl/user/EplCfgMau.h +++ b/drivers/staging/epl/user/EplCfgMau.h | |||
@@ -69,19 +69,16 @@ | |||
69 | 69 | ||
70 | ****************************************************************************/ | 70 | ****************************************************************************/ |
71 | 71 | ||
72 | #include "../EplInc.h" | ||
73 | |||
74 | #ifndef _EPLCFGMA_H_ | 72 | #ifndef _EPLCFGMA_H_ |
75 | #define _EPLCFGMA_H_ | 73 | #define _EPLCFGMA_H_ |
76 | 74 | ||
75 | #include "../EplInc.h" | ||
76 | |||
77 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_CFGMA)) != 0) | 77 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_CFGMA)) != 0) |
78 | 78 | ||
79 | #include "EplObdu.h" | 79 | #include "EplObdu.h" |
80 | #include "EplSdoComu.h" | 80 | #include "EplSdoComu.h" |
81 | 81 | ||
82 | //--------------------------------------------------------------------------- | ||
83 | // typedef | ||
84 | //--------------------------------------------------------------------------- | ||
85 | //define max number of timeouts for configuration of 1 device | 82 | //define max number of timeouts for configuration of 1 device |
86 | #define EPL_CFGMA_MAX_TIMEOUT 3 | 83 | #define EPL_CFGMA_MAX_TIMEOUT 3 |
87 | 84 | ||
@@ -154,10 +151,6 @@ typedef struct { | |||
154 | } tEplCfgMaNode; | 151 | } tEplCfgMaNode; |
155 | 152 | ||
156 | //--------------------------------------------------------------------------- | 153 | //--------------------------------------------------------------------------- |
157 | // function prototypes | ||
158 | //--------------------------------------------------------------------------- | ||
159 | |||
160 | //--------------------------------------------------------------------------- | ||
161 | // Function: EplCfgMaInit() | 154 | // Function: EplCfgMaInit() |
162 | // | 155 | // |
163 | // Description: Function creates first instance of Configuration Manager | 156 | // Description: Function creates first instance of Configuration Manager |
diff --git a/drivers/staging/epl/user/EplDllu.h b/drivers/staging/epl/user/EplDllu.h index ea1f2c09d8ce..890f83759ca9 100644 --- a/drivers/staging/epl/user/EplDllu.h +++ b/drivers/staging/epl/user/EplDllu.h | |||
@@ -73,20 +73,8 @@ | |||
73 | 73 | ||
74 | #include "../EplDll.h" | 74 | #include "../EplDll.h" |
75 | 75 | ||
76 | //--------------------------------------------------------------------------- | ||
77 | // const defines | ||
78 | //--------------------------------------------------------------------------- | ||
79 | |||
80 | //--------------------------------------------------------------------------- | ||
81 | // typedef | ||
82 | //--------------------------------------------------------------------------- | ||
83 | |||
84 | typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); | 76 | typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); |
85 | 77 | ||
86 | //--------------------------------------------------------------------------- | ||
87 | // function prototypes | ||
88 | //--------------------------------------------------------------------------- | ||
89 | |||
90 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLU)) != 0) | 78 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLU)) != 0) |
91 | 79 | ||
92 | tEplKernel EplDlluAddInstance(void); | 80 | tEplKernel EplDlluAddInstance(void); |
diff --git a/drivers/staging/epl/user/EplDlluCal.h b/drivers/staging/epl/user/EplDlluCal.h index d8395d3ae21f..bc9126b1627a 100644 --- a/drivers/staging/epl/user/EplDlluCal.h +++ b/drivers/staging/epl/user/EplDlluCal.h | |||
@@ -74,20 +74,9 @@ | |||
74 | #include "../EplDll.h" | 74 | #include "../EplDll.h" |
75 | #include "../EplEvent.h" | 75 | #include "../EplEvent.h" |
76 | 76 | ||
77 | //--------------------------------------------------------------------------- | ||
78 | // const defines | ||
79 | //--------------------------------------------------------------------------- | ||
80 | |||
81 | //--------------------------------------------------------------------------- | ||
82 | // typedef | ||
83 | //--------------------------------------------------------------------------- | ||
84 | 77 | ||
85 | typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); | 78 | typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); |
86 | 79 | ||
87 | //--------------------------------------------------------------------------- | ||
88 | // function prototypes | ||
89 | //--------------------------------------------------------------------------- | ||
90 | |||
91 | tEplKernel EplDlluCalAddInstance(void); | 80 | tEplKernel EplDlluCalAddInstance(void); |
92 | 81 | ||
93 | tEplKernel EplDlluCalDelInstance(void); | 82 | tEplKernel EplDlluCalDelInstance(void); |
diff --git a/drivers/staging/epl/user/EplEventu.h b/drivers/staging/epl/user/EplEventu.h index 1a72f1f82f58..ab85205b2397 100644 --- a/drivers/staging/epl/user/EplEventu.h +++ b/drivers/staging/epl/user/EplEventu.h | |||
@@ -73,17 +73,6 @@ | |||
73 | 73 | ||
74 | #include "../EplEvent.h" | 74 | #include "../EplEvent.h" |
75 | 75 | ||
76 | //--------------------------------------------------------------------------- | ||
77 | // const defines | ||
78 | //--------------------------------------------------------------------------- | ||
79 | |||
80 | //--------------------------------------------------------------------------- | ||
81 | // typedef | ||
82 | //--------------------------------------------------------------------------- | ||
83 | |||
84 | //--------------------------------------------------------------------------- | ||
85 | // function prototypes | ||
86 | //--------------------------------------------------------------------------- | ||
87 | // init function | 76 | // init function |
88 | tEplKernel EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p); | 77 | tEplKernel EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p); |
89 | 78 | ||
diff --git a/drivers/staging/epl/user/EplIdentu.h b/drivers/staging/epl/user/EplIdentu.h index 973e4b34ecd9..057c9029e988 100644 --- a/drivers/staging/epl/user/EplIdentu.h +++ b/drivers/staging/epl/user/EplIdentu.h | |||
@@ -68,27 +68,15 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #include "../EplDll.h" | ||
72 | |||
73 | #ifndef _EPLIDENTU_H_ | 71 | #ifndef _EPLIDENTU_H_ |
74 | #define _EPLIDENTU_H_ | 72 | #define _EPLIDENTU_H_ |
75 | 73 | ||
76 | //--------------------------------------------------------------------------- | 74 | #include "../EplDll.h" |
77 | // const defines | ||
78 | //--------------------------------------------------------------------------- | ||
79 | |||
80 | //--------------------------------------------------------------------------- | ||
81 | // typedef | ||
82 | //--------------------------------------------------------------------------- | ||
83 | 75 | ||
84 | typedef tEplKernel(* tEplIdentuCbResponse) (unsigned int uiNodeId_p, | 76 | typedef tEplKernel(* tEplIdentuCbResponse) (unsigned int uiNodeId_p, |
85 | tEplIdentResponse * | 77 | tEplIdentResponse * |
86 | pIdentResponse_p); | 78 | pIdentResponse_p); |
87 | 79 | ||
88 | //--------------------------------------------------------------------------- | ||
89 | // function prototypes | ||
90 | //--------------------------------------------------------------------------- | ||
91 | |||
92 | tEplKernel EplIdentuInit(void); | 80 | tEplKernel EplIdentuInit(void); |
93 | 81 | ||
94 | tEplKernel EplIdentuAddInstance(void); | 82 | tEplKernel EplIdentuAddInstance(void); |
diff --git a/drivers/staging/epl/user/EplLedu.h b/drivers/staging/epl/user/EplLedu.h index 87fd02f6819f..ca9eb431100d 100644 --- a/drivers/staging/epl/user/EplLedu.h +++ b/drivers/staging/epl/user/EplLedu.h | |||
@@ -68,28 +68,16 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #include "../EplLed.h" | ||
72 | #include "../EplNmt.h" | ||
73 | #include "EplEventu.h" | ||
74 | |||
75 | #ifndef _EPLLEDU_H_ | 71 | #ifndef _EPLLEDU_H_ |
76 | #define _EPLLEDU_H_ | 72 | #define _EPLLEDU_H_ |
77 | 73 | ||
78 | //--------------------------------------------------------------------------- | 74 | #include "../EplLed.h" |
79 | // const defines | 75 | #include "../EplNmt.h" |
80 | //--------------------------------------------------------------------------- | 76 | #include "EplEventu.h" |
81 | |||
82 | //--------------------------------------------------------------------------- | ||
83 | // typedef | ||
84 | //--------------------------------------------------------------------------- | ||
85 | 77 | ||
86 | typedef tEplKernel(* tEplLeduStateChangeCallback) (tEplLedType LedType_p, | 78 | typedef tEplKernel(* tEplLeduStateChangeCallback) (tEplLedType LedType_p, |
87 | BOOL fOn_p); | 79 | BOOL fOn_p); |
88 | 80 | ||
89 | //--------------------------------------------------------------------------- | ||
90 | // function prototypes | ||
91 | //--------------------------------------------------------------------------- | ||
92 | |||
93 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) | 81 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) |
94 | 82 | ||
95 | tEplKernel EplLeduInit(tEplLeduStateChangeCallback pfnCbStateChange_p); | 83 | tEplKernel EplLeduInit(tEplLeduStateChangeCallback pfnCbStateChange_p); |
diff --git a/drivers/staging/epl/user/EplNmtCnu.h b/drivers/staging/epl/user/EplNmtCnu.h index 873a63e337aa..7d230297f43c 100644 --- a/drivers/staging/epl/user/EplNmtCnu.h +++ b/drivers/staging/epl/user/EplNmtCnu.h | |||
@@ -68,24 +68,12 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #include "EplNmtu.h" | ||
72 | #include "../EplDll.h" | ||
73 | #include "../EplFrame.h" | ||
74 | |||
75 | #ifndef _EPLNMTCNU_H_ | 71 | #ifndef _EPLNMTCNU_H_ |
76 | #define _EPLNMTCNU_H_ | 72 | #define _EPLNMTCNU_H_ |
77 | 73 | ||
78 | //--------------------------------------------------------------------------- | 74 | #include "EplNmtu.h" |
79 | // const defines | 75 | #include "../EplDll.h" |
80 | //--------------------------------------------------------------------------- | 76 | #include "../EplFrame.h" |
81 | |||
82 | //--------------------------------------------------------------------------- | ||
83 | // typedef | ||
84 | //--------------------------------------------------------------------------- | ||
85 | |||
86 | //--------------------------------------------------------------------------- | ||
87 | // function prototypes | ||
88 | //--------------------------------------------------------------------------- | ||
89 | 77 | ||
90 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_CN)) != 0) | 78 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_CN)) != 0) |
91 | 79 | ||
diff --git a/drivers/staging/epl/user/EplNmtMnu.h b/drivers/staging/epl/user/EplNmtMnu.h index 9a8b4e1c0de2..5e5e0cda3246 100644 --- a/drivers/staging/epl/user/EplNmtMnu.h +++ b/drivers/staging/epl/user/EplNmtMnu.h | |||
@@ -68,18 +68,10 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #include "EplNmtu.h" | ||
72 | |||
73 | #ifndef _EPLNMTMNU_H_ | 71 | #ifndef _EPLNMTMNU_H_ |
74 | #define _EPLNMTMNU_H_ | 72 | #define _EPLNMTMNU_H_ |
75 | 73 | ||
76 | //--------------------------------------------------------------------------- | 74 | #include "EplNmtu.h" |
77 | // const defines | ||
78 | //--------------------------------------------------------------------------- | ||
79 | |||
80 | //--------------------------------------------------------------------------- | ||
81 | // typedef | ||
82 | //--------------------------------------------------------------------------- | ||
83 | 75 | ||
84 | typedef tEplKernel(* tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, | 76 | typedef tEplKernel(* tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, |
85 | tEplNmtNodeEvent NodeEvent_p, | 77 | tEplNmtNodeEvent NodeEvent_p, |
@@ -91,10 +83,6 @@ typedef tEplKernel(* tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p, | |||
91 | tEplNmtState NmtState_p, | 83 | tEplNmtState NmtState_p, |
92 | u16 wErrorCode_p); | 84 | u16 wErrorCode_p); |
93 | 85 | ||
94 | //--------------------------------------------------------------------------- | ||
95 | // function prototypes | ||
96 | //--------------------------------------------------------------------------- | ||
97 | |||
98 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) | 86 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) |
99 | 87 | ||
100 | tEplKernel EplNmtMnuInit(tEplNmtMnuCbNodeEvent pfnCbNodeEvent_p, | 88 | tEplKernel EplNmtMnuInit(tEplNmtMnuCbNodeEvent pfnCbNodeEvent_p, |
diff --git a/drivers/staging/epl/user/EplNmtu.h b/drivers/staging/epl/user/EplNmtu.h index fc16ed2bcb68..c1fca80f5a06 100644 --- a/drivers/staging/epl/user/EplNmtu.h +++ b/drivers/staging/epl/user/EplNmtu.h | |||
@@ -68,19 +68,12 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #include "../EplNmt.h" | ||
72 | #include "EplEventu.h" | ||
73 | |||
74 | #ifndef _EPLNMTU_H_ | 71 | #ifndef _EPLNMTU_H_ |
75 | #define _EPLNMTU_H_ | 72 | #define _EPLNMTU_H_ |
76 | 73 | ||
77 | //--------------------------------------------------------------------------- | 74 | #include "../EplNmt.h" |
78 | // const defines | 75 | #include "EplEventu.h" |
79 | //--------------------------------------------------------------------------- | ||
80 | 76 | ||
81 | //--------------------------------------------------------------------------- | ||
82 | // typedef | ||
83 | //--------------------------------------------------------------------------- | ||
84 | // nmt commands | 77 | // nmt commands |
85 | typedef enum { | 78 | typedef enum { |
86 | // requestable ASnd ServiceIds 0x01..0x1F | 79 | // requestable ASnd ServiceIds 0x01..0x1F |
@@ -125,10 +118,6 @@ typedef tEplKernel(* tEplNmtuStateChangeCallback) (tEplEventNmtStateChange NmtSt | |||
125 | 118 | ||
126 | typedef tEplKernel(* tEplNmtuCheckEventCallback) (tEplNmtEvent NmtEvent_p); | 119 | typedef tEplKernel(* tEplNmtuCheckEventCallback) (tEplNmtEvent NmtEvent_p); |
127 | 120 | ||
128 | //--------------------------------------------------------------------------- | ||
129 | // function prototypes | ||
130 | //--------------------------------------------------------------------------- | ||
131 | |||
132 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) | 121 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) |
133 | 122 | ||
134 | tEplKernel EplNmtuInit(void); | 123 | tEplKernel EplNmtuInit(void); |
diff --git a/drivers/staging/epl/user/EplNmtuCal.h b/drivers/staging/epl/user/EplNmtuCal.h index b046f4396e33..b9850372a4a6 100644 --- a/drivers/staging/epl/user/EplNmtuCal.h +++ b/drivers/staging/epl/user/EplNmtuCal.h | |||
@@ -69,23 +69,12 @@ | |||
69 | 69 | ||
70 | ****************************************************************************/ | 70 | ****************************************************************************/ |
71 | 71 | ||
72 | #include "EplNmtu.h" | ||
73 | #include "../kernel/EplNmtk.h" | ||
74 | |||
75 | #ifndef _EPLNMTUCAL_H_ | 72 | #ifndef _EPLNMTUCAL_H_ |
76 | #define _EPLNMTUCAL_H_ | 73 | #define _EPLNMTUCAL_H_ |
77 | 74 | ||
78 | //--------------------------------------------------------------------------- | 75 | #include "EplNmtu.h" |
79 | // const defines | 76 | #include "../kernel/EplNmtk.h" |
80 | //--------------------------------------------------------------------------- | ||
81 | |||
82 | //--------------------------------------------------------------------------- | ||
83 | // typedef | ||
84 | //--------------------------------------------------------------------------- | ||
85 | 77 | ||
86 | //--------------------------------------------------------------------------- | ||
87 | // function prototypes | ||
88 | //--------------------------------------------------------------------------- | ||
89 | tEplNmtState EplNmtkCalGetNmtState(void); | 78 | tEplNmtState EplNmtkCalGetNmtState(void); |
90 | 79 | ||
91 | #endif // #ifndef _EPLNMTUCAL_H_ | 80 | #endif // #ifndef _EPLNMTUCAL_H_ |
diff --git a/drivers/staging/epl/user/EplObdu.h b/drivers/staging/epl/user/EplObdu.h index 6a0a3825dbcf..086371276cf6 100644 --- a/drivers/staging/epl/user/EplObdu.h +++ b/drivers/staging/epl/user/EplObdu.h | |||
@@ -68,22 +68,10 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #include "../EplObd.h" | ||
72 | |||
73 | #ifndef _EPLOBDU_H_ | 71 | #ifndef _EPLOBDU_H_ |
74 | #define _EPLOBDU_H_ | 72 | #define _EPLOBDU_H_ |
75 | 73 | ||
76 | //--------------------------------------------------------------------------- | 74 | #include "../EplObd.h" |
77 | // const defines | ||
78 | //--------------------------------------------------------------------------- | ||
79 | |||
80 | //--------------------------------------------------------------------------- | ||
81 | // typedef | ||
82 | //--------------------------------------------------------------------------- | ||
83 | |||
84 | //--------------------------------------------------------------------------- | ||
85 | // function prototypes | ||
86 | //--------------------------------------------------------------------------- | ||
87 | 75 | ||
88 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDU)) != 0) | 76 | #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDU)) != 0) |
89 | 77 | ||
diff --git a/drivers/staging/epl/user/EplObduCal.h b/drivers/staging/epl/user/EplObduCal.h index fde2f2cb5c6b..07277777219d 100644 --- a/drivers/staging/epl/user/EplObduCal.h +++ b/drivers/staging/epl/user/EplObduCal.h | |||
@@ -69,22 +69,11 @@ | |||
69 | 69 | ||
70 | ****************************************************************************/ | 70 | ****************************************************************************/ |
71 | 71 | ||
72 | #include "../EplObd.h" | ||
73 | |||
74 | #ifndef _EPLOBDUCAL_H_ | 72 | #ifndef _EPLOBDUCAL_H_ |
75 | #define _EPLOBDUCAL_H_ | 73 | #define _EPLOBDUCAL_H_ |
76 | 74 | ||
77 | //--------------------------------------------------------------------------- | 75 | #include "../EplObd.h" |
78 | // const defines | ||
79 | //--------------------------------------------------------------------------- | ||
80 | |||
81 | //--------------------------------------------------------------------------- | ||
82 | // typedef | ||
83 | //--------------------------------------------------------------------------- | ||
84 | 76 | ||
85 | //--------------------------------------------------------------------------- | ||
86 | // function prototypes | ||
87 | //--------------------------------------------------------------------------- | ||
88 | tEplKernel EplObduCalWriteEntry(unsigned int uiIndex_p, | 77 | tEplKernel EplObduCalWriteEntry(unsigned int uiIndex_p, |
89 | unsigned int uiSubIndex_p, | 78 | unsigned int uiSubIndex_p, |
90 | void *pSrcData_p, | 79 | void *pSrcData_p, |
diff --git a/drivers/staging/epl/user/EplPdou.h b/drivers/staging/epl/user/EplPdou.h index 2bed006efb7c..b8c832b09dbf 100644 --- a/drivers/staging/epl/user/EplPdou.h +++ b/drivers/staging/epl/user/EplPdou.h | |||
@@ -72,18 +72,6 @@ | |||
72 | 72 | ||
73 | #include "../EplPdo.h" | 73 | #include "../EplPdo.h" |
74 | 74 | ||
75 | //--------------------------------------------------------------------------- | ||
76 | // const defines | ||
77 | //--------------------------------------------------------------------------- | ||
78 | |||
79 | //--------------------------------------------------------------------------- | ||
80 | // typedef | ||
81 | //--------------------------------------------------------------------------- | ||
82 | |||
83 | //--------------------------------------------------------------------------- | ||
84 | // function prototypes | ||
85 | //--------------------------------------------------------------------------- | ||
86 | |||
87 | tEplKernel EplPdouAddInstance(void); | 75 | tEplKernel EplPdouAddInstance(void); |
88 | 76 | ||
89 | tEplKernel EplPdouDelInstance(void); | 77 | tEplKernel EplPdouDelInstance(void); |
diff --git a/drivers/staging/epl/user/EplSdoAsndu.h b/drivers/staging/epl/user/EplSdoAsndu.h index 20e6fffd5ecd..a62d4c97870f 100644 --- a/drivers/staging/epl/user/EplSdoAsndu.h +++ b/drivers/staging/epl/user/EplSdoAsndu.h | |||
@@ -68,23 +68,12 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #include "../EplSdo.h" | ||
72 | #include "../EplDll.h" | ||
73 | |||
74 | #ifndef _EPLSDOASNDU_H_ | 71 | #ifndef _EPLSDOASNDU_H_ |
75 | #define _EPLSDOASNDU_H_ | 72 | #define _EPLSDOASNDU_H_ |
76 | 73 | ||
77 | //--------------------------------------------------------------------------- | 74 | #include "../EplSdo.h" |
78 | // const defines | 75 | #include "../EplDll.h" |
79 | //--------------------------------------------------------------------------- | ||
80 | |||
81 | //--------------------------------------------------------------------------- | ||
82 | // typedef | ||
83 | //--------------------------------------------------------------------------- | ||
84 | 76 | ||
85 | //--------------------------------------------------------------------------- | ||
86 | // function prototypes | ||
87 | //--------------------------------------------------------------------------- | ||
88 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0) | 77 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0) |
89 | 78 | ||
90 | tEplKernel EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p); | 79 | tEplKernel EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p); |
diff --git a/drivers/staging/epl/user/EplSdoAsySequ.h b/drivers/staging/epl/user/EplSdoAsySequ.h index 0a957ba2fdd6..cc862de1a5b3 100644 --- a/drivers/staging/epl/user/EplSdoAsySequ.h +++ b/drivers/staging/epl/user/EplSdoAsySequ.h | |||
@@ -68,26 +68,15 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #ifndef _EPLSDOASYSEQU_H_ | ||
72 | #define _EPLSDOASYSEQU_H_ | ||
73 | |||
71 | #include "../EplSdo.h" | 74 | #include "../EplSdo.h" |
72 | #include "EplSdoUdpu.h" | 75 | #include "EplSdoUdpu.h" |
73 | #include "EplSdoAsndu.h" | 76 | #include "EplSdoAsndu.h" |
74 | #include "../EplEvent.h" | 77 | #include "../EplEvent.h" |
75 | #include "EplTimeru.h" | 78 | #include "EplTimeru.h" |
76 | 79 | ||
77 | #ifndef _EPLSDOASYSEQU_H_ | ||
78 | #define _EPLSDOASYSEQU_H_ | ||
79 | |||
80 | //--------------------------------------------------------------------------- | ||
81 | // const defines | ||
82 | //--------------------------------------------------------------------------- | ||
83 | |||
84 | //--------------------------------------------------------------------------- | ||
85 | // typedef | ||
86 | //--------------------------------------------------------------------------- | ||
87 | |||
88 | //--------------------------------------------------------------------------- | ||
89 | // function prototypes | ||
90 | //--------------------------------------------------------------------------- | ||
91 | tEplKernel EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, | 80 | tEplKernel EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, |
92 | tEplSdoComConCb fpSdoComConCb_p); | 81 | tEplSdoComConCb fpSdoComConCb_p); |
93 | 82 | ||
diff --git a/drivers/staging/epl/user/EplSdoComu.h b/drivers/staging/epl/user/EplSdoComu.h index 3df48d108392..4eee6fa69747 100644 --- a/drivers/staging/epl/user/EplSdoComu.h +++ b/drivers/staging/epl/user/EplSdoComu.h | |||
@@ -68,26 +68,15 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #ifndef _EPLSDOCOMU_H_ | ||
72 | #define _EPLSDOCOMU_H_ | ||
73 | |||
71 | #include "../EplSdo.h" | 74 | #include "../EplSdo.h" |
72 | #include "../EplObd.h" | 75 | #include "../EplObd.h" |
73 | #include "../EplSdoAc.h" | 76 | #include "../EplSdoAc.h" |
74 | #include "EplObdu.h" | 77 | #include "EplObdu.h" |
75 | #include "EplSdoAsySequ.h" | 78 | #include "EplSdoAsySequ.h" |
76 | 79 | ||
77 | #ifndef _EPLSDOCOMU_H_ | ||
78 | #define _EPLSDOCOMU_H_ | ||
79 | |||
80 | //--------------------------------------------------------------------------- | ||
81 | // const defines | ||
82 | //--------------------------------------------------------------------------- | ||
83 | |||
84 | //--------------------------------------------------------------------------- | ||
85 | // typedef | ||
86 | //--------------------------------------------------------------------------- | ||
87 | |||
88 | //--------------------------------------------------------------------------- | ||
89 | // function prototypes | ||
90 | //--------------------------------------------------------------------------- | ||
91 | tEplKernel EplSdoComInit(void); | 80 | tEplKernel EplSdoComInit(void); |
92 | 81 | ||
93 | tEplKernel EplSdoComAddInstance(void); | 82 | tEplKernel EplSdoComAddInstance(void); |
diff --git a/drivers/staging/epl/user/EplSdoUdpu.h b/drivers/staging/epl/user/EplSdoUdpu.h index c6b91ff5b7eb..13e2a278c11b 100644 --- a/drivers/staging/epl/user/EplSdoUdpu.h +++ b/drivers/staging/epl/user/EplSdoUdpu.h | |||
@@ -68,22 +68,11 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #include "../EplSdo.h" | ||
72 | |||
73 | #ifndef _EPLSDOUDPU_H_ | 71 | #ifndef _EPLSDOUDPU_H_ |
74 | #define _EPLSDOUDPU_H_ | 72 | #define _EPLSDOUDPU_H_ |
75 | 73 | ||
76 | //--------------------------------------------------------------------------- | 74 | #include "../EplSdo.h" |
77 | // const defines | ||
78 | //--------------------------------------------------------------------------- | ||
79 | |||
80 | //--------------------------------------------------------------------------- | ||
81 | // typedef | ||
82 | //--------------------------------------------------------------------------- | ||
83 | 75 | ||
84 | //--------------------------------------------------------------------------- | ||
85 | // function prototypes | ||
86 | //--------------------------------------------------------------------------- | ||
87 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) | 76 | #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) |
88 | 77 | ||
89 | tEplKernel EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p); | 78 | tEplKernel EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p); |
diff --git a/drivers/staging/epl/user/EplStatusu.h b/drivers/staging/epl/user/EplStatusu.h index 6b98ff9b9636..0fd3ebb76dcb 100644 --- a/drivers/staging/epl/user/EplStatusu.h +++ b/drivers/staging/epl/user/EplStatusu.h | |||
@@ -68,26 +68,14 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #include "../EplDll.h" | ||
72 | |||
73 | #ifndef _EPLSTATUSU_H_ | 71 | #ifndef _EPLSTATUSU_H_ |
74 | #define _EPLSTATUSU_H_ | 72 | #define _EPLSTATUSU_H_ |
75 | 73 | ||
76 | //--------------------------------------------------------------------------- | 74 | #include "../EplDll.h" |
77 | // const defines | ||
78 | //--------------------------------------------------------------------------- | ||
79 | |||
80 | //--------------------------------------------------------------------------- | ||
81 | // typedef | ||
82 | //--------------------------------------------------------------------------- | ||
83 | 75 | ||
84 | typedef tEplKernel(* tEplStatusuCbResponse) (unsigned int uiNodeId_p, | 76 | typedef tEplKernel(* tEplStatusuCbResponse) (unsigned int uiNodeId_p, |
85 | tEplStatusResponse *pStatusResponse_p); | 77 | tEplStatusResponse *pStatusResponse_p); |
86 | 78 | ||
87 | //--------------------------------------------------------------------------- | ||
88 | // function prototypes | ||
89 | //--------------------------------------------------------------------------- | ||
90 | |||
91 | tEplKernel EplStatusuInit(void); | 79 | tEplKernel EplStatusuInit(void); |
92 | 80 | ||
93 | tEplKernel EplStatusuAddInstance(void); | 81 | tEplKernel EplStatusuAddInstance(void); |
diff --git a/drivers/staging/epl/user/EplTimeru.h b/drivers/staging/epl/user/EplTimeru.h index 65273e5f9c81..5c447485245c 100644 --- a/drivers/staging/epl/user/EplTimeru.h +++ b/drivers/staging/epl/user/EplTimeru.h | |||
@@ -68,23 +68,11 @@ | |||
68 | 68 | ||
69 | ****************************************************************************/ | 69 | ****************************************************************************/ |
70 | 70 | ||
71 | #include "../EplTimer.h" | ||
72 | #include "EplEventu.h" | ||
73 | |||
74 | #ifndef _EPLTIMERU_H_ | 71 | #ifndef _EPLTIMERU_H_ |
75 | #define _EPLTIMERU_H_ | 72 | #define _EPLTIMERU_H_ |
76 | 73 | ||
77 | //--------------------------------------------------------------------------- | 74 | #include "../EplTimer.h" |
78 | // const defines | 75 | #include "EplEventu.h" |
79 | //--------------------------------------------------------------------------- | ||
80 | |||
81 | //--------------------------------------------------------------------------- | ||
82 | // typedef | ||
83 | //--------------------------------------------------------------------------- | ||
84 | |||
85 | //--------------------------------------------------------------------------- | ||
86 | // function prototypes | ||
87 | //--------------------------------------------------------------------------- | ||
88 | 76 | ||
89 | tEplKernel EplTimeruInit(void); | 77 | tEplKernel EplTimeruInit(void); |
90 | 78 | ||