diff --git a/[refs] b/[refs] index ed2c505f3b4a..0cf382f4d53e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd3966d5dc109a7f5cfcd7e14a851acc18d69324 +refs/heads/master: 44b71174dfe579690c8f91d51763e05ca72169e2 diff --git a/trunk/drivers/staging/epl/EplInstDef.h b/trunk/drivers/staging/epl/EplInstDef.h index 89efbf278264..31406662b3c2 100644 --- a/trunk/drivers/staging/epl/EplInstDef.h +++ b/trunk/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/trunk/drivers/staging/epl/EplObd.c b/trunk/drivers/staging/epl/EplObd.c index a07582cec505..a853a02601a6 100644 --- a/trunk/drivers/staging/epl/EplObd.c +++ b/trunk/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/trunk/drivers/staging/epl/global.h b/trunk/drivers/staging/epl/global.h index 6214075704e2..8a204ac232c3 100644 --- a/trunk/drivers/staging/epl/global.h +++ b/trunk/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