Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 197105a5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 541a8bde

drivers/staging/epl/Debug.h

+1 −20
Original line number Diff line number Diff line
@@ -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

drivers/staging/epl/EplAmi.h

+0 −5
Original line number Diff line number Diff line
@@ -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

drivers/staging/epl/EplInc.h

+0 −8
Original line number Diff line number Diff line
@@ -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

// ============================================================================

drivers/staging/epl/EplObjDef.h

+0 −8
Original line number Diff line number Diff line
@@ -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



//---------------------------------------------------------------------------

//---------------------------------------------------------------------------

drivers/staging/epl/EplPdok.c

+0 −25
Original line number Diff line number Diff line
@@ -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;

}