Skip to content

L
linux-davinci
Commit 5318487c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: epl: remove ROM 

It's not used and is not needed.

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 f15a88fa
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 51 deletions
drivers/staging/epl/Epl.h
View file @ 5318487c
...@@ -131,7 +131,7 @@ typedef union { ...@@ -131,7 +131,7 @@ typedef union {
} tEplApiEventArg; } tEplApiEventArg;
typedef tEplKernel(ROM *tEplApiCbEvent) (tEplApiEventType EventType_p, // IN: event type (enum) typedef tEplKernel(*tEplApiCbEvent) (tEplApiEventType EventType_p, // IN: event type (enum)
tEplApiEventArg *pEventArg_p, // IN: event argument (union) tEplApiEventArg *pEventArg_p, // IN: event argument (union)
void *pUserArg_p); void *pUserArg_p);
......
drivers/staging/epl/EplObd.c
View file @ 5318487c
...@@ -2192,11 +2192,11 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p) ...@@ -2192,11 +2192,11 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p)
// The current position is not decleared. The string // The current position is not decleared. The string
// is located in ROM, therefor use default pointer. // is located in ROM, therefor use default pointer.
pData = (void *)pSubIndexEntry_p->m_pDefault; 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 // The max. size of strings defined by STRING-Macro is stored in
// tEplObdVString of default value. // tEplObdVString of default value.
DataSize = DataSize =
((CONST tEplObdVString ROM *) pData)-> ((CONST tEplObdVString *) pData)->
m_Size; m_Size;
} }
} }
...@@ -2216,11 +2216,11 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p) ...@@ -2216,11 +2216,11 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p)
// The current position is not decleared. The string // The current position is not decleared. The string
// is located in ROM, therefor use default pointer. // is located in ROM, therefor use default pointer.
pData = (void *)pSubIndexEntry_p->m_pDefault; 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 // The max. size of strings defined by STRING-Macro is stored in
// tEplObdVString of default value. // tEplObdVString of default value.
DataSize = DataSize =
((CONST tEplObdOString ROM *) pData)-> ((CONST tEplObdOString *) pData)->
m_Size; m_Size;
} }
} }
...@@ -2887,29 +2887,17 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ ...@@ -2887,29 +2887,17 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_
pSubIndex->m_pCurrent; pSubIndex->m_pCurrent;
if (pDstData != NULL) { if (pDstData != NULL) {
// 08-dec-2004: code optimization !!! // 08-dec-2004: code optimization !!!
// entries ((tEplObdVStringDef ROM*) pSubIndex->m_pDefault)->m_pString // entries ((tEplObdVStringDef*) pSubIndex->m_pDefault)->m_pString
// and ((tEplObdVStringDef ROM*) pSubIndex->m_pDefault)->m_Size were read // and ((tEplObdVStringDef*) pSubIndex->m_pDefault)->m_Size were read
// twice. thats not necessary! // twice. thats not necessary!
// For copying data we have to set the destination pointer to the real RAM string. This // 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.) // pointer to RAM string is located in default string info structure. (translated r.d.)
pDstData = pDstData = (void MEM *)((tEplObdVStringDef*) pSubIndex->m_pDefault)->m_pString;
(void MEM ObjSize = ((tEplObdVStringDef *)pSubIndex->m_pDefault)->m_Size;
*)((tEplObdVStringDef ROM *) pSubIndex->m_pDefault)->m_pString;
ObjSize =
((tEplObdVStringDef
ROM *) pSubIndex->
m_pDefault)->
m_Size;
((tEplObdVString MEM *) ((tEplObdVString MEM *)pSubIndex->m_pCurrent)->m_pString = pDstData;
pSubIndex-> ((tEplObdVString MEM *)pSubIndex->m_pCurrent)->m_Size = ObjSize;
m_pCurrent)->
m_pString = pDstData;
((tEplObdVString MEM *)
pSubIndex->
m_pCurrent)->m_Size =
ObjSize;
} }
} else if (pSubIndex->m_Type == } else if (pSubIndex->m_Type ==
...@@ -2918,29 +2906,17 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_ ...@@ -2918,29 +2906,17 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_
pSubIndex->m_pCurrent; pSubIndex->m_pCurrent;
if (pDstData != NULL) { if (pDstData != NULL) {
// 08-dec-2004: code optimization !!! // 08-dec-2004: code optimization !!!
// entries ((tEplObdOStringDef ROM*) pSubIndex->m_pDefault)->m_pString // entries ((tEplObdOStringDef*) pSubIndex->m_pDefault)->m_pString
// and ((tEplObdOStringDef ROM*) pSubIndex->m_pDefault)->m_Size were read // and ((tEplObdOStringDef*) pSubIndex->m_pDefault)->m_Size were read
// twice. thats not necessary! // twice. thats not necessary!
// For copying data we have to set the destination pointer to the real RAM string. This // 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.) // pointer to RAM string is located in default string info structure. (translated r.d.)
pDstData = pDstData = (void MEM *)((tEplObdOStringDef *) pSubIndex->m_pDefault)->m_pString;
(void MEM ObjSize = ((tEplObdOStringDef *)pSubIndex->m_pDefault)->m_Size;
*)((tEplObdOStringDef ROM *) pSubIndex->m_pDefault)->m_pString;
ObjSize =
((tEplObdOStringDef
ROM *) pSubIndex->
m_pDefault)->
m_Size;
((tEplObdOString MEM *) ((tEplObdOString MEM *)pSubIndex->m_pCurrent)->m_pString = pDstData;
pSubIndex-> ((tEplObdOString MEM *)pSubIndex->m_pCurrent)->m_Size = ObjSize;
m_pCurrent)->
m_pString = pDstData;
((tEplObdOString MEM *)
pSubIndex->
m_pCurrent)->m_Size =
ObjSize;
} }
} }
......
drivers/staging/epl/EplObd.h
View file @ 5318487c
...@@ -283,7 +283,7 @@ typedef enum { ...@@ -283,7 +283,7 @@ typedef enum {
kVarValidAll = 0x03 // currently only size and data are implemented and used kVarValidAll = 0x03 // currently only size and data are implemented and used
} tEplVarParamValid; } tEplVarParamValid;
typedef tEplKernel(ROM *tEplVarCallback) (CCM_DECL_INSTANCE_HDL_ void *pParam_p); typedef tEplKernel(*tEplVarCallback) (CCM_DECL_INSTANCE_HDL_ void *pParam_p);
typedef struct { typedef struct {
tEplVarParamValid m_ValidFlag; tEplVarParamValid m_ValidFlag;
...@@ -375,7 +375,7 @@ typedef struct { ...@@ -375,7 +375,7 @@ typedef struct {
} tEplObdCbParam; } tEplObdCbParam;
// define type for callback function: pParam_p points to 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!!! // do not change the order for this struct!!!
...@@ -419,10 +419,10 @@ typedef struct { ...@@ -419,10 +419,10 @@ typedef struct {
} tEplObdCbStoreParam; } tEplObdCbStoreParam;
typedef tEplKernel(ROM *tInitTabEntryCallback) (void MEM * pTabEntry_p, typedef tEplKernel(*tInitTabEntryCallback) (void MEM * pTabEntry_p,
unsigned int uiObjIndex_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() // this stucture is used for parameters for function ObdInitModuleTab()
......
drivers/staging/epl/global.h
View file @ 5318487c
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
// ------------------ GNUC for I386 --------------------------------------------- // ------------------ 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 HWACC // hardware access through external memory (i.e. CAN)
#define MEM // Memory attribute to optimize speed and code of pointer access. #define MEM // Memory attribute to optimize speed and code of pointer access.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment