From b4a4d56898aac07ac98488c1bc3193fe4f2e126d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 09:31:01 -0700 Subject: Staging: epl: remove complier macros from global.h As we are only building within the Linux kernel, remove all of the different system types from global.h, they are not needed at all. First step of many to clean up the code to match the kernel coding style rules. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/global.h | 1098 +----------------------------------------- 1 file changed, 23 insertions(+), 1075 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index fe167165a836..11b75e4ef6be 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -121,827 +121,40 @@ //--------------------------------------------------------------------------- // defines for target system (TARGET_SYSTEM) //--------------------------------------------------------------------------- - -#define _DOS_ (16 + 0x10000) -#define _WIN16_ 16 -#define _WIN32_ 32 -#define _WINCE_ (32 + 0x20000) -#define _NO_OS_ 0 -#define _LINUX_ 1 -#define _PXROS_ 2 -#define _ECOSPRO_ 3 - -//--------------------------------------------------------------------------- -// definitions for function inlining -//--------------------------------------------------------------------------- - -#define INLINE_FUNCTION // empty define -#undef INLINE_ENABLED // disable actual inlining of functions -#undef INLINE_FUNCTION_DEF // disable inlining for all compilers per default - -//--------------------------------------------------------------------------- -// definitions for Keil C51 -//--------------------------------------------------------------------------- - -#ifdef __C51__ - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_KEIL_C51X_ - -#pragma DEBUG OBJECTEXTEND -#pragma WARNINGLEVEL(2) // maximum warning level - -#define NEAR idata // variables mapped to internal data storage location -#define FAR xdata // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM code // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC xdata // hardware access through external memory (i.e. CAN) -#define LARGE large // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM xdata // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT reentrant -#define PUBLIC - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif - -//--------------------------------------------------------------------------- -// definitions for GNU Compiler for Infineon C16x -// - it have to be befor Keil (it has __C166__ too) -//--------------------------------------------------------------------------- -#elif defined (__GNUC__) && defined (__C166__) - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_GNU_C16X_ - -// #define NEAR idata // variables mapped to internal data storage location -#define NEAR near // variables mapped to internal data storage location -// #define FAR xhuge // variables mapped to external data storage location -#define FAR huge // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -// #define HWACC sdata // hardware access through external memory (i.e. CAN) -#define HWACC huge // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -// #define GENERIC xhuge // generic pointer to point to application data -#define GENERIC huge // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT -#define PUBLIC - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf - -#define ASSERT(p) \ - if (p) \ - { \ - ; \ - } \ - else \ - { \ - PRINTF0("Assert failed: " #p " (file %s line %d)\n", __FILE__, (int) __LINE__ ); \ - while (1); \ - } -#else -#define ASSERT(p) -#endif - -//--------------------------------------------------------------------------- -// definitions for Keil C166 -//--------------------------------------------------------------------------- -#elif defined (__C166__) // 24.01.2005 r.d.: Keil ARM7 needs directive 'defined' - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_KEIL_C16X_ - -#pragma CODE -#pragma MOD167 -#pragma NOINIT -#pragma DEBUG -#pragma WARNINGLEVEL(3) // maximum warning level -#pragma WARNING DISABLE = 47 // warning = OFF -#pragma WARNING DISABLE = 38 // warning = OFF -// #pragma WARNING DISABLE = 102 // warning = OFF -#pragma WARNING DISABLE = 174 // warning = OFF -#pragma WARNING DISABLE = 183 // warning = OFF - -#define NEAR idata // variables mapped to internal data storage location -#define FAR xhuge // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -// #define HWACC sdata // hardware access through external memory (i.e. CAN) -#define HWACC huge // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC xhuge // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT -#define PUBLIC - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif - -//--------------------------------------------------------------------------- -// definitions for MPLAB C30 for dsPIC33F series -//--------------------------------------------------------------------------- -#elif defined (__C30__) - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_MPLAB_DSPIC33F_ - -#define NEAR // variables mapped to internal data storage location -#define FAR // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT -#define PUBLIC - -// #ifndef QWORD -// #define QWORD long long -// #endif - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif - -//--------------------------------------------------------------------------- -// definitions for Keil ARM -//--------------------------------------------------------------------------- -#elif defined (__CA__) - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_KEIL_CARM_ - -#define NEAR // variables mapped to internal data storage location -#define FAR // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT -#define PUBLIC - -#ifndef QWORD -#define QWORD long long -#endif - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif - -//--------------------------------------------------------------------------- -// definitions for RealView ARM compilation tools (provided by recent Keil Microcontroller Development Kits) -//--------------------------------------------------------------------------- -#elif defined (__ARMCC_VERSION) - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_RVCT_CARM_ - -#define NEAR // variables mapped to internal data storage location -#define FAR // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT -#define PUBLIC - -#ifndef QWORD -#define QWORD long long -#endif - -#ifndef NDEBUG -#define ASSERT(expr) if (!(expr)) {\ - TRACE0 ("Assertion failed: " #expr );\ - while (1);} -#else -#define ASSERT(expr) -#endif - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif - -//--------------------------------------------------------------------------- -// definitions for ARM IAR C Compiler -//--------------------------------------------------------------------------- -#elif defined (__ICCARM__) - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_IAR_CARM_ - -#define NEAR // variables mapped to internal data storage location -#define FAR // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT -#define PUBLIC - -#ifndef QWORD -#define QWORD long long -#endif - - // Workaround: - // If we use IAR and want to debug but don't want to use C-Spy Debugger - // assert() doesn't work in debug mode because it needs support for FILE descriptors - // (_DLIB_FILE_DESCRIPTOR == 1). -#ifndef NDEBUG -#define ASSERT(expr) if (!(expr)) {\ - TRACE0 ("Assertion failed: " #expr );\ - while (1);} -#else -#define ASSERT(expr) -#endif - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -// #define TRACE PRINTF4 -#endif - -//--------------------------------------------------------------------------- -// definitions for Tasking 8051 -//--------------------------------------------------------------------------- - -#elif defined (_CC51) - -#include - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_TASKING_C51X_ - -#define NEAR _data // variables mapped to internal data storage location -#define FAR _xdat // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC _xdat // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM _xdat // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT _reentrant -#define PUBLIC - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif - -//--------------------------------------------------------------------------- -// definitions for Tasking C167CR and C164CI -//--------------------------------------------------------------------------- - -#elif defined (_C166) - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_TASKING_C16X_ - -#define NEAR near // variables mapped to internal data storage location -#define FAR far // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC /* to be defined */ // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT -#define PUBLIC - - // Stdio.h has to be alway included here. If printf() is used stdio.h defines NULL - // without checking if it is already included. So an error occurs while compiling. - // (r.d.) -#include // prototype printf() (for TRACE) -#ifndef NDEBUG -#define TRACE printf -#endif - -//--------------------------------------------------------------------------- -// definitions for FUJITSU FFMC-16LX MB90590 -//--------------------------------------------------------------------------- - -//#elif (defined (F590) || defined (F543) || defined (F598) || defined (F495) || defined (F350)) -#elif defined(__COMPILER_FCC907__) - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_FUJITSU_F590_ - -#define NEAR /* to be defined */ // variables mapped to internal data storage location -#define FAR /* to be defined */ // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM /* to be defined */ // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC /* to be defined */ // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - - // softune is not able to support 64 bit variables QWORD !!! - -#define REENTRANT -#define PUBLIC - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif - -//--------------------------------------------------------------------------- -// definitions for Mitsubishi M16C family for TASKING Compiler CM16 -//--------------------------------------------------------------------------- - -#elif defined (_CM16C) - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_TASKING_M16C_ - -#define NEAR _near // variables mapped to internal data storage location -#define FAR _far // variables mapped to external data storage location -#define CONST _farrom // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC _near // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC _far // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. - // do you use memory model SMALL, than you have to set _far -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT -#define PUBLIC - - // Stdio.h has to be alway included here. If printf() is used stdio.h defines NULL - // without checking if it is already included. So an error occurs while compiling. - // (r.d.) -#include // prototype printf() (for TRACE) -#ifndef NDEBUG -#define TRACE printf -#endif - -//--------------------------------------------------------------------------- -// definitions for Mitsubishi M16C family for Mitsubishi Compiler NC30 -//--------------------------------------------------------------------------- -// name NC30, andere Form will der Compiler nicht !! -#elif defined (NC30) - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_MITSUBISHI_M16C_ - -#define NEAR near // variables mapped to internal data storage location -#define FAR far // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC near // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC far // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT -#define PUBLIC - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif - -//--------------------------------------------------------------------------- -// definitions for Renesas M32C family for Renesas Compiler -//--------------------------------------------------------------------------- -#elif defined (NC308) - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_RENESAS_M32C_ - -#define NEAR near // variables mapped to internal data storage location -#define FAR far // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) -#define HWACC // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM far // Memory attribute to optimize speed and code of pointer access. - -#define REENTRANT -#define PUBLIC - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif - -// #error ("RENESAS o.k.") - -//--------------------------------------------------------------------------- -// definitions for ARM7 family with GNU compiler -//--------------------------------------------------------------------------- - -#elif defined(__GNUC__) && defined(__arm__) && !defined(__LINUX_ARM_ARCH__) - -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_GNU_ARM7_ - -#define NEAR // variables mapped to internal data storage location -#define FAR // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. -#define HWACC // hardware access through external memory (i.e. CAN) - -#define REENTRANT -#define PUBLIC - -#ifndef QWORD -#define QWORD long long // i.A. durch Herr Kuschel -#endif - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif - -//--------------------------------------------------------------------------- -// definitions for Motorola PowerPC family 5x5 (555/565) -// definitions Linux-PC -//--------------------------------------------------------------------------- - -#elif defined (__GNUC__) - -#if defined (LINUX) || defined (linux) || defined (__linux__) -#define LINUX_SYSTEM // define 'LINUX_SYSTEM' uniform for all Linux based systems - // r.d.: We will need an other solution here! There are two sections here which do check the preproc-definitions: - // LINUX and __linux__ . The first one was Linux for PC, the second one is this section for embedded Linux (MCF5xxx). - // But Linux for PC does not need the definitions for embedded Linux. -#endif - - // GNU C compiler supports function inlining -#define INLINE_FUNCTION_DEF extern inline - - // to actually enable inlining just include the following three lines - // #undef INLINE_FUNCTION - // #define INLINE_FUNCTION INLINE_FUNCTION_DEF - // #define INLINE_ENABLED TRUE - -#ifdef PXROS -#define TARGET_SYSTEM _PXROS_ -#ifdef __i386__ -#undef LINUX // this define seems to be set from compiler -#define DEV_SYSTEM _DEV_HIGHTEC_X86_ -#elif defined (__tricore__) -#define DEV_SYSTEM _DEV_GNU_TRICORE_ -#else // MPC5x5 -#define DEV_SYSTEM _DEV_GNU_MPC5X5_ -#endif - -#elif defined (LINUX) || defined (__linux__) -#define TARGET_SYSTEM _LINUX_ // Linux definition -#define DEV_SYSTEM _DEV_LINUX_ - -#elif defined (GNU_CF5282) -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_GNU_CF5282_ - -#elif defined (ECOSPRO_I386_PEAK_PCI) -#define TARGET_SYSTEM _ECOSPRO_ -#define DEV_SYSTEM _DEV_GNU_I386_ - -#elif defined (GNU_CF548X) -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_GNU_CF548X_ -#else -#error 'ERROR: DEV_SYSTEM not found!' -#endif - -#ifndef QWORD -#define QWORD long long int -#endif - -#if (TARGET_SYSTEM == _PXROS_) - -#ifndef __KERNEL__ -#include -#endif - -#define NEAR // variables mapped to internal data storage location -#define FAR // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM /* to be defined */ // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#define HWACC // hardware access through external memory (i.e. CAN) - -#define REENTRANT -#define PUBLIC - -#ifndef QWORD -#define QWORD long long int -#endif - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif - -#endif - - // ------------------ GNUC for I386 --------------------------------------------- - -#if (TARGET_SYSTEM == _LINUX_) || (TARGET_SYSTEM == _ECOSPRO_) - -#ifndef __KERNEL__ -#include -#endif - -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#ifndef NEAR -#define NEAR // variables mapped to internal data storage location -#endif - -#ifndef FAR -#define FAR // variables mapped to external data storage location -#endif - -#ifndef CONST -#define CONST const // variables mapped to ROM (i.e. flash) -#endif - -#define LARGE - -#define REENTRANT -#define PUBLIC - -#ifndef NDEBUG -#ifndef __KERNEL__ -#include // prototype printf() (for TRACE) -#define TRACE printf -#else -#define TRACE printk -#endif -#endif -#endif - - // ------------------ GNU without OS --------------------------------------------- - -#if (TARGET_SYSTEM == _NO_OS_) - -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#ifndef NEAR -#define NEAR // variables mapped to internal data storage location -#endif - -#ifndef FAR -#define FAR // variables mapped to external data storage location -#endif - -#ifndef CONST -#define CONST const // variables mapped to ROM (i.e. flash) -#endif - -#define LARGE - -#define REENTRANT -#define PUBLIC - -#ifndef NDEBUG -// #include "xuartdrv.h" -// #include // prototype printf() (for TRACE) -#define TRACE printf -// #define TRACE mprintf -// #ifndef TRACE -// #define TRACE trace -// void trace (char *fmt, ...); -// #endif -#endif - -#endif - -//--------------------------------------------------------------------------- -// definitions for MPC565 -//--------------------------------------------------------------------------- -#elif __MWERKS__ - -#ifdef __MC68K__ - -#define TARGET_SYSTEM = _MCF548X_ -#define DEV_SYSTEM _DEV_MCW_MCF5XXX_ - -#else -#define TARGET_SYSTEM = _MPC565_ -#define DEV_SYSTEM _DEV_MCW_MPC5X5_ -#endif - -#define NEAR // variables mapped to internal data storage location -#define FAR // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define LARGE // functions set parameters to external data storage location - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#define HWACC // hardware access through external memory (i.e. CAN) - -#define REENTRANT -#define PUBLIC - -#ifndef NDEBUG -#include // prototype printf() (for TRACE) -#define TRACE printf -#endif +#define _WIN32_ 32 +#define _NO_OS_ 0 +#define _LINUX_ 1 //--------------------------------------------------------------------------- -// definitions for BECK 1x3 +// definitions for function inlining //--------------------------------------------------------------------------- -#elif defined (__BORLANDC__) && defined (__PARADIGM__) -#define TARGET_SYSTEM _NO_OS_ -#define DEV_SYSTEM _DEV_PAR_BECK1X3_ - -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. -#define NEAR __near // variables mapped to internal data storage location -#define FAR __far // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define LARGE +#define INLINE_FUNCTION // empty define +#undef INLINE_ENABLED // disable actual inlining of functions +#undef INLINE_FUNCTION_DEF // disable inlining for all compilers per default -#define REENTRANT -#define PUBLIC -#ifndef NDEBUG -#ifndef TRACE -#include -#define TRACE printf -#endif -#endif +#define LINUX_SYSTEM // define 'LINUX_SYSTEM' uniform for all Linux based systems + // r.d.: We will need an other solution here! There are two sections here which do check the preproc-definitions: + // LINUX and __linux__ . The first one was Linux for PC, the second one is this section for embedded Linux (MCF5xxx). + // But Linux for PC does not need the definitions for embedded Linux. -//--------------------------------------------------------------------------- -// definitions for PC -//--------------------------------------------------------------------------- + // GNU C compiler supports function inlining +#define INLINE_FUNCTION_DEF extern inline -#elif defined (__BORLANDC__) + // to actually enable inlining just include the following three lines + // #undef INLINE_FUNCTION + // #define INLINE_FUNCTION INLINE_FUNCTION_DEF + // #define INLINE_ENABLED TRUE - // ------------------ definition target system -------------------------- +#define TARGET_SYSTEM _LINUX_ // Linux definition +#define DEV_SYSTEM _DEV_LINUX_ -#ifdef _WIN32 -#define TARGET_SYSTEM _WIN32_ // WIN32 definition -#define DEV_SYSTEM _DEV_WIN32_ -#else -#define TARGET_SYSTEM _DOS_ -#define DEV_SYSTEM _DEV_BORLAND_DOS_ +#ifndef QWORD +#define QWORD long long int #endif - // ------------------ WIN32 --------------------------------------------- - -#if (TARGET_SYSTEM == _WIN32_) + // ------------------ GNUC for I386 --------------------------------------------- #define ROM // code or variables mapped to ROM (i.e. flash) // usage: CONST BYTE ROM foo = 0x00; @@ -966,275 +179,11 @@ #define CONST const // variables mapped to ROM (i.e. flash) #endif -#define LARGE - -#define REENTRANT -#define PUBLIC __stdcall - -#ifndef NDEBUG -#ifndef TRACE -#include -#define TRACE printf -#endif -#endif - -#elif (TARGET_SYSTEM == _DOS_) - -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. -#define NEAR near // variables mapped to internal data storage location -#define FAR far // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define LARGE - -#define REENTRANT -#define PUBLIC - -#ifndef NDEBUG -#ifndef TRACE -#include -#define TRACE printf -#endif -#endif - -#endif - -#elif (_MSC_VER == 800) // PC MS Visual C/C++ for DOS applications - -#define TARGET_SYSTEM _DOS_ -#define DEV_SYSTEM _DEV_MSVC_DOS_ - -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC near // hardware access through external memory (i.e. CAN) - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. -#define NEAR near // variables mapped to internal data storage location -#define FAR far // variables mapped to external data storage location -#define CONST const // variables mapped to ROM (i.e. flash) -#define LARGE - #define REENTRANT #define PUBLIC -#ifndef NDEBUG -#ifndef TRACE -#include -#define TRACE printf -#endif -#endif - -//--------------------------------------------------------------------------- -// definitions for RTX under WIN32 -//--------------------------------------------------------------------------- -#elif (defined (UNDER_RTSS) && defined (WIN32)) - - // ------------------ definition target system -------------------------- -#define TARGET_SYSTEM _WIN32_RTX_ -#define DEV_SYSTEM _DEV_WIN32_RTX_ - -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#ifndef NEAR -#define NEAR // variables mapped to internal data storage location -#endif - -#ifndef FAR -#define FAR // variables mapped to external data storage location -#endif - -#ifndef CONST -#define CONST const // variables mapped to ROM (i.e. flash) -#endif - -#define LARGE - -#define REENTRANT -#define PUBLIC __stdcall - -#ifndef NDEBUG -#ifndef TRACE -#define TRACE RtPrintf -#endif -#endif - -//--------------------------------------------------------------------------- -// definitions for WinCE -//--------------------------------------------------------------------------- -#elif defined (_WIN32_WCE) - - // ------------------ definition target system -------------------------- -#define TARGET_SYSTEM _WINCE_ -#define DEV_SYSTEM _DEV_WIN_CE_ - -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#ifndef NEAR -#define NEAR // variables mapped to internal data storage location -#endif - -#ifndef FAR -#define FAR // variables mapped to external data storage location -#endif - -#ifndef CONST -#define CONST const // variables mapped to ROM (i.e. flash) -#endif - -#define LARGE - -#ifndef QWORD - //#define QWORD long long int // MSVC .NET can use "long long int" too (like GNU) -#define QWORD __int64 -#endif - -#define REENTRANT -#define PUBLIC __cdecl - -#ifdef ASSERTMSG -#undef ASSERTMSG -#endif - -#ifndef NDEBUG -#ifndef TRACE -#define TRACE printf -// void trace (char *fmt, ...); -#endif -#endif - -#else // ===> PC MS Visual C/C++ - - // ------------------ definition target system -------------------------- - -#ifdef _WIN32 -#define TARGET_SYSTEM _WIN32_ // WIN32 definition -#define DEV_SYSTEM _DEV_WIN32_ -#else -#define TARGET_SYSTEM _WIN16_ // WIN16 definition -#define DEV_SYSTEM _DEV_WIN16_ -#endif - - // ------------------ WIN16 --------------------------------------------- - -#if (TARGET_SYSTEM == _WIN16_) - -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) - - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. - -#ifndef NEAR -#define NEAR // variables mapped to internal data storage location -#endif - -#ifndef FAR -#define FAR far // variables mapped to external data storage location -#endif - -#ifndef CONST -#define CONST const // variables mapped to ROM (i.e. flash) -#endif - -#define LARGE - -#define REENTRANT -#define PUBLIC _far _pascal _export +#define TRACE printk -#ifndef NDEBUG -#ifndef TRACE -#define TRACE trace -#ifdef __cplusplus -extern "C" { -#endif - void trace(const char *fmt, ...); -#ifdef __cplusplus -} -#endif -#endif -#endif -#endif - // ------------------ WIN32 --------------------------------------------- -#if (TARGET_SYSTEM == _WIN32_) -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; -#define HWACC // hardware access through external memory (i.e. CAN) - // These types can be adjusted by users to match application requirements. The goal is to// minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external// or internal data memory. -#define MEM // Memory attribute to optimize speed and code of pointer access. -#ifndef NEAR -#define NEAR // variables mapped to internal data storage location -#endif -#ifndef FAR -#define FAR // variables mapped to external data storage location -#endif -#ifndef CONST -#define CONST const // variables mapped to ROM (i.e. flash) -#endif -#define LARGE -#define REENTRANT -#define PUBLIC __stdcall -#ifndef QWORD - //#define QWORD long long int // MSVC .NET can use "long long int" too (like GNU) -#define QWORD __int64 -#endif -#ifndef NDEBUG -#ifndef TRACE -#define TRACE trace -#ifdef __cplusplus -extern "C" { -#endif - void trace(const char *fmt, ...); -#ifdef __cplusplus -} -#endif -#endif -#endif - // MS Visual C++ compiler supports function inlining -#define INLINE_FUNCTION_DEF __forceinline - // to actually enable inlining just include the following two lines// #define INLINE_FUNCTION INLINE_FUNCTION_DEF// #define INLINE_ENABLED TRUE -#endif -#endif // ===> PC -//---------------------------------------------------------------------------// definitions of basic types//--------------------------------------------------------------------------- -#ifndef _WINDEF_ // defined in WINDEF.H, included by - // --- arithmetic types --- #ifndef SHORT #define SHORT short int #endif @@ -1276,7 +225,6 @@ extern "C" { #ifndef NULL #define NULL ((void *) 0) #endif -#endif #ifndef _TIME_OF_DAY_DEFINED_ typedef struct { unsigned long int m_dwMs; -- cgit v1.2.3-59-g8ed1b From 335914e315103100dd27a648744fd2440d31075d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 09:33:20 -0700 Subject: Staging: epl: remove NULL from global.h Don't define something that is already defined in the kernel. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/global.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 11b75e4ef6be..4eb64ecab0f3 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -222,9 +222,6 @@ #ifndef FALSE #define FALSE 0x00 #endif -#ifndef NULL -#define NULL ((void *) 0) -#endif #ifndef _TIME_OF_DAY_DEFINED_ typedef struct { unsigned long int m_dwMs; -- cgit v1.2.3-59-g8ed1b From d10f46992fb59de804550999806e1e0c0aa335a8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 10:45:12 -0700 Subject: Staging: epl: remove PUBLIC definition It doesn't make sense here, so delete it. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Edrv8139.c | 4 +- drivers/staging/epl/Epl.h | 87 +++++++------ drivers/staging/epl/EplAmi.h | 68 +++++------ drivers/staging/epl/EplApiGeneric.c | 128 +++++++++---------- drivers/staging/epl/EplApiLinuxKernel.c | 18 +-- drivers/staging/epl/EplApiProcessImage.c | 6 +- drivers/staging/epl/EplDllk.c | 18 ++- drivers/staging/epl/EplErrorHandlerk.c | 8 +- drivers/staging/epl/EplEvent.h | 4 +- drivers/staging/epl/EplEventk.c | 20 +-- drivers/staging/epl/EplEventu.c | 21 ++-- drivers/staging/epl/EplIdentu.c | 24 ++-- drivers/staging/epl/EplNmtCnu.c | 19 ++- drivers/staging/epl/EplNmtMnu.c | 43 +++---- drivers/staging/epl/EplNmtk.c | 16 ++- drivers/staging/epl/EplNmtu.c | 16 ++- drivers/staging/epl/EplNmtuCal.c | 2 +- drivers/staging/epl/EplObd.c | 170 +++++++++++--------------- drivers/staging/epl/EplObd.h | 17 +-- drivers/staging/epl/EplObdu.c | 74 ++++++----- drivers/staging/epl/EplObduCal.c | 80 ++++++------ drivers/staging/epl/EplObjDef.h | 3 +- drivers/staging/epl/EplPdou.c | 2 +- drivers/staging/epl/EplSdo.h | 22 ++-- drivers/staging/epl/EplSdoAsndu.c | 22 ++-- drivers/staging/epl/EplSdoAsySequ.c | 38 +++--- drivers/staging/epl/EplSdoComu.c | 45 ++++--- drivers/staging/epl/EplSdoUdpu.c | 23 ++-- drivers/staging/epl/EplStatusu.c | 19 ++- drivers/staging/epl/EplTarget.h | 18 ++- drivers/staging/epl/EplTimer.h | 3 +- drivers/staging/epl/EplTimeruLinuxKernel.c | 26 ++-- drivers/staging/epl/TimerHighReskX86.c | 23 ++-- drivers/staging/epl/VirtualEthernetLinux.c | 4 +- drivers/staging/epl/amix86.c | 106 ++++++---------- drivers/staging/epl/demo_main.c | 20 +-- drivers/staging/epl/global.h | 1 - drivers/staging/epl/kernel/EplErrorHandlerk.h | 8 +- drivers/staging/epl/kernel/EplEventk.h | 16 +-- drivers/staging/epl/kernel/EplNmtk.h | 14 +-- drivers/staging/epl/kernel/EplObdk.h | 107 +++++++--------- drivers/staging/epl/kernel/EplTimerHighResk.h | 29 +++-- drivers/staging/epl/kernel/EplTimerk.h | 20 +-- drivers/staging/epl/kernel/VirtualEthernet.h | 4 +- drivers/staging/epl/proc_fs.c | 10 +- drivers/staging/epl/user/EplCfgMau.h | 47 ++++--- drivers/staging/epl/user/EplDllu.h | 2 +- drivers/staging/epl/user/EplDlluCal.h | 2 +- drivers/staging/epl/user/EplEventu.h | 17 ++- drivers/staging/epl/user/EplIdentu.h | 20 ++- drivers/staging/epl/user/EplLedu.h | 14 +-- drivers/staging/epl/user/EplNmtCnu.h | 13 +- drivers/staging/epl/user/EplNmtMnu.h | 28 ++--- drivers/staging/epl/user/EplNmtu.h | 23 ++-- drivers/staging/epl/user/EplNmtuCal.h | 2 +- drivers/staging/epl/user/EplObdu.h | 76 ++++++------ drivers/staging/epl/user/EplObduCal.h | 76 +++++------- drivers/staging/epl/user/EplPdou.h | 2 +- drivers/staging/epl/user/EplSdoAsndu.h | 18 +-- drivers/staging/epl/user/EplSdoAsySequ.h | 26 ++-- drivers/staging/epl/user/EplSdoComu.h | 31 +++-- drivers/staging/epl/user/EplSdoUdpu.h | 21 ++-- drivers/staging/epl/user/EplStatusu.h | 18 ++- drivers/staging/epl/user/EplTimeru.h | 22 ++-- 64 files changed, 848 insertions(+), 1036 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/Edrv8139.c b/drivers/staging/epl/Edrv8139.c index 296354aaa9c7..b00e17e70b5a 100644 --- a/drivers/staging/epl/Edrv8139.c +++ b/drivers/staging/epl/Edrv8139.c @@ -234,8 +234,8 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); -void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h index be60f771b63a..6e5910d1915d 100644 --- a/drivers/staging/epl/Epl.h +++ b/drivers/staging/epl/Epl.h @@ -131,9 +131,9 @@ typedef union { } tEplApiEventArg; -typedef tEplKernel(PUBLIC ROM * tEplApiCbEvent) (tEplApiEventType EventType_p, // IN: event type (enum) - tEplApiEventArg * pEventArg_p, // IN: event argument (union) - void GENERIC * pUserArg_p); +typedef tEplKernel(ROM *tEplApiCbEvent) (tEplApiEventType EventType_p, // IN: event type (enum) + tEplApiEventArg *pEventArg_p, // IN: event argument (union) + void GENERIC *pUserArg_p); typedef struct { unsigned int m_uiSizeOfStruct; @@ -212,62 +212,61 @@ typedef struct { // function prototypes //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiInitialize(tEplApiInitParam * pInitParam_p); +tEplKernel EplApiInitialize(tEplApiInitParam *pInitParam_p); -tEplKernel PUBLIC EplApiShutdown(void); +tEplKernel EplApiShutdown(void); -tEplKernel PUBLIC EplApiReadObject(tEplSdoComConHdl * pSdoComConHdl_p, - unsigned int uiNodeId_p, - unsigned int uiIndex_p, - unsigned int uiSubindex_p, - void *pDstData_le_p, - unsigned int *puiSize_p, - tEplSdoType SdoType_p, void *pUserArg_p); +tEplKernel EplApiReadObject(tEplSdoComConHdl *pSdoComConHdl_p, + unsigned int uiNodeId_p, + unsigned int uiIndex_p, + unsigned int uiSubindex_p, + void *pDstData_le_p, + unsigned int *puiSize_p, + tEplSdoType SdoType_p, void *pUserArg_p); -tEplKernel PUBLIC EplApiWriteObject(tEplSdoComConHdl * pSdoComConHdl_p, - unsigned int uiNodeId_p, - unsigned int uiIndex_p, - unsigned int uiSubindex_p, - void *pSrcData_le_p, - unsigned int uiSize_p, - tEplSdoType SdoType_p, void *pUserArg_p); +tEplKernel EplApiWriteObject(tEplSdoComConHdl *pSdoComConHdl_p, + unsigned int uiNodeId_p, + unsigned int uiIndex_p, + unsigned int uiSubindex_p, + void *pSrcData_le_p, + unsigned int uiSize_p, + tEplSdoType SdoType_p, void *pUserArg_p); -tEplKernel PUBLIC EplApiFreeSdoChannel(tEplSdoComConHdl SdoComConHdl_p); +tEplKernel EplApiFreeSdoChannel(tEplSdoComConHdl SdoComConHdl_p); -tEplKernel PUBLIC EplApiReadLocalObject(unsigned int uiIndex_p, - unsigned int uiSubindex_p, - void *pDstData_p, - unsigned int *puiSize_p); +tEplKernel EplApiReadLocalObject(unsigned int uiIndex_p, + unsigned int uiSubindex_p, + void *pDstData_p, + unsigned int *puiSize_p); -tEplKernel PUBLIC EplApiWriteLocalObject(unsigned int uiIndex_p, - unsigned int uiSubindex_p, - void *pSrcData_p, - unsigned int uiSize_p); +tEplKernel EplApiWriteLocalObject(unsigned int uiIndex_p, + unsigned int uiSubindex_p, + void *pSrcData_p, + unsigned int uiSize_p); -tEplKernel PUBLIC EplApiCbObdAccess(tEplObdCbParam MEM * pParam_p); +tEplKernel EplApiCbObdAccess(tEplObdCbParam MEM *pParam_p); -tEplKernel PUBLIC EplApiLinkObject(unsigned int uiObjIndex_p, - void *pVar_p, - unsigned int *puiVarEntries_p, - tEplObdSize * pEntrySize_p, - unsigned int uiFirstSubindex_p); +tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, + void *pVar_p, + unsigned int *puiVarEntries_p, + tEplObdSize *pEntrySize_p, + unsigned int uiFirstSubindex_p); -tEplKernel PUBLIC EplApiExecNmtCommand(tEplNmtEvent NmtEvent_p); +tEplKernel EplApiExecNmtCommand(tEplNmtEvent NmtEvent_p); -tEplKernel PUBLIC EplApiProcess(void); +tEplKernel EplApiProcess(void); #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) -tEplKernel PUBLIC EplApiMnTriggerStateChange(unsigned int uiNodeId_p, - tEplNmtNodeCommand NodeCommand_p); +tEplKernel EplApiMnTriggerStateChange(unsigned int uiNodeId_p, + tEplNmtNodeCommand NodeCommand_p); #endif -tEplKernel PUBLIC EplApiGetIdentResponse(unsigned int uiNodeId_p, - tEplIdentResponse ** - ppIdentResponse_p); +tEplKernel EplApiGetIdentResponse(unsigned int uiNodeId_p, + tEplIdentResponse **ppIdentResponse_p); // functions for process image will be implemented in separate file -tEplKernel PUBLIC EplApiProcessImageSetup(void); -tEplKernel PUBLIC EplApiProcessImageExchangeIn(tEplApiProcessImage * pPI_p); -tEplKernel PUBLIC EplApiProcessImageExchangeOut(tEplApiProcessImage * pPI_p); +tEplKernel EplApiProcessImageSetup(void); +tEplKernel EplApiProcessImageExchangeIn(tEplApiProcessImage *pPI_p); +tEplKernel EplApiProcessImageExchangeOut(tEplApiProcessImage *pPI_p); #endif // #ifndef _EPL_API_H_ diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h index 6fa04a4f0a13..04aeed68f4cb 100644 --- a/drivers/staging/epl/EplAmi.h +++ b/drivers/staging/epl/EplAmi.h @@ -131,16 +131,16 @@ extern "C" { // // To save code space the function AmiSetByte is replaced by // an macro. -// void PUBLIC AmiSetByte (void FAR* pAddr_p, BYTE bByteVal_p); +// void AmiSetByte (void FAR* pAddr_p, BYTE bByteVal_p); #define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} #define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} #if !defined(INLINE_ENABLED) - void PUBLIC AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p); - void PUBLIC AmiSetDwordToBe(void FAR * pAddr_p, DWORD dwDwordVal_p); - void PUBLIC AmiSetWordToLe(void FAR * pAddr_p, WORD wWordVal_p); - void PUBLIC AmiSetDwordToLe(void FAR * pAddr_p, DWORD dwDwordVal_p); +void AmiSetWordToBe(void FAR *pAddr_p, WORD wWordVal_p); +void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p); +void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p); +void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); #endif //--------------------------------------------------------------------------- @@ -149,17 +149,17 @@ extern "C" { // // To save code space the function AmiGetByte is replaced by // an macro. -// BYTE PUBLIC AmiGetByte (void FAR* pAddr_p); +// BYTE AmiGetByte (void FAR* pAddr_p); #define AmiGetByteFromBe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) #define AmiGetByteFromLe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) #if !defined(INLINE_ENABLED) - WORD PUBLIC AmiGetWordFromBe(void FAR * pAddr_p); - DWORD PUBLIC AmiGetDwordFromBe(void FAR * pAddr_p); - WORD PUBLIC AmiGetWordFromLe(void FAR * pAddr_p); - DWORD PUBLIC AmiGetDwordFromLe(void FAR * pAddr_p); +WORD AmiGetWordFromBe(void FAR *pAddr_p); +DWORD AmiGetDwordFromBe(void FAR *pAddr_p); +WORD AmiGetWordFromLe(void FAR *pAddr_p); +DWORD AmiGetDwordFromLe(void FAR *pAddr_p); //--------------------------------------------------------------------------- // @@ -174,8 +174,8 @@ extern "C" { // //--------------------------------------------------------------------------- - void PUBLIC AmiSetDword24ToBe(void FAR * pAddr_p, DWORD dwDwordVal_p); - void PUBLIC AmiSetDword24ToLe(void FAR * pAddr_p, DWORD dwDwordVal_p); +void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p); +void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); //--------------------------------------------------------------------------- // @@ -189,8 +189,8 @@ extern "C" { // //--------------------------------------------------------------------------- - DWORD PUBLIC AmiGetDword24FromBe(void FAR * pAddr_p); - DWORD PUBLIC AmiGetDword24FromLe(void FAR * pAddr_p); +DWORD AmiGetDword24FromBe(void FAR *pAddr_p); +DWORD AmiGetDword24FromLe(void FAR *pAddr_p); //#ifdef USE_VAR64 @@ -207,8 +207,8 @@ extern "C" { // //--------------------------------------------------------------------------- - void PUBLIC AmiSetQword40ToBe(void FAR * pAddr_p, QWORD qwQwordVal_p); - void PUBLIC AmiSetQword40ToLe(void FAR * pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -222,8 +222,8 @@ extern "C" { // //--------------------------------------------------------------------------- - QWORD PUBLIC AmiGetQword40FromBe(void FAR * pAddr_p); - QWORD PUBLIC AmiGetQword40FromLe(void FAR * pAddr_p); +QWORD AmiGetQword40FromBe(void FAR *pAddr_p); +QWORD AmiGetQword40FromLe(void FAR *pAddr_p); //--------------------------------------------------------------------------- // @@ -238,8 +238,8 @@ extern "C" { // //--------------------------------------------------------------------------- - void PUBLIC AmiSetQword48ToBe(void FAR * pAddr_p, QWORD qwQwordVal_p); - void PUBLIC AmiSetQword48ToLe(void FAR * pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -253,8 +253,8 @@ extern "C" { // //--------------------------------------------------------------------------- - QWORD PUBLIC AmiGetQword48FromBe(void FAR * pAddr_p); - QWORD PUBLIC AmiGetQword48FromLe(void FAR * pAddr_p); +QWORD AmiGetQword48FromBe(void FAR *pAddr_p); +QWORD AmiGetQword48FromLe(void FAR *pAddr_p); //--------------------------------------------------------------------------- // @@ -269,8 +269,8 @@ extern "C" { // //--------------------------------------------------------------------------- - void PUBLIC AmiSetQword56ToBe(void FAR * pAddr_p, QWORD qwQwordVal_p); - void PUBLIC AmiSetQword56ToLe(void FAR * pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -284,8 +284,8 @@ extern "C" { // //--------------------------------------------------------------------------- - QWORD PUBLIC AmiGetQword56FromBe(void FAR * pAddr_p); - QWORD PUBLIC AmiGetQword56FromLe(void FAR * pAddr_p); +QWORD AmiGetQword56FromBe(void FAR *pAddr_p); +QWORD AmiGetQword56FromLe(void FAR *pAddr_p); //--------------------------------------------------------------------------- // @@ -300,8 +300,8 @@ extern "C" { // //--------------------------------------------------------------------------- - void PUBLIC AmiSetQword64ToBe(void FAR * pAddr_p, QWORD qwQwordVal_p); - void PUBLIC AmiSetQword64ToLe(void FAR * pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -315,8 +315,8 @@ extern "C" { // //--------------------------------------------------------------------------- - QWORD PUBLIC AmiGetQword64FromBe(void FAR * pAddr_p); - QWORD PUBLIC AmiGetQword64FromLe(void FAR * pAddr_p); +QWORD AmiGetQword64FromBe(void FAR *pAddr_p); +QWORD AmiGetQword64FromLe(void FAR *pAddr_p); //--------------------------------------------------------------------------- // @@ -330,9 +330,7 @@ extern "C" { // Return: void // //--------------------------------------------------------------------------- - - void PUBLIC AmiSetTimeOfDay(void FAR * pAddr_p, - tTimeOfDay FAR * pTimeOfDay_p); +void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p); //--------------------------------------------------------------------------- // @@ -346,9 +344,7 @@ extern "C" { // Return: void // //--------------------------------------------------------------------------- - - void PUBLIC AmiGetTimeOfDay(void FAR * pAddr_p, - tTimeOfDay FAR * pTimeOfDay_p); +void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p); #endif diff --git a/drivers/staging/epl/EplApiGeneric.c b/drivers/staging/epl/EplApiGeneric.c index ae19e34cd7b3..e174562ddf89 100644 --- a/drivers/staging/epl/EplApiGeneric.c +++ b/drivers/staging/epl/EplApiGeneric.c @@ -162,44 +162,41 @@ static tEplApiInstance EplApiInstance_g; //--------------------------------------------------------------------------- // NMT state change event callback function -static tEplKernel PUBLIC EplApiCbNmtStateChange(tEplEventNmtStateChange - NmtStateChange_p); +static tEplKernel EplApiCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p); // update DLL configuration from OD -static tEplKernel PUBLIC EplApiUpdateDllConfig(BOOL fUpdateIdentity_p); +static tEplKernel EplApiUpdateDllConfig(BOOL fUpdateIdentity_p); // update OD from init param -static tEplKernel PUBLIC EplApiUpdateObd(void); +static tEplKernel EplApiUpdateObd(void); // process events from user event queue -static tEplKernel PUBLIC EplApiProcessEvent(tEplEvent * pEplEvent_p); +static tEplKernel EplApiProcessEvent(tEplEvent *pEplEvent_p); #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) // callback function of SDO module -static tEplKernel PUBLIC EplApiCbSdoCon(tEplSdoComFinished * pSdoComFinished_p); +static tEplKernel EplApiCbSdoCon(tEplSdoComFinished *pSdoComFinished_p); #endif #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) // callback functions of NmtMnu module -static tEplKernel PUBLIC EplApiCbNodeEvent(unsigned int uiNodeId_p, - tEplNmtNodeEvent NodeEvent_p, - tEplNmtState NmtState_p, - WORD wErrorCode_p, - BOOL fMandatory_p); - -static tEplKernel PUBLIC EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, - tEplNmtState NmtState_p, - WORD wErrorCode_p); +static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p, + tEplNmtNodeEvent NodeEvent_p, + tEplNmtState NmtState_p, + WORD wErrorCode_p, BOOL fMandatory_p); + +static tEplKernel EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, + tEplNmtState NmtState_p, + WORD wErrorCode_p); #endif #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) // callback function of Ledu module -static tEplKernel PUBLIC EplApiCbLedStateChange(tEplLedType LedType_p, - BOOL fOn_p); +static tEplKernel EplApiCbLedStateChange(tEplLedType LedType_p, BOOL fOn_p); #endif // OD initialization function (implemented in Objdict.c) -tEplKernel PUBLIC EplObdInitRam(tEplObdInitParam MEM * pInitParam_p); +tEplKernel EplObdInitRam(tEplObdInitParam MEM *pInitParam_p); //=========================================================================// // // @@ -226,7 +223,7 @@ tEplKernel PUBLIC EplObdInitRam(tEplObdInitParam MEM * pInitParam_p); // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiInitialize(tEplApiInitParam * pInitParam_p) +tEplKernel EplApiInitialize(tEplApiInitParam *pInitParam_p) { tEplKernel Ret = kEplSuccessful; tEplObdInitParam ObdInitParam; @@ -415,7 +412,7 @@ tEplKernel PUBLIC EplApiInitialize(tEplApiInitParam * pInitParam_p) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiShutdown(void) +tEplKernel EplApiShutdown(void) { tEplKernel Ret = kEplSuccessful; @@ -523,7 +520,7 @@ tEplKernel PUBLIC EplApiShutdown(void) // State: //---------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiExecNmtCommand(tEplNmtEvent NmtEvent_p) +tEplKernel EplApiExecNmtCommand(tEplNmtEvent NmtEvent_p) { tEplKernel Ret = kEplSuccessful; @@ -553,11 +550,11 @@ tEplKernel PUBLIC EplApiExecNmtCommand(tEplNmtEvent NmtEvent_p) // State: //---------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiLinkObject(unsigned int uiObjIndex_p, - void *pVar_p, - unsigned int *puiVarEntries_p, - tEplObdSize * pEntrySize_p, - unsigned int uiFirstSubindex_p) +tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, + void *pVar_p, + unsigned int *puiVarEntries_p, + tEplObdSize *pEntrySize_p, + unsigned int uiFirstSubindex_p) { BYTE bVarEntries; BYTE bIndexEntries; @@ -677,13 +674,13 @@ tEplKernel PUBLIC EplApiLinkObject(unsigned int uiObjIndex_p, // // ---------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiReadObject(tEplSdoComConHdl * pSdoComConHdl_p, - unsigned int uiNodeId_p, - unsigned int uiIndex_p, - unsigned int uiSubindex_p, - void *pDstData_le_p, - unsigned int *puiSize_p, - tEplSdoType SdoType_p, void *pUserArg_p) +tEplKernel EplApiReadObject(tEplSdoComConHdl *pSdoComConHdl_p, + unsigned int uiNodeId_p, + unsigned int uiIndex_p, + unsigned int uiSubindex_p, + void *pDstData_le_p, + unsigned int *puiSize_p, + tEplSdoType SdoType_p, void *pUserArg_p) { tEplKernel Ret = kEplSuccessful; @@ -765,13 +762,13 @@ tEplKernel PUBLIC EplApiReadObject(tEplSdoComConHdl * pSdoComConHdl_p, // // ---------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiWriteObject(tEplSdoComConHdl * pSdoComConHdl_p, - unsigned int uiNodeId_p, - unsigned int uiIndex_p, - unsigned int uiSubindex_p, - void *pSrcData_le_p, - unsigned int uiSize_p, - tEplSdoType SdoType_p, void *pUserArg_p) +tEplKernel EplApiWriteObject(tEplSdoComConHdl *pSdoComConHdl_p, + unsigned int uiNodeId_p, + unsigned int uiIndex_p, + unsigned int uiSubindex_p, + void *pSrcData_le_p, + unsigned int uiSize_p, + tEplSdoType SdoType_p, void *pUserArg_p) { tEplKernel Ret = kEplSuccessful; @@ -850,7 +847,7 @@ tEplKernel PUBLIC EplApiWriteObject(tEplSdoComConHdl * pSdoComConHdl_p, // // ---------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiFreeSdoChannel(tEplSdoComConHdl SdoComConHdl_p) +tEplKernel EplApiFreeSdoChannel(tEplSdoComConHdl SdoComConHdl_p) { tEplKernel Ret = kEplSuccessful; @@ -881,10 +878,9 @@ tEplKernel PUBLIC EplApiFreeSdoChannel(tEplSdoComConHdl SdoComConHdl_p) // // ---------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiReadLocalObject(unsigned int uiIndex_p, - unsigned int uiSubindex_p, - void *pDstData_p, - unsigned int *puiSize_p) +tEplKernel EplApiReadLocalObject(unsigned int uiIndex_p, + unsigned int uiSubindex_p, + void *pDstData_p, unsigned int *puiSize_p) { tEplKernel Ret = kEplSuccessful; tEplObdSize ObdSize; @@ -911,10 +907,10 @@ tEplKernel PUBLIC EplApiReadLocalObject(unsigned int uiIndex_p, // // ---------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiWriteLocalObject(unsigned int uiIndex_p, - unsigned int uiSubindex_p, - void *pSrcData_p, - unsigned int uiSize_p) +tEplKernel EplApiWriteLocalObject(unsigned int uiIndex_p, + unsigned int uiSubindex_p, + void *pSrcData_p, + unsigned int uiSize_p) { tEplKernel Ret = kEplSuccessful; @@ -939,8 +935,8 @@ tEplKernel PUBLIC EplApiWriteLocalObject(unsigned int uiIndex_p, // // ---------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiMnTriggerStateChange(unsigned int uiNodeId_p, - tEplNmtNodeCommand NodeCommand_p) +tEplKernel EplApiMnTriggerStateChange(unsigned int uiNodeId_p, + tEplNmtNodeCommand NodeCommand_p) { tEplKernel Ret = kEplSuccessful; @@ -966,7 +962,7 @@ tEplKernel PUBLIC EplApiMnTriggerStateChange(unsigned int uiNodeId_p, // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiCbObdAccess(tEplObdCbParam MEM * pParam_p) +tEplKernel EplApiCbObdAccess(tEplObdCbParam MEM *pParam_p) { tEplKernel Ret = kEplSuccessful; @@ -1115,7 +1111,7 @@ tEplKernel PUBLIC EplApiCbObdAccess(tEplObdCbParam MEM * pParam_p) // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplApiProcessEvent(tEplEvent * pEplEvent_p) +static tEplKernel EplApiProcessEvent(tEplEvent *pEplEvent_p) { tEplKernel Ret; tEplEventError *pEventError; @@ -1188,8 +1184,7 @@ static tEplKernel PUBLIC EplApiProcessEvent(tEplEvent * pEplEvent_p) // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplApiCbNmtStateChange(tEplEventNmtStateChange - NmtStateChange_p) +static tEplKernel EplApiCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p) { tEplKernel Ret = kEplSuccessful; BYTE bNmtState; @@ -1411,7 +1406,7 @@ static tEplKernel PUBLIC EplApiCbNmtStateChange(tEplEventNmtStateChange // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplApiUpdateDllConfig(BOOL fUpdateIdentity_p) +static tEplKernel EplApiUpdateDllConfig(BOOL fUpdateIdentity_p) { tEplKernel Ret = kEplSuccessful; tEplDllConfigParam DllConfigParam; @@ -1634,7 +1629,7 @@ static tEplKernel PUBLIC EplApiUpdateDllConfig(BOOL fUpdateIdentity_p) // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplApiUpdateObd(void) +static tEplKernel EplApiUpdateObd(void) { tEplKernel Ret = kEplSuccessful; WORD wTemp; @@ -1905,7 +1900,7 @@ static tEplKernel PUBLIC EplApiUpdateObd(void) //--------------------------------------------------------------------------- #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) -static tEplKernel PUBLIC EplApiCbSdoCon(tEplSdoComFinished * pSdoComFinished_p) +static tEplKernel EplApiCbSdoCon(tEplSdoComFinished *pSdoComFinished_p) { tEplKernel Ret; tEplApiEventArg EventArg; @@ -1946,10 +1941,10 @@ static tEplKernel PUBLIC EplApiCbSdoCon(tEplSdoComFinished * pSdoComFinished_p) // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplApiCbNodeEvent(unsigned int uiNodeId_p, - tEplNmtNodeEvent NodeEvent_p, - tEplNmtState NmtState_p, - WORD wErrorCode_p, BOOL fMandatory_p) +static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p, + tEplNmtNodeEvent NodeEvent_p, + tEplNmtState NmtState_p, + WORD wErrorCode_p, BOOL fMandatory_p) { tEplKernel Ret; tEplApiEventArg EventArg; @@ -1990,9 +1985,9 @@ static tEplKernel PUBLIC EplApiCbNodeEvent(unsigned int uiNodeId_p, // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, - tEplNmtState NmtState_p, - WORD wErrorCode_p) +static tEplKernel EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, + tEplNmtState NmtState_p, + WORD wErrorCode_p) { tEplKernel Ret; tEplApiEventArg EventArg; @@ -2033,8 +2028,7 @@ static tEplKernel PUBLIC EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplApiCbLedStateChange(tEplLedType LedType_p, - BOOL fOn_p) +static tEplKernel EplApiCbLedStateChange(tEplLedType LedType_p, BOOL fOn_p) { tEplKernel Ret; tEplApiEventArg EventArg; diff --git a/drivers/staging/epl/EplApiLinuxKernel.c b/drivers/staging/epl/EplApiLinuxKernel.c index 05ca0628d6ae..8d4a218c3248 100644 --- a/drivers/staging/epl/EplApiLinuxKernel.c +++ b/drivers/staging/epl/EplApiLinuxKernel.c @@ -139,7 +139,7 @@ MODULE_DESCRIPTION("EPL API driver"); // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #else #define TGT_DBG_SIGNAL_TRACE_POINT(p) @@ -204,11 +204,11 @@ typedef struct { // Prototypes of internal functions //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) - tEplApiEventArg * pEventArg_p, // IN: event argument (union) - void GENERIC * pUserArg_p); +tEplKernel EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) + tEplApiEventArg *pEventArg_p, // IN: event argument (union) + void GENERIC *pUserArg_p); -tEplKernel PUBLIC EplLinCbSync(void); +tEplKernel EplLinCbSync(void); static int __init EplLinInit(void); static void __exit EplLinExit(void); @@ -1158,9 +1158,9 @@ static int EplLinIoctl(struct inode *pDeviceFile_p, // information about the dev // // //=========================================================================// -tEplKernel PUBLIC EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) - tEplApiEventArg * pEventArg_p, // IN: event argument (union) - void GENERIC * pUserArg_p) +tEplKernel EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) + tEplApiEventArg *pEventArg_p, // IN: event argument (union) + void GENERIC *pUserArg_p) { tEplKernel EplRet = kEplSuccessful; int iErr; @@ -1224,7 +1224,7 @@ tEplKernel PUBLIC EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type return EplRet; } -tEplKernel PUBLIC EplLinCbSync(void) +tEplKernel EplLinCbSync(void) { tEplKernel EplRet = kEplSuccessful; int iErr; diff --git a/drivers/staging/epl/EplApiProcessImage.c b/drivers/staging/epl/EplApiProcessImage.c index 2b2fdf229a75..4fbb7289e0bf 100644 --- a/drivers/staging/epl/EplApiProcessImage.c +++ b/drivers/staging/epl/EplApiProcessImage.c @@ -169,7 +169,7 @@ static tEplApiProcessImageInstance EplApiProcessImageInstance_g; // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiProcessImageSetup(void) +tEplKernel EplApiProcessImageSetup(void) { tEplKernel Ret = kEplSuccessful; #if ((EPL_API_PROCESS_IMAGE_SIZE_IN > 0) || (EPL_API_PROCESS_IMAGE_SIZE_OUT > 0)) @@ -280,7 +280,7 @@ tEplKernel PUBLIC EplApiProcessImageSetup(void) // State: //---------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiProcessImageExchangeIn(tEplApiProcessImage * pPI_p) +tEplKernel EplApiProcessImageExchangeIn(tEplApiProcessImage *pPI_p) { tEplKernel Ret = kEplSuccessful; @@ -315,7 +315,7 @@ tEplKernel PUBLIC EplApiProcessImageExchangeIn(tEplApiProcessImage * pPI_p) // State: //---------------------------------------------------------------------------- -tEplKernel PUBLIC EplApiProcessImageExchangeOut(tEplApiProcessImage * pPI_p) +tEplKernel EplApiProcessImageExchangeOut(tEplApiProcessImage *pPI_p) { tEplKernel Ret = kEplSuccessful; diff --git a/drivers/staging/epl/EplDllk.c b/drivers/staging/epl/EplDllk.c index 9e22641055c6..8fafe7524428 100644 --- a/drivers/staging/epl/EplDllk.c +++ b/drivers/staging/epl/EplDllk.c @@ -121,8 +121,8 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); -void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else @@ -257,7 +257,7 @@ static tEplKernel EplDllkCheckFrame(tEplFrame * pFrame_p, // called by high resolution timer module to monitor EPL cycle as CN #if EPL_TIMER_USE_HIGHRES != FALSE -static tEplKernel PUBLIC EplDllkCbCnTimer(tEplTimerEventArg * pEventArg_p); +static tEplKernel EplDllkCbCnTimer(tEplTimerEventArg *pEventArg_p); #endif #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) @@ -278,10 +278,9 @@ static tEplKernel EplDllkAsyncFrameNotReceived(tEplDllReqServiceId ReqServiceId_p, unsigned int uiNodeId_p); -static tEplKernel PUBLIC EplDllkCbMnTimerCycle(tEplTimerEventArg * pEventArg_p); +static tEplKernel EplDllkCbMnTimerCycle(tEplTimerEventArg *pEventArg_p); -static tEplKernel PUBLIC EplDllkCbMnTimerResponse(tEplTimerEventArg * - pEventArg_p); +static tEplKernel EplDllkCbMnTimerResponse(tEplTimerEventArg *pEventArg_p); #endif @@ -3546,7 +3545,7 @@ static tEplKernel EplDllkCheckFrame(tEplFrame * pFrame_p, //--------------------------------------------------------------------------- #if EPL_TIMER_USE_HIGHRES != FALSE -static tEplKernel PUBLIC EplDllkCbCnTimer(tEplTimerEventArg * pEventArg_p) +static tEplKernel EplDllkCbCnTimer(tEplTimerEventArg *pEventArg_p) { tEplKernel Ret = kEplSuccessful; tEplNmtState NmtState; @@ -3617,7 +3616,7 @@ static tEplKernel PUBLIC EplDllkCbCnTimer(tEplTimerEventArg * pEventArg_p) // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplDllkCbMnTimerCycle(tEplTimerEventArg * pEventArg_p) +static tEplKernel EplDllkCbMnTimerCycle(tEplTimerEventArg *pEventArg_p) { tEplKernel Ret = kEplSuccessful; tEplNmtState NmtState; @@ -3670,8 +3669,7 @@ static tEplKernel PUBLIC EplDllkCbMnTimerCycle(tEplTimerEventArg * pEventArg_p) // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplDllkCbMnTimerResponse(tEplTimerEventArg * - pEventArg_p) +static tEplKernel EplDllkCbMnTimerResponse(tEplTimerEventArg *pEventArg_p) { tEplKernel Ret = kEplSuccessful; tEplNmtState NmtState; diff --git a/drivers/staging/epl/EplErrorHandlerk.c b/drivers/staging/epl/EplErrorHandlerk.c index d12521fc99a4..25a44d961c00 100644 --- a/drivers/staging/epl/EplErrorHandlerk.c +++ b/drivers/staging/epl/EplErrorHandlerk.c @@ -176,7 +176,7 @@ static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplErrorHandlerkInit(void) +tEplKernel EplErrorHandlerkInit(void) { tEplKernel Ret; @@ -203,7 +203,7 @@ tEplKernel PUBLIC EplErrorHandlerkInit(void) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplErrorHandlerkAddInstance(void) +tEplKernel EplErrorHandlerkAddInstance(void) { tEplKernel Ret; @@ -306,7 +306,7 @@ tEplKernel PUBLIC EplErrorHandlerkAddInstance(void) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplErrorHandlerkDelInstance() +tEplKernel EplErrorHandlerkDelInstance(void) { tEplKernel Ret; @@ -333,7 +333,7 @@ tEplKernel PUBLIC EplErrorHandlerkDelInstance() // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplErrorHandlerkProcess(tEplEvent * pEvent_p) +tEplKernel EplErrorHandlerkProcess(tEplEvent *pEvent_p) { tEplKernel Ret; unsigned long ulDllErrorEvents; diff --git a/drivers/staging/epl/EplEvent.h b/drivers/staging/epl/EplEvent.h index b6dc1b9b2ab1..c3c317df96c5 100644 --- a/drivers/staging/epl/EplEvent.h +++ b/drivers/staging/epl/EplEvent.h @@ -267,10 +267,10 @@ typedef struct { } tEplErrorHandlerkEvent; // callback function to get informed about sync event -typedef tEplKernel(PUBLIC * tEplSyncCb) (void); +typedef tEplKernel(*tEplSyncCb) (void); // callback function for generic events -typedef tEplKernel(PUBLIC * tEplProcessEventCb) (tEplEvent * pEplEvent_p); +typedef tEplKernel(*tEplProcessEventCb) (tEplEvent *pEplEvent_p); //--------------------------------------------------------------------------- // function prototypes diff --git a/drivers/staging/epl/EplEventk.c b/drivers/staging/epl/EplEventk.c index 8068a6c5a0d0..165d7e9ef4ab 100644 --- a/drivers/staging/epl/EplEventk.c +++ b/drivers/staging/epl/EplEventk.c @@ -100,8 +100,8 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); -void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else @@ -172,7 +172,7 @@ static void EplEventkRxSignalHandlerCb(tShbInstance pShbRxInstance_p, // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventkInit(tEplSyncCb pfnCbSync_p) +tEplKernel EplEventkInit(tEplSyncCb pfnCbSync_p) { tEplKernel Ret; @@ -196,7 +196,7 @@ tEplKernel PUBLIC EplEventkInit(tEplSyncCb pfnCbSync_p) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventkAddInstance(tEplSyncCb pfnCbSync_p) +tEplKernel EplEventkAddInstance(tEplSyncCb pfnCbSync_p) { tEplKernel Ret; #ifndef EPL_NO_FIFO @@ -275,7 +275,7 @@ tEplKernel PUBLIC EplEventkAddInstance(tEplSyncCb pfnCbSync_p) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventkDelInstance() +tEplKernel EplEventkDelInstance(void) { tEplKernel Ret; #ifndef EPL_NO_FIFO @@ -339,7 +339,7 @@ tEplKernel PUBLIC EplEventkDelInstance() // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventkProcess(tEplEvent * pEvent_p) +tEplKernel EplEventkProcess(tEplEvent *pEvent_p) { tEplKernel Ret; tEplEventSource EventSource; @@ -562,7 +562,7 @@ tEplKernel PUBLIC EplEventkProcess(tEplEvent * pEvent_p) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventkPost(tEplEvent * pEvent_p) +tEplKernel EplEventkPost(tEplEvent *pEvent_p) { tEplKernel Ret; #ifndef EPL_NO_FIFO @@ -755,9 +755,9 @@ tEplKernel PUBLIC EplEventkPost(tEplEvent * pEvent_p) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventkPostError(tEplEventSource EventSource_p, - tEplKernel EplError_p, - unsigned int uiArgSize_p, void *pArg_p) +tEplKernel EplEventkPostError(tEplEventSource EventSource_p, + tEplKernel EplError_p, + unsigned int uiArgSize_p, void *pArg_p) { tEplKernel Ret; BYTE abBuffer[EPL_MAX_EVENT_ARG_SIZE]; diff --git a/drivers/staging/epl/EplEventu.c b/drivers/staging/epl/EplEventu.c index 815f9a87abf8..d26e95a923a7 100644 --- a/drivers/staging/epl/EplEventu.c +++ b/drivers/staging/epl/EplEventu.c @@ -96,8 +96,8 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); -void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else @@ -172,7 +172,7 @@ static void EplEventuRxSignalHandlerCb(tShbInstance pShbRxInstance_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p) +tEplKernel EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p) { tEplKernel Ret; @@ -199,8 +199,7 @@ tEplKernel PUBLIC EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventuAddInstance(tEplProcessEventCb - pfnApiProcessEventCb_p) +tEplKernel EplEventuAddInstance(tEplProcessEventCb pfnApiProcessEventCb_p) { tEplKernel Ret; #ifndef EPL_NO_FIFO @@ -280,7 +279,7 @@ tEplKernel PUBLIC EplEventuAddInstance(tEplProcessEventCb // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventuDelInstance() +tEplKernel EplEventuDelInstance(void) { tEplKernel Ret; #ifndef EPL_NO_FIFO @@ -348,7 +347,7 @@ tEplKernel PUBLIC EplEventuDelInstance() // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventuProcess(tEplEvent * pEvent_p) +tEplKernel EplEventuProcess(tEplEvent *pEvent_p) { tEplKernel Ret; tEplEventSource EventSource; @@ -515,7 +514,7 @@ tEplKernel PUBLIC EplEventuProcess(tEplEvent * pEvent_p) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventuPost(tEplEvent * pEvent_p) +tEplKernel EplEventuPost(tEplEvent *pEvent_p) { tEplKernel Ret; #ifndef EPL_NO_FIFO @@ -689,9 +688,9 @@ tEplKernel PUBLIC EplEventuPost(tEplEvent * pEvent_p) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplEventuPostError(tEplEventSource EventSource_p, - tEplKernel EplError_p, - unsigned int uiArgSize_p, void *pArg_p) +tEplKernel EplEventuPostError(tEplEventSource EventSource_p, + tEplKernel EplError_p, + unsigned int uiArgSize_p, void *pArg_p) { tEplKernel Ret; BYTE abBuffer[EPL_MAX_EVENT_ARG_SIZE]; diff --git a/drivers/staging/epl/EplIdentu.c b/drivers/staging/epl/EplIdentu.c index ce59ef09ccdf..75f941d97cc6 100644 --- a/drivers/staging/epl/EplIdentu.c +++ b/drivers/staging/epl/EplIdentu.c @@ -138,7 +138,7 @@ static tEplIdentuInstance EplIdentuInstance_g; // local function prototypes //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplIdentuCbIdentResponse(tEplFrameInfo * pFrameInfo_p); +static tEplKernel EplIdentuCbIdentResponse(tEplFrameInfo *pFrameInfo_p); //=========================================================================// // // @@ -164,7 +164,7 @@ static tEplKernel PUBLIC EplIdentuCbIdentResponse(tEplFrameInfo * pFrameInfo_p); // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplIdentuInit() +EPLDLLEXPORT tEplKernel EplIdentuInit(void) { tEplKernel Ret; @@ -191,7 +191,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplIdentuInit() // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplIdentuAddInstance() +EPLDLLEXPORT tEplKernel EplIdentuAddInstance(void) { tEplKernel Ret; @@ -228,7 +228,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplIdentuAddInstance() // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplIdentuDelInstance() +EPLDLLEXPORT tEplKernel EplIdentuDelInstance(void) { tEplKernel Ret; @@ -263,7 +263,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplIdentuDelInstance() // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplIdentuReset() +EPLDLLEXPORT tEplKernel EplIdentuReset(void) { tEplKernel Ret; int iIndex; @@ -300,9 +300,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplIdentuReset() // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplIdentuGetIdentResponse(unsigned int uiNodeId_p, - tEplIdentResponse ** - ppIdentResponse_p) +tEplKernel EplIdentuGetIdentResponse(unsigned int uiNodeId_p, + tEplIdentResponse **ppIdentResponse_p) { tEplKernel Ret; @@ -338,9 +337,8 @@ tEplKernel PUBLIC EplIdentuGetIdentResponse(unsigned int uiNodeId_p, // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, - tEplIdentuCbResponse - pfnCbResponse_p) +tEplKernel EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, + tEplIdentuCbResponse pfnCbResponse_p) { tEplKernel Ret; @@ -388,7 +386,7 @@ tEplKernel PUBLIC EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, // //--------------------------------------------------------------------------- -EPLDLLEXPORT DWORD PUBLIC EplIdentuGetRunningRequests(void) +EPLDLLEXPORT DWORD EplIdentuGetRunningRequests(void) { DWORD dwReqs = 0; unsigned int uiIndex; @@ -426,7 +424,7 @@ EPLDLLEXPORT DWORD PUBLIC EplIdentuGetRunningRequests(void) // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplIdentuCbIdentResponse(tEplFrameInfo * pFrameInfo_p) +static tEplKernel EplIdentuCbIdentResponse(tEplFrameInfo *pFrameInfo_p) { tEplKernel Ret = kEplSuccessful; unsigned int uiNodeId; diff --git a/drivers/staging/epl/EplNmtCnu.c b/drivers/staging/epl/EplNmtCnu.c index f2f46da08c7d..2c3911675396 100644 --- a/drivers/staging/epl/EplNmtCnu.c +++ b/drivers/staging/epl/EplNmtCnu.c @@ -110,7 +110,7 @@ static tEplNmtCommand EplNmtCnuGetNmtCommand(tEplFrameInfo * pFrameInfo_p); static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p); -static tEplKernel PUBLIC EplNmtCnuCommandCb(tEplFrameInfo * pFrameInfo_p); +static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p); //=========================================================================// // // @@ -135,7 +135,7 @@ static tEplKernel PUBLIC EplNmtCnuCommandCb(tEplFrameInfo * pFrameInfo_p); // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuInit(unsigned int uiNodeId_p) +EPLDLLEXPORT tEplKernel EplNmtCnuInit(unsigned int uiNodeId_p) { tEplKernel Ret; @@ -161,7 +161,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuInit(unsigned int uiNodeId_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuAddInstance(unsigned int uiNodeId_p) +EPLDLLEXPORT tEplKernel EplNmtCnuAddInstance(unsigned int uiNodeId_p) { tEplKernel Ret; @@ -201,7 +201,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuAddInstance(unsigned int uiNodeId_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuDelInstance() +EPLDLLEXPORT tEplKernel EplNmtCnuDelInstance(void) { tEplKernel Ret; @@ -234,9 +234,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuDelInstance() // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, - tEplNmtCommand - NmtCommand_p) +EPLDLLEXPORT tEplKernel EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, + tEplNmtCommand NmtCommand_p) { tEplKernel Ret; tEplFrameInfo NmtRequestFrameInfo; @@ -297,9 +296,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC -EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback - pfnEplNmtCheckEventCb_p) +EPLDLLEXPORT tEplKernel EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback pfnEplNmtCheckEventCb_p) { tEplKernel Ret; @@ -335,7 +332,7 @@ EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback // State: // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplNmtCnuCommandCb(tEplFrameInfo * pFrameInfo_p) +static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p) { tEplKernel Ret = kEplSuccessful; tEplNmtCommand NmtCommand; diff --git a/drivers/staging/epl/EplNmtMnu.c b/drivers/staging/epl/EplNmtMnu.c index 4ed0b6ce487c..79ffdbf7fad2 100644 --- a/drivers/staging/epl/EplNmtMnu.c +++ b/drivers/staging/epl/EplNmtMnu.c @@ -94,8 +94,8 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); -void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else @@ -241,15 +241,13 @@ static tEplNmtMnuInstance EplNmtMnuInstance_g; // local function prototypes //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplNmtMnuCbNmtRequest(tEplFrameInfo * pFrameInfo_p); +static tEplKernel EplNmtMnuCbNmtRequest(tEplFrameInfo *pFrameInfo_p); -static tEplKernel PUBLIC EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, - tEplIdentResponse * - pIdentResponse_p); +static tEplKernel EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, + tEplIdentResponse *pIdentResponse_p); -static tEplKernel PUBLIC EplNmtMnuCbStatusResponse(unsigned int uiNodeId_p, - tEplStatusResponse * - pStatusResponse_p); +static tEplKernel EplNmtMnuCbStatusResponse(unsigned int uiNodeId_p, + tEplStatusResponse *pStatusResponse_p); static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p, tEplNmtMnuNodeInfo * pNodeInfo_p, @@ -645,8 +643,7 @@ tEplKernel EplNmtMnuTriggerStateChange(unsigned int uiNodeId_p, // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange - NmtStateChange_p) +tEplKernel EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p) { tEplKernel Ret = kEplSuccessful; @@ -928,7 +925,7 @@ tEplKernel PUBLIC EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplNmtMnuCbCheckEvent(tEplNmtEvent NmtEvent_p) +tEplKernel EplNmtMnuCbCheckEvent(tEplNmtEvent NmtEvent_p) { tEplKernel Ret = kEplSuccessful; @@ -949,7 +946,7 @@ tEplKernel PUBLIC EplNmtMnuCbCheckEvent(tEplNmtEvent NmtEvent_p) // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtMnuProcessEvent(tEplEvent * pEvent_p) +EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent *pEvent_p) { tEplKernel Ret; @@ -1258,11 +1255,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtMnuProcessEvent(tEplEvent * pEvent_p) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplNmtMnuGetDiagnosticInfo(unsigned int - *puiMandatorySlaveCount_p, - unsigned int - *puiSignalSlaveCount_p, - WORD * pwFlags_p) +tEplKernel EplNmtMnuGetDiagnosticInfo(unsigned int *puiMandatorySlaveCount_p, + unsigned int *puiSignalSlaveCount_p, + WORD *pwFlags_p) { tEplKernel Ret = kEplSuccessful; @@ -1347,7 +1342,7 @@ Exit: // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplNmtMnuCbNmtRequest(tEplFrameInfo * pFrameInfo_p) +static tEplKernel EplNmtMnuCbNmtRequest(tEplFrameInfo *pFrameInfo_p) { tEplKernel Ret = kEplSuccessful; @@ -1371,9 +1366,8 @@ static tEplKernel PUBLIC EplNmtMnuCbNmtRequest(tEplFrameInfo * pFrameInfo_p) // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, - tEplIdentResponse * - pIdentResponse_p) +static tEplKernel EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, + tEplIdentResponse *pIdentResponse_p) { tEplKernel Ret = kEplSuccessful; @@ -1431,9 +1425,8 @@ static tEplKernel PUBLIC EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplNmtMnuCbStatusResponse(unsigned int uiNodeId_p, - tEplStatusResponse * - pStatusResponse_p) +static tEplKernel EplNmtMnuCbStatusResponse(unsigned int uiNodeId_p, + tEplStatusResponse *pStatusResponse_p) { tEplKernel Ret = kEplSuccessful; diff --git a/drivers/staging/epl/EplNmtk.c b/drivers/staging/epl/EplNmtk.c index 4e2d0e15e947..ad85d8e8511e 100644 --- a/drivers/staging/epl/EplNmtk.c +++ b/drivers/staging/epl/EplNmtk.c @@ -88,8 +88,8 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); -void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else @@ -163,7 +163,7 @@ EPL_MCO_DEFINE_INSTANCE_FCT() // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR) +EPLDLLEXPORT tEplKernel EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR) { tEplKernel Ret; @@ -189,7 +189,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) +EPLDLLEXPORT tEplKernel EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) { EPL_MCO_DECL_INSTANCE_PTR_LOCAL tEplKernel Ret; //tEplEvent Event; @@ -258,7 +258,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) // //--------------------------------------------------------------------------- #if (EPL_USE_DELETEINST_FUNC != FALSE) -EPLDLLEXPORT tEplKernel PUBLIC EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) +EPLDLLEXPORT tEplKernel EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) { tEplKernel Ret = kEplSuccessful; // check for all API function if instance is valid @@ -296,8 +296,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtkProcess(EPL_MCO_DECL_PTR_INSTANCE_PTR_ - tEplEvent * pEvent_p) +EPLDLLEXPORT tEplKernel EplNmtkProcess(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplEvent *pEvent_p) { tEplKernel Ret; tEplNmtState OldNmtState; @@ -1804,8 +1803,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtkProcess(EPL_MCO_DECL_PTR_INSTANCE_PTR_ // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplNmtState PUBLIC -EplNmtkGetNmtState(EPL_MCO_DECL_PTR_INSTANCE_PTR) +EPLDLLEXPORT tEplNmtState EplNmtkGetNmtState(EPL_MCO_DECL_PTR_INSTANCE_PTR) { tEplNmtState NmtState; diff --git a/drivers/staging/epl/EplNmtu.c b/drivers/staging/epl/EplNmtu.c index 3de16a1eff5e..3c6452fb3048 100644 --- a/drivers/staging/epl/EplNmtu.c +++ b/drivers/staging/epl/EplNmtu.c @@ -132,7 +132,7 @@ static tEplNmtuInstance EplNmtuInstance_g; // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuInit() +EPLDLLEXPORT tEplKernel EplNmtuInit(void) { tEplKernel Ret; @@ -158,7 +158,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtuInit() // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuAddInstance() +EPLDLLEXPORT tEplKernel EplNmtuAddInstance(void) { tEplKernel Ret; @@ -187,7 +187,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtuAddInstance() // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuDelInstance() +EPLDLLEXPORT tEplKernel EplNmtuDelInstance(void) { tEplKernel Ret; @@ -219,7 +219,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtuDelInstance() // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuNmtEvent(tEplNmtEvent NmtEvent_p) +EPLDLLEXPORT tEplKernel EplNmtuNmtEvent(tEplNmtEvent NmtEvent_p) { tEplKernel Ret; tEplEvent Event; @@ -253,7 +253,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtuNmtEvent(tEplNmtEvent NmtEvent_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplNmtState PUBLIC EplNmtuGetNmtState() +EPLDLLEXPORT tEplNmtState EplNmtuGetNmtState(void) { tEplNmtState NmtState; @@ -284,7 +284,7 @@ EPLDLLEXPORT tEplNmtState PUBLIC EplNmtuGetNmtState() // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuProcessEvent(tEplEvent * pEplEvent_p) +EPLDLLEXPORT tEplKernel EplNmtuProcessEvent(tEplEvent *pEplEvent_p) { tEplKernel Ret; @@ -664,9 +664,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtuProcessEvent(tEplEvent * pEplEvent_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC -EplNmtuRegisterStateChangeCb(tEplNmtuStateChangeCallback - pfnEplNmtStateChangeCb_p) +EPLDLLEXPORT tEplKernel EplNmtuRegisterStateChangeCb(tEplNmtuStateChangeCallback pfnEplNmtStateChangeCb_p) { tEplKernel Ret; diff --git a/drivers/staging/epl/EplNmtuCal.c b/drivers/staging/epl/EplNmtuCal.c index 4a29ef58bf9b..db823b919a5d 100644 --- a/drivers/staging/epl/EplNmtuCal.c +++ b/drivers/staging/epl/EplNmtuCal.c @@ -119,7 +119,7 @@ // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplNmtState PUBLIC EplNmtkCalGetNmtState() +EPLDLLEXPORT tEplNmtState EplNmtkCalGetNmtState(void) { tEplNmtState NmtState; // for test direkt call for EplNmtkGetNmtState() diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c index efbb1967a5dc..a07582cec505 100644 --- a/drivers/staging/epl/EplObd.c +++ b/drivers/staging/epl/EplObd.c @@ -189,24 +189,22 @@ void *EplObdGetObjectDataPtrIntern(tEplObdSubEntryPtr pSubindexEntry_p); static tEplKernel EplObdIsNumericalIntern(tEplObdSubEntryPtr pObdSubEntry_p, BOOL * pfEntryNumerical_p); -static tEplKernel PUBLIC EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pSrcData_p, - void **ppDstData_p, - tEplObdSize Size_p, - tEplObdEntryPtr * ppObdEntry_p, - tEplObdSubEntryPtr * ppSubEntry_p, - tEplObdCbParam MEM * pCbParam_p, - tEplObdSize * pObdSize_p); - -static tEplKernel PUBLIC EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdEntryPtr pObdEntry_p, - tEplObdSubEntryPtr pSubEntry_p, - tEplObdCbParam MEM * pCbParam_p, - void *pSrcData_p, - void *pDstData_p, - tEplObdSize ObdSize_p); +static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + void **ppDstData_p, + tEplObdSize Size_p, + tEplObdEntryPtr *ppObdEntry_p, + tEplObdSubEntryPtr *ppSubEntry_p, + tEplObdCbParam MEM *pCbParam_p, + tEplObdSize *pObdSize_p); + +static tEplKernel EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPtr pObdEntry_p, + tEplObdSubEntryPtr pSubEntry_p, + tEplObdCbParam MEM *pCbParam_p, + void *pSrcData_p, + void *pDstData_p, + tEplObdSize ObdSize_p); //=========================================================================// // // @@ -228,8 +226,7 @@ static tEplKernel PUBLIC EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ - tEplObdInitParam MEM * pInitParam_p) +EPLDLLEXPORT tEplKernel EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p) { tEplKernel Ret; @@ -261,9 +258,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ - tEplObdInitParam MEM * - pInitParam_p) +EPLDLLEXPORT tEplKernel EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p) { EPL_MCO_DECL_INSTANCE_PTR_LOCAL tEplKernel Ret; @@ -308,7 +303,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ // //--------------------------------------------------------------------------- #if (EPL_USE_DELETEINST_FUNC != FALSE) -EPLDLLEXPORT tEplKernel PUBLIC EplObdDeleteInstance(EPL_MCO_DECL_INSTANCE_PTR) +EPLDLLEXPORT tEplKernel EplObdDeleteInstance(EPL_MCO_DECL_INSTANCE_PTR) { // check for all API function if instance is valid EPL_MCO_CHECK_INSTANCE_STATE(); @@ -341,11 +336,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdDeleteInstance(EPL_MCO_DECL_INSTANCE_PTR) // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntry(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p) +EPLDLLEXPORT tEplKernel EplObdWriteEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + tEplObdSize Size_p) { tEplKernel Ret; @@ -402,11 +396,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntry(EPL_MCO_DECL_INSTANCE_PTR_ // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntry(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p) +EPLDLLEXPORT tEplKernel EplObdReadEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize *pSize_p) { tEplKernel Ret; @@ -487,9 +480,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntry(EPL_MCO_DECL_INSTANCE_PTR_ // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdPart ObdPart_p, - tEplObdDir Direction_p) +EPLDLLEXPORT tEplKernel EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdPart ObdPart_p, + tEplObdDir Direction_p) { tEplKernel Ret = kEplSuccessful; @@ -587,8 +579,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ - tEplVarParam MEM * pVarParam_p) +EPLDLLEXPORT tEplKernel EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ tEplVarParam MEM *pVarParam_p) { tEplKernel Ret; @@ -674,9 +665,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ // //--------------------------------------------------------------------------- -EPLDLLEXPORT void *PUBLIC EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p) +EPLDLLEXPORT void *EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p) { tEplKernel Ret; void *pData; @@ -719,8 +709,7 @@ EPLDLLEXPORT void *PUBLIC EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdEntryPtr pUserOd_p) +EPLDLLEXPORT tEplKernel EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPtr pUserOd_p) { EPL_MCO_CHECK_INSTANCE_STATE(); @@ -749,10 +738,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ // //--------------------------------------------------------------------------- -EPLDLLEXPORT void PUBLIC EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdVarEntry MEM * pVarEntry_p, - tEplObdType Type_p, - tEplObdSize ObdSize_p) +EPLDLLEXPORT void EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdVarEntry MEM *pVarEntry_p, + tEplObdType Type_p, tEplObdSize ObdSize_p) { /* #if (EPL_PDO_USE_STATIC_MAPPING == FALSE) @@ -803,9 +790,8 @@ EPLDLLEXPORT void PUBLIC EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplObdSize PUBLIC EplObdGetDataSize(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p) +EPLDLLEXPORT tEplObdSize EplObdGetDataSize(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p) { tEplKernel Ret; tEplObdSize ObdSize; @@ -845,7 +831,7 @@ EPLDLLEXPORT tEplObdSize PUBLIC EplObdGetDataSize(EPL_MCO_DECL_INSTANCE_PTR_ // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT unsigned int PUBLIC EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR) +EPLDLLEXPORT unsigned int EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR) { tEplKernel Ret; tEplObdSize ObdSize; @@ -882,9 +868,8 @@ EPLDLLEXPORT unsigned int PUBLIC EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdSetNodeId(EPL_MCO_DECL_PTR_INSTANCE_PTR_ - unsigned int uiNodeId_p, - tEplObdNodeIdType NodeIdType_p) +EPLDLLEXPORT tEplKernel EplObdSetNodeId(EPL_MCO_DECL_PTR_INSTANCE_PTR_ unsigned int uiNodeId_p, + tEplObdNodeIdType NodeIdType_p) { tEplKernel Ret; tEplObdSize ObdSize; @@ -966,10 +951,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdSetNodeId(EPL_MCO_DECL_PTR_INSTANCE_PTR_ // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdIsNumerical(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - BOOL * pfEntryNumerical_p) +EPLDLLEXPORT tEplKernel EplObdIsNumerical(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + BOOL *pfEntryNumerical_p) { tEplKernel Ret; tEplObdEntryPtr pObdEntry; @@ -1018,11 +1002,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdIsNumerical(EPL_MCO_DECL_INSTANCE_PTR_ // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p) +EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize *pSize_p) { tEplKernel Ret; tEplObdEntryPtr pObdEntry; @@ -1199,11 +1182,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p) +EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + tEplObdSize Size_p) { tEplKernel Ret; tEplObdEntryPtr pObdEntry; @@ -1345,10 +1327,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - tEplObdAccess * pAccessTyp_p) +EPLDLLEXPORT tEplKernel EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + tEplObdAccess *pAccessTyp_p) { tEplKernel Ret; tEplObdEntryPtr pObdEntry; @@ -1388,10 +1369,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplObdSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubindex_p, - tEplObdVarEntry MEM ** ppVarEntry_p) +tEplKernel EplObdSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubindex_p, + tEplObdVarEntry MEM **ppVarEntry_p) { tEplKernel Ret; @@ -1870,16 +1850,15 @@ static tEplKernel EplObdCheckObjectRange(tEplObdSubEntryPtr pSubindexEntry_p, // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pSrcData_p, - void **ppDstData_p, - tEplObdSize Size_p, - tEplObdEntryPtr * ppObdEntry_p, - tEplObdSubEntryPtr * ppSubEntry_p, - tEplObdCbParam MEM * pCbParam_p, - tEplObdSize * pObdSize_p) +static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + void **ppDstData_p, + tEplObdSize Size_p, + tEplObdEntryPtr *ppObdEntry_p, + tEplObdSubEntryPtr *ppSubEntry_p, + tEplObdCbParam MEM *pCbParam_p, + tEplObdSize *pObdSize_p) { tEplKernel Ret; @@ -2064,13 +2043,12 @@ static tEplKernel PUBLIC EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdEntryPtr pObdEntry_p, - tEplObdSubEntryPtr pSubEntry_p, - tEplObdCbParam MEM * pCbParam_p, - void *pSrcData_p, - void *pDstData_p, - tEplObdSize ObdSize_p) +static tEplKernel EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPtr pObdEntry_p, + tEplObdSubEntryPtr pSubEntry_p, + tEplObdCbParam MEM *pCbParam_p, + void *pSrcData_p, + void *pDstData_p, + tEplObdSize ObdSize_p) { tEplKernel Ret; @@ -2762,9 +2740,7 @@ static tEplKernel EplObdGetSubindexIntern(tEplObdEntryPtr pObdEntry_p, // //--------------------------------------------------------------------------- #if (EPL_OBD_USE_STORE_RESTORE != FALSE) -EPLDLLEXPORT tEplKernel PUBLIC -EplObdSetStoreLoadObjCallback(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdStoreLoadObjCallback fpCallback_p) +EPLDLLEXPORT tEplKernel EplObdSetStoreLoadObjCallback(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdStoreLoadObjCallback fpCallback_p) { EPL_MCO_CHECK_INSTANCE_STATE(); diff --git a/drivers/staging/epl/EplObd.h b/drivers/staging/epl/EplObd.h index 88cc11e34ccd..6e450d84be86 100644 --- a/drivers/staging/epl/EplObd.h +++ b/drivers/staging/epl/EplObd.h @@ -283,8 +283,7 @@ typedef enum { kVarValidAll = 0x03 // currently only size and data are implemented and used } tEplVarParamValid; -typedef tEplKernel(PUBLIC ROM * tEplVarCallback) (CCM_DECL_INSTANCE_HDL_ - void *pParam_p); +typedef tEplKernel(ROM *tEplVarCallback) (CCM_DECL_INSTANCE_HDL_ void *pParam_p); typedef struct { tEplVarParamValid m_ValidFlag; @@ -376,9 +375,7 @@ typedef struct { } tEplObdCbParam; // define type for callback function: pParam_p points to tEplObdCbParam -typedef tEplKernel(PUBLIC ROM * tEplObdCallback) (CCM_DECL_INSTANCE_HDL_ - tEplObdCbParam MEM * - pParam_p); +typedef tEplKernel(ROM *tEplObdCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbParam MEM * pParam_p); // do not change the order for this struct!!! @@ -422,14 +419,10 @@ typedef struct { } tEplObdCbStoreParam; -typedef tEplKernel(PUBLIC ROM * tInitTabEntryCallback) (void MEM * pTabEntry_p, - unsigned int - uiObjIndex_p); +typedef tEplKernel(ROM *tInitTabEntryCallback) (void MEM * pTabEntry_p, + unsigned int uiObjIndex_p); -typedef tEplKernel(PUBLIC ROM * - tEplObdStoreLoadObjCallback) (CCM_DECL_INSTANCE_HDL_ - tEplObdCbStoreParam MEM * - pCbStoreParam_p); +typedef tEplKernel(ROM * tEplObdStoreLoadObjCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbStoreParam MEM *pCbStoreParam_p); // ------------------------------------------------------------------------- // this stucture is used for parameters for function ObdInitModuleTab() diff --git a/drivers/staging/epl/EplObdu.c b/drivers/staging/epl/EplObdu.c index 218d152897cf..60f590bfbea0 100644 --- a/drivers/staging/epl/EplObdu.c +++ b/drivers/staging/epl/EplObdu.c @@ -121,10 +121,9 @@ // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntry(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p) +EPLDLLEXPORT tEplKernel EplObduWriteEntry(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, tEplObdSize Size_p) { tEplKernel Ret; @@ -153,10 +152,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntry(unsigned int uiIndex_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntry(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p) +EPLDLLEXPORT tEplKernel EplObduReadEntry(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize *pSize_p) { tEplKernel Ret; @@ -179,8 +178,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntry(unsigned int uiIndex_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduAccessOdPart(tEplObdPart ObdPart_p, - tEplObdDir Direction_p) +EPLDLLEXPORT tEplKernel EplObduAccessOdPart(tEplObdPart ObdPart_p, + tEplObdDir Direction_p) { tEplKernel Ret; @@ -202,7 +201,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduAccessOdPart(tEplObdPart ObdPart_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduDefineVar(tEplVarParam MEM * pVarParam_p) +EPLDLLEXPORT tEplKernel EplObduDefineVar(tEplVarParam MEM *pVarParam_p) { tEplKernel Ret; @@ -226,8 +225,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduDefineVar(tEplVarParam MEM * pVarParam_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT void *PUBLIC EplObduGetObjectDataPtr(unsigned int uiIndex_p, - unsigned int uiSubIndex_p) +EPLDLLEXPORT void *EplObduGetObjectDataPtr(unsigned int uiIndex_p, + unsigned int uiSubIndex_p) { void *pData; @@ -250,7 +249,7 @@ EPLDLLEXPORT void *PUBLIC EplObduGetObjectDataPtr(unsigned int uiIndex_p, // //--------------------------------------------------------------------------- #if (defined (EPL_OBD_USER_OD) && (EPL_OBD_USER_OD != FALSE)) -EPLDLLEXPORT tEplKernel PUBLIC EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p) +EPLDLLEXPORT tEplKernel EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p) { tEplKernel Ret; @@ -275,9 +274,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT void PUBLIC EplObduInitVarEntry(tEplObdVarEntry MEM * pVarEntry_p, - BYTE bType_p, - tEplObdSize ObdSize_p) +EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry MEM *pVarEntry_p, + BYTE bType_p, tEplObdSize ObdSize_p) { EplObduCalInitVarEntry(pVarEntry_p, bType_p, ObdSize_p); } @@ -299,8 +297,8 @@ EPLDLLEXPORT void PUBLIC EplObduInitVarEntry(tEplObdVarEntry MEM * pVarEntry_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplObdSize PUBLIC EplObduGetDataSize(unsigned int uiIndex_p, - unsigned int uiSubIndex_p) +EPLDLLEXPORT tEplObdSize EplObduGetDataSize(unsigned int uiIndex_p, + unsigned int uiSubIndex_p) { tEplObdSize Size; @@ -323,7 +321,7 @@ EPLDLLEXPORT tEplObdSize PUBLIC EplObduGetDataSize(unsigned int uiIndex_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT unsigned int PUBLIC EplObduGetNodeId() +EPLDLLEXPORT unsigned int EplObduGetNodeId(void) { unsigned int uiNodeId; @@ -347,8 +345,8 @@ EPLDLLEXPORT unsigned int PUBLIC EplObduGetNodeId() // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduSetNodeId(unsigned int uiNodeId_p, - tEplObdNodeIdType NodeIdType_p) +EPLDLLEXPORT tEplKernel EplObduSetNodeId(unsigned int uiNodeId_p, + tEplObdNodeIdType NodeIdType_p) { tEplKernel Ret; @@ -373,10 +371,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduSetNodeId(unsigned int uiNodeId_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduGetAccessType(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - tEplObdAccess * - pAccessTyp_p) +EPLDLLEXPORT tEplKernel EplObduGetAccessType(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + tEplObdAccess *pAccessTyp_p) { tEplObdAccess AccessType; @@ -410,10 +407,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduGetAccessType(unsigned int uiIndex_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntryToLe(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p) +EPLDLLEXPORT tEplKernel EplObduReadEntryToLe(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize *pSize_p) { tEplKernel Ret; @@ -445,11 +442,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntryToLe(unsigned int uiIndex_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntryFromLe(unsigned int uiIndex_p, - unsigned int - uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p) +EPLDLLEXPORT tEplKernel EplObduWriteEntryFromLe(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + tEplObdSize Size_p) { tEplKernel Ret; @@ -475,11 +471,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntryFromLe(unsigned int uiIndex_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubindex_p, - tEplObdVarEntry MEM ** - ppVarEntry_p) +EPLDLLEXPORT tEplKernel EplObduSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubindex_p, + tEplObdVarEntry MEM **ppVarEntry_p) { tEplKernel Ret; diff --git a/drivers/staging/epl/EplObduCal.c b/drivers/staging/epl/EplObduCal.c index 85b3df0886b1..980d382d49a4 100644 --- a/drivers/staging/epl/EplObduCal.c +++ b/drivers/staging/epl/EplObduCal.c @@ -121,10 +121,10 @@ // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntry(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p) +EPLDLLEXPORT tEplKernel EplObduCalWriteEntry(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + tEplObdSize Size_p) { tEplKernel Ret; @@ -155,10 +155,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntry(unsigned int uiIndex_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntry(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p) +EPLDLLEXPORT tEplKernel EplObduCalReadEntry(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize *pSize_p) { tEplKernel Ret; @@ -185,8 +185,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntry(unsigned int uiIndex_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalAccessOdPart(tEplObdPart ObdPart_p, - tEplObdDir Direction_p) +EPLDLLEXPORT tEplKernel EplObduCalAccessOdPart(tEplObdPart ObdPart_p, + tEplObdDir Direction_p) { tEplKernel Ret; @@ -212,8 +212,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalAccessOdPart(tEplObdPart ObdPart_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalDefineVar(tEplVarParam MEM * - pVarParam_p) +EPLDLLEXPORT tEplKernel EplObduCalDefineVar(tEplVarParam MEM *pVarParam_p) { tEplKernel Ret; @@ -240,8 +239,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalDefineVar(tEplVarParam MEM * // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT void *PUBLIC EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, - unsigned int uiSubIndex_p) +EPLDLLEXPORT void *EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, + unsigned int uiSubIndex_p) { void *pData; @@ -268,8 +267,7 @@ EPLDLLEXPORT void *PUBLIC EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, // //--------------------------------------------------------------------------- #if (defined (EPL_OBD_USER_OD) && (EPL_OBD_USER_OD != FALSE)) -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalRegisterUserOd(tEplObdEntryPtr - pUserOd_p) +EPLDLLEXPORT tEplKernel EplObduCalRegisterUserOd(tEplObdEntryPtr pUserOd_p) { tEplKernel Ret; @@ -298,9 +296,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalRegisterUserOd(tEplObdEntryPtr // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT void PUBLIC EplObduCalInitVarEntry(tEplObdVarEntry MEM * - pVarEntry_p, BYTE bType_p, - tEplObdSize ObdSize_p) +EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry MEM *pVarEntry_p, + BYTE bType_p, tEplObdSize ObdSize_p) { #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) EplObdInitVarEntry(pVarEntry_p, bType_p, ObdSize_p); @@ -324,8 +321,8 @@ EPLDLLEXPORT void PUBLIC EplObduCalInitVarEntry(tEplObdVarEntry MEM * // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplObdSize PUBLIC EplObduCalGetDataSize(unsigned int uiIndex_p, - unsigned int uiSubIndex_p) +EPLDLLEXPORT tEplObdSize EplObduCalGetDataSize(unsigned int uiIndex_p, + unsigned int uiSubIndex_p) { tEplObdSize Size; @@ -352,7 +349,7 @@ EPLDLLEXPORT tEplObdSize PUBLIC EplObduCalGetDataSize(unsigned int uiIndex_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT unsigned int PUBLIC EplObduCalGetNodeId() +EPLDLLEXPORT unsigned int EplObduCalGetNodeId(void) { unsigned int uiNodeId; @@ -380,9 +377,8 @@ EPLDLLEXPORT unsigned int PUBLIC EplObduCalGetNodeId() // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalSetNodeId(unsigned int uiNodeId_p, - tEplObdNodeIdType - NodeIdType_p) +EPLDLLEXPORT tEplKernel EplObduCalSetNodeId(unsigned int uiNodeId_p, + tEplObdNodeIdType NodeIdType_p) { tEplKernel Ret; @@ -411,11 +407,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalSetNodeId(unsigned int uiNodeId_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalGetAccessType(unsigned int uiIndex_p, - unsigned int - uiSubIndex_p, - tEplObdAccess * - pAccessTyp_p) +EPLDLLEXPORT tEplKernel EplObduCalGetAccessType(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + tEplObdAccess *pAccessTyp_p) { tEplObdAccess AccesType; @@ -447,11 +441,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalGetAccessType(unsigned int uiIndex_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntryToLe(unsigned int uiIndex_p, - unsigned int - uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p) +EPLDLLEXPORT tEplKernel EplObduCalReadEntryToLe(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize *pSize_p) { tEplKernel Ret; @@ -481,12 +474,10 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntryToLe(unsigned int uiIndex_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntryFromLe(unsigned int - uiIndex_p, - unsigned int - uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p) +EPLDLLEXPORT tEplKernel EplObduCalWriteEntryFromLe(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + tEplObdSize Size_p) { tEplKernel Ret; @@ -514,10 +505,9 @@ EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntryFromLe(unsigned int // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC -EplObduCalSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, - unsigned int uiSubindex_p, - tEplObdVarEntry MEM ** ppVarEntry_p) +EPLDLLEXPORT tEplKernel EplObduCalSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubindex_p, + tEplObdVarEntry MEM **ppVarEntry_p) { tEplKernel Ret; diff --git a/drivers/staging/epl/EplObjDef.h b/drivers/staging/epl/EplObjDef.h index 7713125a3e8d..4a6fac56ef6c 100644 --- a/drivers/staging/epl/EplObjDef.h +++ b/drivers/staging/epl/EplObjDef.h @@ -165,8 +165,7 @@ // // ---------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EPL_OBD_INIT_RAM_NAME(tEplObdInitParam MEM * - pInitParam_p) +EPLDLLEXPORT tEplKernel EPL_OBD_INIT_RAM_NAME(tEplObdInitParam MEM *pInitParam_p) { tEplObdInitParam MEM *pInitParam = pInitParam_p; diff --git a/drivers/staging/epl/EplPdou.c b/drivers/staging/epl/EplPdou.c index e7b10653a0ed..dfaabb4b9496 100644 --- a/drivers/staging/epl/EplPdou.c +++ b/drivers/staging/epl/EplPdou.c @@ -226,7 +226,7 @@ tEplKernel EplPdouDelInstance(void) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplPdouCbObdAccess(tEplObdCbParam MEM * pParam_p) +tEplKernel EplPdouCbObdAccess(tEplObdCbParam MEM *pParam_p) { tEplKernel Ret = kEplSuccessful; unsigned int uiPdoId; diff --git a/drivers/staging/epl/EplSdo.h b/drivers/staging/epl/EplSdo.h index 1cb3f2de4a3c..a09d1eb05395 100644 --- a/drivers/staging/epl/EplSdo.h +++ b/drivers/staging/epl/EplSdo.h @@ -116,20 +116,18 @@ typedef unsigned int tEplSdoConHdl; // callback function pointer for Protocol Abstraction Layer to call // asynchronuus SDO Sequence Layer -typedef tEplKernel(PUBLIC * tEplSequLayerReceiveCb) (tEplSdoConHdl ConHdl_p, - tEplAsySdoSeq * - pSdoSeqData_p, - unsigned int uiDataSize_p); +typedef tEplKernel(*tEplSequLayerReceiveCb) (tEplSdoConHdl ConHdl_p, + tEplAsySdoSeq *pSdoSeqData_p, + unsigned int uiDataSize_p); // handle between asynchronuus SDO Sequence Layer and SDO Command layer typedef unsigned int tEplSdoSeqConHdl; // callback function pointer for asynchronuus SDO Sequence Layer to call // SDO Command layer for received data -typedef tEplKernel(PUBLIC * - tEplSdoComReceiveCb) (tEplSdoSeqConHdl SdoSeqConHdl_p, - tEplAsySdoCom * pAsySdoCom_p, - unsigned int uiDataSize_p); +typedef tEplKernel(* tEplSdoComReceiveCb) (tEplSdoSeqConHdl SdoSeqConHdl_p, + tEplAsySdoCom *pAsySdoCom_p, + unsigned int uiDataSize_p); // status of connection typedef enum { @@ -143,9 +141,8 @@ typedef enum { // callback function pointer for asynchronuus SDO Sequence Layer to call // SDO Command layer for connection status -typedef tEplKernel(PUBLIC * tEplSdoComConCb) (tEplSdoSeqConHdl SdoSeqConHdl_p, - tEplAsySdoConState - AsySdoConState_p); +typedef tEplKernel(* tEplSdoComConCb) (tEplSdoSeqConHdl SdoSeqConHdl_p, + tEplAsySdoConState AsySdoConState_p); // handle between SDO Command layer and application typedef unsigned int tEplSdoComConHdl; @@ -221,8 +218,7 @@ typedef struct { } tEplSdoComFinished; // callback function pointer to inform application about connection -typedef tEplKernel(PUBLIC * tEplSdoFinishedCb) (tEplSdoComFinished * - pSdoComFinished_p); +typedef tEplKernel(* tEplSdoFinishedCb) (tEplSdoComFinished *pSdoComFinished_p); // structure to init SDO transfer to Read or Write by Index typedef struct { diff --git a/drivers/staging/epl/EplSdoAsndu.c b/drivers/staging/epl/EplSdoAsndu.c index 05a00c9a731e..a6596a51f1eb 100644 --- a/drivers/staging/epl/EplSdoAsndu.c +++ b/drivers/staging/epl/EplSdoAsndu.c @@ -110,7 +110,7 @@ static tEplSdoAsndInstance SdoAsndInstance_g; // local function prototypes //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsnduCb(tEplFrameInfo * pFrameInfo_p); +tEplKernel EplSdoAsnduCb(tEplFrameInfo *pFrameInfo_p); /***************************************************************************/ /* */ @@ -149,7 +149,7 @@ tEplKernel PUBLIC EplSdoAsnduCb(tEplFrameInfo * pFrameInfo_p); // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p) +tEplKernel EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p) { tEplKernel Ret; @@ -176,7 +176,7 @@ tEplKernel PUBLIC EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsnduAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) +tEplKernel EplSdoAsnduAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) { tEplKernel Ret; @@ -218,7 +218,7 @@ tEplKernel PUBLIC EplSdoAsnduAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsnduDelInstance() +tEplKernel EplSdoAsnduDelInstance(void) { tEplKernel Ret; @@ -251,8 +251,8 @@ tEplKernel PUBLIC EplSdoAsnduDelInstance() // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsnduInitCon(tEplSdoConHdl * pSdoConHandle_p, - unsigned int uiTargetNodeId_p) +tEplKernel EplSdoAsnduInitCon(tEplSdoConHdl *pSdoConHandle_p, + unsigned int uiTargetNodeId_p) { tEplKernel Ret; unsigned int uiCount; @@ -319,9 +319,9 @@ tEplKernel PUBLIC EplSdoAsnduInitCon(tEplSdoConHdl * pSdoConHandle_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, - tEplFrame * pSrcData_p, - DWORD dwDataSize_p) +tEplKernel EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, + tEplFrame *pSrcData_p, + DWORD dwDataSize_p) { tEplKernel Ret; unsigned int uiArray; @@ -379,7 +379,7 @@ tEplKernel PUBLIC EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p) +tEplKernel EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p) { tEplKernel Ret; unsigned int uiArray; @@ -422,7 +422,7 @@ tEplKernel PUBLIC EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsnduCb(tEplFrameInfo * pFrameInfo_p) +tEplKernel EplSdoAsnduCb(tEplFrameInfo *pFrameInfo_p) { tEplKernel Ret = kEplSuccessful; unsigned int uiCount; diff --git a/drivers/staging/epl/EplSdoAsySequ.c b/drivers/staging/epl/EplSdoAsySequ.c index 6b6a9975d78b..9048905dcde8 100644 --- a/drivers/staging/epl/EplSdoAsySequ.c +++ b/drivers/staging/epl/EplSdoAsySequ.c @@ -203,9 +203,9 @@ static tEplKernel EplSdoAsySeqSendLowerLayer(tEplAsySdoSeqCon * pAsySdoSeqCon_p, unsigned int uiDataSize_p, tEplFrame * pEplFrame_p); -tEplKernel PUBLIC EplSdoAsyReceiveCb(tEplSdoConHdl ConHdl_p, - tEplAsySdoSeq * pSdoSeqData_p, - unsigned int uiDataSize_p); +tEplKernel EplSdoAsyReceiveCb(tEplSdoConHdl ConHdl_p, + tEplAsySdoSeq *pSdoSeqData_p, + unsigned int uiDataSize_p); static tEplKernel EplSdoAsyInitHistory(void); @@ -267,8 +267,8 @@ static tEplKernel EplSdoAsySeqSetTimer(tEplAsySdoSeqCon * pAsySdoSeqCon_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, - tEplSdoComConCb fpSdoComConCb_p) +tEplKernel EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, + tEplSdoComConCb fpSdoComConCb_p) { tEplKernel Ret; @@ -297,8 +297,8 @@ tEplKernel PUBLIC EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsySeqAddInstance(tEplSdoComReceiveCb fpSdoComCb_p, - tEplSdoComConCb fpSdoComConCb_p) +tEplKernel EplSdoAsySeqAddInstance(tEplSdoComReceiveCb fpSdoComCb_p, + tEplSdoComConCb fpSdoComConCb_p) { tEplKernel Ret; @@ -380,7 +380,7 @@ tEplKernel PUBLIC EplSdoAsySeqAddInstance(tEplSdoComReceiveCb fpSdoComCb_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsySeqDelInstance() +tEplKernel EplSdoAsySeqDelInstance(void) { tEplKernel Ret; unsigned int uiCount; @@ -439,9 +439,9 @@ tEplKernel PUBLIC EplSdoAsySeqDelInstance() // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsySeqInitCon(tEplSdoSeqConHdl * pSdoSeqConHdl_p, - unsigned int uiNodeId_p, - tEplSdoType SdoType) +tEplKernel EplSdoAsySeqInitCon(tEplSdoSeqConHdl *pSdoSeqConHdl_p, + unsigned int uiNodeId_p, + tEplSdoType SdoType) { tEplKernel Ret; unsigned int uiCount; @@ -594,9 +594,9 @@ tEplKernel PUBLIC EplSdoAsySeqInitCon(tEplSdoSeqConHdl * pSdoSeqConHdl_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsySeqSendData(tEplSdoSeqConHdl SdoSeqConHdl_p, - unsigned int uiDataSize_p, - tEplFrame * pabData_p) +tEplKernel EplSdoAsySeqSendData(tEplSdoSeqConHdl SdoSeqConHdl_p, + unsigned int uiDataSize_p, + tEplFrame *pabData_p) { tEplKernel Ret; unsigned int uiHandle; @@ -640,7 +640,7 @@ tEplKernel PUBLIC EplSdoAsySeqSendData(tEplSdoSeqConHdl SdoSeqConHdl_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsySeqProcessEvent(tEplEvent * pEvent_p) +tEplKernel EplSdoAsySeqProcessEvent(tEplEvent *pEvent_p) { tEplKernel Ret; tEplTimerEventArg *pTimerEventArg; @@ -714,7 +714,7 @@ tEplKernel PUBLIC EplSdoAsySeqProcessEvent(tEplEvent * pEvent_p) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsySeqDelCon(tEplSdoSeqConHdl SdoSeqConHdl_p) +tEplKernel EplSdoAsySeqDelCon(tEplSdoSeqConHdl SdoSeqConHdl_p) { tEplKernel Ret = kEplSuccessful; unsigned int uiHandle; @@ -2139,9 +2139,9 @@ static tEplKernel EplSdoAsySeqSendLowerLayer(tEplAsySdoSeqCon * pAsySdoSeqCon_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsyReceiveCb(tEplSdoConHdl ConHdl_p, - tEplAsySdoSeq * pSdoSeqData_p, - unsigned int uiDataSize_p) +tEplKernel EplSdoAsyReceiveCb(tEplSdoConHdl ConHdl_p, + tEplAsySdoSeq *pSdoSeqData_p, + unsigned int uiDataSize_p) { tEplKernel Ret; unsigned int uiCount = 0; diff --git a/drivers/staging/epl/EplSdoComu.c b/drivers/staging/epl/EplSdoComu.c index ce0eb33f4c41..af3d1b146745 100644 --- a/drivers/staging/epl/EplSdoComu.c +++ b/drivers/staging/epl/EplSdoComu.c @@ -205,12 +205,12 @@ static tEplSdoComInstance SdoComInstance_g; //--------------------------------------------------------------------------- // local function prototypes //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p, - tEplAsySdoCom * pAsySdoCom_p, - unsigned int uiDataSize_p); +tEplKernel EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p, + tEplAsySdoCom *pAsySdoCom_p, + unsigned int uiDataSize_p); -tEplKernel PUBLIC EplSdoComConCb(tEplSdoSeqConHdl SdoSeqConHdl_p, - tEplAsySdoConState AsySdoConState_p); +tEplKernel EplSdoComConCb(tEplSdoSeqConHdl SdoSeqConHdl_p, + tEplAsySdoConState AsySdoConState_p); static tEplKernel EplSdoComSearchConIntern(tEplSdoSeqConHdl SdoSeqConHdl_p, tEplSdoComConEvent SdoComConEvent_p, @@ -285,7 +285,7 @@ static tEplKernel EplSdoComClientSendAbort(tEplSdoComCon * pSdoComCon_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoComInit(void) +tEplKernel EplSdoComInit(void) { tEplKernel Ret; @@ -312,7 +312,7 @@ tEplKernel PUBLIC EplSdoComInit(void) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoComAddInstance(void) +tEplKernel EplSdoComAddInstance(void) { tEplKernel Ret; @@ -354,7 +354,7 @@ tEplKernel PUBLIC EplSdoComAddInstance(void) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoComDelInstance(void) +tEplKernel EplSdoComDelInstance(void) { tEplKernel Ret; @@ -398,9 +398,9 @@ tEplKernel PUBLIC EplSdoComDelInstance(void) // //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) -tEplKernel PUBLIC EplSdoComDefineCon(tEplSdoComConHdl * pSdoComConHdl_p, - unsigned int uiTargetNodeId_p, - tEplSdoType ProtType_p) +tEplKernel EplSdoComDefineCon(tEplSdoComConHdl *pSdoComConHdl_p, + unsigned int uiTargetNodeId_p, + tEplSdoType ProtType_p) { tEplKernel Ret; unsigned int uiCount; @@ -511,8 +511,7 @@ tEplKernel PUBLIC EplSdoComDefineCon(tEplSdoComConHdl * pSdoComConHdl_p, // //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) -tEplKernel PUBLIC EplSdoComInitTransferByIndex(tEplSdoComTransParamByIndex * - pSdoComTransParam_p) +tEplKernel EplSdoComInitTransferByIndex(tEplSdoComTransParamByIndex *pSdoComTransParam_p) { tEplKernel Ret; tEplSdoComCon *pSdoComCon; @@ -603,7 +602,7 @@ tEplKernel PUBLIC EplSdoComInitTransferByIndex(tEplSdoComTransParamByIndex * // //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) -tEplKernel PUBLIC EplSdoComUndefineCon(tEplSdoComConHdl SdoComConHdl_p) +tEplKernel EplSdoComUndefineCon(tEplSdoComConHdl SdoComConHdl_p) { tEplKernel Ret; tEplSdoComCon *pSdoComCon; @@ -669,8 +668,8 @@ tEplKernel PUBLIC EplSdoComUndefineCon(tEplSdoComConHdl SdoComConHdl_p) // //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) -tEplKernel PUBLIC EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, - tEplSdoComFinished * pSdoComFinished_p) +tEplKernel EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, + tEplSdoComFinished *pSdoComFinished_p) { tEplKernel Ret; tEplSdoComCon *pSdoComCon; @@ -747,8 +746,8 @@ tEplKernel PUBLIC EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, // //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) -tEplKernel PUBLIC EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, - DWORD dwAbortCode_p) +tEplKernel EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, + DWORD dwAbortCode_p) { tEplKernel Ret; tEplSdoComCon *pSdoComCon; @@ -803,9 +802,9 @@ tEplKernel PUBLIC EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p, - tEplAsySdoCom * pAsySdoCom_p, - unsigned int uiDataSize_p) +tEplKernel EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p, + tEplAsySdoCom *pAsySdoCom_p, + unsigned int uiDataSize_p) { tEplKernel Ret; @@ -840,8 +839,8 @@ tEplKernel PUBLIC EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoComConCb(tEplSdoSeqConHdl SdoSeqConHdl_p, - tEplAsySdoConState AsySdoConState_p) +tEplKernel EplSdoComConCb(tEplSdoSeqConHdl SdoSeqConHdl_p, + tEplAsySdoConState AsySdoConState_p) { tEplKernel Ret; tEplSdoComConEvent SdoComConEvent = kEplSdoComConEventSendFirst; diff --git a/drivers/staging/epl/EplSdoUdpu.c b/drivers/staging/epl/EplSdoUdpu.c index be52233b3ee8..74fe25968e29 100644 --- a/drivers/staging/epl/EplSdoUdpu.c +++ b/drivers/staging/epl/EplSdoUdpu.c @@ -134,7 +134,7 @@ static tEplSdoUdpInstance SdoUdpInstance_g; //--------------------------------------------------------------------------- #if (TARGET_SYSTEM == _WIN32_) -static DWORD PUBLIC EplSdoUdpThread(LPVOID lpParameter); +static DWORD EplSdoUdpThread(LPVOID lpParameter); #elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) static int EplSdoUdpThread(void *pArg_p); @@ -177,7 +177,7 @@ static int EplSdoUdpThread(void *pArg_p); // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p) +tEplKernel EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p) { tEplKernel Ret; @@ -205,7 +205,7 @@ tEplKernel PUBLIC EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) +tEplKernel EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) { tEplKernel Ret; @@ -273,7 +273,7 @@ tEplKernel PUBLIC EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoUdpuDelInstance() +tEplKernel EplSdoUdpuDelInstance(void) { tEplKernel Ret; @@ -340,8 +340,7 @@ tEplKernel PUBLIC EplSdoUdpuDelInstance() // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoUdpuConfig(unsigned long ulIpAddr_p, - unsigned int uiPort_p) +tEplKernel EplSdoUdpuConfig(unsigned long ulIpAddr_p, unsigned int uiPort_p) { tEplKernel Ret; struct sockaddr_in Addr; @@ -459,8 +458,8 @@ tEplKernel PUBLIC EplSdoUdpuConfig(unsigned long ulIpAddr_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoUdpuInitCon(tEplSdoConHdl * pSdoConHandle_p, - unsigned int uiTargetNodeId_p) +tEplKernel EplSdoUdpuInitCon(tEplSdoConHdl *pSdoConHandle_p, + unsigned int uiTargetNodeId_p) { tEplKernel Ret; unsigned int uiCount; @@ -526,8 +525,8 @@ tEplKernel PUBLIC EplSdoUdpuInitCon(tEplSdoConHdl * pSdoConHandle_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, - tEplFrame * pSrcData_p, DWORD dwDataSize_p) +tEplKernel EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, + tEplFrame *pSrcData_p, DWORD dwDataSize_p) { tEplKernel Ret; int iError; @@ -603,7 +602,7 @@ tEplKernel PUBLIC EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, // State: // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p) +tEplKernel EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p) { tEplKernel Ret; unsigned int uiArray; @@ -649,7 +648,7 @@ tEplKernel PUBLIC EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p) // //--------------------------------------------------------------------------- #if (TARGET_SYSTEM == _WIN32_) -static DWORD PUBLIC EplSdoUdpThread(LPVOID lpParameter) +static DWORD EplSdoUdpThread(LPVOID lpParameter) #elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) static int EplSdoUdpThread(void *pArg_p) #endif diff --git a/drivers/staging/epl/EplStatusu.c b/drivers/staging/epl/EplStatusu.c index 689f9124ae29..5dcabdf61914 100644 --- a/drivers/staging/epl/EplStatusu.c +++ b/drivers/staging/epl/EplStatusu.c @@ -137,8 +137,7 @@ static tEplStatusuInstance EplStatusuInstance_g; // local function prototypes //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplStatusuCbStatusResponse(tEplFrameInfo * - pFrameInfo_p); +static tEplKernel EplStatusuCbStatusResponse(tEplFrameInfo *pFrameInfo_p); //=========================================================================// // // @@ -164,7 +163,7 @@ static tEplKernel PUBLIC EplStatusuCbStatusResponse(tEplFrameInfo * // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplStatusuInit() +EPLDLLEXPORT tEplKernel EplStatusuInit(void) { tEplKernel Ret; @@ -191,7 +190,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuInit() // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplStatusuAddInstance() +EPLDLLEXPORT tEplKernel EplStatusuAddInstance(void) { tEplKernel Ret; @@ -228,7 +227,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuAddInstance() // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplStatusuDelInstance() +EPLDLLEXPORT tEplKernel EplStatusuDelInstance(void) { tEplKernel Ret; @@ -258,7 +257,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuDelInstance() // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplStatusuReset() +EPLDLLEXPORT tEplKernel EplStatusuReset(void) { tEplKernel Ret; @@ -287,9 +286,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuReset() // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, - tEplStatusuCbResponse - pfnCbResponse_p) +tEplKernel EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, + tEplStatusuCbResponse pfnCbResponse_p) { tEplKernel Ret; @@ -342,8 +340,7 @@ tEplKernel PUBLIC EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, // State: // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplStatusuCbStatusResponse(tEplFrameInfo * - pFrameInfo_p) +static tEplKernel EplStatusuCbStatusResponse(tEplFrameInfo *pFrameInfo_p) { tEplKernel Ret = kEplSuccessful; unsigned int uiNodeId; diff --git a/drivers/staging/epl/EplTarget.h b/drivers/staging/epl/EplTarget.h index b2b66f82c035..462c6d0c0a16 100644 --- a/drivers/staging/epl/EplTarget.h +++ b/drivers/staging/epl/EplTarget.h @@ -217,17 +217,15 @@ void trace(const char *fmt, ...); // currently no Timer functions are needed by EPL stack // so they are not implemented yet -//void PUBLIC TgtTimerInit(void); -//DWORD PUBLIC TgtGetTickCount(void); -//void PUBLIC TgtGetNetTime(tEplNetTime * pNetTime_p); +//void TgtTimerInit(void); +//DWORD TgtGetTickCount(void); +//void TgtGetNetTime(tEplNetTime * pNetTime_p); // functions for ethernet driver -tEplKernel PUBLIC TgtInitEthIsr(void); -void PUBLIC TgtFreeEthIsr(void); -void PUBLIC TgtEnableGlobalInterrupt(BYTE fEnable_p); -void PUBLIC TgtEnableEthInterrupt0(BYTE fEnable_p, - unsigned int uiInterruptMask_p); -void PUBLIC TgtEnableEthInterrupt1(BYTE fEnable_p, - unsigned int uiInterruptMask_p); +tEplKernel TgtInitEthIsr(void); +void TgtFreeEthIsr(void); +void TgtEnableGlobalInterrupt(BYTE fEnable_p); +void TgtEnableEthInterrupt0(BYTE fEnable_p, unsigned int uiInterruptMask_p); +void TgtEnableEthInterrupt1(BYTE fEnable_p, unsigned int uiInterruptMask_p); #endif // #ifndef _EPLTARGET_H_ diff --git a/drivers/staging/epl/EplTimer.h b/drivers/staging/epl/EplTimer.h index facbfd8740e6..d1a73eaf65c1 100644 --- a/drivers/staging/epl/EplTimer.h +++ b/drivers/staging/epl/EplTimer.h @@ -107,8 +107,7 @@ typedef struct { } tEplTimerEventArg; -typedef tEplKernel(PUBLIC * tEplTimerkCallback) (tEplTimerEventArg * - pEventArg_p); +typedef tEplKernel(* tEplTimerkCallback) (tEplTimerEventArg *pEventArg_p); //--------------------------------------------------------------------------- // function prototypes diff --git a/drivers/staging/epl/EplTimeruLinuxKernel.c b/drivers/staging/epl/EplTimeruLinuxKernel.c index 08820d184055..ff80fc80d021 100644 --- a/drivers/staging/epl/EplTimeruLinuxKernel.c +++ b/drivers/staging/epl/EplTimeruLinuxKernel.c @@ -99,7 +99,7 @@ typedef struct { //--------------------------------------------------------------------------- // local function prototypes //--------------------------------------------------------------------------- -static void PUBLIC EplTimeruCbMs(unsigned long ulParameter_p); +static void EplTimeruCbMs(unsigned long ulParameter_p); /***************************************************************************/ /* */ @@ -134,7 +134,7 @@ static void PUBLIC EplTimeruCbMs(unsigned long ulParameter_p); // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimeruInit() +tEplKernel EplTimeruInit(void) { tEplKernel Ret; @@ -157,7 +157,7 @@ tEplKernel PUBLIC EplTimeruInit() // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimeruAddInstance() +tEplKernel EplTimeruAddInstance(void) { tEplKernel Ret; @@ -182,7 +182,7 @@ tEplKernel PUBLIC EplTimeruAddInstance() // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimeruDelInstance() +tEplKernel EplTimeruDelInstance(void) { tEplKernel Ret; @@ -207,9 +207,9 @@ tEplKernel PUBLIC EplTimeruDelInstance() // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimeruSetTimerMs(tEplTimerHdl * pTimerHdl_p, - unsigned long ulTime_p, - tEplTimerArg Argument_p) +tEplKernel EplTimeruSetTimerMs(tEplTimerHdl *pTimerHdl_p, + unsigned long ulTime_p, + tEplTimerArg Argument_p) { tEplKernel Ret = kEplSuccessful; tEplTimeruData *pData; @@ -257,9 +257,9 @@ tEplKernel PUBLIC EplTimeruSetTimerMs(tEplTimerHdl * pTimerHdl_p, // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimeruModifyTimerMs(tEplTimerHdl * pTimerHdl_p, - unsigned long ulTime_p, - tEplTimerArg Argument_p) +tEplKernel EplTimeruModifyTimerMs(tEplTimerHdl *pTimerHdl_p, + unsigned long ulTime_p, + tEplTimerArg Argument_p) { tEplKernel Ret = kEplSuccessful; tEplTimeruData *pData; @@ -315,7 +315,7 @@ tEplKernel PUBLIC EplTimeruModifyTimerMs(tEplTimerHdl * pTimerHdl_p, // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimeruDeleteTimer(tEplTimerHdl * pTimerHdl_p) +tEplKernel EplTimeruDeleteTimer(tEplTimerHdl *pTimerHdl_p) { tEplKernel Ret = kEplSuccessful; tEplTimeruData *pData; @@ -370,7 +370,7 @@ tEplKernel PUBLIC EplTimeruDeleteTimer(tEplTimerHdl * pTimerHdl_p) // //--------------------------------------------------------------------------- -BOOL PUBLIC EplTimeruIsTimerActive(tEplTimerHdl TimerHdl_p) +BOOL EplTimeruIsTimerActive(tEplTimerHdl TimerHdl_p) { BOOL fActive = FALSE; tEplTimeruData *pData; @@ -417,7 +417,7 @@ BOOL PUBLIC EplTimeruIsTimerActive(tEplTimerHdl TimerHdl_p) // State: // //--------------------------------------------------------------------------- -static void PUBLIC EplTimeruCbMs(unsigned long ulParameter_p) +static void EplTimeruCbMs(unsigned long ulParameter_p) { tEplKernel Ret = kEplSuccessful; tEplTimeruData *pData; diff --git a/drivers/staging/epl/TimerHighReskX86.c b/drivers/staging/epl/TimerHighReskX86.c index 82eee4702aa6..11ae8192323d 100644 --- a/drivers/staging/epl/TimerHighReskX86.c +++ b/drivers/staging/epl/TimerHighReskX86.c @@ -103,8 +103,8 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); -void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else @@ -172,7 +172,7 @@ enum hrtimer_restart EplTimerHighReskCallback(struct hrtimer *pTimer_p); // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimerHighReskInit(void) +tEplKernel EplTimerHighReskInit(void) { tEplKernel Ret; @@ -196,7 +196,7 @@ tEplKernel PUBLIC EplTimerHighReskInit(void) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimerHighReskAddInstance(void) +tEplKernel EplTimerHighReskAddInstance(void) { tEplKernel Ret; unsigned int uiIndex; @@ -244,7 +244,7 @@ tEplKernel PUBLIC EplTimerHighReskAddInstance(void) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimerHighReskDelInstance(void) +tEplKernel EplTimerHighReskDelInstance(void) { tEplTimerHighReskTimerInfo *pTimerInfo; tEplKernel Ret; @@ -298,12 +298,11 @@ tEplKernel PUBLIC EplTimerHighReskDelInstance(void) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimerHighReskModifyTimerNs(tEplTimerHdl * pTimerHdl_p, - unsigned long long ullTimeNs_p, - tEplTimerkCallback - pfnCallback_p, - unsigned long ulArgument_p, - BOOL fContinuously_p) +tEplKernel EplTimerHighReskModifyTimerNs(tEplTimerHdl *pTimerHdl_p, + unsigned long long ullTimeNs_p, + tEplTimerkCallback pfnCallback_p, + unsigned long ulArgument_p, + BOOL fContinuously_p) { tEplKernel Ret; unsigned int uiIndex; @@ -396,7 +395,7 @@ tEplKernel PUBLIC EplTimerHighReskModifyTimerNs(tEplTimerHdl * pTimerHdl_p, // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimerHighReskDeleteTimer(tEplTimerHdl * pTimerHdl_p) +tEplKernel EplTimerHighReskDeleteTimer(tEplTimerHdl *pTimerHdl_p) { tEplKernel Ret = kEplSuccessful; unsigned int uiIndex; diff --git a/drivers/staging/epl/VirtualEthernetLinux.c b/drivers/staging/epl/VirtualEthernetLinux.c index 5d838dbf73a7..445b9e620c27 100644 --- a/drivers/staging/epl/VirtualEthernetLinux.c +++ b/drivers/staging/epl/VirtualEthernetLinux.c @@ -285,7 +285,7 @@ static tEplKernel VEthRecvFrame(tEplFrameInfo * pFrameInfo_p) return Ret; } -tEplKernel PUBLIC VEthAddInstance(tEplDllkInitParam * pInitParam_p) +tEplKernel VEthAddInstance(tEplDllkInitParam *pInitParam_p) { tEplKernel Ret = kEplSuccessful; @@ -324,7 +324,7 @@ tEplKernel PUBLIC VEthAddInstance(tEplDllkInitParam * pInitParam_p) return Ret; } -tEplKernel PUBLIC VEthDelInstance(void) +tEplKernel VEthDelInstance(void) { tEplKernel Ret = kEplSuccessful; diff --git a/drivers/staging/epl/amix86.c b/drivers/staging/epl/amix86.c index 9f742384dac0..a2e54b6755ad 100644 --- a/drivers/staging/epl/amix86.c +++ b/drivers/staging/epl/amix86.c @@ -119,7 +119,7 @@ typedef struct { //------------< write BYTE in big endian >-------------------------- /* -void PUBLIC AmiSetByteToBe (void FAR* pAddr_p, BYTE bByteVal_p) +void AmiSetByteToBe (void FAR* pAddr_p, BYTE bByteVal_p) { *(BYTE FAR*)pAddr_p = bByteVal_p; @@ -129,7 +129,7 @@ void PUBLIC AmiSetByteToBe (void FAR* pAddr_p, BYTE bByteVal_p) //------------< write WORD in big endian >-------------------------- -INLINE_FUNCTION void PUBLIC AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p) +INLINE_FUNCTION void AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p) { twStruct FAR *pwStruct; twStruct wValue; @@ -144,8 +144,7 @@ INLINE_FUNCTION void PUBLIC AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p) //------------< write DWORD in big endian >------------------------- -INLINE_FUNCTION void PUBLIC AmiSetDwordToBe(void FAR * pAddr_p, - DWORD dwDwordVal_p) +INLINE_FUNCTION void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) { tdwStruct FAR *pdwStruct; tdwStruct dwValue; @@ -178,7 +177,7 @@ INLINE_FUNCTION void PUBLIC AmiSetDwordToBe(void FAR * pAddr_p, //------------< write BYTE in little endian >-------------------------- /* -void PUBLIC AmiSetByteToLe (void FAR* pAddr_p, BYTE bByteVal_p) +void AmiSetByteToLe (void FAR* pAddr_p, BYTE bByteVal_p) { *(BYTE FAR*)pAddr_p = bByteVal_p; @@ -188,7 +187,7 @@ void PUBLIC AmiSetByteToLe (void FAR* pAddr_p, BYTE bByteVal_p) //------------< write WORD in little endian >-------------------------- -INLINE_FUNCTION void PUBLIC AmiSetWordToLe(void FAR * pAddr_p, WORD wWordVal_p) +INLINE_FUNCTION void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p) { twStruct FAR *pwStruct; @@ -199,8 +198,7 @@ INLINE_FUNCTION void PUBLIC AmiSetWordToLe(void FAR * pAddr_p, WORD wWordVal_p) //------------< write DWORD in little endian >------------------------- -INLINE_FUNCTION void PUBLIC AmiSetDwordToLe(void FAR * pAddr_p, - DWORD dwDwordVal_p) +INLINE_FUNCTION void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) { tdwStruct FAR *pdwStruct; @@ -226,7 +224,7 @@ INLINE_FUNCTION void PUBLIC AmiSetDwordToLe(void FAR * pAddr_p, //------------< read BYTE in big endian >--------------------------- /* -BYTE PUBLIC AmiGetByteFromBe (void FAR* pAddr_p) +BYTE AmiGetByteFromBe (void FAR* pAddr_p) { return ( *(BYTE FAR*)pAddr_p ); @@ -236,7 +234,7 @@ BYTE PUBLIC AmiGetByteFromBe (void FAR* pAddr_p) //------------< read WORD in big endian >--------------------------- -INLINE_FUNCTION WORD PUBLIC AmiGetWordFromBe(void FAR * pAddr_p) +INLINE_FUNCTION WORD AmiGetWordFromBe(void FAR *pAddr_p) { twStruct FAR *pwStruct; twStruct wValue; @@ -252,7 +250,7 @@ INLINE_FUNCTION WORD PUBLIC AmiGetWordFromBe(void FAR * pAddr_p) //------------< read DWORD in big endian >-------------------------- -INLINE_FUNCTION DWORD PUBLIC AmiGetDwordFromBe(void FAR * pAddr_p) +INLINE_FUNCTION DWORD AmiGetDwordFromBe(void FAR *pAddr_p) { tdwStruct FAR *pdwStruct; tdwStruct dwValue; @@ -285,7 +283,7 @@ INLINE_FUNCTION DWORD PUBLIC AmiGetDwordFromBe(void FAR * pAddr_p) //------------< read BYTE in little endian >--------------------------- /* -BYTE PUBLIC AmiGetByteFromLe (void FAR* pAddr_p) +BYTE AmiGetByteFromLe (void FAR* pAddr_p) { return ( *(BYTE FAR*)pAddr_p ); @@ -295,24 +293,22 @@ BYTE PUBLIC AmiGetByteFromLe (void FAR* pAddr_p) //------------< read WORD in little endian >--------------------------- -INLINE_FUNCTION WORD PUBLIC AmiGetWordFromLe(void FAR * pAddr_p) +INLINE_FUNCTION WORD AmiGetWordFromLe(void FAR *pAddr_p) { twStruct FAR *pwStruct; pwStruct = (twStruct FAR *) pAddr_p; return (pwStruct->m_wWord); - } //------------< read DWORD in little endian >-------------------------- -INLINE_FUNCTION DWORD PUBLIC AmiGetDwordFromLe(void FAR * pAddr_p) +INLINE_FUNCTION DWORD AmiGetDwordFromLe(void FAR *pAddr_p) { tdwStruct FAR *pdwStruct; pdwStruct = (tdwStruct FAR *) pAddr_p; return (pdwStruct->m_dwDword); - } //--------------------------------------------------------------------------- @@ -330,14 +326,11 @@ INLINE_FUNCTION DWORD PUBLIC AmiGetDwordFromLe(void FAR * pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void PUBLIC AmiSetDword24ToBe(void FAR * pAddr_p, - DWORD dwDwordVal_p) +INLINE_FUNCTION void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) { - ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[2]; ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & dwDwordVal_p)[0]; - } //--------------------------------------------------------------------------- @@ -355,14 +348,11 @@ INLINE_FUNCTION void PUBLIC AmiSetDword24ToBe(void FAR * pAddr_p, // //--------------------------------------------------------------------------- -INLINE_FUNCTION void PUBLIC AmiSetDword24ToLe(void FAR * pAddr_p, - DWORD dwDwordVal_p) +INLINE_FUNCTION void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) { - ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[0]; ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & dwDwordVal_p)[2]; - } //--------------------------------------------------------------------------- @@ -378,17 +368,14 @@ INLINE_FUNCTION void PUBLIC AmiSetDword24ToLe(void FAR * pAddr_p, // State: not tested // //--------------------------------------------------------------------------- - -INLINE_FUNCTION DWORD PUBLIC AmiGetDword24FromBe(void FAR * pAddr_p) +INLINE_FUNCTION DWORD AmiGetDword24FromBe(void FAR *pAddr_p) { - tdwStruct dwStruct; dwStruct.m_dwDword = AmiGetDwordFromBe(pAddr_p); dwStruct.m_dwDword >>= 8; return (dwStruct.m_dwDword); - } //--------------------------------------------------------------------------- @@ -404,17 +391,14 @@ INLINE_FUNCTION DWORD PUBLIC AmiGetDword24FromBe(void FAR * pAddr_p) // State: not tested // //--------------------------------------------------------------------------- - -INLINE_FUNCTION DWORD PUBLIC AmiGetDword24FromLe(void FAR * pAddr_p) +INLINE_FUNCTION DWORD AmiGetDword24FromLe(void FAR *pAddr_p) { - tdwStruct dwStruct; dwStruct.m_dwDword = AmiGetDwordFromLe(pAddr_p); dwStruct.m_dwDword &= 0x00FFFFFF; return (dwStruct.m_dwDword); - } //#ifdef USE_VAR64 @@ -433,11 +417,8 @@ INLINE_FUNCTION DWORD PUBLIC AmiGetDword24FromLe(void FAR * pAddr_p) // State: not tested // //--------------------------------------------------------------------------- - -INLINE_FUNCTION void PUBLIC AmiSetQword64ToBe(void FAR * pAddr_p, - QWORD qwQwordVal_p) +INLINE_FUNCTION void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) { - ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[7]; ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[6]; ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & qwQwordVal_p)[5]; @@ -446,7 +427,6 @@ INLINE_FUNCTION void PUBLIC AmiSetQword64ToBe(void FAR * pAddr_p, ((BYTE FAR *) pAddr_p)[5] = ((BYTE FAR *) & qwQwordVal_p)[2]; ((BYTE FAR *) pAddr_p)[6] = ((BYTE FAR *) & qwQwordVal_p)[1]; ((BYTE FAR *) pAddr_p)[7] = ((BYTE FAR *) & qwQwordVal_p)[0]; - } //--------------------------------------------------------------------------- @@ -463,16 +443,12 @@ INLINE_FUNCTION void PUBLIC AmiSetQword64ToBe(void FAR * pAddr_p, // State: not tested // //--------------------------------------------------------------------------- - -INLINE_FUNCTION void PUBLIC AmiSetQword64ToLe(void FAR * pAddr_p, - QWORD qwQwordVal_p) +INLINE_FUNCTION void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) { - QWORD FAR *pqwDst; pqwDst = (QWORD FAR *) pAddr_p; *pqwDst = qwQwordVal_p; - } //--------------------------------------------------------------------------- @@ -488,10 +464,8 @@ INLINE_FUNCTION void PUBLIC AmiSetQword64ToLe(void FAR * pAddr_p, // State: not tested // //--------------------------------------------------------------------------- - -INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromBe(void FAR * pAddr_p) +INLINE_FUNCTION QWORD AmiGetQword64FromBe(void FAR *pAddr_p) { - tqwStruct qwStruct; ((BYTE FAR *) & qwStruct.m_qwQword)[0] = ((BYTE FAR *) pAddr_p)[7]; @@ -504,7 +478,6 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromBe(void FAR * pAddr_p) ((BYTE FAR *) & qwStruct.m_qwQword)[7] = ((BYTE FAR *) pAddr_p)[0]; return (qwStruct.m_qwQword); - } //--------------------------------------------------------------------------- @@ -520,10 +493,8 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromBe(void FAR * pAddr_p) // State: not tested // //--------------------------------------------------------------------------- - -INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromLe(void FAR * pAddr_p) +INLINE_FUNCTION QWORD AmiGetQword64FromLe(void FAR *pAddr_p) { - tqwStruct FAR *pqwStruct; tqwStruct qwStruct; @@ -531,7 +502,6 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromLe(void FAR * pAddr_p) qwStruct.m_qwQword = pqwStruct->m_qwQword; return (qwStruct.m_qwQword); - } //--------------------------------------------------------------------------- @@ -549,8 +519,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword64FromLe(void FAR * pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void PUBLIC AmiSetQword40ToBe(void FAR * pAddr_p, - QWORD qwQwordVal_p) +INLINE_FUNCTION void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[4]; @@ -576,8 +545,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword40ToBe(void FAR * pAddr_p, // //--------------------------------------------------------------------------- -INLINE_FUNCTION void PUBLIC AmiSetQword40ToLe(void FAR * pAddr_p, - QWORD qwQwordVal_p) +INLINE_FUNCTION void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; @@ -599,7 +567,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword40ToLe(void FAR * pAddr_p, // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD PUBLIC AmiGetQword40FromBe(void FAR * pAddr_p) +INLINE_FUNCTION QWORD AmiGetQword40FromBe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -625,7 +593,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword40FromBe(void FAR * pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD PUBLIC AmiGetQword40FromLe(void FAR * pAddr_p) +INLINE_FUNCTION QWORD AmiGetQword40FromLe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -652,8 +620,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword40FromLe(void FAR * pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void PUBLIC AmiSetQword48ToBe(void FAR * pAddr_p, - QWORD qwQwordVal_p) +INLINE_FUNCTION void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[5]; @@ -680,8 +647,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword48ToBe(void FAR * pAddr_p, // //--------------------------------------------------------------------------- -INLINE_FUNCTION void PUBLIC AmiSetQword48ToLe(void FAR * pAddr_p, - QWORD qwQwordVal_p) +INLINE_FUNCTION void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; @@ -703,7 +669,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword48ToLe(void FAR * pAddr_p, // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD PUBLIC AmiGetQword48FromBe(void FAR * pAddr_p) +INLINE_FUNCTION QWORD AmiGetQword48FromBe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -729,7 +695,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword48FromBe(void FAR * pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD PUBLIC AmiGetQword48FromLe(void FAR * pAddr_p) +INLINE_FUNCTION QWORD AmiGetQword48FromLe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -756,8 +722,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword48FromLe(void FAR * pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void PUBLIC AmiSetQword56ToBe(void FAR * pAddr_p, - QWORD qwQwordVal_p) +INLINE_FUNCTION void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[6]; @@ -785,8 +750,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword56ToBe(void FAR * pAddr_p, // //--------------------------------------------------------------------------- -INLINE_FUNCTION void PUBLIC AmiSetQword56ToLe(void FAR * pAddr_p, - QWORD qwQwordVal_p) +INLINE_FUNCTION void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; @@ -809,7 +773,7 @@ INLINE_FUNCTION void PUBLIC AmiSetQword56ToLe(void FAR * pAddr_p, // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD PUBLIC AmiGetQword56FromBe(void FAR * pAddr_p) +INLINE_FUNCTION QWORD AmiGetQword56FromBe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -835,7 +799,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword56FromBe(void FAR * pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD PUBLIC AmiGetQword56FromLe(void FAR * pAddr_p) +INLINE_FUNCTION QWORD AmiGetQword56FromLe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -862,8 +826,7 @@ INLINE_FUNCTION QWORD PUBLIC AmiGetQword56FromLe(void FAR * pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void PUBLIC AmiSetTimeOfDay(void FAR * pAddr_p, - tTimeOfDay FAR * pTimeOfDay_p) +INLINE_FUNCTION void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) { AmiSetDwordToLe(((BYTE FAR *) pAddr_p), @@ -887,8 +850,7 @@ INLINE_FUNCTION void PUBLIC AmiSetTimeOfDay(void FAR * pAddr_p, // //--------------------------------------------------------------------------- -INLINE_FUNCTION void PUBLIC AmiGetTimeOfDay(void FAR * pAddr_p, - tTimeOfDay FAR * pTimeOfDay_p) +INLINE_FUNCTION void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) { pTimeOfDay_p->m_dwMs = diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c index 263fa042291d..6be30d6b4a28 100644 --- a/drivers/staging/epl/demo_main.c +++ b/drivers/staging/epl/demo_main.c @@ -118,7 +118,7 @@ MODULE_DESCRIPTION("EPL MN demo"); // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #else #define TGT_DBG_SIGNAL_TRACE_POINT(p) @@ -188,13 +188,13 @@ module_param_named(cyclelen, uiCycleLen_g, uint, 0); // this function prototype here. If you want to use more than one Epl // instances then the function name of each object dictionary has to differ. -tEplKernel PUBLIC EplObdInitRam(tEplObdInitParam MEM * pInitParam_p); +tEplKernel EplObdInitRam(tEplObdInitParam MEM * pInitParam_p); -tEplKernel PUBLIC AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) - tEplApiEventArg * pEventArg_p, // IN: event argument (union) - void GENERIC * pUserArg_p); +tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) + tEplApiEventArg *pEventArg_p, // IN: event argument (union) + void GENERIC *pUserArg_p); -tEplKernel PUBLIC AppCbSync(void); +tEplKernel AppCbSync(void); static int __init EplLinInit(void); static void __exit EplLinExit(void); @@ -484,9 +484,9 @@ static void __exit EplLinExit(void) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) - tEplApiEventArg * pEventArg_p, // IN: event argument (union) - void GENERIC * pUserArg_p) +tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) + tEplApiEventArg *pEventArg_p, // IN: event argument (union) + void GENERIC *pUserArg_p) { tEplKernel EplRet = kEplSuccessful; @@ -802,7 +802,7 @@ tEplKernel PUBLIC AppCbEvent(tEplApiEventType EventType_p, // IN: event type (en // //--------------------------------------------------------------------------- -tEplKernel PUBLIC AppCbSync(void) +tEplKernel AppCbSync(void) { tEplKernel EplRet = kEplSuccessful; diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 4eb64ecab0f3..9cd6b890ee01 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -180,7 +180,6 @@ #endif #define REENTRANT -#define PUBLIC #define TRACE printk diff --git a/drivers/staging/epl/kernel/EplErrorHandlerk.h b/drivers/staging/epl/kernel/EplErrorHandlerk.h index 4a67ef88b97a..b9d53dc6085c 100644 --- a/drivers/staging/epl/kernel/EplErrorHandlerk.h +++ b/drivers/staging/epl/kernel/EplErrorHandlerk.h @@ -86,15 +86,15 @@ //--------------------------------------------------------------------------- // init function -tEplKernel PUBLIC EplErrorHandlerkInit(void); +tEplKernel EplErrorHandlerkInit(void); // add instance -tEplKernel PUBLIC EplErrorHandlerkAddInstance(void); +tEplKernel EplErrorHandlerkAddInstance(void); // delete instance -tEplKernel PUBLIC EplErrorHandlerkDelInstance(void); +tEplKernel EplErrorHandlerkDelInstance(void); // processes error events -tEplKernel PUBLIC EplErrorHandlerkProcess(tEplEvent * pEvent_p); +tEplKernel EplErrorHandlerkProcess(tEplEvent *pEvent_p); #endif // #ifndef _EPL_ERRORHANDLERK_H_ diff --git a/drivers/staging/epl/kernel/EplEventk.h b/drivers/staging/epl/kernel/EplEventk.h index 1d25aaa2ed49..29c3e94de087 100644 --- a/drivers/staging/epl/kernel/EplEventk.h +++ b/drivers/staging/epl/kernel/EplEventk.h @@ -86,23 +86,23 @@ //--------------------------------------------------------------------------- // init function -tEplKernel PUBLIC EplEventkInit(tEplSyncCb fpSyncCb); +tEplKernel EplEventkInit(tEplSyncCb fpSyncCb); // add instance -tEplKernel PUBLIC EplEventkAddInstance(tEplSyncCb fpSyncCb); +tEplKernel EplEventkAddInstance(tEplSyncCb fpSyncCb); // delete instance -tEplKernel PUBLIC EplEventkDelInstance(void); +tEplKernel EplEventkDelInstance(void); // Kernelthread that dispatches events in kernelspace -tEplKernel PUBLIC EplEventkProcess(tEplEvent * pEvent_p); +tEplKernel EplEventkProcess(tEplEvent *pEvent_p); // post events from kernelspace -tEplKernel PUBLIC EplEventkPost(tEplEvent * pEvent_p); +tEplKernel EplEventkPost(tEplEvent *pEvent_p); // post errorevents from kernelspace -tEplKernel PUBLIC EplEventkPostError(tEplEventSource EventSource_p, - tEplKernel EplError_p, - unsigned int uiArgSize_p, void *pArg_p); +tEplKernel EplEventkPostError(tEplEventSource EventSource_p, + tEplKernel EplError_p, + unsigned int uiArgSize_p, void *pArg_p); #endif // #ifndef _EPL_EVENTK_H_ diff --git a/drivers/staging/epl/kernel/EplNmtk.h b/drivers/staging/epl/kernel/EplNmtk.h index 53409cc89921..599ee8c246bd 100644 --- a/drivers/staging/epl/kernel/EplNmtk.h +++ b/drivers/staging/epl/kernel/EplNmtk.h @@ -86,19 +86,15 @@ // function prototypes //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTK)) != 0) -EPLDLLEXPORT tEplKernel PUBLIC EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR); +EPLDLLEXPORT tEplKernel EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR); -EPLDLLEXPORT tEplKernel PUBLIC -EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR); +EPLDLLEXPORT tEplKernel EplNmtkAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR); -EPLDLLEXPORT tEplKernel PUBLIC -EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR); +EPLDLLEXPORT tEplKernel EplNmtkDelInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtkProcess(EPL_MCO_DECL_PTR_INSTANCE_PTR_ - tEplEvent * pEvent_p); +EPLDLLEXPORT tEplKernel EplNmtkProcess(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplEvent *pEvent_p); -EPLDLLEXPORT tEplNmtState PUBLIC -EplNmtkGetNmtState(EPL_MCO_DECL_PTR_INSTANCE_PTR); +EPLDLLEXPORT tEplNmtState EplNmtkGetNmtState(EPL_MCO_DECL_PTR_INSTANCE_PTR); #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTK)) != 0) diff --git a/drivers/staging/epl/kernel/EplObdk.h b/drivers/staging/epl/kernel/EplObdk.h index cf9f5837dd38..eafd0bf54bea 100644 --- a/drivers/staging/epl/kernel/EplObdk.h +++ b/drivers/staging/epl/kernel/EplObdk.h @@ -92,104 +92,83 @@ extern BYTE MEM abEplObdTrashObject_g[8]; //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ - tEplObdInitParam MEM * pInitParam_p); +EPLDLLEXPORT tEplKernel EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ - tEplObdInitParam MEM * - pInitParam_p); +EPLDLLEXPORT tEplKernel EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdDeleteInstance(EPL_MCO_DECL_INSTANCE_PTR); +EPLDLLEXPORT tEplKernel EplObdDeleteInstance(EPL_MCO_DECL_INSTANCE_PTR); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntry(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p); +EPLDLLEXPORT tEplKernel EplObdWriteEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + tEplObdSize Size_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntry(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p); +EPLDLLEXPORT tEplKernel EplObdReadEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize *pSize_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC -EplObdSetStoreLoadObjCallback(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdStoreLoadObjCallback fpCallback_p); +EPLDLLEXPORT tEplKernel EplObdSetStoreLoadObjCallback(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdStoreLoadObjCallback fpCallback_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdPart ObdPart_p, - tEplObdDir Direction_p); +EPLDLLEXPORT tEplKernel EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdPart ObdPart_p, + tEplObdDir Direction_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ - tEplVarParam MEM * pVarParam_p); +EPLDLLEXPORT tEplKernel EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ tEplVarParam MEM *pVarParam_p); // --------------------------------------------------------------------- -EPLDLLEXPORT void *PUBLIC EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p); +EPLDLLEXPORT void *EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdEntryPtr pUserOd_p); +EPLDLLEXPORT tEplKernel EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPtr pUserOd_p); // --------------------------------------------------------------------- -EPLDLLEXPORT void PUBLIC EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdVarEntry MEM * pVarEntry_p, - tEplObdType Type_p, - tEplObdSize ObdSize_p); +EPLDLLEXPORT void EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdVarEntry MEM *pVarEntry_p, + tEplObdType Type_p, + tEplObdSize ObdSize_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplObdSize PUBLIC EplObdGetDataSize(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p); +EPLDLLEXPORT tEplObdSize EplObdGetDataSize(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p); // --------------------------------------------------------------------- -EPLDLLEXPORT unsigned int PUBLIC EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR); +EPLDLLEXPORT unsigned int EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdSetNodeId(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiNodeId_p, - tEplObdNodeIdType NodeIdType_p); +EPLDLLEXPORT tEplKernel EplObdSetNodeId(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiNodeId_p, + tEplObdNodeIdType NodeIdType_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdIsNumerical(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - BOOL * pfEntryNumerical); +EPLDLLEXPORT tEplKernel EplObdIsNumerical(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + BOOL *pfEntryNumerical); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p); +EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + tEplObdSize Size_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p); +EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize *pSize_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - tEplObdAccess * - pAccessTyp_p); +EPLDLLEXPORT tEplKernel EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + tEplObdAccess *pAccessTyp_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObdSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubindex_p, - tEplObdVarEntry MEM ** - ppVarEntry_p); +EPLDLLEXPORT tEplKernel EplObdSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, + unsigned int uiSubindex_p, + tEplObdVarEntry MEM **ppVarEntry_p); #endif // end of #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) diff --git a/drivers/staging/epl/kernel/EplTimerHighResk.h b/drivers/staging/epl/kernel/EplTimerHighResk.h index d5d046d4d370..64fb52bef819 100644 --- a/drivers/staging/epl/kernel/EplTimerHighResk.h +++ b/drivers/staging/epl/kernel/EplTimerHighResk.h @@ -85,25 +85,24 @@ // function prototypes //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimerHighReskInit(void); +tEplKernel EplTimerHighReskInit(void); -tEplKernel PUBLIC EplTimerHighReskAddInstance(void); +tEplKernel EplTimerHighReskAddInstance(void); -tEplKernel PUBLIC EplTimerHighReskDelInstance(void); +tEplKernel EplTimerHighReskDelInstance(void); -tEplKernel PUBLIC EplTimerHighReskSetTimerNs(tEplTimerHdl * pTimerHdl_p, - unsigned long long ullTimeNs_p, - tEplTimerkCallback pfnCallback_p, - unsigned long ulArgument_p, - BOOL fContinuously_p); +tEplKernel EplTimerHighReskSetTimerNs(tEplTimerHdl *pTimerHdl_p, + unsigned long long ullTimeNs_p, + tEplTimerkCallback pfnCallback_p, + unsigned long ulArgument_p, + BOOL fContinuously_p); -tEplKernel PUBLIC EplTimerHighReskModifyTimerNs(tEplTimerHdl * pTimerHdl_p, - unsigned long long ullTimeNs_p, - tEplTimerkCallback - pfnCallback_p, - unsigned long ulArgument_p, - BOOL fContinuously_p); +tEplKernel EplTimerHighReskModifyTimerNs(tEplTimerHdl *pTimerHdl_p, + unsigned long long ullTimeNs_p, + tEplTimerkCallback pfnCallback_p, + unsigned long ulArgument_p, + BOOL fContinuously_p); -tEplKernel PUBLIC EplTimerHighReskDeleteTimer(tEplTimerHdl * pTimerHdl_p); +tEplKernel EplTimerHighReskDeleteTimer(tEplTimerHdl *pTimerHdl_p); #endif // #ifndef _EPLTIMERHIGHRESK_H_ diff --git a/drivers/staging/epl/kernel/EplTimerk.h b/drivers/staging/epl/kernel/EplTimerk.h index 9160e7260de8..c3d4ef7071de 100644 --- a/drivers/staging/epl/kernel/EplTimerk.h +++ b/drivers/staging/epl/kernel/EplTimerk.h @@ -99,20 +99,20 @@ // function prototypes //--------------------------------------------------------------------------- #if EPL_TIMER_USE_USER == FALSE -tEplKernel PUBLIC EplTimerkInit(void); +tEplKernel EplTimerkInit(void); -tEplKernel PUBLIC EplTimerkAddInstance(void); +tEplKernel EplTimerkAddInstance(void); -tEplKernel PUBLIC EplTimerkDelInstance(void); +tEplKernel EplTimerkDelInstance(void); -tEplKernel PUBLIC EplTimerkSetTimerMs(tEplTimerHdl * pTimerHdl_p, - unsigned long ulTime_p, - tEplTimerArg Argument_p); +tEplKernel EplTimerkSetTimerMs(tEplTimerHdl *pTimerHdl_p, + unsigned long ulTime_p, + tEplTimerArg Argument_p); -tEplKernel PUBLIC EplTimerkModifyTimerMs(tEplTimerHdl * pTimerHdl_p, - unsigned long ulTime_p, - tEplTimerArg Argument_p); +tEplKernel EplTimerkModifyTimerMs(tEplTimerHdl *pTimerHdl_p, + unsigned long ulTime_p, + tEplTimerArg Argument_p); -tEplKernel PUBLIC EplTimerkDeleteTimer(tEplTimerHdl * pTimerHdl_p); +tEplKernel EplTimerkDeleteTimer(tEplTimerHdl *pTimerHdl_p); #endif #endif // #ifndef _EPLTIMERK_H_ diff --git a/drivers/staging/epl/kernel/VirtualEthernet.h b/drivers/staging/epl/kernel/VirtualEthernet.h index deff8720e37f..c6c5433fe9ff 100644 --- a/drivers/staging/epl/kernel/VirtualEthernet.h +++ b/drivers/staging/epl/kernel/VirtualEthernet.h @@ -87,9 +87,9 @@ #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0) -tEplKernel PUBLIC VEthAddInstance(tEplDllkInitParam * pInitParam_p); +tEplKernel VEthAddInstance(tEplDllkInitParam *pInitParam_p); -tEplKernel PUBLIC VEthDelInstance(void); +tEplKernel VEthDelInstance(void); #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0) diff --git a/drivers/staging/epl/proc_fs.c b/drivers/staging/epl/proc_fs.c index f4910332d3c6..c08453d54903 100644 --- a/drivers/staging/epl/proc_fs.c +++ b/drivers/staging/epl/proc_fs.c @@ -145,10 +145,10 @@ static int EplLinProcRead(char *pcBuffer_p, char **ppcStart_p, off_t Offset_p, static int EplLinProcWrite(struct file *file, const char __user * buffer, unsigned long count, void *data); -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); -void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgPostTraceValue(DWORD dwTraceValue_p); -EPLDLLEXPORT DWORD PUBLIC EplIdentuGetRunningRequests(void); +EPLDLLEXPORT DWORD EplIdentuGetRunningRequests(void); //=========================================================================// // // @@ -191,7 +191,7 @@ tEplKernel EplLinProcFree(void) //--------------------------------------------------------------------------- #ifdef _DBG_TRACE_POINTS_ -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p) +void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p) { if (bTracePointNumber_p >= @@ -207,7 +207,7 @@ void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p) } -void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p) +void TgtDbgPostTraceValue(DWORD dwTraceValue_p) { spin_lock_irqsave(&spinlockDbgTraceValue_l, ulDbTraceValueFlags_l); diff --git a/drivers/staging/epl/user/EplCfgMau.h b/drivers/staging/epl/user/EplCfgMau.h index d25a1e9d36cf..cafe60f094b6 100644 --- a/drivers/staging/epl/user/EplCfgMau.h +++ b/drivers/staging/epl/user/EplCfgMau.h @@ -86,8 +86,8 @@ #define EPL_CFGMA_MAX_TIMEOUT 3 //callbackfunction, called if configuration is finished -typedef void (PUBLIC * tfpEplCfgMaCb) (unsigned int uiNodeId_p, - tEplKernel Errorstate_p); +typedef void (* tfpEplCfgMaCb)(unsigned int uiNodeId_p, + tEplKernel Errorstate_p); //State for configuartion manager Statemachine typedef enum { @@ -166,7 +166,7 @@ typedef struct { // // Returns: tEplKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaInit(); +tEplKernel EplCfgMaInit(void); //--------------------------------------------------------------------------- // Function: EplCfgMaAddInstance() @@ -177,7 +177,7 @@ tEplKernel PUBLIC EplCfgMaInit(); // // Returns: tEplKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaAddInstance(); +tEplKernel EplCfgMaAddInstance(void); //--------------------------------------------------------------------------- // Function: EplCfgMaDelInstance() @@ -188,7 +188,7 @@ tEplKernel PUBLIC EplCfgMaAddInstance(); // // Returns: tEplKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaDelInstance(); +tEplKernel plCfgMaDelInstance(void); //--------------------------------------------------------------------------- // Function: EplCfgMaStartConfig() @@ -204,11 +204,11 @@ tEplKernel PUBLIC EplCfgMaDelInstance(); // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaStartConfig(unsigned int uiNodeId_p, - BYTE * pbConcise_p, - tfpEplCfgMaCb fpCfgMaCb_p, - tEplObdSize SizeOfConcise_p, - tEplCfgMaDcfTyp DcfType_p); +tEplKernel EplCfgMaStartConfig(unsigned int uiNodeId_p, + BYTE * pbConcise_p, + tfpEplCfgMaCb fpCfgMaCb_p, + tEplObdSize SizeOfConcise_p, + tEplCfgMaDcfTyp DcfType_p); //--------------------------------------------------------------------------- // Function: CfgMaStartConfigurationNode() @@ -222,9 +222,9 @@ tEplKernel PUBLIC EplCfgMaStartConfig(unsigned int uiNodeId_p, // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaStartConfigNode(unsigned int uiNodeId_p, - tfpEplCfgMaCb fpCfgMaCb_p, - tEplCfgMaDcfTyp DcfType_p); +tEplKernel EplCfgMaStartConfigNode(unsigned int uiNodeId_p, + tfpEplCfgMaCb fpCfgMaCb_p, + tEplCfgMaDcfTyp DcfType_p); //--------------------------------------------------------------------------- // Function: EplCfgMaStartConfigNodeDcf() @@ -240,11 +240,11 @@ tEplKernel PUBLIC EplCfgMaStartConfigNode(unsigned int uiNodeId_p, // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, - BYTE * pbConcise_p, - tfpEplCfgMaCb fpCfgMaCb_p, - tEplObdSize SizeOfConcise_p, - tEplCfgMaDcfTyp DcfType_p); +tEplKernel EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, + BYTE * pbConcise_p, + tfpEplCfgMaCb fpCfgMaCb_p, + tEplObdSize SizeOfConcise_p, + tEplCfgMaDcfTyp DcfType_p); //--------------------------------------------------------------------------- // Function: EplCfgMaLinkDcf() @@ -258,10 +258,10 @@ tEplKernel PUBLIC EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaLinkDcf(unsigned int uiNodeId_p, - BYTE * pbConcise_p, - tEplObdSize SizeOfConcise_p, - tEplCfgMaDcfTyp DcfType_p); +tEplKernel EplCfgMaLinkDcf(unsigned int uiNodeId_p, + BYTE * pbConcise_p, + tEplObdSize SizeOfConcise_p, + tEplCfgMaDcfTyp DcfType_p); //--------------------------------------------------------------------------- // Function: EplCfgMaCheckDcf() @@ -274,8 +274,7 @@ tEplKernel PUBLIC EplCfgMaLinkDcf(unsigned int uiNodeId_p, // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplCfgMaCheckDcf(unsigned int uiNodeId_p, - tEplCfgMaDcfTyp DcfType_p); +tEplKernel EplCfgMaCheckDcf(unsigned int uiNodeId_p, tEplCfgMaDcfTyp DcfType_p); #endif // #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_CFGMA)) != 0) diff --git a/drivers/staging/epl/user/EplDllu.h b/drivers/staging/epl/user/EplDllu.h index 36f8bb76f7ca..ea1f2c09d8ce 100644 --- a/drivers/staging/epl/user/EplDllu.h +++ b/drivers/staging/epl/user/EplDllu.h @@ -81,7 +81,7 @@ // typedef //--------------------------------------------------------------------------- -typedef tEplKernel(PUBLIC * tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); +typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); //--------------------------------------------------------------------------- // function prototypes diff --git a/drivers/staging/epl/user/EplDlluCal.h b/drivers/staging/epl/user/EplDlluCal.h index b1dcd0609573..2b2232d02bbc 100644 --- a/drivers/staging/epl/user/EplDlluCal.h +++ b/drivers/staging/epl/user/EplDlluCal.h @@ -82,7 +82,7 @@ // typedef //--------------------------------------------------------------------------- -typedef tEplKernel(PUBLIC * tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); +typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); //--------------------------------------------------------------------------- // function prototypes diff --git a/drivers/staging/epl/user/EplEventu.h b/drivers/staging/epl/user/EplEventu.h index 322cffd11874..1a72f1f82f58 100644 --- a/drivers/staging/epl/user/EplEventu.h +++ b/drivers/staging/epl/user/EplEventu.h @@ -85,24 +85,23 @@ // function prototypes //--------------------------------------------------------------------------- // init function -tEplKernel PUBLIC EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p); +tEplKernel EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p); // add instance -tEplKernel PUBLIC EplEventuAddInstance(tEplProcessEventCb - pfnApiProcessEventCb_p); +tEplKernel EplEventuAddInstance(tEplProcessEventCb pfnApiProcessEventCb_p); // delete instance -tEplKernel PUBLIC EplEventuDelInstance(void); +tEplKernel EplEventuDelInstance(void); // Task that dispatches events in userspace -tEplKernel PUBLIC EplEventuProcess(tEplEvent * pEvent_p); +tEplKernel EplEventuProcess(tEplEvent * pEvent_p); // post events from userspace -tEplKernel PUBLIC EplEventuPost(tEplEvent * pEvent_p); +tEplKernel EplEventuPost(tEplEvent * pEvent_p); // post errorevents from userspace -tEplKernel PUBLIC EplEventuPostError(tEplEventSource EventSource_p, - tEplKernel EplError_p, - unsigned int uiArgSize_p, void *pArg_p); +tEplKernel EplEventuPostError(tEplEventSource EventSource_p, + tEplKernel EplError_p, + unsigned int uiArgSize_p, void *pArg_p); #endif // #ifndef _EPL_EVENTU_H_ diff --git a/drivers/staging/epl/user/EplIdentu.h b/drivers/staging/epl/user/EplIdentu.h index e7302106c741..973e4b34ecd9 100644 --- a/drivers/staging/epl/user/EplIdentu.h +++ b/drivers/staging/epl/user/EplIdentu.h @@ -81,7 +81,7 @@ // typedef //--------------------------------------------------------------------------- -typedef tEplKernel(PUBLIC * tEplIdentuCbResponse) (unsigned int uiNodeId_p, +typedef tEplKernel(* tEplIdentuCbResponse) (unsigned int uiNodeId_p, tEplIdentResponse * pIdentResponse_p); @@ -89,20 +89,18 @@ typedef tEplKernel(PUBLIC * tEplIdentuCbResponse) (unsigned int uiNodeId_p, // function prototypes //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplIdentuInit(void); +tEplKernel EplIdentuInit(void); -tEplKernel PUBLIC EplIdentuAddInstance(void); +tEplKernel EplIdentuAddInstance(void); -tEplKernel PUBLIC EplIdentuDelInstance(void); +tEplKernel EplIdentuDelInstance(void); -tEplKernel PUBLIC EplIdentuReset(void); +tEplKernel EplIdentuReset(void); -tEplKernel PUBLIC EplIdentuGetIdentResponse(unsigned int uiNodeId_p, - tEplIdentResponse ** - ppIdentResponse_p); +tEplKernel EplIdentuGetIdentResponse(unsigned int uiNodeId_p, + tEplIdentResponse **ppIdentResponse_p); -tEplKernel PUBLIC EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, - tEplIdentuCbResponse - pfnCbResponse_p); +tEplKernel EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, + tEplIdentuCbResponse pfnCbResponse_p); #endif // #ifndef _EPLIDENTU_H_ diff --git a/drivers/staging/epl/user/EplLedu.h b/drivers/staging/epl/user/EplLedu.h index 78e70d064459..87fd02f6819f 100644 --- a/drivers/staging/epl/user/EplLedu.h +++ b/drivers/staging/epl/user/EplLedu.h @@ -83,7 +83,7 @@ // typedef //--------------------------------------------------------------------------- -typedef tEplKernel(PUBLIC * tEplLeduStateChangeCallback) (tEplLedType LedType_p, +typedef tEplKernel(* tEplLeduStateChangeCallback) (tEplLedType LedType_p, BOOL fOn_p); //--------------------------------------------------------------------------- @@ -92,17 +92,15 @@ typedef tEplKernel(PUBLIC * tEplLeduStateChangeCallback) (tEplLedType LedType_p, #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) -tEplKernel PUBLIC EplLeduInit(tEplLeduStateChangeCallback pfnCbStateChange_p); +tEplKernel EplLeduInit(tEplLeduStateChangeCallback pfnCbStateChange_p); -tEplKernel PUBLIC EplLeduAddInstance(tEplLeduStateChangeCallback - pfnCbStateChange_p); +tEplKernel EplLeduAddInstance(tEplLeduStateChangeCallback pfnCbStateChange_p); -tEplKernel PUBLIC EplLeduDelInstance(void); +tEplKernel EplLeduDelInstance(void); -tEplKernel PUBLIC EplLeduCbNmtStateChange(tEplEventNmtStateChange - NmtStateChange_p); +tEplKernel EplLeduCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p); -tEplKernel PUBLIC EplLeduProcessEvent(tEplEvent * pEplEvent_p); +tEplKernel EplLeduProcessEvent(tEplEvent * pEplEvent_p); #endif // #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) diff --git a/drivers/staging/epl/user/EplNmtCnu.h b/drivers/staging/epl/user/EplNmtCnu.h index e508055b5b8f..d7e740263885 100644 --- a/drivers/staging/epl/user/EplNmtCnu.h +++ b/drivers/staging/epl/user/EplNmtCnu.h @@ -89,17 +89,16 @@ #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_CN)) != 0) -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuInit(unsigned int uiNodeId_p); +EPLDLLEXPORT tEplKernel EplNmtCnuInit(unsigned int uiNodeId_p); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuAddInstance(unsigned int uiNodeId_p); +EPLDLLEXPORT tEplKernel EplNmtCnuAddInstance(unsigned int uiNodeId_p); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuDelInstance(void); +EPLDLLEXPORT tEplKernel EplNmtCnuDelInstance(void); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, - tEplNmtCommand - NmtCommand_p); +EPLDLLEXPORT tEplKernel EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, + tEplNmtCommand NmtCommand_p); -EPLDLLEXPORT tEplKernel PUBLIC +EPLDLLEXPORT tEplKernel EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback pfnEplNmtCheckEventCb_p); diff --git a/drivers/staging/epl/user/EplNmtMnu.h b/drivers/staging/epl/user/EplNmtMnu.h index c54efeba303f..478baae2121d 100644 --- a/drivers/staging/epl/user/EplNmtMnu.h +++ b/drivers/staging/epl/user/EplNmtMnu.h @@ -81,17 +81,15 @@ // typedef //--------------------------------------------------------------------------- -typedef tEplKernel(PUBLIC * tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, - tEplNmtNodeEvent - NodeEvent_p, - tEplNmtState NmtState_p, - WORD wErrorCode_p, - BOOL fMandatory_p); - -typedef tEplKernel(PUBLIC * - tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p, - tEplNmtState NmtState_p, - WORD wErrorCode_p); +typedef tEplKernel(* tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, + tEplNmtNodeEvent NodeEvent_p, + tEplNmtState NmtState_p, + WORD wErrorCode_p, + BOOL fMandatory_p); + +typedef tEplKernel(* tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p, + tEplNmtState NmtState_p, + WORD wErrorCode_p); //--------------------------------------------------------------------------- // function prototypes @@ -107,7 +105,7 @@ tEplKernel EplNmtMnuAddInstance(tEplNmtMnuCbNodeEvent pfnCbNodeEvent_p, tEplKernel EplNmtMnuDelInstance(void); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtMnuProcessEvent(tEplEvent * pEvent_p); +EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent * pEvent_p); tEplKernel EplNmtMnuSendNmtCommand(unsigned int uiNodeId_p, tEplNmtCommand NmtCommand_p); @@ -115,12 +113,12 @@ tEplKernel EplNmtMnuSendNmtCommand(unsigned int uiNodeId_p, tEplKernel EplNmtMnuTriggerStateChange(unsigned int uiNodeId_p, tEplNmtNodeCommand NodeCommand_p); -tEplKernel PUBLIC EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange +tEplKernel EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p); -tEplKernel PUBLIC EplNmtMnuCbCheckEvent(tEplNmtEvent NmtEvent_p); +tEplKernel EplNmtMnuCbCheckEvent(tEplNmtEvent NmtEvent_p); -tEplKernel PUBLIC EplNmtMnuGetDiagnosticInfo(unsigned int +tEplKernel EplNmtMnuGetDiagnosticInfo(unsigned int *puiMandatorySlaveCount_p, unsigned int *puiSignalSlaveCount_p, diff --git a/drivers/staging/epl/user/EplNmtu.h b/drivers/staging/epl/user/EplNmtu.h index 5a56c5830603..fd63899d2841 100644 --- a/drivers/staging/epl/user/EplNmtu.h +++ b/drivers/staging/epl/user/EplNmtu.h @@ -121,12 +121,9 @@ typedef enum { kEplNmtCmdInvalidService = 0xFF } tEplNmtCommand; -typedef tEplKernel(PUBLIC * - tEplNmtuStateChangeCallback) (tEplEventNmtStateChange - NmtStateChange_p); +typedef tEplKernel(* tEplNmtuStateChangeCallback) (tEplEventNmtStateChange NmtStateChange_p); -typedef tEplKernel(PUBLIC * - tEplNmtuCheckEventCallback) (tEplNmtEvent NmtEvent_p); +typedef tEplKernel(* tEplNmtuCheckEventCallback) (tEplNmtEvent NmtEvent_p); //--------------------------------------------------------------------------- // function prototypes @@ -134,21 +131,19 @@ typedef tEplKernel(PUBLIC * #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuInit(void); +EPLDLLEXPORT tEplKernel EplNmtuInit(void); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuAddInstance(void); +EPLDLLEXPORT tEplKernel EplNmtuAddInstance(void); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuDelInstance(void); +EPLDLLEXPORT tEplKernel EplNmtuDelInstance(void); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuNmtEvent(tEplNmtEvent NmtEvent_p); +EPLDLLEXPORT tEplKernel EplNmtuNmtEvent(tEplNmtEvent NmtEvent_p); -EPLDLLEXPORT tEplNmtState PUBLIC EplNmtuGetNmtState(void); +EPLDLLEXPORT tEplNmtState EplNmtuGetNmtState(void); -EPLDLLEXPORT tEplKernel PUBLIC EplNmtuProcessEvent(tEplEvent * pEplEvent_p); +EPLDLLEXPORT tEplKernel EplNmtuProcessEvent(tEplEvent * pEplEvent_p); -EPLDLLEXPORT tEplKernel PUBLIC -EplNmtuRegisterStateChangeCb(tEplNmtuStateChangeCallback - pfnEplNmtStateChangeCb_p); +EPLDLLEXPORT tEplKernel EplNmtuRegisterStateChangeCb(tEplNmtuStateChangeCallback pfnEplNmtStateChangeCb_p); #endif // #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) diff --git a/drivers/staging/epl/user/EplNmtuCal.h b/drivers/staging/epl/user/EplNmtuCal.h index c881582702bb..d8c125e042f3 100644 --- a/drivers/staging/epl/user/EplNmtuCal.h +++ b/drivers/staging/epl/user/EplNmtuCal.h @@ -86,6 +86,6 @@ //--------------------------------------------------------------------------- // function prototypes //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplNmtState PUBLIC EplNmtkCalGetNmtState(void); +EPLDLLEXPORT tEplNmtState EplNmtkCalGetNmtState(void); #endif // #ifndef _EPLNMTUCAL_H_ diff --git a/drivers/staging/epl/user/EplObdu.h b/drivers/staging/epl/user/EplObdu.h index bc1e17303017..c9138cb084ef 100644 --- a/drivers/staging/epl/user/EplObdu.h +++ b/drivers/staging/epl/user/EplObdu.h @@ -91,68 +91,64 @@ #error "EPL OBDu module enabled, but OBD_USE_KERNEL == TRUE" #endif -EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntry(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p); +EPLDLLEXPORT tEplKernel EplObduWriteEntry(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + tEplObdSize Size_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntry(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p); +EPLDLLEXPORT tEplKernel EplObduReadEntry(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize *pSize_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduAccessOdPart(tEplObdPart ObdPart_p, - tEplObdDir Direction_p); +EPLDLLEXPORT tEplKernel EplObduAccessOdPart(tEplObdPart ObdPart_p, + tEplObdDir Direction_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduDefineVar(tEplVarParam MEM * pVarParam_p); +EPLDLLEXPORT tEplKernel EplObduDefineVar(tEplVarParam MEM * pVarParam_p); // --------------------------------------------------------------------- -EPLDLLEXPORT void *PUBLIC EplObduGetObjectDataPtr(unsigned int uiIndex_p, - unsigned int uiSubIndex_p); +EPLDLLEXPORT void *EplObduGetObjectDataPtr(unsigned int uiIndex_p, + unsigned int uiSubIndex_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p); +EPLDLLEXPORT tEplKernel EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p); // --------------------------------------------------------------------- -EPLDLLEXPORT void PUBLIC EplObduInitVarEntry(tEplObdVarEntry MEM * pVarEntry_p, - BYTE bType_p, - tEplObdSize ObdSize_p); +EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry MEM * pVarEntry_p, + BYTE bType_p, tEplObdSize ObdSize_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplObdSize PUBLIC EplObduGetDataSize(unsigned int uiIndex_p, - unsigned int uiSubIndex_p); +EPLDLLEXPORT tEplObdSize EplObduGetDataSize(unsigned int uiIndex_p, + unsigned int uiSubIndex_p); // --------------------------------------------------------------------- -EPLDLLEXPORT unsigned int PUBLIC EplObduGetNodeId(void); +EPLDLLEXPORT unsigned int EplObduGetNodeId(void); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduSetNodeId(unsigned int uiNodeId_p, - tEplObdNodeIdType NodeIdType_p); +EPLDLLEXPORT tEplKernel EplObduSetNodeId(unsigned int uiNodeId_p, + tEplObdNodeIdType NodeIdType_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduGetAccessType(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - tEplObdAccess * - pAccessTyp_p); +EPLDLLEXPORT tEplKernel EplObduGetAccessType(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + tEplObdAccess *pAccessTyp_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduReadEntryToLe(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p); +EPLDLLEXPORT tEplKernel EplObduReadEntryToLe(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize *pSize_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduWriteEntryFromLe(unsigned int uiIndex_p, - unsigned int - uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p); +EPLDLLEXPORT tEplKernel EplObduWriteEntryFromLe(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + tEplObdSize Size_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ - unsigned int uiIndex_p, - unsigned int uiSubindex_p, - tEplObdVarEntry MEM ** - ppVarEntry_p); +EPLDLLEXPORT tEplKernel EplObduSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ + unsigned int uiIndex_p, + unsigned int uiSubindex_p, + tEplObdVarEntry MEM **ppVarEntry_p); #elif EPL_OBD_USE_KERNEL != FALSE #include "../kernel/EplObdk.h" diff --git a/drivers/staging/epl/user/EplObduCal.h b/drivers/staging/epl/user/EplObduCal.h index 498e0112fac3..367ecc56d15f 100644 --- a/drivers/staging/epl/user/EplObduCal.h +++ b/drivers/staging/epl/user/EplObduCal.h @@ -85,62 +85,52 @@ //--------------------------------------------------------------------------- // function prototypes //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntry(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p); +EPLDLLEXPORT tEplKernel EplObduCalWriteEntry(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + tEplObdSize Size_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntry(unsigned int uiIndex_p, - unsigned int uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p); +EPLDLLEXPORT tEplKernel EplObduCalReadEntry(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize * pSize_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalAccessOdPart(tEplObdPart ObdPart_p, - tEplObdDir Direction_p); +EPLDLLEXPORT tEplKernel EplObduCalAccessOdPart(tEplObdPart ObdPart_p, + tEplObdDir Direction_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalDefineVar(tEplVarParam MEM * - pVarParam_p); +EPLDLLEXPORT tEplKernel EplObduCalDefineVar(tEplVarParam MEM *pVarParam_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT void *PUBLIC EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, - unsigned int uiSubIndex_p); +EPLDLLEXPORT void *EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, + unsigned int uiSubIndex_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalRegisterUserOd(tEplObdEntryPtr - pUserOd_p); +EPLDLLEXPORT tEplKernel EplObduCalRegisterUserOd(tEplObdEntryPtr pUserOd_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT void PUBLIC EplObduCalInitVarEntry(tEplObdVarEntry MEM * - pVarEntry_p, BYTE bType_p, - tEplObdSize ObdSize_p); +EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry MEM *pVarEntry_p, + BYTE bType_p, tEplObdSize ObdSize_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplObdSize PUBLIC EplObduCalGetDataSize(unsigned int uiIndex_p, - unsigned int - uiSubIndex_p); +EPLDLLEXPORT tEplObdSize EplObduCalGetDataSize(unsigned int uiIndex_p, + unsigned int uiSubIndex_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT unsigned int PUBLIC EplObduCalGetNodeId(void); +EPLDLLEXPORT unsigned int EplObduCalGetNodeId(void); //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalSetNodeId(unsigned int uiNodeId_p, - tEplObdNodeIdType - NodeIdType_p); +EPLDLLEXPORT tEplKernel EplObduCalSetNodeId(unsigned int uiNodeId_p, + tEplObdNodeIdType NodeIdType_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalGetAccessType(unsigned int uiIndex_p, - unsigned int - uiSubIndex_p, - tEplObdAccess * - pAccessTyp_p); +EPLDLLEXPORT tEplKernel EplObduCalGetAccessType(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + tEplObdAccess *pAccessTyp_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalReadEntryToLe(unsigned int uiIndex_p, - unsigned int - uiSubIndex_p, - void *pDstData_p, - tEplObdSize * pSize_p); +EPLDLLEXPORT tEplKernel EplObduCalReadEntryToLe(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pDstData_p, + tEplObdSize *pSize_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplObduCalWriteEntryFromLe(unsigned int - uiIndex_p, - unsigned int - uiSubIndex_p, - void *pSrcData_p, - tEplObdSize Size_p); +EPLDLLEXPORT tEplKernel EplObduCalWriteEntryFromLe(unsigned int uiIndex_p, + unsigned int uiSubIndex_p, + void *pSrcData_p, + tEplObdSize Size_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC +EPLDLLEXPORT tEplKernel EplObduCalSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, unsigned int uiSubindex_p, tEplObdVarEntry MEM ** ppVarEntry_p); diff --git a/drivers/staging/epl/user/EplPdou.h b/drivers/staging/epl/user/EplPdou.h index 11de4862e8bb..ebc6cd021f46 100644 --- a/drivers/staging/epl/user/EplPdou.h +++ b/drivers/staging/epl/user/EplPdou.h @@ -89,7 +89,7 @@ tEplKernel EplPdouAddInstance(void); tEplKernel EplPdouDelInstance(void); #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_PDOU)) != 0) -tEplKernel PUBLIC EplPdouCbObdAccess(tEplObdCbParam MEM * pParam_p); +tEplKernel EplPdouCbObdAccess(tEplObdCbParam MEM * pParam_p); #else #define EplPdouCbObdAccess NULL #endif diff --git a/drivers/staging/epl/user/EplSdoAsndu.h b/drivers/staging/epl/user/EplSdoAsndu.h index e34959f42792..6049e5852ed2 100644 --- a/drivers/staging/epl/user/EplSdoAsndu.h +++ b/drivers/staging/epl/user/EplSdoAsndu.h @@ -87,20 +87,20 @@ //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0) -tEplKernel PUBLIC EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p); +tEplKernel EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p); -tEplKernel PUBLIC EplSdoAsnduAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p); +tEplKernel EplSdoAsnduAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p); -tEplKernel PUBLIC EplSdoAsnduDelInstance(void); +tEplKernel EplSdoAsnduDelInstance(void); -tEplKernel PUBLIC EplSdoAsnduInitCon(tEplSdoConHdl * pSdoConHandle_p, - unsigned int uiTargetNodeId_p); +tEplKernel EplSdoAsnduInitCon(tEplSdoConHdl *pSdoConHandle_p, + unsigned int uiTargetNodeId_p); -tEplKernel PUBLIC EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, - tEplFrame * pSrcData_p, - DWORD dwDataSize_p); +tEplKernel EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, + tEplFrame *pSrcData_p, + DWORD dwDataSize_p); -tEplKernel PUBLIC EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p); +tEplKernel EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p); #endif // end of #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0) diff --git a/drivers/staging/epl/user/EplSdoAsySequ.h b/drivers/staging/epl/user/EplSdoAsySequ.h index 4658b5f8c538..0a957ba2fdd6 100644 --- a/drivers/staging/epl/user/EplSdoAsySequ.h +++ b/drivers/staging/epl/user/EplSdoAsySequ.h @@ -88,24 +88,24 @@ //--------------------------------------------------------------------------- // function prototypes //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, - tEplSdoComConCb fpSdoComConCb_p); +tEplKernel EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, + tEplSdoComConCb fpSdoComConCb_p); -tEplKernel PUBLIC EplSdoAsySeqAddInstance(tEplSdoComReceiveCb fpSdoComCb_p, - tEplSdoComConCb fpSdoComConCb_p); +tEplKernel EplSdoAsySeqAddInstance(tEplSdoComReceiveCb fpSdoComCb_p, + tEplSdoComConCb fpSdoComConCb_p); -tEplKernel PUBLIC EplSdoAsySeqDelInstance(void); +tEplKernel EplSdoAsySeqDelInstance(void); -tEplKernel PUBLIC EplSdoAsySeqInitCon(tEplSdoSeqConHdl * pSdoSeqConHdl_p, - unsigned int uiNodeId_p, - tEplSdoType SdoType); +tEplKernel EplSdoAsySeqInitCon(tEplSdoSeqConHdl *pSdoSeqConHdl_p, + unsigned int uiNodeId_p, + tEplSdoType SdoType); -tEplKernel PUBLIC EplSdoAsySeqSendData(tEplSdoSeqConHdl SdoSeqConHdl_p, - unsigned int uiDataSize_p, - tEplFrame * pData_p); +tEplKernel EplSdoAsySeqSendData(tEplSdoSeqConHdl SdoSeqConHdl_p, + unsigned int uiDataSize_p, + tEplFrame *pData_p); -tEplKernel PUBLIC EplSdoAsySeqProcessEvent(tEplEvent * pEvent_p); +tEplKernel EplSdoAsySeqProcessEvent(tEplEvent *pEvent_p); -tEplKernel PUBLIC EplSdoAsySeqDelCon(tEplSdoSeqConHdl SdoSeqConHdl_p); +tEplKernel EplSdoAsySeqDelCon(tEplSdoSeqConHdl SdoSeqConHdl_p); #endif // #ifndef _EPLSDOASYSEQU_H_ diff --git a/drivers/staging/epl/user/EplSdoComu.h b/drivers/staging/epl/user/EplSdoComu.h index 3e454c7a3559..9e45e99a978a 100644 --- a/drivers/staging/epl/user/EplSdoComu.h +++ b/drivers/staging/epl/user/EplSdoComu.h @@ -88,38 +88,37 @@ //--------------------------------------------------------------------------- // function prototypes //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplSdoComInit(void); +tEplKernel EplSdoComInit(void); -tEplKernel PUBLIC EplSdoComAddInstance(void); +tEplKernel EplSdoComAddInstance(void); -tEplKernel PUBLIC EplSdoComDelInstance(void); +tEplKernel EplSdoComDelInstance(void); #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) -tEplKernel PUBLIC EplSdoComDefineCon(tEplSdoComConHdl * pSdoComConHdl_p, - unsigned int uiTargetNodeId_p, - tEplSdoType ProtType_p); +tEplKernel EplSdoComDefineCon(tEplSdoComConHdl *pSdoComConHdl_p, + unsigned int uiTargetNodeId_p, + tEplSdoType ProtType_p); -tEplKernel PUBLIC EplSdoComInitTransferByIndex(tEplSdoComTransParamByIndex * - pSdoComTransParam_p); +tEplKernel EplSdoComInitTransferByIndex(tEplSdoComTransParamByIndex *pSdoComTransParam_p); -tEplKernel PUBLIC EplSdoComUndefineCon(tEplSdoComConHdl SdoComConHdl_p); +tEplKernel EplSdoComUndefineCon(tEplSdoComConHdl SdoComConHdl_p); -tEplKernel PUBLIC EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, - tEplSdoComFinished * pSdoComFinished_p); +tEplKernel EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, + tEplSdoComFinished *pSdoComFinished_p); -tEplKernel PUBLIC EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, - DWORD dwAbortCode_p); +tEplKernel EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, + DWORD dwAbortCode_p); #endif // for future extention /* -tEplKernel PUBLIC EplSdoComInitTransferAllByIndex(tEplSdoComTransParamAllByIndex* pSdoComTransParam_p); +tEplKernel EplSdoComInitTransferAllByIndex(tEplSdoComTransParamAllByIndex* pSdoComTransParam_p); -tEplKernel PUBLIC EplSdoComInitTransferByName(tEplSdoComTransParamByName* pSdoComTransParam_p); +tEplKernel EplSdoComInitTransferByName(tEplSdoComTransParamByName* pSdoComTransParam_p); -tEplKernel PUBLIC EplSdoComInitTransferFile(tEplSdoComTransParamFile* pSdoComTransParam_p); +tEplKernel EplSdoComInitTransferFile(tEplSdoComTransParamFile* pSdoComTransParam_p); */ diff --git a/drivers/staging/epl/user/EplSdoUdpu.h b/drivers/staging/epl/user/EplSdoUdpu.h index 2d77b6fff199..22091d4f317e 100644 --- a/drivers/staging/epl/user/EplSdoUdpu.h +++ b/drivers/staging/epl/user/EplSdoUdpu.h @@ -86,23 +86,22 @@ //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) -tEplKernel PUBLIC EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p); +tEplKernel EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p); -tEplKernel PUBLIC EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p); +tEplKernel EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p); -tEplKernel PUBLIC EplSdoUdpuDelInstance(void); +tEplKernel EplSdoUdpuDelInstance(void); -tEplKernel PUBLIC EplSdoUdpuConfig(unsigned long ulIpAddr_p, - unsigned int uiPort_p); +tEplKernel EplSdoUdpuConfig(unsigned long ulIpAddr_p, + unsigned int uiPort_p); -tEplKernel PUBLIC EplSdoUdpuInitCon(tEplSdoConHdl * pSdoConHandle_p, - unsigned int uiTargetNodeId_p); +tEplKernel EplSdoUdpuInitCon(tEplSdoConHdl *pSdoConHandle_p, + unsigned int uiTargetNodeId_p); -tEplKernel PUBLIC EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, - tEplFrame * pSrcData_p, - DWORD dwDataSize_p); +tEplKernel EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, + tEplFrame *pSrcData_p, DWORD dwDataSize_p); -tEplKernel PUBLIC EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p); +tEplKernel EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p); #endif // end of #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) diff --git a/drivers/staging/epl/user/EplStatusu.h b/drivers/staging/epl/user/EplStatusu.h index d211935f0e83..6b98ff9b9636 100644 --- a/drivers/staging/epl/user/EplStatusu.h +++ b/drivers/staging/epl/user/EplStatusu.h @@ -81,24 +81,22 @@ // typedef //--------------------------------------------------------------------------- -typedef tEplKernel(PUBLIC * tEplStatusuCbResponse) (unsigned int uiNodeId_p, - tEplStatusResponse * - pStatusResponse_p); +typedef tEplKernel(* tEplStatusuCbResponse) (unsigned int uiNodeId_p, + tEplStatusResponse *pStatusResponse_p); //--------------------------------------------------------------------------- // function prototypes //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplStatusuInit(void); +tEplKernel EplStatusuInit(void); -tEplKernel PUBLIC EplStatusuAddInstance(void); +tEplKernel EplStatusuAddInstance(void); -tEplKernel PUBLIC EplStatusuDelInstance(void); +tEplKernel EplStatusuDelInstance(void); -tEplKernel PUBLIC EplStatusuReset(void); +tEplKernel EplStatusuReset(void); -tEplKernel PUBLIC EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, - tEplStatusuCbResponse - pfnCbResponse_p); +tEplKernel EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, + tEplStatusuCbResponse pfnCbResponse_p); #endif // #ifndef _EPLSTATUSU_H_ diff --git a/drivers/staging/epl/user/EplTimeru.h b/drivers/staging/epl/user/EplTimeru.h index 404495501b8d..65273e5f9c81 100644 --- a/drivers/staging/epl/user/EplTimeru.h +++ b/drivers/staging/epl/user/EplTimeru.h @@ -86,22 +86,22 @@ // function prototypes //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimeruInit(void); +tEplKernel EplTimeruInit(void); -tEplKernel PUBLIC EplTimeruAddInstance(void); +tEplKernel EplTimeruAddInstance(void); -tEplKernel PUBLIC EplTimeruDelInstance(void); +tEplKernel EplTimeruDelInstance(void); -tEplKernel PUBLIC EplTimeruSetTimerMs(tEplTimerHdl * pTimerHdl_p, - unsigned long ulTime_p, - tEplTimerArg Argument_p); +tEplKernel EplTimeruSetTimerMs(tEplTimerHdl *pTimerHdl_p, + unsigned long ulTime_p, + tEplTimerArg Argument_p); -tEplKernel PUBLIC EplTimeruModifyTimerMs(tEplTimerHdl * pTimerHdl_p, - unsigned long ulTime_p, - tEplTimerArg Argument_p); +tEplKernel EplTimeruModifyTimerMs(tEplTimerHdl *pTimerHdl_p, + unsigned long ulTime_p, + tEplTimerArg Argument_p); -tEplKernel PUBLIC EplTimeruDeleteTimer(tEplTimerHdl * pTimerHdl_p); +tEplKernel EplTimeruDeleteTimer(tEplTimerHdl *pTimerHdl_p); -BOOL PUBLIC EplTimeruIsTimerActive(tEplTimerHdl TimerHdl_p); +BOOL EplTimeruIsTimerActive(tEplTimerHdl TimerHdl_p); #endif // #ifndef _EPLTIMERU_H_ -- cgit v1.2.3-59-g8ed1b From 54e49dddd0983a1f4612e1843a2b193940a4e985 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 10:54:14 -0700 Subject: Staging: epl: remove _WIN_32_ and _NO_OS_ defines They are not used. Also remove the code that was looking for them. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Benchmark.h | 5 +- drivers/staging/epl/Debug.h | 21 ------- drivers/staging/epl/EplAmi.h | 11 +--- drivers/staging/epl/EplSdoUdpu.c | 128 +++------------------------------------ drivers/staging/epl/EplTarget.h | 79 ------------------------ drivers/staging/epl/ShbIpc.h | 11 +--- drivers/staging/epl/global.h | 2 - 7 files changed, 10 insertions(+), 247 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/Benchmark.h b/drivers/staging/epl/Benchmark.h index 62dee3b14373..634600fff320 100644 --- a/drivers/staging/epl/Benchmark.h +++ b/drivers/staging/epl/Benchmark.h @@ -73,10 +73,7 @@ #include "global.h" -#if (TARGET_SYSTEM == _NO_OS_) && (DEV_SYSTEM == _DEV_GNU_CF548X_) -#include "common.h" - -#elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) +#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) // #include #include diff --git a/drivers/staging/epl/Debug.h b/drivers/staging/epl/Debug.h index 05de9d541fd6..2761606b6887 100644 --- a/drivers/staging/epl/Debug.h +++ b/drivers/staging/epl/Debug.h @@ -163,25 +163,6 @@ #endif //--------------------------------------------------------------------------- -#if (DEV_SYSTEM == _DEV_WIN32_) && defined (TRACE_MSG) - - // For WIN32 the macro DEBUG_TRACE0 can be defined as function call TraceLvl() - // or as macro TRACE(). - // - // Here the parameter 'lvl' can be used with more than one - // debug-level (using OR). - // - // Example: DEBUG_TRACE1(DEBUG_LVL_30 | DEBUG_LVL_02, "Hello %d", bCount); - -#define DEBUG_TRACE0(lvl,str) TraceLvl((lvl),str) -#define DEBUG_TRACE1(lvl,str,p1) TraceLvl((lvl),str,p1) -#define DEBUG_TRACE2(lvl,str,p1,p2) TraceLvl((lvl),str,p1,p2) -#define DEBUG_TRACE3(lvl,str,p1,p2,p3) TraceLvl((lvl),str,p1,p2,p3) -#define DEBUG_TRACE4(lvl,str,p1,p2,p3,p4) TraceLvl((lvl),str,p1,p2,p3,p4) -#define DEBUG_GLB_LVL() dwDebugLevel_g - -#else - // At microcontrollers we do reduce the memory usage by deleting DEBUG_TRACE-lines // (compiler does delete the lines). // @@ -643,8 +624,6 @@ #define DEBUG_TRACE3(lvl,str,p1,p2,p3) lvl##_TRACE3(str,p1,p2,p3) #define DEBUG_TRACE4(lvl,str,p1,p2,p3,p4) lvl##_TRACE4(str,p1,p2,p3,p4) -#endif - //--------------------------------------------------------------------------- // The macro DEBUG_DUMP_DATA() can be used with the same debug-levels to dump // out data bytes. Function DumpData() has to be included. diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h index 04aeed68f4cb..04ceda43a915 100644 --- a/drivers/staging/epl/EplAmi.h +++ b/drivers/staging/epl/EplAmi.h @@ -104,16 +104,7 @@ extern "C" { #endif -#if (TARGET_SYSTEM == _WIN32_) -#if defined(INLINE_FUNCTION_DEF) -#undef INLINE_FUNCTION -#define INLINE_FUNCTION INLINE_FUNCTION_DEF -#define INLINE_ENABLED TRUE -#define EPL_AMI_INLINED -#include "../EplStack/amix86.c" -#endif - -#elif (TARGET_SYSTEM == _LINUX_) +#if (TARGET_SYSTEM == _LINUX_) #if defined(__m68k__) // it is an big endian machine #if defined(INLINE_FUNCTION_DEF) #undef INLINE_FUNCTION diff --git a/drivers/staging/epl/EplSdoUdpu.c b/drivers/staging/epl/EplSdoUdpu.c index 74fe25968e29..c6397df90455 100644 --- a/drivers/staging/epl/EplSdoUdpu.c +++ b/drivers/staging/epl/EplSdoUdpu.c @@ -110,12 +110,7 @@ typedef struct { tEplSequLayerReceiveCb m_fpSdoAsySeqCb; SOCKET m_UdpSocket; -#if (TARGET_SYSTEM == _WIN32_) - HANDLE m_ThreadHandle; - LPCRITICAL_SECTION m_pCriticalSection; - CRITICAL_SECTION m_CriticalSection; - -#elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) +#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) struct completion m_CompletionUdpThread; int m_ThreadHandle; int m_iTerminateThread; @@ -133,10 +128,7 @@ static tEplSdoUdpInstance SdoUdpInstance_g; // local function prototypes //--------------------------------------------------------------------------- -#if (TARGET_SYSTEM == _WIN32_) -static DWORD EplSdoUdpThread(LPVOID lpParameter); - -#elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) +#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) static int EplSdoUdpThread(void *pArg_p); #endif @@ -209,12 +201,6 @@ tEplKernel EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) { tEplKernel Ret; -#if (TARGET_SYSTEM == _WIN32_) - int iError; - WSADATA Wsa; - -#endif - // set instance variables to 0 EPL_MEMSET(&SdoUdpInstance_g, 0x00, sizeof(SdoUdpInstance_g)); @@ -228,20 +214,7 @@ tEplKernel EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) goto Exit; } -#if (TARGET_SYSTEM == _WIN32_) - // start winsock2 for win32 - // windows specific start of socket - iError = WSAStartup(MAKEWORD(2, 0), &Wsa); - if (iError != 0) { - Ret = kEplSdoUdpNoSocket; - goto Exit; - } - // create critical section for acccess of instnace variables - SdoUdpInstance_g.m_pCriticalSection = - &SdoUdpInstance_g.m_CriticalSection; - InitializeCriticalSection(SdoUdpInstance_g.m_pCriticalSection); - -#elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) +#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) init_completion(&SdoUdpInstance_g.m_CompletionUdpThread); SdoUdpInstance_g.m_iTerminateThread = 0; #endif @@ -277,22 +250,11 @@ tEplKernel EplSdoUdpuDelInstance(void) { tEplKernel Ret; -#if (TARGET_SYSTEM == _WIN32_) - BOOL fTermError; -#endif - Ret = kEplSuccessful; if (SdoUdpInstance_g.m_ThreadHandle != 0) { // listen thread was started // close thread -#if (TARGET_SYSTEM == _WIN32_) - fTermError = - TerminateThread(SdoUdpInstance_g.m_ThreadHandle, 0); - if (fTermError == FALSE) { - Ret = kEplSdoUdpThreadError; - goto Exit; - } -#elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) +#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) SdoUdpInstance_g.m_iTerminateThread = 1; /* kill_proc(SdoUdpInstance_g.m_ThreadHandle, SIGTERM, 1 ); */ send_sig(SIGTERM, SdoUdpInstance_g.m_ThreadHandle, 1); @@ -307,19 +269,6 @@ tEplKernel EplSdoUdpuDelInstance(void) closesocket(SdoUdpInstance_g.m_UdpSocket); SdoUdpInstance_g.m_UdpSocket = INVALID_SOCKET; } -#if (TARGET_SYSTEM == _WIN32_) - // delete critical section - DeleteCriticalSection(SdoUdpInstance_g.m_pCriticalSection); -#endif - -#if (TARGET_SYSTEM == _WIN32_) - // for win 32 - WSACleanup(); -#endif - -#if (TARGET_SYSTEM == _WIN32_) - Exit: -#endif return Ret; } @@ -346,11 +295,6 @@ tEplKernel EplSdoUdpuConfig(unsigned long ulIpAddr_p, unsigned int uiPort_p) struct sockaddr_in Addr; int iError; -#if (TARGET_SYSTEM == _WIN32_) - BOOL fTermError; - unsigned long ulThreadId; -#endif - Ret = kEplSuccessful; if (uiPort_p == 0) { // set UDP port to default port number @@ -363,14 +307,7 @@ tEplKernel EplSdoUdpuConfig(unsigned long ulIpAddr_p, unsigned int uiPort_p) if (SdoUdpInstance_g.m_ThreadHandle != 0) { // listen thread was started // close old thread -#if (TARGET_SYSTEM == _WIN32_) - fTermError = - TerminateThread(SdoUdpInstance_g.m_ThreadHandle, 0); - if (fTermError == FALSE) { - Ret = kEplSdoUdpThreadError; - goto Exit; - } -#elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) +#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) SdoUdpInstance_g.m_iTerminateThread = 1; /* kill_proc(SdoUdpInstance_g.m_ThreadHandle, SIGTERM, 1 ); */ send_sig(SIGTERM, SdoUdpInstance_g.m_ThreadHandle, 1); @@ -412,20 +349,7 @@ tEplKernel EplSdoUdpuConfig(unsigned long ulIpAddr_p, unsigned int uiPort_p) goto Exit; } // create Listen-Thread -#if (TARGET_SYSTEM == _WIN32_) - // for win32 - - // create thread - SdoUdpInstance_g.m_ThreadHandle = CreateThread(NULL, - 0, - EplSdoUdpThread, - &SdoUdpInstance_g, - 0, &ulThreadId); - if (SdoUdpInstance_g.m_ThreadHandle == NULL) { - Ret = kEplSdoUdpThreadError; - goto Exit; - } -#elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) +#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) SdoUdpInstance_g.m_ThreadHandle = kernel_thread(EplSdoUdpThread, &SdoUdpInstance_g, CLONE_KERNEL); @@ -552,22 +476,12 @@ tEplKernel EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, // call sendto Addr.sin_family = AF_INET; -#if (TARGET_SYSTEM == _WIN32_) - // enter critical section for process function - EnterCriticalSection(SdoUdpInstance_g.m_pCriticalSection); -#endif - Addr.sin_port = (unsigned short)SdoUdpInstance_g.m_aSdoAbsUdpConnection[uiArray]. m_uiPort; Addr.sin_addr.s_addr = SdoUdpInstance_g.m_aSdoAbsUdpConnection[uiArray].m_ulIpAddr; -#if (TARGET_SYSTEM == _WIN32_) - // leave critical section for process function - LeaveCriticalSection(SdoUdpInstance_g.m_pCriticalSection); -#endif - iError = sendto(SdoUdpInstance_g.m_UdpSocket, // sockethandle (const char *)&pSrcData_p->m_le_bMessageType, // data to send dwDataSize_p, // number of bytes to send @@ -647,11 +561,7 @@ tEplKernel EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p) // State: // //--------------------------------------------------------------------------- -#if (TARGET_SYSTEM == _WIN32_) -static DWORD EplSdoUdpThread(LPVOID lpParameter) -#elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) static int EplSdoUdpThread(void *pArg_p) -#endif { tEplSdoUdpInstance *pInstance; @@ -663,11 +573,7 @@ static int EplSdoUdpThread(void *pArg_p) unsigned int uiSize; tEplSdoConHdl SdoConHdl; -#if (TARGET_SYSTEM == _WIN32_) - pInstance = (tEplSdoUdpInstance *) lpParameter; - - for (;;) -#elif (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) +#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) pInstance = (tEplSdoUdpInstance *) pArg_p; daemonize("EplSdoUdpThread"); allow_signal(SIGTERM); @@ -693,11 +599,6 @@ static int EplSdoUdpThread(void *pArg_p) // get handle for higher layer iCount = 0; iFreeEntry = 0xFFFF; -#if (TARGET_SYSTEM == _WIN32_) - // enter critical section for process function - EnterCriticalSection(SdoUdpInstance_g. - m_pCriticalSection); -#endif while (iCount < EPL_SDO_MAX_CONNECTION_UDP) { // check if this connection is already known if ((pInstance->m_aSdoAbsUdpConnection[iCount]. @@ -733,11 +634,6 @@ static int EplSdoUdpThread(void *pArg_p) pInstance-> m_aSdoAbsUdpConnection[iFreeEntry]. m_uiPort = RemoteAddr.sin_port; -#if (TARGET_SYSTEM == _WIN32_) - // leave critical section for process function - LeaveCriticalSection(SdoUdpInstance_g. - m_pCriticalSection); -#endif // call callback SdoConHdl = iFreeEntry; SdoConHdl |= EPL_SDO_UDP_HANDLE; @@ -751,11 +647,6 @@ static int EplSdoUdpThread(void *pArg_p) } else { EPL_DBGLVL_SDO_TRACE0 ("Error in EplSdoUdpThread() no free handle\n"); -#if (TARGET_SYSTEM == _WIN32_) - // leave critical section for process function - LeaveCriticalSection(SdoUdpInstance_g. - m_pCriticalSection); -#endif } } else { @@ -763,11 +654,6 @@ static int EplSdoUdpThread(void *pArg_p) // call callback with correct handle SdoConHdl = iCount; SdoConHdl |= EPL_SDO_UDP_HANDLE; -#if (TARGET_SYSTEM == _WIN32_) - // leave critical section for process function - LeaveCriticalSection(SdoUdpInstance_g. - m_pCriticalSection); -#endif // offset 4 -> start of SDO Sequence header pInstance->m_fpSdoAsySeqCb(SdoConHdl, (tEplAsySdoSeq *) & diff --git a/drivers/staging/epl/EplTarget.h b/drivers/staging/epl/EplTarget.h index 462c6d0c0a16..6ee8d515942d 100644 --- a/drivers/staging/epl/EplTarget.h +++ b/drivers/staging/epl/EplTarget.h @@ -83,83 +83,6 @@ // applications needs to use one common library function (e.g. memcpy()). So // you can set (or change) it here. -#if (TARGET_SYSTEM == _WIN32_) - -#define _WIN32_WINDOWS 0x0401 -#define _WIN32_WINNT 0x0400 - -#include -#include - - //29.11.2004 f.j. sonst ist memcpy und memset unbekannt -#include - -#define EPL_MEMCPY(dst,src,siz) memcpy((void*)(dst),(const void*)(src),(size_t)(siz)); -#define EPL_MEMSET(dst,val,siz) memset((void*)(dst),(int)(val),(size_t)(siz)); - - // f.j.: die Funktionen für und sind in WinMem.c definiert - //definition der Prototypen -void FAR *MemAlloc(DWORD dwMemSize_p); -void MemFree(void FAR * pMem_p); - -#define EPL_MALLOC(siz) malloc((size_t)(siz)) -#define EPL_FREE(ptr) free((void *)ptr) - -#ifndef PRINTF0 -void trace(const char *fmt, ...); -#define PRINTF TRACE -#define PRINTF0(arg) TRACE0(arg) -#define PRINTF1(arg,p1) TRACE1(arg,p1) -#define PRINTF2(arg,p1,p2) TRACE2(arg,p1,p2) -#define PRINTF3(arg,p1,p2,p3) TRACE3(arg,p1,p2,p3) -#define PRINTF4(arg,p1,p2,p3,p4) TRACE4(arg,p1,p2,p3,p4) - //#define PRINTF printf - //#define PRINTF0(arg) PRINTF(arg) - //#define PRINTF1(arg,p1) PRINTF(arg,p1) - //#define PRINTF2(arg,p1,p2) PRINTF(arg,p1,p2) - //#define PRINTF3(arg,p1,p2,p3) PRINTF(arg,p1,p2,p3) - //#define PRINTF4(arg,p1,p2,p3,p4) PRINTF(arg,p1,p2,p3,p4) -#endif - -#ifdef ASSERTMSG -#undef ASSERTMSG -#endif - -#define ASSERTMSG(expr,string) if (!(expr)) { \ - MessageBox (NULL, string, "Assertion failed", MB_OK | MB_ICONERROR); \ - exit (-1);} - -#elif (TARGET_SYSTEM == _NO_OS_) - -#include -#include - - //29.11.2004 f.j. sonst ist memcpy und memset unbekannt -// #include - -#define EPL_MEMCPY(dst,src,siz) memcpy((void*)(dst),(const void*)(src),(size_t)(siz)); -#define EPL_MEMSET(dst,val,siz) memset((void*)(dst),(int)(val),(size_t)(siz)); - -#define EPL_MALLOC(siz) malloc((size_t)(siz)) -#define EPL_FREE(ptr) free((void *)ptr) - -#ifndef PRINTF0 -#define PRINTF TRACE -#define PRINTF0(arg) TRACE0(arg) -#define PRINTF1(arg,p1) TRACE1(arg,p1) -#define PRINTF2(arg,p1,p2) TRACE2(arg,p1,p2) -#define PRINTF3(arg,p1,p2,p3) TRACE3(arg,p1,p2,p3) -#define PRINTF4(arg,p1,p2,p3,p4) TRACE4(arg,p1,p2,p3,p4) - //#define PRINTF printf - //#define PRINTF0(arg) PRINTF(arg) - //#define PRINTF1(arg,p1) PRINTF(arg,p1) - //#define PRINTF2(arg,p1,p2) PRINTF(arg,p1,p2) - //#define PRINTF3(arg,p1,p2,p3) PRINTF(arg,p1,p2,p3) - //#define PRINTF4(arg,p1,p2,p3,p4) PRINTF(arg,p1,p2,p3,p4) -#endif - -#elif (TARGET_SYSTEM == _LINUX_) - #ifndef __KERNEL__ #include #include @@ -202,8 +125,6 @@ void trace(const char *fmt, ...); //#define PRINTF4(arg,p1,p2,p3,p4) PRINTF(arg,p1,p2,p3,p4) #endif -#endif - #define EPL_TGT_INTMASK_ETH 0x0001 // ethernet interrupt #define EPL_TGT_INTMASK_DMA 0x0002 // DMA interrupt diff --git a/drivers/staging/epl/ShbIpc.h b/drivers/staging/epl/ShbIpc.h index cad8846a0824..2f2993813161 100644 --- a/drivers/staging/epl/ShbIpc.h +++ b/drivers/staging/epl/ShbIpc.h @@ -65,16 +65,7 @@ typedef int (*tSigHndlrNewData) (tShbInstance pShbInstance_p); typedef void (*tSigHndlrJobReady) (tShbInstance pShbInstance_p, unsigned int fTimeOut_p); -#if (TARGET_SYSTEM == _WIN32_) -#if defined(INLINE_FUNCTION_DEF) -#undef INLINE_FUNCTION -#define INLINE_FUNCTION INLINE_FUNCTION_DEF -#define SHBIPC_INLINE_ENABLED TRUE -#define SHBIPC_INLINED -#include "ShbIpc-Win32.c" -#endif - -#elif (TARGET_SYSTEM == _LINUX_) +#if (TARGET_SYSTEM == _LINUX_) #if defined(INLINE_FUNCTION_DEF) #undef INLINE_FUNCTION #define INLINE_FUNCTION INLINE_FUNCTION_DEF diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 9cd6b890ee01..64654f7fd275 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -121,8 +121,6 @@ //--------------------------------------------------------------------------- // defines for target system (TARGET_SYSTEM) //--------------------------------------------------------------------------- -#define _WIN32_ 32 -#define _NO_OS_ 0 #define _LINUX_ 1 //--------------------------------------------------------------------------- -- cgit v1.2.3-59-g8ed1b From 563b125de36c91722f038f11da374d49de168917 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 11:14:48 -0700 Subject: Staging: epl: remove INLINE mess extern inline isn't the nicest and it doesn't really make sense. So unwind all the INLINE defines and includes, if speed is _really_ an issue later stuff can be put back in a sane manner. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/EplAmi.h | 21 ------- drivers/staging/epl/SharedBuff.c | 102 +++++++++++-------------------- drivers/staging/epl/SharedBuff.h | 17 ------ drivers/staging/epl/ShbIpc-LinuxKernel.c | 46 ++++---------- drivers/staging/epl/ShbIpc.h | 17 ------ drivers/staging/epl/amix86.c | 64 +++++++++---------- drivers/staging/epl/global.h | 13 ---- 7 files changed, 78 insertions(+), 202 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h index 04ceda43a915..296b0200e1f7 100644 --- a/drivers/staging/epl/EplAmi.h +++ b/drivers/staging/epl/EplAmi.h @@ -104,18 +104,6 @@ extern "C" { #endif -#if (TARGET_SYSTEM == _LINUX_) -#if defined(__m68k__) // it is an big endian machine -#if defined(INLINE_FUNCTION_DEF) -#undef INLINE_FUNCTION -#define INLINE_FUNCTION INLINE_FUNCTION_DEF -#define INLINE_ENABLED TRUE -#define EPL_AMI_INLINED -#include "../EplStack/amibe.c" -#endif -#endif -#endif - //--------------------------------------------------------------------------- // // write functions @@ -127,12 +115,10 @@ extern "C" { #define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} #define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} -#if !defined(INLINE_ENABLED) void AmiSetWordToBe(void FAR *pAddr_p, WORD wWordVal_p); void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p); void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p); void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); -#endif //--------------------------------------------------------------------------- // @@ -145,8 +131,6 @@ void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); #define AmiGetByteFromBe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) #define AmiGetByteFromLe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) -#if !defined(INLINE_ENABLED) - WORD AmiGetWordFromBe(void FAR *pAddr_p); DWORD AmiGetDwordFromBe(void FAR *pAddr_p); WORD AmiGetWordFromLe(void FAR *pAddr_p); @@ -337,11 +321,6 @@ void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p); //--------------------------------------------------------------------------- void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p); -#endif - -#undef INLINE_ENABLED // disable actual inlining of functions -#define EPL_AMI_INCLUDED - #ifdef __cplusplus } #endif diff --git a/drivers/staging/epl/SharedBuff.c b/drivers/staging/epl/SharedBuff.c index 9fb09d6bc28e..b69126cf6a78 100644 --- a/drivers/staging/epl/SharedBuff.c +++ b/drivers/staging/epl/SharedBuff.c @@ -88,6 +88,7 @@ // d.k. Linux kernel modules needs other header files for memcpy() #if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) #include +#include #else #include #include @@ -102,8 +103,6 @@ /* */ /***************************************************************************/ -#if (!defined(SHAREDBUFF_INLINED)) || defined(INLINE_ENABLED) - //--------------------------------------------------------------------------- // Configuration //--------------------------------------------------------------------------- @@ -177,7 +176,7 @@ typedef struct { // Get pointer to Circular Shared Buffer //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbCirBuff *ShbCirGetBuffer(tShbInstance pShbInstance_p) +tShbCirBuff *ShbCirGetBuffer(tShbInstance pShbInstance_p) { tShbCirBuff *pShbCirBuff; @@ -193,7 +192,7 @@ INLINE_FUNCTION tShbCirBuff *ShbCirGetBuffer(tShbInstance pShbInstance_p) // Get pointer to Linear Shared Buffer //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbLinBuff *ShbLinGetBuffer(tShbInstance pShbInstance_p) +tShbLinBuff *ShbLinGetBuffer(tShbInstance pShbInstance_p) { tShbLinBuff *pShbLinBuff; @@ -210,7 +209,6 @@ int ShbCirSignalHandlerNewData(tShbInstance pShbInstance_p); void ShbCirSignalHandlerReset(tShbInstance pShbInstance_p, unsigned int fTimeOut_p); -#endif //=========================================================================// // // @@ -218,7 +216,6 @@ void ShbCirSignalHandlerReset(tShbInstance pShbInstance_p, // // //=========================================================================// -#if !defined(INLINE_ENABLED) // not inlined external functions //--------------------------------------------------------------------------- @@ -363,18 +360,13 @@ tShbError ShbCirReleaseBuffer(tShbInstance pShbInstance_p) } -#endif // !defined(INLINE_ENABLED) - -#if (!defined(SHAREDBUFF_INLINED)) || defined(INLINE_ENABLED) - //--------------------------------------------------------------------------- // Reset Circular Shared Buffer //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbCirResetBuffer(tShbInstance pShbInstance_p, - unsigned long ulTimeOut_p, - tShbCirSigHndlrReset - pfnSignalHandlerReset_p) +tShbError ShbCirResetBuffer(tShbInstance pShbInstance_p, + unsigned long ulTimeOut_p, + tShbCirSigHndlrReset pfnSignalHandlerReset_p) { tShbCirBuff *pShbCirBuff; @@ -440,9 +432,9 @@ INLINE_FUNCTION tShbError ShbCirResetBuffer(tShbInstance pShbInstance_p, // Write data block to Circular Shared Buffer //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbCirWriteDataBlock(tShbInstance pShbInstance_p, - const void *pSrcDataBlock_p, - unsigned long ulDataBlockSize_p) +tShbError ShbCirWriteDataBlock(tShbInstance pShbInstance_p, + const void *pSrcDataBlock_p, + unsigned long ulDataBlockSize_p) { tShbCirBuff *pShbCirBuff; @@ -608,9 +600,9 @@ INLINE_FUNCTION tShbError ShbCirWriteDataBlock(tShbInstance pShbInstance_p, // Allocate block within the Circular Shared Buffer for chunk writing //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbCirAllocDataBlock(tShbInstance pShbInstance_p, - tShbCirChunk * pShbCirChunk_p, - unsigned long ulDataBufferSize_p) +tShbError ShbCirAllocDataBlock(tShbInstance pShbInstance_p, + tShbCirChunk * pShbCirChunk_p, + unsigned long ulDataBufferSize_p) { tShbCirBuff *pShbCirBuff; @@ -717,12 +709,11 @@ INLINE_FUNCTION tShbError ShbCirAllocDataBlock(tShbInstance pShbInstance_p, // Write data chunk into an allocated buffer of the Circular Shared Buffer //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbCirWriteDataChunk(tShbInstance pShbInstance_p, - tShbCirChunk * pShbCirChunk_p, - const void *pSrcDataChunk_p, - unsigned long ulDataChunkSize_p, - unsigned int - *pfBufferCompleted_p) +tShbError ShbCirWriteDataChunk(tShbInstance pShbInstance_p, + tShbCirChunk *pShbCirChunk_p, + const void *pSrcDataChunk_p, + unsigned long ulDataChunkSize_p, + unsigned int *pfBufferCompleted_p) { tShbCirBuff *pShbCirBuff; @@ -857,10 +848,10 @@ INLINE_FUNCTION tShbError ShbCirWriteDataChunk(tShbInstance pShbInstance_p, // Read data block from Circular Shared Buffer //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbCirReadDataBlock(tShbInstance pShbInstance_p, - void *pDstDataBlock_p, - unsigned long ulRdBuffSize_p, - unsigned long *pulDataBlockSize_p) +tShbError ShbCirReadDataBlock(tShbInstance pShbInstance_p, + void *pDstDataBlock_p, + unsigned long ulRdBuffSize_p, + unsigned long *pulDataBlockSize_p) { tShbCirBuff *pShbCirBuff; @@ -1009,9 +1000,8 @@ INLINE_FUNCTION tShbError ShbCirReadDataBlock(tShbInstance pShbInstance_p, // Get data size of next readable block from Circular Shared Buffer //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbCirGetReadDataSize(tShbInstance pShbInstance_p, - unsigned long - *pulDataBlockSize_p) +tShbError ShbCirGetReadDataSize(tShbInstance pShbInstance_p, + unsigned long *pulDataBlockSize_p) { tShbCirBuff *pShbCirBuff; @@ -1070,9 +1060,8 @@ INLINE_FUNCTION tShbError ShbCirGetReadDataSize(tShbInstance pShbInstance_p, // Get number of readable blocks from Circular Shared Buffer //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbCirGetReadBlockCount(tShbInstance pShbInstance_p, - unsigned long - *pulDataBlockCount_p) +tShbError ShbCirGetReadBlockCount(tShbInstance pShbInstance_p, + unsigned long *pulDataBlockCount_p) { tShbCirBuff *pShbCirBuff; @@ -1113,12 +1102,9 @@ INLINE_FUNCTION tShbError ShbCirGetReadBlockCount(tShbInstance pShbInstance_p, // d.k.: new parameter priority as enum //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbCirSetSignalHandlerNewData(tShbInstance - pShbInstance_p, - tShbCirSigHndlrNewData - pfnSignalHandlerNewData_p, - tShbPriority - ShbPriority_p) +tShbError ShbCirSetSignalHandlerNewData(tShbInstance pShbInstance_p, + tShbCirSigHndlrNewData pfnSignalHandlerNewData_p, + tShbPriority ShbPriority_p) { tShbCirBuff *pShbCirBuff; @@ -1165,10 +1151,6 @@ INLINE_FUNCTION tShbError ShbCirSetSignalHandlerNewData(tShbInstance } -#endif - -#if !defined(INLINE_ENABLED) - //--------------------------------------------------------------------------- // DEBUG: Trace Circular Shared Buffer //--------------------------------------------------------------------------- @@ -1413,18 +1395,13 @@ tShbError ShbLinReleaseBuffer(tShbInstance pShbInstance_p) } -#endif // !defined(INLINE_ENABLED) - -#if (!defined(SHAREDBUFF_INLINED)) || defined(INLINE_ENABLED) - //--------------------------------------------------------------------------- // Write data block to Linear Shared Buffer //--------------------------------------------------------------------------- - -INLINE_FUNCTION tShbError ShbLinWriteDataBlock(tShbInstance pShbInstance_p, - unsigned long ulDstBufferOffs_p, - const void *pSrcDataBlock_p, - unsigned long ulDataBlockSize_p) +tShbError ShbLinWriteDataBlock(tShbInstance pShbInstance_p, + unsigned long ulDstBufferOffs_p, + const void *pSrcDataBlock_p, + unsigned long ulDataBlockSize_p) { tShbLinBuff *pShbLinBuff; @@ -1489,11 +1466,10 @@ INLINE_FUNCTION tShbError ShbLinWriteDataBlock(tShbInstance pShbInstance_p, //--------------------------------------------------------------------------- // Read data block from Linear Shared Buffer //--------------------------------------------------------------------------- - -INLINE_FUNCTION tShbError ShbLinReadDataBlock(tShbInstance pShbInstance_p, - void *pDstDataBlock_p, - unsigned long ulSrcBufferOffs_p, - unsigned long ulDataBlockSize_p) +tShbError ShbLinReadDataBlock(tShbInstance pShbInstance_p, + void *pDstDataBlock_p, + unsigned long ulSrcBufferOffs_p, + unsigned long ulDataBlockSize_p) { tShbLinBuff *pShbLinBuff; @@ -1555,10 +1531,6 @@ INLINE_FUNCTION tShbError ShbLinReadDataBlock(tShbInstance pShbInstance_p, } -#endif - -#if !defined(INLINE_ENABLED) - //--------------------------------------------------------------------------- // DEBUG: Trace Linear Shared Buffer //--------------------------------------------------------------------------- @@ -1794,6 +1766,4 @@ void ShbCirSignalHandlerReset(tShbInstance pShbInstance_p, } -#endif - // EOF diff --git a/drivers/staging/epl/SharedBuff.h b/drivers/staging/epl/SharedBuff.h index 0ec1b4b9e6ae..4edbd0b2bd5a 100644 --- a/drivers/staging/epl/SharedBuff.h +++ b/drivers/staging/epl/SharedBuff.h @@ -110,15 +110,6 @@ typedef void (*tShbCirSigHndlrReset) (tShbInstance pShbInstance_p, extern "C" { #endif -/*#if defined(INLINE_FUNCTION_DEF) - #undef INLINE_FUNCTION - #define INLINE_FUNCTION INLINE_FUNCTION_DEF - #define INLINE_ENABLED TRUE - #define SHAREDBUFF_INLINED - #include "SharedBuff.c" -#endif -*/ - tShbError ShbInit(void); tShbError ShbExit(void); @@ -129,7 +120,6 @@ extern "C" { unsigned int *pfShbNewCreated_p); tShbError ShbCirReleaseBuffer(tShbInstance pShbInstance_p); -#if !defined(INLINE_ENABLED) tShbError ShbCirResetBuffer(tShbInstance pShbInstance_p, unsigned long ulTimeOut_p, @@ -159,7 +149,6 @@ extern "C" { pfnShbSignalHandlerNewData_p, tShbPriority ShbPriority_p); -#endif // Linear Shared Buffer tShbError ShbLinAllocBuffer(unsigned long ulBufferSize_p, @@ -168,7 +157,6 @@ extern "C" { unsigned int *pfShbNewCreated_p); tShbError ShbLinReleaseBuffer(tShbInstance pShbInstance_p); -#if !defined(INLINE_ENABLED) tShbError ShbLinWriteDataBlock(tShbInstance pShbInstance_p, unsigned long ulDstBufferOffs_p, @@ -179,7 +167,6 @@ extern "C" { unsigned long ulSrcBufferOffs_p, unsigned long ulDataBlockSize_p); -#endif #ifndef NDEBUG tShbError ShbCirTraceBuffer(tShbInstance pShbInstance_p); @@ -194,10 +181,6 @@ extern "C" { #define ShbTraceDump(p0, p1, p2, p3) #endif -#undef INLINE_ENABLED // disable actual inlining of functions -#undef INLINE_FUNCTION -#define INLINE_FUNCTION // define INLINE_FUNCTION to nothing - #ifdef __cplusplus } #endif diff --git a/drivers/staging/epl/ShbIpc-LinuxKernel.c b/drivers/staging/epl/ShbIpc-LinuxKernel.c index 1d3cb3f13de1..6ffe41008d3c 100644 --- a/drivers/staging/epl/ShbIpc-LinuxKernel.c +++ b/drivers/staging/epl/ShbIpc-LinuxKernel.c @@ -79,8 +79,6 @@ /* */ /***************************************************************************/ -#if (!defined(SHBIPC_INLINED)) || defined(SHBIPC_INLINE_ENABLED) - //--------------------------------------------------------------------------- // Configuration //--------------------------------------------------------------------------- @@ -211,13 +209,11 @@ static inline tShbMemHeader *ShbIpcGetShbMemHeader(tShbMemInst * pShbMemInst_p) // not inlined internal functions int ShbIpcThreadSignalNewData(void *pvThreadParam_p); int ShbIpcThreadSignalJobReady(void *pvThreadParam_p); -#endif //--------------------------------------------------------------------------- // modul globale vars //--------------------------------------------------------------------------- -#if !defined(SHBIPC_INLINE_ENABLED) struct sShbMemTable *psMemTableElementFirst_g; static void *ShbIpcAllocPrivateMem(unsigned long ulMemSize_p); @@ -230,7 +226,6 @@ static void ShbIpcCrc32GenTable(unsigned long aulCrcTable[256]); static unsigned long ShbIpcCrc32GetCrc(const char *pcString, unsigned long aulCrcTable[256]); -#endif //=========================================================================// // // @@ -238,7 +233,6 @@ static unsigned long ShbIpcCrc32GetCrc(const char *pcString, // // //=========================================================================// -#if !defined(SHBIPC_INLINE_ENABLED) // not inlined external functions //--------------------------------------------------------------------------- @@ -433,15 +427,11 @@ tShbError ShbIpcReleaseBuffer(tShbInstance pShbInstance_p) return (ShbError); } -#endif // !defined(SHBIPC_INLINE_ENABLED) - -#if (!defined(SHBIPC_INLINED)) || defined(SHBIPC_INLINE_ENABLED) - //--------------------------------------------------------------------------- // Enter atomic section for Shared Buffer access //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbIpcEnterAtomicSection(tShbInstance pShbInstance_p) +tShbError ShbIpcEnterAtomicSection(tShbInstance pShbInstance_p) { tShbMemInst *pShbMemInst; @@ -469,7 +459,7 @@ INLINE_FUNCTION tShbError ShbIpcEnterAtomicSection(tShbInstance pShbInstance_p) // Leave atomic section for Shared Buffer access //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbIpcLeaveAtomicSection(tShbInstance pShbInstance_p) +tShbError ShbIpcLeaveAtomicSection(tShbInstance pShbInstance_p) { tShbMemInst *pShbMemInst; @@ -496,12 +486,9 @@ INLINE_FUNCTION tShbError ShbIpcLeaveAtomicSection(tShbInstance pShbInstance_p) // Start signaling of new data (called from reading process) //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbIpcStartSignalingNewData(tShbInstance - pShbInstance_p, - tSigHndlrNewData - pfnSignalHandlerNewData_p, - tShbPriority - ShbPriority_p) +tShbError ShbIpcStartSignalingNewData(tShbInstance pShbInstance_p, + tSigHndlrNewData pfnSignalHandlerNewData_p, + tShbPriority ShbPriority_p) { tShbMemInst *pShbMemInst; tShbMemHeader *pShbMemHeader; @@ -557,8 +544,7 @@ INLINE_FUNCTION tShbError ShbIpcStartSignalingNewData(tShbInstance // Stop signaling of new data (called from reading process) //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbIpcStopSignalingNewData(tShbInstance - pShbInstance_p) +tShbError ShbIpcStopSignalingNewData(tShbInstance pShbInstance_p) { tShbMemInst *pShbMemInst; tShbMemHeader *pShbMemHeader; @@ -604,7 +590,7 @@ INLINE_FUNCTION tShbError ShbIpcStopSignalingNewData(tShbInstance // Signal new data (called from writing process) //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbIpcSignalNewData(tShbInstance pShbInstance_p) +tShbError ShbIpcSignalNewData(tShbInstance pShbInstance_p) { tShbMemHeader *pShbMemHeader; @@ -625,12 +611,9 @@ INLINE_FUNCTION tShbError ShbIpcSignalNewData(tShbInstance pShbInstance_p) // Start signaling for job ready (called from waiting process) //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbIpcStartSignalingJobReady(tShbInstance - pShbInstance_p, - unsigned long - ulTimeOut_p, - tSigHndlrJobReady - pfnSignalHandlerJobReady_p) +tShbError ShbIpcStartSignalingJobReady(tShbInstance pShbInstance_p, + unsigned long ulTimeOut_p, + tSigHndlrJobReady pfnSignalHandlerJobReady_p) { tShbMemInst *pShbMemInst; tShbMemHeader *pShbMemHeader; @@ -663,7 +646,7 @@ INLINE_FUNCTION tShbError ShbIpcStartSignalingJobReady(tShbInstance // Signal job ready (called from executing process) //--------------------------------------------------------------------------- -INLINE_FUNCTION tShbError ShbIpcSignalJobReady(tShbInstance pShbInstance_p) +tShbError ShbIpcSignalJobReady(tShbInstance pShbInstance_p) { tShbMemHeader *pShbMemHeader; @@ -685,7 +668,7 @@ INLINE_FUNCTION tShbError ShbIpcSignalJobReady(tShbInstance pShbInstance_p) // Get pointer to common used share memory area //--------------------------------------------------------------------------- -INLINE_FUNCTION void *ShbIpcGetShMemPtr(tShbInstance pShbInstance_p) +void *ShbIpcGetShMemPtr(tShbInstance pShbInstance_p) { tShbMemHeader *pShbMemHeader; @@ -703,16 +686,12 @@ INLINE_FUNCTION void *ShbIpcGetShMemPtr(tShbInstance pShbInstance_p) } -#endif - //=========================================================================// // // // P R I V A T E F U N C T I O N S // // // //=========================================================================// -#if !defined(SHBIPC_INLINE_ENABLED) - //--------------------------------------------------------------------------- // Get pointer to process local information structure //--------------------------------------------------------------------------- @@ -963,4 +942,3 @@ static void ShbIpcDeleteListElement(int iBufferId) } -#endif diff --git a/drivers/staging/epl/ShbIpc.h b/drivers/staging/epl/ShbIpc.h index 2f2993813161..285f096e771f 100644 --- a/drivers/staging/epl/ShbIpc.h +++ b/drivers/staging/epl/ShbIpc.h @@ -65,16 +65,6 @@ typedef int (*tSigHndlrNewData) (tShbInstance pShbInstance_p); typedef void (*tSigHndlrJobReady) (tShbInstance pShbInstance_p, unsigned int fTimeOut_p); -#if (TARGET_SYSTEM == _LINUX_) -#if defined(INLINE_FUNCTION_DEF) -#undef INLINE_FUNCTION -#define INLINE_FUNCTION INLINE_FUNCTION_DEF -#define SHBIPC_INLINE_ENABLED TRUE -#define SHBIPC_INLINED -#include "ShbIpc-LinuxKernel.c" -#endif -#endif - //--------------------------------------------------------------------------- // Prototypes //--------------------------------------------------------------------------- @@ -88,8 +78,6 @@ tShbError ShbIpcAllocBuffer(unsigned long ulBufferSize_p, unsigned int *pfShbNewCreated_p); tShbError ShbIpcReleaseBuffer(tShbInstance pShbInstance_p); -#if !defined(SHBIPC_INLINE_ENABLED) - tShbError ShbIpcEnterAtomicSection(tShbInstance pShbInstance_p); tShbError ShbIpcLeaveAtomicSection(tShbInstance pShbInstance_p); @@ -107,10 +95,5 @@ tShbError ShbIpcStartSignalingJobReady(tShbInstance pShbInstance_p, tShbError ShbIpcSignalJobReady(tShbInstance pShbInstance_p); void *ShbIpcGetShMemPtr(tShbInstance pShbInstance_p); -#endif - -#undef SHBIPC_INLINE_ENABLED // disable actual inlining of functions -#undef INLINE_FUNCTION -#define INLINE_FUNCTION // define INLINE_FUNCTION to nothing #endif // #ifndef _SHBIPC_H_ diff --git a/drivers/staging/epl/amix86.c b/drivers/staging/epl/amix86.c index a2e54b6755ad..67a49dab2bb8 100644 --- a/drivers/staging/epl/amix86.c +++ b/drivers/staging/epl/amix86.c @@ -74,8 +74,6 @@ //#include "EplAmi.h" #include "EplInc.h" -#if (!defined(EPL_AMI_INLINED)) || defined(INLINE_ENABLED) - //--------------------------------------------------------------------------- // typedef //--------------------------------------------------------------------------- @@ -129,7 +127,7 @@ void AmiSetByteToBe (void FAR* pAddr_p, BYTE bByteVal_p) //------------< write WORD in big endian >-------------------------- -INLINE_FUNCTION void AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p) +void AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p) { twStruct FAR *pwStruct; twStruct wValue; @@ -144,7 +142,7 @@ INLINE_FUNCTION void AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p) //------------< write DWORD in big endian >------------------------- -INLINE_FUNCTION void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) { tdwStruct FAR *pdwStruct; tdwStruct dwValue; @@ -187,7 +185,7 @@ void AmiSetByteToLe (void FAR* pAddr_p, BYTE bByteVal_p) //------------< write WORD in little endian >-------------------------- -INLINE_FUNCTION void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p) +void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p) { twStruct FAR *pwStruct; @@ -198,7 +196,7 @@ INLINE_FUNCTION void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p) //------------< write DWORD in little endian >------------------------- -INLINE_FUNCTION void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) { tdwStruct FAR *pdwStruct; @@ -234,7 +232,7 @@ BYTE AmiGetByteFromBe (void FAR* pAddr_p) //------------< read WORD in big endian >--------------------------- -INLINE_FUNCTION WORD AmiGetWordFromBe(void FAR *pAddr_p) +WORD AmiGetWordFromBe(void FAR *pAddr_p) { twStruct FAR *pwStruct; twStruct wValue; @@ -250,7 +248,7 @@ INLINE_FUNCTION WORD AmiGetWordFromBe(void FAR *pAddr_p) //------------< read DWORD in big endian >-------------------------- -INLINE_FUNCTION DWORD AmiGetDwordFromBe(void FAR *pAddr_p) +DWORD AmiGetDwordFromBe(void FAR *pAddr_p) { tdwStruct FAR *pdwStruct; tdwStruct dwValue; @@ -293,7 +291,7 @@ BYTE AmiGetByteFromLe (void FAR* pAddr_p) //------------< read WORD in little endian >--------------------------- -INLINE_FUNCTION WORD AmiGetWordFromLe(void FAR *pAddr_p) +WORD AmiGetWordFromLe(void FAR *pAddr_p) { twStruct FAR *pwStruct; @@ -303,7 +301,7 @@ INLINE_FUNCTION WORD AmiGetWordFromLe(void FAR *pAddr_p) //------------< read DWORD in little endian >-------------------------- -INLINE_FUNCTION DWORD AmiGetDwordFromLe(void FAR *pAddr_p) +DWORD AmiGetDwordFromLe(void FAR *pAddr_p) { tdwStruct FAR *pdwStruct; @@ -326,7 +324,7 @@ INLINE_FUNCTION DWORD AmiGetDwordFromLe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) { ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[2]; ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; @@ -348,7 +346,7 @@ INLINE_FUNCTION void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) { ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[0]; ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; @@ -368,7 +366,7 @@ INLINE_FUNCTION void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) // State: not tested // //--------------------------------------------------------------------------- -INLINE_FUNCTION DWORD AmiGetDword24FromBe(void FAR *pAddr_p) +DWORD AmiGetDword24FromBe(void FAR *pAddr_p) { tdwStruct dwStruct; @@ -391,7 +389,7 @@ INLINE_FUNCTION DWORD AmiGetDword24FromBe(void FAR *pAddr_p) // State: not tested // //--------------------------------------------------------------------------- -INLINE_FUNCTION DWORD AmiGetDword24FromLe(void FAR *pAddr_p) +DWORD AmiGetDword24FromLe(void FAR *pAddr_p) { tdwStruct dwStruct; @@ -417,7 +415,7 @@ INLINE_FUNCTION DWORD AmiGetDword24FromLe(void FAR *pAddr_p) // State: not tested // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[7]; ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[6]; @@ -443,7 +441,7 @@ INLINE_FUNCTION void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) // State: not tested // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) { QWORD FAR *pqwDst; @@ -464,7 +462,7 @@ INLINE_FUNCTION void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) // State: not tested // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD AmiGetQword64FromBe(void FAR *pAddr_p) +QWORD AmiGetQword64FromBe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -493,7 +491,7 @@ INLINE_FUNCTION QWORD AmiGetQword64FromBe(void FAR *pAddr_p) // State: not tested // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD AmiGetQword64FromLe(void FAR *pAddr_p) +QWORD AmiGetQword64FromLe(void FAR *pAddr_p) { tqwStruct FAR *pqwStruct; tqwStruct qwStruct; @@ -519,7 +517,7 @@ INLINE_FUNCTION QWORD AmiGetQword64FromLe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[4]; @@ -545,7 +543,7 @@ INLINE_FUNCTION void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; @@ -567,7 +565,7 @@ INLINE_FUNCTION void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD AmiGetQword40FromBe(void FAR *pAddr_p) +QWORD AmiGetQword40FromBe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -593,7 +591,7 @@ INLINE_FUNCTION QWORD AmiGetQword40FromBe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD AmiGetQword40FromLe(void FAR *pAddr_p) +QWORD AmiGetQword40FromLe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -620,7 +618,7 @@ INLINE_FUNCTION QWORD AmiGetQword40FromLe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[5]; @@ -647,7 +645,7 @@ INLINE_FUNCTION void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; @@ -669,7 +667,7 @@ INLINE_FUNCTION void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD AmiGetQword48FromBe(void FAR *pAddr_p) +QWORD AmiGetQword48FromBe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -695,7 +693,7 @@ INLINE_FUNCTION QWORD AmiGetQword48FromBe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD AmiGetQword48FromLe(void FAR *pAddr_p) +QWORD AmiGetQword48FromLe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -722,7 +720,7 @@ INLINE_FUNCTION QWORD AmiGetQword48FromLe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[6]; @@ -750,7 +748,7 @@ INLINE_FUNCTION void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) { ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; @@ -773,7 +771,7 @@ INLINE_FUNCTION void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD AmiGetQword56FromBe(void FAR *pAddr_p) +QWORD AmiGetQword56FromBe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -799,7 +797,7 @@ INLINE_FUNCTION QWORD AmiGetQword56FromBe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION QWORD AmiGetQword56FromLe(void FAR *pAddr_p) +QWORD AmiGetQword56FromLe(void FAR *pAddr_p) { tqwStruct qwStruct; @@ -826,7 +824,7 @@ INLINE_FUNCTION QWORD AmiGetQword56FromLe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) +void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) { AmiSetDwordToLe(((BYTE FAR *) pAddr_p), @@ -850,7 +848,7 @@ INLINE_FUNCTION void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfD // //--------------------------------------------------------------------------- -INLINE_FUNCTION void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) +void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) { pTimeOfDay_p->m_dwMs = @@ -859,8 +857,6 @@ INLINE_FUNCTION void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfD } -#endif - // EOF // Die letzte Zeile muß unbedingt eine leere Zeile sein, weil manche Compiler diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 64654f7fd275..d882f2f52707 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -127,24 +127,11 @@ // definitions for function inlining //--------------------------------------------------------------------------- -#define INLINE_FUNCTION // empty define -#undef INLINE_ENABLED // disable actual inlining of functions -#undef INLINE_FUNCTION_DEF // disable inlining for all compilers per default - - #define LINUX_SYSTEM // define 'LINUX_SYSTEM' uniform for all Linux based systems // r.d.: We will need an other solution here! There are two sections here which do check the preproc-definitions: // LINUX and __linux__ . The first one was Linux for PC, the second one is this section for embedded Linux (MCF5xxx). // But Linux for PC does not need the definitions for embedded Linux. - // GNU C compiler supports function inlining -#define INLINE_FUNCTION_DEF extern inline - - // to actually enable inlining just include the following three lines - // #undef INLINE_FUNCTION - // #define INLINE_FUNCTION INLINE_FUNCTION_DEF - // #define INLINE_ENABLED TRUE - #define TARGET_SYSTEM _LINUX_ // Linux definition #define DEV_SYSTEM _DEV_LINUX_ -- cgit v1.2.3-59-g8ed1b From 541a8bde90068471e9fc26cfe4c5fcb11dcd751b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 11:19:28 -0700 Subject: Staging: epl: remove __KERNEL__ checks We are in the kernel, so these checks are pointless. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Benchmark.h | 9 --------- drivers/staging/epl/EplApiProcessImage.c | 21 +-------------------- drivers/staging/epl/EplSdoUdpu.c | 26 -------------------------- drivers/staging/epl/EplTarget.h | 11 ----------- drivers/staging/epl/SharedBuff.c | 7 ------- drivers/staging/epl/global.h | 7 ------- 6 files changed, 1 insertion(+), 80 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/Benchmark.h b/drivers/staging/epl/Benchmark.h index 634600fff320..4cc01bd12a1a 100644 --- a/drivers/staging/epl/Benchmark.h +++ b/drivers/staging/epl/Benchmark.h @@ -73,9 +73,6 @@ #include "global.h" -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) - -// #include #include #ifdef CONFIG_COLDFIRE @@ -90,12 +87,6 @@ #define BENCHMARK_MODULES 0x00000000 #endif -#else - // disable Benchmarking -#undef BENCHMARK_MODULES -#define BENCHMARK_MODULES 0x00000000 -#endif - /***************************************************************************/ /* */ /* */ diff --git a/drivers/staging/epl/EplApiProcessImage.c b/drivers/staging/epl/EplApiProcessImage.c index 4fbb7289e0bf..869d97a4bd1c 100644 --- a/drivers/staging/epl/EplApiProcessImage.c +++ b/drivers/staging/epl/EplApiProcessImage.c @@ -69,11 +69,8 @@ ****************************************************************************/ #include "Epl.h" -//#include "kernel/EplPdokCal.h" -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) -#include -#endif +#include /***************************************************************************/ /* */ @@ -285,19 +282,11 @@ tEplKernel EplApiProcessImageExchangeIn(tEplApiProcessImage *pPI_p) tEplKernel Ret = kEplSuccessful; #if EPL_API_PROCESS_IMAGE_SIZE_IN > 0 -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) copy_to_user(pPI_p->m_pImage, EplApiProcessImageInstance_g.m_abProcessImageInput, min(pPI_p->m_uiSize, sizeof(EplApiProcessImageInstance_g. m_abProcessImageInput))); -#else - EPL_MEMCPY(pPI_p->m_pImage, - EplApiProcessImageInstance_g.m_abProcessImageInput, - min(pPI_p->m_uiSize, - sizeof(EplApiProcessImageInstance_g. - m_abProcessImageInput))); -#endif #endif return Ret; @@ -320,19 +309,11 @@ tEplKernel EplApiProcessImageExchangeOut(tEplApiProcessImage *pPI_p) tEplKernel Ret = kEplSuccessful; #if EPL_API_PROCESS_IMAGE_SIZE_OUT > 0 -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) copy_from_user(EplApiProcessImageInstance_g.m_abProcessImageOutput, pPI_p->m_pImage, min(pPI_p->m_uiSize, sizeof(EplApiProcessImageInstance_g. m_abProcessImageOutput))); -#else - EPL_MEMCPY(EplApiProcessImageInstance_g.m_abProcessImageOutput, - pPI_p->m_pImage, - min(pPI_p->m_uiSize, - sizeof(EplApiProcessImageInstance_g. - m_abProcessImageOutput))); -#endif #endif return Ret; diff --git a/drivers/staging/epl/EplSdoUdpu.c b/drivers/staging/epl/EplSdoUdpu.c index c6397df90455..293e60fc4de7 100644 --- a/drivers/staging/epl/EplSdoUdpu.c +++ b/drivers/staging/epl/EplSdoUdpu.c @@ -72,11 +72,9 @@ #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) #include "SocketLinuxKernel.h" #include #include -#endif /***************************************************************************/ /* */ @@ -110,12 +108,9 @@ typedef struct { tEplSequLayerReceiveCb m_fpSdoAsySeqCb; SOCKET m_UdpSocket; -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) struct completion m_CompletionUdpThread; int m_ThreadHandle; int m_iTerminateThread; -#endif - } tEplSdoUdpInstance; //--------------------------------------------------------------------------- @@ -128,9 +123,7 @@ static tEplSdoUdpInstance SdoUdpInstance_g; // local function prototypes //--------------------------------------------------------------------------- -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) static int EplSdoUdpThread(void *pArg_p); -#endif /***************************************************************************/ /* */ @@ -214,11 +207,8 @@ tEplKernel EplSdoUdpuAddInstance(tEplSequLayerReceiveCb fpReceiveCb_p) goto Exit; } -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) init_completion(&SdoUdpInstance_g.m_CompletionUdpThread); SdoUdpInstance_g.m_iTerminateThread = 0; -#endif - SdoUdpInstance_g.m_ThreadHandle = 0; SdoUdpInstance_g.m_UdpSocket = INVALID_SOCKET; @@ -254,13 +244,10 @@ tEplKernel EplSdoUdpuDelInstance(void) if (SdoUdpInstance_g.m_ThreadHandle != 0) { // listen thread was started // close thread -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) SdoUdpInstance_g.m_iTerminateThread = 1; /* kill_proc(SdoUdpInstance_g.m_ThreadHandle, SIGTERM, 1 ); */ send_sig(SIGTERM, SdoUdpInstance_g.m_ThreadHandle, 1); wait_for_completion(&SdoUdpInstance_g.m_CompletionUdpThread); -#endif - SdoUdpInstance_g.m_ThreadHandle = 0; } @@ -307,14 +294,11 @@ tEplKernel EplSdoUdpuConfig(unsigned long ulIpAddr_p, unsigned int uiPort_p) if (SdoUdpInstance_g.m_ThreadHandle != 0) { // listen thread was started // close old thread -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) SdoUdpInstance_g.m_iTerminateThread = 1; /* kill_proc(SdoUdpInstance_g.m_ThreadHandle, SIGTERM, 1 ); */ send_sig(SIGTERM, SdoUdpInstance_g.m_ThreadHandle, 1); wait_for_completion(&SdoUdpInstance_g.m_CompletionUdpThread); SdoUdpInstance_g.m_iTerminateThread = 0; -#endif - SdoUdpInstance_g.m_ThreadHandle = 0; } @@ -349,15 +333,12 @@ tEplKernel EplSdoUdpuConfig(unsigned long ulIpAddr_p, unsigned int uiPort_p) goto Exit; } // create Listen-Thread -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) - SdoUdpInstance_g.m_ThreadHandle = kernel_thread(EplSdoUdpThread, &SdoUdpInstance_g, CLONE_KERNEL); if (SdoUdpInstance_g.m_ThreadHandle == 0) { Ret = kEplSdoUdpThreadError; goto Exit; } -#endif Exit: return Ret; @@ -573,13 +554,11 @@ static int EplSdoUdpThread(void *pArg_p) unsigned int uiSize; tEplSdoConHdl SdoConHdl; -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) pInstance = (tEplSdoUdpInstance *) pArg_p; daemonize("EplSdoUdpThread"); allow_signal(SIGTERM); for (; pInstance->m_iTerminateThread == 0;) -#endif { // wait for data @@ -590,11 +569,9 @@ static int EplSdoUdpThread(void *pArg_p) 0, // flags (struct sockaddr *)&RemoteAddr, (int *)&uiSize); -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) if (iError == -ERESTARTSYS) { break; } -#endif if (iError > 0) { // get handle for higher layer iCount = 0; @@ -663,10 +640,7 @@ static int EplSdoUdpThread(void *pArg_p) } // end of if(iError!=SOCKET_ERROR) } // end of for(;;) -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) complete_and_exit(&SdoUdpInstance_g.m_CompletionUdpThread, 0); -#endif - return 0; } diff --git a/drivers/staging/epl/EplTarget.h b/drivers/staging/epl/EplTarget.h index 6ee8d515942d..0e6da2105458 100644 --- a/drivers/staging/epl/EplTarget.h +++ b/drivers/staging/epl/EplTarget.h @@ -83,18 +83,12 @@ // applications needs to use one common library function (e.g. memcpy()). So // you can set (or change) it here. -#ifndef __KERNEL__ -#include -#include -#else -// #include #include #include #include #include #include #include -#endif //29.11.2004 f.j. sonst ist memcpy und memset unbekannt // #include @@ -102,13 +96,8 @@ #define EPL_MEMCPY(dst,src,siz) memcpy((void*)(dst),(const void*)(src),(size_t)(siz)); #define EPL_MEMSET(dst,val,siz) memset((void*)(dst),(int)(val),(size_t)(siz)); -#ifndef __KERNEL__ -#define EPL_MALLOC(siz) malloc((size_t)(siz)) -#define EPL_FREE(ptr) free((void *)ptr) -#else #define EPL_MALLOC(siz) kmalloc((size_t)(siz), GFP_KERNEL) #define EPL_FREE(ptr) kfree((void *)ptr) -#endif #ifndef PRINTF0 #define PRINTF TRACE diff --git a/drivers/staging/epl/SharedBuff.c b/drivers/staging/epl/SharedBuff.c index b69126cf6a78..d88afc01e951 100644 --- a/drivers/staging/epl/SharedBuff.c +++ b/drivers/staging/epl/SharedBuff.c @@ -85,15 +85,8 @@ #include "SharedBuff.h" #include "ShbIpc.h" -// d.k. Linux kernel modules needs other header files for memcpy() -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) #include #include -#else -#include -#include -#include -#endif /***************************************************************************/ /* */ diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index d882f2f52707..a27bde92917d 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -288,15 +288,8 @@ typedef struct { //--------------------------------------------------------------------------- #ifndef ASSERT -#if !defined (__linux__) && !defined (__KERNEL__) -#include -#ifndef ASSERT -#define ASSERT(p) assert(p) -#endif -#else #define ASSERT(p) #endif -#endif //--------------------------------------------------------------------------- // SYS TEC extensions -- cgit v1.2.3-59-g8ed1b From 197105a5349d69fff902149cbe7fe7475561d69a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 11:33:12 -0700 Subject: Staging: epl: unwind rest of _LINUX_ #ifdefs All the non-Linux #defines are now resolved, so remove the board/system type defines as they are not needed anymore. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Debug.h | 21 +------- drivers/staging/epl/EplAmi.h | 5 -- drivers/staging/epl/EplInc.h | 8 --- drivers/staging/epl/EplObjDef.h | 8 --- drivers/staging/epl/EplPdok.c | 25 --------- drivers/staging/epl/global.h | 112 ---------------------------------------- 6 files changed, 1 insertion(+), 178 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/Debug.h b/drivers/staging/epl/Debug.h index 2761606b6887..35f784c82d22 100644 --- a/drivers/staging/epl/Debug.h +++ b/drivers/staging/epl/Debug.h @@ -628,7 +628,7 @@ // The macro DEBUG_DUMP_DATA() can be used with the same debug-levels to dump // out data bytes. Function DumpData() has to be included. // NOTE: DUMP_DATA has to be defined in project settings. -#if (!defined (NDEBUG) && defined (DUMP_DATA)) || (DEV_SYSTEM == _DEV_WIN32_) +#if (!defined (NDEBUG) && defined (DUMP_DATA)) #ifdef __cplusplus extern "C" { @@ -654,24 +654,6 @@ extern "C" { // deleted from compiler (in release version too). #if !defined (NDEBUG) || defined (DEBUG_KEEP_ASSERT) -#if (DEV_SYSTEM == _DEV_WIN32_) - - // For WIN32 process will be killed after closing message box. - -#define DEBUG_ASSERT0(expr,str) if (!(expr ) && ((DEBUG_GLB_LVL() & DEBUG_LVL_ASSERT)!=0)) { \ - MessageBox (NULL, \ - "Assertion failed: line " __LINE__ " file " __FILE__ \ - "\n -> " str "\n"); \ - ExitProcess (-1); } - -#define DEBUG_ASSERT1(expr,str,p1) if (!(expr ) && ((DEBUG_GLB_LVL() & DEBUG_LVL_ASSERT)!=0)) { \ - MessageBox (NULL, \ - "Assertion failed: line " __LINE__ " file " __FILE__ \ - "\n -> " str "\n"); \ - ExitProcess (-1); } - -#else - // For microcontrollers process will be stopped using endless loop. #define DEBUG_ASSERT0(expr,str) if (!(expr )) { \ @@ -687,7 +669,6 @@ extern "C" { " -> 0x%08lX\n", __LINE__, __FILE__, str, (DWORD) p1); \ while (1); } -#endif #else diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h index 296b0200e1f7..f5754d14997d 100644 --- a/drivers/staging/epl/EplAmi.h +++ b/drivers/staging/epl/EplAmi.h @@ -86,11 +86,6 @@ #ifndef _EPLAMI_H_ #define _EPLAMI_H_ -#if ((DEV_SYSTEM & _DEV_64BIT_SUPPORT_) == 0) -// #ifdef USE_VAR64 -#error 'ERROR: development system does not support 64 bit operations!' -// #endif -#endif //--------------------------------------------------------------------------- // types diff --git a/drivers/staging/epl/EplInc.h b/drivers/staging/epl/EplInc.h index 77f93d144166..5addab4981c8 100644 --- a/drivers/staging/epl/EplInc.h +++ b/drivers/staging/epl/EplInc.h @@ -241,16 +241,8 @@ typedef struct { //--------------------------------------------------------------------------- // definitions for DLL export -#if ((DEV_SYSTEM == _DEV_WIN32_) || (DEV_SYSTEM == _DEV_WIN_CE_)) && defined (COP_LIB) - -#define EPLDLLEXPORT __declspec (dllexport) - -#else - #define EPLDLLEXPORT -#endif - // ============================================================================ // common debug macros // ============================================================================ diff --git a/drivers/staging/epl/EplObjDef.h b/drivers/staging/epl/EplObjDef.h index 4a6fac56ef6c..89d6f00645fe 100644 --- a/drivers/staging/epl/EplObjDef.h +++ b/drivers/staging/epl/EplObjDef.h @@ -96,17 +96,9 @@ // To prevent unused memory in subindex tables we need this macro. // But not all compilers support to preset the last struct value followed by a comma. // Compilers which does not support a comma after last struct value has to place in a dummy subindex. -#if ((DEV_SYSTEM & _DEV_COMMA_EXT_) != 0) - -#define EPL_OBD_END_SUBINDEX() -#define EPL_OBD_MAX_ARRAY_SUBENTRIES 2 - -#else - #define EPL_OBD_END_SUBINDEX() {0,0,0,NULL,NULL} #define EPL_OBD_MAX_ARRAY_SUBENTRIES 3 -#endif //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- diff --git a/drivers/staging/epl/EplPdok.c b/drivers/staging/epl/EplPdok.c index 15999b4f5750..3b253ffee3bc 100644 --- a/drivers/staging/epl/EplPdok.c +++ b/drivers/staging/epl/EplPdok.c @@ -73,11 +73,6 @@ #include "kernel/EplEventk.h" #include "kernel/EplObdk.h" -#if (DEV_SYSTEM == _DEV_GNU_CF548X_) -#include "plccore.h" -#define PDO_LED 0x08 -#endif - #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_PDOK)) != 0) #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLK)) == 0) @@ -226,11 +221,6 @@ tEplKernel EplPdokCbPdoReceived(tEplFrameInfo * pFrameInfo_p) tEplKernel Ret = kEplSuccessful; tEplEvent Event; -#if (DEV_SYSTEM == _DEV_GNU_CF548X_) - // reset LED -// MCF_GPIO_PODR_PCIBG &= ~PDO_LED; // Level -#endif - Event.m_EventSink = kEplEventSinkPdok; Event.m_EventType = kEplEventTypePdoRx; // limit copied data to size of PDO (because from some CNs the frame is larger than necessary) @@ -238,11 +228,6 @@ tEplKernel EplPdokCbPdoReceived(tEplFrameInfo * pFrameInfo_p) Event.m_pArg = pFrameInfo_p->m_pFrame; Ret = EplEventkPost(&Event); -#if (DEV_SYSTEM == _DEV_GNU_CF548X_) - // set LED -// MCF_GPIO_PODR_PCIBG |= PDO_LED; // Level -#endif - return Ret; } @@ -269,22 +254,12 @@ tEplKernel EplPdokCbPdoTransmitted(tEplFrameInfo * pFrameInfo_p) tEplKernel Ret = kEplSuccessful; tEplEvent Event; -#if (DEV_SYSTEM == _DEV_GNU_CF548X_) - // reset LED - MCF_GPIO_PODR_PCIBG &= ~PDO_LED; // Level -#endif - Event.m_EventSink = kEplEventSinkPdok; Event.m_EventType = kEplEventTypePdoTx; Event.m_uiSize = sizeof(tEplFrameInfo); Event.m_pArg = pFrameInfo_p; Ret = EplEventkPost(&Event); -#if (DEV_SYSTEM == _DEV_GNU_CF548X_) - // set LED - MCF_GPIO_PODR_PCIBG |= PDO_LED; // Level -#endif - return Ret; } diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index a27bde92917d..3a987db81cca 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -22,118 +22,6 @@ #ifndef _GLOBAL_H_ #define _GLOBAL_H_ -//--------------------------------------------------------------------------- -// elements of defines for development system -//--------------------------------------------------------------------------- - -// these defines are necessary to check some of characteristics of the development system -#define _DEV_BIGEND_ 0x80000000L // big endian (motorolla format) -#define _DEV_ALIGNMENT_4_ 0x00400000L // the CPU needs alignment of 4 bytes -#define _DEV_ONLY_INT_MAIN_ 0x00004000L // the compiler needs "int main(int)" instead of "void main(void)" -#define _DEV_COMMA_EXT_ 0x00002000L // support of last comma in struct predefinition -#define _DEV_64BIT_SUPPORT_ 0x00001000L // support of 64 bit operations -#define _DEV_BIT64_ 0x00000400L // count of bits: 64 bit -#define _DEV_BIT32_ 0x00000300L // 32 bit -#define _DEV_BIT16_ 0x00000200L // 16 bit -#define _DEV_BIT8_ 0x00000100L // 8 bit -#define _DEV_RVCT_ARM_ 0x0000001CL // RealView ARM -#define _DEV_RENESASM32C 0x0000001BL // compiler from: Renesas -#define _DEV_GNUC_MIPS2_ 0x0000001AL // GNU for MIPS2 -#define _DEV_MPLAB_C30_ 0x00000019L // MPLAB C30 for Microchip dsPIC33F series -#define _DEV_GNUC_TC_ 0x00000018L // GNU for Infineon TriCore -#define _DEV_GNUC_X86_ 0x00000017L // GNU for I386 -#define _DEV_IAR_ARM_ 0x00000016L // ARM IAR C/C++ Compiler -#define _DEV_PARADGM_X86 0x00000015L // Paradigm C/C++ for Beck 1x3 -#define _DEV_GNUC_CF_ 0x00000014L // GNU for Coldfire -#define _DEV_KEIL_ARM_ 0x00000013L // Keil ARM -#define _DEV_MSEVC_ 0x00000012L // Microsoft embedded Visual C/C++ -#define _DEV_HIGHTEC_GNUC_X86_ 0x00000011L // Hightec elf386 gcc -#define _DEV_MSVC_RTX_ 0x00000010L // VC600 + RTX -#define _DEV_MSVC_V1_5_ 0x0000000FL // Microsoft Visual C/C++ V1.5 -#define _DEV_GNUC_ARM7_ 0x0000000EL // GNU Compiler gcc for ARM7 -#define _DEV_METROWERKS_CW_ 0x0000000DL // Metrowerks Code Warrior -#define _DEV_MITSUBISHIM16C_ 0x0000000CL //compiler from: Mitsubishi -#define _DEV_GNUC_C16X_ 0x0000000BL // GNU Compiler gcc166 for Infineon C16x -#define _DEV_LINUX_GCC_ 0x0000000AL // Linux GNU Compiler gcc -#define _DEV_GNUC_MPC5X5 0x00000009L // GNU for Motorola PPC5x5 -#define _DEV_TASKINGM16C_ 0x00000008L // Tasking for Mitsubishi M16C -#define _DEV_FUJITSU_ 0x00000007L // Fujitsu -#define _DEV_TASKING8_ 0x00000006L // Tasking 8051 -#define _DEV_TASKING16_ 0x00000005L // Tasking 166 -#define _DEV_KEIL8_ 0x00000004L // Keil C51 -#define _DEV_KEIL16_ 0x00000003L // Keil C166 -#define _DEV_BORLANDC_ 0x00000002L // Borland C/C++ -#define _DEV_MSVC16_ 0x00000001L // Microsoft Visual C/C++ -#define _DEV_MSVC32_ 0x00000000L // Microsoft Visual C/C++ - -// these defines can be used to mask previous elements -#define _DEV_MASK_COMPILER 0x000000FFL -#define _DEV_MASK_BITCOUNT 0x00000F00L -#define _DEV_MASK_ADDSUPPORT 0x0000F000L -#define _DEV_MASK_ALIGNMENT 0x00F00000L - -//--------------------------------------------------------------------------- -// defines for development system (DEV_SYSTEM) including previous elements -//--------------------------------------------------------------------------- - -#define _DEV_WIN16_ (_DEV_BIT16_ | _DEV_MSVC16_ ) -#define _DEV_WIN32_ (_DEV_BIT32_ | _DEV_MSVC32_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_MSVC_DOS_ (_DEV_BIT32_ | _DEV_MSVC_V1_5_ ) -#define _DEV_BORLAND_DOS_ (_DEV_BIT32_ | _DEV_BORLANDC_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_KEIL_C51X_ (_DEV_BIT8_ | _DEV_KEIL8_ | _DEV_BIGEND_ | _DEV_COMMA_EXT_) // at least C51 version 7.05 supports comma extension -#define _DEV_KEIL_C16X_ (_DEV_BIT16_ | _DEV_KEIL16_ | _DEV_COMMA_EXT_) // at least C166 version 5.03 supports comma extension -#define _DEV_TASKING_C51X_ (_DEV_BIT8_ | _DEV_TASKING8_ | _DEV_BIGEND_) -#define _DEV_TASKING_C16X_ (_DEV_BIT16_ | _DEV_TASKING16_ ) -#define _DEV_FUJITSU_F590_ (_DEV_BIT8_ | _DEV_FUJITSU_ | _DEV_COMMA_EXT_) // softune is not able to support 64 bit variables QWORD !!! -//f.j.29.04.03 M16C kann effektiv mit Bytes umgehen -//#define _DEV_TASKING_M16C_ (_DEV_BIT16_ | _DEV_TASKINGM16C_ ) -#define _DEV_TASKING_M16C_ (_DEV_BIT8_ | _DEV_TASKINGM16C_ ) -#define _DEV_MITSUBISHI_M16C_ (_DEV_BIT8_ | _DEV_MITSUBISHIM16C_ ) -#define _DEV_GNU_MPC5X5_ (_DEV_BIT32_ | _DEV_GNUC_MPC5X5| _DEV_BIGEND_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_LINUX_ (_DEV_BIT32_ | _DEV_LINUX_GCC_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_GNU_C16X_ (_DEV_BIT16_ | _DEV_GNUC_C16X_ ) //| _DEV_COMMA_EXT_) -#define _DEV_MCW_MPC5X5_ (_DEV_BIT32_ | _DEV_METROWERKS_CW_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_GNU_ARM7_ (_DEV_BIT32_ | _DEV_GNUC_ARM7_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_ | _DEV_ONLY_INT_MAIN_) -#define _DEV_WIN32_RTX_ (_DEV_BIT32_ | _DEV_MSVC_RTX_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_HIGHTEC_X86_ (_DEV_BIT32_ | _DEV_HIGHTEC_GNUC_X86_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_WIN_CE_ (_DEV_BIT32_ | _DEV_MSEVC_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_KEIL_CARM_ (_DEV_BIT32_ | _DEV_KEIL_ARM_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_IAR_CARM_ (_DEV_BIT32_ | _DEV_IAR_ARM_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_RVCT_CARM_ (_DEV_BIT32_ | _DEV_RVCT_ARM_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_ | _DEV_ONLY_INT_MAIN_) -#define _DEV_MCW_MCF5XXX_ (_DEV_BIT32_ | _DEV_METROWERKS_CW_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_GNU_CF5282_ (_DEV_BIT32_ | _DEV_GNUC_CF_ | _DEV_BIGEND_) -#define _DEV_PAR_BECK1X3_ (_DEV_BIT16_ | _DEV_PARADGM_X86) -#define _DEV_GNU_CF548X_ (_DEV_BIT32_ | _DEV_GNUC_CF_ | _DEV_BIGEND_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_) -#define _DEV_GNU_I386_ (_DEV_BIT32_ | _DEV_GNUC_X86_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_ | _DEV_ONLY_INT_MAIN_) -#define _DEV_GNU_TRICORE_ (_DEV_BIT32_ | _DEV_GNUC_TC_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_ | _DEV_ONLY_INT_MAIN_ | _DEV_ALIGNMENT_4_) -#define _DEV_MPLAB_DSPIC33F_ (_DEV_BIT16_ | _DEV_MPLAB_C30_ ) //| _DEV_COMMA_EXT_) -#define _DEV_GNU_MIPSEL_ (_DEV_BIT32_ | _DEV_GNUC_MIPS2_ | _DEV_BIGEND_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_ | _DEV_ONLY_INT_MAIN_) - -#define _DEV_RENESAS_M32C_ (_DEV_BIT32_ | _DEV_RENESASM32C) - -//--------------------------------------------------------------------------- -// usefull macros -//--------------------------------------------------------------------------- - -#define CHECK_IF_ONLY_INT_MAIN() (DEV_SYSTEM & _DEV_ONLY_INT_MAIN_) -#define CHECK_MEMORY_ALINMENT() (DEV_SYSTEM & _DEV_MASK_ALIGNMENT) - -//--------------------------------------------------------------------------- -// defines for target system (TARGET_SYSTEM) -//--------------------------------------------------------------------------- -#define _LINUX_ 1 - -//--------------------------------------------------------------------------- -// definitions for function inlining -//--------------------------------------------------------------------------- - -#define LINUX_SYSTEM // define 'LINUX_SYSTEM' uniform for all Linux based systems - // r.d.: We will need an other solution here! There are two sections here which do check the preproc-definitions: - // LINUX and __linux__ . The first one was Linux for PC, the second one is this section for embedded Linux (MCF5xxx). - // But Linux for PC does not need the definitions for embedded Linux. - -#define TARGET_SYSTEM _LINUX_ // Linux definition -#define DEV_SYSTEM _DEV_LINUX_ #ifndef QWORD #define QWORD long long int -- cgit v1.2.3-59-g8ed1b From bd3966d5dc109a7f5cfcd7e14a851acc18d69324 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 11:37:22 -0700 Subject: Staging: epl: remove GENERIC It wasn't used and isn't needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Epl.h | 2 +- drivers/staging/epl/EplApiGeneric.c | 8 ++++---- drivers/staging/epl/EplApiLinuxKernel.c | 4 ++-- drivers/staging/epl/EplErrorHandlerk.c | 2 +- drivers/staging/epl/demo_main.c | 4 ++-- drivers/staging/epl/global.h | 5 ----- 6 files changed, 10 insertions(+), 15 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h index 6e5910d1915d..74038b7df2e7 100644 --- a/drivers/staging/epl/Epl.h +++ b/drivers/staging/epl/Epl.h @@ -133,7 +133,7 @@ typedef union { typedef tEplKernel(ROM *tEplApiCbEvent) (tEplApiEventType EventType_p, // IN: event type (enum) tEplApiEventArg *pEventArg_p, // IN: event argument (union) - void GENERIC *pUserArg_p); + void *pUserArg_p); typedef struct { unsigned int m_uiSizeOfStruct; diff --git a/drivers/staging/epl/EplApiGeneric.c b/drivers/staging/epl/EplApiGeneric.c index e174562ddf89..58286fccfc20 100644 --- a/drivers/staging/epl/EplApiGeneric.c +++ b/drivers/staging/epl/EplApiGeneric.c @@ -588,7 +588,7 @@ tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, EntrySize = (tEplObdSize) sizeof(bIndexEntries); RetCode = EplObdReadEntry(uiObjIndex_p, 0x00, - (void GENERIC *)&bIndexEntries, + (void *)&bIndexEntries, &EntrySize); if ((RetCode != kEplSuccessful) || (bIndexEntries == 0x00)) { @@ -1839,7 +1839,7 @@ static tEplKernel EplApiUpdateObd(void) // write Device Name (0x1008) Ret = EplObdWriteEntry(0x1008, 0, - (void GENERIC *)EplApiInstance_g. + (void *)EplApiInstance_g. m_InitParam.m_pszDevName, (tEplObdSize) strlen(EplApiInstance_g. m_InitParam. @@ -1854,7 +1854,7 @@ static tEplKernel EplApiUpdateObd(void) // write Hardware version (0x1009) Ret = EplObdWriteEntry(0x1009, 0, - (void GENERIC *)EplApiInstance_g. + (void *)EplApiInstance_g. m_InitParam.m_pszHwVersion, (tEplObdSize) strlen(EplApiInstance_g. m_InitParam. @@ -1869,7 +1869,7 @@ static tEplKernel EplApiUpdateObd(void) // write Software version (0x100A) Ret = EplObdWriteEntry(0x100A, 0, - (void GENERIC *)EplApiInstance_g. + (void *)EplApiInstance_g. m_InitParam.m_pszSwVersion, (tEplObdSize) strlen(EplApiInstance_g. m_InitParam. diff --git a/drivers/staging/epl/EplApiLinuxKernel.c b/drivers/staging/epl/EplApiLinuxKernel.c index 8d4a218c3248..52f8e1bd473f 100644 --- a/drivers/staging/epl/EplApiLinuxKernel.c +++ b/drivers/staging/epl/EplApiLinuxKernel.c @@ -206,7 +206,7 @@ typedef struct { tEplKernel EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) tEplApiEventArg *pEventArg_p, // IN: event argument (union) - void GENERIC *pUserArg_p); + void *pUserArg_p); tEplKernel EplLinCbSync(void); @@ -1160,7 +1160,7 @@ static int EplLinIoctl(struct inode *pDeviceFile_p, // information about the dev tEplKernel EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) tEplApiEventArg *pEventArg_p, // IN: event argument (union) - void GENERIC *pUserArg_p) + void *pUserArg_p) { tEplKernel EplRet = kEplSuccessful; int iErr; diff --git a/drivers/staging/epl/EplErrorHandlerk.c b/drivers/staging/epl/EplErrorHandlerk.c index 25a44d961c00..120e77e50894 100644 --- a/drivers/staging/epl/EplErrorHandlerk.c +++ b/drivers/staging/epl/EplErrorHandlerk.c @@ -774,7 +774,7 @@ static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p, EntrySize = (tEplObdSize) sizeof(bIndexEntries); Ret = EplObdReadEntry(uiIndex_p, - 0x00, (void GENERIC *)&bIndexEntries, &EntrySize); + 0x00, (void *)&bIndexEntries, &EntrySize); if ((Ret != kEplSuccessful) || (bIndexEntries == 0x00)) { // Object doesn't exist or invalid entry number diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c index 6be30d6b4a28..20787dc18b9a 100644 --- a/drivers/staging/epl/demo_main.c +++ b/drivers/staging/epl/demo_main.c @@ -192,7 +192,7 @@ tEplKernel EplObdInitRam(tEplObdInitParam MEM * pInitParam_p); tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) tEplApiEventArg *pEventArg_p, // IN: event argument (union) - void GENERIC *pUserArg_p); + void *pUserArg_p); tEplKernel AppCbSync(void); @@ -486,7 +486,7 @@ static void __exit EplLinExit(void) tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) tEplApiEventArg *pEventArg_p, // IN: event argument (union) - void GENERIC *pUserArg_p) + void *pUserArg_p) { tEplKernel EplRet = kEplSuccessful; diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 3a987db81cca..6214075704e2 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -33,11 +33,6 @@ // usage: CONST BYTE ROM foo = 0x00; #define HWACC // hardware access through external memory (i.e. CAN) - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. #define MEM // Memory attribute to optimize speed and code of pointer access. #ifndef NEAR -- cgit v1.2.3-59-g8ed1b From 44b71174dfe579690c8f91d51763e05ca72169e2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 11:39:15 -0700 Subject: Staging: epl: remove NEAR It wasn't used and isn't needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/EplInstDef.h | 2 -- drivers/staging/epl/EplObd.c | 2 +- drivers/staging/epl/global.h | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/EplInstDef.h b/drivers/staging/epl/EplInstDef.h index 89efbf278264..31406662b3c2 100644 --- a/drivers/staging/epl/EplInstDef.h +++ b/drivers/staging/epl/EplInstDef.h @@ -99,7 +99,6 @@ typedef BYTE tEplInstanceHdl; //-------------------------------------------------------------------------------------- // memory attributes for instance table -#define INST_NEAR // faster access to variables #define INST_FAR // variables wich have to located in xdata #define STATIC // prevent warnings for variables with same name @@ -254,7 +253,6 @@ typedef BYTE tEplInstanceHdl; #else // only one instance is used // Memory attributes for instance table. -#define INST_NEAR NEAR // faster access to variables #define INST_FAR MEM // variables wich have to located in xdata #define STATIC static // prevent warnings for variables with same name diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c index a07582cec505..a853a02601a6 100644 --- a/drivers/staging/epl/EplObd.c +++ b/drivers/staging/epl/EplObd.c @@ -102,7 +102,7 @@ INSTANCE_TYPE_BEGIN EPL_MCO_DECL_INSTANCE_MEMBER() STATIC tEplObdInitParam INST_FAR m_ObdInitParam; -STATIC tEplObdStoreLoadObjCallback INST_NEAR m_fpStoreLoadObjCallback; +STATIC tEplObdStoreLoadObjCallback m_fpStoreLoadObjCallback; INSTANCE_TYPE_END // decomposition of float diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 6214075704e2..8a204ac232c3 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -35,10 +35,6 @@ #define MEM // Memory attribute to optimize speed and code of pointer access. -#ifndef NEAR -#define NEAR // variables mapped to internal data storage location -#endif - #ifndef FAR #define FAR // variables mapped to external data storage location #endif -- cgit v1.2.3-59-g8ed1b From f15a88fae1b75bfcf19d25e557d7ef5301562ec6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 11:44:31 -0700 Subject: Staging: epl: remove FAR It's not used and is not needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/EplAmi.h | 72 +++++++------- drivers/staging/epl/amix86.c | 220 +++++++++++++++++++++---------------------- drivers/staging/epl/global.h | 4 - 3 files changed, 145 insertions(+), 151 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h index f5754d14997d..d3e47cbd3c94 100644 --- a/drivers/staging/epl/EplAmi.h +++ b/drivers/staging/epl/EplAmi.h @@ -105,15 +105,15 @@ extern "C" { // // To save code space the function AmiSetByte is replaced by // an macro. -// void AmiSetByte (void FAR* pAddr_p, BYTE bByteVal_p); +// void AmiSetByte (void * pAddr_p, BYTE bByteVal_p); -#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} -#define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} +#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(BYTE *)(pAddr_p) = (bByteVal_p);} +#define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(BYTE *)(pAddr_p) = (bByteVal_p);} -void AmiSetWordToBe(void FAR *pAddr_p, WORD wWordVal_p); -void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p); -void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p); -void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); +void AmiSetWordToBe(void *pAddr_p, WORD wWordVal_p); +void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p); +void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p); +void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p); //--------------------------------------------------------------------------- // @@ -121,15 +121,15 @@ void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); // // To save code space the function AmiGetByte is replaced by // an macro. -// BYTE AmiGetByte (void FAR* pAddr_p); +// BYTE AmiGetByte (void * pAddr_p); -#define AmiGetByteFromBe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) -#define AmiGetByteFromLe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) +#define AmiGetByteFromBe(pAddr_p) (*(BYTE *)(pAddr_p)) +#define AmiGetByteFromLe(pAddr_p) (*(BYTE *)(pAddr_p)) -WORD AmiGetWordFromBe(void FAR *pAddr_p); -DWORD AmiGetDwordFromBe(void FAR *pAddr_p); -WORD AmiGetWordFromLe(void FAR *pAddr_p); -DWORD AmiGetDwordFromLe(void FAR *pAddr_p); +WORD AmiGetWordFromBe(void *pAddr_p); +DWORD AmiGetDwordFromBe(void *pAddr_p); +WORD AmiGetWordFromLe(void *pAddr_p); +DWORD AmiGetDwordFromLe(void *pAddr_p); //--------------------------------------------------------------------------- // @@ -144,8 +144,8 @@ DWORD AmiGetDwordFromLe(void FAR *pAddr_p); // //--------------------------------------------------------------------------- -void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p); -void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); +void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p); +void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p); //--------------------------------------------------------------------------- // @@ -159,8 +159,8 @@ void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); // //--------------------------------------------------------------------------- -DWORD AmiGetDword24FromBe(void FAR *pAddr_p); -DWORD AmiGetDword24FromLe(void FAR *pAddr_p); +DWORD AmiGetDword24FromBe(void *pAddr_p); +DWORD AmiGetDword24FromLe(void *pAddr_p); //#ifdef USE_VAR64 @@ -177,8 +177,8 @@ DWORD AmiGetDword24FromLe(void FAR *pAddr_p); // //--------------------------------------------------------------------------- -void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); -void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -192,8 +192,8 @@ void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); // //--------------------------------------------------------------------------- -QWORD AmiGetQword40FromBe(void FAR *pAddr_p); -QWORD AmiGetQword40FromLe(void FAR *pAddr_p); +QWORD AmiGetQword40FromBe(void *pAddr_p); +QWORD AmiGetQword40FromLe(void *pAddr_p); //--------------------------------------------------------------------------- // @@ -208,8 +208,8 @@ QWORD AmiGetQword40FromLe(void FAR *pAddr_p); // //--------------------------------------------------------------------------- -void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); -void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -223,8 +223,8 @@ void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); // //--------------------------------------------------------------------------- -QWORD AmiGetQword48FromBe(void FAR *pAddr_p); -QWORD AmiGetQword48FromLe(void FAR *pAddr_p); +QWORD AmiGetQword48FromBe(void *pAddr_p); +QWORD AmiGetQword48FromLe(void *pAddr_p); //--------------------------------------------------------------------------- // @@ -239,8 +239,8 @@ QWORD AmiGetQword48FromLe(void FAR *pAddr_p); // //--------------------------------------------------------------------------- -void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); -void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -254,8 +254,8 @@ void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); // //--------------------------------------------------------------------------- -QWORD AmiGetQword56FromBe(void FAR *pAddr_p); -QWORD AmiGetQword56FromLe(void FAR *pAddr_p); +QWORD AmiGetQword56FromBe(void *pAddr_p); +QWORD AmiGetQword56FromLe(void *pAddr_p); //--------------------------------------------------------------------------- // @@ -270,8 +270,8 @@ QWORD AmiGetQword56FromLe(void FAR *pAddr_p); // //--------------------------------------------------------------------------- -void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); -void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -285,8 +285,8 @@ void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); // //--------------------------------------------------------------------------- -QWORD AmiGetQword64FromBe(void FAR *pAddr_p); -QWORD AmiGetQword64FromLe(void FAR *pAddr_p); +QWORD AmiGetQword64FromBe(void *pAddr_p); +QWORD AmiGetQword64FromLe(void *pAddr_p); //--------------------------------------------------------------------------- // @@ -300,7 +300,7 @@ QWORD AmiGetQword64FromLe(void FAR *pAddr_p); // Return: void // //--------------------------------------------------------------------------- -void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p); +void AmiSetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p); //--------------------------------------------------------------------------- // @@ -314,7 +314,7 @@ void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p); // Return: void // //--------------------------------------------------------------------------- -void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p); +void AmiGetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p); #ifdef __cplusplus } diff --git a/drivers/staging/epl/amix86.c b/drivers/staging/epl/amix86.c index 67a49dab2bb8..bff9dfe5ff3c 100644 --- a/drivers/staging/epl/amix86.c +++ b/drivers/staging/epl/amix86.c @@ -117,34 +117,34 @@ typedef struct { //------------< write BYTE in big endian >-------------------------- /* -void AmiSetByteToBe (void FAR* pAddr_p, BYTE bByteVal_p) +void AmiSetByteToBe (void *pAddr_p, BYTE bByteVal_p) { - *(BYTE FAR*)pAddr_p = bByteVal_p; + *(BYTE *)pAddr_p = bByteVal_p; } */ //------------< write WORD in big endian >-------------------------- -void AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p) +void AmiSetWordToBe(void * pAddr_p, WORD wWordVal_p) { - twStruct FAR *pwStruct; + twStruct *pwStruct; twStruct wValue; wValue.m_wWord = (WORD) ((wWordVal_p & 0x00FF) << 8); //LSB to MSB wValue.m_wWord |= (WORD) ((wWordVal_p & 0xFF00) >> 8); //MSB to LSB - pwStruct = (twStruct FAR *) pAddr_p; + pwStruct = (twStruct *) pAddr_p; pwStruct->m_wWord = wValue.m_wWord; } //------------< write DWORD in big endian >------------------------- -void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p) { - tdwStruct FAR *pdwStruct; + tdwStruct *pdwStruct; tdwStruct dwValue; dwValue.m_dwDword = ((dwDwordVal_p & 0x000000FF) << 24); //LSB to MSB @@ -152,7 +152,7 @@ void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) dwValue.m_dwDword |= ((dwDwordVal_p & 0x00FF0000) >> 8); dwValue.m_dwDword |= ((dwDwordVal_p & 0xFF000000) >> 24); //MSB to LSB - pdwStruct = (tdwStruct FAR *) pAddr_p; + pdwStruct = (tdwStruct *) pAddr_p; pdwStruct->m_dwDword = dwValue.m_dwDword; } @@ -175,32 +175,32 @@ void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) //------------< write BYTE in little endian >-------------------------- /* -void AmiSetByteToLe (void FAR* pAddr_p, BYTE bByteVal_p) +void AmiSetByteToLe (void *pAddr_p, BYTE bByteVal_p) { - *(BYTE FAR*)pAddr_p = bByteVal_p; + *(BYTE *)pAddr_p = bByteVal_p; } */ //------------< write WORD in little endian >-------------------------- -void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p) +void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p) { - twStruct FAR *pwStruct; + twStruct *pwStruct; - pwStruct = (twStruct FAR *) pAddr_p; + pwStruct = (twStruct *) pAddr_p; pwStruct->m_wWord = wWordVal_p; } //------------< write DWORD in little endian >------------------------- -void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p) { - tdwStruct FAR *pdwStruct; + tdwStruct *pdwStruct; - pdwStruct = (tdwStruct FAR *) pAddr_p; + pdwStruct = (tdwStruct *) pAddr_p; pdwStruct->m_dwDword = dwDwordVal_p; } @@ -222,22 +222,22 @@ void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) //------------< read BYTE in big endian >--------------------------- /* -BYTE AmiGetByteFromBe (void FAR* pAddr_p) +BYTE AmiGetByteFromBe (void *pAddr_p) { - return ( *(BYTE FAR*)pAddr_p ); + return ( *(BYTE *)pAddr_p ); } */ //------------< read WORD in big endian >--------------------------- -WORD AmiGetWordFromBe(void FAR *pAddr_p) +WORD AmiGetWordFromBe(void *pAddr_p) { - twStruct FAR *pwStruct; + twStruct *pwStruct; twStruct wValue; - pwStruct = (twStruct FAR *) pAddr_p; + pwStruct = (twStruct *) pAddr_p; wValue.m_wWord = (WORD) ((pwStruct->m_wWord & 0x00FF) << 8); //LSB to MSB wValue.m_wWord |= (WORD) ((pwStruct->m_wWord & 0xFF00) >> 8); //MSB to LSB @@ -248,12 +248,12 @@ WORD AmiGetWordFromBe(void FAR *pAddr_p) //------------< read DWORD in big endian >-------------------------- -DWORD AmiGetDwordFromBe(void FAR *pAddr_p) +DWORD AmiGetDwordFromBe(void *pAddr_p) { - tdwStruct FAR *pdwStruct; + tdwStruct *pdwStruct; tdwStruct dwValue; - pdwStruct = (tdwStruct FAR *) pAddr_p; + pdwStruct = (tdwStruct *) pAddr_p; dwValue.m_dwDword = ((pdwStruct->m_dwDword & 0x000000FF) << 24); //LSB to MSB dwValue.m_dwDword |= ((pdwStruct->m_dwDword & 0x0000FF00) << 8); @@ -281,31 +281,31 @@ DWORD AmiGetDwordFromBe(void FAR *pAddr_p) //------------< read BYTE in little endian >--------------------------- /* -BYTE AmiGetByteFromLe (void FAR* pAddr_p) +BYTE AmiGetByteFromLe (void *pAddr_p) { - return ( *(BYTE FAR*)pAddr_p ); + return ( *(BYTE *)pAddr_p ); } */ //------------< read WORD in little endian >--------------------------- -WORD AmiGetWordFromLe(void FAR *pAddr_p) +WORD AmiGetWordFromLe(void *pAddr_p) { - twStruct FAR *pwStruct; + twStruct *pwStruct; - pwStruct = (twStruct FAR *) pAddr_p; + pwStruct = (twStruct *) pAddr_p; return (pwStruct->m_wWord); } //------------< read DWORD in little endian >-------------------------- -DWORD AmiGetDwordFromLe(void FAR *pAddr_p) +DWORD AmiGetDwordFromLe(void *pAddr_p) { - tdwStruct FAR *pdwStruct; + tdwStruct *pdwStruct; - pdwStruct = (tdwStruct FAR *) pAddr_p; + pdwStruct = (tdwStruct *) pAddr_p; return (pdwStruct->m_dwDword); } @@ -324,11 +324,11 @@ DWORD AmiGetDwordFromLe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p) { - ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[2]; - ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; - ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & dwDwordVal_p)[0]; + ((BYTE *) pAddr_p)[0] = ((BYTE *) & dwDwordVal_p)[2]; + ((BYTE *) pAddr_p)[1] = ((BYTE *) & dwDwordVal_p)[1]; + ((BYTE *) pAddr_p)[2] = ((BYTE *) & dwDwordVal_p)[0]; } //--------------------------------------------------------------------------- @@ -346,11 +346,11 @@ void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) // //--------------------------------------------------------------------------- -void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p) { - ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[0]; - ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; - ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & dwDwordVal_p)[2]; + ((BYTE *) pAddr_p)[0] = ((BYTE *) & dwDwordVal_p)[0]; + ((BYTE *) pAddr_p)[1] = ((BYTE *) & dwDwordVal_p)[1]; + ((BYTE *) pAddr_p)[2] = ((BYTE *) & dwDwordVal_p)[2]; } //--------------------------------------------------------------------------- @@ -366,7 +366,7 @@ void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) // State: not tested // //--------------------------------------------------------------------------- -DWORD AmiGetDword24FromBe(void FAR *pAddr_p) +DWORD AmiGetDword24FromBe(void *pAddr_p) { tdwStruct dwStruct; @@ -389,7 +389,7 @@ DWORD AmiGetDword24FromBe(void FAR *pAddr_p) // State: not tested // //--------------------------------------------------------------------------- -DWORD AmiGetDword24FromLe(void FAR *pAddr_p) +DWORD AmiGetDword24FromLe(void *pAddr_p) { tdwStruct dwStruct; @@ -415,16 +415,16 @@ DWORD AmiGetDword24FromLe(void FAR *pAddr_p) // State: not tested // //--------------------------------------------------------------------------- -void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p) { - ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[7]; - ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[6]; - ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & qwQwordVal_p)[5]; - ((BYTE FAR *) pAddr_p)[3] = ((BYTE FAR *) & qwQwordVal_p)[4]; - ((BYTE FAR *) pAddr_p)[4] = ((BYTE FAR *) & qwQwordVal_p)[3]; - ((BYTE FAR *) pAddr_p)[5] = ((BYTE FAR *) & qwQwordVal_p)[2]; - ((BYTE FAR *) pAddr_p)[6] = ((BYTE FAR *) & qwQwordVal_p)[1]; - ((BYTE FAR *) pAddr_p)[7] = ((BYTE FAR *) & qwQwordVal_p)[0]; + ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[7]; + ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[6]; + ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[5]; + ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[4]; + ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[3]; + ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[2]; + ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[1]; + ((BYTE *) pAddr_p)[7] = ((BYTE *) & qwQwordVal_p)[0]; } //--------------------------------------------------------------------------- @@ -441,11 +441,11 @@ void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) // State: not tested // //--------------------------------------------------------------------------- -void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p) { - QWORD FAR *pqwDst; + QWORD *pqwDst; - pqwDst = (QWORD FAR *) pAddr_p; + pqwDst = (QWORD *) pAddr_p; *pqwDst = qwQwordVal_p; } @@ -462,18 +462,18 @@ void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) // State: not tested // //--------------------------------------------------------------------------- -QWORD AmiGetQword64FromBe(void FAR *pAddr_p) +QWORD AmiGetQword64FromBe(void *pAddr_p) { tqwStruct qwStruct; - ((BYTE FAR *) & qwStruct.m_qwQword)[0] = ((BYTE FAR *) pAddr_p)[7]; - ((BYTE FAR *) & qwStruct.m_qwQword)[1] = ((BYTE FAR *) pAddr_p)[6]; - ((BYTE FAR *) & qwStruct.m_qwQword)[2] = ((BYTE FAR *) pAddr_p)[5]; - ((BYTE FAR *) & qwStruct.m_qwQword)[3] = ((BYTE FAR *) pAddr_p)[4]; - ((BYTE FAR *) & qwStruct.m_qwQword)[4] = ((BYTE FAR *) pAddr_p)[3]; - ((BYTE FAR *) & qwStruct.m_qwQword)[5] = ((BYTE FAR *) pAddr_p)[2]; - ((BYTE FAR *) & qwStruct.m_qwQword)[6] = ((BYTE FAR *) pAddr_p)[1]; - ((BYTE FAR *) & qwStruct.m_qwQword)[7] = ((BYTE FAR *) pAddr_p)[0]; + ((BYTE *) & qwStruct.m_qwQword)[0] = ((BYTE *) pAddr_p)[7]; + ((BYTE *) & qwStruct.m_qwQword)[1] = ((BYTE *) pAddr_p)[6]; + ((BYTE *) & qwStruct.m_qwQword)[2] = ((BYTE *) pAddr_p)[5]; + ((BYTE *) & qwStruct.m_qwQword)[3] = ((BYTE *) pAddr_p)[4]; + ((BYTE *) & qwStruct.m_qwQword)[4] = ((BYTE *) pAddr_p)[3]; + ((BYTE *) & qwStruct.m_qwQword)[5] = ((BYTE *) pAddr_p)[2]; + ((BYTE *) & qwStruct.m_qwQword)[6] = ((BYTE *) pAddr_p)[1]; + ((BYTE *) & qwStruct.m_qwQword)[7] = ((BYTE *) pAddr_p)[0]; return (qwStruct.m_qwQword); } @@ -491,12 +491,12 @@ QWORD AmiGetQword64FromBe(void FAR *pAddr_p) // State: not tested // //--------------------------------------------------------------------------- -QWORD AmiGetQword64FromLe(void FAR *pAddr_p) +QWORD AmiGetQword64FromLe(void *pAddr_p) { - tqwStruct FAR *pqwStruct; + tqwStruct *pqwStruct; tqwStruct qwStruct; - pqwStruct = (tqwStruct FAR *) pAddr_p; + pqwStruct = (tqwStruct *) pAddr_p; qwStruct.m_qwQword = pqwStruct->m_qwQword; return (qwStruct.m_qwQword); @@ -517,14 +517,14 @@ QWORD AmiGetQword64FromLe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p) { - ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[4]; - ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[3]; - ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & qwQwordVal_p)[2]; - ((BYTE FAR *) pAddr_p)[3] = ((BYTE FAR *) & qwQwordVal_p)[1]; - ((BYTE FAR *) pAddr_p)[4] = ((BYTE FAR *) & qwQwordVal_p)[0]; + ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[4]; + ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[3]; + ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[2]; + ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[1]; + ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[0]; } @@ -543,11 +543,11 @@ void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p) { - ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; - ((BYTE FAR *) pAddr_p)[4] = ((BYTE FAR *) & qwQwordVal_p)[4]; + ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; + ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[4]; } @@ -565,7 +565,7 @@ void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -QWORD AmiGetQword40FromBe(void FAR *pAddr_p) +QWORD AmiGetQword40FromBe(void *pAddr_p) { tqwStruct qwStruct; @@ -591,7 +591,7 @@ QWORD AmiGetQword40FromBe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -QWORD AmiGetQword40FromLe(void FAR *pAddr_p) +QWORD AmiGetQword40FromLe(void *pAddr_p) { tqwStruct qwStruct; @@ -618,15 +618,15 @@ QWORD AmiGetQword40FromLe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p) { - ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[5]; - ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[4]; - ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & qwQwordVal_p)[3]; - ((BYTE FAR *) pAddr_p)[3] = ((BYTE FAR *) & qwQwordVal_p)[2]; - ((BYTE FAR *) pAddr_p)[4] = ((BYTE FAR *) & qwQwordVal_p)[1]; - ((BYTE FAR *) pAddr_p)[5] = ((BYTE FAR *) & qwQwordVal_p)[0]; + ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[5]; + ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[4]; + ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[3]; + ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[2]; + ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[1]; + ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[0]; } @@ -645,11 +645,11 @@ void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p) { - ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; - ((WORD FAR *) pAddr_p)[2] = ((WORD FAR *) & qwQwordVal_p)[2]; + ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; + ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; } @@ -667,7 +667,7 @@ void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -QWORD AmiGetQword48FromBe(void FAR *pAddr_p) +QWORD AmiGetQword48FromBe(void *pAddr_p) { tqwStruct qwStruct; @@ -693,7 +693,7 @@ QWORD AmiGetQword48FromBe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -QWORD AmiGetQword48FromLe(void FAR *pAddr_p) +QWORD AmiGetQword48FromLe(void *pAddr_p) { tqwStruct qwStruct; @@ -720,16 +720,16 @@ QWORD AmiGetQword48FromLe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p) { - ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[6]; - ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[5]; - ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & qwQwordVal_p)[4]; - ((BYTE FAR *) pAddr_p)[3] = ((BYTE FAR *) & qwQwordVal_p)[3]; - ((BYTE FAR *) pAddr_p)[4] = ((BYTE FAR *) & qwQwordVal_p)[2]; - ((BYTE FAR *) pAddr_p)[5] = ((BYTE FAR *) & qwQwordVal_p)[1]; - ((BYTE FAR *) pAddr_p)[6] = ((BYTE FAR *) & qwQwordVal_p)[0]; + ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[6]; + ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[5]; + ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[4]; + ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[3]; + ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[2]; + ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[1]; + ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[0]; } @@ -748,12 +748,12 @@ void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p) { - ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; - ((WORD FAR *) pAddr_p)[2] = ((WORD FAR *) & qwQwordVal_p)[2]; - ((BYTE FAR *) pAddr_p)[6] = ((BYTE FAR *) & qwQwordVal_p)[6]; + ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; + ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; + ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[6]; } @@ -771,7 +771,7 @@ void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -QWORD AmiGetQword56FromBe(void FAR *pAddr_p) +QWORD AmiGetQword56FromBe(void *pAddr_p) { tqwStruct qwStruct; @@ -797,7 +797,7 @@ QWORD AmiGetQword56FromBe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -QWORD AmiGetQword56FromLe(void FAR *pAddr_p) +QWORD AmiGetQword56FromLe(void *pAddr_p) { tqwStruct qwStruct; @@ -824,12 +824,11 @@ QWORD AmiGetQword56FromLe(void FAR *pAddr_p) // //--------------------------------------------------------------------------- -void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) +void AmiSetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p) { - AmiSetDwordToLe(((BYTE FAR *) pAddr_p), - pTimeOfDay_p->m_dwMs & 0x0FFFFFFF); - AmiSetWordToLe(((BYTE FAR *) pAddr_p) + 4, pTimeOfDay_p->m_wDays); + AmiSetDwordToLe(((BYTE *) pAddr_p), pTimeOfDay_p->m_dwMs & 0x0FFFFFFF); + AmiSetWordToLe(((BYTE *) pAddr_p) + 4, pTimeOfDay_p->m_wDays); } @@ -848,12 +847,11 @@ void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) // //--------------------------------------------------------------------------- -void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) +void AmiGetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p) { - pTimeOfDay_p->m_dwMs = - AmiGetDwordFromLe(((BYTE FAR *) pAddr_p)) & 0x0FFFFFFF; - pTimeOfDay_p->m_wDays = AmiGetWordFromLe(((BYTE FAR *) pAddr_p) + 4); + pTimeOfDay_p->m_dwMs = AmiGetDwordFromLe(((BYTE *) pAddr_p)) & 0x0FFFFFFF; + pTimeOfDay_p->m_wDays = AmiGetWordFromLe(((BYTE *) pAddr_p) + 4); } diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 8a204ac232c3..9c45c03216fa 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -35,10 +35,6 @@ #define MEM // Memory attribute to optimize speed and code of pointer access. -#ifndef FAR -#define FAR // variables mapped to external data storage location -#endif - #ifndef CONST #define CONST const // variables mapped to ROM (i.e. flash) #endif -- cgit v1.2.3-59-g8ed1b From 5318487c34b99de4f9978ae1a8f963d25d767734 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 11:48:19 -0700 Subject: Staging: epl: remove ROM It's not used and is not needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Epl.h | 6 ++--- drivers/staging/epl/EplObd.c | 60 +++++++++++++------------------------------- drivers/staging/epl/EplObd.h | 8 +++--- drivers/staging/epl/global.h | 2 -- 4 files changed, 25 insertions(+), 51 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h index 74038b7df2e7..cfcb067f34ff 100644 --- a/drivers/staging/epl/Epl.h +++ b/drivers/staging/epl/Epl.h @@ -131,9 +131,9 @@ typedef union { } tEplApiEventArg; -typedef tEplKernel(ROM *tEplApiCbEvent) (tEplApiEventType EventType_p, // IN: event type (enum) - tEplApiEventArg *pEventArg_p, // IN: event argument (union) - void *pUserArg_p); +typedef tEplKernel(*tEplApiCbEvent) (tEplApiEventType EventType_p, // IN: event type (enum) + tEplApiEventArg *pEventArg_p, // IN: event argument (union) + void *pUserArg_p); typedef struct { unsigned int m_uiSizeOfStruct; diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c index a853a02601a6..7485c82d7c45 100644 --- a/drivers/staging/epl/EplObd.c +++ b/drivers/staging/epl/EplObd.c @@ -2192,11 +2192,11 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p) // The current position is not decleared. The string // is located in ROM, therefor use default pointer. pData = (void *)pSubIndexEntry_p->m_pDefault; - if ((CONST void ROM *)pData != (CONST void ROM *)NULL) { + if ((CONST void *)pData != (CONST void *)NULL) { // The max. size of strings defined by STRING-Macro is stored in // tEplObdVString of default value. DataSize = - ((CONST tEplObdVString ROM *) pData)-> + ((CONST tEplObdVString *) pData)-> m_Size; } } @@ -2216,11 +2216,11 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p) // The current position is not decleared. The string // is located in ROM, therefor use default pointer. pData = (void *)pSubIndexEntry_p->m_pDefault; - if ((CONST void ROM *)pData != (CONST void ROM *)NULL) { + if ((CONST void *)pData != (CONST void *)NULL) { // The max. size of strings defined by STRING-Macro is stored in // tEplObdVString of default value. DataSize = - ((CONST tEplObdOString ROM *) pData)-> + ((CONST tEplObdOString *) pData)-> m_Size; } } @@ -2887,29 +2887,17 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ pSubIndex->m_pCurrent; if (pDstData != NULL) { // 08-dec-2004: code optimization !!! - // entries ((tEplObdVStringDef ROM*) pSubIndex->m_pDefault)->m_pString - // and ((tEplObdVStringDef ROM*) pSubIndex->m_pDefault)->m_Size were read + // entries ((tEplObdVStringDef*) pSubIndex->m_pDefault)->m_pString + // and ((tEplObdVStringDef*) pSubIndex->m_pDefault)->m_Size were read // twice. thats not necessary! // For copying data we have to set the destination pointer to the real RAM string. This // pointer to RAM string is located in default string info structure. (translated r.d.) - pDstData = - (void MEM - *)((tEplObdVStringDef ROM *) pSubIndex->m_pDefault)->m_pString; - ObjSize = - ((tEplObdVStringDef - ROM *) pSubIndex-> - m_pDefault)-> - m_Size; - - ((tEplObdVString MEM *) - pSubIndex-> - m_pCurrent)-> - m_pString = pDstData; - ((tEplObdVString MEM *) - pSubIndex-> - m_pCurrent)->m_Size = - ObjSize; + pDstData = (void MEM *)((tEplObdVStringDef*) pSubIndex->m_pDefault)->m_pString; + ObjSize = ((tEplObdVStringDef *)pSubIndex->m_pDefault)->m_Size; + + ((tEplObdVString MEM *)pSubIndex->m_pCurrent)->m_pString = pDstData; + ((tEplObdVString MEM *)pSubIndex->m_pCurrent)->m_Size = ObjSize; } } else if (pSubIndex->m_Type == @@ -2918,29 +2906,17 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ pSubIndex->m_pCurrent; if (pDstData != NULL) { // 08-dec-2004: code optimization !!! - // entries ((tEplObdOStringDef ROM*) pSubIndex->m_pDefault)->m_pString - // and ((tEplObdOStringDef ROM*) pSubIndex->m_pDefault)->m_Size were read + // entries ((tEplObdOStringDef*) pSubIndex->m_pDefault)->m_pString + // and ((tEplObdOStringDef*) pSubIndex->m_pDefault)->m_Size were read // twice. thats not necessary! // For copying data we have to set the destination pointer to the real RAM string. This // pointer to RAM string is located in default string info structure. (translated r.d.) - pDstData = - (void MEM - *)((tEplObdOStringDef ROM *) pSubIndex->m_pDefault)->m_pString; - ObjSize = - ((tEplObdOStringDef - ROM *) pSubIndex-> - m_pDefault)-> - m_Size; - - ((tEplObdOString MEM *) - pSubIndex-> - m_pCurrent)-> - m_pString = pDstData; - ((tEplObdOString MEM *) - pSubIndex-> - m_pCurrent)->m_Size = - ObjSize; + pDstData = (void MEM *)((tEplObdOStringDef *) pSubIndex->m_pDefault)->m_pString; + ObjSize = ((tEplObdOStringDef *)pSubIndex->m_pDefault)->m_Size; + + ((tEplObdOString MEM *)pSubIndex->m_pCurrent)->m_pString = pDstData; + ((tEplObdOString MEM *)pSubIndex->m_pCurrent)->m_Size = ObjSize; } } diff --git a/drivers/staging/epl/EplObd.h b/drivers/staging/epl/EplObd.h index 6e450d84be86..a70139c6bbc2 100644 --- a/drivers/staging/epl/EplObd.h +++ b/drivers/staging/epl/EplObd.h @@ -283,7 +283,7 @@ typedef enum { kVarValidAll = 0x03 // currently only size and data are implemented and used } tEplVarParamValid; -typedef tEplKernel(ROM *tEplVarCallback) (CCM_DECL_INSTANCE_HDL_ void *pParam_p); +typedef tEplKernel(*tEplVarCallback) (CCM_DECL_INSTANCE_HDL_ void *pParam_p); typedef struct { tEplVarParamValid m_ValidFlag; @@ -375,7 +375,7 @@ typedef struct { } tEplObdCbParam; // define type for callback function: pParam_p points to tEplObdCbParam -typedef tEplKernel(ROM *tEplObdCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbParam MEM * pParam_p); +typedef tEplKernel(*tEplObdCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbParam MEM * pParam_p); // do not change the order for this struct!!! @@ -419,10 +419,10 @@ typedef struct { } tEplObdCbStoreParam; -typedef tEplKernel(ROM *tInitTabEntryCallback) (void MEM * pTabEntry_p, +typedef tEplKernel(*tInitTabEntryCallback) (void MEM * pTabEntry_p, unsigned int uiObjIndex_p); -typedef tEplKernel(ROM * tEplObdStoreLoadObjCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbStoreParam MEM *pCbStoreParam_p); +typedef tEplKernel(*tEplObdStoreLoadObjCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbStoreParam MEM *pCbStoreParam_p); // ------------------------------------------------------------------------- // this stucture is used for parameters for function ObdInitModuleTab() diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 9c45c03216fa..b5902da8fa46 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -29,8 +29,6 @@ // ------------------ GNUC for I386 --------------------------------------------- -#define ROM // code or variables mapped to ROM (i.e. flash) - // usage: CONST BYTE ROM foo = 0x00; #define HWACC // hardware access through external memory (i.e. CAN) #define MEM // Memory attribute to optimize speed and code of pointer access. -- cgit v1.2.3-59-g8ed1b From 5e9f6bc67d44c7b73208d4038b8a637ff942ca52 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 12:09:26 -0700 Subject: Staging: epl: remove MEM It's not used and is not needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Debug.h | 4 +- drivers/staging/epl/Epl.h | 2 +- drivers/staging/epl/EplApiGeneric.c | 8 +- drivers/staging/epl/EplInstDef.h | 34 ++++---- drivers/staging/epl/EplNmtk.c | 14 +-- drivers/staging/epl/EplObd.c | 158 ++++++++++++++++------------------ drivers/staging/epl/EplObd.h | 17 ++-- drivers/staging/epl/EplObdMacro.h | 36 ++++---- drivers/staging/epl/EplObdu.c | 6 +- drivers/staging/epl/EplObduCal.c | 6 +- drivers/staging/epl/EplPdou.c | 6 +- drivers/staging/epl/demo_main.c | 2 +- drivers/staging/epl/global.h | 6 -- drivers/staging/epl/kernel/EplObdk.h | 12 +-- drivers/staging/epl/user/EplObdu.h | 6 +- drivers/staging/epl/user/EplObduCal.h | 6 +- drivers/staging/epl/user/EplPdou.h | 2 +- 17 files changed, 151 insertions(+), 174 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/Debug.h b/drivers/staging/epl/Debug.h index 35f784c82d22..68fe3c4b9f51 100644 --- a/drivers/staging/epl/Debug.h +++ b/drivers/staging/epl/Debug.h @@ -634,13 +634,13 @@ extern "C" { #endif - void DumpData(char *szStr_p, BYTE MEM * pbData_p, WORD wSize_p); + void DumpData(char *szStr_p, BYTE *pbData_p, WORD wSize_p); #ifdef __cplusplus } // von extern "C" #endif #define DEBUG_DUMP_DATA(lvl,str,ptr,siz) if ((DEBUG_GLB_LVL() & (lvl))==(lvl)) \ - DumpData (str, (BYTE MEM*) (ptr), (WORD) (siz)); + DumpData (str, (BYTE *)(ptr), (WORD)(siz)); #else #define DEBUG_DUMP_DATA(lvl,str,ptr,siz) diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h index cfcb067f34ff..454b2ba6ad3e 100644 --- a/drivers/staging/epl/Epl.h +++ b/drivers/staging/epl/Epl.h @@ -244,7 +244,7 @@ tEplKernel EplApiWriteLocalObject(unsigned int uiIndex_p, void *pSrcData_p, unsigned int uiSize_p); -tEplKernel EplApiCbObdAccess(tEplObdCbParam MEM *pParam_p); +tEplKernel EplApiCbObdAccess(tEplObdCbParam *pParam_p); tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, void *pVar_p, diff --git a/drivers/staging/epl/EplApiGeneric.c b/drivers/staging/epl/EplApiGeneric.c index 58286fccfc20..7a52267aca0c 100644 --- a/drivers/staging/epl/EplApiGeneric.c +++ b/drivers/staging/epl/EplApiGeneric.c @@ -196,7 +196,7 @@ static tEplKernel EplApiCbLedStateChange(tEplLedType LedType_p, BOOL fOn_p); #endif // OD initialization function (implemented in Objdict.c) -tEplKernel EplObdInitRam(tEplObdInitParam MEM *pInitParam_p); +tEplKernel EplObdInitRam(tEplObdInitParam *pInitParam_p); //=========================================================================// // // @@ -558,7 +558,7 @@ tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, { BYTE bVarEntries; BYTE bIndexEntries; - BYTE MEM *pbData; + BYTE *pbData; unsigned int uiSubindex; tEplVarParam VarParam; tEplObdSize EntrySize; @@ -574,7 +574,7 @@ tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, goto Exit; } - pbData = (BYTE MEM *) pVar_p; + pbData = (BYTE *)pVar_p; bVarEntries = (BYTE) * puiVarEntries_p; UsedSize = 0; @@ -962,7 +962,7 @@ tEplKernel EplApiMnTriggerStateChange(unsigned int uiNodeId_p, // //--------------------------------------------------------------------------- -tEplKernel EplApiCbObdAccess(tEplObdCbParam MEM *pParam_p) +tEplKernel EplApiCbObdAccess(tEplObdCbParam *pParam_p) { tEplKernel Ret = kEplSuccessful; diff --git a/drivers/staging/epl/EplInstDef.h b/drivers/staging/epl/EplInstDef.h index 31406662b3c2..5b7be34c14b8 100644 --- a/drivers/staging/epl/EplInstDef.h +++ b/drivers/staging/epl/EplInstDef.h @@ -83,7 +83,7 @@ typedef enum { //------------------------------------------------------------------------------------------ -typedef void MEM *tEplPtrInstance; +typedef void *tEplPtrInstance; typedef BYTE tEplInstanceHdl; // define const for illegale values @@ -99,7 +99,6 @@ typedef BYTE tEplInstanceHdl; //-------------------------------------------------------------------------------------- // memory attributes for instance table -#define INST_FAR // variables wich have to located in xdata #define STATIC // prevent warnings for variables with same name #define INSTANCE_TYPE_BEGIN typedef struct { @@ -116,12 +115,12 @@ typedef BYTE tEplInstanceHdl; #define CCM_DECL_INSTANCE_HDL_ tEplInstanceHdl InstanceHandle, // macros for declaration of pointer to instance handle within function header or prototype of API functions -#define CCM_DECL_PTR_INSTANCE_HDL tEplInstanceHdl MEM* pInstanceHandle -#define CCM_DECL_PTR_INSTANCE_HDL_ tEplInstanceHdl MEM* pInstanceHandle, +#define CCM_DECL_PTR_INSTANCE_HDL tEplInstanceHdl *pInstanceHandle +#define CCM_DECL_PTR_INSTANCE_HDL_ tEplInstanceHdl *pInstanceHandle, // macros for declaration instance as lokacl variable within functions -#define CCM_DECL_INSTANCE_PTR_LOCAL tCcmInstanceInfo MEM* pInstance; -#define CCM_DECL_PTR_INSTANCE_HDL_LOCAL tEplInstanceHdl MEM* pInstanceHandle; +#define CCM_DECL_INSTANCE_PTR_LOCAL tCcmInstanceInfo *pInstance; +#define CCM_DECL_PTR_INSTANCE_HDL_LOCAL tEplInstanceHdl *pInstanceHandle; // reference: @@ -162,10 +161,10 @@ typedef BYTE tEplInstanceHdl; //-------------------------------------------------------------------------------------- // macros for declaration within the function header, prototype or local var list - // Declaration of pointers within function paramater list must defined as void MEM* + // Declaration of pointers within function paramater list must defined as void * // pointer. -#define EPL_MCO_DECL_INSTANCE_PTR void MEM* pInstance -#define EPL_MCO_DECL_INSTANCE_PTR_ void MEM* pInstance, +#define EPL_MCO_DECL_INSTANCE_PTR void *pInstance +#define EPL_MCO_DECL_INSTANCE_PTR_ void *pInstance, #define EPL_MCO_DECL_INSTANCE_PTR_LOCAL tEplPtrInstance pInstance; // macros for reference of pointer to instance @@ -190,8 +189,8 @@ typedef BYTE tEplInstanceHdl; ASSERT (((tEplPtrInstance)pInstance)->m_InstState == kStateUsed); // macros for declaration of pointer to instance pointer -#define EPL_MCO_DECL_PTR_INSTANCE_PTR void MEM* MEM* pInstancePtr -#define EPL_MCO_DECL_PTR_INSTANCE_PTR_ void MEM* MEM* pInstancePtr, +#define EPL_MCO_DECL_PTR_INSTANCE_PTR void **pInstancePtr +#define EPL_MCO_DECL_PTR_INSTANCE_PTR_ void **pInstancePtr, // macros for reference of pointer to instance pointer // These macros are used for parameter passing to called function. @@ -211,9 +210,9 @@ typedef BYTE tEplInstanceHdl; // this macro deletes all instance entries as unused #define EPL_MCO_DELETE_INSTANCE_TABLE() \ { \ - tEplInstanceInfo MEM* pInstance = &aEplInstanceTable_g[0]; \ - tFastByte InstNumber = 0; \ - tFastByte i = EPL_MAX_INSTANCES; \ + tEplInstanceInfo * pInstance = &aEplInstanceTable_g[0]; \ + tFastByte InstNumber = 0; \ + tFastByte i = EPL_MAX_INSTANCES; \ do { \ pInstance->m_InstState = (BYTE) kStateUnused; \ pInstance->m_bInstIndex = (BYTE) InstNumber; \ @@ -229,8 +228,8 @@ typedef BYTE tEplInstanceHdl; static tEplPtrInstance GetInstancePtr (tEplInstanceHdl InstHandle_p) { \ return &aEplInstanceTable_g[InstHandle_p]; } \ static tEplPtrInstance GetFreeInstance (void) { \ - tEplInstanceInfo MEM* pInstance = &aEplInstanceTable_g[0]; \ - tFastByte i = EPL_MAX_INSTANCES; \ + tEplInstanceInfo *pInstance = &aEplInstanceTable_g[0]; \ + tFastByte i = EPL_MAX_INSTANCES; \ do { if (pInstance->m_InstState != kStateUsed) { \ return (tEplPtrInstance) pInstance; } \ pInstance++; i--; } \ @@ -239,7 +238,7 @@ typedef BYTE tEplInstanceHdl; // this macro defines the instance table. Each entry is reserved for an instance of CANopen. #define EPL_MCO_DECL_INSTANCE_VAR() \ - static tEplInstanceInfo MEM aEplInstanceTable_g [EPL_MAX_INSTANCES]; + static tEplInstanceInfo aEplInstanceTable_g [EPL_MAX_INSTANCES]; // this macro defines member variables in instance table which are needed in // all modules of Epl stack @@ -253,7 +252,6 @@ typedef BYTE tEplInstanceHdl; #else // only one instance is used // Memory attributes for instance table. -#define INST_FAR MEM // variables wich have to located in xdata #define STATIC static // prevent warnings for variables with same name #define INSTANCE_TYPE_BEGIN diff --git a/drivers/staging/epl/EplNmtk.c b/drivers/staging/epl/EplNmtk.c index ad85d8e8511e..51df9e68ac27 100644 --- a/drivers/staging/epl/EplNmtk.c +++ b/drivers/staging/epl/EplNmtk.c @@ -107,12 +107,12 @@ void TgtDbgPostTraceValue(DWORD dwTraceValue_p); // struct for instance table INSTANCE_TYPE_BEGIN EPL_MCO_DECL_INSTANCE_MEMBER() -STATIC volatile tEplNmtState INST_FAR m_NmtState; -STATIC volatile BOOL INST_FAR m_fEnableReadyToOperate; -STATIC volatile BOOL INST_FAR m_fAppReadyToOperate; -STATIC volatile BOOL INST_FAR m_fTimerMsPreOp2; -STATIC volatile BOOL INST_FAR m_fAllMandatoryCNIdent; -STATIC volatile BOOL INST_FAR m_fFrozen; +STATIC volatile tEplNmtState m_NmtState; +STATIC volatile BOOL m_fEnableReadyToOperate; +STATIC volatile BOOL m_fAppReadyToOperate; +STATIC volatile BOOL m_fTimerMsPreOp2; +STATIC volatile BOOL m_fAllMandatoryCNIdent; +STATIC volatile BOOL m_fFrozen; INSTANCE_TYPE_END //--------------------------------------------------------------------------- @@ -121,7 +121,7 @@ INSTANCE_TYPE_END // This macro replace the unspecific pointer to an instance through // the modul specific type for the local instance table. This macro // must defined in each modul. -//#define tEplPtrInstance tEplInstanceInfo MEM* +//#define tEplPtrInstance tEplInstanceInfo* EPL_MCO_DECL_INSTANCE_VAR() //--------------------------------------------------------------------------- // local function prototypes diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c index 7485c82d7c45..6d53e1ca83bc 100644 --- a/drivers/staging/epl/EplObd.c +++ b/drivers/staging/epl/EplObd.c @@ -101,7 +101,7 @@ // struct for instance table INSTANCE_TYPE_BEGIN EPL_MCO_DECL_INSTANCE_MEMBER() -STATIC tEplObdInitParam INST_FAR m_ObdInitParam; +STATIC tEplObdInitParam m_ObdInitParam; STATIC tEplObdStoreLoadObjCallback m_fpStoreLoadObjCallback; INSTANCE_TYPE_END @@ -119,11 +119,11 @@ typedef union { // This macro replace the unspecific pointer to an instance through // the modul specific type for the local instance table. This macro // must defined in each modul. -//#define tEplPtrInstance tEplInstanceInfo MEM* +//#define tEplPtrInstance tEplInstanceInfo * EPL_MCO_DECL_INSTANCE_VAR() -BYTE MEM abEplObdTrashObject_g[8]; +BYTE abEplObdTrashObject_g[8]; //--------------------------------------------------------------------------- // local function prototypes @@ -133,7 +133,7 @@ EPL_MCO_DEFINE_INSTANCE_FCT() static tEplKernel EplObdCallObjectCallback(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdCallback fpCallback_p, - tEplObdCbParam MEM * pCbParam_p); + tEplObdCbParam *pCbParam_p); static tEplObdSize EplObdGetDataSizeIntern(tEplObdSubEntryPtr pSubIndexEntry_p); @@ -146,7 +146,7 @@ static tEplKernel EplObdCheckObjectRange(tEplObdSubEntryPtr pSubindexEntry_p, #endif static tEplKernel EplObdGetVarEntry(tEplObdSubEntryPtr pSubindexEntry_p, - tEplObdVarEntry MEM ** ppVarEntry_p); + tEplObdVarEntry **ppVarEntry_p); static tEplKernel EplObdGetEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, @@ -156,7 +156,7 @@ static tEplKernel EplObdGetEntry(EPL_MCO_DECL_INSTANCE_PTR_ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p); -static tEplKernel EplObdGetIndexIntern(tEplObdInitParam MEM * pInitParam_p, +static tEplKernel EplObdGetIndexIntern(tEplObdInitParam *pInitParam_p, unsigned int uiIndex_p, tEplObdEntryPtr * ppObdEntry_p); @@ -170,17 +170,15 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdDir Direction_p); static void *EplObdGetObjectDefaultPtr(tEplObdSubEntryPtr pSubIndexEntry_p); -static void MEM *EplObdGetObjectCurrentPtr(tEplObdSubEntryPtr pSubIndexEntry_p); +static void *EplObdGetObjectCurrentPtr(tEplObdSubEntryPtr pSubIndexEntry_p); #if (EPL_OBD_USE_STORE_RESTORE != FALSE) -static tEplKernel EplObdCallStoreCallback(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdCbStoreParam MEM * - pCbStoreParam_p); +static tEplKernel EplObdCallStoreCallback(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdCbStoreParam *pCbStoreParam_p); #endif // (EPL_OBD_USE_STORE_RESTORE != FALSE) -static void EplObdCopyObjectData(void MEM * pDstData_p, +static void EplObdCopyObjectData(void *pDstData_p, void *pSrcData_p, tEplObdSize ObjSize_p, tEplObdType ObjType_p); @@ -196,12 +194,12 @@ static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int ui tEplObdSize Size_p, tEplObdEntryPtr *ppObdEntry_p, tEplObdSubEntryPtr *ppSubEntry_p, - tEplObdCbParam MEM *pCbParam_p, + tEplObdCbParam *pCbParam_p, tEplObdSize *pObdSize_p); static tEplKernel EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPtr pObdEntry_p, tEplObdSubEntryPtr pSubEntry_p, - tEplObdCbParam MEM *pCbParam_p, + tEplObdCbParam *pCbParam_p, void *pSrcData_p, void *pDstData_p, tEplObdSize ObdSize_p); @@ -226,7 +224,7 @@ static tEplKernel EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPt // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p) +EPLDLLEXPORT tEplKernel EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam *pInitParam_p) { tEplKernel Ret; @@ -258,7 +256,7 @@ EPLDLLEXPORT tEplKernel EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitPar // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p) +EPLDLLEXPORT tEplKernel EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam *pInitParam_p) { EPL_MCO_DECL_INSTANCE_PTR_LOCAL tEplKernel Ret; @@ -345,8 +343,8 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int tEplKernel Ret; tEplObdEntryPtr pObdEntry; tEplObdSubEntryPtr pSubEntry; - tEplObdCbParam MEM CbParam; - void MEM *pDstData; + tEplObdCbParam CbParam; + void *pDstData; tEplObdSize ObdSize; Ret = EplObdWriteEntryPre(EPL_MCO_INSTANCE_PTR_ @@ -405,7 +403,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int tEplKernel Ret; tEplObdEntryPtr pObdEntry; tEplObdSubEntryPtr pSubEntry; - tEplObdCbParam MEM CbParam; + tEplObdCbParam CbParam; void *pSrcData; tEplObdSize ObdSize; @@ -579,11 +577,11 @@ EPLDLLEXPORT tEplKernel EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdPar // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ tEplVarParam MEM *pVarParam_p) +EPLDLLEXPORT tEplKernel EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ tEplVarParam *pVarParam_p) { tEplKernel Ret; - tEplObdVarEntry MEM *pVarEntry; + tEplObdVarEntry *pVarEntry; tEplVarParamValid VarValid; tEplObdSubEntryPtr pSubindexEntry; @@ -738,7 +736,7 @@ EPLDLLEXPORT tEplKernel EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdE // //--------------------------------------------------------------------------- -EPLDLLEXPORT void EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdVarEntry MEM *pVarEntry_p, +EPLDLLEXPORT void EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdVarEntry *pVarEntry_p, tEplObdType Type_p, tEplObdSize ObdSize_p) { /* @@ -1010,7 +1008,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned tEplKernel Ret; tEplObdEntryPtr pObdEntry; tEplObdSubEntryPtr pSubEntry; - tEplObdCbParam MEM CbParam; + tEplObdCbParam CbParam; void *pSrcData; tEplObdSize ObdSize; @@ -1190,8 +1188,8 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign tEplKernel Ret; tEplObdEntryPtr pObdEntry; tEplObdSubEntryPtr pSubEntry; - tEplObdCbParam MEM CbParam; - void MEM *pDstData; + tEplObdCbParam CbParam; + void *pDstData; tEplObdSize ObdSize; QWORD qwBuffer; void *pBuffer = &qwBuffer; @@ -1371,7 +1369,7 @@ EPLDLLEXPORT tEplKernel EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ unsigned tEplKernel EplObdSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, unsigned int uiSubindex_p, - tEplObdVarEntry MEM **ppVarEntry_p) + tEplObdVarEntry **ppVarEntry_p) { tEplKernel Ret; @@ -1415,11 +1413,11 @@ EPL_MCO_DECL_INSTANCE_FCT() //--------------------------------------------------------------------------- static tEplKernel EplObdCallObjectCallback(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdCallback fpCallback_p, - tEplObdCbParam MEM * pCbParam_p) + tEplObdCbParam *pCbParam_p) { tEplKernel Ret; - tEplObdCallback MEM fpCallback; + tEplObdCallback fpCallback; // check for all API function if instance is valid EPL_MCO_CHECK_INSTANCE_STATE(); @@ -1461,7 +1459,7 @@ static tEplObdSize EplObdGetDataSizeIntern(tEplObdSubEntryPtr pSubIndexEntry_p) { tEplObdSize DataSize; - void MEM *pData; + void *pData; // If OD entry is defined by macro EPL_OBD_SUBINDEX_ROM_VSTRING // then the current pointer is always NULL. The function @@ -1470,8 +1468,7 @@ static tEplObdSize EplObdGetDataSizeIntern(tEplObdSubEntryPtr pSubIndexEntry_p) if (pSubIndexEntry_p->m_Type == kEplObdTypVString) { // The pointer to current value can be received from EplObdGetObjectCurrentPtr() - pData = - ((void MEM *)EplObdGetObjectCurrentPtr(pSubIndexEntry_p)); + pData = ((void *)EplObdGetObjectCurrentPtr(pSubIndexEntry_p)); if (pData != NULL) { DataSize = EplObdGetStrLen((void *)pData, DataSize, @@ -1857,7 +1854,7 @@ static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int ui tEplObdSize Size_p, tEplObdEntryPtr *ppObdEntry_p, tEplObdSubEntryPtr *ppSubEntry_p, - tEplObdCbParam MEM *pCbParam_p, + tEplObdCbParam *pCbParam_p, tEplObdSize *pObdSize_p) { @@ -1865,13 +1862,13 @@ static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int ui tEplObdEntryPtr pObdEntry; tEplObdSubEntryPtr pSubEntry; tEplObdAccess Access; - void MEM *pDstData; + void *pDstData; tEplObdSize ObdSize; BOOL fEntryNumerical; #if (EPL_OBD_USE_STRING_DOMAIN_IN_RAM != FALSE) - tEplObdVStringDomain MEM MemVStringDomain; - void MEM *pCurrData; + tEplObdVStringDomain MemVStringDomain; + void *pCurrData; #endif // check for all API function if instance is valid @@ -1887,7 +1884,7 @@ static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int ui goto Exit; } // get pointer to object data - pDstData = (void MEM *)EplObdGetObjectDataPtrIntern(pSubEntry); + pDstData = (void *)EplObdGetObjectDataPtrIntern(pSubEntry); Access = (tEplObdAccess) pSubEntry->m_Access; @@ -1912,7 +1909,7 @@ static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int ui // adapted by user callback function, re-read // this values. ObdSize = EplObdGetObjectSize(pSubEntry); - pDstData = (void MEM *)EplObdGetObjectDataPtrIntern(pSubEntry); + pDstData = (void *)EplObdGetObjectDataPtrIntern(pSubEntry); // 09-dec-2004 r.d.: // Function EplObdWriteEntry() calls new event kEplObdEvWrStringDomain @@ -1946,23 +1943,19 @@ static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int ui pCurrData = pSubEntry->m_pCurrent; if ((pSubEntry->m_Type == kEplObdTypVString) || (pSubEntry->m_Type == kEplObdTypOString)) { - ((tEplObdVString MEM *) pCurrData)->m_Size = - MemVStringDomain.m_ObjSize; - ((tEplObdVString MEM *) pCurrData)->m_pString = - MemVStringDomain.m_pData; + ((tEplObdVString *)pCurrData)->m_Size = MemVStringDomain.m_ObjSize; + ((tEplObdVString *)pCurrData)->m_pString = MemVStringDomain.m_pData; } else // if (pSdosTableEntry_p->m_bObjType == kEplObdTypDomain) { - ((tEplObdVarEntry MEM *) pCurrData)->m_Size = - MemVStringDomain.m_ObjSize; - ((tEplObdVarEntry MEM *) pCurrData)->m_pData = - (void MEM *)MemVStringDomain.m_pData; + ((tEplObdVarEntry *)pCurrData)->m_Size = MemVStringDomain.m_ObjSize; + ((tEplObdVarEntry *)pCurrData)->m_pData = (void *)MemVStringDomain.m_pData; } // Because object size and object pointer are // adapted by user callback function, re-read // this values. ObdSize = MemVStringDomain.m_ObjSize; - pDstData = (void MEM *)MemVStringDomain.m_pData; + pDstData = (void *)MemVStringDomain.m_pData; } #endif //#if (OBD_USE_STRING_DOMAIN_IN_RAM != FALSE) @@ -1983,7 +1976,7 @@ static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int ui } if (pSubEntry->m_Type == kEplObdTypVString) { - if (((char MEM *)pSrcData_p)[Size_p - 1] == '\0') { // last byte of source string contains null character + if (((char *)pSrcData_p)[Size_p - 1] == '\0') { // last byte of source string contains null character // reserve one byte in destination for 0-termination Size_p -= 1; @@ -2045,7 +2038,7 @@ static tEplKernel EplObdWriteEntryPre(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int ui static tEplKernel EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPtr pObdEntry_p, tEplObdSubEntryPtr pSubEntry_p, - tEplObdCbParam MEM *pCbParam_p, + tEplObdCbParam *pCbParam_p, void *pSrcData_p, void *pDstData_p, tEplObdSize ObdSize_p) @@ -2081,7 +2074,7 @@ static tEplKernel EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPt // terminate string with 0 if (pSubEntry_p->m_Type == kEplObdTypVString) { - ((char MEM *)pDstData_p)[ObdSize_p] = '\0'; + ((char *)pDstData_p)[ObdSize_p] = '\0'; } // write address of destination to structure of callback parameters // so callback function can change data subsequently @@ -2170,8 +2163,8 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p) case kEplObdTypDomain: pData = (void *)pSubIndexEntry_p->m_pCurrent; - if ((void MEM *)pData != (void MEM *)NULL) { - DataSize = ((tEplObdVarEntry MEM *) pData)->m_Size; + if ((void *)pData != (void *)NULL) { + DataSize = ((tEplObdVarEntry *) pData)->m_Size; } break; @@ -2183,11 +2176,11 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p) // then the current pointer is always NULL. The function // returns the length of default string. pData = (void *)pSubIndexEntry_p->m_pCurrent; - if ((void MEM *)pData != (void MEM *)NULL) { + if ((void *)pData != (void *)NULL) { // The max. size of strings defined by STRING-Macro is stored in // tEplObdVString of current value. // (types tEplObdVString, tEplObdOString and tEplObdUString has the same members) - DataSize = ((tEplObdVString MEM *) pData)->m_Size; + DataSize = ((tEplObdVString *) pData)->m_Size; } else { // The current position is not decleared. The string // is located in ROM, therefor use default pointer. @@ -2207,11 +2200,11 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p) case kEplObdTypOString: pData = (void *)pSubIndexEntry_p->m_pCurrent; - if ((void MEM *)pData != (void MEM *)NULL) { + if ((void *)pData != (void *)NULL) { // The max. size of strings defined by STRING-Macro is stored in // tEplObdVString of current value. // (types tEplObdVString, tEplObdOString and tEplObdUString has the same members) - DataSize = ((tEplObdOString MEM *) pData)->m_Size; + DataSize = ((tEplObdOString *) pData)->m_Size; } else { // The current position is not decleared. The string // is located in ROM, therefor use default pointer. @@ -2344,7 +2337,7 @@ static void *EplObdGetObjectDefaultPtr(tEplObdSubEntryPtr pSubIndexEntry_p) //--------------------------------------------------------------------------- static tEplKernel EplObdGetVarEntry(tEplObdSubEntryPtr pSubindexEntry_p, - tEplObdVarEntry MEM ** ppVarEntry_p) + tEplObdVarEntry **ppVarEntry_p) { tEplKernel Ret = kEplObdVarEntryNotExist; @@ -2356,13 +2349,9 @@ static tEplKernel EplObdGetVarEntry(tEplObdSubEntryPtr pSubindexEntry_p, if ((pSubindexEntry_p->m_Access & kEplObdAccVar) != 0) { // check if object is an array if ((pSubindexEntry_p->m_Access & kEplObdAccArray) != 0) { - *ppVarEntry_p = - &((tEplObdVarEntry MEM *) pSubindexEntry_p-> - m_pCurrent)[pSubindexEntry_p->m_uiSubIndex - 1]; + *ppVarEntry_p = &((tEplObdVarEntry *)pSubindexEntry_p->m_pCurrent)[pSubindexEntry_p->m_uiSubIndex - 1]; } else { - *ppVarEntry_p = - (tEplObdVarEntry MEM *) pSubindexEntry_p-> - m_pCurrent; + *ppVarEntry_p = (tEplObdVarEntry *)pSubindexEntry_p->m_pCurrent; } Ret = kEplSuccessful; @@ -2398,7 +2387,7 @@ static tEplKernel EplObdGetEntry(EPL_MCO_DECL_INSTANCE_PTR_ { tEplObdEntryPtr pObdEntry; - tEplObdCbParam MEM CbParam; + tEplObdCbParam CbParam; tEplKernel Ret; // check for all API function if instance is valid @@ -2452,16 +2441,16 @@ static tEplKernel EplObdGetEntry(EPL_MCO_DECL_INSTANCE_PTR_ // // Parameters: pSubIndexEntry_p // -// Return: void MEM* +// Return: void * // // State: // //--------------------------------------------------------------------------- -static void MEM *EplObdGetObjectCurrentPtr(tEplObdSubEntryPtr pSubIndexEntry_p) +static void *EplObdGetObjectCurrentPtr(tEplObdSubEntryPtr pSubIndexEntry_p) { - void MEM *pData; + void *pData; unsigned int uiArrayIndex; tEplObdSize Size; @@ -2478,24 +2467,21 @@ static void MEM *EplObdGetObjectCurrentPtr(tEplObdSubEntryPtr pSubIndexEntry_p) } else { Size = EplObdGetObjectSize(pSubIndexEntry_p); } - pData = ((BYTE MEM *) pData) + (Size * uiArrayIndex); + pData = ((BYTE *) pData) + (Size * uiArrayIndex); } // check if VarEntry if ((pSubIndexEntry_p->m_Access & kEplObdAccVar) != 0) { // The data pointer is stored in VarEntry->pData - pData = ((tEplObdVarEntry MEM *) pData)->m_pData; + pData = ((tEplObdVarEntry *) pData)->m_pData; } // the default pointer is stored for strings in tEplObdVString else if ((pSubIndexEntry_p->m_Type == kEplObdTypVString) /* || (pSubIndexEntry_p->m_Type == kEplObdTypUString) */ ) { - pData = - (void MEM *)((tEplObdVString MEM *) pData)-> - m_pString; + pData = (void *)((tEplObdVString *)pData)->m_pString; } else if (pSubIndexEntry_p->m_Type == kEplObdTypOString) { pData = - (void MEM *)((tEplObdOString MEM *) pData)-> - m_pString; + (void *)((tEplObdOString *)pData)->m_pString; } } @@ -2519,7 +2505,7 @@ static void MEM *EplObdGetObjectCurrentPtr(tEplObdSubEntryPtr pSubIndexEntry_p) // //--------------------------------------------------------------------------- -static tEplKernel EplObdGetIndexIntern(tEplObdInitParam MEM * pInitParam_p, +static tEplKernel EplObdGetIndexIntern(tEplObdInitParam *pInitParam_p, unsigned int uiIndex_p, tEplObdEntryPtr * ppObdEntry_p) { @@ -2778,12 +2764,12 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdSubEntryPtr pSubIndex; unsigned int nSubIndexCount; tEplObdAccess Access; - void MEM *pDstData; + void *pDstData; void *pDefault; tEplObdSize ObjSize; tEplKernel Ret; - tEplObdCbStoreParam MEM CbStore; - tEplObdVarEntry MEM *pVarEntry; + tEplObdCbStoreParam CbStore; + tEplObdVarEntry *pVarEntry; ASSERT(pObdEnty_p != NULL); @@ -2866,7 +2852,7 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ } else { - EplObdInitVarEntry ((tEplObdVarEntry MEM*) (((BYTE MEM*) pSubIndex->m_pCurrent) + (sizeof (tEplObdVarEntry) * pSubIndex->m_uiSubIndex)), + EplObdInitVarEntry ((tEplObdVarEntry *) (((BYTE *) pSubIndex->m_pCurrent) + (sizeof (tEplObdVarEntry) * pSubIndex->m_uiSubIndex)), pSubIndex->m_Type, ObjSize); } */ @@ -2893,11 +2879,11 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ // For copying data we have to set the destination pointer to the real RAM string. This // pointer to RAM string is located in default string info structure. (translated r.d.) - pDstData = (void MEM *)((tEplObdVStringDef*) pSubIndex->m_pDefault)->m_pString; + pDstData = (void *)((tEplObdVStringDef*) pSubIndex->m_pDefault)->m_pString; ObjSize = ((tEplObdVStringDef *)pSubIndex->m_pDefault)->m_Size; - ((tEplObdVString MEM *)pSubIndex->m_pCurrent)->m_pString = pDstData; - ((tEplObdVString MEM *)pSubIndex->m_pCurrent)->m_Size = ObjSize; + ((tEplObdVString *)pSubIndex->m_pCurrent)->m_pString = pDstData; + ((tEplObdVString *)pSubIndex->m_pCurrent)->m_Size = ObjSize; } } else if (pSubIndex->m_Type == @@ -2912,11 +2898,11 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ // For copying data we have to set the destination pointer to the real RAM string. This // pointer to RAM string is located in default string info structure. (translated r.d.) - pDstData = (void MEM *)((tEplObdOStringDef *) pSubIndex->m_pDefault)->m_pString; + pDstData = (void *)((tEplObdOStringDef *) pSubIndex->m_pDefault)->m_pString; ObjSize = ((tEplObdOStringDef *)pSubIndex->m_pDefault)->m_Size; - ((tEplObdOString MEM *)pSubIndex->m_pCurrent)->m_pString = pDstData; - ((tEplObdOString MEM *)pSubIndex->m_pCurrent)->m_Size = ObjSize; + ((tEplObdOString *)pSubIndex->m_pCurrent)->m_pString = pDstData; + ((tEplObdOString *)pSubIndex->m_pCurrent)->m_Size = ObjSize; } } @@ -3056,7 +3042,7 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ // Returns: tEplKernel = error code // ---------------------------------------------------------------------------- -static void EplObdCopyObjectData(void MEM * pDstData_p, +static void EplObdCopyObjectData(void *pDstData_p, void *pSrcData_p, tEplObdSize ObjSize_p, tEplObdType ObjType_p) { @@ -3087,7 +3073,7 @@ static void EplObdCopyObjectData(void MEM * pDstData_p, EPL_MEMCPY(pDstData_p, pSrcData_p, ObjSize_p); if (ObjType_p == kEplObdTypVString) { - ((char MEM *)pDstData_p)[StrSize] = '\0'; + ((char *)pDstData_p)[StrSize] = '\0'; } } } @@ -3148,7 +3134,7 @@ static tEplKernel EplObdIsNumericalIntern(tEplObdSubEntryPtr pObdSubEntry_p, // ---------------------------------------------------------------------------- #if (EPL_OBD_USE_STORE_RESTORE != FALSE) static tEplKernel EplObdCallStoreCallback(EPL_MCO_DECL_INSTANCE_PTR_ - tEplObdCbStoreParam MEM * + tEplObdCbStoreParam * pCbStoreParam_p) { diff --git a/drivers/staging/epl/EplObd.h b/drivers/staging/epl/EplObd.h index a70139c6bbc2..e2dd2278a1bc 100644 --- a/drivers/staging/epl/EplObd.h +++ b/drivers/staging/epl/EplObd.h @@ -290,14 +290,14 @@ typedef struct { unsigned int m_uiIndex; unsigned int m_uiSubindex; tEplObdSize m_Size; - void MEM *m_pData; + void *m_pData; // tEplVarCallback m_fpCallback; // void * m_pArg; } tEplVarParam; typedef struct { - void MEM *m_pData; + void *m_pData; tEplObdSize m_Size; /* #if (EPL_PDO_USE_STATIC_MAPPING == FALSE) @@ -353,7 +353,7 @@ typedef struct { tEplObdType m_Type; tEplObdAccess m_Access; void *m_pDefault; - void MEM *m_pCurrent; // points always to RAM + void *m_pCurrent; // points always to RAM } tEplObdSubEntry; @@ -375,7 +375,7 @@ typedef struct { } tEplObdCbParam; // define type for callback function: pParam_p points to tEplObdCbParam -typedef tEplKernel(*tEplObdCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbParam MEM * pParam_p); +typedef tEplKernel(*tEplObdCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbParam *pParam_p); // do not change the order for this struct!!! @@ -414,15 +414,14 @@ typedef struct { typedef struct { tEplObdCommand m_bCommand; tEplObdPart m_bCurrentOdPart; - void MEM *m_pData; + void *m_pData; tEplObdSize m_ObjSize; } tEplObdCbStoreParam; -typedef tEplKernel(*tInitTabEntryCallback) (void MEM * pTabEntry_p, - unsigned int uiObjIndex_p); +typedef tEplKernel(*tInitTabEntryCallback) (void *pTabEntry_p, unsigned int uiObjIndex_p); -typedef tEplKernel(*tEplObdStoreLoadObjCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbStoreParam MEM *pCbStoreParam_p); +typedef tEplKernel(*tEplObdStoreLoadObjCallback) (CCM_DECL_INSTANCE_HDL_ tEplObdCbStoreParam *pCbStoreParam_p); // ------------------------------------------------------------------------- // this stucture is used for parameters for function ObdInitModuleTab() @@ -431,7 +430,7 @@ typedef struct { unsigned int m_uiLowerObjIndex; // lower limit of ObjIndex unsigned int m_uiUpperObjIndex; // upper limit of ObjIndex tInitTabEntryCallback m_fpInitTabEntry; // will be called if ObjIndex was found - void MEM *m_pTabBase; // base address of table + void *m_pTabBase; // base address of table unsigned int m_uiEntrySize; // size of table entry // 25-feb-2005 r.d.: expansion from BYTE to WORD necessary for PDO bit mapping unsigned int m_uiMaxEntries; // max. tabel entries diff --git a/drivers/staging/epl/EplObdMacro.h b/drivers/staging/epl/EplObdMacro.h index 23f2ad80dde8..21849b059e3b 100644 --- a/drivers/staging/epl/EplObdMacro.h +++ b/drivers/staging/epl/EplObdMacro.h @@ -102,10 +102,10 @@ #define EPL_OBD_SUBINDEX_RAM_VAR(ind,sub,typ,acc,dtyp,name,val) static dtyp xDef##ind##_##sub##_g = val; #define EPL_OBD_SUBINDEX_RAM_VAR_RG(ind,sub,typ,acc,dtyp,name,val,low,high) static dtyp xDef##ind##_##sub##_g[3] = {val,low,high}; #define EPL_OBD_SUBINDEX_RAM_VAR_NOINIT(ind,sub,typ,acc,dtyp,name) -#define EPL_OBD_SUBINDEX_RAM_VSTRING(ind,sub,acc,name,size,val) static char MEM szCur##ind##_##sub##_g[size+1]; \ +#define EPL_OBD_SUBINDEX_RAM_VSTRING(ind,sub,acc,name,size,val) static char szCur##ind##_##sub##_g[size+1]; \ static tEplObdVStringDef xDef##ind##_##sub##_g = {size, val, szCur##ind##_##sub##_g}; -#define EPL_OBD_SUBINDEX_RAM_OSTRING(ind,sub,acc,name,size) static BYTE MEM bCur##ind##_##sub##_g[size]; \ +#define EPL_OBD_SUBINDEX_RAM_OSTRING(ind,sub,acc,name,size) static BYTE bCur##ind##_##sub##_g[size]; \ static tEplObdOStringDef xDef##ind##_##sub##_g = {size, ((BYTE*)""), bCur##ind##_##sub##_g}; #define EPL_OBD_SUBINDEX_RAM_DOMAIN(ind,sub,acc,name) #define EPL_OBD_SUBINDEX_RAM_USERDEF(ind,sub,typ,acc,dtyp,name,val) static dtyp xDef##ind##_##sub##_g = val; @@ -129,20 +129,20 @@ //--------------------------------------------------------------------------------------- #define EPL_OBD_BEGIN_INDEX_RAM(ind,cnt,call) #define EPL_OBD_END_INDEX(ind) -#define EPL_OBD_RAM_INDEX_RAM_ARRAY(ind,cnt,call,typ,acc,dtyp,name,def) static dtyp MEM axCur##ind##_g[cnt]; -#define EPL_OBD_RAM_INDEX_RAM_VARARRAY(ind,cnt,call,typ,acc,dtyp,name,def) static tEplObdVarEntry MEM aVarEntry##ind##_g[cnt]; -#define EPL_OBD_RAM_INDEX_RAM_VARARRAY_NOINIT(ind,cnt,call,typ,acc,dtyp,name) static tEplObdVarEntry MEM aVarEntry##ind##_g[cnt]; +#define EPL_OBD_RAM_INDEX_RAM_ARRAY(ind,cnt,call,typ,acc,dtyp,name,def) static dtyp axCur##ind##_g[cnt]; +#define EPL_OBD_RAM_INDEX_RAM_VARARRAY(ind,cnt,call,typ,acc,dtyp,name,def) static tEplObdVarEntry aVarEntry##ind##_g[cnt]; +#define EPL_OBD_RAM_INDEX_RAM_VARARRAY_NOINIT(ind,cnt,call,typ,acc,dtyp,name) static tEplObdVarEntry aVarEntry##ind##_g[cnt]; //--------------------------------------------------------------------------------------- -#define EPL_OBD_SUBINDEX_RAM_VAR(ind,sub,typ,acc,dtyp,name,val) static dtyp MEM xCur##ind##_##sub##_g; -#define EPL_OBD_SUBINDEX_RAM_VAR_RG(ind,sub,typ,acc,dtyp,name,val,low,high) static dtyp MEM xCur##ind##_##sub##_g; -#define EPL_OBD_SUBINDEX_RAM_VSTRING(ind,sub,acc,name,size,val) static tEplObdVString MEM xCur##ind##_##sub##_g; -#define EPL_OBD_SUBINDEX_RAM_OSTRING(ind,sub,acc,name,size) static tEplObdOString MEM xCur##ind##_##sub##_g; -#define EPL_OBD_SUBINDEX_RAM_VAR_NOINIT(ind,sub,typ,acc,dtyp,name) static dtyp MEM xCur##ind##_##sub##_g; -#define EPL_OBD_SUBINDEX_RAM_DOMAIN(ind,sub,acc,name) static tEplObdVarEntry MEM VarEntry##ind##_##sub##_g; -#define EPL_OBD_SUBINDEX_RAM_USERDEF(ind,sub,typ,acc,dtyp,name,val) static tEplObdVarEntry MEM VarEntry##ind##_##sub##_g; -#define EPL_OBD_SUBINDEX_RAM_USERDEF_RG(ind,sub,typ,acc,dtyp,name,val,low,high) static tEplObdVarEntry MEM VarEntry##ind##_##sub##_g; -#define EPL_OBD_SUBINDEX_RAM_USERDEF_NOINIT(ind,sub,typ,acc,dtyp,name) static tEplObdVarEntry MEM VarEntry##ind##_##sub##_g; +#define EPL_OBD_SUBINDEX_RAM_VAR(ind,sub,typ,acc,dtyp,name,val) static dtyp xCur##ind##_##sub##_g; +#define EPL_OBD_SUBINDEX_RAM_VAR_RG(ind,sub,typ,acc,dtyp,name,val,low,high) static dtyp xCur##ind##_##sub##_g; +#define EPL_OBD_SUBINDEX_RAM_VSTRING(ind,sub,acc,name,size,val) static tEplObdVString xCur##ind##_##sub##_g; +#define EPL_OBD_SUBINDEX_RAM_OSTRING(ind,sub,acc,name,size) static tEplObdOString xCur##ind##_##sub##_g; +#define EPL_OBD_SUBINDEX_RAM_VAR_NOINIT(ind,sub,typ,acc,dtyp,name) static dtyp xCur##ind##_##sub##_g; +#define EPL_OBD_SUBINDEX_RAM_DOMAIN(ind,sub,acc,name) static tEplObdVarEntry VarEntry##ind##_##sub##_g; +#define EPL_OBD_SUBINDEX_RAM_USERDEF(ind,sub,typ,acc,dtyp,name,val) static tEplObdVarEntry VarEntry##ind##_##sub##_g; +#define EPL_OBD_SUBINDEX_RAM_USERDEF_RG(ind,sub,typ,acc,dtyp,name,val,low,high) static tEplObdVarEntry VarEntry##ind##_##sub##_g; +#define EPL_OBD_SUBINDEX_RAM_USERDEF_NOINIT(ind,sub,typ,acc,dtyp,name) static tEplObdVarEntry VarEntry##ind##_##sub##_g; //------------------------------------------------------------------------------------------- #elif defined (EPL_OBD_CREATE_SUBINDEX_TAB) @@ -159,17 +159,17 @@ #define EPL_OBD_END_PART() //--------------------------------------------------------------------------------------- -#define EPL_OBD_BEGIN_INDEX_RAM(ind,cnt,call) static tEplObdSubEntry MEM aObdSubEntry##ind##Ram_g[cnt]= { +#define EPL_OBD_BEGIN_INDEX_RAM(ind,cnt,call) static tEplObdSubEntry aObdSubEntry##ind##Ram_g[cnt]= { #define EPL_OBD_END_INDEX(ind) EPL_OBD_END_SUBINDEX()}; -#define EPL_OBD_RAM_INDEX_RAM_ARRAY(ind,cnt,call,typ,acc,dtyp,name,def) static tEplObdSubEntry MEM aObdSubEntry##ind##Ram_g[]= { \ +#define EPL_OBD_RAM_INDEX_RAM_ARRAY(ind,cnt,call,typ,acc,dtyp,name,def) static tEplObdSubEntry aObdSubEntry##ind##Ram_g[]= { \ {0, kEplObdTypUInt8, kEplObdAccCR, &xDef##ind##_0x00_g, NULL}, \ {1, typ, (acc)|kEplObdAccArray, &xDef##ind##_0x01_g, &axCur##ind##_g[0]}, \ EPL_OBD_END_SUBINDEX()}; -#define EPL_OBD_RAM_INDEX_RAM_VARARRAY(ind,cnt,call,typ,acc,dtyp,name,def) static tEplObdSubEntry MEM aObdSubEntry##ind##Ram_g[]= { \ +#define EPL_OBD_RAM_INDEX_RAM_VARARRAY(ind,cnt,call,typ,acc,dtyp,name,def) static tEplObdSubEntry aObdSubEntry##ind##Ram_g[]= { \ {0, kEplObdTypUInt8, kEplObdAccCR, &xDef##ind##_0x00_g, NULL}, \ {1, typ, (acc)|kEplObdAccArray|kEplObdAccVar, &xDef##ind##_0x01_g, &aVarEntry##ind##_g[0]}, \ EPL_OBD_END_SUBINDEX()}; -#define EPL_OBD_RAM_INDEX_RAM_VARARRAY_NOINIT(ind,cnt,call,typ,acc,dtyp,name) static tEplObdSubEntry MEM aObdSubEntry##ind##Ram_g[]= { \ +#define EPL_OBD_RAM_INDEX_RAM_VARARRAY_NOINIT(ind,cnt,call,typ,acc,dtyp,name) static tEplObdSubEntry aObdSubEntry##ind##Ram_g[]= { \ {0, kEplObdTypUInt8, kEplObdAccCR, &xDef##ind##_0x00_g, NULL}, \ {1, typ, (acc)|kEplObdAccArray|kEplObdAccVar, NULL, &aVarEntry##ind##_g[0]}, \ EPL_OBD_END_SUBINDEX()}; diff --git a/drivers/staging/epl/EplObdu.c b/drivers/staging/epl/EplObdu.c index 60f590bfbea0..da975ff01f30 100644 --- a/drivers/staging/epl/EplObdu.c +++ b/drivers/staging/epl/EplObdu.c @@ -201,7 +201,7 @@ EPLDLLEXPORT tEplKernel EplObduAccessOdPart(tEplObdPart ObdPart_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplObduDefineVar(tEplVarParam MEM *pVarParam_p) +EPLDLLEXPORT tEplKernel EplObduDefineVar(tEplVarParam *pVarParam_p) { tEplKernel Ret; @@ -274,7 +274,7 @@ EPLDLLEXPORT tEplKernel EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry MEM *pVarEntry_p, +EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry *pVarEntry_p, BYTE bType_p, tEplObdSize ObdSize_p) { EplObduCalInitVarEntry(pVarEntry_p, bType_p, ObdSize_p); @@ -473,7 +473,7 @@ EPLDLLEXPORT tEplKernel EplObduWriteEntryFromLe(unsigned int uiIndex_p, //--------------------------------------------------------------------------- EPLDLLEXPORT tEplKernel EplObduSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, unsigned int uiSubindex_p, - tEplObdVarEntry MEM **ppVarEntry_p) + tEplObdVarEntry **ppVarEntry_p) { tEplKernel Ret; diff --git a/drivers/staging/epl/EplObduCal.c b/drivers/staging/epl/EplObduCal.c index 980d382d49a4..fc04d9a7c0e4 100644 --- a/drivers/staging/epl/EplObduCal.c +++ b/drivers/staging/epl/EplObduCal.c @@ -212,7 +212,7 @@ EPLDLLEXPORT tEplKernel EplObduCalAccessOdPart(tEplObdPart ObdPart_p, // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplObduCalDefineVar(tEplVarParam MEM *pVarParam_p) +EPLDLLEXPORT tEplKernel EplObduCalDefineVar(tEplVarParam *pVarParam_p) { tEplKernel Ret; @@ -296,7 +296,7 @@ EPLDLLEXPORT tEplKernel EplObduCalRegisterUserOd(tEplObdEntryPtr pUserOd_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry MEM *pVarEntry_p, +EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry *pVarEntry_p, BYTE bType_p, tEplObdSize ObdSize_p) { #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) @@ -507,7 +507,7 @@ EPLDLLEXPORT tEplKernel EplObduCalWriteEntryFromLe(unsigned int uiIndex_p, //--------------------------------------------------------------------------- EPLDLLEXPORT tEplKernel EplObduCalSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, unsigned int uiSubindex_p, - tEplObdVarEntry MEM **ppVarEntry_p) + tEplObdVarEntry **ppVarEntry_p) { tEplKernel Ret; diff --git a/drivers/staging/epl/EplPdou.c b/drivers/staging/epl/EplPdou.c index dfaabb4b9496..606f03269b34 100644 --- a/drivers/staging/epl/EplPdou.c +++ b/drivers/staging/epl/EplPdou.c @@ -149,7 +149,7 @@ // local function prototypes //--------------------------------------------------------------------------- -static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam MEM * pParam_p, +static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam *pParam_p, unsigned int uiIndex_p); static void EplPdouDecodeObjectMapping(QWORD qwObjectMapping_p, @@ -226,7 +226,7 @@ tEplKernel EplPdouDelInstance(void) // //--------------------------------------------------------------------------- -tEplKernel EplPdouCbObdAccess(tEplObdCbParam MEM *pParam_p) +tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p) { tEplKernel Ret = kEplSuccessful; unsigned int uiPdoId; @@ -394,7 +394,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam MEM *pParam_p) // //--------------------------------------------------------------------------- -static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam MEM * pParam_p, +static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam *pParam_p, unsigned int uiIndex_p) { tEplKernel Ret = kEplSuccessful; diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c index 20787dc18b9a..6e0db9a25fe9 100644 --- a/drivers/staging/epl/demo_main.c +++ b/drivers/staging/epl/demo_main.c @@ -188,7 +188,7 @@ module_param_named(cyclelen, uiCycleLen_g, uint, 0); // this function prototype here. If you want to use more than one Epl // instances then the function name of each object dictionary has to differ. -tEplKernel EplObdInitRam(tEplObdInitParam MEM * pInitParam_p); +tEplKernel EplObdInitRam(tEplObdInitParam *pInitParam_p); tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) tEplApiEventArg *pEventArg_p, // IN: event argument (union) diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index b5902da8fa46..74db85ce36c9 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -27,12 +27,6 @@ #define QWORD long long int #endif - // ------------------ GNUC for I386 --------------------------------------------- - -#define HWACC // hardware access through external memory (i.e. CAN) - -#define MEM // Memory attribute to optimize speed and code of pointer access. - #ifndef CONST #define CONST const // variables mapped to ROM (i.e. flash) #endif diff --git a/drivers/staging/epl/kernel/EplObdk.h b/drivers/staging/epl/kernel/EplObdk.h index eafd0bf54bea..30e51d0eb46a 100644 --- a/drivers/staging/epl/kernel/EplObdk.h +++ b/drivers/staging/epl/kernel/EplObdk.h @@ -85,17 +85,17 @@ // global variables //--------------------------------------------------------------------------- -extern BYTE MEM abEplObdTrashObject_g[8]; +extern BYTE abEplObdTrashObject_g[8]; //--------------------------------------------------------------------------- // function prototypes //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p); +EPLDLLEXPORT tEplKernel EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam *pInitParam_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam MEM *pInitParam_p); +EPLDLLEXPORT tEplKernel EplObdAddInstance(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam *pInitParam_p); // --------------------------------------------------------------------- EPLDLLEXPORT tEplKernel EplObdDeleteInstance(EPL_MCO_DECL_INSTANCE_PTR); @@ -120,7 +120,7 @@ EPLDLLEXPORT tEplKernel EplObdAccessOdPart(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdPar tEplObdDir Direction_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ tEplVarParam MEM *pVarParam_p); +EPLDLLEXPORT tEplKernel EplObdDefineVar(EPL_MCO_DECL_INSTANCE_PTR_ tEplVarParam *pVarParam_p); // --------------------------------------------------------------------- EPLDLLEXPORT void *EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, @@ -129,7 +129,7 @@ EPLDLLEXPORT void *EplObdGetObjectDataPtr(EPL_MCO_DECL_INSTANCE_PTR_ unsigned in EPLDLLEXPORT tEplKernel EplObdRegisterUserOd(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPtr pUserOd_p); // --------------------------------------------------------------------- -EPLDLLEXPORT void EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdVarEntry MEM *pVarEntry_p, +EPLDLLEXPORT void EplObdInitVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdVarEntry *pVarEntry_p, tEplObdType Type_p, tEplObdSize ObdSize_p); @@ -168,7 +168,7 @@ EPLDLLEXPORT tEplKernel EplObdGetAccessType(EPL_MCO_DECL_INSTANCE_PTR_ unsigned // --------------------------------------------------------------------- EPLDLLEXPORT tEplKernel EplObdSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, unsigned int uiSubindex_p, - tEplObdVarEntry MEM **ppVarEntry_p); + tEplObdVarEntry **ppVarEntry_p); #endif // end of #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) diff --git a/drivers/staging/epl/user/EplObdu.h b/drivers/staging/epl/user/EplObdu.h index c9138cb084ef..679ff6f054f3 100644 --- a/drivers/staging/epl/user/EplObdu.h +++ b/drivers/staging/epl/user/EplObdu.h @@ -107,7 +107,7 @@ EPLDLLEXPORT tEplKernel EplObduAccessOdPart(tEplObdPart ObdPart_p, tEplObdDir Direction_p); // --------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplObduDefineVar(tEplVarParam MEM * pVarParam_p); +EPLDLLEXPORT tEplKernel EplObduDefineVar(tEplVarParam *pVarParam_p); // --------------------------------------------------------------------- EPLDLLEXPORT void *EplObduGetObjectDataPtr(unsigned int uiIndex_p, @@ -116,7 +116,7 @@ EPLDLLEXPORT void *EplObduGetObjectDataPtr(unsigned int uiIndex_p, EPLDLLEXPORT tEplKernel EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p); // --------------------------------------------------------------------- -EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry MEM * pVarEntry_p, +EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry *pVarEntry_p, BYTE bType_p, tEplObdSize ObdSize_p); // --------------------------------------------------------------------- @@ -148,7 +148,7 @@ EPLDLLEXPORT tEplKernel EplObduWriteEntryFromLe(unsigned int uiIndex_p, EPLDLLEXPORT tEplKernel EplObduSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, unsigned int uiSubindex_p, - tEplObdVarEntry MEM **ppVarEntry_p); + tEplObdVarEntry **ppVarEntry_p); #elif EPL_OBD_USE_KERNEL != FALSE #include "../kernel/EplObdk.h" diff --git a/drivers/staging/epl/user/EplObduCal.h b/drivers/staging/epl/user/EplObduCal.h index 367ecc56d15f..2f067bfd7c16 100644 --- a/drivers/staging/epl/user/EplObduCal.h +++ b/drivers/staging/epl/user/EplObduCal.h @@ -98,14 +98,14 @@ EPLDLLEXPORT tEplKernel EplObduCalReadEntry(unsigned int uiIndex_p, EPLDLLEXPORT tEplKernel EplObduCalAccessOdPart(tEplObdPart ObdPart_p, tEplObdDir Direction_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplObduCalDefineVar(tEplVarParam MEM *pVarParam_p); +EPLDLLEXPORT tEplKernel EplObduCalDefineVar(tEplVarParam *pVarParam_p); //--------------------------------------------------------------------------- EPLDLLEXPORT void *EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, unsigned int uiSubIndex_p); //--------------------------------------------------------------------------- EPLDLLEXPORT tEplKernel EplObduCalRegisterUserOd(tEplObdEntryPtr pUserOd_p); //--------------------------------------------------------------------------- -EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry MEM *pVarEntry_p, +EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry *pVarEntry_p, BYTE bType_p, tEplObdSize ObdSize_p); //--------------------------------------------------------------------------- EPLDLLEXPORT tEplObdSize EplObduCalGetDataSize(unsigned int uiIndex_p, @@ -133,6 +133,6 @@ EPLDLLEXPORT tEplKernel EplObduCalWriteEntryFromLe(unsigned int uiIndex_p, EPLDLLEXPORT tEplKernel EplObduCalSearchVarEntry(EPL_MCO_DECL_INSTANCE_PTR_ unsigned int uiIndex_p, unsigned int uiSubindex_p, - tEplObdVarEntry MEM ** ppVarEntry_p); + tEplObdVarEntry **ppVarEntry_p); #endif // #ifndef _EPLOBDUCAL_H_ diff --git a/drivers/staging/epl/user/EplPdou.h b/drivers/staging/epl/user/EplPdou.h index ebc6cd021f46..8e4b711c8c5c 100644 --- a/drivers/staging/epl/user/EplPdou.h +++ b/drivers/staging/epl/user/EplPdou.h @@ -89,7 +89,7 @@ tEplKernel EplPdouAddInstance(void); tEplKernel EplPdouDelInstance(void); #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_PDOU)) != 0) -tEplKernel EplPdouCbObdAccess(tEplObdCbParam MEM * pParam_p); +tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p); #else #define EplPdouCbObdAccess NULL #endif -- cgit v1.2.3-59-g8ed1b From b852ba7d38a210b2d23c514f191582033b371e89 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 12:10:47 -0700 Subject: Staging: epl: remove REENTRANT It's not used and is not needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/EplInstDef.h | 12 ------------ drivers/staging/epl/global.h | 2 -- 2 files changed, 14 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/EplInstDef.h b/drivers/staging/epl/EplInstDef.h index 5b7be34c14b8..756ac635324a 100644 --- a/drivers/staging/epl/EplInstDef.h +++ b/drivers/staging/epl/EplInstDef.h @@ -355,18 +355,6 @@ typedef BYTE tEplInstanceHdl; #endif -/* -#if (CDRV_MAX_INSTANCES > 1) - - #define CDRV_REENTRANT REENTRANT - -#else - - #define CDRV_REENTRANT - -#endif -*/ - #endif // _EPLINSTDEF_H_ // Die letzte Zeile muß unbedingt eine leere Zeile sein, weil manche Compiler diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 74db85ce36c9..ba5cf3201bdf 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -31,8 +31,6 @@ #define CONST const // variables mapped to ROM (i.e. flash) #endif -#define REENTRANT - #define TRACE printk #ifndef SHORT -- cgit v1.2.3-59-g8ed1b From e6cc5eac8a823fb9674f46cd5050d607009b4a72 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 12:21:08 -0700 Subject: Staging: epl: remove some unused types SHORT, USHORT, INT, UINT, LONG, and ULONG aren't used, so delete them. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/global.h | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index ba5cf3201bdf..31ea536e48b9 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -33,25 +33,7 @@ #define TRACE printk -#ifndef SHORT -#define SHORT short int -#endif -#ifndef USHORT -#define USHORT unsigned short int -#endif -#ifndef INT -#define INT int -#endif -#ifndef UINT -#define UINT unsigned int -#endif -#ifndef LONG -#define LONG long int -#endif -#ifndef ULONG -#define ULONG unsigned long int -#endif - // --- logic types --- +// --- logic types --- #ifndef BYTE #define BYTE unsigned char #endif @@ -64,7 +46,8 @@ #ifndef BOOL #define BOOL unsigned char #endif - // --- alias types --- + +// --- alias types --- #ifndef TRUE #define TRUE 0xFF #endif -- cgit v1.2.3-59-g8ed1b From 5d9d5eb2bf0f31e41851c4cee01f7ba51dd11bf2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 12:24:46 -0700 Subject: Staging: epl: remove CONST Just make it const Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/EplObd.c | 12 ++++-------- drivers/staging/epl/demo_main.c | 2 +- drivers/staging/epl/global.h | 4 ---- 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c index 6d53e1ca83bc..f449f4c30a7a 100644 --- a/drivers/staging/epl/EplObd.c +++ b/drivers/staging/epl/EplObd.c @@ -2185,12 +2185,10 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p) // The current position is not decleared. The string // is located in ROM, therefor use default pointer. pData = (void *)pSubIndexEntry_p->m_pDefault; - if ((CONST void *)pData != (CONST void *)NULL) { + if ((const void *)pData != (const void *)NULL) { // The max. size of strings defined by STRING-Macro is stored in // tEplObdVString of default value. - DataSize = - ((CONST tEplObdVString *) pData)-> - m_Size; + DataSize = ((const tEplObdVString *)pData)->m_Size; } } @@ -2209,12 +2207,10 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p) // The current position is not decleared. The string // is located in ROM, therefor use default pointer. pData = (void *)pSubIndexEntry_p->m_pDefault; - if ((CONST void *)pData != (CONST void *)NULL) { + if ((const void *)pData != (const void *)NULL) { // The max. size of strings defined by STRING-Macro is stored in // tEplObdVString of default value. - DataSize = - ((CONST tEplObdOString *) pData)-> - m_Size; + DataSize = ((const tEplObdOString *)pData)->m_Size; } } break; diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c index 6e0db9a25fe9..4e60143a5b08 100644 --- a/drivers/staging/epl/demo_main.c +++ b/drivers/staging/epl/demo_main.c @@ -148,7 +148,7 @@ void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); // modul globale vars //--------------------------------------------------------------------------- -CONST BYTE abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +const BYTE abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; BYTE bVarIn1_l; BYTE bVarOut1_l; diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 31ea536e48b9..51c7409828f7 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -27,10 +27,6 @@ #define QWORD long long int #endif -#ifndef CONST -#define CONST const // variables mapped to ROM (i.e. flash) -#endif - #define TRACE printk // --- logic types --- -- cgit v1.2.3-59-g8ed1b From 2ed53cf8a523d3e2fc133d892f8d040c3fc9656d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 12:36:38 -0700 Subject: Staging: epl: remove BYTE It's u8 in kernelspace, not BYTE. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Debug.h | 4 +- drivers/staging/epl/Edrv8139.c | 28 ++++---- drivers/staging/epl/EdrvFec.h | 2 +- drivers/staging/epl/EdrvSim.h | 2 +- drivers/staging/epl/Epl.h | 6 +- drivers/staging/epl/EplAmi.h | 14 ++-- drivers/staging/epl/EplApiGeneric.c | 32 ++++----- drivers/staging/epl/EplApiLinuxKernel.c | 2 +- drivers/staging/epl/EplApiProcessImage.c | 4 +- drivers/staging/epl/EplDll.h | 4 +- drivers/staging/epl/EplDllCal.h | 2 +- drivers/staging/epl/EplDllk.c | 98 +++++++++++++------------- drivers/staging/epl/EplDllkCal.c | 10 +-- drivers/staging/epl/EplDlluCal.c | 2 +- drivers/staging/epl/EplErrorHandlerk.c | 2 +- drivers/staging/epl/EplEvent.h | 2 +- drivers/staging/epl/EplEventk.c | 6 +- drivers/staging/epl/EplEventu.c | 6 +- drivers/staging/epl/EplFrame.h | 110 ++++++++++++++--------------- drivers/staging/epl/EplInstDef.h | 12 ++-- drivers/staging/epl/EplNmtCnu.c | 20 +++--- drivers/staging/epl/EplNmtMnu.c | 42 +++++------ drivers/staging/epl/EplNmtk.c | 2 +- drivers/staging/epl/EplObd.c | 40 +++++------ drivers/staging/epl/EplObd.h | 8 +-- drivers/staging/epl/EplObdMacro.h | 4 +- drivers/staging/epl/EplObdu.c | 2 +- drivers/staging/epl/EplObduCal.c | 2 +- drivers/staging/epl/EplPdo.h | 2 +- drivers/staging/epl/EplPdok.c | 14 ++-- drivers/staging/epl/EplPdou.c | 8 +-- drivers/staging/epl/EplSdoAsndu.c | 4 +- drivers/staging/epl/EplSdoAsySequ.c | 28 ++++---- drivers/staging/epl/EplSdoComu.c | 58 ++++++++-------- drivers/staging/epl/EplSdoUdpu.c | 2 +- drivers/staging/epl/EplTarget.h | 6 +- drivers/staging/epl/ShbIpc-LinuxKernel.c | 2 +- drivers/staging/epl/TimerHighReskX86.c | 2 +- drivers/staging/epl/amix86.c | 116 +++++++++++++++---------------- drivers/staging/epl/demo_main.c | 26 +++---- drivers/staging/epl/edrv.h | 20 +++--- drivers/staging/epl/global.h | 3 - drivers/staging/epl/kernel/EplDllk.h | 8 +-- drivers/staging/epl/kernel/EplDllkCal.h | 2 +- drivers/staging/epl/kernel/EplObdk.h | 2 +- drivers/staging/epl/proc_fs.c | 4 +- drivers/staging/epl/user/EplCfgMau.h | 20 +++--- drivers/staging/epl/user/EplDlluCal.h | 2 +- drivers/staging/epl/user/EplObdu.h | 2 +- drivers/staging/epl/user/EplObduCal.h | 2 +- drivers/staging/epl/user/EplPdou.h | 8 +-- 51 files changed, 404 insertions(+), 405 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/Debug.h b/drivers/staging/epl/Debug.h index 68fe3c4b9f51..9a6a5c824b2c 100644 --- a/drivers/staging/epl/Debug.h +++ b/drivers/staging/epl/Debug.h @@ -634,13 +634,13 @@ extern "C" { #endif - void DumpData(char *szStr_p, BYTE *pbData_p, WORD wSize_p); + void DumpData(char *szStr_p, u8 *pbData_p, WORD wSize_p); #ifdef __cplusplus } // von extern "C" #endif #define DEBUG_DUMP_DATA(lvl,str,ptr,siz) if ((DEBUG_GLB_LVL() & (lvl))==(lvl)) \ - DumpData (str, (BYTE *)(ptr), (WORD)(siz)); + DumpData (str, (u8 *)(ptr), (WORD)(siz)); #else #define DEBUG_DUMP_DATA(lvl,str,ptr,siz) diff --git a/drivers/staging/epl/Edrv8139.c b/drivers/staging/epl/Edrv8139.c index b00e17e70b5a..73e5c7cf69d3 100644 --- a/drivers/staging/epl/Edrv8139.c +++ b/drivers/staging/epl/Edrv8139.c @@ -234,7 +234,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) @@ -282,9 +282,9 @@ typedef struct typedef struct { struct pci_dev *m_pPciDev; // pointer to PCI device structure void *m_pIoAddr; // pointer to register space of Ethernet controller - BYTE *m_pbRxBuf; // pointer to Rx buffer + u8 *m_pbRxBuf; // pointer to Rx buffer dma_addr_t m_pRxBufDma; - BYTE *m_pbTxBuf; // pointer to Tx buffer + u8 *m_pbTxBuf; // pointer to Tx buffer dma_addr_t m_pTxBufDma; BOOL m_afTxBufUsed[EDRV_MAX_TX_BUFFERS]; unsigned int m_uiCurTxDesc; @@ -359,7 +359,7 @@ static struct pci_driver EdrvDriver = { // local function prototypes //--------------------------------------------------------------------------- -static BYTE EdrvCalcHash(BYTE * pbMAC_p); +static u8 EdrvCalcHash(u8 * pbMAC_p); //--------------------------------------------------------------------------- // @@ -453,11 +453,11 @@ tEplKernel EdrvShutdown(void) // State: // //--------------------------------------------------------------------------- -tEplKernel EdrvDefineRxMacAddrEntry(BYTE * pbMacAddr_p) +tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p) { tEplKernel Ret = kEplSuccessful; DWORD dwData; - BYTE bHash; + u8 bHash; bHash = EdrvCalcHash(pbMacAddr_p); /* @@ -494,11 +494,11 @@ tEplKernel EdrvDefineRxMacAddrEntry(BYTE * pbMacAddr_p) // State: // //--------------------------------------------------------------------------- -tEplKernel EdrvUndefineRxMacAddrEntry(BYTE * pbMacAddr_p) +tEplKernel EdrvUndefineRxMacAddrEntry(u8 * pbMacAddr_p) { tEplKernel Ret = kEplSuccessful; DWORD dwData; - BYTE bHash; + u8 bHash; bHash = EdrvCalcHash(pbMacAddr_p); @@ -720,7 +720,7 @@ tEplKernel EdrvTxMsgStart(tEdrvTxBuffer * pBuffer_p) //--------------------------------------------------------------------------- static void EdrvReinitRx(void) { - BYTE bCmd; + u8 bCmd; // simply switch off and on the receiver // this will reset the CAPR register @@ -765,7 +765,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, DWORD dwTxStatus; DWORD dwRxStatus; WORD wCurRx; - BYTE *pbRxBuf; + u8 *pbRxBuf; unsigned int uiLength; int iHandled = IRQ_HANDLED; @@ -1215,15 +1215,15 @@ static void EdrvRemoveOne(struct pci_dev *pPciDev) //#define CRC32_POLY 0xEDB88320 // // G(x) = x32 + x26 + x23 + x22 + x16 + x12 + x11 + x10 + x8 + x7 + x5 + x4 + x2 + x + 1 -static BYTE EdrvCalcHash(BYTE * pbMAC_p) +static u8 EdrvCalcHash(u8 * pbMAC_p) { DWORD dwByteCounter; DWORD dwBitCounter; DWORD dwData; DWORD dwCrc; DWORD dwCarry; - BYTE *pbData; - BYTE bHash; + u8 *pbData; + u8 bHash; pbData = pbMAC_p; @@ -1246,7 +1246,7 @@ static BYTE EdrvCalcHash(BYTE * pbMAC_p) // printk("MyCRC = 0x%08lX\n", dwCrc); // only upper 6 bits (HASH_BITS) are used // which point to specific bit in the hash registers - bHash = (BYTE) ((dwCrc >> (32 - HASH_BITS)) & 0x3f); + bHash = (u8) ((dwCrc >> (32 - HASH_BITS)) & 0x3f); return bHash; } diff --git a/drivers/staging/epl/EdrvFec.h b/drivers/staging/epl/EdrvFec.h index 5f252fbed744..42bb8d32643c 100644 --- a/drivers/staging/epl/EdrvFec.h +++ b/drivers/staging/epl/EdrvFec.h @@ -98,7 +98,7 @@ typedef struct { WORD m_wStatus; // control / status --- used by edrv, do not change in application WORD m_wLength; // transfer length - BYTE *m_pbData; // buffer address + u8 *m_pbData; // buffer address } tBufferDescr; #if ((TARGET_HARDWARE & TGT_CPU_MASK_) == TGT_CPU_5282) diff --git a/drivers/staging/epl/EdrvSim.h b/drivers/staging/epl/EdrvSim.h index 39300e321d6c..9cbafb6295af 100644 --- a/drivers/staging/epl/EdrvSim.h +++ b/drivers/staging/epl/EdrvSim.h @@ -83,7 +83,7 @@ // function prototypes //--------------------------------------------------------------------------- -void EdrvRxInterruptHandler(BYTE bBufferInFrame_p, BYTE * pbEthernetData_p, +void EdrvRxInterruptHandler(u8 bBufferInFrame_p, u8 * pbEthernetData_p, WORD wDataLen_p); #endif // #ifndef _EDRVSIM_H_ diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h index 454b2ba6ad3e..0a6b9b8a2dd9 100644 --- a/drivers/staging/epl/Epl.h +++ b/drivers/staging/epl/Epl.h @@ -139,7 +139,7 @@ typedef struct { unsigned int m_uiSizeOfStruct; BOOL m_fAsyncOnly; // do not need to register PRes unsigned int m_uiNodeId; // local node ID - BYTE m_abMacAddress[6]; // local MAC address + u8 m_abMacAddress[6]; // local MAC address // 0x1F82: NMT_FeatureFlags_U32 DWORD m_dwFeatureFlags; @@ -189,8 +189,8 @@ typedef struct { DWORD m_dwIpAddress; DWORD m_dwSubnetMask; DWORD m_dwDefaultGateway; - BYTE m_sHostname[32]; - BYTE m_abVendorSpecificExt2[48]; + u8 m_sHostname[32]; + u8 m_abVendorSpecificExt2[48]; char *m_pszDevName; // NMT_ManufactDevName_VS (0x1008/0 local OD) char *m_pszHwVersion; // NMT_ManufactHwVers_VS (0x1009/0 local OD) diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h index d3e47cbd3c94..7abcb6c2028f 100644 --- a/drivers/staging/epl/EplAmi.h +++ b/drivers/staging/epl/EplAmi.h @@ -69,7 +69,7 @@ 16.09.2002 -as To save code space the functions AmiSetByte and AmiGetByte - are replaced by macros. For targets which assign BYTE by + are replaced by macros. For targets which assign u8 by an 16Bit type, the definition of macros must changed to functions. @@ -105,10 +105,10 @@ extern "C" { // // To save code space the function AmiSetByte is replaced by // an macro. -// void AmiSetByte (void * pAddr_p, BYTE bByteVal_p); +// void AmiSetByte (void * pAddr_p, u8 bByteVal_p); -#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(BYTE *)(pAddr_p) = (bByteVal_p);} -#define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(BYTE *)(pAddr_p) = (bByteVal_p);} +#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);} +#define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);} void AmiSetWordToBe(void *pAddr_p, WORD wWordVal_p); void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p); @@ -121,10 +121,10 @@ void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p); // // To save code space the function AmiGetByte is replaced by // an macro. -// BYTE AmiGetByte (void * pAddr_p); +// u8 AmiGetByte (void * pAddr_p); -#define AmiGetByteFromBe(pAddr_p) (*(BYTE *)(pAddr_p)) -#define AmiGetByteFromLe(pAddr_p) (*(BYTE *)(pAddr_p)) +#define AmiGetByteFromBe(pAddr_p) (*(u8 *)(pAddr_p)) +#define AmiGetByteFromLe(pAddr_p) (*(u8 *)(pAddr_p)) WORD AmiGetWordFromBe(void *pAddr_p); DWORD AmiGetDwordFromBe(void *pAddr_p); diff --git a/drivers/staging/epl/EplApiGeneric.c b/drivers/staging/epl/EplApiGeneric.c index 7a52267aca0c..2dd0b33b8be4 100644 --- a/drivers/staging/epl/EplApiGeneric.c +++ b/drivers/staging/epl/EplApiGeneric.c @@ -556,9 +556,9 @@ tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, tEplObdSize *pEntrySize_p, unsigned int uiFirstSubindex_p) { - BYTE bVarEntries; - BYTE bIndexEntries; - BYTE *pbData; + u8 bVarEntries; + u8 bIndexEntries; + u8 *pbData; unsigned int uiSubindex; tEplVarParam VarParam; tEplObdSize EntrySize; @@ -574,8 +574,8 @@ tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, goto Exit; } - pbData = (BYTE *)pVar_p; - bVarEntries = (BYTE) * puiVarEntries_p; + pbData = (u8 *)pVar_p; + bVarEntries = (u8) * puiVarEntries_p; UsedSize = 0; // init VarParam structure with default values @@ -607,7 +607,7 @@ tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, // object actually has. if ((bIndexEntries > (bVarEntries + uiFirstSubindex_p - 1)) && (bVarEntries != 0x00)) { - bIndexEntries = (BYTE) (bVarEntries + uiFirstSubindex_p - 1); + bIndexEntries = (u8) (bVarEntries + uiFirstSubindex_p - 1); } // map entries for (uiSubindex = uiFirstSubindex_p; uiSubindex <= bIndexEntries; @@ -1012,9 +1012,9 @@ tEplKernel EplApiCbObdAccess(tEplObdCbParam *pParam_p) case 0x1F9E: // NMT_ResetCmd_U8 { if (pParam_p->m_ObdEvent == kEplObdEvPreWrite) { - BYTE bNmtCommand; + u8 bNmtCommand; - bNmtCommand = *((BYTE *) pParam_p->m_pArg); + bNmtCommand = *((u8 *) pParam_p->m_pArg); // check value range switch ((tEplNmtCommand) bNmtCommand) { case kEplNmtCmdResetNode: @@ -1032,9 +1032,9 @@ tEplKernel EplApiCbObdAccess(tEplObdCbParam *pParam_p) break; } } else if (pParam_p->m_ObdEvent == kEplObdEvPostWrite) { - BYTE bNmtCommand; + u8 bNmtCommand; - bNmtCommand = *((BYTE *) pParam_p->m_pArg); + bNmtCommand = *((u8 *) pParam_p->m_pArg); // check value range switch ((tEplNmtCommand) bNmtCommand) { case kEplNmtCmdResetNode: @@ -1187,11 +1187,11 @@ static tEplKernel EplApiProcessEvent(tEplEvent *pEplEvent_p) static tEplKernel EplApiCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p) { tEplKernel Ret = kEplSuccessful; - BYTE bNmtState; + u8 bNmtState; tEplApiEventArg EventArg; // save NMT state in OD - bNmtState = (BYTE) NmtStateChange_p.m_NewNmtState; + bNmtState = (u8) NmtStateChange_p.m_NewNmtState; Ret = EplObdWriteEntry(0x1F8C, 0, &bNmtState, 1); if (Ret != kEplSuccessful) { goto Exit; @@ -1270,7 +1270,7 @@ static tEplKernel EplApiCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_ case kEplNmtCsNotActive: { // indicate completion of reset in NMT_ResetCmd_U8 - bNmtState = (BYTE) kEplNmtCmdInvalidService; + bNmtState = (u8) kEplNmtCmdInvalidService; Ret = EplObdWriteEntry(0x1F9E, 0, &bNmtState, 1); if (Ret != kEplSuccessful) { goto Exit; @@ -1413,7 +1413,7 @@ static tEplKernel EplApiUpdateDllConfig(BOOL fUpdateIdentity_p) tEplDllIdentParam DllIdentParam; tEplObdSize ObdSize; WORD wTemp; - BYTE bTemp; + u8 bTemp; // configure Dll EPL_MEMSET(&DllConfigParam, 0, sizeof(DllConfigParam)); @@ -1633,7 +1633,7 @@ static tEplKernel EplApiUpdateObd(void) { tEplKernel Ret = kEplSuccessful; WORD wTemp; - BYTE bTemp; + u8 bTemp; // set node id in OD Ret = EplObdSetNodeId(EplApiInstance_g.m_InitParam.m_uiNodeId, // node id @@ -1730,7 +1730,7 @@ static tEplKernel EplApiUpdateObd(void) }*/ if (EplApiInstance_g.m_InitParam.m_uiMultiplCycleCnt <= 0xFF) { - bTemp = (BYTE) EplApiInstance_g.m_InitParam.m_uiMultiplCycleCnt; + bTemp = (u8) EplApiInstance_g.m_InitParam.m_uiMultiplCycleCnt; Ret = EplObdWriteEntry(0x1F98, 7, &bTemp, 1); /* if(Ret != kEplSuccessful) { diff --git a/drivers/staging/epl/EplApiLinuxKernel.c b/drivers/staging/epl/EplApiLinuxKernel.c index 52f8e1bd473f..a994b16d8492 100644 --- a/drivers/staging/epl/EplApiLinuxKernel.c +++ b/drivers/staging/epl/EplApiLinuxKernel.c @@ -139,7 +139,7 @@ MODULE_DESCRIPTION("EPL API driver"); // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #else #define TGT_DBG_SIGNAL_TRACE_POINT(p) diff --git a/drivers/staging/epl/EplApiProcessImage.c b/drivers/staging/epl/EplApiProcessImage.c index 869d97a4bd1c..7d55086a8e4e 100644 --- a/drivers/staging/epl/EplApiProcessImage.c +++ b/drivers/staging/epl/EplApiProcessImage.c @@ -126,10 +126,10 @@ #if ((EPL_API_PROCESS_IMAGE_SIZE_IN > 0) || (EPL_API_PROCESS_IMAGE_SIZE_OUT > 0)) typedef struct { #if EPL_API_PROCESS_IMAGE_SIZE_IN > 0 - BYTE m_abProcessImageInput[EPL_API_PROCESS_IMAGE_SIZE_IN]; + u8 m_abProcessImageInput[EPL_API_PROCESS_IMAGE_SIZE_IN]; #endif #if EPL_API_PROCESS_IMAGE_SIZE_OUT > 0 - BYTE m_abProcessImageOutput[EPL_API_PROCESS_IMAGE_SIZE_OUT]; + u8 m_abProcessImageOutput[EPL_API_PROCESS_IMAGE_SIZE_OUT]; #endif } tEplApiProcessImageInstance; diff --git a/drivers/staging/epl/EplDll.h b/drivers/staging/epl/EplDll.h index 36657f2daf8b..cd2d25d5506b 100644 --- a/drivers/staging/epl/EplDll.h +++ b/drivers/staging/epl/EplDll.h @@ -185,8 +185,8 @@ typedef struct { DWORD m_dwIpAddress; DWORD m_dwSubnetMask; DWORD m_dwDefaultGateway; - BYTE m_sHostname[32]; - BYTE m_abVendorSpecificExt2[48]; + u8 m_sHostname[32]; + u8 m_abVendorSpecificExt2[48]; } tEplDllIdentParam; diff --git a/drivers/staging/epl/EplDllCal.h b/drivers/staging/epl/EplDllCal.h index 24460087e987..70b27b1b6768 100644 --- a/drivers/staging/epl/EplDllCal.h +++ b/drivers/staging/epl/EplDllCal.h @@ -112,7 +112,7 @@ typedef struct { typedef struct { tEplDllReqServiceId m_Service; unsigned int m_uiNodeId; - BYTE m_bSoaFlag1; + u8 m_bSoaFlag1; } tEplDllCalIssueRequest; diff --git a/drivers/staging/epl/EplDllk.c b/drivers/staging/epl/EplDllk.c index 8fafe7524428..d22e74ee25ea 100644 --- a/drivers/staging/epl/EplDllk.c +++ b/drivers/staging/epl/EplDllk.c @@ -121,7 +121,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) @@ -195,12 +195,12 @@ typedef enum { } tEplDllState; typedef struct { - BYTE m_be_abSrcMac[6]; + u8 m_be_abSrcMac[6]; tEdrvTxBuffer *m_pTxBuffer; // Buffers for Tx-Frames unsigned int m_uiMaxTxFrames; - BYTE m_bFlag1; // Flag 1 with EN, EC for PRes, StatusRes - BYTE m_bMnFlag1; // Flag 1 with EA, ER from PReq, SoA of MN - BYTE m_bFlag2; // Flag 2 with PR and RS for PRes, StatusRes, IdentRes + u8 m_bFlag1; // Flag 1 with EN, EC for PRes, StatusRes + u8 m_bMnFlag1; // Flag 1 with EA, ER from PReq, SoA of MN + u8 m_bFlag2; // Flag 2 with PR and RS for PRes, StatusRes, IdentRes tEplDllConfigParam m_DllConfigParam; tEplDllIdentParam m_DllIdentParam; tEplDllState m_DllState; @@ -513,7 +513,7 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p, EPL_C_DLL_ETHERTYPE_EPL); // source node ID AmiSetByteToLe(&pTxFrame->m_le_bSrcNodeId, - (BYTE) EplDllkInstance_g.m_DllConfigParam. + (u8) EplDllkInstance_g.m_DllConfigParam. m_uiNodeId); // source MAC address EPL_MEMCPY(&pTxFrame->m_be_abSrcMac[0], @@ -530,7 +530,7 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p, { // IdentResponses and StatusResponses are Broadcast AmiSetByteToLe(&pTxFrame-> m_le_bDstNodeId, - (BYTE) + (u8) EPL_C_ADR_BROADCAST); break; } @@ -549,10 +549,10 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p, EPL_C_DLL_MULTICAST_SOC); // destination node ID AmiSetByteToLe(&pTxFrame->m_le_bDstNodeId, - (BYTE) EPL_C_ADR_BROADCAST); + (u8) EPL_C_ADR_BROADCAST); // reset Flags - //AmiSetByteToLe(&pTxFrame->m_Data.m_Soc.m_le_bFlag1, (BYTE) 0); - //AmiSetByteToLe(&pTxFrame->m_Data.m_Soc.m_le_bFlag2, (BYTE) 0); + //AmiSetByteToLe(&pTxFrame->m_Data.m_Soc.m_le_bFlag1, (u8) 0); + //AmiSetByteToLe(&pTxFrame->m_Data.m_Soc.m_le_bFlag2, (u8) 0); break; case kEplMsgTypeSoa: @@ -561,13 +561,13 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p, EPL_C_DLL_MULTICAST_SOA); // destination node ID AmiSetByteToLe(&pTxFrame->m_le_bDstNodeId, - (BYTE) EPL_C_ADR_BROADCAST); + (u8) EPL_C_ADR_BROADCAST); // reset Flags - //AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bFlag1, (BYTE) 0); - //AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bFlag2, (BYTE) 0); + //AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bFlag1, (u8) 0); + //AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bFlag2, (u8) 0); // EPL profile version AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bEplVersion, - (BYTE) EPL_SPEC_VERSION); + (u8) EPL_SPEC_VERSION); break; case kEplMsgTypePres: @@ -576,18 +576,18 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p, EPL_C_DLL_MULTICAST_PRES); // destination node ID AmiSetByteToLe(&pTxFrame->m_le_bDstNodeId, - (BYTE) EPL_C_ADR_BROADCAST); + (u8) EPL_C_ADR_BROADCAST); // reset Flags - //AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.m_le_bFlag1, (BYTE) 0); - //AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.m_le_bFlag2, (BYTE) 0); + //AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.m_le_bFlag1, (u8) 0); + //AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.m_le_bFlag2, (u8) 0); // PDO size //AmiSetWordToLe(&pTxFrame->m_Data.m_Pres.m_le_wSize, 0); break; case kEplMsgTypePreq: // reset Flags - //AmiSetByteToLe(&pTxFrame->m_Data.m_Preq.m_le_bFlag1, (BYTE) 0); - //AmiSetByteToLe(&pTxFrame->m_Data.m_Preq.m_le_bFlag2, (BYTE) 0); + //AmiSetByteToLe(&pTxFrame->m_Data.m_Preq.m_le_bFlag1, (u8) 0); + //AmiSetByteToLe(&pTxFrame->m_Data.m_Preq.m_le_bFlag2, (u8) 0); // PDO size //AmiSetWordToLe(&pTxFrame->m_Data.m_Preq.m_le_wSize, 0); break; @@ -596,7 +596,7 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p, break; } // EPL message type - AmiSetByteToLe(&pTxFrame->m_le_bMessageType, (BYTE) MsgType_p); + AmiSetByteToLe(&pTxFrame->m_le_bMessageType, (u8) MsgType_p); } *ppFrame_p = pTxFrame; @@ -672,7 +672,7 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p) tEdrvTxBuffer *pTxBuffer; unsigned int uiHandle; unsigned int uiFrameSize; - BYTE abMulticastMac[6]; + u8 abMulticastMac[6]; tEplDllAsyncReqPriority AsyncReqPriority; unsigned int uiFrameCount; tEplNmtState NmtState; @@ -711,7 +711,7 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p) // EPL profile version AmiSetByteToLe(&pTxFrame->m_Data.m_Asnd.m_Payload. m_IdentResponse.m_le_bEplProfileVersion, - (BYTE) EPL_SPEC_VERSION); + (u8) EPL_SPEC_VERSION); // FeatureFlags AmiSetDwordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload. m_IdentResponse.m_le_dwFeatureFlags, @@ -1232,7 +1232,7 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p) } if (uiFrameCount > 0) { EplDllkInstance_g.m_bFlag2 = - (BYTE) (((AsyncReqPriority << + (u8) (((AsyncReqPriority << EPL_FRAME_FLAG2_PR_SHIFT) & EPL_FRAME_FLAG2_PR) | (uiFrameCount & @@ -1306,7 +1306,7 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p) } AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. m_le_bNmtStatus, - (BYTE) NmtState); + (u8) NmtState); AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. m_le_bFlag2, EplDllkInstance_g. @@ -1532,7 +1532,7 @@ tEplKernel EplDllkSetAsndServiceIdFilter(tEplDllAsndServiceId ServiceId_p, // //--------------------------------------------------------------------------- -tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, BYTE bSoaFlag1_p) +tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, u8 bSoaFlag1_p) { tEplKernel Ret = kEplSuccessful; tEplDllkNodeInfo *pNodeInfo; @@ -1663,7 +1663,7 @@ tEplKernel EplDllkAddNode(tEplDllNodeInfo * pNodeInfo_p) pIntNodeInfo->m_pPreqTxBuffer = &EplDllkInstance_g.m_pTxBuffer[uiHandle]; AmiSetByteToLe(&pFrame->m_le_bDstNodeId, - (BYTE) pNodeInfo_p->m_uiNodeId); + (u8) pNodeInfo_p->m_uiNodeId); // set up destination MAC address EPL_MEMCPY(pFrame->m_be_abDstMac, pIntNodeInfo->m_be_abMacAddr, @@ -2430,7 +2430,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p) tEplDllReqServiceId ReqServiceId; unsigned int uiAsndServiceId; unsigned int uiNodeId; - BYTE bFlag1; + u8 bFlag1; BENCHMARK_MOD_02_SET(3); NmtState = EplNmtkGetNmtState(); @@ -2465,7 +2465,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p) // update frame (NMT state, RD, RS, PR, MS, EN flags) AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. m_le_bNmtStatus, - (BYTE) NmtState); + (u8) NmtState); AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. m_le_bFlag2, EplDllkInstance_g. @@ -2540,7 +2540,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p) // update frame (NMT state, RD, RS, PR, MS, EN flags) AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. m_le_bNmtStatus, - (BYTE) NmtState); + (u8) NmtState); AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. m_le_bFlag2, EplDllkInstance_g. @@ -2802,7 +2802,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p) } AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. m_le_bNmtStatus, - (BYTE) NmtState); + (u8) NmtState); AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. m_le_bFlag2, EplDllkInstance_g.m_bFlag2); @@ -2887,7 +2887,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p) m_Payload. m_StatusResponse. m_le_bNmtStatus, - (BYTE) NmtState); + (u8) NmtState); AmiSetByteToLe(&pTxFrame-> m_Data.m_Asnd. m_Payload. @@ -2953,7 +2953,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p) m_Payload. m_IdentResponse. m_le_bNmtStatus, - (BYTE) NmtState); + (u8) NmtState); AmiSetByteToLe(&pTxFrame-> m_Data.m_Asnd. m_Payload. @@ -3285,7 +3285,7 @@ static void EplDllkCbFrameTransmitted(tEdrvTxBuffer * pTxBuffer_p) m_Payload. m_StatusResponse. m_le_bNmtStatus, - (BYTE) NmtState); + (u8) NmtState); AmiSetByteToLe(&pTxFrame->m_Data.m_Asnd. m_Payload. m_StatusResponse. @@ -3321,7 +3321,7 @@ static void EplDllkCbFrameTransmitted(tEdrvTxBuffer * pTxBuffer_p) m_Payload. m_IdentResponse. m_le_bNmtStatus, - (BYTE) NmtState); + (u8) NmtState); AmiSetByteToLe(&pTxFrame->m_Data.m_Asnd. m_Payload. m_IdentResponse. @@ -3361,12 +3361,12 @@ static void EplDllkCbFrameTransmitted(tEdrvTxBuffer * pTxBuffer_p) if ((AmiGetByteFromLe (&pTxFrame-> m_le_bMessageType) - == (BYTE) kEplMsgTypeAsnd) + == (u8) kEplMsgTypeAsnd) && (AmiGetByteFromLe (&pTxFrame->m_Data.m_Asnd. m_le_bServiceId) - == (BYTE) kEplDllAsndNmtCommand)) { // post event directly to NmtMnu module + == (u8) kEplDllAsndNmtCommand)) { // post event directly to NmtMnu module Event.m_EventSink = kEplEventSinkNmtMnu; Event.m_EventType = @@ -3505,7 +3505,7 @@ static tEplKernel EplDllkCheckFrame(tEplFrame * pFrame_p, if (wEtherType == EPL_C_DLL_ETHERTYPE_EPL) { // source node ID AmiSetByteToLe(&pFrame_p->m_le_bSrcNodeId, - (BYTE) EplDllkInstance_g. + (u8) EplDllkInstance_g. m_DllConfigParam.m_uiNodeId); // check message type @@ -3514,7 +3514,7 @@ static tEplKernel EplDllkCheckFrame(tEplFrame * pFrame_p, if (MsgType == 0) { MsgType = kEplMsgTypeAsnd; AmiSetByteToLe(&pFrame_p->m_le_bMessageType, - (BYTE) MsgType); + (u8) MsgType); } if (MsgType == kEplMsgTypeAsnd) { @@ -3825,24 +3825,24 @@ static tEplKernel EplDllkMnSendSoa(tEplNmtState NmtState_p, // update frame (target) AmiSetByteToLe(&pTxFrame->m_Data.m_Soa. m_le_bReqServiceId, - (BYTE) EplDllkInstance_g. + (u8) EplDllkInstance_g. m_LastReqServiceId); AmiSetByteToLe(&pTxFrame->m_Data.m_Soa. m_le_bReqServiceTarget, - (BYTE) EplDllkInstance_g. + (u8) EplDllkInstance_g. m_uiLastTargetNodeId); } else { // invite nobody // update frame (target) AmiSetByteToLe(&pTxFrame->m_Data.m_Soa. - m_le_bReqServiceId, (BYTE) 0); + m_le_bReqServiceId, (u8) 0); AmiSetByteToLe(&pTxFrame->m_Data.m_Soa. - m_le_bReqServiceTarget, (BYTE) 0); + m_le_bReqServiceTarget, (u8) 0); } // update frame (NMT state) AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bNmtStatus, - (BYTE) NmtState_p); + (u8) NmtState_p); // send SoA frame Ret = EdrvSendTxMsg(pTxBuffer); @@ -3919,7 +3919,7 @@ static tEplKernel EplDllkMnSendPreq(tEplNmtState NmtState_p, tEplKernel Ret = kEplSuccessful; tEdrvTxBuffer *pTxBuffer = NULL; tEplFrame *pTxFrame; - BYTE bFlag1 = 0; + u8 bFlag1 = 0; if (EplDllkInstance_g.m_pCurNodeInfo == NULL) { // start with first isochronous CN EplDllkInstance_g.m_pCurNodeInfo = @@ -3970,7 +3970,7 @@ static tEplKernel EplDllkMnSendPreq(tEplNmtState NmtState_p, if (pTxBuffer == &EplDllkInstance_g.m_pTxBuffer[EPL_DLLK_TXFRAME_PRES]) { // PRes of MN will be sent // update NMT state AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.m_le_bNmtStatus, - (BYTE) NmtState_p); + (u8) NmtState_p); *pDllStateProposed_p = kEplDllMsWaitSoaTrig; } // $$$ d.k. set EPL_FRAME_FLAG1_MS if necessary @@ -4013,7 +4013,7 @@ static tEplKernel EplDllkAsyncFrameNotReceived(tEplDllReqServiceId unsigned int uiNodeId_p) { tEplKernel Ret = kEplSuccessful; - BYTE abBuffer[18]; + u8 abBuffer[18]; tEplFrame *pFrame = (tEplFrame *) abBuffer; tEplFrameInfo FrameInfo; @@ -4024,13 +4024,13 @@ static tEplKernel EplDllkAsyncFrameNotReceived(tEplDllReqServiceId // ASnd service registered? if (EplDllkInstance_g.m_aAsndFilter[ReqServiceId_p] == kEplDllAsndFilterAny) { // ASnd service ID is registered AmiSetByteToLe(&pFrame->m_le_bSrcNodeId, - (BYTE) uiNodeId_p); + (u8) uiNodeId_p); // EPL MsgType ASnd AmiSetByteToLe(&pFrame->m_le_bMessageType, - (BYTE) kEplMsgTypeAsnd); + (u8) kEplMsgTypeAsnd); // ASnd Service ID AmiSetByteToLe(&pFrame->m_Data.m_Asnd.m_le_bServiceId, - (BYTE) ReqServiceId_p); + (u8) ReqServiceId_p); // create frame info structure FrameInfo.m_pFrame = pFrame; FrameInfo.m_uiFrameSize = 18; // empty non existing ASnd frame diff --git a/drivers/staging/epl/EplDllkCal.c b/drivers/staging/epl/EplDllkCal.c index 359083ebe12d..88ce4b1145a1 100644 --- a/drivers/staging/epl/EplDllkCal.c +++ b/drivers/staging/epl/EplDllkCal.c @@ -142,9 +142,9 @@ typedef struct { tShbInstance m_ShbInstanceTxGen; // FIFO for Tx frames with generic priority #else unsigned int m_uiFrameSizeNmt; - BYTE m_abFrameNmt[1500]; + u8 m_abFrameNmt[1500]; unsigned int m_uiFrameSizeGen; - BYTE m_abFrameGen[1500]; + u8 m_abFrameGen[1500]; #endif tEplDllkCalStatistics m_Statistics; @@ -536,7 +536,7 @@ tEplKernel EplDllkCalAsyncGetTxFrame(void *pFrame_p, case kEplDllAsyncReqPrioNmt: // NMT request priority ShbError = ShbCirReadDataBlock(EplDllkCalInstance_g.m_ShbInstanceTxNmt, - (BYTE *) pFrame_p, *puiFrameSize_p, + (u8 *) pFrame_p, *puiFrameSize_p, &ulFrameSize); // returns kShbOk, kShbDataTruncated, kShbInvalidArg, kShbNoReadableData break; @@ -544,7 +544,7 @@ tEplKernel EplDllkCalAsyncGetTxFrame(void *pFrame_p, default: // generic priority ShbError = ShbCirReadDataBlock(EplDllkCalInstance_g.m_ShbInstanceTxGen, - (BYTE *) pFrame_p, *puiFrameSize_p, + (u8 *) pFrame_p, *puiFrameSize_p, &ulFrameSize); // returns kShbOk, kShbDataTruncated, kShbInvalidArg, kShbNoReadableData break; @@ -876,7 +876,7 @@ tEplKernel EplDllkCalGetStatistics(tEplDllkCalStatistics ** ppStatistics) //--------------------------------------------------------------------------- tEplKernel EplDllkCalIssueRequest(tEplDllReqServiceId Service_p, - unsigned int uiNodeId_p, BYTE bSoaFlag1_p) + unsigned int uiNodeId_p, u8 bSoaFlag1_p) { tEplKernel Ret = kEplSuccessful; diff --git a/drivers/staging/epl/EplDlluCal.c b/drivers/staging/epl/EplDlluCal.c index 7f4a17450237..06952985604d 100644 --- a/drivers/staging/epl/EplDlluCal.c +++ b/drivers/staging/epl/EplDlluCal.c @@ -355,7 +355,7 @@ tEplKernel EplDlluCalAsyncSend(tEplFrameInfo * pFrameInfo_p, //--------------------------------------------------------------------------- tEplKernel EplDlluCalIssueRequest(tEplDllReqServiceId Service_p, - unsigned int uiNodeId_p, BYTE bSoaFlag1_p) + unsigned int uiNodeId_p, u8 bSoaFlag1_p) { tEplKernel Ret = kEplSuccessful; diff --git a/drivers/staging/epl/EplErrorHandlerk.c b/drivers/staging/epl/EplErrorHandlerk.c index 120e77e50894..aeb77fb9d53d 100644 --- a/drivers/staging/epl/EplErrorHandlerk.c +++ b/drivers/staging/epl/EplErrorHandlerk.c @@ -770,7 +770,7 @@ static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p, tEplKernel Ret = kEplSuccessful; tEplVarParam VarParam; tEplObdSize EntrySize; - BYTE bIndexEntries; + u8 bIndexEntries; EntrySize = (tEplObdSize) sizeof(bIndexEntries); Ret = EplObdReadEntry(uiIndex_p, diff --git a/drivers/staging/epl/EplEvent.h b/drivers/staging/epl/EplEvent.h index c3c317df96c5..b543711feb6b 100644 --- a/drivers/staging/epl/EplEvent.h +++ b/drivers/staging/epl/EplEvent.h @@ -248,7 +248,7 @@ typedef struct { tEplEventSource m_EventSource; // module which posted this error event tEplKernel m_EplError; // EPL error which occured union { - BYTE m_bArg; + u8 m_bArg; DWORD m_dwArg; tEplEventSource m_EventSource; // from Eventk/u module (originating error source) tEplEventObdError m_ObdError; // from Obd module diff --git a/drivers/staging/epl/EplEventk.c b/drivers/staging/epl/EplEventk.c index 165d7e9ef4ab..88ea89344dd7 100644 --- a/drivers/staging/epl/EplEventk.c +++ b/drivers/staging/epl/EplEventk.c @@ -100,7 +100,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) @@ -760,7 +760,7 @@ tEplKernel EplEventkPostError(tEplEventSource EventSource_p, unsigned int uiArgSize_p, void *pArg_p) { tEplKernel Ret; - BYTE abBuffer[EPL_MAX_EVENT_ARG_SIZE]; + u8 abBuffer[EPL_MAX_EVENT_ARG_SIZE]; tEplEventError *pEventError = (tEplEventError *) abBuffer; tEplEvent EplEvent; @@ -814,7 +814,7 @@ static void EplEventkRxSignalHandlerCb(tShbInstance pShbRxInstance_p, tShbError ShbError; //unsigned long ulBlockCount; //unsigned long ulDataSize; - BYTE abDataBuffer[sizeof(tEplEvent) + EPL_MAX_EVENT_ARG_SIZE]; + u8 abDataBuffer[sizeof(tEplEvent) + EPL_MAX_EVENT_ARG_SIZE]; // d.k.: abDataBuffer contains the complete tEplEvent structure // and behind this the argument diff --git a/drivers/staging/epl/EplEventu.c b/drivers/staging/epl/EplEventu.c index d26e95a923a7..29cb1636e59f 100644 --- a/drivers/staging/epl/EplEventu.c +++ b/drivers/staging/epl/EplEventu.c @@ -96,7 +96,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) @@ -693,7 +693,7 @@ tEplKernel EplEventuPostError(tEplEventSource EventSource_p, unsigned int uiArgSize_p, void *pArg_p) { tEplKernel Ret; - BYTE abBuffer[EPL_MAX_EVENT_ARG_SIZE]; + u8 abBuffer[EPL_MAX_EVENT_ARG_SIZE]; tEplEventError *pEventError = (tEplEventError *) abBuffer; tEplEvent EplEvent; @@ -750,7 +750,7 @@ static void EplEventuRxSignalHandlerCb(tShbInstance pShbRxInstance_p, tShbError ShbError; //unsigned long ulBlockCount; //unsigned long ulDataSize; - BYTE abDataBuffer[sizeof(tEplEvent) + EPL_MAX_EVENT_ARG_SIZE]; + u8 abDataBuffer[sizeof(tEplEvent) + EPL_MAX_EVENT_ARG_SIZE]; // d.k.: abDataBuffer contains the complete tEplEvent structure // and behind this the argument diff --git a/drivers/staging/epl/EplFrame.h b/drivers/staging/epl/EplFrame.h index 9a7f8b9f594e..0f8d59f937bc 100644 --- a/drivers/staging/epl/EplFrame.h +++ b/drivers/staging/epl/EplFrame.h @@ -122,11 +122,11 @@ typedef struct { // Offset 17 - BYTE m_le_bRes1; // reserved + u8 m_le_bRes1; // reserved // Offset 18 - BYTE m_le_bFlag1; // Flags: MC, PS + u8 m_le_bFlag1; // Flags: MC, PS // Offset 19 - BYTE m_le_bFlag2; // Flags: res + u8 m_le_bFlag2; // Flags: res // Offset 20 tEplNetTime m_le_NetTime; // supported if D_NMT_NetTimeIsRealTime_BOOL is set // Offset 28 @@ -136,54 +136,54 @@ typedef struct { typedef struct { // Offset 17 - BYTE m_le_bRes1; // reserved + u8 m_le_bRes1; // reserved // Offset 18 - BYTE m_le_bFlag1; // Flags: MS, EA, RD + u8 m_le_bFlag1; // Flags: MS, EA, RD // Offset 19 - BYTE m_le_bFlag2; // Flags: res + u8 m_le_bFlag2; // Flags: res // Offset 20 - BYTE m_le_bPdoVersion; + u8 m_le_bPdoVersion; // Offset 21 - BYTE m_le_bRes2; // reserved + u8 m_le_bRes2; // reserved // Offset 22 WORD m_le_wSize; // Offset 24 - BYTE m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16 */ ]; + u8 m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16 */ ]; } PACK_STRUCT tEplPreqFrame; typedef struct { // Offset 17 - BYTE m_le_bNmtStatus; // NMT state + u8 m_le_bNmtStatus; // NMT state // Offset 18 - BYTE m_le_bFlag1; // Flags: MS, EN, RD + u8 m_le_bFlag1; // Flags: MS, EN, RD // Offset 19 - BYTE m_le_bFlag2; // Flags: PR, RS + u8 m_le_bFlag2; // Flags: PR, RS // Offset 20 - BYTE m_le_bPdoVersion; + u8 m_le_bPdoVersion; // Offset 21 - BYTE m_le_bRes2; // reserved + u8 m_le_bRes2; // reserved // Offset 22 WORD m_le_wSize; // Offset 24 - BYTE m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16 + u8 m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16 / D_NMT_IsochrTxMaxPayload_U16 */ ]; } PACK_STRUCT tEplPresFrame; typedef struct { // Offset 17 - BYTE m_le_bNmtStatus; // NMT state + u8 m_le_bNmtStatus; // NMT state // Offset 18 - BYTE m_le_bFlag1; // Flags: EA, ER + u8 m_le_bFlag1; // Flags: EA, ER // Offset 19 - BYTE m_le_bFlag2; // Flags: res + u8 m_le_bFlag2; // Flags: res // Offset 20 - BYTE m_le_bReqServiceId; + u8 m_le_bReqServiceId; // Offset 21 - BYTE m_le_bReqServiceTarget; + u8 m_le_bReqServiceTarget; // Offset 22 - BYTE m_le_bEplVersion; + u8 m_le_bEplVersion; } PACK_STRUCT tEplSoaFrame; @@ -191,16 +191,16 @@ typedef struct { WORD m_wEntryType; WORD m_wErrorCode; tEplNetTime m_TimeStamp; - BYTE m_abAddInfo[8]; + u8 m_abAddInfo[8]; } PACK_STRUCT tEplErrHistoryEntry; typedef struct { // Offset 18 - BYTE m_le_bFlag1; // Flags: EN, EC - BYTE m_le_bFlag2; // Flags: PR, RS - BYTE m_le_bNmtStatus; // NMT state - BYTE m_le_bRes1[3]; + u8 m_le_bFlag1; // Flags: EN, EC + u8 m_le_bFlag2; // Flags: PR, RS + u8 m_le_bNmtStatus; // NMT state + u8 m_le_bRes1[3]; QWORD m_le_qwStaticError; // static error bit field tEplErrHistoryEntry m_le_aErrHistoryEntry[14]; @@ -208,12 +208,12 @@ typedef struct { typedef struct { // Offset 18 - BYTE m_le_bFlag1; // Flags: res - BYTE m_le_bFlag2; // Flags: PR, RS - BYTE m_le_bNmtStatus; // NMT state - BYTE m_le_bIdentRespFlags; // Flags: FW - BYTE m_le_bEplProfileVersion; - BYTE m_le_bRes1; + u8 m_le_bFlag1; // Flags: res + u8 m_le_bFlag2; // Flags: PR, RS + u8 m_le_bNmtStatus; // NMT state + u8 m_le_bIdentRespFlags; // Flags: FW + u8 m_le_bEplProfileVersion; + u8 m_le_bRes1; DWORD m_le_dwFeatureFlags; // NMT_FeatureFlags_U32 WORD m_le_wMtu; // NMT_CycleTiming_REC.AsyncMTU_U16: C_IP_MIN_MTU - C_IP_MAX_MTU WORD m_le_wPollInSize; // NMT_CycleTiming_REC.PReqActPayload_U16 @@ -233,44 +233,44 @@ typedef struct { DWORD m_le_dwIpAddress; DWORD m_le_dwSubnetMask; DWORD m_le_dwDefaultGateway; - BYTE m_le_sHostname[32]; - BYTE m_le_abVendorSpecificExt2[48]; + u8 m_le_sHostname[32]; + u8 m_le_abVendorSpecificExt2[48]; } PACK_STRUCT tEplIdentResponse; typedef struct { // Offset 18 - BYTE m_le_bNmtCommandId; - BYTE m_le_bRes1; - BYTE m_le_abNmtCommandData[32]; + u8 m_le_bNmtCommandId; + u8 m_le_bRes1; + u8 m_le_abNmtCommandData[32]; } PACK_STRUCT tEplNmtCommandService; typedef struct { - BYTE m_le_bReserved; - BYTE m_le_bTransactionId; - BYTE m_le_bFlags; - BYTE m_le_bCommandId; + u8 m_le_bReserved; + u8 m_le_bTransactionId; + u8 m_le_bFlags; + u8 m_le_bCommandId; WORD m_le_wSegmentSize; WORD m_le_wReserved; - BYTE m_le_abCommandData[8]; // just reserve a minimum number of bytes as a placeholder + u8 m_le_abCommandData[8]; // just reserve a minimum number of bytes as a placeholder } PACK_STRUCT tEplAsySdoCom; // asynchronous SDO Sequence Header typedef struct { - BYTE m_le_bRecSeqNumCon; - BYTE m_le_bSendSeqNumCon; - BYTE m_le_abReserved[2]; + u8 m_le_bRecSeqNumCon; + u8 m_le_bSendSeqNumCon; + u8 m_le_abReserved[2]; tEplAsySdoCom m_le_abSdoSeqPayload; } PACK_STRUCT tEplAsySdoSeq; typedef struct { // Offset 18 - BYTE m_le_bNmtCommandId; - BYTE m_le_bTargetNodeId; - BYTE m_le_abNmtCommandData[32]; + u8 m_le_bNmtCommandId; + u8 m_le_bTargetNodeId; + u8 m_le_abNmtCommandData[32]; } PACK_STRUCT tEplNmtRequestService; @@ -281,14 +281,14 @@ typedef union { tEplNmtCommandService m_NmtCommandService; tEplNmtRequestService m_NmtRequestService; tEplAsySdoSeq m_SdoSequenceFrame; - BYTE m_le_abPayload[256 /*D_NMT_ASndTxMaxPayload_U16 + u8 m_le_abPayload[256 /*D_NMT_ASndTxMaxPayload_U16 / D_NMT_ASndRxMaxPayload_U16 */ ]; } tEplAsndPayload; typedef struct { // Offset 17 - BYTE m_le_bServiceId; + u8 m_le_bServiceId; // Offset 18 tEplAsndPayload m_Payload; @@ -306,17 +306,17 @@ typedef union { typedef struct { // Offset 0 - BYTE m_be_abDstMac[6]; // MAC address of the addressed nodes + u8 m_be_abDstMac[6]; // MAC address of the addressed nodes // Offset 6 - BYTE m_be_abSrcMac[6]; // MAC address of the transmitting node + u8 m_be_abSrcMac[6]; // MAC address of the transmitting node // Offset 12 WORD m_be_wEtherType; // Ethernet message type (big endian) // Offset 14 - BYTE m_le_bMessageType; // EPL message type + u8 m_le_bMessageType; // EPL message type // Offset 15 - BYTE m_le_bDstNodeId; // EPL node ID of the addressed nodes + u8 m_le_bDstNodeId; // EPL node ID of the addressed nodes // Offset 16 - BYTE m_le_bSrcNodeId; // EPL node ID of the transmitting node + u8 m_le_bSrcNodeId; // EPL node ID of the transmitting node // Offset 17 tEplFrameData m_Data; diff --git a/drivers/staging/epl/EplInstDef.h b/drivers/staging/epl/EplInstDef.h index 756ac635324a..29ab7fb7888d 100644 --- a/drivers/staging/epl/EplInstDef.h +++ b/drivers/staging/epl/EplInstDef.h @@ -71,6 +71,8 @@ #ifndef _EPLINSTDEF_H_ #define _EPLINSTDEF_H_ +#include + // ========================================================================= // types and macros for generating instances // ========================================================================= @@ -84,7 +86,7 @@ typedef enum { //------------------------------------------------------------------------------------------ typedef void *tEplPtrInstance; -typedef BYTE tEplInstanceHdl; +typedef u8 tEplInstanceHdl; // define const for illegale values #define CCM_ILLINSTANCE NULL @@ -214,8 +216,8 @@ typedef BYTE tEplInstanceHdl; tFastByte InstNumber = 0; \ tFastByte i = EPL_MAX_INSTANCES; \ do { \ - pInstance->m_InstState = (BYTE) kStateUnused; \ - pInstance->m_bInstIndex = (BYTE) InstNumber; \ + pInstance->m_InstState = (u8) kStateUnused; \ + pInstance->m_bInstIndex = (u8) InstNumber; \ pInstance++; InstNumber++; i--; \ } while (i != 0); \ } @@ -243,8 +245,8 @@ typedef BYTE tEplInstanceHdl; // this macro defines member variables in instance table which are needed in // all modules of Epl stack #define EPL_MCO_DECL_INSTANCE_MEMBER() \ - STATIC BYTE m_InstState; \ - STATIC BYTE m_bInstIndex; + STATIC u8 m_InstState; \ + STATIC u8 m_bInstIndex; #define EPL_MCO_INSTANCE_PARAM_IDX_() EPL_MCO_INSTANCE_PARAM_ (EPL_MCO_GLB_VAR (m_bInstIndex)) #define EPL_MCO_INSTANCE_PARAM_IDX() EPL_MCO_INSTANCE_PARAM (EPL_MCO_GLB_VAR (m_bInstIndex)) diff --git a/drivers/staging/epl/EplNmtCnu.c b/drivers/staging/epl/EplNmtCnu.c index 2c3911675396..4bbc4ffca9f2 100644 --- a/drivers/staging/epl/EplNmtCnu.c +++ b/drivers/staging/epl/EplNmtCnu.c @@ -108,7 +108,7 @@ static tEplNmtCnuInstance EplNmtCnuInstance_g; static tEplNmtCommand EplNmtCnuGetNmtCommand(tEplFrameInfo * pFrameInfo_p); -static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p); +static BOOL EplNmtCnuNodeIdList(u8 * pbNmtCommandDate_p); static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p); @@ -248,15 +248,15 @@ EPLDLLEXPORT tEplKernel EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, EPL_MEMSET(&NmtRequestFrame.m_be_abSrcMac[0], 0x00, sizeof(NmtRequestFrame.m_be_abSrcMac)); // set by DLL AmiSetWordToBe(&NmtRequestFrame.m_be_wEtherType, EPL_C_DLL_ETHERTYPE_EPL); - AmiSetByteToLe(&NmtRequestFrame.m_le_bDstNodeId, (BYTE) EPL_C_ADR_MN_DEF_NODE_ID); // node id of the MN + AmiSetByteToLe(&NmtRequestFrame.m_le_bDstNodeId, (u8) EPL_C_ADR_MN_DEF_NODE_ID); // node id of the MN AmiSetByteToLe(&NmtRequestFrame.m_le_bMessageType, - (BYTE) kEplMsgTypeAsnd); + (u8) kEplMsgTypeAsnd); AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_le_bServiceId, - (BYTE) kEplDllAsndNmtRequest); + (u8) kEplDllAsndNmtRequest); AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload. m_NmtRequestService.m_le_bNmtCommandId, - (BYTE) NmtCommand_p); - AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService.m_le_bTargetNodeId, (BYTE) uiNodeId_p); // target for the nmt command + (u8) NmtCommand_p); + AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService.m_le_bTargetNodeId, (u8) uiNodeId_p); // target for the nmt command EPL_MEMSET(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService. m_le_abNmtCommandData[0], 0x00, sizeof(NmtRequestFrame.m_Data.m_Asnd.m_Payload. @@ -673,18 +673,18 @@ static tEplNmtCommand EplNmtCnuGetNmtCommand(tEplFrameInfo * pFrameInfo_p) // State: // //--------------------------------------------------------------------------- -static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p) +static BOOL EplNmtCnuNodeIdList(u8 * pbNmtCommandDate_p) { BOOL fNodeIdInList; unsigned int uiByteOffset; - BYTE bBitOffset; - BYTE bNodeListByte; + u8 bBitOffset; + u8 bNodeListByte; // get byte-offset of the own nodeid in NodeIdList // devide though 8 uiByteOffset = (unsigned int)(EplNmtCnuInstance_g.m_uiNodeId >> 3); // get bitoffset - bBitOffset = (BYTE) EplNmtCnuInstance_g.m_uiNodeId % 8; + bBitOffset = (u8) EplNmtCnuInstance_g.m_uiNodeId % 8; bNodeListByte = AmiGetByteFromLe(&pbNmtCommandDate_p[uiByteOffset]); if ((bNodeListByte & bBitOffset) == 0) { diff --git a/drivers/staging/epl/EplNmtMnu.c b/drivers/staging/epl/EplNmtMnu.c index 79ffdbf7fad2..1c5d9d407d26 100644 --- a/drivers/staging/epl/EplNmtMnu.c +++ b/drivers/staging/epl/EplNmtMnu.c @@ -94,7 +94,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) @@ -417,7 +417,7 @@ tEplKernel EplNmtMnuSendNmtCommandEx(unsigned int uiNodeId_p, { tEplKernel Ret = kEplSuccessful; tEplFrameInfo FrameInfo; - BYTE abBuffer[EPL_C_DLL_MINSIZE_NMTCMDEXT]; + u8 abBuffer[EPL_C_DLL_MINSIZE_NMTCMDEXT]; tEplFrame *pFrame = (tEplFrame *) abBuffer; BOOL fSoftDeleteNode = FALSE; @@ -437,11 +437,11 @@ tEplKernel EplNmtMnuSendNmtCommandEx(unsigned int uiNodeId_p, // build frame EPL_MEMSET(pFrame, 0x00, sizeof(abBuffer)); - AmiSetByteToLe(&pFrame->m_le_bDstNodeId, (BYTE) uiNodeId_p); + AmiSetByteToLe(&pFrame->m_le_bDstNodeId, (u8) uiNodeId_p); AmiSetByteToLe(&pFrame->m_Data.m_Asnd.m_le_bServiceId, - (BYTE) kEplDllAsndNmtCommand); + (u8) kEplDllAsndNmtCommand); AmiSetByteToLe(&pFrame->m_Data.m_Asnd.m_Payload.m_NmtCommandService. - m_le_bNmtCommandId, (BYTE) NmtCommand_p); + m_le_bNmtCommandId, (u8) NmtCommand_p); if ((pNmtCommandData_p != NULL) && (uiDataSize_p > 0)) { // copy command data to frame EPL_MEMCPY(&pFrame->m_Data.m_Asnd.m_Payload.m_NmtCommandService. m_le_abNmtCommandData[0], pNmtCommandData_p, @@ -572,7 +572,7 @@ tEplKernel EplNmtMnuTriggerStateChange(unsigned int uiNodeId_p, tEplKernel Ret = kEplSuccessful; tEplNmtMnuIntNodeEvent NodeEvent; tEplObdSize ObdSize; - BYTE bNmtState; + u8 bNmtState; WORD wErrorCode = EPL_E_NO_ERROR; if ((uiNodeId_p == 0) || (uiNodeId_p >= EPL_C_ADR_BROADCAST)) { @@ -967,7 +967,7 @@ EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent *pEvent_p) EPL_NMTMNU_TIMERARG_NODE_MASK); if (uiNodeId != 0) { tEplObdSize ObdSize; - BYTE bNmtState; + u8 bNmtState; tEplNmtMnuNodeInfo *pNodeInfo; pNodeInfo = EPL_NMTMNU_GET_NODEINFO(uiNodeId); @@ -1147,7 +1147,7 @@ EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent *pEvent_p) tEplFrame *pFrame = (tEplFrame *) pEvent_p->m_pArg; unsigned int uiNodeId; tEplNmtCommand NmtCommand; - BYTE bNmtState; + u8 bNmtState; uiNodeId = AmiGetByteFromLe(&pFrame->m_le_bDstNodeId); NmtCommand = @@ -1159,30 +1159,30 @@ EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent *pEvent_p) switch (NmtCommand) { case kEplNmtCmdStartNode: bNmtState = - (BYTE) (kEplNmtCsOperational & 0xFF); + (u8) (kEplNmtCsOperational & 0xFF); break; case kEplNmtCmdStopNode: - bNmtState = (BYTE) (kEplNmtCsStopped & 0xFF); + bNmtState = (u8) (kEplNmtCsStopped & 0xFF); break; case kEplNmtCmdEnterPreOperational2: bNmtState = - (BYTE) (kEplNmtCsPreOperational2 & 0xFF); + (u8) (kEplNmtCsPreOperational2 & 0xFF); break; case kEplNmtCmdEnableReadyToOperate: // d.k. do not change expected node state, because of DS 1.0.0 7.3.1.2.1 Plain NMT State Command // and because node may not change NMT state within EPL_C_NMT_STATE_TOLERANCE bNmtState = - (BYTE) (kEplNmtCsPreOperational2 & 0xFF); + (u8) (kEplNmtCsPreOperational2 & 0xFF); break; case kEplNmtCmdResetNode: case kEplNmtCmdResetCommunication: case kEplNmtCmdResetConfiguration: case kEplNmtCmdSwReset: - bNmtState = (BYTE) (kEplNmtCsNotActive & 0xFF); + bNmtState = (u8) (kEplNmtCsNotActive & 0xFF); // EplNmtMnuProcessInternalEvent() sets internal node state to kEplNmtMnuNodeStateUnknown // after next unresponded IdentRequest/StatusRequest break; @@ -1927,7 +1927,7 @@ static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p, switch (NodeEvent_p) { case kEplNmtMnuIntNodeEventIdentResponse: { - BYTE bNmtState; + u8 bNmtState; EPL_NMTMNU_DBG_POST_TRACE_VALUE(NodeEvent_p, uiNodeId_p, @@ -1954,7 +1954,7 @@ static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p, ~EPL_NMTMNU_NODE_FLAG_NOT_SCANNED; } // update object 0x1F8F NMT_MNNodeExpState_AU8 to PreOp1 (even if local state >= PreOp2) - bNmtState = (BYTE) (kEplNmtCsPreOperational1 & 0xFF); + bNmtState = (u8) (kEplNmtCsPreOperational1 & 0xFF); Ret = EplObduWriteEntry(0x1F8F, uiNodeId_p, &bNmtState, 1); @@ -2434,11 +2434,11 @@ static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p, case kEplNmtMnuIntNodeEventNmtCmdSent: { - BYTE bNmtState; + u8 bNmtState; // update expected NMT state with the one that results // from the sent NMT command - bNmtState = (BYTE) (NodeNmtState_p & 0xFF); + bNmtState = (u8) (NodeNmtState_p & 0xFF); // write object 0x1F8F NMT_MNNodeExpState_AU8 Ret = @@ -2628,8 +2628,8 @@ static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p, { tEplKernel Ret = kEplSuccessful; tEplObdSize ObdSize; - BYTE bNmtState; - BYTE bNmtStatePrev; + u8 bNmtState; + u8 bNmtStatePrev; tEplNmtState ExpNmtState; ObdSize = 1; @@ -2640,8 +2640,8 @@ static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p, } // compute expected NMT state ExpNmtState = (tEplNmtState) (bNmtState | EPL_NMT_TYPE_CS); - // compute BYTE of current NMT state - bNmtState = ((BYTE) NodeNmtState_p & 0xFF); + // compute u8 of current NMT state + bNmtState = ((u8) NodeNmtState_p & 0xFF); if (ExpNmtState == kEplNmtCsNotActive) { // ignore the current state, because the CN shall be not active Ret = kEplReject; diff --git a/drivers/staging/epl/EplNmtk.c b/drivers/staging/epl/EplNmtk.c index 51df9e68ac27..18edb0b07484 100644 --- a/drivers/staging/epl/EplNmtk.c +++ b/drivers/staging/epl/EplNmtk.c @@ -88,7 +88,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c index f449f4c30a7a..e55cf07a3e6b 100644 --- a/drivers/staging/epl/EplObd.c +++ b/drivers/staging/epl/EplObd.c @@ -123,7 +123,7 @@ typedef union { EPL_MCO_DECL_INSTANCE_VAR() -BYTE abEplObdTrashObject_g[8]; +u8 abEplObdTrashObject_g[8]; //--------------------------------------------------------------------------- // local function prototypes @@ -833,7 +833,7 @@ EPLDLLEXPORT unsigned int EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR) { tEplKernel Ret; tEplObdSize ObdSize; - BYTE bNodeId; + u8 bNodeId; bNodeId = 0; ObdSize = sizeof(bNodeId); @@ -871,16 +871,16 @@ EPLDLLEXPORT tEplKernel EplObdSetNodeId(EPL_MCO_DECL_PTR_INSTANCE_PTR_ unsigned { tEplKernel Ret; tEplObdSize ObdSize; - BYTE fHwBool; - BYTE bNodeId; + u8 fHwBool; + u8 bNodeId; // check Node Id if (uiNodeId_p == EPL_C_ADR_INVALID) { Ret = kEplInvalidNodeId; goto Exit; } - bNodeId = (BYTE) uiNodeId_p; - ObdSize = sizeof(BYTE); + bNodeId = (u8) uiNodeId_p; + ObdSize = sizeof(u8); // write NodeId to OD entry Ret = EplObdWriteEntry(EPL_MCO_PTR_INSTANCE_PTR_ EPL_OBD_NODE_ID_INDEX, @@ -1072,7 +1072,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned case kEplObdTypInt8: case kEplObdTypUInt8: { - AmiSetByteToLe(pDstData_p, *((BYTE *) pSrcData)); + AmiSetByteToLe(pDstData_p, *((u8 *) pSrcData)); break; } @@ -1222,7 +1222,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign case kEplObdTypInt8: case kEplObdTypUInt8: { - *((BYTE *) pBuffer) = AmiGetByteFromLe(pSrcData_p); + *((u8 *) pBuffer) = AmiGetByteFromLe(pSrcData_p); break; } @@ -1503,7 +1503,7 @@ static tEplObdSize EplObdGetStrLen(void *pObjData_p, { tEplObdSize StrLen = 0; - BYTE *pbString; + u8 *pbString; if (pObjData_p == NULL) { goto Exit; @@ -2094,7 +2094,7 @@ static tEplKernel EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPt // Function: EplObdGetObjectSize() // // Description: function to get size of object -// The function determines if an object type an fixed data type (BYTE, WORD, ...) +// The function determines if an object type an fixed data type (u8, WORD, ...) // or non fixed object (string, domain). This information is used to decide // if download data are stored temporary or not. For objects with fixed data length // and types a value range checking can process. @@ -2463,7 +2463,7 @@ static void *EplObdGetObjectCurrentPtr(tEplObdSubEntryPtr pSubIndexEntry_p) } else { Size = EplObdGetObjectSize(pSubIndexEntry_p); } - pData = ((BYTE *) pData) + (Size * uiArrayIndex); + pData = ((u8 *) pData) + (Size * uiArrayIndex); } // check if VarEntry if ((pSubIndexEntry_p->m_Access & kEplObdAccVar) != 0) { @@ -2772,14 +2772,14 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ Ret = kEplSuccessful; // prepare structure for STORE RESTORE callback function - CbStore.m_bCurrentOdPart = (BYTE) CurrentOdPart_p; + CbStore.m_bCurrentOdPart = (u8) CurrentOdPart_p; CbStore.m_pData = NULL; CbStore.m_ObjSize = 0; // command of first action depends on direction to access #if (EPL_OBD_USE_STORE_RESTORE != FALSE) if (Direction_p == kEplObdDirLoad) { - CbStore.m_bCommand = (BYTE) kEplObdCommOpenRead; + CbStore.m_bCommand = (u8) kEplObdCommOpenRead; // call callback function for previous command Ret = EplObdCallStoreCallback(EPL_MCO_INSTANCE_PTR_ & CbStore); @@ -2787,9 +2787,9 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ goto Exit; } // set command for index and subindex loop - CbStore.m_bCommand = (BYTE) kEplObdCommReadObj; + CbStore.m_bCommand = (u8) kEplObdCommReadObj; } else if (Direction_p == kEplObdDirStore) { - CbStore.m_bCommand = (BYTE) kEplObdCommOpenWrite; + CbStore.m_bCommand = (u8) kEplObdCommOpenWrite; // call callback function for previous command Ret = EplObdCallStoreCallback(EPL_MCO_INSTANCE_PTR_ & CbStore); @@ -2797,7 +2797,7 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ goto Exit; } // set command for index and subindex loop - CbStore.m_bCommand = (BYTE) kEplObdCommWriteObj; + CbStore.m_bCommand = (u8) kEplObdCommWriteObj; } #endif // (EPL_OBD_USE_STORE_RESTORE != FALSE) @@ -2848,7 +2848,7 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ } else { - EplObdInitVarEntry ((tEplObdVarEntry *) (((BYTE *) pSubIndex->m_pCurrent) + (sizeof (tEplObdVarEntry) * pSubIndex->m_uiSubIndex)), + EplObdInitVarEntry ((tEplObdVarEntry *) (((u8 *) pSubIndex->m_pCurrent) + (sizeof (tEplObdVarEntry) * pSubIndex->m_uiSubIndex)), pSubIndex->m_Type, ObjSize); } */ @@ -3003,11 +3003,11 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ #if (EPL_OBD_USE_STORE_RESTORE != FALSE) else { if (Direction_p == kEplObdDirLoad) { - CbStore.m_bCommand = (BYTE) kEplObdCommCloseRead; + CbStore.m_bCommand = (u8) kEplObdCommCloseRead; } else if (Direction_p == kEplObdDirStore) { - CbStore.m_bCommand = (BYTE) kEplObdCommCloseWrite; + CbStore.m_bCommand = (u8) kEplObdCommCloseWrite; } else if (Direction_p == kEplObdDirRestore) { - CbStore.m_bCommand = (BYTE) kEplObdCommClear; + CbStore.m_bCommand = (u8) kEplObdCommClear; } else { goto Exit; } diff --git a/drivers/staging/epl/EplObd.h b/drivers/staging/epl/EplObd.h index e2dd2278a1bc..eebff886bf89 100644 --- a/drivers/staging/epl/EplObd.h +++ b/drivers/staging/epl/EplObd.h @@ -309,7 +309,7 @@ typedef struct { typedef struct { tEplObdSize m_Size; - BYTE *m_pString; + u8 *m_pString; } tEplObdOString; // 000C @@ -327,8 +327,8 @@ typedef struct { typedef struct { tEplObdSize m_Size; - BYTE *m_pDefString; // $$$ d.k. it is unused, so we could delete it - BYTE *m_pString; + u8 *m_pDefString; // $$$ d.k. it is unused, so we could delete it + u8 *m_pString; } tEplObdOStringDef; @@ -431,7 +431,7 @@ typedef struct { unsigned int m_uiUpperObjIndex; // upper limit of ObjIndex tInitTabEntryCallback m_fpInitTabEntry; // will be called if ObjIndex was found void *m_pTabBase; // base address of table - unsigned int m_uiEntrySize; // size of table entry // 25-feb-2005 r.d.: expansion from BYTE to WORD necessary for PDO bit mapping + unsigned int m_uiEntrySize; // size of table entry // 25-feb-2005 r.d.: expansion from u8 to WORD necessary for PDO bit mapping unsigned int m_uiMaxEntries; // max. tabel entries } tEplObdModulTabParam; diff --git a/drivers/staging/epl/EplObdMacro.h b/drivers/staging/epl/EplObdMacro.h index 21849b059e3b..c70d17abaa1b 100644 --- a/drivers/staging/epl/EplObdMacro.h +++ b/drivers/staging/epl/EplObdMacro.h @@ -105,8 +105,8 @@ #define EPL_OBD_SUBINDEX_RAM_VSTRING(ind,sub,acc,name,size,val) static char szCur##ind##_##sub##_g[size+1]; \ static tEplObdVStringDef xDef##ind##_##sub##_g = {size, val, szCur##ind##_##sub##_g}; -#define EPL_OBD_SUBINDEX_RAM_OSTRING(ind,sub,acc,name,size) static BYTE bCur##ind##_##sub##_g[size]; \ - static tEplObdOStringDef xDef##ind##_##sub##_g = {size, ((BYTE*)""), bCur##ind##_##sub##_g}; +#define EPL_OBD_SUBINDEX_RAM_OSTRING(ind,sub,acc,name,size) static u8 bCur##ind##_##sub##_g[size]; \ + static tEplObdOStringDef xDef##ind##_##sub##_g = {size, ((u8*)""), bCur##ind##_##sub##_g}; #define EPL_OBD_SUBINDEX_RAM_DOMAIN(ind,sub,acc,name) #define EPL_OBD_SUBINDEX_RAM_USERDEF(ind,sub,typ,acc,dtyp,name,val) static dtyp xDef##ind##_##sub##_g = val; #define EPL_OBD_SUBINDEX_RAM_USERDEF_RG(ind,sub,typ,acc,dtyp,name,val,low,high) static dtyp xDef##ind##_##sub##_g[3] = {val,low,high}; diff --git a/drivers/staging/epl/EplObdu.c b/drivers/staging/epl/EplObdu.c index da975ff01f30..d0840532a964 100644 --- a/drivers/staging/epl/EplObdu.c +++ b/drivers/staging/epl/EplObdu.c @@ -275,7 +275,7 @@ EPLDLLEXPORT tEplKernel EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p) // //--------------------------------------------------------------------------- EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry *pVarEntry_p, - BYTE bType_p, tEplObdSize ObdSize_p) + u8 bType_p, tEplObdSize ObdSize_p) { EplObduCalInitVarEntry(pVarEntry_p, bType_p, ObdSize_p); } diff --git a/drivers/staging/epl/EplObduCal.c b/drivers/staging/epl/EplObduCal.c index fc04d9a7c0e4..24058410c6b2 100644 --- a/drivers/staging/epl/EplObduCal.c +++ b/drivers/staging/epl/EplObduCal.c @@ -297,7 +297,7 @@ EPLDLLEXPORT tEplKernel EplObduCalRegisterUserOd(tEplObdEntryPtr pUserOd_p) // //--------------------------------------------------------------------------- EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry *pVarEntry_p, - BYTE bType_p, tEplObdSize ObdSize_p) + u8 bType_p, tEplObdSize ObdSize_p) { #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) EplObdInitVarEntry(pVarEntry_p, bType_p, ObdSize_p); diff --git a/drivers/staging/epl/EplPdo.h b/drivers/staging/epl/EplPdo.h index d22ac86e85b6..83cc1f7046dc 100644 --- a/drivers/staging/epl/EplPdo.h +++ b/drivers/staging/epl/EplPdo.h @@ -104,7 +104,7 @@ typedef struct { // TPDO: 0x00=PRes, MN: CnNodeId=PReq BOOL m_fTxRx; - BYTE m_bMappingVersion; + u8 m_bMappingVersion; unsigned int m_uiMaxMappingEntries; // maximum number of mapping entries, i.e. size of m_aPdoMapping tEplPdoMapping m_aPdoMapping[1]; diff --git a/drivers/staging/epl/EplPdok.c b/drivers/staging/epl/EplPdok.c index 3b253ffee3bc..163dc53344e0 100644 --- a/drivers/staging/epl/EplPdok.c +++ b/drivers/staging/epl/EplPdok.c @@ -319,14 +319,14 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p) WORD wBitSize; WORD wVarSize; QWORD qwObjectMapping; - BYTE bMappSubindex; - BYTE bObdSubindex; + u8 bMappSubindex; + u8 bObdSubindex; WORD wObdMappIndex; WORD wObdCommIndex; WORD wPdoId; - BYTE bObdData; - BYTE bObjectCount; - BYTE bFrameData; + u8 bObdData; + u8 bObjectCount; + u8 bFrameData; BOOL fValid; tEplObdSize ObdSize; tEplFrame *pFrame; @@ -441,7 +441,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p) (WORD) (qwObjectMapping & 0x000000000000FFFFLL); bObdSubindex = - (BYTE) ((qwObjectMapping & + (u8) ((qwObjectMapping & 0x0000000000FF0000LL) >> 16); wBitOffset = (WORD) ((qwObjectMapping & @@ -571,7 +571,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p) (WORD) (qwObjectMapping & 0x000000000000FFFFLL); bObdSubindex = - (BYTE) ((qwObjectMapping & + (u8) ((qwObjectMapping & 0x0000000000FF0000LL) >> 16); wBitOffset = (WORD) ((qwObjectMapping & diff --git a/drivers/staging/epl/EplPdou.c b/drivers/staging/epl/EplPdou.c index 606f03269b34..4536d4dc6a46 100644 --- a/drivers/staging/epl/EplPdou.c +++ b/drivers/staging/epl/EplPdou.c @@ -232,10 +232,10 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p) unsigned int uiPdoId; unsigned int uiIndexType; tEplObdSize ObdSize; - BYTE bObjectCount; + u8 bObjectCount; QWORD qwObjectMapping; tEplObdAccess AccessType; - BYTE bMappSubindex; + u8 bMappSubindex; unsigned int uiCurPdoSize; WORD wMaxPdoSize; unsigned int uiSubIndex; @@ -293,7 +293,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p) if (pParam_p->m_uiSubIndex == 0) { // object mapping count accessed // PDO is enabled or disabled - bObjectCount = *((BYTE *) pParam_p->m_pArg); + bObjectCount = *((u8 *) pParam_p->m_pArg); if (bObjectCount == 0) { // PDO shall be disabled @@ -399,7 +399,7 @@ static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam *pParam_p, { tEplKernel Ret = kEplSuccessful; tEplObdSize ObdSize; - BYTE bObjectCount; + u8 bObjectCount; ObdSize = 1; // read number of mapped objects from OD; this indicates if the PDO is valid diff --git a/drivers/staging/epl/EplSdoAsndu.c b/drivers/staging/epl/EplSdoAsndu.c index a6596a51f1eb..80135d27e038 100644 --- a/drivers/staging/epl/EplSdoAsndu.c +++ b/drivers/staging/epl/EplSdoAsndu.c @@ -339,10 +339,10 @@ tEplKernel EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, // own node id not needed -> filled by DLL // set message type - AmiSetByteToLe(&pSrcData_p->m_le_bMessageType, (BYTE) kEplMsgTypeAsnd); // ASnd == 0x06 + AmiSetByteToLe(&pSrcData_p->m_le_bMessageType, (u8) kEplMsgTypeAsnd); // ASnd == 0x06 // target node id AmiSetByteToLe(&pSrcData_p->m_le_bDstNodeId, - (BYTE) SdoAsndInstance_g. + (u8) SdoAsndInstance_g. m_auiSdoAsndConnection[uiArray]); // set source-nodeid (filled by DLL 0) AmiSetByteToLe(&pSrcData_p->m_le_bSrcNodeId, 0x00); diff --git a/drivers/staging/epl/EplSdoAsySequ.c b/drivers/staging/epl/EplSdoAsySequ.c index 9048905dcde8..d7e007ad4d6f 100644 --- a/drivers/staging/epl/EplSdoAsySequ.c +++ b/drivers/staging/epl/EplSdoAsySequ.c @@ -128,11 +128,11 @@ typedef enum { // structure for History-Buffer typedef struct { - BYTE m_bFreeEntries; - BYTE m_bWrite; // index of the next free buffer entry - BYTE m_bAck; // index of the next message which should become acknowledged - BYTE m_bRead; // index between m_bAck and m_bWrite to the next message for retransmission - BYTE m_aabHistoryFrame[EPL_SDO_HISTORY_SIZE] + u8 m_bFreeEntries; + u8 m_bWrite; // index of the next free buffer entry + u8 m_bAck; // index of the next message which should become acknowledged + u8 m_bRead; // index between m_bAck and m_bWrite to the next message for retransmission + u8 m_aabHistoryFrame[EPL_SDO_HISTORY_SIZE] [EPL_SEQ_HISTROY_FRAME_SIZE]; unsigned int m_auiFrameSize[EPL_SDO_HISTORY_SIZE]; @@ -152,8 +152,8 @@ typedef enum { typedef struct { tEplSdoConHdl m_ConHandle; tEplAsySdoState m_SdoState; - BYTE m_bRecSeqNum; // name from view of the communication partner - BYTE m_bSendSeqNum; // name from view of the communication partner + u8 m_bRecSeqNum; // name from view of the communication partner + u8 m_bSendSeqNum; // name from view of the communication partner tEplAsySdoConHistory m_SdoConHistory; tEplTimerHdl m_EplTimerHdl; unsigned int m_uiRetryCount; // retry counter @@ -214,7 +214,7 @@ static tEplKernel EplSdoAsyAddFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p, unsigned int uiSize_p); static tEplKernel EplSdoAsyAckFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p, - BYTE bRecSeqNumber_p); + u8 bRecSeqNumber_p); static tEplKernel EplSdoAsyReadFromHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p, tEplFrame ** ppFrame_p, @@ -1498,7 +1498,7 @@ static tEplKernel EplSdoAsySeqProcess(unsigned int uiHandle_p, // frame received case kAsySdoSeqEventFrameRec: { - BYTE bSendSeqNumCon = + u8 bSendSeqNumCon = AmiGetByteFromLe(&pRecFrame_p-> m_le_bSendSeqNumCon); @@ -2016,7 +2016,7 @@ static tEplKernel EplSdoAsySeqSendIntern(tEplAsySdoSeqCon * pAsySdoSeqCon_p, BOOL fFrameInHistory_p) { tEplKernel Ret; - BYTE abFrame[EPL_SEQ_FRAME_SIZE]; + u8 abFrame[EPL_SEQ_FRAME_SIZE]; tEplFrame *pEplFrame; unsigned int uiFreeEntries; @@ -2154,7 +2154,7 @@ tEplKernel EplSdoAsyReceiveCb(tEplSdoConHdl ConHdl_p, #endif EPL_DBGLVL_SDO_TRACE2("Handle: 0x%x , First Databyte 0x%x\n", ConHdl_p, - ((BYTE *) pSdoSeqData_p)[0]); + ((u8 *) pSdoSeqData_p)[0]); // search controll structure for this connection pAsySdoSeqCon = &AsySdoSequInstance_g.m_AsySdoConnection[uiCount]; @@ -2328,12 +2328,12 @@ static tEplKernel EplSdoAsyAddFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p, // //--------------------------------------------------------------------------- static tEplKernel EplSdoAsyAckFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p, - BYTE bRecSeqNumber_p) + u8 bRecSeqNumber_p) { tEplKernel Ret; tEplAsySdoConHistory *pHistory; - BYTE bAckIndex; - BYTE bCurrentSeqNum; + u8 bAckIndex; + u8 bCurrentSeqNum; Ret = kEplSuccessful; diff --git a/drivers/staging/epl/EplSdoComu.c b/drivers/staging/epl/EplSdoComu.c index af3d1b146745..a9325d47efb1 100644 --- a/drivers/staging/epl/EplSdoComu.c +++ b/drivers/staging/epl/EplSdoComu.c @@ -156,14 +156,14 @@ typedef enum { typedef struct { tEplSdoSeqConHdl m_SdoSeqConHdl; // if != 0 -> entry used tEplSdoComState m_SdoComState; - BYTE m_bTransactionId; + u8 m_bTransactionId; unsigned int m_uiNodeId; // NodeId of the target // -> needed to reinit connection // after timeout tEplSdoTransType m_SdoTransType; // Auto, Expedited, Segmented tEplSdoServiceType m_SdoServiceType; // WriteByIndex, ReadByIndex tEplSdoType m_SdoProtType; // protocol layer: Auto, Udp, Asnd, Pdo - BYTE *m_pData; // pointer to data + u8 *m_pData; // pointer to data unsigned int m_uiTransSize; // number of bytes // to transfer unsigned int m_uiTransferredByte; // number of bytes @@ -765,7 +765,7 @@ tEplKernel EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, goto Exit; } // save pointer to abort code - pSdoComCon->m_pData = (BYTE *) & dwAbortCode_p; + pSdoComCon->m_pData = (u8 *) & dwAbortCode_p; Ret = EplSdoComProcessIntern(SdoComConHdl_p, kEplSdoComConEventAbort, @@ -998,7 +998,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p, { tEplKernel Ret; tEplSdoComCon *pSdoComCon; - BYTE bFlag; + u8 bFlag; #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOS)) != 0) DWORD dwAbortCode; @@ -1137,7 +1137,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p, pSdoComCon-> m_pData = - (BYTE + (u8 *) & dwAbortCode; @@ -1282,7 +1282,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p, if (pSdoComCon-> m_dwLastAbortCode == 0) { - ( /*(BYTE*) */ + ( /*(u8*) */ pSdoComCon-> m_pData) += uiSize; @@ -1320,7 +1320,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p, pSdoComCon-> m_pData = - (BYTE + (u8 *) & pSdoComCon-> @@ -1986,7 +1986,7 @@ static tEplKernel EplSdoComServerInitReadByIndex(tEplSdoComCon * pSdoComCon_p, if (Ret == kEplObdSubindexNotExist) { // subentry doesn't exist dwAbortCode = EPL_SDOAC_SUB_INDEX_NOT_EXIST; // send abort - pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode; + pSdoComCon_p->m_pData = (u8 *) & dwAbortCode; Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex, uiSubindex, @@ -1995,7 +1995,7 @@ static tEplKernel EplSdoComServerInitReadByIndex(tEplSdoComCon * pSdoComCon_p, } else if (Ret != kEplSuccessful) { // entry doesn't exist dwAbortCode = EPL_SDOAC_OBJECT_NOT_EXIST; // send abort - pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode; + pSdoComCon_p->m_pData = (u8 *) & dwAbortCode; Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex, uiSubindex, @@ -2013,7 +2013,7 @@ static tEplKernel EplSdoComServerInitReadByIndex(tEplSdoComCon * pSdoComCon_p, dwAbortCode = EPL_SDOAC_UNSUPPORTED_ACCESS; } // send abort - pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode; + pSdoComCon_p->m_pData = (u8 *) & dwAbortCode; Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex, uiSubindex, @@ -2050,7 +2050,7 @@ static tEplKernel EplSdoComServerInitReadByIndex(tEplSdoComCon * pSdoComCon_p, // error -> abort dwAbortCode = EPL_SDOAC_GENERAL_ERROR; // send abort - pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode; + pSdoComCon_p->m_pData = (u8 *) & dwAbortCode; Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex, uiSubindex, @@ -2089,11 +2089,11 @@ static tEplKernel EplSdoComServerSendFrameIntern(tEplSdoComCon * pSdoComCon_p, tEplSdoComSendType SendType_p) { tEplKernel Ret; - BYTE abFrame[EPL_MAX_SDO_FRAME_SIZE]; + u8 abFrame[EPL_MAX_SDO_FRAME_SIZE]; tEplFrame *pFrame; tEplAsySdoCom *pCommandFrame; unsigned int uiSizeOfFrame; - BYTE bFlag; + u8 bFlag; Ret = kEplSuccessful; @@ -2373,7 +2373,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p, tEplObdSize EntrySize; tEplObdAccess AccessType; DWORD dwAbortCode; - BYTE *pbSrcData; + u8 *pbSrcData; dwAbortCode = 0; @@ -2426,7 +2426,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p, pSdoComCon_p->m_dwLastAbortCode = EPL_SDOAC_SUB_INDEX_NOT_EXIST; // send abort // d.k. This is wrong: k.t. not needed send abort on end of write - /*pSdoComCon_p->m_pData = (BYTE*)pSdoComCon_p->m_dwLastAbortCode; + /*pSdoComCon_p->m_pData = (u8*)pSdoComCon_p->m_dwLastAbortCode; Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex, uiSubindex, @@ -2437,7 +2437,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p, // send abort // d.k. This is wrong: k.t. not needed send abort on end of write /* - pSdoComCon_p->m_pData = (BYTE*)&dwAbortCode; + pSdoComCon_p->m_pData = (u8*)&dwAbortCode; Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex, uiSubindex, @@ -2457,7 +2457,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p, } // send abort // d.k. This is wrong: k.t. not needed send abort on end of write - /*pSdoComCon_p->m_pData = (BYTE*)&dwAbortCode; + /*pSdoComCon_p->m_pData = (u8*)&dwAbortCode; Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex, uiSubindex, @@ -2548,7 +2548,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p, EPL_SDOAC_DATA_TYPE_LENGTH_TOO_HIGH; // send abort // d.k. This is wrong: k.t. not needed send abort on end of write - /*pSdoComCon_p->m_pData = (BYTE*)&dwAbortCode; + /*pSdoComCon_p->m_pData = (u8*)&dwAbortCode; Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex, uiSubindex, @@ -2570,7 +2570,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p, EPL_SDOAC_GENERAL_ERROR; // send abort // d.k. This is wrong: k.t. not needed send abort on end of write -/* pSdoComCon_p->m_pData = (BYTE*)&pSdoComCon_p->m_dwLastAbortCode; +/* pSdoComCon_p->m_pData = (u8*)&pSdoComCon_p->m_dwLastAbortCode; Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex, uiSubindex, @@ -2585,7 +2585,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p, pSdoComCon_p->m_uiTransSize -= uiBytesToTransfer; // update target pointer - ( /*(BYTE*) */ pSdoComCon_p->m_pData) += uiBytesToTransfer; + ( /*(u8*) */ pSdoComCon_p->m_pData) += uiBytesToTransfer; // send acknowledge without any Command layer data Ret = EplSdoAsySeqSendData(pSdoComCon_p->m_SdoSeqConHdl, @@ -2597,7 +2597,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p, if (pSdoComCon_p->m_dwLastAbortCode != 0) { // send abort pSdoComCon_p->m_pData = - (BYTE *) & pSdoComCon_p->m_dwLastAbortCode; + (u8 *) & pSdoComCon_p->m_dwLastAbortCode; Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex, uiSubindex, @@ -2634,12 +2634,12 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p, static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p) { tEplKernel Ret; - BYTE abFrame[EPL_MAX_SDO_FRAME_SIZE]; + u8 abFrame[EPL_MAX_SDO_FRAME_SIZE]; tEplFrame *pFrame; tEplAsySdoCom *pCommandFrame; unsigned int uiSizeOfFrame; - BYTE bFlags; - BYTE *pbPayload; + u8 bFlags; + u8 *pbPayload; Ret = kEplSuccessful; @@ -2683,7 +2683,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p) m_uiTargetIndex); pbPayload += 2; AmiSetByteToLe(pbPayload, - (BYTE) pSdoComCon_p-> + (u8) pSdoComCon_p-> m_uiTargetSubIndex); // calc size uiSizeOfFrame += 4; @@ -2725,7 +2725,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p) m_uiTargetIndex); pbPayload += 2; AmiSetByteToLe(pbPayload, - (BYTE) + (u8) pSdoComCon_p-> m_uiTargetSubIndex); // on byte for reserved @@ -2764,7 +2764,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p) m_uiTargetIndex); pbPayload += 2; AmiSetByteToLe(pbPayload, - (BYTE) + (u8) pSdoComCon_p-> m_uiTargetSubIndex); // + 2 -> one byte for subindex and one byte reserved @@ -2943,7 +2943,7 @@ static tEplKernel EplSdoComClientProcessFrame(tEplSdoComConHdl SdoComCon_p, tEplAsySdoCom * pAsySdoCom_p) { tEplKernel Ret; - BYTE bBuffer; + u8 bBuffer; unsigned int uiBuffer; unsigned int uiDataSize; unsigned long ulBuffer; @@ -3219,7 +3219,7 @@ static tEplKernel EplSdoComClientSendAbort(tEplSdoComCon * pSdoComCon_p, DWORD dwAbortCode_p) { tEplKernel Ret; - BYTE abFrame[EPL_MAX_SDO_FRAME_SIZE]; + u8 abFrame[EPL_MAX_SDO_FRAME_SIZE]; tEplFrame *pFrame; tEplAsySdoCom *pCommandFrame; unsigned int uiSizeOfFrame; diff --git a/drivers/staging/epl/EplSdoUdpu.c b/drivers/staging/epl/EplSdoUdpu.c index 293e60fc4de7..656ea2429204 100644 --- a/drivers/staging/epl/EplSdoUdpu.c +++ b/drivers/staging/epl/EplSdoUdpu.c @@ -550,7 +550,7 @@ static int EplSdoUdpThread(void *pArg_p) int iError; int iCount; int iFreeEntry; - BYTE abBuffer[EPL_MAX_SDO_REC_FRAME_SIZE]; + u8 abBuffer[EPL_MAX_SDO_REC_FRAME_SIZE]; unsigned int uiSize; tEplSdoConHdl SdoConHdl; diff --git a/drivers/staging/epl/EplTarget.h b/drivers/staging/epl/EplTarget.h index 0e6da2105458..61a56951da96 100644 --- a/drivers/staging/epl/EplTarget.h +++ b/drivers/staging/epl/EplTarget.h @@ -134,8 +134,8 @@ // functions for ethernet driver tEplKernel TgtInitEthIsr(void); void TgtFreeEthIsr(void); -void TgtEnableGlobalInterrupt(BYTE fEnable_p); -void TgtEnableEthInterrupt0(BYTE fEnable_p, unsigned int uiInterruptMask_p); -void TgtEnableEthInterrupt1(BYTE fEnable_p, unsigned int uiInterruptMask_p); +void TgtEnableGlobalInterrupt(u8 fEnable_p); +void TgtEnableEthInterrupt0(u8 fEnable_p, unsigned int uiInterruptMask_p); +void TgtEnableEthInterrupt1(u8 fEnable_p, unsigned int uiInterruptMask_p); #endif // #ifndef _EPLTARGET_H_ diff --git a/drivers/staging/epl/ShbIpc-LinuxKernel.c b/drivers/staging/epl/ShbIpc-LinuxKernel.c index 6ffe41008d3c..497938bd09b9 100644 --- a/drivers/staging/epl/ShbIpc-LinuxKernel.c +++ b/drivers/staging/epl/ShbIpc-LinuxKernel.c @@ -677,7 +677,7 @@ void *ShbIpcGetShMemPtr(tShbInstance pShbInstance_p) pShbMemHeader = ShbIpcGetShbMemHeader(ShbIpcGetShbMemInst(pShbInstance_p)); if (pShbMemHeader != NULL) { - pShbShMemPtr = (BYTE *) pShbMemHeader + sizeof(tShbMemHeader); + pShbShMemPtr = (u8 *) pShbMemHeader + sizeof(tShbMemHeader); } else { pShbShMemPtr = NULL; } diff --git a/drivers/staging/epl/TimerHighReskX86.c b/drivers/staging/epl/TimerHighReskX86.c index 11ae8192323d..2d657d711d8e 100644 --- a/drivers/staging/epl/TimerHighReskX86.c +++ b/drivers/staging/epl/TimerHighReskX86.c @@ -103,7 +103,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); void TgtDbgPostTraceValue(DWORD dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) diff --git a/drivers/staging/epl/amix86.c b/drivers/staging/epl/amix86.c index bff9dfe5ff3c..7f1a5028df69 100644 --- a/drivers/staging/epl/amix86.c +++ b/drivers/staging/epl/amix86.c @@ -115,12 +115,12 @@ typedef struct { // //--------------------------------------------------------------------------- -//------------< write BYTE in big endian >-------------------------- +//------------< write u8 in big endian >-------------------------- /* -void AmiSetByteToBe (void *pAddr_p, BYTE bByteVal_p) +void AmiSetByteToBe (void *pAddr_p, u8 bByteVal_p) { - *(BYTE *)pAddr_p = bByteVal_p; + *(u8 *)pAddr_p = bByteVal_p; } */ @@ -173,12 +173,12 @@ void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p) // //--------------------------------------------------------------------------- -//------------< write BYTE in little endian >-------------------------- +//------------< write u8 in little endian >-------------------------- /* -void AmiSetByteToLe (void *pAddr_p, BYTE bByteVal_p) +void AmiSetByteToLe (void *pAddr_p, u8 bByteVal_p) { - *(BYTE *)pAddr_p = bByteVal_p; + *(u8 *)pAddr_p = bByteVal_p; } */ @@ -220,12 +220,12 @@ void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p) // //--------------------------------------------------------------------------- -//------------< read BYTE in big endian >--------------------------- +//------------< read u8 in big endian >--------------------------- /* -BYTE AmiGetByteFromBe (void *pAddr_p) +u8 AmiGetByteFromBe (void *pAddr_p) { - return ( *(BYTE *)pAddr_p ); + return ( *(u8 *)pAddr_p ); } */ @@ -279,12 +279,12 @@ DWORD AmiGetDwordFromBe(void *pAddr_p) // //--------------------------------------------------------------------------- -//------------< read BYTE in little endian >--------------------------- +//------------< read u8 in little endian >--------------------------- /* -BYTE AmiGetByteFromLe (void *pAddr_p) +u8 AmiGetByteFromLe (void *pAddr_p) { - return ( *(BYTE *)pAddr_p ); + return ( *(u8 *)pAddr_p ); } */ @@ -326,9 +326,9 @@ DWORD AmiGetDwordFromLe(void *pAddr_p) void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p) { - ((BYTE *) pAddr_p)[0] = ((BYTE *) & dwDwordVal_p)[2]; - ((BYTE *) pAddr_p)[1] = ((BYTE *) & dwDwordVal_p)[1]; - ((BYTE *) pAddr_p)[2] = ((BYTE *) & dwDwordVal_p)[0]; + ((u8 *) pAddr_p)[0] = ((u8 *) & dwDwordVal_p)[2]; + ((u8 *) pAddr_p)[1] = ((u8 *) & dwDwordVal_p)[1]; + ((u8 *) pAddr_p)[2] = ((u8 *) & dwDwordVal_p)[0]; } //--------------------------------------------------------------------------- @@ -348,9 +348,9 @@ void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p) void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p) { - ((BYTE *) pAddr_p)[0] = ((BYTE *) & dwDwordVal_p)[0]; - ((BYTE *) pAddr_p)[1] = ((BYTE *) & dwDwordVal_p)[1]; - ((BYTE *) pAddr_p)[2] = ((BYTE *) & dwDwordVal_p)[2]; + ((u8 *) pAddr_p)[0] = ((u8 *) & dwDwordVal_p)[0]; + ((u8 *) pAddr_p)[1] = ((u8 *) & dwDwordVal_p)[1]; + ((u8 *) pAddr_p)[2] = ((u8 *) & dwDwordVal_p)[2]; } //--------------------------------------------------------------------------- @@ -417,14 +417,14 @@ DWORD AmiGetDword24FromLe(void *pAddr_p) //--------------------------------------------------------------------------- void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p) { - ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[7]; - ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[6]; - ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[5]; - ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[4]; - ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[3]; - ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[2]; - ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[1]; - ((BYTE *) pAddr_p)[7] = ((BYTE *) & qwQwordVal_p)[0]; + ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[7]; + ((u8 *) pAddr_p)[1] = ((u8 *) & qwQwordVal_p)[6]; + ((u8 *) pAddr_p)[2] = ((u8 *) & qwQwordVal_p)[5]; + ((u8 *) pAddr_p)[3] = ((u8 *) & qwQwordVal_p)[4]; + ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[3]; + ((u8 *) pAddr_p)[5] = ((u8 *) & qwQwordVal_p)[2]; + ((u8 *) pAddr_p)[6] = ((u8 *) & qwQwordVal_p)[1]; + ((u8 *) pAddr_p)[7] = ((u8 *) & qwQwordVal_p)[0]; } //--------------------------------------------------------------------------- @@ -466,14 +466,14 @@ QWORD AmiGetQword64FromBe(void *pAddr_p) { tqwStruct qwStruct; - ((BYTE *) & qwStruct.m_qwQword)[0] = ((BYTE *) pAddr_p)[7]; - ((BYTE *) & qwStruct.m_qwQword)[1] = ((BYTE *) pAddr_p)[6]; - ((BYTE *) & qwStruct.m_qwQword)[2] = ((BYTE *) pAddr_p)[5]; - ((BYTE *) & qwStruct.m_qwQword)[3] = ((BYTE *) pAddr_p)[4]; - ((BYTE *) & qwStruct.m_qwQword)[4] = ((BYTE *) pAddr_p)[3]; - ((BYTE *) & qwStruct.m_qwQword)[5] = ((BYTE *) pAddr_p)[2]; - ((BYTE *) & qwStruct.m_qwQword)[6] = ((BYTE *) pAddr_p)[1]; - ((BYTE *) & qwStruct.m_qwQword)[7] = ((BYTE *) pAddr_p)[0]; + ((u8 *) & qwStruct.m_qwQword)[0] = ((u8 *) pAddr_p)[7]; + ((u8 *) & qwStruct.m_qwQword)[1] = ((u8 *) pAddr_p)[6]; + ((u8 *) & qwStruct.m_qwQword)[2] = ((u8 *) pAddr_p)[5]; + ((u8 *) & qwStruct.m_qwQword)[3] = ((u8 *) pAddr_p)[4]; + ((u8 *) & qwStruct.m_qwQword)[4] = ((u8 *) pAddr_p)[3]; + ((u8 *) & qwStruct.m_qwQword)[5] = ((u8 *) pAddr_p)[2]; + ((u8 *) & qwStruct.m_qwQword)[6] = ((u8 *) pAddr_p)[1]; + ((u8 *) & qwStruct.m_qwQword)[7] = ((u8 *) pAddr_p)[0]; return (qwStruct.m_qwQword); } @@ -520,11 +520,11 @@ QWORD AmiGetQword64FromLe(void *pAddr_p) void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p) { - ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[4]; - ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[3]; - ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[2]; - ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[1]; - ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[0]; + ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[4]; + ((u8 *) pAddr_p)[1] = ((u8 *) & qwQwordVal_p)[3]; + ((u8 *) pAddr_p)[2] = ((u8 *) & qwQwordVal_p)[2]; + ((u8 *) pAddr_p)[3] = ((u8 *) & qwQwordVal_p)[1]; + ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[0]; } @@ -547,7 +547,7 @@ void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p) { ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; - ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[4]; + ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[4]; } @@ -621,12 +621,12 @@ QWORD AmiGetQword40FromLe(void *pAddr_p) void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p) { - ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[5]; - ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[4]; - ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[3]; - ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[2]; - ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[1]; - ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[0]; + ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[5]; + ((u8 *) pAddr_p)[1] = ((u8 *) & qwQwordVal_p)[4]; + ((u8 *) pAddr_p)[2] = ((u8 *) & qwQwordVal_p)[3]; + ((u8 *) pAddr_p)[3] = ((u8 *) & qwQwordVal_p)[2]; + ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[1]; + ((u8 *) pAddr_p)[5] = ((u8 *) & qwQwordVal_p)[0]; } @@ -723,13 +723,13 @@ QWORD AmiGetQword48FromLe(void *pAddr_p) void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p) { - ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[6]; - ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[5]; - ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[4]; - ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[3]; - ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[2]; - ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[1]; - ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[0]; + ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[6]; + ((u8 *) pAddr_p)[1] = ((u8 *) & qwQwordVal_p)[5]; + ((u8 *) pAddr_p)[2] = ((u8 *) & qwQwordVal_p)[4]; + ((u8 *) pAddr_p)[3] = ((u8 *) & qwQwordVal_p)[3]; + ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[2]; + ((u8 *) pAddr_p)[5] = ((u8 *) & qwQwordVal_p)[1]; + ((u8 *) pAddr_p)[6] = ((u8 *) & qwQwordVal_p)[0]; } @@ -753,7 +753,7 @@ void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p) ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; - ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[6]; + ((u8 *) pAddr_p)[6] = ((u8 *) & qwQwordVal_p)[6]; } @@ -827,8 +827,8 @@ QWORD AmiGetQword56FromLe(void *pAddr_p) void AmiSetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p) { - AmiSetDwordToLe(((BYTE *) pAddr_p), pTimeOfDay_p->m_dwMs & 0x0FFFFFFF); - AmiSetWordToLe(((BYTE *) pAddr_p) + 4, pTimeOfDay_p->m_wDays); + AmiSetDwordToLe(((u8 *) pAddr_p), pTimeOfDay_p->m_dwMs & 0x0FFFFFFF); + AmiSetWordToLe(((u8 *) pAddr_p) + 4, pTimeOfDay_p->m_wDays); } @@ -850,8 +850,8 @@ void AmiSetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p) void AmiGetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p) { - pTimeOfDay_p->m_dwMs = AmiGetDwordFromLe(((BYTE *) pAddr_p)) & 0x0FFFFFFF; - pTimeOfDay_p->m_wDays = AmiGetWordFromLe(((BYTE *) pAddr_p) + 4); + pTimeOfDay_p->m_dwMs = AmiGetDwordFromLe(((u8 *) pAddr_p)) & 0x0FFFFFFF; + pTimeOfDay_p->m_wDays = AmiGetWordFromLe(((u8 *) pAddr_p) + 4); } diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c index 4e60143a5b08..594485e28117 100644 --- a/drivers/staging/epl/demo_main.c +++ b/drivers/staging/epl/demo_main.c @@ -118,7 +118,7 @@ MODULE_DESCRIPTION("EPL MN demo"); // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #else #define TGT_DBG_SIGNAL_TRACE_POINT(p) @@ -148,25 +148,25 @@ void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); // modul globale vars //--------------------------------------------------------------------------- -const BYTE abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +const u8 abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -BYTE bVarIn1_l; -BYTE bVarOut1_l; -BYTE bVarOut1Old_l; -BYTE bModeSelect_l; // state of the pushbuttons to select the mode -BYTE bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed -BYTE bSpeedSelectOld_l; // old state of the pushbuttons +u8 bVarIn1_l; +u8 bVarOut1_l; +u8 bVarOut1Old_l; +u8 bModeSelect_l; // state of the pushbuttons to select the mode +u8 bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed +u8 bSpeedSelectOld_l; // old state of the pushbuttons DWORD dwLeds_l; // current state of all LEDs -BYTE bLedsRow1_l; // current state of the LEDs in row 1 -BYTE bLedsRow2_l; // current state of the LEDs in row 2 -BYTE abSelect_l[3]; // pushbuttons from CNs +u8 bLedsRow1_l; // current state of the LEDs in row 1 +u8 bLedsRow2_l; // current state of the LEDs in row 2 +u8 abSelect_l[3]; // pushbuttons from CNs DWORD dwMode_l; // current mode int iCurCycleCount_l; // current cycle count int iMaxCycleCount_l; // maximum cycle count (i.e. number of cycles until next light movement step) int iToggle; // indicates the light movement direction -BYTE abDomain_l[3000]; +u8 abDomain_l[3000]; static wait_queue_head_t WaitQueueShutdown_g; // wait queue for tEplNmtEventSwitchOff static atomic_t AtomicShutdown_g = ATOMIC_INIT(FALSE); @@ -263,7 +263,7 @@ static int __init EplLinInit(void) EplApiInitParam.m_uiSizeOfStruct = sizeof(EplApiInitParam); EPL_MEMCPY(EplApiInitParam.m_abMacAddress, abMacAddr, sizeof(EplApiInitParam.m_abMacAddress)); -// EplApiInitParam.m_abMacAddress[5] = (BYTE) EplApiInitParam.m_uiNodeId; +// EplApiInitParam.m_abMacAddress[5] = (u8) EplApiInitParam.m_uiNodeId; EplApiInitParam.m_dwFeatureFlags = -1; EplApiInitParam.m_dwCycleLen = uiCycleLen_g; // required for error detection EplApiInitParam.m_uiIsochrTxMaxPayload = 100; // const diff --git a/drivers/staging/epl/edrv.h b/drivers/staging/epl/edrv.h index a45984dfb092..56b287e03180 100644 --- a/drivers/staging/epl/edrv.h +++ b/drivers/staging/epl/edrv.h @@ -104,7 +104,7 @@ typedef struct _tEdrvTxBuffer { unsigned int m_uiTxMsgLen; // IN: length of message to be send (set for each transmit call) // ---------------------- unsigned int m_uiBufferNumber; // OUT: number of the buffer, set by ethernetdriver - BYTE *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver + u8 *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver tEplNetTime m_NetTime; // OUT: Timestamp of end of transmission, set by ethernetdriver // ---------------------- unsigned int m_uiMaxBufferLen; // IN/OUT: maximum length of the buffer @@ -114,21 +114,21 @@ typedef struct _tEdrvTxBuffer { typedef struct _tEdrvRxBuffer { tEdrvBufferInFrame m_BufferInFrame; // OUT position of received buffer in an ethernet-frame unsigned int m_uiRxMsgLen; // OUT: length of received buffer (without CRC) - BYTE *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver + u8 *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver tEplNetTime m_NetTime; // OUT: Timestamp of end of receiption } tEdrvRxBuffer; -//typedef void (*tEdrvRxHandler) (BYTE bBufferInFrame_p, tBufferDescr * pbBuffer_p); -//typedef void (*tEdrvRxHandler) (BYTE bBufferInFrame_p, BYTE * pbEthernetData_p, WORD wDataLen_p); +//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, tBufferDescr * pbBuffer_p); +//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, u8 * pbEthernetData_p, WORD wDataLen_p); typedef void (*tEdrvRxHandler) (tEdrvRxBuffer * pRxBuffer_p); typedef void (*tEdrvTxHandler) (tEdrvTxBuffer * pTxBuffer_p); // format of init structure typedef struct { - BYTE m_abMyMacAddr[6]; // the own MAC address + u8 m_abMyMacAddr[6]; // the own MAC address -// BYTE m_bNoOfRxBuffDescr; // number of entries in rx bufferdescriptor table +// u8 m_bNoOfRxBuffDescr; // number of entries in rx bufferdescriptor table // tBufferDescr * m_pRxBuffDescrTable; // rx bufferdescriptor table // WORD m_wRxBufferSize; // size of the whole rx buffer @@ -145,11 +145,11 @@ tEplKernel EdrvInit(tEdrvInitParam * pEdrvInitParam_p); tEplKernel EdrvShutdown(void); -tEplKernel EdrvDefineRxMacAddrEntry(BYTE * pbMacAddr_p); -tEplKernel EdrvUndefineRxMacAddrEntry(BYTE * pbMacAddr_p); +tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p); +tEplKernel EdrvUndefineRxMacAddrEntry(u8 * pbMacAddr_p); -//tEplKernel EdrvDefineUnicastEntry (BYTE * pbUCEntry_p); -//tEplKernel EdrvUndfineUnicastEntry (BYTE * pbUCEntry_p); +//tEplKernel EdrvDefineUnicastEntry (u8 * pbUCEntry_p); +//tEplKernel EdrvUndfineUnicastEntry (u8 * pbUCEntry_p); tEplKernel EdrvAllocTxMsgBuffer(tEdrvTxBuffer * pBuffer_p); tEplKernel EdrvReleaseTxMsgBuffer(tEdrvTxBuffer * pBuffer_p); diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 51c7409828f7..f5e48e4163b8 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -30,9 +30,6 @@ #define TRACE printk // --- logic types --- -#ifndef BYTE -#define BYTE unsigned char -#endif #ifndef WORD #define WORD unsigned short int #endif diff --git a/drivers/staging/epl/kernel/EplDllk.h b/drivers/staging/epl/kernel/EplDllk.h index 588e871a922b..9967bdda5f5d 100644 --- a/drivers/staging/epl/kernel/EplDllk.h +++ b/drivers/staging/epl/kernel/EplDllk.h @@ -85,7 +85,7 @@ typedef tEplKernel(*tEplDllkCbAsync) (tEplFrameInfo * pFrameInfo_p); typedef struct { - BYTE m_be_abSrcMac[6]; + u8 m_be_abSrcMac[6]; } tEplDllkInitParam; @@ -100,8 +100,8 @@ struct _tEplDllkNodeInfo { unsigned long m_ulDllErrorEvents; tEplNmtState m_NmtState; WORD m_wPresPayloadLimit; - BYTE m_be_abMacAddr[6]; - BYTE m_bSoaFlag1; + u8 m_be_abMacAddr[6]; + u8 m_bSoaFlag1; BOOL m_fSoftDelete; // delete node after error and ignore error }; @@ -154,7 +154,7 @@ tEplKernel EplDllkDeleteNode(unsigned int uiNodeId_p); tEplKernel EplDllkSoftDeleteNode(unsigned int uiNodeId_p); -tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, BYTE bSoaFlag1_p); +tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, u8 bSoaFlag1_p); tEplKernel EplDllkGetFirstNodeInfo(tEplDllkNodeInfo ** ppNodeInfo_p); diff --git a/drivers/staging/epl/kernel/EplDllkCal.h b/drivers/staging/epl/kernel/EplDllkCal.h index 6c4dc7e4a80d..4e983c3f29ea 100644 --- a/drivers/staging/epl/kernel/EplDllkCal.h +++ b/drivers/staging/epl/kernel/EplDllkCal.h @@ -124,7 +124,7 @@ tEplKernel EplDllkCalProcess(tEplEvent * pEvent_p); tEplKernel EplDllkCalAsyncClearQueues(void); tEplKernel EplDllkCalIssueRequest(tEplDllReqServiceId Service_p, - unsigned int uiNodeId_p, BYTE bSoaFlag1_p); + unsigned int uiNodeId_p, u8 bSoaFlag1_p); tEplKernel EplDllkCalAsyncGetSoaRequest(tEplDllReqServiceId * pReqServiceId_p, unsigned int *puiNodeId_p); diff --git a/drivers/staging/epl/kernel/EplObdk.h b/drivers/staging/epl/kernel/EplObdk.h index 30e51d0eb46a..ddd1426778cd 100644 --- a/drivers/staging/epl/kernel/EplObdk.h +++ b/drivers/staging/epl/kernel/EplObdk.h @@ -85,7 +85,7 @@ // global variables //--------------------------------------------------------------------------- -extern BYTE abEplObdTrashObject_g[8]; +extern u8 abEplObdTrashObject_g[8]; //--------------------------------------------------------------------------- // function prototypes diff --git a/drivers/staging/epl/proc_fs.c b/drivers/staging/epl/proc_fs.c index c08453d54903..62aaa7c3a356 100644 --- a/drivers/staging/epl/proc_fs.c +++ b/drivers/staging/epl/proc_fs.c @@ -145,7 +145,7 @@ static int EplLinProcRead(char *pcBuffer_p, char **ppcStart_p, off_t Offset_p, static int EplLinProcWrite(struct file *file, const char __user * buffer, unsigned long count, void *data); -void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); void TgtDbgPostTraceValue(DWORD dwTraceValue_p); EPLDLLEXPORT DWORD EplIdentuGetRunningRequests(void); @@ -191,7 +191,7 @@ tEplKernel EplLinProcFree(void) //--------------------------------------------------------------------------- #ifdef _DBG_TRACE_POINTS_ -void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p) +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p) { if (bTracePointNumber_p >= diff --git a/drivers/staging/epl/user/EplCfgMau.h b/drivers/staging/epl/user/EplCfgMau.h index cafe60f094b6..2d911d1d7248 100644 --- a/drivers/staging/epl/user/EplCfgMau.h +++ b/drivers/staging/epl/user/EplCfgMau.h @@ -133,18 +133,18 @@ typedef struct { tEplSdoComConHdl m_SdoComConHdl; // handle for sdo connection DWORD m_dwLastAbortCode; unsigned int m_uiLastIndex; // last index of configuration, to compair with actual index - BYTE *m_pbConcise; // Ptr to concise DCF - BYTE *m_pbActualIndex; // Ptr to actual index in the DCF segment + u8 *m_pbConcise; // Ptr to concise DCF + u8 *m_pbActualIndex; // Ptr to actual index in the DCF segment tfpEplCfgMaCb m_pfnCfgMaCb; // Ptr to CfgMa Callback, is call if configuration finished tEplKernel m_EplKernelError; // errorcode DWORD m_dwNumValueCopy; // numeric values are copied in this variable unsigned int m_uiPdoNodeId; // buffer for PDO node id - BYTE m_bNrOfMappedObject; // number of mapped objects + u8 m_bNrOfMappedObject; // number of mapped objects unsigned int m_uiNodeId; // Epl node addresse tEplSdocState m_SdocState; // bitcoded state of the SDO transfer unsigned int m_uiLastSubIndex; // last subindex of configuration BOOL m_fOneTranferOk; // atleased one transfer was successful - BYTE m_bEventFlag; // for Eventsignaling to the State Maschine + u8 m_bEventFlag; // for Eventsignaling to the State Maschine DWORD m_dwCntObjectInDcf; // number of Objects in DCF tEplCfgMaIndexType m_SkipCfg; // TRUE if a adsitional Configurationprocess // have to insert e.g. PDO-mapping @@ -199,13 +199,13 @@ tEplKernel plCfgMaDelInstance(void); // Parameters: uiNodeId_p = NodeId of the node to configure // pbConcise_p = pointer to DCF // fpCfgMaCb_p = pointer to callback function (should not be NULL) -// SizeOfConcise_p = size of DCF in BYTE -> for future use +// SizeOfConcise_p = size of DCF in u8 -> for future use // DcfType_p = type of the DCF // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- tEplKernel EplCfgMaStartConfig(unsigned int uiNodeId_p, - BYTE * pbConcise_p, + u8 * pbConcise_p, tfpEplCfgMaCb fpCfgMaCb_p, tEplObdSize SizeOfConcise_p, tEplCfgMaDcfTyp DcfType_p); @@ -235,13 +235,13 @@ tEplKernel EplCfgMaStartConfigNode(unsigned int uiNodeId_p, // Parameters: uiNodeId_p = NodeId of the node to configure // pbConcise_p = pointer to DCF // fpCfgMaCb_p = pointer to callback function (should not be NULL) -// SizeOfConcise_p = size of DCF in BYTE -> for future use +// SizeOfConcise_p = size of DCF in u8 -> for future use // DcfType_p = type of the DCF // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- tEplKernel EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, - BYTE * pbConcise_p, + u8 * pbConcise_p, tfpEplCfgMaCb fpCfgMaCb_p, tEplObdSize SizeOfConcise_p, tEplCfgMaDcfTyp DcfType_p); @@ -253,13 +253,13 @@ tEplKernel EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, // // Parameters: uiNodeId_p = NodeId of the node to configure // pbConcise_p = pointer to DCF -// SizeOfConcise_p = size of DCF in BYTE -> for future use +// SizeOfConcise_p = size of DCF in u8 -> for future use // DcfType_p = type of the DCF // // Returns: tCopKernel = error code //--------------------------------------------------------------------------- tEplKernel EplCfgMaLinkDcf(unsigned int uiNodeId_p, - BYTE * pbConcise_p, + u8 * pbConcise_p, tEplObdSize SizeOfConcise_p, tEplCfgMaDcfTyp DcfType_p); diff --git a/drivers/staging/epl/user/EplDlluCal.h b/drivers/staging/epl/user/EplDlluCal.h index 2b2232d02bbc..d8395d3ae21f 100644 --- a/drivers/staging/epl/user/EplDlluCal.h +++ b/drivers/staging/epl/user/EplDlluCal.h @@ -110,7 +110,7 @@ tEplKernel EplDlluCalDeleteNode(unsigned int uiNodeId_p); tEplKernel EplDlluCalSoftDeleteNode(unsigned int uiNodeId_p); tEplKernel EplDlluCalIssueRequest(tEplDllReqServiceId Service_p, - unsigned int uiNodeId_p, BYTE bSoaFlag1_p); + unsigned int uiNodeId_p, u8 bSoaFlag1_p); #endif diff --git a/drivers/staging/epl/user/EplObdu.h b/drivers/staging/epl/user/EplObdu.h index 679ff6f054f3..21494b4669a5 100644 --- a/drivers/staging/epl/user/EplObdu.h +++ b/drivers/staging/epl/user/EplObdu.h @@ -117,7 +117,7 @@ EPLDLLEXPORT tEplKernel EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p); // --------------------------------------------------------------------- EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry *pVarEntry_p, - BYTE bType_p, tEplObdSize ObdSize_p); + u8 bType_p, tEplObdSize ObdSize_p); // --------------------------------------------------------------------- EPLDLLEXPORT tEplObdSize EplObduGetDataSize(unsigned int uiIndex_p, diff --git a/drivers/staging/epl/user/EplObduCal.h b/drivers/staging/epl/user/EplObduCal.h index 2f067bfd7c16..16260566aaf9 100644 --- a/drivers/staging/epl/user/EplObduCal.h +++ b/drivers/staging/epl/user/EplObduCal.h @@ -106,7 +106,7 @@ EPLDLLEXPORT void *EplObduCalGetObjectDataPtr(unsigned int uiIndex_p, EPLDLLEXPORT tEplKernel EplObduCalRegisterUserOd(tEplObdEntryPtr pUserOd_p); //--------------------------------------------------------------------------- EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry *pVarEntry_p, - BYTE bType_p, tEplObdSize ObdSize_p); + u8 bType_p, tEplObdSize ObdSize_p); //--------------------------------------------------------------------------- EPLDLLEXPORT tEplObdSize EplObduCalGetDataSize(unsigned int uiIndex_p, unsigned int uiSubIndex_p); diff --git a/drivers/staging/epl/user/EplPdou.h b/drivers/staging/epl/user/EplPdou.h index 8e4b711c8c5c..2bed006efb7c 100644 --- a/drivers/staging/epl/user/EplPdou.h +++ b/drivers/staging/epl/user/EplPdou.h @@ -97,12 +97,12 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p); // returns error if bPdoId_p is already valid /* tEplKernel EplPdouSetMapping( - BYTE bPdoId_p, BOOL fTxRx_p, BYTE bNodeId, BYTE bMappingVersion, - tEplPdoMapping * pMapping_p, BYTE bMaxEntries_p); + u8 bPdoId_p, BOOL fTxRx_p, u8 bNodeId, u8 bMappingVersion, + tEplPdoMapping * pMapping_p, u8 bMaxEntries_p); tEplKernel EplPdouGetMapping( - BYTE bPdoId_p, BOOL fTxRx_p, BYTE * pbNodeId, BYTE * pbMappingVersion, - tEplPdoMapping * pMapping_p, BYTE * pbMaxEntries_p); + u8 bPdoId_p, BOOL fTxRx_p, u8 * pbNodeId, u8 * pbMappingVersion, + tEplPdoMapping * pMapping_p, u8 * pbMaxEntries_p); */ #endif // #ifndef _EPL_PDOU_H_ -- cgit v1.2.3-59-g8ed1b From a5c30d94b226ca473b1001b382e9e465921f8301 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 12:43:05 -0700 Subject: Staging: epl: remove QWORD It's u64 in kernelspace, not QWORD. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Epl.h | 2 +- drivers/staging/epl/EplAmi.h | 38 ++++++++++++++++---------------- drivers/staging/epl/EplDll.h | 2 +- drivers/staging/epl/EplFrame.h | 6 ++--- drivers/staging/epl/EplObd.c | 38 ++++++++++++++++---------------- drivers/staging/epl/EplObd.h | 20 ++++++++--------- drivers/staging/epl/EplPdok.c | 6 ++--- drivers/staging/epl/EplPdou.c | 14 ++++++------ drivers/staging/epl/amix86.c | 50 +++++++++++++++++++++--------------------- drivers/staging/epl/global.h | 4 ---- 10 files changed, 88 insertions(+), 92 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h index 0a6b9b8a2dd9..09a3d0a2491e 100644 --- a/drivers/staging/epl/Epl.h +++ b/drivers/staging/epl/Epl.h @@ -181,7 +181,7 @@ typedef struct { DWORD m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 DWORD m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 DWORD m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 - QWORD m_qwVendorSpecificExt1; + u64 m_qwVendorSpecificExt1; DWORD m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 DWORD m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 DWORD m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h index 7abcb6c2028f..1d6080afacd4 100644 --- a/drivers/staging/epl/EplAmi.h +++ b/drivers/staging/epl/EplAmi.h @@ -177,8 +177,8 @@ DWORD AmiGetDword24FromLe(void *pAddr_p); // //--------------------------------------------------------------------------- -void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p); -void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword40ToBe(void *pAddr_p, u64 qwQwordVal_p); +void AmiSetQword40ToLe(void *pAddr_p, u64 qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -188,12 +188,12 @@ void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p); // // Parameters: pAddr_p = pointer to source buffer // -// Return: QWORD +// Return: u64 // //--------------------------------------------------------------------------- -QWORD AmiGetQword40FromBe(void *pAddr_p); -QWORD AmiGetQword40FromLe(void *pAddr_p); +u64 AmiGetQword40FromBe(void *pAddr_p); +u64 AmiGetQword40FromLe(void *pAddr_p); //--------------------------------------------------------------------------- // @@ -208,8 +208,8 @@ QWORD AmiGetQword40FromLe(void *pAddr_p); // //--------------------------------------------------------------------------- -void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p); -void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword48ToBe(void *pAddr_p, u64 qwQwordVal_p); +void AmiSetQword48ToLe(void *pAddr_p, u64 qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -219,12 +219,12 @@ void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p); // // Parameters: pAddr_p = pointer to source buffer // -// Return: QWORD +// Return: u64 // //--------------------------------------------------------------------------- -QWORD AmiGetQword48FromBe(void *pAddr_p); -QWORD AmiGetQword48FromLe(void *pAddr_p); +u64 AmiGetQword48FromBe(void *pAddr_p); +u64 AmiGetQword48FromLe(void *pAddr_p); //--------------------------------------------------------------------------- // @@ -239,8 +239,8 @@ QWORD AmiGetQword48FromLe(void *pAddr_p); // //--------------------------------------------------------------------------- -void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p); -void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword56ToBe(void *pAddr_p, u64 qwQwordVal_p); +void AmiSetQword56ToLe(void *pAddr_p, u64 qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -250,12 +250,12 @@ void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p); // // Parameters: pAddr_p = pointer to source buffer // -// Return: QWORD +// Return: u64 // //--------------------------------------------------------------------------- -QWORD AmiGetQword56FromBe(void *pAddr_p); -QWORD AmiGetQword56FromLe(void *pAddr_p); +u64 AmiGetQword56FromBe(void *pAddr_p); +u64 AmiGetQword56FromLe(void *pAddr_p); //--------------------------------------------------------------------------- // @@ -270,8 +270,8 @@ QWORD AmiGetQword56FromLe(void *pAddr_p); // //--------------------------------------------------------------------------- -void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p); -void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p); +void AmiSetQword64ToBe(void *pAddr_p, u64 qwQwordVal_p); +void AmiSetQword64ToLe(void *pAddr_p, u64 qwQwordVal_p); //--------------------------------------------------------------------------- // @@ -285,8 +285,8 @@ void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p); // //--------------------------------------------------------------------------- -QWORD AmiGetQword64FromBe(void *pAddr_p); -QWORD AmiGetQword64FromLe(void *pAddr_p); +u64 AmiGetQword64FromBe(void *pAddr_p); +u64 AmiGetQword64FromLe(void *pAddr_p); //--------------------------------------------------------------------------- // diff --git a/drivers/staging/epl/EplDll.h b/drivers/staging/epl/EplDll.h index cd2d25d5506b..863728a9053a 100644 --- a/drivers/staging/epl/EplDll.h +++ b/drivers/staging/epl/EplDll.h @@ -177,7 +177,7 @@ typedef struct { DWORD m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 DWORD m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 DWORD m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 - QWORD m_qwVendorSpecificExt1; + u64 m_qwVendorSpecificExt1; DWORD m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 DWORD m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 DWORD m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device diff --git a/drivers/staging/epl/EplFrame.h b/drivers/staging/epl/EplFrame.h index 0f8d59f937bc..156f907a1cfd 100644 --- a/drivers/staging/epl/EplFrame.h +++ b/drivers/staging/epl/EplFrame.h @@ -130,7 +130,7 @@ typedef struct { // Offset 20 tEplNetTime m_le_NetTime; // supported if D_NMT_NetTimeIsRealTime_BOOL is set // Offset 28 - QWORD m_le_RelativeTime; // in us (supported if D_NMT_RelativeTime_BOOL is set) + u64 m_le_RelativeTime; // in us (supported if D_NMT_RelativeTime_BOOL is set) } PACK_STRUCT tEplSocFrame; @@ -201,7 +201,7 @@ typedef struct { u8 m_le_bFlag2; // Flags: PR, RS u8 m_le_bNmtStatus; // NMT state u8 m_le_bRes1[3]; - QWORD m_le_qwStaticError; // static error bit field + u64 m_le_qwStaticError; // static error bit field tEplErrHistoryEntry m_le_aErrHistoryEntry[14]; } PACK_STRUCT tEplStatusResponse; @@ -225,7 +225,7 @@ typedef struct { DWORD m_le_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 DWORD m_le_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 DWORD m_le_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 - QWORD m_le_qwVendorSpecificExt1; + u64 m_le_qwVendorSpecificExt1; DWORD m_le_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 DWORD m_le_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 DWORD m_le_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c index e55cf07a3e6b..ca61db449cee 100644 --- a/drivers/staging/epl/EplObd.c +++ b/drivers/staging/epl/EplObd.c @@ -1105,7 +1105,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned case kEplObdTypInt40: case kEplObdTypUInt40: { - AmiSetQword40ToLe(pDstData_p, *((QWORD *) pSrcData)); + AmiSetQword40ToLe(pDstData_p, *((u64 *) pSrcData)); break; } @@ -1113,7 +1113,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned case kEplObdTypInt48: case kEplObdTypUInt48: { - AmiSetQword48ToLe(pDstData_p, *((QWORD *) pSrcData)); + AmiSetQword48ToLe(pDstData_p, *((u64 *) pSrcData)); break; } @@ -1121,7 +1121,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned case kEplObdTypInt56: case kEplObdTypUInt56: { - AmiSetQword56ToLe(pDstData_p, *((QWORD *) pSrcData)); + AmiSetQword56ToLe(pDstData_p, *((u64 *) pSrcData)); break; } @@ -1130,7 +1130,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned case kEplObdTypUInt64: case kEplObdTypReal64: { - AmiSetQword64ToLe(pDstData_p, *((QWORD *) pSrcData)); + AmiSetQword64ToLe(pDstData_p, *((u64 *) pSrcData)); break; } @@ -1191,7 +1191,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign tEplObdCbParam CbParam; void *pDstData; tEplObdSize ObdSize; - QWORD qwBuffer; + u64 qwBuffer; void *pBuffer = &qwBuffer; Ret = EplObdWriteEntryPre(EPL_MCO_INSTANCE_PTR_ @@ -1255,7 +1255,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign case kEplObdTypInt40: case kEplObdTypUInt40: { - *((QWORD *) pBuffer) = AmiGetQword40FromLe(pSrcData_p); + *((u64 *) pBuffer) = AmiGetQword40FromLe(pSrcData_p); break; } @@ -1263,7 +1263,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign case kEplObdTypInt48: case kEplObdTypUInt48: { - *((QWORD *) pBuffer) = AmiGetQword48FromLe(pSrcData_p); + *((u64 *) pBuffer) = AmiGetQword48FromLe(pSrcData_p); break; } @@ -1271,7 +1271,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign case kEplObdTypInt56: case kEplObdTypUInt56: { - *((QWORD *) pBuffer) = AmiGetQword56FromLe(pSrcData_p); + *((u64 *) pBuffer) = AmiGetQword56FromLe(pSrcData_p); break; } @@ -1280,7 +1280,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign case kEplObdTypUInt64: case kEplObdTypReal64: { - *((QWORD *) pBuffer) = AmiGetQword64FromLe(pSrcData_p); + *((u64 *) pBuffer) = AmiGetQword64FromLe(pSrcData_p); break; } @@ -1740,18 +1740,18 @@ static tEplKernel EplObdCheckObjectRange(tEplObdSubEntryPtr pSubindexEntry_p, case kEplObdTypInt64: // switch to lower limit - pRangeData = ((signed QWORD *)pRangeData) + 1; + pRangeData = ((signed u64 *)pRangeData) + 1; // check if value is to low - if (*((signed QWORD *)pData_p) < *((signed QWORD *)pRangeData)) { + if (*((signed u64 *)pData_p) < *((signed u64 *)pRangeData)) { Ret = kEplObdValueTooLow; break; } // switch to higher limit - pRangeData = ((signed QWORD *)pRangeData) + 1; + pRangeData = ((signed u64 *)pRangeData) + 1; // check if value is to high - if (*((signed QWORD *)pData_p) > *((signed QWORD *)pRangeData)) { + if (*((signed u64 *)pData_p) > *((signed u64 *)pRangeData)) { Ret = kEplObdValueTooHigh; } @@ -1764,20 +1764,20 @@ static tEplKernel EplObdCheckObjectRange(tEplObdSubEntryPtr pSubindexEntry_p, case kEplObdTypUInt64: // switch to lower limit - pRangeData = ((unsigned QWORD *)pRangeData) + 1; + pRangeData = ((unsigned u64 *)pRangeData) + 1; // check if value is to low - if (*((unsigned QWORD *)pData_p) < - *((unsigned QWORD *)pRangeData)) { + if (*((unsigned u64 *)pData_p) < + *((unsigned u64 *)pRangeData)) { Ret = kEplObdValueTooLow; break; } // switch to higher limit - pRangeData = ((unsigned QWORD *)pRangeData) + 1; + pRangeData = ((unsigned u64 *)pRangeData) + 1; // check if value is to high - if (*((unsigned QWORD *)pData_p) > - *((unsigned QWORD *)pRangeData)) { + if (*((unsigned u64 *)pData_p) > + *((unsigned u64 *)pRangeData)) { Ret = kEplObdValueTooHigh; } diff --git a/drivers/staging/epl/EplObd.h b/drivers/staging/epl/EplObd.h index eebff886bf89..587f57a6aba7 100644 --- a/drivers/staging/epl/EplObd.h +++ b/drivers/staging/epl/EplObd.h @@ -68,11 +68,11 @@ ****************************************************************************/ -#include "EplInc.h" - #ifndef _EPLOBD_H_ #define _EPLOBD_H_ +#include "EplInc.h" + // ============================================================================ // defines // ============================================================================ @@ -255,15 +255,15 @@ typedef unsigned char tEplObdDomain; // 000F typedef signed long tEplObdInteger24; // 0010 typedef unsigned long tEplObdUnsigned24; // 0016 -typedef signed QWORD tEplObdInteger40; // 0012 -typedef signed QWORD tEplObdInteger48; // 0013 -typedef signed QWORD tEplObdInteger56; // 0014 -typedef signed QWORD tEplObdInteger64; // 0015 +typedef s64 tEplObdInteger40; // 0012 +typedef s64 tEplObdInteger48; // 0013 +typedef s64 tEplObdInteger56; // 0014 +typedef s64 tEplObdInteger64; // 0015 -typedef unsigned QWORD tEplObdUnsigned40; // 0018 -typedef unsigned QWORD tEplObdUnsigned48; // 0019 -typedef unsigned QWORD tEplObdUnsigned56; // 001A -typedef unsigned QWORD tEplObdUnsigned64; // 001B +typedef u64 tEplObdUnsigned40; // 0018 +typedef u64 tEplObdUnsigned48; // 0019 +typedef u64 tEplObdUnsigned56; // 001A +typedef u64 tEplObdUnsigned64; // 001B typedef double tEplObdReal64; // 0011 diff --git a/drivers/staging/epl/EplPdok.c b/drivers/staging/epl/EplPdok.c index 163dc53344e0..848fdb1e3875 100644 --- a/drivers/staging/epl/EplPdok.c +++ b/drivers/staging/epl/EplPdok.c @@ -318,7 +318,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p) WORD wBitOffset; WORD wBitSize; WORD wVarSize; - QWORD qwObjectMapping; + u64 qwObjectMapping; u8 bMappSubindex; u8 bObdSubindex; WORD wObdMappIndex; @@ -423,7 +423,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p) // process mapping for (bMappSubindex = 1; bMappSubindex <= bObjectCount; bMappSubindex++) { - ObdSize = 8; // QWORD + ObdSize = 8; // u64 // read object mapping from OD Ret = EplObdReadEntry(wObdMappIndex, @@ -553,7 +553,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p) // process mapping for (bMappSubindex = 1; bMappSubindex <= bObjectCount; bMappSubindex++) { - ObdSize = 8; // QWORD + ObdSize = 8; // u64 // read object mapping from OD Ret = EplObdReadEntry(wObdMappIndex, diff --git a/drivers/staging/epl/EplPdou.c b/drivers/staging/epl/EplPdou.c index 4536d4dc6a46..d65e21ce0b5c 100644 --- a/drivers/staging/epl/EplPdou.c +++ b/drivers/staging/epl/EplPdou.c @@ -152,13 +152,13 @@ static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam *pParam_p, unsigned int uiIndex_p); -static void EplPdouDecodeObjectMapping(QWORD qwObjectMapping_p, +static void EplPdouDecodeObjectMapping(u64 qwObjectMapping_p, unsigned int *puiIndex_p, unsigned int *puiSubIndex_p, unsigned int *puiBitOffset_p, unsigned int *puiBitSize_p); -static tEplKernel EplPdouCheckObjectMapping(QWORD qwObjectMapping_p, +static tEplKernel EplPdouCheckObjectMapping(u64 qwObjectMapping_p, tEplObdAccess AccessType_p, DWORD * pdwAbortCode_p, unsigned int *puiPdoSize_p); @@ -233,7 +233,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p) unsigned int uiIndexType; tEplObdSize ObdSize; u8 bObjectCount; - QWORD qwObjectMapping; + u64 qwObjectMapping; tEplObdAccess AccessType; u8 bMappSubindex; unsigned int uiCurPdoSize; @@ -326,7 +326,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p) for (bMappSubindex = 1; bMappSubindex <= bObjectCount; bMappSubindex++) { // read object mapping from OD - ObdSize = sizeof(qwObjectMapping); // QWORD + ObdSize = sizeof(qwObjectMapping); // u64 Ret = EplObduReadEntry(pParam_p->m_uiIndex, bMappSubindex, &qwObjectMapping, &ObdSize); @@ -360,7 +360,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p) } // check existence of object and validity of object length - qwObjectMapping = *((QWORD *) pParam_p->m_pArg); + qwObjectMapping = *((u64 *) pParam_p->m_pArg); Ret = EplPdouCheckObjectMapping(qwObjectMapping, AccessType, @@ -439,7 +439,7 @@ static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam *pParam_p, // //--------------------------------------------------------------------------- -static void EplPdouDecodeObjectMapping(QWORD qwObjectMapping_p, +static void EplPdouDecodeObjectMapping(u64 qwObjectMapping_p, unsigned int *puiIndex_p, unsigned int *puiSubIndex_p, unsigned int *puiBitOffset_p, @@ -480,7 +480,7 @@ static void EplPdouDecodeObjectMapping(QWORD qwObjectMapping_p, // //--------------------------------------------------------------------------- -static tEplKernel EplPdouCheckObjectMapping(QWORD qwObjectMapping_p, +static tEplKernel EplPdouCheckObjectMapping(u64 qwObjectMapping_p, tEplObdAccess AccessType_p, DWORD * pdwAbortCode_p, unsigned int *puiPdoSize_p) diff --git a/drivers/staging/epl/amix86.c b/drivers/staging/epl/amix86.c index 7f1a5028df69..b8e891d1cd0b 100644 --- a/drivers/staging/epl/amix86.c +++ b/drivers/staging/epl/amix86.c @@ -89,7 +89,7 @@ typedef struct { } tdwStruct; typedef struct { - QWORD m_qwQword; + u64 m_qwQword; } tqwStruct; @@ -415,7 +415,7 @@ DWORD AmiGetDword24FromLe(void *pAddr_p) // State: not tested // //--------------------------------------------------------------------------- -void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword64ToBe(void *pAddr_p, u64 qwQwordVal_p) { ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[7]; ((u8 *) pAddr_p)[1] = ((u8 *) & qwQwordVal_p)[6]; @@ -441,11 +441,11 @@ void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p) // State: not tested // //--------------------------------------------------------------------------- -void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword64ToLe(void *pAddr_p, u64 qwQwordVal_p) { - QWORD *pqwDst; + u64 *pqwDst; - pqwDst = (QWORD *) pAddr_p; + pqwDst = (u64 *) pAddr_p; *pqwDst = qwQwordVal_p; } @@ -462,7 +462,7 @@ void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p) // State: not tested // //--------------------------------------------------------------------------- -QWORD AmiGetQword64FromBe(void *pAddr_p) +u64 AmiGetQword64FromBe(void *pAddr_p) { tqwStruct qwStruct; @@ -491,7 +491,7 @@ QWORD AmiGetQword64FromBe(void *pAddr_p) // State: not tested // //--------------------------------------------------------------------------- -QWORD AmiGetQword64FromLe(void *pAddr_p) +u64 AmiGetQword64FromLe(void *pAddr_p) { tqwStruct *pqwStruct; tqwStruct qwStruct; @@ -517,7 +517,7 @@ QWORD AmiGetQword64FromLe(void *pAddr_p) // //--------------------------------------------------------------------------- -void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword40ToBe(void *pAddr_p, u64 qwQwordVal_p) { ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[4]; @@ -543,7 +543,7 @@ void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword40ToLe(void *pAddr_p, u64 qwQwordVal_p) { ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; @@ -559,13 +559,13 @@ void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p) // // Parameters: pAddr_p = pointer to source buffer // -// Return: QWORD +// Return: u64 // // State: not tested // //--------------------------------------------------------------------------- -QWORD AmiGetQword40FromBe(void *pAddr_p) +u64 AmiGetQword40FromBe(void *pAddr_p) { tqwStruct qwStruct; @@ -585,13 +585,13 @@ QWORD AmiGetQword40FromBe(void *pAddr_p) // // Parameters: pAddr_p = pointer to source buffer // -// Return: QWORD +// Return: u64 // // State: not tested // //--------------------------------------------------------------------------- -QWORD AmiGetQword40FromLe(void *pAddr_p) +u64 AmiGetQword40FromLe(void *pAddr_p) { tqwStruct qwStruct; @@ -618,7 +618,7 @@ QWORD AmiGetQword40FromLe(void *pAddr_p) // //--------------------------------------------------------------------------- -void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword48ToBe(void *pAddr_p, u64 qwQwordVal_p) { ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[5]; @@ -645,7 +645,7 @@ void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword48ToLe(void *pAddr_p, u64 qwQwordVal_p) { ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; @@ -661,13 +661,13 @@ void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p) // // Parameters: pAddr_p = pointer to source buffer // -// Return: QWORD +// Return: u64 // // State: not tested // //--------------------------------------------------------------------------- -QWORD AmiGetQword48FromBe(void *pAddr_p) +u64 AmiGetQword48FromBe(void *pAddr_p) { tqwStruct qwStruct; @@ -687,13 +687,13 @@ QWORD AmiGetQword48FromBe(void *pAddr_p) // // Parameters: pAddr_p = pointer to source buffer // -// Return: QWORD +// Return: u64 // // State: not tested // //--------------------------------------------------------------------------- -QWORD AmiGetQword48FromLe(void *pAddr_p) +u64 AmiGetQword48FromLe(void *pAddr_p) { tqwStruct qwStruct; @@ -720,7 +720,7 @@ QWORD AmiGetQword48FromLe(void *pAddr_p) // //--------------------------------------------------------------------------- -void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword56ToBe(void *pAddr_p, u64 qwQwordVal_p) { ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[6]; @@ -748,7 +748,7 @@ void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p) // //--------------------------------------------------------------------------- -void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p) +void AmiSetQword56ToLe(void *pAddr_p, u64 qwQwordVal_p) { ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; @@ -765,13 +765,13 @@ void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p) // // Parameters: pAddr_p = pointer to source buffer // -// Return: QWORD +// Return: u64 // // State: not tested // //--------------------------------------------------------------------------- -QWORD AmiGetQword56FromBe(void *pAddr_p) +u64 AmiGetQword56FromBe(void *pAddr_p) { tqwStruct qwStruct; @@ -791,13 +791,13 @@ QWORD AmiGetQword56FromBe(void *pAddr_p) // // Parameters: pAddr_p = pointer to source buffer // -// Return: QWORD +// Return: u64 // // State: not tested // //--------------------------------------------------------------------------- -QWORD AmiGetQword56FromLe(void *pAddr_p) +u64 AmiGetQword56FromLe(void *pAddr_p) { tqwStruct qwStruct; diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index f5e48e4163b8..c83163e73882 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -23,10 +23,6 @@ #define _GLOBAL_H_ -#ifndef QWORD -#define QWORD long long int -#endif - #define TRACE printk // --- logic types --- -- cgit v1.2.3-59-g8ed1b From d539cfb03ad31e4ba5d6b18ea65954da9a785fe6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 12:51:37 -0700 Subject: Staging: epl: remove DWORD It's u32 in kernelspace, not DWORD. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Debug.h | 2 +- drivers/staging/epl/Edrv8139.c | 54 +++++++++++++++++----------------- drivers/staging/epl/Epl.h | 38 ++++++++++++------------ drivers/staging/epl/EplAmi.h | 18 ++++++------ drivers/staging/epl/EplApiGeneric.c | 4 +-- drivers/staging/epl/EplDll.h | 40 ++++++++++++------------- drivers/staging/epl/EplDllk.c | 12 ++++---- drivers/staging/epl/EplErrorHandlerk.c | 24 +++++++-------- drivers/staging/epl/EplEvent.h | 2 +- drivers/staging/epl/EplEventk.c | 2 +- drivers/staging/epl/EplEventu.c | 2 +- drivers/staging/epl/EplFrame.h | 28 +++++++++--------- drivers/staging/epl/EplIdentu.c | 4 +-- drivers/staging/epl/EplInc.h | 8 ++--- drivers/staging/epl/EplNmtMnu.c | 20 ++++++------- drivers/staging/epl/EplNmtk.c | 2 +- drivers/staging/epl/EplNmtu.c | 6 ++-- drivers/staging/epl/EplObd.c | 8 ++--- drivers/staging/epl/EplObd.h | 2 +- drivers/staging/epl/EplObdMacro.h | 2 +- drivers/staging/epl/EplPdou.c | 4 +-- drivers/staging/epl/EplSdo.h | 2 +- drivers/staging/epl/EplSdoAsndu.c | 2 +- drivers/staging/epl/EplSdoComu.c | 36 +++++++++++------------ drivers/staging/epl/EplSdoUdpu.c | 4 +-- drivers/staging/epl/EplTarget.h | 2 +- drivers/staging/epl/TimerHighReskX86.c | 2 +- drivers/staging/epl/amix86.c | 36 +++++++++++------------ drivers/staging/epl/demo_main.c | 14 ++++----- drivers/staging/epl/global.h | 3 -- drivers/staging/epl/kernel/EplDllk.h | 2 +- drivers/staging/epl/proc_fs.c | 12 ++++---- drivers/staging/epl/user/EplCfgMau.h | 6 ++-- drivers/staging/epl/user/EplSdoAsndu.h | 2 +- drivers/staging/epl/user/EplSdoComu.h | 2 +- drivers/staging/epl/user/EplSdoUdpu.h | 2 +- 36 files changed, 203 insertions(+), 206 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/Debug.h b/drivers/staging/epl/Debug.h index 9a6a5c824b2c..94646b28db34 100644 --- a/drivers/staging/epl/Debug.h +++ b/drivers/staging/epl/Debug.h @@ -666,7 +666,7 @@ extern "C" { DEBUG_LVL_ASSERT_TRACE4 ( \ "Assertion failed: line %d file '%s'\n" \ " -> '%s'\n" \ - " -> 0x%08lX\n", __LINE__, __FILE__, str, (DWORD) p1); \ + " -> 0x%08lX\n", __LINE__, __FILE__, str, (u32) p1); \ while (1); } diff --git a/drivers/staging/epl/Edrv8139.c b/drivers/staging/epl/Edrv8139.c index 73e5c7cf69d3..c8fcc4e815b6 100644 --- a/drivers/staging/epl/Edrv8139.c +++ b/drivers/staging/epl/Edrv8139.c @@ -235,7 +235,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); -void TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgPostTraceValue(u32 dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else @@ -456,7 +456,7 @@ tEplKernel EdrvShutdown(void) tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p) { tEplKernel Ret = kEplSuccessful; - DWORD dwData; + u32 dwData; u8 bHash; bHash = EdrvCalcHash(pbMacAddr_p); @@ -497,7 +497,7 @@ tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p) tEplKernel EdrvUndefineRxMacAddrEntry(u8 * pbMacAddr_p) { tEplKernel Ret = kEplSuccessful; - DWORD dwData; + u32 dwData; u8 bHash; bHash = EdrvCalcHash(pbMacAddr_p); @@ -532,7 +532,7 @@ tEplKernel EdrvUndefineRxMacAddrEntry(u8 * pbMacAddr_p) tEplKernel EdrvAllocTxMsgBuffer(tEdrvTxBuffer * pBuffer_p) { tEplKernel Ret = kEplSuccessful; - DWORD i; + u32 i; if (pBuffer_p->m_uiMaxBufferLen > EDRV_MAX_FRAME_SIZE) { Ret = kEplEdrvNoFreeBufEntry; @@ -605,7 +605,7 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p) { tEplKernel Ret = kEplSuccessful; unsigned int uiBufferNumber; - DWORD dwTemp; + u32 dwTemp; uiBufferNumber = pBuffer_p->m_uiBufferNumber; @@ -620,8 +620,8 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p) dwTemp = EDRV_REGDW_READ((EDRV_REGDW_TSD0 + (EdrvInstance_l.m_uiCurTxDesc * - sizeof(DWORD)))); - printk("%s InvOp TSD%u = 0x%08lX", __func__, + sizeof(u32)))); + printk("%s InvOp TSD%u = 0x%08X", __func__, EdrvInstance_l.m_uiCurTxDesc, dwTemp); printk(" Cmd = 0x%02X\n", (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); @@ -640,22 +640,22 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p) } // set DMA address of buffer EDRV_REGDW_WRITE((EDRV_REGDW_TSAD0 + - (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD))), + (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32))), (EdrvInstance_l.m_pTxBufDma + (uiBufferNumber * EDRV_MAX_FRAME_SIZE))); dwTemp = EDRV_REGDW_READ((EDRV_REGDW_TSAD0 + - (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD)))); + (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32)))); // printk("%s TSAD%u = 0x%08lX", __func__, EdrvInstance_l.m_uiCurTxDesc, dwTemp); // start transmission EDRV_REGDW_WRITE((EDRV_REGDW_TSD0 + - (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD))), + (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32))), (EDRV_REGDW_TSD_TXTH_DEF | pBuffer_p->m_uiTxMsgLen)); dwTemp = EDRV_REGDW_READ((EDRV_REGDW_TSD0 + - (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD)))); -// printk(" TSD%u = 0x%08lX / 0x%08lX\n", EdrvInstance_l.m_uiCurTxDesc, dwTemp, (DWORD)(EDRV_REGDW_TSD_TXTH_DEF | pBuffer_p->m_uiTxMsgLen)); + (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32)))); +// printk(" TSD%u = 0x%08lX / 0x%08lX\n", EdrvInstance_l.m_uiCurTxDesc, dwTemp, (u32)(EDRV_REGDW_TSD_TXTH_DEF | pBuffer_p->m_uiTxMsgLen)); Exit: return Ret; @@ -762,8 +762,8 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, tEdrvRxBuffer RxBuffer; tEdrvTxBuffer *pTxBuffer; WORD wStatus; - DWORD dwTxStatus; - DWORD dwRxStatus; + u32 dwTxStatus; + u32 dwRxStatus; WORD wCurRx; u8 *pbRxBuf; unsigned int uiLength; @@ -793,7 +793,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, dwTxStatus = EDRV_REGDW_READ((EDRV_REGDW_TSD0 + (EdrvInstance_l.m_uiCurTxDesc * - sizeof(DWORD)))); + sizeof(u32)))); if ((dwTxStatus & (EDRV_REGDW_TSD_TOK | EDRV_REGDW_TSD_TABT | EDRV_REGDW_TSD_TUN)) != 0) { // transmit finished EdrvInstance_l.m_uiCurTxDesc = (EdrvInstance_l.m_uiCurTxDesc + 1) & 0x03; @@ -855,8 +855,8 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, // calculate pointer to current frame in receive buffer pbRxBuf = EdrvInstance_l.m_pbRxBuf + wCurRx; - // read receive status DWORD - dwRxStatus = le32_to_cpu(*((DWORD *) pbRxBuf)); + // read receive status u32 + dwRxStatus = le32_to_cpu(*((u32 *) pbRxBuf)); // calculate length of received frame uiLength = dwRxStatus >> 16; @@ -896,7 +896,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, m_pfnRxHandler(&RxBuffer); } - // calulate new offset (DWORD aligned) + // calulate new offset (u32 aligned) wCurRx = (WORD) ((wCurRx + uiLength + sizeof(dwRxStatus) + 3) & ~0x3); @@ -941,7 +941,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId) { int iResult = 0; - DWORD dwTemp; + u32 dwTemp; if (EdrvInstance_l.m_pPciDev != NULL) { // Edrv is already connected to a PCI device printk("%s device %s discarded\n", __func__, @@ -1008,7 +1008,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId) dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TCR); if (((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_C) && ((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_D)) { // unsupported chip - printk("%s Unsupported chip! TCR = 0x%08lX\n", __func__, + printk("%s Unsupported chip! TCR = 0x%08X\n", __func__, dwTemp); iResult = -ENODEV; goto Exit; @@ -1043,11 +1043,11 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId) printk("%s set local MAC address\n", __func__); // write this MAC address to controller EDRV_REGDW_WRITE(EDRV_REGDW_IDR0, - le32_to_cpu(*((DWORD*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[0]))); + le32_to_cpu(*((u32*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[0]))); dwTemp = EDRV_REGDW_READ(EDRV_REGDW_IDR0); EDRV_REGDW_WRITE(EDRV_REGDW_IDR4, - le32_to_cpu(*((DWORD*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[4]))); + le32_to_cpu(*((u32*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[4]))); dwTemp = EDRV_REGDW_READ(EDRV_REGDW_IDR4); break; } @@ -1217,11 +1217,11 @@ static void EdrvRemoveOne(struct pci_dev *pPciDev) static u8 EdrvCalcHash(u8 * pbMAC_p) { - DWORD dwByteCounter; - DWORD dwBitCounter; - DWORD dwData; - DWORD dwCrc; - DWORD dwCarry; + u32 dwByteCounter; + u32 dwBitCounter; + u32 dwData; + u32 dwCrc; + u32 dwCarry; u8 *pbData; u8 bHash; diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h index 09a3d0a2491e..6fc158915497 100644 --- a/drivers/staging/epl/Epl.h +++ b/drivers/staging/epl/Epl.h @@ -142,22 +142,22 @@ typedef struct { u8 m_abMacAddress[6]; // local MAC address // 0x1F82: NMT_FeatureFlags_U32 - DWORD m_dwFeatureFlags; + u32 m_dwFeatureFlags; // Cycle Length (0x1006: NMT_CycleLen_U32) in [us] - DWORD m_dwCycleLen; // required for error detection + u32 m_dwCycleLen; // required for error detection // 0x1F98: NMT_CycleTiming_REC // 0x1F98.1: IsochrTxMaxPayload_U16 unsigned int m_uiIsochrTxMaxPayload; // const // 0x1F98.2: IsochrRxMaxPayload_U16 unsigned int m_uiIsochrRxMaxPayload; // const // 0x1F98.3: PResMaxLatency_U32 - DWORD m_dwPresMaxLatency; // const in [ns], only required for IdentRes + u32 m_dwPresMaxLatency; // const in [ns], only required for IdentRes // 0x1F98.4: PReqActPayloadLimit_U16 unsigned int m_uiPreqActPayloadLimit; // required for initialisation (+28 bytes) // 0x1F98.5: PResActPayloadLimit_U16 unsigned int m_uiPresActPayloadLimit; // required for initialisation of Pres frame (+28 bytes) // 0x1F98.6: ASndMaxLatency_U32 - DWORD m_dwAsndMaxLatency; // const in [ns], only required for IdentRes + u32 m_dwAsndMaxLatency; // const in [ns], only required for IdentRes // 0x1F98.7: MultiplCycleCnt_U8 unsigned int m_uiMultiplCycleCnt; // required for error detection // 0x1F98.8: AsyncMTU_U16 @@ -167,28 +167,28 @@ typedef struct { // $$$ Multiplexed Slot // 0x1C14: DLL_LossOfFrameTolerance_U32 in [ns] - DWORD m_dwLossOfFrameTolerance; + u32 m_dwLossOfFrameTolerance; // 0x1F8A: NMT_MNCycleTiming_REC // 0x1F8A.1: WaitSoCPReq_U32 in [ns] - DWORD m_dwWaitSocPreq; + u32 m_dwWaitSocPreq; // 0x1F8A.2: AsyncSlotTimeout_U32 in [ns] - DWORD m_dwAsyncSlotTimeout; + u32 m_dwAsyncSlotTimeout; - DWORD m_dwDeviceType; // NMT_DeviceType_U32 - DWORD m_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 - DWORD m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 - DWORD m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 - DWORD m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 + u32 m_dwDeviceType; // NMT_DeviceType_U32 + u32 m_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 + u32 m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 + u32 m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 + u32 m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 u64 m_qwVendorSpecificExt1; - DWORD m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 - DWORD m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 - DWORD m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device - DWORD m_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device - DWORD m_dwIpAddress; - DWORD m_dwSubnetMask; - DWORD m_dwDefaultGateway; + u32 m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 + u32 m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 + u32 m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device + u32 m_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device + u32 m_dwIpAddress; + u32 m_dwSubnetMask; + u32 m_dwDefaultGateway; u8 m_sHostname[32]; u8 m_abVendorSpecificExt2[48]; diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h index 1d6080afacd4..4a323ad4f291 100644 --- a/drivers/staging/epl/EplAmi.h +++ b/drivers/staging/epl/EplAmi.h @@ -111,9 +111,9 @@ extern "C" { #define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);} void AmiSetWordToBe(void *pAddr_p, WORD wWordVal_p); -void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p); +void AmiSetDwordToBe(void *pAddr_p, u32 dwDwordVal_p); void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p); -void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p); +void AmiSetDwordToLe(void *pAddr_p, u32 dwDwordVal_p); //--------------------------------------------------------------------------- // @@ -127,9 +127,9 @@ void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p); #define AmiGetByteFromLe(pAddr_p) (*(u8 *)(pAddr_p)) WORD AmiGetWordFromBe(void *pAddr_p); -DWORD AmiGetDwordFromBe(void *pAddr_p); +u32 AmiGetDwordFromBe(void *pAddr_p); WORD AmiGetWordFromLe(void *pAddr_p); -DWORD AmiGetDwordFromLe(void *pAddr_p); +u32 AmiGetDwordFromLe(void *pAddr_p); //--------------------------------------------------------------------------- // @@ -144,8 +144,8 @@ DWORD AmiGetDwordFromLe(void *pAddr_p); // //--------------------------------------------------------------------------- -void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p); -void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p); +void AmiSetDword24ToBe(void *pAddr_p, u32 dwDwordVal_p); +void AmiSetDword24ToLe(void *pAddr_p, u32 dwDwordVal_p); //--------------------------------------------------------------------------- // @@ -155,12 +155,12 @@ void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p); // // Parameters: pAddr_p = pointer to source buffer // -// Return: DWORD = read value +// Return: u32 = read value // //--------------------------------------------------------------------------- -DWORD AmiGetDword24FromBe(void *pAddr_p); -DWORD AmiGetDword24FromLe(void *pAddr_p); +u32 AmiGetDword24FromBe(void *pAddr_p); +u32 AmiGetDword24FromLe(void *pAddr_p); //#ifdef USE_VAR64 diff --git a/drivers/staging/epl/EplApiGeneric.c b/drivers/staging/epl/EplApiGeneric.c index 2dd0b33b8be4..431b19de0ed4 100644 --- a/drivers/staging/epl/EplApiGeneric.c +++ b/drivers/staging/epl/EplApiGeneric.c @@ -997,8 +997,8 @@ tEplKernel EplApiCbObdAccess(tEplObdCbParam *pParam_p) { if ((pParam_p->m_ObdEvent == kEplObdEvPostWrite) && (pParam_p->m_uiSubIndex == 3) - && (*((DWORD *) pParam_p->m_pArg) != 0)) { - DWORD dwVerifyConfInvalid = 0; + && (*((u32 *) pParam_p->m_pArg) != 0)) { + u32 dwVerifyConfInvalid = 0; // set CFM_VerifyConfiguration_REC.VerifyConfInvalid_U32 to 0 Ret = EplObdWriteEntry(0x1020, 4, diff --git a/drivers/staging/epl/EplDll.h b/drivers/staging/epl/EplDll.h index 863728a9053a..79be2c23f8b6 100644 --- a/drivers/staging/epl/EplDll.h +++ b/drivers/staging/epl/EplDll.h @@ -135,22 +135,22 @@ typedef struct { unsigned int m_uiNodeId; // local node ID // 0x1F82: NMT_FeatureFlags_U32 - DWORD m_dwFeatureFlags; + u32 m_dwFeatureFlags; // Cycle Length (0x1006: NMT_CycleLen_U32) in [us] - DWORD m_dwCycleLen; // required for error detection + u32 m_dwCycleLen; // required for error detection // 0x1F98: NMT_CycleTiming_REC // 0x1F98.1: IsochrTxMaxPayload_U16 unsigned int m_uiIsochrTxMaxPayload; // const // 0x1F98.2: IsochrRxMaxPayload_U16 unsigned int m_uiIsochrRxMaxPayload; // const // 0x1F98.3: PResMaxLatency_U32 - DWORD m_dwPresMaxLatency; // const in [ns], only required for IdentRes + u32 m_dwPresMaxLatency; // const in [ns], only required for IdentRes // 0x1F98.4: PReqActPayloadLimit_U16 unsigned int m_uiPreqActPayloadLimit; // required for initialisation (+24 bytes) // 0x1F98.5: PResActPayloadLimit_U16 unsigned int m_uiPresActPayloadLimit; // required for initialisation of Pres frame (+24 bytes) // 0x1F98.6: ASndMaxLatency_U32 - DWORD m_dwAsndMaxLatency; // const in [ns], only required for IdentRes + u32 m_dwAsndMaxLatency; // const in [ns], only required for IdentRes // 0x1F98.7: MultiplCycleCnt_U8 unsigned int m_uiMultiplCycleCnt; // required for error detection // 0x1F98.8: AsyncMTU_U16 @@ -159,32 +159,32 @@ typedef struct { // $$$ Multiplexed Slot // 0x1C14: DLL_LossOfFrameTolerance_U32 in [ns] - DWORD m_dwLossOfFrameTolerance; + u32 m_dwLossOfFrameTolerance; // 0x1F8A: NMT_MNCycleTiming_REC // 0x1F8A.1: WaitSoCPReq_U32 in [ns] - DWORD m_dwWaitSocPreq; + u32 m_dwWaitSocPreq; // 0x1F8A.2: AsyncSlotTimeout_U32 in [ns] - DWORD m_dwAsyncSlotTimeout; + u32 m_dwAsyncSlotTimeout; } tEplDllConfigParam; typedef struct { unsigned int m_uiSizeOfStruct; - DWORD m_dwDeviceType; // NMT_DeviceType_U32 - DWORD m_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 - DWORD m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 - DWORD m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 - DWORD m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 + u32 m_dwDeviceType; // NMT_DeviceType_U32 + u32 m_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 + u32 m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 + u32 m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 + u32 m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 u64 m_qwVendorSpecificExt1; - DWORD m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 - DWORD m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 - DWORD m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device - DWORD m_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device - DWORD m_dwIpAddress; - DWORD m_dwSubnetMask; - DWORD m_dwDefaultGateway; + u32 m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 + u32 m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 + u32 m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device + u32 m_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device + u32 m_dwIpAddress; + u32 m_dwSubnetMask; + u32 m_dwDefaultGateway; u8 m_sHostname[32]; u8 m_abVendorSpecificExt2[48]; @@ -194,7 +194,7 @@ typedef struct { unsigned int m_uiNodeId; WORD m_wPreqPayloadLimit; // object 0x1F8B: NMT_MNPReqPayloadLimitList_AU16 WORD m_wPresPayloadLimit; // object 0x1F8D: NMT_PResPayloadLimitList_AU16 - DWORD m_dwPresTimeout; // object 0x1F92: NMT_MNCNPResTimeout_AU32 + u32 m_dwPresTimeout; // object 0x1F92: NMT_MNCNPResTimeout_AU32 } tEplDllNodeInfo; diff --git a/drivers/staging/epl/EplDllk.c b/drivers/staging/epl/EplDllk.c index d22e74ee25ea..53f05d9b37ac 100644 --- a/drivers/staging/epl/EplDllk.c +++ b/drivers/staging/epl/EplDllk.c @@ -122,7 +122,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); -void TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgPostTraceValue(u32 dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else @@ -3154,7 +3154,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p) Exit: if (Ret != kEplSuccessful) { - DWORD dwArg; + u32 dwArg; BENCHMARK_MOD_02_TOGGLE(9); @@ -3448,7 +3448,7 @@ static void EplDllkCbFrameTransmitted(tEdrvTxBuffer * pTxBuffer_p) Exit: if (Ret != kEplSuccessful) { - DWORD dwArg; + u32 dwArg; BENCHMARK_MOD_02_TOGGLE(9); @@ -3582,7 +3582,7 @@ static tEplKernel EplDllkCbCnTimer(tEplTimerEventArg *pEventArg_p) Exit: if (Ret != kEplSuccessful) { - DWORD dwArg; + u32 dwArg; BENCHMARK_MOD_02_TOGGLE(9); @@ -3638,7 +3638,7 @@ static tEplKernel EplDllkCbMnTimerCycle(tEplTimerEventArg *pEventArg_p) Exit: if (Ret != kEplSuccessful) { - DWORD dwArg; + u32 dwArg; BENCHMARK_MOD_02_TOGGLE(9); @@ -3691,7 +3691,7 @@ static tEplKernel EplDllkCbMnTimerResponse(tEplTimerEventArg *pEventArg_p) Exit: if (Ret != kEplSuccessful) { - DWORD dwArg; + u32 dwArg; BENCHMARK_MOD_02_TOGGLE(9); diff --git a/drivers/staging/epl/EplErrorHandlerk.c b/drivers/staging/epl/EplErrorHandlerk.c index aeb77fb9d53d..6baed04ef11c 100644 --- a/drivers/staging/epl/EplErrorHandlerk.c +++ b/drivers/staging/epl/EplErrorHandlerk.c @@ -97,9 +97,9 @@ //--------------------------------------------------------------------------- typedef struct { - DWORD m_dwCumulativeCnt; // subindex 1 - DWORD m_dwThresholdCnt; // subindex 2 - DWORD m_dwThreshold; // subindex 3 + u32 m_dwCumulativeCnt; // subindex 1 + u32 m_dwThresholdCnt; // subindex 2 + u32 m_dwThreshold; // subindex 3 } tEplErrorHandlerkErrorCounter; @@ -112,9 +112,9 @@ typedef struct { #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) tEplErrorHandlerkErrorCounter m_MnCrcErr; // object 0x1C00 tEplErrorHandlerkErrorCounter m_MnCycTimeExceed; // object 0x1C02 - DWORD m_adwMnCnLossPresCumCnt[254]; // object 0x1C07 - DWORD m_adwMnCnLossPresThrCnt[254]; // object 0x1C08 - DWORD m_adwMnCnLossPresThreshold[254]; // object 0x1C09 + u32 m_adwMnCnLossPresCumCnt[254]; // object 0x1C07 + u32 m_adwMnCnLossPresThrCnt[254]; // object 0x1C08 + u32 m_adwMnCnLossPresThreshold[254]; // object 0x1C09 BOOL m_afMnCnLossPresEvent[254]; #endif @@ -135,7 +135,7 @@ static tEplKernel EplErrorHandlerkLinkErrorCounter(tEplErrorHandlerkErrorCounter unsigned int uiIndex_p); #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) -static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p, +static tEplKernel EplErrorHandlerkLinkArray(u32 * pdwValue_p, unsigned int uiValueCount_p, unsigned int uiIndex_p); #endif @@ -713,7 +713,7 @@ static tEplKernel EplErrorHandlerkLinkErrorCounter(tEplErrorHandlerkErrorCounter tEplVarParam VarParam; VarParam.m_pData = &pErrorCounter_p->m_dwCumulativeCnt; - VarParam.m_Size = sizeof(DWORD); + VarParam.m_Size = sizeof(u32); VarParam.m_uiIndex = uiIndex_p; VarParam.m_uiSubindex = 0x01; VarParam.m_ValidFlag = kVarValidAll; @@ -723,7 +723,7 @@ static tEplKernel EplErrorHandlerkLinkErrorCounter(tEplErrorHandlerkErrorCounter } VarParam.m_pData = &pErrorCounter_p->m_dwThresholdCnt; - VarParam.m_Size = sizeof(DWORD); + VarParam.m_Size = sizeof(u32); VarParam.m_uiIndex = uiIndex_p; VarParam.m_uiSubindex = 0x02; VarParam.m_ValidFlag = kVarValidAll; @@ -733,7 +733,7 @@ static tEplKernel EplErrorHandlerkLinkErrorCounter(tEplErrorHandlerkErrorCounter } VarParam.m_pData = &pErrorCounter_p->m_dwThreshold; - VarParam.m_Size = sizeof(DWORD); + VarParam.m_Size = sizeof(u32); VarParam.m_uiIndex = uiIndex_p; VarParam.m_uiSubindex = 0x03; VarParam.m_ValidFlag = kVarValidAll; @@ -763,7 +763,7 @@ static tEplKernel EplErrorHandlerkLinkErrorCounter(tEplErrorHandlerkErrorCounter //--------------------------------------------------------------------------- #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) -static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p, +static tEplKernel EplErrorHandlerkLinkArray(u32 * pdwValue_p, unsigned int uiValueCount_p, unsigned int uiIndex_p) { @@ -786,7 +786,7 @@ static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p, uiValueCount_p = bIndexEntries; } - VarParam.m_Size = sizeof(DWORD); + VarParam.m_Size = sizeof(u32); VarParam.m_uiIndex = uiIndex_p; VarParam.m_ValidFlag = kVarValidAll; diff --git a/drivers/staging/epl/EplEvent.h b/drivers/staging/epl/EplEvent.h index b543711feb6b..910bd69a18c2 100644 --- a/drivers/staging/epl/EplEvent.h +++ b/drivers/staging/epl/EplEvent.h @@ -249,7 +249,7 @@ typedef struct { tEplKernel m_EplError; // EPL error which occured union { u8 m_bArg; - DWORD m_dwArg; + u32 m_dwArg; tEplEventSource m_EventSource; // from Eventk/u module (originating error source) tEplEventObdError m_ObdError; // from Obd module // tEplErrHistoryEntry m_HistoryEntry; // from Nmtk/u module diff --git a/drivers/staging/epl/EplEventk.c b/drivers/staging/epl/EplEventk.c index 88ea89344dd7..ef36815c7984 100644 --- a/drivers/staging/epl/EplEventk.c +++ b/drivers/staging/epl/EplEventk.c @@ -101,7 +101,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); -void TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgPostTraceValue(u32 dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else diff --git a/drivers/staging/epl/EplEventu.c b/drivers/staging/epl/EplEventu.c index 29cb1636e59f..3ae2841ad023 100644 --- a/drivers/staging/epl/EplEventu.c +++ b/drivers/staging/epl/EplEventu.c @@ -97,7 +97,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); -void TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgPostTraceValue(u32 dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else diff --git a/drivers/staging/epl/EplFrame.h b/drivers/staging/epl/EplFrame.h index 156f907a1cfd..9ca424274745 100644 --- a/drivers/staging/epl/EplFrame.h +++ b/drivers/staging/epl/EplFrame.h @@ -214,25 +214,25 @@ typedef struct { u8 m_le_bIdentRespFlags; // Flags: FW u8 m_le_bEplProfileVersion; u8 m_le_bRes1; - DWORD m_le_dwFeatureFlags; // NMT_FeatureFlags_U32 + u32 m_le_dwFeatureFlags; // NMT_FeatureFlags_U32 WORD m_le_wMtu; // NMT_CycleTiming_REC.AsyncMTU_U16: C_IP_MIN_MTU - C_IP_MAX_MTU WORD m_le_wPollInSize; // NMT_CycleTiming_REC.PReqActPayload_U16 WORD m_le_wPollOutSize; // NMT_CycleTiming_REC.PResActPayload_U16 - DWORD m_le_dwResponseTime; // NMT_CycleTiming_REC.PResMaxLatency_U32 + u32 m_le_dwResponseTime; // NMT_CycleTiming_REC.PResMaxLatency_U32 WORD m_le_wRes2; - DWORD m_le_dwDeviceType; // NMT_DeviceType_U32 - DWORD m_le_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 - DWORD m_le_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 - DWORD m_le_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 - DWORD m_le_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 + u32 m_le_dwDeviceType; // NMT_DeviceType_U32 + u32 m_le_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 + u32 m_le_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 + u32 m_le_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 + u32 m_le_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 u64 m_le_qwVendorSpecificExt1; - DWORD m_le_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 - DWORD m_le_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 - DWORD m_le_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device - DWORD m_le_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device - DWORD m_le_dwIpAddress; - DWORD m_le_dwSubnetMask; - DWORD m_le_dwDefaultGateway; + u32 m_le_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 + u32 m_le_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 + u32 m_le_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device + u32 m_le_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device + u32 m_le_dwIpAddress; + u32 m_le_dwSubnetMask; + u32 m_le_dwDefaultGateway; u8 m_le_sHostname[32]; u8 m_le_abVendorSpecificExt2[48]; diff --git a/drivers/staging/epl/EplIdentu.c b/drivers/staging/epl/EplIdentu.c index 75f941d97cc6..bff1194ad6d8 100644 --- a/drivers/staging/epl/EplIdentu.c +++ b/drivers/staging/epl/EplIdentu.c @@ -386,9 +386,9 @@ tEplKernel EplIdentuRequestIdentResponse(unsigned int uiNodeId_p, // //--------------------------------------------------------------------------- -EPLDLLEXPORT DWORD EplIdentuGetRunningRequests(void) +EPLDLLEXPORT u32 EplIdentuGetRunningRequests(void) { - DWORD dwReqs = 0; + u32 dwReqs = 0; unsigned int uiIndex; for (uiIndex = 0; uiIndex < 32; uiIndex++) { diff --git a/drivers/staging/epl/EplInc.h b/drivers/staging/epl/EplInc.h index 5addab4981c8..fc9f0d0bf65e 100644 --- a/drivers/staging/epl/EplInc.h +++ b/drivers/staging/epl/EplInc.h @@ -140,8 +140,8 @@ // IEEE 1588 conformant net time structure typedef struct { - DWORD m_dwSec; - DWORD m_dwNanoSec; + u32 m_dwSec; + u32 m_dwNanoSec; } tEplNetTime; @@ -154,8 +154,8 @@ typedef struct { // ------------------------------------------------------------------------- #define EPL_SPEC_VERSION 0x20 // ETHERNET Powerlink V. 2.0 -#define EPL_STACK_VERSION(ver,rev,rel) ((((DWORD)(ver)) & 0xFF)|((((DWORD)(rev))&0xFF)<<8)|(((DWORD)(rel))<<16)) -#define EPL_OBJ1018_VERSION(ver,rev,rel) ((((DWORD)(ver))<<16) |(((DWORD)(rev))&0xFFFF)) +#define EPL_STACK_VERSION(ver,rev,rel) ((((u32)(ver)) & 0xFF)|((((u32)(rev))&0xFF)<<8)|(((u32)(rel))<<16)) +#define EPL_OBJ1018_VERSION(ver,rev,rel) ((((u32)(ver))<<16) |(((u32)(rev))&0xFFFF)) #define EPL_STRING_VERSION(ver,rev,rel) "V" #ver "." #rev " r" #rel #include "EplVersion.h" diff --git a/drivers/staging/epl/EplNmtMnu.c b/drivers/staging/epl/EplNmtMnu.c index 1c5d9d407d26..fd4f6d9e73dc 100644 --- a/drivers/staging/epl/EplNmtMnu.c +++ b/drivers/staging/epl/EplNmtMnu.c @@ -95,7 +95,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); -void TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgPostTraceValue(u32 dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else @@ -211,7 +211,7 @@ typedef struct { tEplTimerHdl m_TimerHdlStatReq; // timer to delay StatusRequests and IdentRequests tEplTimerHdl m_TimerHdlLonger; // 2nd timer for NMT command EnableReadyToOp and CheckCommunication tEplNmtMnuNodeState m_NodeState; // internal node state (kind of sub state of NMT state) - DWORD m_dwNodeCfg; // subindex from 0x1F81 + u32 m_dwNodeCfg; // subindex from 0x1F81 WORD m_wFlags; // flags: CN is being accessed isochronously } tEplNmtMnuNodeInfo; @@ -225,7 +225,7 @@ typedef struct { unsigned long m_ulTimeoutReadyToOp; // in [ms] (object 0x1F89/5) unsigned long m_ulTimeoutCheckCom; // in [ms] (object 0x1006 * MultiplexedCycleCount) WORD m_wFlags; // global flags - DWORD m_dwNmtStartup; // object 0x1F80 NMT_StartUp_U32 + u32 m_dwNmtStartup; // object 0x1F80 NMT_StartUp_U32 tEplNmtMnuCbNodeEvent m_pfnCbNodeEvent; tEplNmtMnuCbBootEvent m_pfnCbBootEvent; @@ -673,7 +673,7 @@ tEplKernel EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p) // build the configuration with infos from OD case kEplNmtGsResetConfiguration: { - DWORD dwTimeout; + u32 dwTimeout; tEplObdSize ObdSize; // read object 0x1F80 NMT_StartUp_U32 @@ -785,7 +785,7 @@ tEplKernel EplNmtMnuCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p) // node processes only async frames case kEplNmtMsPreOperational1: { - DWORD dwTimeout; + u32 dwTimeout; tEplTimerArg TimerArg; tEplObdSize ObdSize; tEplEvent Event; @@ -1291,7 +1291,7 @@ tEplKernel EplNmtMnuGetDiagnosticInfo(unsigned int *puiMandatorySlaveCount_p, // //--------------------------------------------------------------------------- /* -DWORD EplNmtMnuGetRunningTimerStatReq(void) +u32 EplNmtMnuGetRunningTimerStatReq(void) { tEplKernel Ret = kEplSuccessful; unsigned int uiIndex; @@ -1376,7 +1376,7 @@ static tEplKernel EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, kEplNmtMnuIntNodeEventNoIdentResponse); } else { // node answered IdentRequest tEplObdSize ObdSize; - DWORD dwDevType; + u32 dwDevType; WORD wErrorCode = EPL_E_NO_ERROR; tEplNmtState NmtState = (tEplNmtState) (AmiGetByteFromLe @@ -1466,7 +1466,7 @@ static tEplKernel EplNmtMnuStartBootStep1(void) tEplKernel Ret = kEplSuccessful; unsigned int uiSubIndex; unsigned int uiLocalNodeId; - DWORD dwNodeCfg; + u32 dwNodeCfg; tEplObdSize ObdSize; // $$$ d.k.: save current time for 0x1F89/2 MNTimeoutPreOp1_U32 @@ -1626,7 +1626,7 @@ static tEplKernel EplNmtMnuNodeBootStep2(unsigned int uiNodeId_p, { tEplKernel Ret = kEplSuccessful; tEplDllNodeInfo DllNodeInfo; - DWORD dwNodeCfg; + u32 dwNodeCfg; tEplObdSize ObdSize; tEplTimerArg TimerArg; @@ -1775,7 +1775,7 @@ static tEplKernel EplNmtMnuNodeCheckCom(unsigned int uiNodeId_p, tEplNmtMnuNodeInfo * pNodeInfo_p) { tEplKernel Ret = kEplSuccessful; - DWORD dwNodeCfg; + u32 dwNodeCfg; tEplTimerArg TimerArg; dwNodeCfg = pNodeInfo_p->m_dwNodeCfg; diff --git a/drivers/staging/epl/EplNmtk.c b/drivers/staging/epl/EplNmtk.c index 18edb0b07484..b7ddea0e4cfc 100644 --- a/drivers/staging/epl/EplNmtk.c +++ b/drivers/staging/epl/EplNmtk.c @@ -89,7 +89,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); -void TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgPostTraceValue(u32 dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else diff --git a/drivers/staging/epl/EplNmtu.c b/drivers/staging/epl/EplNmtu.c index 3c6452fb3048..40324af08f70 100644 --- a/drivers/staging/epl/EplNmtu.c +++ b/drivers/staging/epl/EplNmtu.c @@ -382,7 +382,7 @@ EPLDLLEXPORT tEplKernel EplNmtuProcessEvent(tEplEvent *pEplEvent_p) // node listens for EPL-Frames and check timeout case kEplNmtCsNotActive: { - DWORD dwBuffer; + u32 dwBuffer; tEplObdSize ObdSize; tEplTimerArg TimerArg; @@ -475,7 +475,7 @@ EPLDLLEXPORT tEplKernel EplNmtuProcessEvent(tEplEvent *pEplEvent_p) // node listens for EPL-Frames and check timeout case kEplNmtMsNotActive: { - DWORD dwBuffer; + u32 dwBuffer; tEplObdSize ObdSize; tEplTimerArg TimerArg; @@ -544,7 +544,7 @@ EPLDLLEXPORT tEplKernel EplNmtuProcessEvent(tEplEvent *pEplEvent_p) // node processes only async frames case kEplNmtMsPreOperational1: { - DWORD dwBuffer = 0; + u32 dwBuffer = 0; tEplObdSize ObdSize; tEplTimerArg TimerArg; diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c index ca61db449cee..ab0966ea6559 100644 --- a/drivers/staging/epl/EplObd.c +++ b/drivers/staging/epl/EplObd.c @@ -1088,7 +1088,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned case kEplObdTypInt24: case kEplObdTypUInt24: { - AmiSetDword24ToLe(pDstData_p, *((DWORD *) pSrcData)); + AmiSetDword24ToLe(pDstData_p, *((u32 *) pSrcData)); break; } @@ -1097,7 +1097,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned case kEplObdTypUInt32: case kEplObdTypReal32: { - AmiSetDwordToLe(pDstData_p, *((DWORD *) pSrcData)); + AmiSetDwordToLe(pDstData_p, *((u32 *) pSrcData)); break; } @@ -1238,7 +1238,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign case kEplObdTypInt24: case kEplObdTypUInt24: { - *((DWORD *) pBuffer) = AmiGetDword24FromLe(pSrcData_p); + *((u32 *) pBuffer) = AmiGetDword24FromLe(pSrcData_p); break; } @@ -1247,7 +1247,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign case kEplObdTypUInt32: case kEplObdTypReal32: { - *((DWORD *) pBuffer) = AmiGetDwordFromLe(pSrcData_p); + *((u32 *) pBuffer) = AmiGetDwordFromLe(pSrcData_p); break; } diff --git a/drivers/staging/epl/EplObd.h b/drivers/staging/epl/EplObd.h index 587f57a6aba7..ed7f091c0a06 100644 --- a/drivers/staging/epl/EplObd.h +++ b/drivers/staging/epl/EplObd.h @@ -370,7 +370,7 @@ typedef struct { unsigned int m_uiIndex; unsigned int m_uiSubIndex; void *m_pArg; - DWORD m_dwAbortCode; + u32 m_dwAbortCode; } tEplObdCbParam; diff --git a/drivers/staging/epl/EplObdMacro.h b/drivers/staging/epl/EplObdMacro.h index c70d17abaa1b..fc325bfd604c 100644 --- a/drivers/staging/epl/EplObdMacro.h +++ b/drivers/staging/epl/EplObdMacro.h @@ -80,7 +80,7 @@ // #pragma message ("EPL_OBD_CREATE_ROM_DATA") -#define EPL_OBD_BEGIN() static DWORD dwObd_OBK_g = 0x0000; +#define EPL_OBD_BEGIN() static u32 dwObd_OBK_g = 0x0000; #define EPL_OBD_END() //--------------------------------------------------------------------------------------- diff --git a/drivers/staging/epl/EplPdou.c b/drivers/staging/epl/EplPdou.c index d65e21ce0b5c..857ab513db1f 100644 --- a/drivers/staging/epl/EplPdou.c +++ b/drivers/staging/epl/EplPdou.c @@ -160,7 +160,7 @@ static void EplPdouDecodeObjectMapping(u64 qwObjectMapping_p, static tEplKernel EplPdouCheckObjectMapping(u64 qwObjectMapping_p, tEplObdAccess AccessType_p, - DWORD * pdwAbortCode_p, + u32 * pdwAbortCode_p, unsigned int *puiPdoSize_p); //=========================================================================// @@ -482,7 +482,7 @@ static void EplPdouDecodeObjectMapping(u64 qwObjectMapping_p, static tEplKernel EplPdouCheckObjectMapping(u64 qwObjectMapping_p, tEplObdAccess AccessType_p, - DWORD * pdwAbortCode_p, + u32 * pdwAbortCode_p, unsigned int *puiPdoSize_p) { tEplKernel Ret = kEplSuccessful; diff --git a/drivers/staging/epl/EplSdo.h b/drivers/staging/epl/EplSdo.h index a09d1eb05395..8002e0cc4d9b 100644 --- a/drivers/staging/epl/EplSdo.h +++ b/drivers/staging/epl/EplSdo.h @@ -207,7 +207,7 @@ typedef enum { typedef struct { tEplSdoComConHdl m_SdoComConHdl; tEplSdoComConState m_SdoComConState; - DWORD m_dwAbortCode; + u32 m_dwAbortCode; tEplSdoAccessType m_SdoAccessType; unsigned int m_uiNodeId; // NodeId of the target unsigned int m_uiTargetIndex; // index which was accessed diff --git a/drivers/staging/epl/EplSdoAsndu.c b/drivers/staging/epl/EplSdoAsndu.c index 80135d27e038..aa8bdef317cf 100644 --- a/drivers/staging/epl/EplSdoAsndu.c +++ b/drivers/staging/epl/EplSdoAsndu.c @@ -321,7 +321,7 @@ tEplKernel EplSdoAsnduInitCon(tEplSdoConHdl *pSdoConHandle_p, //--------------------------------------------------------------------------- tEplKernel EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, tEplFrame *pSrcData_p, - DWORD dwDataSize_p) + u32 dwDataSize_p) { tEplKernel Ret; unsigned int uiArray; diff --git a/drivers/staging/epl/EplSdoComu.c b/drivers/staging/epl/EplSdoComu.c index a9325d47efb1..1f71b5c6e5f6 100644 --- a/drivers/staging/epl/EplSdoComu.c +++ b/drivers/staging/epl/EplSdoComu.c @@ -174,7 +174,7 @@ typedef struct { // the SDO transfer void *m_pUserArg; // user definable argument pointer - DWORD m_dwLastAbortCode; // save the last abort code + u32 m_dwLastAbortCode; // save the last abort code #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) // only for client unsigned int m_uiTargetIndex; // index to access @@ -246,7 +246,7 @@ static tEplKernel EplSdoComClientProcessFrame(tEplSdoComConHdl SdoComCon_p, tEplAsySdoCom * pAsySdoCom_p); static tEplKernel EplSdoComClientSendAbort(tEplSdoComCon * pSdoComCon_p, - DWORD dwAbortCode_p); + u32 dwAbortCode_p); #endif /***************************************************************************/ @@ -747,7 +747,7 @@ tEplKernel EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) tEplKernel EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, - DWORD dwAbortCode_p) + u32 dwAbortCode_p) { tEplKernel Ret; tEplSdoComCon *pSdoComCon; @@ -1001,7 +1001,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p, u8 bFlag; #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOS)) != 0) - DWORD dwAbortCode; + u32 dwAbortCode; unsigned int uiSize; #endif @@ -1666,7 +1666,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p, case kEplSdoComConEventAbort: { EplSdoComClientSendAbort(pSdoComCon, - *((DWORD *) + *((u32 *) pSdoComCon-> m_pData)); @@ -1674,7 +1674,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p, pSdoComCon->m_bTransactionId++; // call callback of application pSdoComCon->m_dwLastAbortCode = - *((DWORD *) pSdoComCon->m_pData); + *((u32 *) pSdoComCon->m_pData); Ret = EplSdoComTransferFinished (SdoComCon_p, pSdoComCon, @@ -1868,7 +1868,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p, case kEplSdoComConEventAbort: { EplSdoComClientSendAbort(pSdoComCon, - *((DWORD *) + *((u32 *) pSdoComCon-> m_pData)); @@ -1879,7 +1879,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p, kEplSdoComStateClientConnected; // call callback of application pSdoComCon->m_dwLastAbortCode = - *((DWORD *) pSdoComCon->m_pData); + *((u32 *) pSdoComCon->m_pData); Ret = EplSdoComTransferFinished (SdoComCon_p, pSdoComCon, @@ -1964,7 +1964,7 @@ static tEplKernel EplSdoComServerInitReadByIndex(tEplSdoComCon * pSdoComCon_p, unsigned int uiSubindex; tEplObdSize EntrySize; tEplObdAccess AccessType; - DWORD dwAbortCode; + u32 dwAbortCode; dwAbortCode = 0; @@ -2323,18 +2323,18 @@ static tEplKernel EplSdoComServerSendFrameIntern(tEplSdoComCon * pSdoComCon_p, // copy abortcode to frame AmiSetDwordToLe(&pCommandFrame->m_le_abCommandData[0], - *((DWORD *) pSdoComCon_p->m_pData)); + *((u32 *) pSdoComCon_p->m_pData)); // set size of segment AmiSetWordToLe(&pCommandFrame->m_le_wSegmentSize, - sizeof(DWORD)); + sizeof(u32)); // update counter - pSdoComCon_p->m_uiTransferredByte = sizeof(DWORD); + pSdoComCon_p->m_uiTransferredByte = sizeof(u32); pSdoComCon_p->m_uiTransSize = 0; // calc framesize - uiSizeOfFrame += sizeof(DWORD); + uiSizeOfFrame += sizeof(u32); Ret = EplSdoAsySeqSendData(pSdoComCon_p->m_SdoSeqConHdl, uiSizeOfFrame, pFrame); break; @@ -2372,7 +2372,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p, unsigned int uiBytesToTransfer; tEplObdSize EntrySize; tEplObdAccess AccessType; - DWORD dwAbortCode; + u32 dwAbortCode; u8 *pbSrcData; dwAbortCode = 0; @@ -3216,7 +3216,7 @@ static tEplKernel EplSdoComClientProcessFrame(tEplSdoComConHdl SdoComCon_p, //--------------------------------------------------------------------------- #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) static tEplKernel EplSdoComClientSendAbort(tEplSdoComCon * pSdoComCon_p, - DWORD dwAbortCode_p) + u32 dwAbortCode_p) { tEplKernel Ret; u8 abFrame[EPL_MAX_SDO_FRAME_SIZE]; @@ -3249,14 +3249,14 @@ static tEplKernel EplSdoComClientSendAbort(tEplSdoComCon * pSdoComCon_p, AmiSetDwordToLe(&pCommandFrame->m_le_abCommandData[0], dwAbortCode_p); // set size of segment - AmiSetWordToLe(&pCommandFrame->m_le_wSegmentSize, sizeof(DWORD)); + AmiSetWordToLe(&pCommandFrame->m_le_wSegmentSize, sizeof(u32)); // update counter - pSdoComCon_p->m_uiTransferredByte = sizeof(DWORD); + pSdoComCon_p->m_uiTransferredByte = sizeof(u32); pSdoComCon_p->m_uiTransSize = 0; // calc framesize - uiSizeOfFrame += sizeof(DWORD); + uiSizeOfFrame += sizeof(u32); // save abort code pSdoComCon_p->m_dwLastAbortCode = dwAbortCode_p; diff --git a/drivers/staging/epl/EplSdoUdpu.c b/drivers/staging/epl/EplSdoUdpu.c index 656ea2429204..b409c9b7be48 100644 --- a/drivers/staging/epl/EplSdoUdpu.c +++ b/drivers/staging/epl/EplSdoUdpu.c @@ -431,7 +431,7 @@ tEplKernel EplSdoUdpuInitCon(tEplSdoConHdl *pSdoConHandle_p, // //--------------------------------------------------------------------------- tEplKernel EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, - tEplFrame *pSrcData_p, DWORD dwDataSize_p) + tEplFrame *pSrcData_p, u32 dwDataSize_p) { tEplKernel Ret; int iError; @@ -536,7 +536,7 @@ tEplKernel EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p) // Parameters: lpParameter = pointer to parameter type tEplSdoUdpThreadPara // // -// Returns: DWORD = errorcode +// Returns: u32 = errorcode // // // State: diff --git a/drivers/staging/epl/EplTarget.h b/drivers/staging/epl/EplTarget.h index 61a56951da96..beacd89c3d68 100644 --- a/drivers/staging/epl/EplTarget.h +++ b/drivers/staging/epl/EplTarget.h @@ -128,7 +128,7 @@ // currently no Timer functions are needed by EPL stack // so they are not implemented yet //void TgtTimerInit(void); -//DWORD TgtGetTickCount(void); +//u32 TgtGetTickCount(void); //void TgtGetNetTime(tEplNetTime * pNetTime_p); // functions for ethernet driver diff --git a/drivers/staging/epl/TimerHighReskX86.c b/drivers/staging/epl/TimerHighReskX86.c index 2d657d711d8e..8a97fb413965 100644 --- a/drivers/staging/epl/TimerHighReskX86.c +++ b/drivers/staging/epl/TimerHighReskX86.c @@ -104,7 +104,7 @@ // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); -void TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgPostTraceValue(u32 dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else diff --git a/drivers/staging/epl/amix86.c b/drivers/staging/epl/amix86.c index b8e891d1cd0b..60fb6efbaf2b 100644 --- a/drivers/staging/epl/amix86.c +++ b/drivers/staging/epl/amix86.c @@ -84,7 +84,7 @@ typedef struct { } twStruct; typedef struct { - DWORD m_dwDword; + u32 m_dwDword; } tdwStruct; @@ -140,9 +140,9 @@ void AmiSetWordToBe(void * pAddr_p, WORD wWordVal_p) } -//------------< write DWORD in big endian >------------------------- +//------------< write u32 in big endian >------------------------- -void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDwordToBe(void *pAddr_p, u32 dwDwordVal_p) { tdwStruct *pdwStruct; tdwStruct dwValue; @@ -194,9 +194,9 @@ void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p) } -//------------< write DWORD in little endian >------------------------- +//------------< write u32 in little endian >------------------------- -void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDwordToLe(void *pAddr_p, u32 dwDwordVal_p) { tdwStruct *pdwStruct; @@ -246,9 +246,9 @@ WORD AmiGetWordFromBe(void *pAddr_p) } -//------------< read DWORD in big endian >-------------------------- +//------------< read u32 in big endian >-------------------------- -DWORD AmiGetDwordFromBe(void *pAddr_p) +u32 AmiGetDwordFromBe(void *pAddr_p) { tdwStruct *pdwStruct; tdwStruct dwValue; @@ -299,9 +299,9 @@ WORD AmiGetWordFromLe(void *pAddr_p) return (pwStruct->m_wWord); } -//------------< read DWORD in little endian >-------------------------- +//------------< read u32 in little endian >-------------------------- -DWORD AmiGetDwordFromLe(void *pAddr_p) +u32 AmiGetDwordFromLe(void *pAddr_p) { tdwStruct *pdwStruct; @@ -324,7 +324,7 @@ DWORD AmiGetDwordFromLe(void *pAddr_p) // //--------------------------------------------------------------------------- -void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDword24ToBe(void *pAddr_p, u32 dwDwordVal_p) { ((u8 *) pAddr_p)[0] = ((u8 *) & dwDwordVal_p)[2]; ((u8 *) pAddr_p)[1] = ((u8 *) & dwDwordVal_p)[1]; @@ -346,7 +346,7 @@ void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p) // //--------------------------------------------------------------------------- -void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p) +void AmiSetDword24ToLe(void *pAddr_p, u32 dwDwordVal_p) { ((u8 *) pAddr_p)[0] = ((u8 *) & dwDwordVal_p)[0]; ((u8 *) pAddr_p)[1] = ((u8 *) & dwDwordVal_p)[1]; @@ -361,12 +361,12 @@ void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p) // // Parameters: pAddr_p = pointer to source buffer // -// Return: DWORD = read value +// Return: u32 = read value // // State: not tested // //--------------------------------------------------------------------------- -DWORD AmiGetDword24FromBe(void *pAddr_p) +u32 AmiGetDword24FromBe(void *pAddr_p) { tdwStruct dwStruct; @@ -384,12 +384,12 @@ DWORD AmiGetDword24FromBe(void *pAddr_p) // // Parameters: pAddr_p = pointer to source buffer // -// Return: DWORD = read value +// Return: u32 = read value // // State: not tested // //--------------------------------------------------------------------------- -DWORD AmiGetDword24FromLe(void *pAddr_p) +u32 AmiGetDword24FromLe(void *pAddr_p) { tdwStruct dwStruct; @@ -546,7 +546,7 @@ void AmiSetQword40ToBe(void *pAddr_p, u64 qwQwordVal_p) void AmiSetQword40ToLe(void *pAddr_p, u64 qwQwordVal_p) { - ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; + ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0]; ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[4]; } @@ -648,7 +648,7 @@ void AmiSetQword48ToBe(void *pAddr_p, u64 qwQwordVal_p) void AmiSetQword48ToLe(void *pAddr_p, u64 qwQwordVal_p) { - ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; + ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0]; ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; } @@ -751,7 +751,7 @@ void AmiSetQword56ToBe(void *pAddr_p, u64 qwQwordVal_p) void AmiSetQword56ToLe(void *pAddr_p, u64 qwQwordVal_p) { - ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; + ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0]; ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; ((u8 *) pAddr_p)[6] = ((u8 *) & qwQwordVal_p)[6]; diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c index 594485e28117..9a10f1cf167e 100644 --- a/drivers/staging/epl/demo_main.c +++ b/drivers/staging/epl/demo_main.c @@ -156,12 +156,12 @@ u8 bVarOut1Old_l; u8 bModeSelect_l; // state of the pushbuttons to select the mode u8 bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed u8 bSpeedSelectOld_l; // old state of the pushbuttons -DWORD dwLeds_l; // current state of all LEDs +u32 dwLeds_l; // current state of all LEDs u8 bLedsRow1_l; // current state of the LEDs in row 1 u8 bLedsRow2_l; // current state of the LEDs in row 2 u8 abSelect_l[3]; // pushbuttons from CNs -DWORD dwMode_l; // current mode +u32 dwMode_l; // current mode int iCurCycleCount_l; // current cycle count int iMaxCycleCount_l; // maximum cycle count (i.e. number of cycles until next light movement step) int iToggle; // indicates the light movement direction @@ -171,7 +171,7 @@ u8 abDomain_l[3000]; static wait_queue_head_t WaitQueueShutdown_g; // wait queue for tEplNmtEventSwitchOff static atomic_t AtomicShutdown_g = ATOMIC_INIT(FALSE); -static DWORD dw_le_CycleLen_g; +static u32 dw_le_CycleLen_g; static uint uiNodeId_g = EPL_C_ADR_INVALID; module_param_named(nodeid, uiNodeId_g, uint, 0); @@ -401,7 +401,7 @@ static int __init EplLinInit(void) // configure IP address of virtual network interface // for TCP/IP communication over the POWERLINK network - sprintf(sBuffer, "%lu.%lu.%lu.%lu", + sprintf(sBuffer, "%u.%u.%u.%u", (EplApiInitParam.m_dwIpAddress >> 24), ((EplApiInitParam.m_dwIpAddress >> 16) & 0xFF), ((EplApiInitParam.m_dwIpAddress >> 8) & 0xFF), @@ -515,7 +515,7 @@ tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) case kEplNmtGsResetCommunication: { - DWORD dwBuffer; + u32 dwBuffer; // configure OD for MN in state ResetComm after reseting the OD // TODO: setup your own network configuration here @@ -677,8 +677,8 @@ tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) case kEplEventSourceDllk: { // error occured within the data link layer (e.g. interrupt processing) - // the DWORD argument contains the DLL state and the NMT event - printk(" val=%lX\n", + // the u32 argument contains the DLL state and the NMT event + printk(" val=%X\n", pEventArg_p->m_InternalError. m_Arg.m_dwArg); break; diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index c83163e73882..b54842ba7ed7 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -29,9 +29,6 @@ #ifndef WORD #define WORD unsigned short int #endif -#ifndef DWORD -#define DWORD unsigned long int -#endif #ifndef BOOL #define BOOL unsigned char #endif diff --git a/drivers/staging/epl/kernel/EplDllk.h b/drivers/staging/epl/kernel/EplDllk.h index 9967bdda5f5d..31ab0585f8ed 100644 --- a/drivers/staging/epl/kernel/EplDllk.h +++ b/drivers/staging/epl/kernel/EplDllk.h @@ -96,7 +96,7 @@ struct _tEplDllkNodeInfo { struct _tEplDllkNodeInfo *m_pNextNodeInfo; struct _tEdrvTxBuffer *m_pPreqTxBuffer; unsigned int m_uiNodeId; - DWORD m_dwPresTimeout; + u32 m_dwPresTimeout; unsigned long m_ulDllErrorEvents; tEplNmtState m_NmtState; WORD m_wPresPayloadLimit; diff --git a/drivers/staging/epl/proc_fs.c b/drivers/staging/epl/proc_fs.c index 62aaa7c3a356..a3235a129220 100644 --- a/drivers/staging/epl/proc_fs.c +++ b/drivers/staging/epl/proc_fs.c @@ -129,8 +129,8 @@ #ifdef _DBG_TRACE_POINTS_ atomic_t aatmDbgTracePoint_l[DBG_TRACE_POINTS]; -DWORD adwDbgTraceValue_l[DBG_TRACE_VALUES]; -DWORD dwDbgTraceValueOld_l; +u32 adwDbgTraceValue_l[DBG_TRACE_VALUES]; +u32 dwDbgTraceValueOld_l; unsigned int uiDbgTraceValuePos_l; spinlock_t spinlockDbgTraceValue_l; unsigned long ulDbTraceValueFlags_l; @@ -146,9 +146,9 @@ static int EplLinProcWrite(struct file *file, const char __user * buffer, unsigned long count, void *data); void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); -void TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgPostTraceValue(u32 dwTraceValue_p); -EPLDLLEXPORT DWORD EplIdentuGetRunningRequests(void); +EPLDLLEXPORT u32 EplIdentuGetRunningRequests(void); //=========================================================================// // // @@ -207,7 +207,7 @@ void TgtDbgSignalTracePoint(u8 bTracePointNumber_p) } -void TgtDbgPostTraceValue(DWORD dwTraceValue_p) +void TgtDbgPostTraceValue(u32 dwTraceValue_p) { spin_lock_irqsave(&spinlockDbgTraceValue_l, ulDbTraceValueFlags_l); @@ -279,7 +279,7 @@ static int EplLinProcRead(char *pcBuffer_p, #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) // fetch running IdentRequests nSize += snprintf(pcBuffer_p + nSize, nBufferSize_p - nSize, - "running IdentRequests: 0x%08lX\n", + "running IdentRequests: 0x%08X\n", EplIdentuGetRunningRequests()); // fetch state of NmtMnu module diff --git a/drivers/staging/epl/user/EplCfgMau.h b/drivers/staging/epl/user/EplCfgMau.h index 2d911d1d7248..9ffe51cac709 100644 --- a/drivers/staging/epl/user/EplCfgMau.h +++ b/drivers/staging/epl/user/EplCfgMau.h @@ -131,13 +131,13 @@ typedef enum { typedef struct { tEplCfgState m_CfgState; // state of the configuration state maschine tEplSdoComConHdl m_SdoComConHdl; // handle for sdo connection - DWORD m_dwLastAbortCode; + u32 m_dwLastAbortCode; unsigned int m_uiLastIndex; // last index of configuration, to compair with actual index u8 *m_pbConcise; // Ptr to concise DCF u8 *m_pbActualIndex; // Ptr to actual index in the DCF segment tfpEplCfgMaCb m_pfnCfgMaCb; // Ptr to CfgMa Callback, is call if configuration finished tEplKernel m_EplKernelError; // errorcode - DWORD m_dwNumValueCopy; // numeric values are copied in this variable + u32 m_dwNumValueCopy; // numeric values are copied in this variable unsigned int m_uiPdoNodeId; // buffer for PDO node id u8 m_bNrOfMappedObject; // number of mapped objects unsigned int m_uiNodeId; // Epl node addresse @@ -145,7 +145,7 @@ typedef struct { unsigned int m_uiLastSubIndex; // last subindex of configuration BOOL m_fOneTranferOk; // atleased one transfer was successful u8 m_bEventFlag; // for Eventsignaling to the State Maschine - DWORD m_dwCntObjectInDcf; // number of Objects in DCF + u32 m_dwCntObjectInDcf; // number of Objects in DCF tEplCfgMaIndexType m_SkipCfg; // TRUE if a adsitional Configurationprocess // have to insert e.g. PDO-mapping WORD m_wTimeOutCnt; // Timeout Counter, break configuration is diff --git a/drivers/staging/epl/user/EplSdoAsndu.h b/drivers/staging/epl/user/EplSdoAsndu.h index 6049e5852ed2..20e6fffd5ecd 100644 --- a/drivers/staging/epl/user/EplSdoAsndu.h +++ b/drivers/staging/epl/user/EplSdoAsndu.h @@ -98,7 +98,7 @@ tEplKernel EplSdoAsnduInitCon(tEplSdoConHdl *pSdoConHandle_p, tEplKernel EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, tEplFrame *pSrcData_p, - DWORD dwDataSize_p); + u32 dwDataSize_p); tEplKernel EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p); diff --git a/drivers/staging/epl/user/EplSdoComu.h b/drivers/staging/epl/user/EplSdoComu.h index 9e45e99a978a..3df48d108392 100644 --- a/drivers/staging/epl/user/EplSdoComu.h +++ b/drivers/staging/epl/user/EplSdoComu.h @@ -108,7 +108,7 @@ tEplKernel EplSdoComGetState(tEplSdoComConHdl SdoComConHdl_p, tEplSdoComFinished *pSdoComFinished_p); tEplKernel EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, - DWORD dwAbortCode_p); + u32 dwAbortCode_p); #endif diff --git a/drivers/staging/epl/user/EplSdoUdpu.h b/drivers/staging/epl/user/EplSdoUdpu.h index 22091d4f317e..c6b91ff5b7eb 100644 --- a/drivers/staging/epl/user/EplSdoUdpu.h +++ b/drivers/staging/epl/user/EplSdoUdpu.h @@ -99,7 +99,7 @@ tEplKernel EplSdoUdpuInitCon(tEplSdoConHdl *pSdoConHandle_p, unsigned int uiTargetNodeId_p); tEplKernel EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, - tEplFrame *pSrcData_p, DWORD dwDataSize_p); + tEplFrame *pSrcData_p, u32 dwDataSize_p); tEplKernel EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p); -- cgit v1.2.3-59-g8ed1b From dcf5371cdea03b09b6cc506d2cd538138bd643a8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 12:57:39 -0700 Subject: Staging: epl: remove WORD It's u16 in kernelspace, not WORD. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Debug.h | 4 ++-- drivers/staging/epl/Edrv8139.c | 20 ++++++++++---------- drivers/staging/epl/EdrvFec.h | 4 ++-- drivers/staging/epl/EdrvSim.h | 2 +- drivers/staging/epl/Epl.h | 4 ++-- drivers/staging/epl/EplAmi.h | 8 ++++---- drivers/staging/epl/EplApiGeneric.c | 24 ++++++++++++------------ drivers/staging/epl/EplDll.h | 4 ++-- drivers/staging/epl/EplDllk.c | 10 +++++----- drivers/staging/epl/EplFrame.h | 22 +++++++++++----------- drivers/staging/epl/EplNmt.h | 2 +- drivers/staging/epl/EplNmtMnu.c | 20 ++++++++++---------- drivers/staging/epl/EplObd.c | 6 +++--- drivers/staging/epl/EplObd.h | 4 ++-- drivers/staging/epl/EplPdo.h | 4 ++-- drivers/staging/epl/EplPdok.c | 28 ++++++++++++++-------------- drivers/staging/epl/EplPdou.c | 2 +- drivers/staging/epl/EplSdoAsySequ.c | 6 +++--- drivers/staging/epl/EplSdoComu.c | 16 ++++++++-------- drivers/staging/epl/amix86.c | 30 +++++++++++++++--------------- drivers/staging/epl/demo_main.c | 2 +- drivers/staging/epl/edrv.h | 4 ++-- drivers/staging/epl/global.h | 3 --- drivers/staging/epl/kernel/EplDllk.h | 2 +- drivers/staging/epl/proc_fs.c | 4 ++-- drivers/staging/epl/user/EplCfgMau.h | 2 +- drivers/staging/epl/user/EplNmtMnu.h | 6 +++--- 27 files changed, 120 insertions(+), 123 deletions(-) (limited to 'drivers/staging/epl/global.h') diff --git a/drivers/staging/epl/Debug.h b/drivers/staging/epl/Debug.h index 94646b28db34..851a22213ad7 100644 --- a/drivers/staging/epl/Debug.h +++ b/drivers/staging/epl/Debug.h @@ -634,13 +634,13 @@ extern "C" { #endif - void DumpData(char *szStr_p, u8 *pbData_p, WORD wSize_p); + void DumpData(char *szStr_p, u8 *pbData_p, u16 wSize_p); #ifdef __cplusplus } // von extern "C" #endif #define DEBUG_DUMP_DATA(lvl,str,ptr,siz) if ((DEBUG_GLB_LVL() & (lvl))==(lvl)) \ - DumpData (str, (u8 *)(ptr), (WORD)(siz)); + DumpData (str, (u8 *)(ptr), (u16)(siz)); #else #define DEBUG_DUMP_DATA(lvl,str,ptr,siz) diff --git a/drivers/staging/epl/Edrv8139.c b/drivers/staging/epl/Edrv8139.c index c8fcc4e815b6..c0709a5836f7 100644 --- a/drivers/staging/epl/Edrv8139.c +++ b/drivers/staging/epl/Edrv8139.c @@ -464,9 +464,9 @@ tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p) dwData = ether_crc(6, pbMacAddr_p); printk("EdrvDefineRxMacAddrEntry('%02X:%02X:%02X:%02X:%02X:%02X') hash = %u / %u ether_crc = 0x%08lX\n", - (WORD) pbMacAddr_p[0], (WORD) pbMacAddr_p[1], (WORD) pbMacAddr_p[2], - (WORD) pbMacAddr_p[3], (WORD) pbMacAddr_p[4], (WORD) pbMacAddr_p[5], - (WORD) bHash, (WORD) (dwData >> 26), dwData); + (u16) pbMacAddr_p[0], (u16) pbMacAddr_p[1], (u16) pbMacAddr_p[2], + (u16) pbMacAddr_p[3], (u16) pbMacAddr_p[4], (u16) pbMacAddr_p[5], + (u16) bHash, (u16) (dwData >> 26), dwData); */ if (bHash > 31) { dwData = EDRV_REGDW_READ(EDRV_REGDW_MAR4); @@ -624,7 +624,7 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p) printk("%s InvOp TSD%u = 0x%08X", __func__, EdrvInstance_l.m_uiCurTxDesc, dwTemp); printk(" Cmd = 0x%02X\n", - (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); + (u16) EDRV_REGB_READ(EDRV_REGB_COMMAND)); goto Exit; } // save pointer to buffer structure for TxHandler @@ -761,10 +761,10 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, // EdrvInterruptHandler(); tEdrvRxBuffer RxBuffer; tEdrvTxBuffer *pTxBuffer; - WORD wStatus; + u16 wStatus; u32 dwTxStatus; u32 dwRxStatus; - WORD wCurRx; + u16 wCurRx; u8 *pbRxBuf; unsigned int uiLength; int iHandled = IRQ_HANDLED; @@ -898,7 +898,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, // calulate new offset (u32 aligned) wCurRx = - (WORD) ((wCurRx + uiLength + sizeof(dwRxStatus) + + (u16) ((wCurRx + uiLength + sizeof(dwRxStatus) + 3) & ~0x3); EDRV_TRACE_CAPR(wCurRx - 0x10); EDRV_REGW_WRITE(EDRV_REGW_CAPR, wCurRx - 0x10); @@ -1087,7 +1087,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId) dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TSAD3); printk(" Command = 0x%02X\n", - (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); + (u16) EDRV_REGB_READ(EDRV_REGB_COMMAND)); // set pointer for receive buffer in controller printk("%s set pointer to Rx buffer\n", __func__); @@ -1098,7 +1098,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId) EDRV_REGB_WRITE(EDRV_REGB_COMMAND, (EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE)); printk(" Command = 0x%02X\n", - (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); + (u16) EDRV_REGB_READ(EDRV_REGB_COMMAND)); // clear missed packet counter to enable Rx/Tx process EDRV_REGDW_WRITE(EDRV_REGDW_MPC, 0); @@ -1123,7 +1123,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId) // enable transmitter and receiver printk("%s enable Tx and Rx", __func__); EDRV_REGB_WRITE(EDRV_REGB_COMMAND, (EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE)); - printk(" Command = 0x%02X\n", (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); + printk(" Command = 0x%02X\n", (u16) EDRV_REGB_READ(EDRV_REGB_COMMAND)); */ // disable early interrupts EDRV_REGW_WRITE(EDRV_REGW_MULINT, 0); diff --git a/drivers/staging/epl/EdrvFec.h b/drivers/staging/epl/EdrvFec.h index 42bb8d32643c..56728d1e95e7 100644 --- a/drivers/staging/epl/EdrvFec.h +++ b/drivers/staging/epl/EdrvFec.h @@ -96,8 +96,8 @@ // Rx and Tx buffer descriptor format typedef struct { - WORD m_wStatus; // control / status --- used by edrv, do not change in application - WORD m_wLength; // transfer length + u16 m_wStatus; // control / status --- used by edrv, do not change in application + u16 m_wLength; // transfer length u8 *m_pbData; // buffer address } tBufferDescr; diff --git a/drivers/staging/epl/EdrvSim.h b/drivers/staging/epl/EdrvSim.h index 9cbafb6295af..191ec1457d26 100644 --- a/drivers/staging/epl/EdrvSim.h +++ b/drivers/staging/epl/EdrvSim.h @@ -84,6 +84,6 @@ //--------------------------------------------------------------------------- void EdrvRxInterruptHandler(u8 bBufferInFrame_p, u8 * pbEthernetData_p, - WORD wDataLen_p); + u16 wDataLen_p); #endif // #ifndef _EDRVSIM_H_ diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h index 6fc158915497..7f22b04022b2 100644 --- a/drivers/staging/epl/Epl.h +++ b/drivers/staging/epl/Epl.h @@ -89,7 +89,7 @@ typedef struct { unsigned int m_uiNodeId; tEplNmtState m_NmtState; tEplNmtNodeEvent m_NodeEvent; - WORD m_wErrorCode; // EPL error code if m_NodeEvent == kEplNmtNodeEventError + u16 m_wErrorCode; // EPL error code if m_NodeEvent == kEplNmtNodeEventError BOOL m_fMandatory; } tEplApiEventNode; @@ -97,7 +97,7 @@ typedef struct { typedef struct { tEplNmtState m_NmtState; // local NMT state tEplNmtBootEvent m_BootEvent; - WORD m_wErrorCode; // EPL error code if m_BootEvent == kEplNmtBootEventError + u16 m_wErrorCode; // EPL error code if m_BootEvent == kEplNmtBootEventError } tEplApiEventBoot; diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h index 4a323ad4f291..3b46ea11442b 100644 --- a/drivers/staging/epl/EplAmi.h +++ b/drivers/staging/epl/EplAmi.h @@ -110,9 +110,9 @@ extern "C" { #define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);} #define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);} -void AmiSetWordToBe(void *pAddr_p, WORD wWordVal_p); +void AmiSetWordToBe(void *pAddr_p, u16 wWordVal_p); void AmiSetDwordToBe(void *pAddr_p, u32 dwDwordVal_p); -void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p); +void AmiSetWordToLe(void *pAddr_p, u16 wWordVal_p); void AmiSetDwordToLe(void *pAddr_p, u32 dwDwordVal_p); //--------------------------------------------------------------------------- @@ -126,9 +126,9 @@ void AmiSetDwordToLe(void *pAddr_p, u32 dwDwordVal_p); #define AmiGetByteFromBe(pAddr_p) (*(u8 *)(pAddr_p)) #define AmiGetByteFromLe(pAddr_p) (*(u8 *)(pAddr_p)) -WORD AmiGetWordFromBe(void *pAddr_p); +u16 AmiGetWordFromBe(void *pAddr_p); u32 AmiGetDwordFromBe(void *pAddr_p); -WORD AmiGetWordFromLe(void *pAddr_p); +u16 AmiGetWordFromLe(void *pAddr_p); u32 AmiGetDwordFromLe(void *pAddr_p); //--------------------------------------------------------------------------- diff --git a/drivers/staging/epl/EplApiGeneric.c b/drivers/staging/epl/EplApiGeneric.c index 431b19de0ed4..c4419569183f 100644 --- a/drivers/staging/epl/EplApiGeneric.c +++ b/drivers/staging/epl/EplApiGeneric.c @@ -183,11 +183,11 @@ static tEplKernel EplApiCbSdoCon(tEplSdoComFinished *pSdoComFinished_p); static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p, tEplNmtNodeEvent NodeEvent_p, tEplNmtState NmtState_p, - WORD wErrorCode_p, BOOL fMandatory_p); + u16 wErrorCode_p, BOOL fMandatory_p); static tEplKernel EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, tEplNmtState NmtState_p, - WORD wErrorCode_p); + u16 wErrorCode_p); #endif #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) @@ -1412,7 +1412,7 @@ static tEplKernel EplApiUpdateDllConfig(BOOL fUpdateIdentity_p) tEplDllConfigParam DllConfigParam; tEplDllIdentParam DllIdentParam; tEplObdSize ObdSize; - WORD wTemp; + u16 wTemp; u8 bTemp; // configure Dll @@ -1632,7 +1632,7 @@ static tEplKernel EplApiUpdateDllConfig(BOOL fUpdateIdentity_p) static tEplKernel EplApiUpdateObd(void) { tEplKernel Ret = kEplSuccessful; - WORD wTemp; + u16 wTemp; u8 bTemp; // set node id in OD @@ -1675,14 +1675,14 @@ static tEplKernel EplApiUpdateObd(void) } */ } - wTemp = (WORD) EplApiInstance_g.m_InitParam.m_uiIsochrTxMaxPayload; + wTemp = (u16) EplApiInstance_g.m_InitParam.m_uiIsochrTxMaxPayload; Ret = EplObdWriteEntry(0x1F98, 1, &wTemp, 2); /* if(Ret != kEplSuccessful) { goto Exit; }*/ - wTemp = (WORD) EplApiInstance_g.m_InitParam.m_uiIsochrRxMaxPayload; + wTemp = (u16) EplApiInstance_g.m_InitParam.m_uiIsochrRxMaxPayload; Ret = EplObdWriteEntry(0x1F98, 2, &wTemp, 2); /* if(Ret != kEplSuccessful) { @@ -1701,7 +1701,7 @@ static tEplKernel EplApiUpdateObd(void) if (EplApiInstance_g.m_InitParam.m_uiPreqActPayloadLimit <= EPL_C_DLL_ISOCHR_MAX_PAYL) { wTemp = - (WORD) EplApiInstance_g.m_InitParam.m_uiPreqActPayloadLimit; + (u16) EplApiInstance_g.m_InitParam.m_uiPreqActPayloadLimit; Ret = EplObdWriteEntry(0x1F98, 4, &wTemp, 2); /* if(Ret != kEplSuccessful) { @@ -1712,7 +1712,7 @@ static tEplKernel EplApiUpdateObd(void) if (EplApiInstance_g.m_InitParam.m_uiPresActPayloadLimit <= EPL_C_DLL_ISOCHR_MAX_PAYL) { wTemp = - (WORD) EplApiInstance_g.m_InitParam.m_uiPresActPayloadLimit; + (u16) EplApiInstance_g.m_InitParam.m_uiPresActPayloadLimit; Ret = EplObdWriteEntry(0x1F98, 5, &wTemp, 2); /* if(Ret != kEplSuccessful) { @@ -1740,7 +1740,7 @@ static tEplKernel EplApiUpdateObd(void) if (EplApiInstance_g.m_InitParam.m_uiAsyncMtu <= EPL_C_DLL_MAX_ASYNC_MTU) { - wTemp = (WORD) EplApiInstance_g.m_InitParam.m_uiAsyncMtu; + wTemp = (u16) EplApiInstance_g.m_InitParam.m_uiAsyncMtu; Ret = EplObdWriteEntry(0x1F98, 8, &wTemp, 2); /* if(Ret != kEplSuccessful) { @@ -1749,7 +1749,7 @@ static tEplKernel EplApiUpdateObd(void) } if (EplApiInstance_g.m_InitParam.m_uiPrescaler <= 1000) { - wTemp = (WORD) EplApiInstance_g.m_InitParam.m_uiPrescaler; + wTemp = (u16) EplApiInstance_g.m_InitParam.m_uiPrescaler; Ret = EplObdWriteEntry(0x1F98, 9, &wTemp, 2); // ignore return code Ret = kEplSuccessful; @@ -1944,7 +1944,7 @@ static tEplKernel EplApiCbSdoCon(tEplSdoComFinished *pSdoComFinished_p) static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p, tEplNmtNodeEvent NodeEvent_p, tEplNmtState NmtState_p, - WORD wErrorCode_p, BOOL fMandatory_p) + u16 wErrorCode_p, BOOL fMandatory_p) { tEplKernel Ret; tEplApiEventArg EventArg; @@ -1987,7 +1987,7 @@ static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p, static tEplKernel EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, tEplNmtState NmtState_p, - WORD wErrorCode_p) + u16 wErrorCode_p) { tEplKernel Ret; tEplApiEventArg EventArg; diff --git a/drivers/staging/epl/EplDll.h b/drivers/staging/epl/EplDll.h index 79be2c23f8b6..b960199bd0e1 100644 --- a/drivers/staging/epl/EplDll.h +++ b/drivers/staging/epl/EplDll.h @@ -192,8 +192,8 @@ typedef struct { typedef struct { unsigned int m_uiNodeId; - WORD m_wPreqPayloadLimit; // object 0x1F8B: NMT_MNPReqPayloadLimitList_AU16 - WORD m_wPresPayloadLimit; // object 0x1F8D: NMT_PResPayloadLimitList_AU16 + u16 m_wPreqPayloadLimit; // object 0x1F8B: NMT_MNPReqPayloadLimitList_AU16 + u16 m_wPresPayloadLimit; // object 0x1F8D: NMT_PResPayloadLimitList_AU16 u32 m_dwPresTimeout; // object 0x1F92: NMT_MNCNPResTimeout_AU32 } tEplDllNodeInfo; diff --git a/drivers/staging/epl/EplDllk.c b/drivers/staging/epl/EplDllk.c index 53f05d9b37ac..25d2c34325db 100644 --- a/drivers/staging/epl/EplDllk.c +++ b/drivers/staging/epl/EplDllk.c @@ -720,18 +720,18 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p) // MTU AmiSetWordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload. m_IdentResponse.m_le_wMtu, - (WORD) EplDllkInstance_g. + (u16) EplDllkInstance_g. m_DllConfigParam.m_uiAsyncMtu); // PollInSize AmiSetWordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload. m_IdentResponse.m_le_wPollInSize, - (WORD) EplDllkInstance_g. + (u16) EplDllkInstance_g. m_DllConfigParam. m_uiPreqActPayloadLimit); // PollOutSize AmiSetWordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload. m_IdentResponse.m_le_wPollOutSize, - (WORD) EplDllkInstance_g. + (u16) EplDllkInstance_g. m_DllConfigParam. m_uiPresActPayloadLimit); // ResponseTime / PresMaxLatency @@ -935,7 +935,7 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p) // EplDllkInstance_g.m_aNodeInfo[uiIndex].m_uiNodeId = uiIndex + 1; EplDllkInstance_g.m_aNodeInfo[uiIndex]. m_wPresPayloadLimit = - (WORD) EplDllkInstance_g. + (u16) EplDllkInstance_g. m_DllConfigParam. m_uiIsochrRxMaxPayload; } @@ -3484,7 +3484,7 @@ static tEplKernel EplDllkCheckFrame(tEplFrame * pFrame_p, unsigned int uiFrameSize_p) { tEplMsgType MsgType; - WORD wEtherType; + u16 wEtherType; // check frame if (pFrame_p != NULL) { diff --git a/drivers/staging/epl/EplFrame.h b/drivers/staging/epl/EplFrame.h index 9ca424274745..ba1ae9e9e907 100644 --- a/drivers/staging/epl/EplFrame.h +++ b/drivers/staging/epl/EplFrame.h @@ -146,7 +146,7 @@ typedef struct { // Offset 21 u8 m_le_bRes2; // reserved // Offset 22 - WORD m_le_wSize; + u16 m_le_wSize; // Offset 24 u8 m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16 */ ]; @@ -164,7 +164,7 @@ typedef struct { // Offset 21 u8 m_le_bRes2; // reserved // Offset 22 - WORD m_le_wSize; + u16 m_le_wSize; // Offset 24 u8 m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16 / D_NMT_IsochrTxMaxPayload_U16 */ ]; @@ -188,8 +188,8 @@ typedef struct { } PACK_STRUCT tEplSoaFrame; typedef struct { - WORD m_wEntryType; - WORD m_wErrorCode; + u16 m_wEntryType; + u16 m_wErrorCode; tEplNetTime m_TimeStamp; u8 m_abAddInfo[8]; @@ -215,11 +215,11 @@ typedef struct { u8 m_le_bEplProfileVersion; u8 m_le_bRes1; u32 m_le_dwFeatureFlags; // NMT_FeatureFlags_U32 - WORD m_le_wMtu; // NMT_CycleTiming_REC.AsyncMTU_U16: C_IP_MIN_MTU - C_IP_MAX_MTU - WORD m_le_wPollInSize; // NMT_CycleTiming_REC.PReqActPayload_U16 - WORD m_le_wPollOutSize; // NMT_CycleTiming_REC.PResActPayload_U16 + u16 m_le_wMtu; // NMT_CycleTiming_REC.AsyncMTU_U16: C_IP_MIN_MTU - C_IP_MAX_MTU + u16 m_le_wPollInSize; // NMT_CycleTiming_REC.PReqActPayload_U16 + u16 m_le_wPollOutSize; // NMT_CycleTiming_REC.PResActPayload_U16 u32 m_le_dwResponseTime; // NMT_CycleTiming_REC.PResMaxLatency_U32 - WORD m_le_wRes2; + u16 m_le_wRes2; u32 m_le_dwDeviceType; // NMT_DeviceType_U32 u32 m_le_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 u32 m_le_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 @@ -251,8 +251,8 @@ typedef struct { u8 m_le_bTransactionId; u8 m_le_bFlags; u8 m_le_bCommandId; - WORD m_le_wSegmentSize; - WORD m_le_wReserved; + u16 m_le_wSegmentSize; + u16 m_le_wReserved; u8 m_le_abCommandData[8]; // just reserve a minimum number of bytes as a placeholder } PACK_STRUCT tEplAsySdoCom; @@ -310,7 +310,7 @@ typedef struct { // Offset 6 u8 m_be_abSrcMac[6]; // MAC address of the transmitting node // Offset 12 - WORD m_be_wEtherType; // Ethernet message type (big endian) + u16 m_be_wEtherType; // Ethernet message type (big endian) // Offset 14 u8 m_le_bMessageType; // EPL message type // Offset 15 diff --git a/drivers/staging/epl/EplNmt.h b/drivers/staging/epl/EplNmt.h index 4c11e5bc74aa..e351b55eea6f 100644 --- a/drivers/staging/epl/EplNmt.h +++ b/drivers/staging/epl/EplNmt.h @@ -185,7 +185,7 @@ typedef struct { typedef struct { unsigned int m_uiNodeId; // NodeId tEplNmtState m_NmtState; // NMT state (remember distinguish between MN / CN) - WORD m_wErrorCode; // EPL error code in case of NMT state NotActive + u16 m_wErrorCode; // EPL error code in case of NMT state NotActive } tEplHeartbeatEvent; diff --git a/drivers/staging/epl/EplNmtMnu.c b/drivers/staging/epl/EplNmtMnu.c index fd4f6d9e73dc..30a9f1ec73ed 100644 --- a/drivers/staging/epl/EplNmtMnu.c +++ b/drivers/staging/epl/EplNmtMnu.c @@ -212,7 +212,7 @@ typedef struct { tEplTimerHdl m_TimerHdlLonger; // 2nd timer for NMT command EnableReadyToOp and CheckCommunication tEplNmtMnuNodeState m_NodeState; // internal node state (kind of sub state of NMT state) u32 m_dwNodeCfg; // subindex from 0x1F81 - WORD m_wFlags; // flags: CN is being accessed isochronously + u16 m_wFlags; // flags: CN is being accessed isochronously } tEplNmtMnuNodeInfo; @@ -224,7 +224,7 @@ typedef struct { unsigned long m_ulStatusRequestDelay; // in [ms] (object 0x1006 * EPL_C_NMT_STATREQ_CYCLE) unsigned long m_ulTimeoutReadyToOp; // in [ms] (object 0x1F89/5) unsigned long m_ulTimeoutCheckCom; // in [ms] (object 0x1006 * MultiplexedCycleCount) - WORD m_wFlags; // global flags + u16 m_wFlags; // global flags u32 m_dwNmtStartup; // object 0x1F80 NMT_StartUp_U32 tEplNmtMnuCbNodeEvent m_pfnCbNodeEvent; tEplNmtMnuCbBootEvent m_pfnCbBootEvent; @@ -252,7 +252,7 @@ static tEplKernel EplNmtMnuCbStatusResponse(unsigned int uiNodeId_p, static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p, tEplNmtMnuNodeInfo * pNodeInfo_p, tEplNmtState NodeNmtState_p, - WORD wErrorCode_p, + u16 wErrorCode_p, tEplNmtState LocalNmtState_p); static tEplKernel EplNmtMnuStartBootStep1(void); @@ -271,7 +271,7 @@ static tEplKernel EplNmtMnuStartNodes(void); static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p, tEplNmtState NodeNmtState_p, - WORD wErrorCode_p, + u16 wErrorCode_p, tEplNmtMnuIntNodeEvent NodeEvent_p); @@ -573,7 +573,7 @@ tEplKernel EplNmtMnuTriggerStateChange(unsigned int uiNodeId_p, tEplNmtMnuIntNodeEvent NodeEvent; tEplObdSize ObdSize; u8 bNmtState; - WORD wErrorCode = EPL_E_NO_ERROR; + u16 wErrorCode = EPL_E_NO_ERROR; if ((uiNodeId_p == 0) || (uiNodeId_p >= EPL_C_ADR_BROADCAST)) { Ret = kEplInvalidNodeId; @@ -1257,7 +1257,7 @@ EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent *pEvent_p) tEplKernel EplNmtMnuGetDiagnosticInfo(unsigned int *puiMandatorySlaveCount_p, unsigned int *puiSignalSlaveCount_p, - WORD *pwFlags_p) + u16 *pwFlags_p) { tEplKernel Ret = kEplSuccessful; @@ -1377,7 +1377,7 @@ static tEplKernel EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p, } else { // node answered IdentRequest tEplObdSize ObdSize; u32 dwDevType; - WORD wErrorCode = EPL_E_NO_ERROR; + u16 wErrorCode = EPL_E_NO_ERROR; tEplNmtState NmtState = (tEplNmtState) (AmiGetByteFromLe (&pIdentResponse_p-> @@ -1909,7 +1909,7 @@ static tEplKernel EplNmtMnuStartNodes(void) static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p, tEplNmtState NodeNmtState_p, - WORD wErrorCode_p, + u16 wErrorCode_p, tEplNmtMnuIntNodeEvent NodeEvent_p) { @@ -2623,7 +2623,7 @@ static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p, static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p, tEplNmtMnuNodeInfo * pNodeInfo_p, tEplNmtState NodeNmtState_p, - WORD wErrorCode_p, + u16 wErrorCode_p, tEplNmtState LocalNmtState_p) { tEplKernel Ret = kEplSuccessful; @@ -2699,7 +2699,7 @@ static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p, } else if ((ExpNmtState != NodeNmtState_p) && !((ExpNmtState == kEplNmtCsPreOperational1) && (NodeNmtState_p == kEplNmtCsPreOperational2))) { // CN is not in expected NMT state (without the exceptions above) - WORD wbeErrorCode; + u16 wbeErrorCode; if ((pNodeInfo_p-> m_wFlags & EPL_NMTMNU_NODE_FLAG_NOT_SCANNED) != 0) { diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c index ab0966ea6559..e90c4949d6af 100644 --- a/drivers/staging/epl/EplObd.c +++ b/drivers/staging/epl/EplObd.c @@ -1080,7 +1080,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned case kEplObdTypInt16: case kEplObdTypUInt16: { - AmiSetWordToLe(pDstData_p, *((WORD *) pSrcData)); + AmiSetWordToLe(pDstData_p, *((u16 *) pSrcData)); break; } @@ -1230,7 +1230,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign case kEplObdTypInt16: case kEplObdTypUInt16: { - *((WORD *) pBuffer) = AmiGetWordFromLe(pSrcData_p); + *((u16 *) pBuffer) = AmiGetWordFromLe(pSrcData_p); break; } @@ -2094,7 +2094,7 @@ static tEplKernel EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPt // Function: EplObdGetObjectSize() // // Description: function to get size of object -// The function determines if an object type an fixed data type (u8, WORD, ...) +// The function determines if an object type an fixed data type (u8, u16, ...) // or non fixed object (string, domain). This information is used to decide // if download data are stored temporary or not. For objects with fixed data length // and types a value range checking can process. diff --git a/drivers/staging/epl/EplObd.h b/drivers/staging/epl/EplObd.h index ed7f091c0a06..6bb5a2780686 100644 --- a/drivers/staging/epl/EplObd.h +++ b/drivers/staging/epl/EplObd.h @@ -206,7 +206,7 @@ typedef unsigned int tEplObdSize; // For all objects as objects size are used an // ------------------------------------------------------------------------- // types of objects in object dictionary -// DS-301 defines these types as WORD +// DS-301 defines these types as u16 typedef enum { // types which are always supported kEplObdTypBool = 0x0001, @@ -431,7 +431,7 @@ typedef struct { unsigned int m_uiUpperObjIndex; // upper limit of ObjIndex tInitTabEntryCallback m_fpInitTabEntry; // will be called if ObjIndex was found void *m_pTabBase; // base address of table - unsigned int m_uiEntrySize; // size of table entry // 25-feb-2005 r.d.: expansion from u8 to WORD necessary for PDO bit mapping + unsigned int m_uiEntrySize; // size of table entry // 25-feb-2005 r.d.: expansion from u8 to u16 necessary for PDO bit mapping unsigned int m_uiMaxEntries; // max. tabel entries } tEplObdModulTabParam; diff --git a/drivers/staging/epl/EplPdo.h b/drivers/staging/epl/EplPdo.h index 83cc1f7046dc..0b3ad5bc7d5e 100644 --- a/drivers/staging/epl/EplPdo.h +++ b/drivers/staging/epl/EplPdo.h @@ -90,8 +90,8 @@ typedef struct { void *m_pVar; - WORD m_wOffset; // in Bits - WORD m_wSize; // in Bits + u16 m_wOffset; // in Bits + u16 m_wSize; // in Bits BOOL m_fNumeric; // numeric value -> use AMI functions } tEplPdoMapping; diff --git a/drivers/staging/epl/EplPdok.c b/drivers/staging/epl/EplPdok.c index 848fdb1e3875..db9b3f083841 100644 --- a/drivers/staging/epl/EplPdok.c +++ b/drivers/staging/epl/EplPdok.c @@ -314,16 +314,16 @@ tEplKernel EplPdokCbSoa(tEplFrameInfo * pFrameInfo_p) tEplKernel EplPdokProcess(tEplEvent * pEvent_p) { tEplKernel Ret = kEplSuccessful; - WORD wPdoSize; - WORD wBitOffset; - WORD wBitSize; - WORD wVarSize; + u16 wPdoSize; + u16 wBitOffset; + u16 wBitSize; + u16 wVarSize; u64 qwObjectMapping; u8 bMappSubindex; u8 bObdSubindex; - WORD wObdMappIndex; - WORD wObdCommIndex; - WORD wPdoId; + u16 wObdMappIndex; + u16 wObdCommIndex; + u16 wPdoId; u8 bObdData; u8 bObjectCount; u8 bFrameData; @@ -438,16 +438,16 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p) } // decode object mapping wObdCommIndex = - (WORD) (qwObjectMapping & + (u16) (qwObjectMapping & 0x000000000000FFFFLL); bObdSubindex = (u8) ((qwObjectMapping & 0x0000000000FF0000LL) >> 16); wBitOffset = - (WORD) ((qwObjectMapping & + (u16) ((qwObjectMapping & 0x0000FFFF00000000LL) >> 32); wBitSize = - (WORD) ((qwObjectMapping & + (u16) ((qwObjectMapping & 0xFFFF000000000000LL) >> 48); // check if object exceeds PDO size @@ -568,21 +568,21 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p) } // decode object mapping wObdCommIndex = - (WORD) (qwObjectMapping & + (u16) (qwObjectMapping & 0x000000000000FFFFLL); bObdSubindex = (u8) ((qwObjectMapping & 0x0000000000FF0000LL) >> 16); wBitOffset = - (WORD) ((qwObjectMapping & + (u16) ((qwObjectMapping & 0x0000FFFF00000000LL) >> 32); wBitSize = - (WORD) ((qwObjectMapping & + (u16) ((qwObjectMapping & 0xFFFF000000000000LL) >> 48); // calculate max PDO size ObdSize = wBitSize >> 3; - wVarSize = (wBitOffset >> 3) + (WORD) ObdSize; + wVarSize = (wBitOffset >> 3) + (u16) ObdSize; if ((unsigned int)(wVarSize + 24) > pFrameInfo->m_uiFrameSize) { // TPDO is too short // $$$ raise PDO error, set Ret goto Exit; diff --git a/drivers/staging/epl/EplPdou.c b/drivers/staging/epl/EplPdou.c index 857ab513db1f..d6d06242d746 100644 --- a/drivers/staging/epl/EplPdou.c +++ b/drivers/staging/epl/EplPdou.c @@ -237,7 +237,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p) tEplObdAccess AccessType; u8 bMappSubindex; unsigned int uiCurPdoSize; - WORD wMaxPdoSize; + u16 wMaxPdoSize; unsigned int uiSubIndex; // fetch PDO ID diff --git a/drivers/staging/epl/EplSdoAsySequ.c b/drivers/staging/epl/EplSdoAsySequ.c index d7e007ad4d6f..256d70866343 100644 --- a/drivers/staging/epl/EplSdoAsySequ.c +++ b/drivers/staging/epl/EplSdoAsySequ.c @@ -2422,8 +2422,8 @@ static tEplKernel EplSdoAsyReadFromHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p, // check if entries are available for reading if ((pHistory->m_bFreeEntries < EPL_SDO_HISTORY_SIZE) && (pHistory->m_bWrite != pHistory->m_bRead)) { -// PRINTF4("EplSdoAsyReadFromHistory(): init = %d, read = %u, write = %u, ack = %u", (int) fInitRead_p, (WORD)pHistory->m_bRead, (WORD)pHistory->m_bWrite, (WORD)pHistory->m_bAck); -// PRINTF2(", free entries = %u, next frame size = %u\n", (WORD)pHistory->m_bFreeEntries, pHistory->m_auiFrameSize[pHistory->m_bRead]); +// PRINTF4("EplSdoAsyReadFromHistory(): init = %d, read = %u, write = %u, ack = %u", (int) fInitRead_p, (u16)pHistory->m_bRead, (u16)pHistory->m_bWrite, (u16)pHistory->m_bAck); +// PRINTF2(", free entries = %u, next frame size = %u\n", (u16)pHistory->m_bFreeEntries, pHistory->m_auiFrameSize[pHistory->m_bRead]); // return pointer to stored frame *ppFrame_p = @@ -2439,7 +2439,7 @@ static tEplKernel EplSdoAsyReadFromHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p, } } else { -// PRINTF3("EplSdoAsyReadFromHistory(): read = %u, ack = %u, free entries = %u, no frame\n", (WORD)pHistory->m_bRead, (WORD)pHistory->m_bAck, (WORD)pHistory->m_bFreeEntries); +// PRINTF3("EplSdoAsyReadFromHistory(): read = %u, ack = %u, free entries = %u, no frame\n", (u16)pHistory->m_bRead, (u16)pHistory->m_bAck, (u16)pHistory->m_bFreeEntries); // no more frames to send // return null pointer diff --git a/drivers/staging/epl/EplSdoComu.c b/drivers/staging/epl/EplSdoComu.c index 1f71b5c6e5f6..bf35afab152d 100644 --- a/drivers/staging/epl/EplSdoComu.c +++ b/drivers/staging/epl/EplSdoComu.c @@ -814,7 +814,7 @@ tEplKernel EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p, EPL_DBGLVL_SDO_TRACE3 ("EplSdoComReceiveCb SdoSeqConHdl: 0x%X, First Byte of pAsySdoCom_p: 0x%02X, uiDataSize_p: 0x%04X\n", - SdoSeqConHdl_p, (WORD) pAsySdoCom_p->m_le_abCommandData[0], + SdoSeqConHdl_p, (u16) pAsySdoCom_p->m_le_abCommandData[0], uiDataSize_p); return Ret; @@ -2166,7 +2166,7 @@ static tEplKernel EplSdoComServerSendFrameIntern(tEplSdoComCon * pSdoComCon_p, // set size of frame AmiSetWordToLe(&pCommandFrame-> m_le_wSegmentSize, - (WORD) pSdoComCon_p-> + (u16) pSdoComCon_p-> m_uiTransSize); // correct byte-counter @@ -2296,7 +2296,7 @@ static tEplKernel EplSdoComServerSendFrameIntern(tEplSdoComCon * pSdoComCon_p, // set segment size AmiSetWordToLe(&pCommandFrame-> m_le_wSegmentSize, - (WORD) pSdoComCon_p-> + (u16) pSdoComCon_p-> m_uiTransSize); // send frame @@ -2679,7 +2679,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p) // create command header AmiSetWordToLe(pbPayload, - (WORD) pSdoComCon_p-> + (u16) pSdoComCon_p-> m_uiTargetIndex); pbPayload += 2; AmiSetByteToLe(pbPayload, @@ -2720,7 +2720,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p) bFlags); // create command header AmiSetWordToLe(pbPayload, - (WORD) + (u16) pSdoComCon_p-> m_uiTargetIndex); pbPayload += 2; @@ -2759,7 +2759,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p) // create command header AmiSetWordToLe(pbPayload, - (WORD) + (u16) pSdoComCon_p-> m_uiTargetIndex); pbPayload += 2; @@ -2783,7 +2783,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p) // fill rest of header AmiSetWordToLe(&pCommandFrame-> m_le_wSegmentSize, - (WORD) (4 + + (u16) (4 + pSdoComCon_p-> m_uiTransSize)); @@ -2854,7 +2854,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p) AmiSetWordToLe (&pCommandFrame-> m_le_wSegmentSize, - (WORD) + (u16) pSdoComCon_p-> m_uiTransSize); bFlags = 0x30; diff --git a/drivers/staging/epl/amix86.c b/drivers/staging/epl/amix86.c index 60fb6efbaf2b..d40ad918d3b9 100644 --- a/drivers/staging/epl/amix86.c +++ b/drivers/staging/epl/amix86.c @@ -79,7 +79,7 @@ //--------------------------------------------------------------------------- typedef struct { - WORD m_wWord; + u16 m_wWord; } twStruct; @@ -125,15 +125,15 @@ void AmiSetByteToBe (void *pAddr_p, u8 bByteVal_p) } */ -//------------< write WORD in big endian >-------------------------- +//------------< write u16 in big endian >-------------------------- -void AmiSetWordToBe(void * pAddr_p, WORD wWordVal_p) +void AmiSetWordToBe(void * pAddr_p, u16 wWordVal_p) { twStruct *pwStruct; twStruct wValue; - wValue.m_wWord = (WORD) ((wWordVal_p & 0x00FF) << 8); //LSB to MSB - wValue.m_wWord |= (WORD) ((wWordVal_p & 0xFF00) >> 8); //MSB to LSB + wValue.m_wWord = (u16) ((wWordVal_p & 0x00FF) << 8); //LSB to MSB + wValue.m_wWord |= (u16) ((wWordVal_p & 0xFF00) >> 8); //MSB to LSB pwStruct = (twStruct *) pAddr_p; pwStruct->m_wWord = wValue.m_wWord; @@ -183,9 +183,9 @@ void AmiSetByteToLe (void *pAddr_p, u8 bByteVal_p) } */ -//------------< write WORD in little endian >-------------------------- +//------------< write u16 in little endian >-------------------------- -void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p) +void AmiSetWordToLe(void *pAddr_p, u16 wWordVal_p) { twStruct *pwStruct; @@ -230,17 +230,17 @@ u8 AmiGetByteFromBe (void *pAddr_p) } */ -//------------< read WORD in big endian >--------------------------- +//------------< read u16 in big endian >--------------------------- -WORD AmiGetWordFromBe(void *pAddr_p) +u16 AmiGetWordFromBe(void *pAddr_p) { twStruct *pwStruct; twStruct wValue; pwStruct = (twStruct *) pAddr_p; - wValue.m_wWord = (WORD) ((pwStruct->m_wWord & 0x00FF) << 8); //LSB to MSB - wValue.m_wWord |= (WORD) ((pwStruct->m_wWord & 0xFF00) >> 8); //MSB to LSB + wValue.m_wWord = (u16) ((pwStruct->m_wWord & 0x00FF) << 8); //LSB to MSB + wValue.m_wWord |= (u16) ((pwStruct->m_wWord & 0xFF00) >> 8); //MSB to LSB return (wValue.m_wWord); @@ -289,9 +289,9 @@ u8 AmiGetByteFromLe (void *pAddr_p) } */ -//------------< read WORD in little endian >--------------------------- +//------------< read u16 in little endian >--------------------------- -WORD AmiGetWordFromLe(void *pAddr_p) +u16 AmiGetWordFromLe(void *pAddr_p) { twStruct *pwStruct; @@ -649,7 +649,7 @@ void AmiSetQword48ToLe(void *pAddr_p, u64 qwQwordVal_p) { ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0]; - ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; + ((u16 *) pAddr_p)[2] = ((u16 *) & qwQwordVal_p)[2]; } @@ -752,7 +752,7 @@ void AmiSetQword56ToLe(void *pAddr_p, u64 qwQwordVal_p) { ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0]; - ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; + ((u16 *) pAddr_p)[2] = ((u16 *) & qwQwordVal_p)[2]; ((u8 *) pAddr_p)[6] = ((u8 *) & qwQwordVal_p)[6]; } diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c index 9a10f1cf167e..74ab74f80f94 100644 --- a/drivers/staging/epl/demo_main.c +++ b/drivers/staging/epl/demo_main.c @@ -810,7 +810,7 @@ tEplKernel AppCbSync(void) bVarOut1Old_l = bVarOut1_l; // set LEDs -// printk("bVarIn = 0x%02X bVarOut = 0x%02X\n", (WORD) bVarIn_l, (WORD) bVarOut_l); +// printk("bVarIn = 0x%02X bVarOut = 0x%02X\n", (u16) bVarIn_l, (u16) bVarOut_l); } if (uiNodeId_g != EPL_C_ADR_MN_DEF_NODE_ID) { bVarIn1_l++; diff --git a/drivers/staging/epl/edrv.h b/drivers/staging/epl/edrv.h index 56b287e03180..62b4e77e0695 100644 --- a/drivers/staging/epl/edrv.h +++ b/drivers/staging/epl/edrv.h @@ -120,7 +120,7 @@ typedef struct _tEdrvRxBuffer { } tEdrvRxBuffer; //typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, tBufferDescr * pbBuffer_p); -//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, u8 * pbEthernetData_p, WORD wDataLen_p); +//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, u8 * pbEthernetData_p, u16 wDataLen_p); typedef void (*tEdrvRxHandler) (tEdrvRxBuffer * pRxBuffer_p); typedef void (*tEdrvTxHandler) (tEdrvTxBuffer * pTxBuffer_p); @@ -130,7 +130,7 @@ typedef struct { // u8 m_bNoOfRxBuffDescr; // number of entries in rx bufferdescriptor table // tBufferDescr * m_pRxBuffDescrTable; // rx bufferdescriptor table -// WORD m_wRxBufferSize; // size of the whole rx buffer +// u16 m_wRxBufferSize; // size of the whole rx buffer tEdrvRxHandler m_pfnRxHandler; tEdrvTxHandler m_pfnTxHandler; diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index b54842ba7ed7..8c52d97ec9c0 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -26,9 +26,6 @@ #define TRACE printk // --- logic types --- -#ifndef WORD -#define WORD unsigned short int -#endif #ifndef BOOL #define BOOL unsigned char #endif diff --git a/drivers/staging/epl/kernel/EplDllk.h b/drivers/staging/epl/kernel/EplDllk.h index 31ab0585f8ed..adc35dca7f19 100644 --- a/drivers/staging/epl/kernel/EplDllk.h +++ b/drivers/staging/epl/kernel/EplDllk.h @@ -99,7 +99,7 @@ struct _tEplDllkNodeInfo { u32 m_dwPresTimeout; unsigned long m_ulDllErrorEvents; tEplNmtState m_NmtState; - WORD m_wPresPayloadLimit; + u16 m_wPresPayloadLimit; u8 m_be_abMacAddr[6]; u8 m_bSoaFlag1; BOOL m_fSoftDelete; // delete node after error and ignore error diff --git a/drivers/staging/epl/proc_fs.c b/drivers/staging/epl/proc_fs.c index a3235a129220..e82ab0c0b569 100644 --- a/drivers/staging/epl/proc_fs.c +++ b/drivers/staging/epl/proc_fs.c @@ -263,7 +263,7 @@ static int EplLinProcRead(char *pcBuffer_p, // ---- EPL state ---- nSize += snprintf(pcBuffer_p + nSize, nBufferSize_p - nSize, "NMT state: 0x%04X\n", - (WORD) EplNmtkGetNmtState()); + (u16) EplNmtkGetNmtState()); EplDllkCalGetStatistics(&pDllkCalStats); @@ -286,7 +286,7 @@ static int EplLinProcRead(char *pcBuffer_p, { unsigned int uiMandatorySlaveCount; unsigned int uiSignalSlaveCount; - WORD wFlags; + u16 wFlags; EplNmtMnuGetDiagnosticInfo(&uiMandatorySlaveCount, &uiSignalSlaveCount, &wFlags); diff --git a/drivers/staging/epl/user/EplCfgMau.h b/drivers/staging/epl/user/EplCfgMau.h index 9ffe51cac709..b5ee972b90b0 100644 --- a/drivers/staging/epl/user/EplCfgMau.h +++ b/drivers/staging/epl/user/EplCfgMau.h @@ -148,7 +148,7 @@ typedef struct { u32 m_dwCntObjectInDcf; // number of Objects in DCF tEplCfgMaIndexType m_SkipCfg; // TRUE if a adsitional Configurationprocess // have to insert e.g. PDO-mapping - WORD m_wTimeOutCnt; // Timeout Counter, break configuration is + u16 m_wTimeOutCnt; // Timeout Counter, break configuration is // m_wTimeOutCnt == CFGMA_MAX_TIMEOUT } tEplCfgMaNode; diff --git a/drivers/staging/epl/user/EplNmtMnu.h b/drivers/staging/epl/user/EplNmtMnu.h index 478baae2121d..8206c5ad29bb 100644 --- a/drivers/staging/epl/user/EplNmtMnu.h +++ b/drivers/staging/epl/user/EplNmtMnu.h @@ -84,12 +84,12 @@ typedef tEplKernel(* tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, tEplNmtNodeEvent NodeEvent_p, tEplNmtState NmtState_p, - WORD wErrorCode_p, + u16 wErrorCode_p, BOOL fMandatory_p); typedef tEplKernel(* tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p, tEplNmtState NmtState_p, - WORD wErrorCode_p); + u16 wErrorCode_p); //--------------------------------------------------------------------------- // function prototypes @@ -122,7 +122,7 @@ tEplKernel EplNmtMnuGetDiagnosticInfo(unsigned int *puiMandatorySlaveCount_p, unsigned int *puiSignalSlaveCount_p, - WORD * pwFlags_p); + u16 * pwFlags_p); #endif -- cgit v1.2.3-59-g8ed1b