aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-03-23 14:33:12 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 17:54:20 -0400
commit197105a5349d69fff902149cbe7fe7475561d69a (patch)
tree90f61b5efb012389e549414dbf1a3d82e3b88cce
parent541a8bde90068471e9fc26cfe4c5fcb11dcd751b (diff)
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 <daniel.krueger@systec-electronic.com> Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat
-rw-r--r--drivers/staging/epl/Debug.h21
-rw-r--r--drivers/staging/epl/EplAmi.h5
-rw-r--r--drivers/staging/epl/EplInc.h8
-rw-r--r--drivers/staging/epl/EplObjDef.h8
-rw-r--r--drivers/staging/epl/EplPdok.c25
-rw-r--r--drivers/staging/epl/global.h112
6 files changed, 1 insertions, 178 deletions
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 @@
628// The macro DEBUG_DUMP_DATA() can be used with the same debug-levels to dump 628// The macro DEBUG_DUMP_DATA() can be used with the same debug-levels to dump
629// out data bytes. Function DumpData() has to be included. 629// out data bytes. Function DumpData() has to be included.
630// NOTE: DUMP_DATA has to be defined in project settings. 630// NOTE: DUMP_DATA has to be defined in project settings.
631#if (!defined (NDEBUG) && defined (DUMP_DATA)) || (DEV_SYSTEM == _DEV_WIN32_) 631#if (!defined (NDEBUG) && defined (DUMP_DATA))
632 632
633#ifdef __cplusplus 633#ifdef __cplusplus
634extern "C" { 634extern "C" {
@@ -654,24 +654,6 @@ extern "C" {
654// deleted from compiler (in release version too). 654// deleted from compiler (in release version too).
655#if !defined (NDEBUG) || defined (DEBUG_KEEP_ASSERT) 655#if !defined (NDEBUG) || defined (DEBUG_KEEP_ASSERT)
656 656
657#if (DEV_SYSTEM == _DEV_WIN32_)
658
659 // For WIN32 process will be killed after closing message box.
660
661#define DEBUG_ASSERT0(expr,str) if (!(expr ) && ((DEBUG_GLB_LVL() & DEBUG_LVL_ASSERT)!=0)) { \
662 MessageBox (NULL, \
663 "Assertion failed: line " __LINE__ " file " __FILE__ \
664 "\n -> " str "\n"); \
665 ExitProcess (-1); }
666
667#define DEBUG_ASSERT1(expr,str,p1) if (!(expr ) && ((DEBUG_GLB_LVL() & DEBUG_LVL_ASSERT)!=0)) { \
668 MessageBox (NULL, \
669 "Assertion failed: line " __LINE__ " file " __FILE__ \
670 "\n -> " str "\n"); \
671 ExitProcess (-1); }
672
673#else
674
675 // For microcontrollers process will be stopped using endless loop. 657 // For microcontrollers process will be stopped using endless loop.
676 658
677#define DEBUG_ASSERT0(expr,str) if (!(expr )) { \ 659#define DEBUG_ASSERT0(expr,str) if (!(expr )) { \
@@ -687,7 +669,6 @@ extern "C" {
687 " -> 0x%08lX\n", __LINE__, __FILE__, str, (DWORD) p1); \ 669 " -> 0x%08lX\n", __LINE__, __FILE__, str, (DWORD) p1); \
688 while (1); } 670 while (1); }
689 671
690#endif
691 672
692#else 673#else
693 674
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 @@
86#ifndef _EPLAMI_H_ 86#ifndef _EPLAMI_H_
87#define _EPLAMI_H_ 87#define _EPLAMI_H_
88 88
89#if ((DEV_SYSTEM & _DEV_64BIT_SUPPORT_) == 0)
90// #ifdef USE_VAR64
91#error 'ERROR: development system does not support 64 bit operations!'
92// #endif
93#endif
94 89
95//--------------------------------------------------------------------------- 90//---------------------------------------------------------------------------
96// types 91// 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 {
241//--------------------------------------------------------------------------- 241//---------------------------------------------------------------------------
242 242
243// definitions for DLL export 243// definitions for DLL export
244#if ((DEV_SYSTEM == _DEV_WIN32_) || (DEV_SYSTEM == _DEV_WIN_CE_)) && defined (COP_LIB)
245
246#define EPLDLLEXPORT __declspec (dllexport)
247
248#else
249
250#define EPLDLLEXPORT 244#define EPLDLLEXPORT
251 245
252#endif
253
254// ============================================================================ 246// ============================================================================
255// common debug macros 247// common debug macros
256// ============================================================================ 248// ============================================================================
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 @@
96// To prevent unused memory in subindex tables we need this macro. 96// To prevent unused memory in subindex tables we need this macro.
97// But not all compilers support to preset the last struct value followed by a comma. 97// But not all compilers support to preset the last struct value followed by a comma.
98// Compilers which does not support a comma after last struct value has to place in a dummy subindex. 98// Compilers which does not support a comma after last struct value has to place in a dummy subindex.
99#if ((DEV_SYSTEM & _DEV_COMMA_EXT_) != 0)
100
101#define EPL_OBD_END_SUBINDEX()
102#define EPL_OBD_MAX_ARRAY_SUBENTRIES 2
103
104#else
105
106#define EPL_OBD_END_SUBINDEX() {0,0,0,NULL,NULL} 99#define EPL_OBD_END_SUBINDEX() {0,0,0,NULL,NULL}
107#define EPL_OBD_MAX_ARRAY_SUBENTRIES 3 100#define EPL_OBD_MAX_ARRAY_SUBENTRIES 3
108 101
109#endif
110 102
111//--------------------------------------------------------------------------- 103//---------------------------------------------------------------------------
112//--------------------------------------------------------------------------- 104//---------------------------------------------------------------------------
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 @@
73#include "kernel/EplEventk.h" 73#include "kernel/EplEventk.h"
74#include "kernel/EplObdk.h" 74#include "kernel/EplObdk.h"
75 75
76#if (DEV_SYSTEM == _DEV_GNU_CF548X_)
77#include "plccore.h"
78#define PDO_LED 0x08
79#endif
80
81#if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_PDOK)) != 0) 76#if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_PDOK)) != 0)
82 77
83#if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLK)) == 0) 78#if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLK)) == 0)
@@ -226,11 +221,6 @@ tEplKernel EplPdokCbPdoReceived(tEplFrameInfo * pFrameInfo_p)
226 tEplKernel Ret = kEplSuccessful; 221 tEplKernel Ret = kEplSuccessful;
227 tEplEvent Event; 222 tEplEvent Event;
228 223
229#if (DEV_SYSTEM == _DEV_GNU_CF548X_)
230 // reset LED
231// MCF_GPIO_PODR_PCIBG &= ~PDO_LED; // Level
232#endif
233
234 Event.m_EventSink = kEplEventSinkPdok; 224 Event.m_EventSink = kEplEventSinkPdok;
235 Event.m_EventType = kEplEventTypePdoRx; 225 Event.m_EventType = kEplEventTypePdoRx;
236 // limit copied data to size of PDO (because from some CNs the frame is larger than necessary) 226 // 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)
238 Event.m_pArg = pFrameInfo_p->m_pFrame; 228 Event.m_pArg = pFrameInfo_p->m_pFrame;
239 Ret = EplEventkPost(&Event); 229 Ret = EplEventkPost(&Event);
240 230
241#if (DEV_SYSTEM == _DEV_GNU_CF548X_)
242 // set LED
243// MCF_GPIO_PODR_PCIBG |= PDO_LED; // Level
244#endif
245
246 return Ret; 231 return Ret;
247} 232}
248 233
@@ -269,22 +254,12 @@ tEplKernel EplPdokCbPdoTransmitted(tEplFrameInfo * pFrameInfo_p)
269 tEplKernel Ret = kEplSuccessful; 254 tEplKernel Ret = kEplSuccessful;
270 tEplEvent Event; 255 tEplEvent Event;
271 256
272#if (DEV_SYSTEM == _DEV_GNU_CF548X_)
273 // reset LED
274 MCF_GPIO_PODR_PCIBG &= ~PDO_LED; // Level
275#endif
276
277 Event.m_EventSink = kEplEventSinkPdok; 257 Event.m_EventSink = kEplEventSinkPdok;
278 Event.m_EventType = kEplEventTypePdoTx; 258 Event.m_EventType = kEplEventTypePdoTx;
279 Event.m_uiSize = sizeof(tEplFrameInfo); 259 Event.m_uiSize = sizeof(tEplFrameInfo);
280 Event.m_pArg = pFrameInfo_p; 260 Event.m_pArg = pFrameInfo_p;
281 Ret = EplEventkPost(&Event); 261 Ret = EplEventkPost(&Event);
282 262
283#if (DEV_SYSTEM == _DEV_GNU_CF548X_)
284 // set LED
285 MCF_GPIO_PODR_PCIBG |= PDO_LED; // Level
286#endif
287
288 return Ret; 263 return Ret;
289} 264}
290 265
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 @@
22#ifndef _GLOBAL_H_ 22#ifndef _GLOBAL_H_
23#define _GLOBAL_H_ 23#define _GLOBAL_H_
24 24
25//---------------------------------------------------------------------------
26// elements of defines for development system
27//---------------------------------------------------------------------------
28
29// these defines are necessary to check some of characteristics of the development system
30#define _DEV_BIGEND_ 0x80000000L // big endian (motorolla format)
31#define _DEV_ALIGNMENT_4_ 0x00400000L // the CPU needs alignment of 4 bytes
32#define _DEV_ONLY_INT_MAIN_ 0x00004000L // the compiler needs "int main(int)" instead of "void main(void)"
33#define _DEV_COMMA_EXT_ 0x00002000L // support of last comma in struct predefinition
34#define _DEV_64BIT_SUPPORT_ 0x00001000L // support of 64 bit operations
35#define _DEV_BIT64_ 0x00000400L // count of bits: 64 bit
36#define _DEV_BIT32_ 0x00000300L // 32 bit
37#define _DEV_BIT16_ 0x00000200L // 16 bit
38#define _DEV_BIT8_ 0x00000100L // 8 bit
39#define _DEV_RVCT_ARM_ 0x0000001CL // RealView ARM
40#define _DEV_RENESASM32C 0x0000001BL // compiler from: Renesas
41#define _DEV_GNUC_MIPS2_ 0x0000001AL // GNU for MIPS2
42#define _DEV_MPLAB_C30_ 0x00000019L // MPLAB C30 for Microchip dsPIC33F series
43#define _DEV_GNUC_TC_ 0x00000018L // GNU for Infineon TriCore
44#define _DEV_GNUC_X86_ 0x00000017L // GNU for I386
45#define _DEV_IAR_ARM_ 0x00000016L // ARM IAR C/C++ Compiler
46#define _DEV_PARADGM_X86 0x00000015L // Paradigm C/C++ for Beck 1x3
47#define _DEV_GNUC_CF_ 0x00000014L // GNU for Coldfire
48#define _DEV_KEIL_ARM_ 0x00000013L // Keil ARM
49#define _DEV_MSEVC_ 0x00000012L // Microsoft embedded Visual C/C++
50#define _DEV_HIGHTEC_GNUC_X86_ 0x00000011L // Hightec elf386 gcc
51#define _DEV_MSVC_RTX_ 0x00000010L // VC600 + RTX
52#define _DEV_MSVC_V1_5_ 0x0000000FL // Microsoft Visual C/C++ V1.5
53#define _DEV_GNUC_ARM7_ 0x0000000EL // GNU Compiler gcc for ARM7
54#define _DEV_METROWERKS_CW_ 0x0000000DL // Metrowerks Code Warrior
55#define _DEV_MITSUBISHIM16C_ 0x0000000CL //compiler from: Mitsubishi
56#define _DEV_GNUC_C16X_ 0x0000000BL // GNU Compiler gcc166 for Infineon C16x
57#define _DEV_LINUX_GCC_ 0x0000000AL // Linux GNU Compiler gcc
58#define _DEV_GNUC_MPC5X5 0x00000009L // GNU for Motorola PPC5x5
59#define _DEV_TASKINGM16C_ 0x00000008L // Tasking for Mitsubishi M16C
60#define _DEV_FUJITSU_ 0x00000007L // Fujitsu
61#define _DEV_TASKING8_ 0x00000006L // Tasking 8051
62#define _DEV_TASKING16_ 0x00000005L // Tasking 166
63#define _DEV_KEIL8_ 0x00000004L // Keil C51
64#define _DEV_KEIL16_ 0x00000003L // Keil C166
65#define _DEV_BORLANDC_ 0x00000002L // Borland C/C++
66#define _DEV_MSVC16_ 0x00000001L // Microsoft Visual C/C++
67#define _DEV_MSVC32_ 0x00000000L // Microsoft Visual C/C++
68
69// these defines can be used to mask previous elements
70#define _DEV_MASK_COMPILER 0x000000FFL
71#define _DEV_MASK_BITCOUNT 0x00000F00L
72#define _DEV_MASK_ADDSUPPORT 0x0000F000L
73#define _DEV_MASK_ALIGNMENT 0x00F00000L
74
75//---------------------------------------------------------------------------
76// defines for development system (DEV_SYSTEM) including previous elements
77//---------------------------------------------------------------------------
78
79#define _DEV_WIN16_ (_DEV_BIT16_ | _DEV_MSVC16_ )
80#define _DEV_WIN32_ (_DEV_BIT32_ | _DEV_MSVC32_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
81#define _DEV_MSVC_DOS_ (_DEV_BIT32_ | _DEV_MSVC_V1_5_ )
82#define _DEV_BORLAND_DOS_ (_DEV_BIT32_ | _DEV_BORLANDC_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
83#define _DEV_KEIL_C51X_ (_DEV_BIT8_ | _DEV_KEIL8_ | _DEV_BIGEND_ | _DEV_COMMA_EXT_) // at least C51 version 7.05 supports comma extension
84#define _DEV_KEIL_C16X_ (_DEV_BIT16_ | _DEV_KEIL16_ | _DEV_COMMA_EXT_) // at least C166 version 5.03 supports comma extension
85#define _DEV_TASKING_C51X_ (_DEV_BIT8_ | _DEV_TASKING8_ | _DEV_BIGEND_)
86#define _DEV_TASKING_C16X_ (_DEV_BIT16_ | _DEV_TASKING16_ )
87#define _DEV_FUJITSU_F590_ (_DEV_BIT8_ | _DEV_FUJITSU_ | _DEV_COMMA_EXT_) // softune is not able to support 64 bit variables QWORD !!!
88//f.j.29.04.03 M16C kann effektiv mit Bytes umgehen
89//#define _DEV_TASKING_M16C_ (_DEV_BIT16_ | _DEV_TASKINGM16C_ )
90#define _DEV_TASKING_M16C_ (_DEV_BIT8_ | _DEV_TASKINGM16C_ )
91#define _DEV_MITSUBISHI_M16C_ (_DEV_BIT8_ | _DEV_MITSUBISHIM16C_ )
92#define _DEV_GNU_MPC5X5_ (_DEV_BIT32_ | _DEV_GNUC_MPC5X5| _DEV_BIGEND_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
93#define _DEV_LINUX_ (_DEV_BIT32_ | _DEV_LINUX_GCC_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
94#define _DEV_GNU_C16X_ (_DEV_BIT16_ | _DEV_GNUC_C16X_ ) //| _DEV_COMMA_EXT_)
95#define _DEV_MCW_MPC5X5_ (_DEV_BIT32_ | _DEV_METROWERKS_CW_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
96#define _DEV_GNU_ARM7_ (_DEV_BIT32_ | _DEV_GNUC_ARM7_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_ | _DEV_ONLY_INT_MAIN_)
97#define _DEV_WIN32_RTX_ (_DEV_BIT32_ | _DEV_MSVC_RTX_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
98#define _DEV_HIGHTEC_X86_ (_DEV_BIT32_ | _DEV_HIGHTEC_GNUC_X86_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
99#define _DEV_WIN_CE_ (_DEV_BIT32_ | _DEV_MSEVC_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
100#define _DEV_KEIL_CARM_ (_DEV_BIT32_ | _DEV_KEIL_ARM_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
101#define _DEV_IAR_CARM_ (_DEV_BIT32_ | _DEV_IAR_ARM_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
102#define _DEV_RVCT_CARM_ (_DEV_BIT32_ | _DEV_RVCT_ARM_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_ | _DEV_ONLY_INT_MAIN_)
103#define _DEV_MCW_MCF5XXX_ (_DEV_BIT32_ | _DEV_METROWERKS_CW_ ) //| _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
104#define _DEV_GNU_CF5282_ (_DEV_BIT32_ | _DEV_GNUC_CF_ | _DEV_BIGEND_)
105#define _DEV_PAR_BECK1X3_ (_DEV_BIT16_ | _DEV_PARADGM_X86)
106#define _DEV_GNU_CF548X_ (_DEV_BIT32_ | _DEV_GNUC_CF_ | _DEV_BIGEND_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_)
107#define _DEV_GNU_I386_ (_DEV_BIT32_ | _DEV_GNUC_X86_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_ | _DEV_ONLY_INT_MAIN_)
108#define _DEV_GNU_TRICORE_ (_DEV_BIT32_ | _DEV_GNUC_TC_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_ | _DEV_ONLY_INT_MAIN_ | _DEV_ALIGNMENT_4_)
109#define _DEV_MPLAB_DSPIC33F_ (_DEV_BIT16_ | _DEV_MPLAB_C30_ ) //| _DEV_COMMA_EXT_)
110#define _DEV_GNU_MIPSEL_ (_DEV_BIT32_ | _DEV_GNUC_MIPS2_ | _DEV_BIGEND_ | _DEV_64BIT_SUPPORT_ | _DEV_COMMA_EXT_ | _DEV_ONLY_INT_MAIN_)
111
112#define _DEV_RENESAS_M32C_ (_DEV_BIT32_ | _DEV_RENESASM32C)
113
114//---------------------------------------------------------------------------
115// usefull macros
116//---------------------------------------------------------------------------
117
118#define CHECK_IF_ONLY_INT_MAIN() (DEV_SYSTEM & _DEV_ONLY_INT_MAIN_)
119#define CHECK_MEMORY_ALINMENT() (DEV_SYSTEM & _DEV_MASK_ALIGNMENT)
120
121//---------------------------------------------------------------------------
122// defines for target system (TARGET_SYSTEM)
123//---------------------------------------------------------------------------
124#define _LINUX_ 1
125
126//---------------------------------------------------------------------------
127// definitions for function inlining
128//---------------------------------------------------------------------------
129
130#define LINUX_SYSTEM // define 'LINUX_SYSTEM' uniform for all Linux based systems
131 // r.d.: We will need an other solution here! There are two sections here which do check the preproc-definitions:
132 // LINUX and __linux__ . The first one was Linux for PC, the second one is this section for embedded Linux (MCF5xxx).
133 // But Linux for PC does not need the definitions for embedded Linux.
134
135#define TARGET_SYSTEM _LINUX_ // Linux definition
136#define DEV_SYSTEM _DEV_LINUX_
137 25
138#ifndef QWORD 26#ifndef QWORD
139#define QWORD long long int 27#define QWORD long long int
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-10 10:22:11 -0500