From d10f46992fb59de804550999806e1e0c0aa335a8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 10:45:12 -0700 Subject: Staging: epl: remove PUBLIC definition It doesn't make sense here, so delete it. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/EplNmtCnu.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'drivers/staging/epl/EplNmtCnu.c') diff --git a/drivers/staging/epl/EplNmtCnu.c b/drivers/staging/epl/EplNmtCnu.c index f2f46da08c7..2c391167539 100644 --- a/drivers/staging/epl/EplNmtCnu.c +++ b/drivers/staging/epl/EplNmtCnu.c @@ -110,7 +110,7 @@ static tEplNmtCommand EplNmtCnuGetNmtCommand(tEplFrameInfo * pFrameInfo_p); static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p); -static tEplKernel PUBLIC EplNmtCnuCommandCb(tEplFrameInfo * pFrameInfo_p); +static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p); //=========================================================================// // // @@ -135,7 +135,7 @@ static tEplKernel PUBLIC EplNmtCnuCommandCb(tEplFrameInfo * pFrameInfo_p); // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuInit(unsigned int uiNodeId_p) +EPLDLLEXPORT tEplKernel EplNmtCnuInit(unsigned int uiNodeId_p) { tEplKernel Ret; @@ -161,7 +161,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuInit(unsigned int uiNodeId_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuAddInstance(unsigned int uiNodeId_p) +EPLDLLEXPORT tEplKernel EplNmtCnuAddInstance(unsigned int uiNodeId_p) { tEplKernel Ret; @@ -201,7 +201,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuAddInstance(unsigned int uiNodeId_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuDelInstance() +EPLDLLEXPORT tEplKernel EplNmtCnuDelInstance(void) { tEplKernel Ret; @@ -234,9 +234,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuDelInstance() // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, - tEplNmtCommand - NmtCommand_p) +EPLDLLEXPORT tEplKernel EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, + tEplNmtCommand NmtCommand_p) { tEplKernel Ret; tEplFrameInfo NmtRequestFrameInfo; @@ -297,9 +296,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC -EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback - pfnEplNmtCheckEventCb_p) +EPLDLLEXPORT tEplKernel EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback pfnEplNmtCheckEventCb_p) { tEplKernel Ret; @@ -335,7 +332,7 @@ EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback // State: // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplNmtCnuCommandCb(tEplFrameInfo * pFrameInfo_p) +static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p) { tEplKernel Ret = kEplSuccessful; tEplNmtCommand NmtCommand; -- cgit v1.2.3 From 2ed53cf8a523d3e2fc133d892f8d040c3fc9656d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 12:36:38 -0700 Subject: Staging: epl: remove BYTE It's u8 in kernelspace, not BYTE. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/EplNmtCnu.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'drivers/staging/epl/EplNmtCnu.c') diff --git a/drivers/staging/epl/EplNmtCnu.c b/drivers/staging/epl/EplNmtCnu.c index 2c391167539..4bbc4ffca9f 100644 --- a/drivers/staging/epl/EplNmtCnu.c +++ b/drivers/staging/epl/EplNmtCnu.c @@ -108,7 +108,7 @@ static tEplNmtCnuInstance EplNmtCnuInstance_g; static tEplNmtCommand EplNmtCnuGetNmtCommand(tEplFrameInfo * pFrameInfo_p); -static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p); +static BOOL EplNmtCnuNodeIdList(u8 * pbNmtCommandDate_p); static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p); @@ -248,15 +248,15 @@ EPLDLLEXPORT tEplKernel EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, EPL_MEMSET(&NmtRequestFrame.m_be_abSrcMac[0], 0x00, sizeof(NmtRequestFrame.m_be_abSrcMac)); // set by DLL AmiSetWordToBe(&NmtRequestFrame.m_be_wEtherType, EPL_C_DLL_ETHERTYPE_EPL); - AmiSetByteToLe(&NmtRequestFrame.m_le_bDstNodeId, (BYTE) EPL_C_ADR_MN_DEF_NODE_ID); // node id of the MN + AmiSetByteToLe(&NmtRequestFrame.m_le_bDstNodeId, (u8) EPL_C_ADR_MN_DEF_NODE_ID); // node id of the MN AmiSetByteToLe(&NmtRequestFrame.m_le_bMessageType, - (BYTE) kEplMsgTypeAsnd); + (u8) kEplMsgTypeAsnd); AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_le_bServiceId, - (BYTE) kEplDllAsndNmtRequest); + (u8) kEplDllAsndNmtRequest); AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload. m_NmtRequestService.m_le_bNmtCommandId, - (BYTE) NmtCommand_p); - AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService.m_le_bTargetNodeId, (BYTE) uiNodeId_p); // target for the nmt command + (u8) NmtCommand_p); + AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService.m_le_bTargetNodeId, (u8) uiNodeId_p); // target for the nmt command EPL_MEMSET(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService. m_le_abNmtCommandData[0], 0x00, sizeof(NmtRequestFrame.m_Data.m_Asnd.m_Payload. @@ -673,18 +673,18 @@ static tEplNmtCommand EplNmtCnuGetNmtCommand(tEplFrameInfo * pFrameInfo_p) // State: // //--------------------------------------------------------------------------- -static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p) +static BOOL EplNmtCnuNodeIdList(u8 * pbNmtCommandDate_p) { BOOL fNodeIdInList; unsigned int uiByteOffset; - BYTE bBitOffset; - BYTE bNodeListByte; + u8 bBitOffset; + u8 bNodeListByte; // get byte-offset of the own nodeid in NodeIdList // devide though 8 uiByteOffset = (unsigned int)(EplNmtCnuInstance_g.m_uiNodeId >> 3); // get bitoffset - bBitOffset = (BYTE) EplNmtCnuInstance_g.m_uiNodeId % 8; + bBitOffset = (u8) EplNmtCnuInstance_g.m_uiNodeId % 8; bNodeListByte = AmiGetByteFromLe(&pbNmtCommandDate_p[uiByteOffset]); if ((bNodeListByte & bBitOffset) == 0) { -- cgit v1.2.3 From d9068d622f6e8aeaba4049b6d4953cebc2b90938 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 13:26:29 -0700 Subject: Staging: epl: remove EPLDLLEXPORT This isn't a DLL, so we don't need this :) Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/EplNmtCnu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/staging/epl/EplNmtCnu.c') diff --git a/drivers/staging/epl/EplNmtCnu.c b/drivers/staging/epl/EplNmtCnu.c index 4bbc4ffca9f..c27ca8f8c2f 100644 --- a/drivers/staging/epl/EplNmtCnu.c +++ b/drivers/staging/epl/EplNmtCnu.c @@ -135,7 +135,7 @@ static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p); // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplNmtCnuInit(unsigned int uiNodeId_p) +tEplKernel EplNmtCnuInit(unsigned int uiNodeId_p) { tEplKernel Ret; @@ -161,7 +161,7 @@ EPLDLLEXPORT tEplKernel EplNmtCnuInit(unsigned int uiNodeId_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplNmtCnuAddInstance(unsigned int uiNodeId_p) +tEplKernel EplNmtCnuAddInstance(unsigned int uiNodeId_p) { tEplKernel Ret; @@ -201,7 +201,7 @@ EPLDLLEXPORT tEplKernel EplNmtCnuAddInstance(unsigned int uiNodeId_p) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplNmtCnuDelInstance(void) +tEplKernel EplNmtCnuDelInstance(void) { tEplKernel Ret; @@ -234,8 +234,8 @@ EPLDLLEXPORT tEplKernel EplNmtCnuDelInstance(void) // State: // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, - tEplNmtCommand NmtCommand_p) +tEplKernel EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, + tEplNmtCommand NmtCommand_p) { tEplKernel Ret; tEplFrameInfo NmtRequestFrameInfo; @@ -296,7 +296,7 @@ EPLDLLEXPORT tEplKernel EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p, // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback pfnEplNmtCheckEventCb_p) +tEplKernel EplNmtCnuRegisterCheckEventCb(tEplNmtuCheckEventCallback pfnEplNmtCheckEventCb_p) { tEplKernel Ret; -- cgit v1.2.3