Skip to content

L
linux-davinci
Commit 046f45fa authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d9068d62
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 242 deletions
drivers/staging/epl/user/EplCfgMau.h
View file @ 046f45fa
...@@ -69,19 +69,16 @@ ...@@ -69,19 +69,16 @@
****************************************************************************/ ****************************************************************************/
#include "../EplInc.h"
#ifndef _EPLCFGMA_H_ #ifndef _EPLCFGMA_H_
#define _EPLCFGMA_H_ #define _EPLCFGMA_H_
#include "../EplInc.h"
#if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_CFGMA)) != 0) #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_CFGMA)) != 0)
#include "EplObdu.h" #include "EplObdu.h"
#include "EplSdoComu.h" #include "EplSdoComu.h"
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//define max number of timeouts for configuration of 1 device //define max number of timeouts for configuration of 1 device
#define EPL_CFGMA_MAX_TIMEOUT 3 #define EPL_CFGMA_MAX_TIMEOUT 3
...@@ -153,10 +150,6 @@ typedef struct { ...@@ -153,10 +150,6 @@ typedef struct {
} tEplCfgMaNode; } tEplCfgMaNode;
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Function: EplCfgMaInit() // Function: EplCfgMaInit()
// //
......
drivers/staging/epl/user/EplDllu.h
View file @ 046f45fa
...@@ -73,20 +73,8 @@ ...@@ -73,20 +73,8 @@
#include "../EplDll.h" #include "../EplDll.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p);
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLU)) != 0) #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLU)) != 0)
tEplKernel EplDlluAddInstance(void); tEplKernel EplDlluAddInstance(void);
......
drivers/staging/epl/user/EplDlluCal.h
View file @ 046f45fa
...@@ -74,20 +74,9 @@ ...@@ -74,20 +74,9 @@
#include "../EplDll.h" #include "../EplDll.h"
#include "../EplEvent.h" #include "../EplEvent.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p);
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
tEplKernel EplDlluCalAddInstance(void); tEplKernel EplDlluCalAddInstance(void);
tEplKernel EplDlluCalDelInstance(void); tEplKernel EplDlluCalDelInstance(void);
......
drivers/staging/epl/user/EplEventu.h
View file @ 046f45fa
...@@ -73,17 +73,6 @@ ...@@ -73,17 +73,6 @@
#include "../EplEvent.h" #include "../EplEvent.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
// init function // init function
tEplKernel EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p); tEplKernel EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p);
......
drivers/staging/epl/user/EplIdentu.h
View file @ 046f45fa
...@@ -68,27 +68,15 @@ ...@@ -68,27 +68,15 @@
****************************************************************************/ ****************************************************************************/
#include "../EplDll.h"
#ifndef _EPLIDENTU_H_ #ifndef _EPLIDENTU_H_
#define _EPLIDENTU_H_ #define _EPLIDENTU_H_
//--------------------------------------------------------------------------- #include "../EplDll.h"
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
typedef tEplKernel(* tEplIdentuCbResponse) (unsigned int uiNodeId_p, typedef tEplKernel(* tEplIdentuCbResponse) (unsigned int uiNodeId_p,
tEplIdentResponse * tEplIdentResponse *
pIdentResponse_p); pIdentResponse_p);
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
tEplKernel EplIdentuInit(void); tEplKernel EplIdentuInit(void);
tEplKernel EplIdentuAddInstance(void); tEplKernel EplIdentuAddInstance(void);
......
drivers/staging/epl/user/EplLedu.h
View file @ 046f45fa
...@@ -68,28 +68,16 @@ ...@@ -68,28 +68,16 @@
****************************************************************************/ ****************************************************************************/
#include "../EplLed.h"
#include "../EplNmt.h"
#include "EplEventu.h"
#ifndef _EPLLEDU_H_ #ifndef _EPLLEDU_H_
#define _EPLLEDU_H_ #define _EPLLEDU_H_
//--------------------------------------------------------------------------- #include "../EplLed.h"
// const defines #include "../EplNmt.h"
//--------------------------------------------------------------------------- #include "EplEventu.h"
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
typedef tEplKernel(* tEplLeduStateChangeCallback) (tEplLedType LedType_p, typedef tEplKernel(* tEplLeduStateChangeCallback) (tEplLedType LedType_p,
BOOL fOn_p); BOOL fOn_p);
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0)
tEplKernel EplLeduInit(tEplLeduStateChangeCallback pfnCbStateChange_p); tEplKernel EplLeduInit(tEplLeduStateChangeCallback pfnCbStateChange_p);
......
drivers/staging/epl/user/EplNmtCnu.h
View file @ 046f45fa
...@@ -68,24 +68,12 @@ ...@@ -68,24 +68,12 @@
****************************************************************************/ ****************************************************************************/
#include "EplNmtu.h"
#include "../EplDll.h"
#include "../EplFrame.h"
#ifndef _EPLNMTCNU_H_ #ifndef _EPLNMTCNU_H_
#define _EPLNMTCNU_H_ #define _EPLNMTCNU_H_
//--------------------------------------------------------------------------- #include "EplNmtu.h"
// const defines #include "../EplDll.h"
//--------------------------------------------------------------------------- #include "../EplFrame.h"
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_CN)) != 0) #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_CN)) != 0)
......
drivers/staging/epl/user/EplNmtMnu.h
View file @ 046f45fa
...@@ -68,18 +68,10 @@ ...@@ -68,18 +68,10 @@
****************************************************************************/ ****************************************************************************/
#include "EplNmtu.h"
#ifndef _EPLNMTMNU_H_ #ifndef _EPLNMTMNU_H_
#define _EPLNMTMNU_H_ #define _EPLNMTMNU_H_
//--------------------------------------------------------------------------- #include "EplNmtu.h"
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
typedef tEplKernel(* tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, typedef tEplKernel(* tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p,
tEplNmtNodeEvent NodeEvent_p, tEplNmtNodeEvent NodeEvent_p,
...@@ -91,10 +83,6 @@ typedef tEplKernel(* tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p, ...@@ -91,10 +83,6 @@ typedef tEplKernel(* tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p,
tEplNmtState NmtState_p, tEplNmtState NmtState_p,
u16 wErrorCode_p); u16 wErrorCode_p);
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0)
tEplKernel EplNmtMnuInit(tEplNmtMnuCbNodeEvent pfnCbNodeEvent_p, tEplKernel EplNmtMnuInit(tEplNmtMnuCbNodeEvent pfnCbNodeEvent_p,
......
drivers/staging/epl/user/EplNmtu.h
View file @ 046f45fa
...@@ -68,19 +68,12 @@ ...@@ -68,19 +68,12 @@
****************************************************************************/ ****************************************************************************/
#include "../EplNmt.h"
#include "EplEventu.h"
#ifndef _EPLNMTU_H_ #ifndef _EPLNMTU_H_
#define _EPLNMTU_H_ #define _EPLNMTU_H_
//--------------------------------------------------------------------------- #include "../EplNmt.h"
// const defines #include "EplEventu.h"
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
// nmt commands // nmt commands
typedef enum { typedef enum {
// requestable ASnd ServiceIds 0x01..0x1F // requestable ASnd ServiceIds 0x01..0x1F
...@@ -125,10 +118,6 @@ typedef tEplKernel(* tEplNmtuStateChangeCallback) (tEplEventNmtStateChange NmtSt ...@@ -125,10 +118,6 @@ typedef tEplKernel(* tEplNmtuStateChangeCallback) (tEplEventNmtStateChange NmtSt
typedef tEplKernel(* tEplNmtuCheckEventCallback) (tEplNmtEvent NmtEvent_p); typedef tEplKernel(* tEplNmtuCheckEventCallback) (tEplNmtEvent NmtEvent_p);
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0)
tEplKernel EplNmtuInit(void); tEplKernel EplNmtuInit(void);
......
drivers/staging/epl/user/EplNmtuCal.h
View file @ 046f45fa
...@@ -69,23 +69,12 @@ ...@@ -69,23 +69,12 @@
****************************************************************************/ ****************************************************************************/
#include "EplNmtu.h"
#include "../kernel/EplNmtk.h"
#ifndef _EPLNMTUCAL_H_ #ifndef _EPLNMTUCAL_H_
#define _EPLNMTUCAL_H_ #define _EPLNMTUCAL_H_
//--------------------------------------------------------------------------- #include "EplNmtu.h"
// const defines #include "../kernel/EplNmtk.h"
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
tEplNmtState EplNmtkCalGetNmtState(void); tEplNmtState EplNmtkCalGetNmtState(void);
#endif // #ifndef _EPLNMTUCAL_H_ #endif // #ifndef _EPLNMTUCAL_H_
drivers/staging/epl/user/EplObdu.h
View file @ 046f45fa
...@@ -68,22 +68,10 @@ ...@@ -68,22 +68,10 @@
****************************************************************************/ ****************************************************************************/
#include "../EplObd.h"
#ifndef _EPLOBDU_H_ #ifndef _EPLOBDU_H_
#define _EPLOBDU_H_ #define _EPLOBDU_H_
//--------------------------------------------------------------------------- #include "../EplObd.h"
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDU)) != 0) #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDU)) != 0)
......
drivers/staging/epl/user/EplObduCal.h
View file @ 046f45fa
...@@ -69,22 +69,11 @@ ...@@ -69,22 +69,11 @@
****************************************************************************/ ****************************************************************************/
#include "../EplObd.h"
#ifndef _EPLOBDUCAL_H_ #ifndef _EPLOBDUCAL_H_
#define _EPLOBDUCAL_H_ #define _EPLOBDUCAL_H_
//--------------------------------------------------------------------------- #include "../EplObd.h"
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
tEplKernel EplObduCalWriteEntry(unsigned int uiIndex_p, tEplKernel EplObduCalWriteEntry(unsigned int uiIndex_p,
unsigned int uiSubIndex_p, unsigned int uiSubIndex_p,
void *pSrcData_p, void *pSrcData_p,
......
drivers/staging/epl/user/EplPdou.h
View file @ 046f45fa
...@@ -72,18 +72,6 @@ ...@@ -72,18 +72,6 @@
#include "../EplPdo.h" #include "../EplPdo.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
tEplKernel EplPdouAddInstance(void); tEplKernel EplPdouAddInstance(void);
tEplKernel EplPdouDelInstance(void); tEplKernel EplPdouDelInstance(void);
......
drivers/staging/epl/user/EplSdoAsndu.h
View file @ 046f45fa
...@@ -68,23 +68,12 @@ ...@@ -68,23 +68,12 @@
****************************************************************************/ ****************************************************************************/
#include "../EplSdo.h"
#include "../EplDll.h"
#ifndef _EPLSDOASNDU_H_ #ifndef _EPLSDOASNDU_H_
#define _EPLSDOASNDU_H_ #define _EPLSDOASNDU_H_
//--------------------------------------------------------------------------- #include "../EplSdo.h"
// const defines #include "../EplDll.h"
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0) #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0)
tEplKernel EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p); tEplKernel EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p);
......
drivers/staging/epl/user/EplSdoAsySequ.h
View file @ 046f45fa
...@@ -68,26 +68,15 @@ ...@@ -68,26 +68,15 @@
****************************************************************************/ ****************************************************************************/
#ifndef _EPLSDOASYSEQU_H_
#define _EPLSDOASYSEQU_H_
#include "../EplSdo.h" #include "../EplSdo.h"
#include "EplSdoUdpu.h" #include "EplSdoUdpu.h"
#include "EplSdoAsndu.h" #include "EplSdoAsndu.h"
#include "../EplEvent.h" #include "../EplEvent.h"
#include "EplTimeru.h" #include "EplTimeru.h"
#ifndef _EPLSDOASYSEQU_H_
#define _EPLSDOASYSEQU_H_
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
tEplKernel EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, tEplKernel EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p,
tEplSdoComConCb fpSdoComConCb_p); tEplSdoComConCb fpSdoComConCb_p);
......
drivers/staging/epl/user/EplSdoComu.h
View file @ 046f45fa
...@@ -68,26 +68,15 @@ ...@@ -68,26 +68,15 @@
****************************************************************************/ ****************************************************************************/
#ifndef _EPLSDOCOMU_H_
#define _EPLSDOCOMU_H_
#include "../EplSdo.h" #include "../EplSdo.h"
#include "../EplObd.h" #include "../EplObd.h"
#include "../EplSdoAc.h" #include "../EplSdoAc.h"
#include "EplObdu.h" #include "EplObdu.h"
#include "EplSdoAsySequ.h" #include "EplSdoAsySequ.h"
#ifndef _EPLSDOCOMU_H_
#define _EPLSDOCOMU_H_
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
tEplKernel EplSdoComInit(void); tEplKernel EplSdoComInit(void);
tEplKernel EplSdoComAddInstance(void); tEplKernel EplSdoComAddInstance(void);
......
drivers/staging/epl/user/EplSdoUdpu.h
View file @ 046f45fa
...@@ -68,22 +68,11 @@ ...@@ -68,22 +68,11 @@
****************************************************************************/ ****************************************************************************/
#include "../EplSdo.h"
#ifndef _EPLSDOUDPU_H_ #ifndef _EPLSDOUDPU_H_
#define _EPLSDOUDPU_H_ #define _EPLSDOUDPU_H_
//--------------------------------------------------------------------------- #include "../EplSdo.h"
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0)
tEplKernel EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p); tEplKernel EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p);
......
drivers/staging/epl/user/EplStatusu.h
View file @ 046f45fa
...@@ -68,26 +68,14 @@ ...@@ -68,26 +68,14 @@
****************************************************************************/ ****************************************************************************/
#include "../EplDll.h"
#ifndef _EPLSTATUSU_H_ #ifndef _EPLSTATUSU_H_
#define _EPLSTATUSU_H_ #define _EPLSTATUSU_H_
//--------------------------------------------------------------------------- #include "../EplDll.h"
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
typedef tEplKernel(* tEplStatusuCbResponse) (unsigned int uiNodeId_p, typedef tEplKernel(* tEplStatusuCbResponse) (unsigned int uiNodeId_p,
tEplStatusResponse *pStatusResponse_p); tEplStatusResponse *pStatusResponse_p);
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
tEplKernel EplStatusuInit(void); tEplKernel EplStatusuInit(void);
tEplKernel EplStatusuAddInstance(void); tEplKernel EplStatusuAddInstance(void);
......
drivers/staging/epl/user/EplTimeru.h
View file @ 046f45fa
...@@ -68,23 +68,11 @@ ...@@ -68,23 +68,11 @@
****************************************************************************/ ****************************************************************************/
#include "../EplTimer.h"
#include "EplEventu.h"
#ifndef _EPLTIMERU_H_ #ifndef _EPLTIMERU_H_
#define _EPLTIMERU_H_ #define _EPLTIMERU_H_
//--------------------------------------------------------------------------- #include "../EplTimer.h"
// const defines #include "EplEventu.h"
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
tEplKernel EplTimeruInit(void); tEplKernel EplTimeruInit(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment