From 046f45fa714046ac400e22f48ec8ac77e7faf5cc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 13:38:43 -0700 Subject: [PATCH] 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 Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/user/EplCfgMau.h | 11 ++--------- drivers/staging/epl/user/EplDllu.h | 12 ------------ drivers/staging/epl/user/EplDlluCal.h | 11 ----------- drivers/staging/epl/user/EplEventu.h | 11 ----------- drivers/staging/epl/user/EplIdentu.h | 14 +------------- drivers/staging/epl/user/EplLedu.h | 18 +++--------------- drivers/staging/epl/user/EplNmtCnu.h | 18 +++--------------- drivers/staging/epl/user/EplNmtMnu.h | 14 +------------- drivers/staging/epl/user/EplNmtu.h | 15 ++------------- drivers/staging/epl/user/EplNmtuCal.h | 15 ++------------- drivers/staging/epl/user/EplObdu.h | 14 +------------- drivers/staging/epl/user/EplObduCal.h | 13 +------------ drivers/staging/epl/user/EplPdou.h | 12 ------------ drivers/staging/epl/user/EplSdoAsndu.h | 15 ++------------- drivers/staging/epl/user/EplSdoAsySequ.h | 17 +++-------------- drivers/staging/epl/user/EplSdoComu.h | 17 +++-------------- drivers/staging/epl/user/EplSdoUdpu.h | 13 +------------ drivers/staging/epl/user/EplStatusu.h | 14 +------------- 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 b5ee972..4ac770f 100644 --- a/drivers/staging/epl/user/EplCfgMau.h +++ b/drivers/staging/epl/user/EplCfgMau.h @@ -69,19 +69,16 @@ ****************************************************************************/ -#include "../EplInc.h" - #ifndef _EPLCFGMA_H_ #define _EPLCFGMA_H_ +#include "../EplInc.h" + #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_CFGMA)) != 0) #include "EplObdu.h" #include "EplSdoComu.h" -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- //define max number of timeouts for configuration of 1 device #define EPL_CFGMA_MAX_TIMEOUT 3 @@ -154,10 +151,6 @@ typedef struct { } tEplCfgMaNode; //--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- // Function: EplCfgMaInit() // // 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 ea1f2c0..890f837 100644 --- a/drivers/staging/epl/user/EplDllu.h +++ b/drivers/staging/epl/user/EplDllu.h @@ -73,20 +73,8 @@ #include "../EplDll.h" -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- - typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- - #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLU)) != 0) tEplKernel EplDlluAddInstance(void); diff --git a/drivers/staging/epl/user/EplDlluCal.h b/drivers/staging/epl/user/EplDlluCal.h index d8395d3..bc9126b 100644 --- a/drivers/staging/epl/user/EplDlluCal.h +++ b/drivers/staging/epl/user/EplDlluCal.h @@ -74,20 +74,9 @@ #include "../EplDll.h" #include "../EplEvent.h" -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- - tEplKernel EplDlluCalAddInstance(void); tEplKernel EplDlluCalDelInstance(void); diff --git a/drivers/staging/epl/user/EplEventu.h b/drivers/staging/epl/user/EplEventu.h index 1a72f1f..ab85205 100644 --- a/drivers/staging/epl/user/EplEventu.h +++ b/drivers/staging/epl/user/EplEventu.h @@ -73,17 +73,6 @@ #include "../EplEvent.h" -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- // init function tEplKernel EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p); diff --git a/drivers/staging/epl/user/EplIdentu.h b/drivers/staging/epl/user/EplIdentu.h index 973e4b3..057c902 100644 --- a/drivers/staging/epl/user/EplIdentu.h +++ b/drivers/staging/epl/user/EplIdentu.h @@ -68,27 +68,15 @@ ****************************************************************************/ -#include "../EplDll.h" - #ifndef _EPLIDENTU_H_ #define _EPLIDENTU_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- +#include "../EplDll.h" typedef tEplKernel(* tEplIdentuCbResponse) (unsigned int uiNodeId_p, tEplIdentResponse * pIdentResponse_p); -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- - tEplKernel EplIdentuInit(void); tEplKernel EplIdentuAddInstance(void); diff --git a/drivers/staging/epl/user/EplLedu.h b/drivers/staging/epl/user/EplLedu.h index 87fd02f..ca9eb43 100644 --- a/drivers/staging/epl/user/EplLedu.h +++ b/drivers/staging/epl/user/EplLedu.h @@ -68,28 +68,16 @@ ****************************************************************************/ -#include "../EplLed.h" -#include "../EplNmt.h" -#include "EplEventu.h" - #ifndef _EPLLEDU_H_ #define _EPLLEDU_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- +#include "../EplLed.h" +#include "../EplNmt.h" +#include "EplEventu.h" typedef tEplKernel(* tEplLeduStateChangeCallback) (tEplLedType LedType_p, BOOL fOn_p); -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- - #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) tEplKernel EplLeduInit(tEplLeduStateChangeCallback pfnCbStateChange_p); diff --git a/drivers/staging/epl/user/EplNmtCnu.h b/drivers/staging/epl/user/EplNmtCnu.h index 873a63e..7d23029 100644 --- a/drivers/staging/epl/user/EplNmtCnu.h +++ b/drivers/staging/epl/user/EplNmtCnu.h @@ -68,24 +68,12 @@ ****************************************************************************/ -#include "EplNmtu.h" -#include "../EplDll.h" -#include "../EplFrame.h" - #ifndef _EPLNMTCNU_H_ #define _EPLNMTCNU_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- +#include "EplNmtu.h" +#include "../EplDll.h" +#include "../EplFrame.h" #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_CN)) != 0) diff --git a/drivers/staging/epl/user/EplNmtMnu.h b/drivers/staging/epl/user/EplNmtMnu.h index 9a8b4e1..5e5e0cd 100644 --- a/drivers/staging/epl/user/EplNmtMnu.h +++ b/drivers/staging/epl/user/EplNmtMnu.h @@ -68,18 +68,10 @@ ****************************************************************************/ -#include "EplNmtu.h" - #ifndef _EPLNMTMNU_H_ #define _EPLNMTMNU_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- +#include "EplNmtu.h" typedef tEplKernel(* tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, tEplNmtNodeEvent NodeEvent_p, @@ -91,10 +83,6 @@ typedef tEplKernel(* tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p, tEplNmtState NmtState_p, u16 wErrorCode_p); -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- - #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) tEplKernel EplNmtMnuInit(tEplNmtMnuCbNodeEvent pfnCbNodeEvent_p, diff --git a/drivers/staging/epl/user/EplNmtu.h b/drivers/staging/epl/user/EplNmtu.h index fc16ed2..c1fca80 100644 --- a/drivers/staging/epl/user/EplNmtu.h +++ b/drivers/staging/epl/user/EplNmtu.h @@ -68,19 +68,12 @@ ****************************************************************************/ -#include "../EplNmt.h" -#include "EplEventu.h" - #ifndef _EPLNMTU_H_ #define _EPLNMTU_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- +#include "../EplNmt.h" +#include "EplEventu.h" -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- // nmt commands typedef enum { // requestable ASnd ServiceIds 0x01..0x1F @@ -125,10 +118,6 @@ typedef tEplKernel(* tEplNmtuStateChangeCallback) (tEplEventNmtStateChange NmtSt typedef tEplKernel(* tEplNmtuCheckEventCallback) (tEplNmtEvent NmtEvent_p); -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- - #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) tEplKernel EplNmtuInit(void); diff --git a/drivers/staging/epl/user/EplNmtuCal.h b/drivers/staging/epl/user/EplNmtuCal.h index b046f43..b985037 100644 --- a/drivers/staging/epl/user/EplNmtuCal.h +++ b/drivers/staging/epl/user/EplNmtuCal.h @@ -69,23 +69,12 @@ ****************************************************************************/ -#include "EplNmtu.h" -#include "../kernel/EplNmtk.h" - #ifndef _EPLNMTUCAL_H_ #define _EPLNMTUCAL_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- +#include "EplNmtu.h" +#include "../kernel/EplNmtk.h" -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- tEplNmtState EplNmtkCalGetNmtState(void); #endif // #ifndef _EPLNMTUCAL_H_ diff --git a/drivers/staging/epl/user/EplObdu.h b/drivers/staging/epl/user/EplObdu.h index 6a0a382..0863712 100644 --- a/drivers/staging/epl/user/EplObdu.h +++ b/drivers/staging/epl/user/EplObdu.h @@ -68,22 +68,10 @@ ****************************************************************************/ -#include "../EplObd.h" - #ifndef _EPLOBDU_H_ #define _EPLOBDU_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- +#include "../EplObd.h" #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDU)) != 0) diff --git a/drivers/staging/epl/user/EplObduCal.h b/drivers/staging/epl/user/EplObduCal.h index fde2f2c..0727777 100644 --- a/drivers/staging/epl/user/EplObduCal.h +++ b/drivers/staging/epl/user/EplObduCal.h @@ -69,22 +69,11 @@ ****************************************************************************/ -#include "../EplObd.h" - #ifndef _EPLOBDUCAL_H_ #define _EPLOBDUCAL_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- +#include "../EplObd.h" -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- tEplKernel EplObduCalWriteEntry(unsigned int uiIndex_p, unsigned int uiSubIndex_p, void *pSrcData_p, diff --git a/drivers/staging/epl/user/EplPdou.h b/drivers/staging/epl/user/EplPdou.h index 2bed006..b8c832b 100644 --- a/drivers/staging/epl/user/EplPdou.h +++ b/drivers/staging/epl/user/EplPdou.h @@ -72,18 +72,6 @@ #include "../EplPdo.h" -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- - tEplKernel EplPdouAddInstance(void); tEplKernel EplPdouDelInstance(void); diff --git a/drivers/staging/epl/user/EplSdoAsndu.h b/drivers/staging/epl/user/EplSdoAsndu.h index 20e6fff..a62d4c9 100644 --- a/drivers/staging/epl/user/EplSdoAsndu.h +++ b/drivers/staging/epl/user/EplSdoAsndu.h @@ -68,23 +68,12 @@ ****************************************************************************/ -#include "../EplSdo.h" -#include "../EplDll.h" - #ifndef _EPLSDOASNDU_H_ #define _EPLSDOASNDU_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- +#include "../EplSdo.h" +#include "../EplDll.h" -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0) tEplKernel EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p); diff --git a/drivers/staging/epl/user/EplSdoAsySequ.h b/drivers/staging/epl/user/EplSdoAsySequ.h index 0a957ba..cc862de 100644 --- a/drivers/staging/epl/user/EplSdoAsySequ.h +++ b/drivers/staging/epl/user/EplSdoAsySequ.h @@ -68,26 +68,15 @@ ****************************************************************************/ +#ifndef _EPLSDOASYSEQU_H_ +#define _EPLSDOASYSEQU_H_ + #include "../EplSdo.h" #include "EplSdoUdpu.h" #include "EplSdoAsndu.h" #include "../EplEvent.h" #include "EplTimeru.h" -#ifndef _EPLSDOASYSEQU_H_ -#define _EPLSDOASYSEQU_H_ - -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- tEplKernel EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, tEplSdoComConCb fpSdoComConCb_p); diff --git a/drivers/staging/epl/user/EplSdoComu.h b/drivers/staging/epl/user/EplSdoComu.h index 3df48d1..4eee6fa 100644 --- a/drivers/staging/epl/user/EplSdoComu.h +++ b/drivers/staging/epl/user/EplSdoComu.h @@ -68,26 +68,15 @@ ****************************************************************************/ +#ifndef _EPLSDOCOMU_H_ +#define _EPLSDOCOMU_H_ + #include "../EplSdo.h" #include "../EplObd.h" #include "../EplSdoAc.h" #include "EplObdu.h" #include "EplSdoAsySequ.h" -#ifndef _EPLSDOCOMU_H_ -#define _EPLSDOCOMU_H_ - -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- tEplKernel EplSdoComInit(void); tEplKernel EplSdoComAddInstance(void); diff --git a/drivers/staging/epl/user/EplSdoUdpu.h b/drivers/staging/epl/user/EplSdoUdpu.h index c6b91ff..13e2a27 100644 --- a/drivers/staging/epl/user/EplSdoUdpu.h +++ b/drivers/staging/epl/user/EplSdoUdpu.h @@ -68,22 +68,11 @@ ****************************************************************************/ -#include "../EplSdo.h" - #ifndef _EPLSDOUDPU_H_ #define _EPLSDOUDPU_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- +#include "../EplSdo.h" -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) tEplKernel EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p); diff --git a/drivers/staging/epl/user/EplStatusu.h b/drivers/staging/epl/user/EplStatusu.h index 6b98ff9..0fd3ebb 100644 --- a/drivers/staging/epl/user/EplStatusu.h +++ b/drivers/staging/epl/user/EplStatusu.h @@ -68,26 +68,14 @@ ****************************************************************************/ -#include "../EplDll.h" - #ifndef _EPLSTATUSU_H_ #define _EPLSTATUSU_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- +#include "../EplDll.h" typedef tEplKernel(* tEplStatusuCbResponse) (unsigned int uiNodeId_p, tEplStatusResponse *pStatusResponse_p); -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- - tEplKernel EplStatusuInit(void); tEplKernel EplStatusuAddInstance(void); diff --git a/drivers/staging/epl/user/EplTimeru.h b/drivers/staging/epl/user/EplTimeru.h index 65273e5..5c44748 100644 --- a/drivers/staging/epl/user/EplTimeru.h +++ b/drivers/staging/epl/user/EplTimeru.h @@ -68,23 +68,11 @@ ****************************************************************************/ -#include "../EplTimer.h" -#include "EplEventu.h" - #ifndef _EPLTIMERU_H_ #define _EPLTIMERU_H_ -//--------------------------------------------------------------------------- -// const defines -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// typedef -//--------------------------------------------------------------------------- - -//--------------------------------------------------------------------------- -// function prototypes -//--------------------------------------------------------------------------- +#include "../EplTimer.h" +#include "EplEventu.h" tEplKernel EplTimeruInit(void); -- 2.7.4