Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
1 年多 前同步成功

通知 160
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 70e2db22 编写于 作者: G Greg Kroah-Hartman
浏览文件
操作

Staging: epl: fix up epl/kernel/*.h files 

Only include a file if it's needed.

Also remove some unused comments from the boilerplate text.

And delete some empty .h files

Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 046f45fa
隐藏空白更改
内联 并排
Showing with 5 addition and 319 deletion
drivers/staging/epl/EplNmtkCal.c
浏览文件 @ 70e2db22
......@@ -69,8 +69,6 @@
****************************************************************************/
#include "kernel/EplNmtkCal.h"
// TODO: init function needed to prepare EplNmtkGetNmtState for
// io-controll-call from EplNmtuCal-Modul
......
drivers/staging/epl/EplObdkCal.c
浏览文件 @ 70e2db22
......@@ -70,7 +70,6 @@
****************************************************************************/
#include "EplInc.h"
#include "kernel/EplObdkCal.h"
/***************************************************************************/
/* */
......
drivers/staging/epl/kernel/EplDllk.h
浏览文件 @ 70e2db22
......@@ -74,14 +74,6 @@
#include "../EplDll.h"
#include "../EplEvent.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
typedef tEplKernel(*tEplDllkCbAsync) (tEplFrameInfo * pFrameInfo_p);
typedef struct {
......@@ -108,10 +100,6 @@ struct _tEplDllkNodeInfo {
typedef struct _tEplDllkNodeInfo tEplDllkNodeInfo;
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLK)) != 0)
tEplKernel EplDllkAddInstance(tEplDllkInitParam * pInitParam_p);
......
drivers/staging/epl/kernel/EplDllkCal.h
浏览文件 @ 70e2db22
......@@ -74,14 +74,6 @@
#include "../EplDll.h"
#include "../EplEvent.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
typedef struct {
unsigned long m_ulCurTxFrameCountGen;
unsigned long m_ulCurTxFrameCountNmt;
......@@ -92,10 +84,6 @@ typedef struct {
} tEplDllkCalStatistics;
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLK)) != 0)
tEplKernel EplDllkCalAddInstance(void);
......
drivers/staging/epl/kernel/EplErrorHandlerk.h
浏览文件 @ 70e2db22
......@@ -73,18 +73,6 @@
#include "../EplEvent.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
// init function
tEplKernel EplErrorHandlerkInit(void);
......
drivers/staging/epl/kernel/EplEventk.h
浏览文件 @ 70e2db22
......@@ -73,18 +73,6 @@
#include "../EplEvent.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
// init function
tEplKernel EplEventkInit(tEplSyncCb fpSyncCb);
......
drivers/staging/epl/kernel/EplNmtk.h
浏览文件 @ 70e2db22
......@@ -74,17 +74,6 @@
#include "../EplNmt.h"
#include "EplEventk.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTK)) != 0)
tEplKernel EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR);
......
drivers/staging/epl/kernel/EplNmtkCal.h 已删除 100644 → 0
浏览文件 @ 046f45fa
/****************************************************************************
(c) SYSTEC electronic GmbH, D-07973 Greiz, August-Bebel-Str. 29
www.systec-electronic.com
Project: openPOWERLINK
Description: include file for communication abstraction layer of the
NMT-Kernel-Module
License:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of SYSTEC electronic GmbH nor the names of its
contributors may be used to endorse or promote products derived
from this software without prior written permission. For written
permission, please contact info@systec-electronic.com.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
Severability Clause:
If a provision of this License is or becomes illegal, invalid or
unenforceable in any jurisdiction, that shall not affect:
1. the validity or enforceability in that jurisdiction of any other
provision of this License; or
2. the validity or enforceability in other jurisdictions of that or
any other provision of this License.
-------------------------------------------------------------------------
$RCSfile: EplNmtkCal.h,v $
$Author: D.Krueger $
$Revision: 1.3 $ $Date: 2008/04/17 21:36:32 $
$State: Exp $
Build Environment:
KEIL uVision 2
-------------------------------------------------------------------------
Revision History:
2006/06/16 -k.t.: start of the implementation
****************************************************************************/
#include "EplNmtk.h"
#ifndef _EPLNMTKCAL_H_
#define _EPLNMTKCAL_H_
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#endif // #ifndef _EPLNMTKCAL_H_
drivers/staging/epl/kernel/EplObdk.h
浏览文件 @ 70e2db22
......@@ -68,28 +68,13 @@
****************************************************************************/
#include "../EplObd.h"
#ifndef _EPLOBDK_H_
#define _EPLOBDK_H_
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// global variables
//---------------------------------------------------------------------------
#include "../EplObd.h"
extern u8 abEplObdTrashObject_g[8];
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0)
// ---------------------------------------------------------------------
tEplKernel EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam *pInitParam_p);
......
drivers/staging/epl/kernel/EplObdkCal.h 已删除 100644 → 0
浏览文件 @ 046f45fa
/****************************************************************************
(c) SYSTEC electronic GmbH, D-07973 Greiz, August-Bebel-Str. 29
www.systec-electronic.com
Project: openPOWERLINK
Description: include file for communication abstraction layer
for the Epl-Obd-Kernelspace-Modul
License:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of SYSTEC electronic GmbH nor the names of its
contributors may be used to endorse or promote products derived
from this software without prior written permission. For written
permission, please contact info@systec-electronic.com.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
Severability Clause:
If a provision of this License is or becomes illegal, invalid or
unenforceable in any jurisdiction, that shall not affect:
1. the validity or enforceability in that jurisdiction of any other
provision of this License; or
2. the validity or enforceability in other jurisdictions of that or
any other provision of this License.
-------------------------------------------------------------------------
$RCSfile: EplObdkCal.h,v $
$Author: D.Krueger $
$Revision: 1.4 $ $Date: 2008/04/17 21:36:32 $
$State: Exp $
Build Environment:
GCC V3.4
-------------------------------------------------------------------------
Revision History:
2006/06/19 k.t.: start of the implementation
****************************************************************************/
#include "../EplObd.h"
#ifndef _EPLOBDKCAL_H_
#define _EPLOBDKCAL_H_
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#endif // #ifndef _EPLOBDKCAL_H_
drivers/staging/epl/kernel/EplPdok.h
浏览文件 @ 70e2db22
......@@ -75,18 +75,6 @@
#include "../EplEvent.h"
#include "../EplDll.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
// process events from queue (PDOs/frames and SoA for synchronization)
tEplKernel EplPdokProcess(tEplEvent * pEvent_p);
......
drivers/staging/epl/kernel/EplPdokCal.h
浏览文件 @ 70e2db22
......@@ -72,19 +72,6 @@
#define _EPL_PDOKCAL_H_
#include "../EplInc.h"
//#include "EplPdo.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
tEplKernel EplPdokCalAddInstance(void);
......
drivers/staging/epl/kernel/EplTimerHighResk.h
浏览文件 @ 70e2db22
......@@ -68,22 +68,10 @@
****************************************************************************/
#include "../EplTimer.h"
#ifndef _EPLTIMERHIGHRESK_H_
#define _EPLTIMERHIGHRESK_H_
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#include "../EplTimer.h"
tEplKernel EplTimerHighReskInit(void);
......
drivers/staging/epl/kernel/EplTimerk.h
浏览文件 @ 70e2db22
......@@ -68,19 +68,16 @@
****************************************************************************/
#include "../EplTimer.h"
#include "../user/EplEventu.h"
#ifndef _EPLTIMERK_H_
#define _EPLTIMERK_H_
#include "../EplTimer.h"
#include "../user/EplEventu.h"
#if EPL_TIMER_USE_USER != FALSE
#include "../user/EplTimeru.h"
#endif
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
#if EPL_TIMER_USE_USER != FALSE
#define EplTimerkInit EplTimeruInit
......@@ -91,13 +88,6 @@
#define EplTimerkDeleteTimer EplTimeruDeleteTimer
#endif
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if EPL_TIMER_USE_USER == FALSE
tEplKernel EplTimerkInit(void);
......
drivers/staging/epl/kernel/VirtualEthernet.h
浏览文件 @ 70e2db22
......@@ -73,18 +73,6 @@
#include "EplDllk.h"
//---------------------------------------------------------------------------
// const defines
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// typedef
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// function prototypes
//---------------------------------------------------------------------------
#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0)
tEplKernel VEthAddInstance(tEplDllkInitParam *pInitParam_p);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或