Skip to content

Commit

Permalink
Staging: epl: remove PUBLIC definition
Browse files Browse the repository at this point in the history 
It doesn't make sense here, so delete it.

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>
  • Loading branch information
Greg Kroah-Hartman committed Apr 3, 2009
1 parent 335914e commit d10f469
Show file tree
Hide file tree
Showing 64 changed files with 848 additions and 1,036 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/epl/Edrv8139.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
87 changes: 43 additions & 44 deletions drivers/staging/epl/Epl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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_
68 changes: 32 additions & 36 deletions drivers/staging/epl/EplAmi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

//---------------------------------------------------------------------------
Expand All @@ -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);

//---------------------------------------------------------------------------
//
Expand All @@ -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);

//---------------------------------------------------------------------------
//
Expand All @@ -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

Expand All @@ -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);

//---------------------------------------------------------------------------
//
Expand All @@ -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);

//---------------------------------------------------------------------------
//
Expand All @@ -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);

//---------------------------------------------------------------------------
//
Expand All @@ -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);

//---------------------------------------------------------------------------
//
Expand All @@ -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);

//---------------------------------------------------------------------------
//
Expand All @@ -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);

//---------------------------------------------------------------------------
//
Expand All @@ -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);

//---------------------------------------------------------------------------
//
Expand All @@ -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);

//---------------------------------------------------------------------------
//
Expand All @@ -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);

//---------------------------------------------------------------------------
//
Expand All @@ -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

Expand Down
Loading

0 comments on commit d10f469

Please sign in to comment.