aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-03-23 15:36:38 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 17:54:21 -0400
commit2ed53cf8a523d3e2fc133d892f8d040c3fc9656d (patch)
treef64d09b10df57de29c4cc001adafa052636f7150 /drivers/staging
parent48c13450c82817f6ce2d33fdb3692a759817c00b (diff)
Staging: epl: remove BYTE
It's u8 in kernelspace, not BYTE. 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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/epl/Debug.h4
-rw-r--r--drivers/staging/epl/Edrv8139.c28
-rw-r--r--drivers/staging/epl/EdrvFec.h2
-rw-r--r--drivers/staging/epl/EdrvSim.h2
-rw-r--r--drivers/staging/epl/Epl.h6
-rw-r--r--drivers/staging/epl/EplAmi.h14
-rw-r--r--drivers/staging/epl/EplApiGeneric.c32
-rw-r--r--drivers/staging/epl/EplApiLinuxKernel.c2
-rw-r--r--drivers/staging/epl/EplApiProcessImage.c4
-rw-r--r--drivers/staging/epl/EplDll.h4
-rw-r--r--drivers/staging/epl/EplDllCal.h2
-rw-r--r--drivers/staging/epl/EplDllk.c98
-rw-r--r--drivers/staging/epl/EplDllkCal.c10
-rw-r--r--drivers/staging/epl/EplDlluCal.c2
-rw-r--r--drivers/staging/epl/EplErrorHandlerk.c2
-rw-r--r--drivers/staging/epl/EplEvent.h2
-rw-r--r--drivers/staging/epl/EplEventk.c6
-rw-r--r--drivers/staging/epl/EplEventu.c6
-rw-r--r--drivers/staging/epl/EplFrame.h110
-rw-r--r--drivers/staging/epl/EplInstDef.h12
-rw-r--r--drivers/staging/epl/EplNmtCnu.c20
-rw-r--r--drivers/staging/epl/EplNmtMnu.c42
-rw-r--r--drivers/staging/epl/EplNmtk.c2
-rw-r--r--drivers/staging/epl/EplObd.c40
-rw-r--r--drivers/staging/epl/EplObd.h8
-rw-r--r--drivers/staging/epl/EplObdMacro.h4
-rw-r--r--drivers/staging/epl/EplObdu.c2
-rw-r--r--drivers/staging/epl/EplObduCal.c2
-rw-r--r--drivers/staging/epl/EplPdo.h2
-rw-r--r--drivers/staging/epl/EplPdok.c14
-rw-r--r--drivers/staging/epl/EplPdou.c8
-rw-r--r--drivers/staging/epl/EplSdoAsndu.c4
-rw-r--r--drivers/staging/epl/EplSdoAsySequ.c28
-rw-r--r--drivers/staging/epl/EplSdoComu.c58
-rw-r--r--drivers/staging/epl/EplSdoUdpu.c2
-rw-r--r--drivers/staging/epl/EplTarget.h6
-rw-r--r--drivers/staging/epl/ShbIpc-LinuxKernel.c2
-rw-r--r--drivers/staging/epl/TimerHighReskX86.c2
-rw-r--r--drivers/staging/epl/amix86.c116
-rw-r--r--drivers/staging/epl/demo_main.c26
-rw-r--r--drivers/staging/epl/edrv.h20
-rw-r--r--drivers/staging/epl/global.h3
-rw-r--r--drivers/staging/epl/kernel/EplDllk.h8
-rw-r--r--drivers/staging/epl/kernel/EplDllkCal.h2
-rw-r--r--drivers/staging/epl/kernel/EplObdk.h2
-rw-r--r--drivers/staging/epl/proc_fs.c4
-rw-r--r--drivers/staging/epl/user/EplCfgMau.h20
-rw-r--r--drivers/staging/epl/user/EplDlluCal.h2
-rw-r--r--drivers/staging/epl/user/EplObdu.h2
-rw-r--r--drivers/staging/epl/user/EplObduCal.h2
-rw-r--r--drivers/staging/epl/user/EplPdou.h8
51 files changed, 404 insertions, 405 deletions
diff --git a/drivers/staging/epl/Debug.h b/drivers/staging/epl/Debug.h
index 68fe3c4b9f5..9a6a5c824b2 100644
--- a/drivers/staging/epl/Debug.h
+++ b/drivers/staging/epl/Debug.h
@@ -634,13 +634,13 @@
634extern "C" { 634extern "C" {
635#endif 635#endif
636 636
637 void DumpData(char *szStr_p, BYTE *pbData_p, WORD wSize_p); 637 void DumpData(char *szStr_p, u8 *pbData_p, WORD wSize_p);
638 638
639#ifdef __cplusplus 639#ifdef __cplusplus
640} // von extern "C" 640} // von extern "C"
641#endif 641#endif
642#define DEBUG_DUMP_DATA(lvl,str,ptr,siz) if ((DEBUG_GLB_LVL() & (lvl))==(lvl)) \ 642#define DEBUG_DUMP_DATA(lvl,str,ptr,siz) if ((DEBUG_GLB_LVL() & (lvl))==(lvl)) \
643 DumpData (str, (BYTE *)(ptr), (WORD)(siz)); 643 DumpData (str, (u8 *)(ptr), (WORD)(siz));
644#else 644#else
645 645
646#define DEBUG_DUMP_DATA(lvl,str,ptr,siz) 646#define DEBUG_DUMP_DATA(lvl,str,ptr,siz)
diff --git a/drivers/staging/epl/Edrv8139.c b/drivers/staging/epl/Edrv8139.c
index b00e17e70b5..73e5c7cf69d 100644
--- a/drivers/staging/epl/Edrv8139.c
+++ b/drivers/staging/epl/Edrv8139.c
@@ -234,7 +234,7 @@
234 234
235// TracePoint support for realtime-debugging 235// TracePoint support for realtime-debugging
236#ifdef _DBG_TRACE_POINTS_ 236#ifdef _DBG_TRACE_POINTS_
237void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); 237void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);
238void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 238void TgtDbgPostTraceValue(DWORD dwTraceValue_p);
239#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 239#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)
240#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 240#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v)
@@ -282,9 +282,9 @@ typedef struct
282typedef struct { 282typedef struct {
283 struct pci_dev *m_pPciDev; // pointer to PCI device structure 283 struct pci_dev *m_pPciDev; // pointer to PCI device structure
284 void *m_pIoAddr; // pointer to register space of Ethernet controller 284 void *m_pIoAddr; // pointer to register space of Ethernet controller
285 BYTE *m_pbRxBuf; // pointer to Rx buffer 285 u8 *m_pbRxBuf; // pointer to Rx buffer
286 dma_addr_t m_pRxBufDma; 286 dma_addr_t m_pRxBufDma;
287 BYTE *m_pbTxBuf; // pointer to Tx buffer 287 u8 *m_pbTxBuf; // pointer to Tx buffer
288 dma_addr_t m_pTxBufDma; 288 dma_addr_t m_pTxBufDma;
289 BOOL m_afTxBufUsed[EDRV_MAX_TX_BUFFERS]; 289 BOOL m_afTxBufUsed[EDRV_MAX_TX_BUFFERS];
290 unsigned int m_uiCurTxDesc; 290 unsigned int m_uiCurTxDesc;
@@ -359,7 +359,7 @@ static struct pci_driver EdrvDriver = {
359// local function prototypes 359// local function prototypes
360//--------------------------------------------------------------------------- 360//---------------------------------------------------------------------------
361 361
362static BYTE EdrvCalcHash(BYTE * pbMAC_p); 362static u8 EdrvCalcHash(u8 * pbMAC_p);
363 363
364//--------------------------------------------------------------------------- 364//---------------------------------------------------------------------------
365// 365//
@@ -453,11 +453,11 @@ tEplKernel EdrvShutdown(void)
453// State: 453// State:
454// 454//
455//--------------------------------------------------------------------------- 455//---------------------------------------------------------------------------
456tEplKernel EdrvDefineRxMacAddrEntry(BYTE * pbMacAddr_p) 456tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p)
457{ 457{
458 tEplKernel Ret = kEplSuccessful; 458 tEplKernel Ret = kEplSuccessful;
459 DWORD dwData; 459 DWORD dwData;
460 BYTE bHash; 460 u8 bHash;
461 461
462 bHash = EdrvCalcHash(pbMacAddr_p); 462 bHash = EdrvCalcHash(pbMacAddr_p);
463/* 463/*
@@ -494,11 +494,11 @@ tEplKernel EdrvDefineRxMacAddrEntry(BYTE * pbMacAddr_p)
494// State: 494// State:
495// 495//
496//--------------------------------------------------------------------------- 496//---------------------------------------------------------------------------
497tEplKernel EdrvUndefineRxMacAddrEntry(BYTE * pbMacAddr_p) 497tEplKernel EdrvUndefineRxMacAddrEntry(u8 * pbMacAddr_p)
498{ 498{
499 tEplKernel Ret = kEplSuccessful; 499 tEplKernel Ret = kEplSuccessful;
500 DWORD dwData; 500 DWORD dwData;
501 BYTE bHash; 501 u8 bHash;
502 502
503 bHash = EdrvCalcHash(pbMacAddr_p); 503 bHash = EdrvCalcHash(pbMacAddr_p);
504 504
@@ -720,7 +720,7 @@ tEplKernel EdrvTxMsgStart(tEdrvTxBuffer * pBuffer_p)
720//--------------------------------------------------------------------------- 720//---------------------------------------------------------------------------
721static void EdrvReinitRx(void) 721static void EdrvReinitRx(void)
722{ 722{
723 BYTE bCmd; 723 u8 bCmd;
724 724
725 // simply switch off and on the receiver 725 // simply switch off and on the receiver
726 // this will reset the CAPR register 726 // this will reset the CAPR register
@@ -765,7 +765,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p,
765 DWORD dwTxStatus; 765 DWORD dwTxStatus;
766 DWORD dwRxStatus; 766 DWORD dwRxStatus;
767 WORD wCurRx; 767 WORD wCurRx;
768 BYTE *pbRxBuf; 768 u8 *pbRxBuf;
769 unsigned int uiLength; 769 unsigned int uiLength;
770 int iHandled = IRQ_HANDLED; 770 int iHandled = IRQ_HANDLED;
771 771
@@ -1215,15 +1215,15 @@ static void EdrvRemoveOne(struct pci_dev *pPciDev)
1215//#define CRC32_POLY 0xEDB88320 // 1215//#define CRC32_POLY 0xEDB88320 //
1216// G(x) = x32 + x26 + x23 + x22 + x16 + x12 + x11 + x10 + x8 + x7 + x5 + x4 + x2 + x + 1 1216// G(x) = x32 + x26 + x23 + x22 + x16 + x12 + x11 + x10 + x8 + x7 + x5 + x4 + x2 + x + 1
1217 1217
1218static BYTE EdrvCalcHash(BYTE * pbMAC_p) 1218static u8 EdrvCalcHash(u8 * pbMAC_p)
1219{ 1219{
1220 DWORD dwByteCounter; 1220 DWORD dwByteCounter;
1221 DWORD dwBitCounter; 1221 DWORD dwBitCounter;
1222 DWORD dwData; 1222 DWORD dwData;
1223 DWORD dwCrc; 1223 DWORD dwCrc;
1224 DWORD dwCarry; 1224 DWORD dwCarry;
1225 BYTE *pbData; 1225 u8 *pbData;
1226 BYTE bHash; 1226 u8 bHash;
1227 1227
1228 pbData = pbMAC_p; 1228 pbData = pbMAC_p;
1229 1229
@@ -1246,7 +1246,7 @@ static BYTE EdrvCalcHash(BYTE * pbMAC_p)
1246// printk("MyCRC = 0x%08lX\n", dwCrc); 1246// printk("MyCRC = 0x%08lX\n", dwCrc);
1247 // only upper 6 bits (HASH_BITS) are used 1247 // only upper 6 bits (HASH_BITS) are used
1248 // which point to specific bit in the hash registers 1248 // which point to specific bit in the hash registers
1249 bHash = (BYTE) ((dwCrc >> (32 - HASH_BITS)) & 0x3f); 1249 bHash = (u8) ((dwCrc >> (32 - HASH_BITS)) & 0x3f);
1250 1250
1251 return bHash; 1251 return bHash;
1252} 1252}
diff --git a/drivers/staging/epl/EdrvFec.h b/drivers/staging/epl/EdrvFec.h
index 5f252fbed74..42bb8d32643 100644
--- a/drivers/staging/epl/EdrvFec.h
+++ b/drivers/staging/epl/EdrvFec.h
@@ -98,7 +98,7 @@
98typedef struct { 98typedef struct {
99 WORD m_wStatus; // control / status --- used by edrv, do not change in application 99 WORD m_wStatus; // control / status --- used by edrv, do not change in application
100 WORD m_wLength; // transfer length 100 WORD m_wLength; // transfer length
101 BYTE *m_pbData; // buffer address 101 u8 *m_pbData; // buffer address
102} tBufferDescr; 102} tBufferDescr;
103 103
104#if ((TARGET_HARDWARE & TGT_CPU_MASK_) == TGT_CPU_5282) 104#if ((TARGET_HARDWARE & TGT_CPU_MASK_) == TGT_CPU_5282)
diff --git a/drivers/staging/epl/EdrvSim.h b/drivers/staging/epl/EdrvSim.h
index 39300e321d6..9cbafb6295a 100644
--- a/drivers/staging/epl/EdrvSim.h
+++ b/drivers/staging/epl/EdrvSim.h
@@ -83,7 +83,7 @@
83// function prototypes 83// function prototypes
84//--------------------------------------------------------------------------- 84//---------------------------------------------------------------------------
85 85
86void EdrvRxInterruptHandler(BYTE bBufferInFrame_p, BYTE * pbEthernetData_p, 86void EdrvRxInterruptHandler(u8 bBufferInFrame_p, u8 * pbEthernetData_p,
87 WORD wDataLen_p); 87 WORD wDataLen_p);
88 88
89#endif // #ifndef _EDRVSIM_H_ 89#endif // #ifndef _EDRVSIM_H_
diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h
index 454b2ba6ad3..0a6b9b8a2dd 100644
--- a/drivers/staging/epl/Epl.h
+++ b/drivers/staging/epl/Epl.h
@@ -139,7 +139,7 @@ typedef struct {
139 unsigned int m_uiSizeOfStruct; 139 unsigned int m_uiSizeOfStruct;
140 BOOL m_fAsyncOnly; // do not need to register PRes 140 BOOL m_fAsyncOnly; // do not need to register PRes
141 unsigned int m_uiNodeId; // local node ID 141 unsigned int m_uiNodeId; // local node ID
142 BYTE m_abMacAddress[6]; // local MAC address 142 u8 m_abMacAddress[6]; // local MAC address
143 143
144 // 0x1F82: NMT_FeatureFlags_U32 144 // 0x1F82: NMT_FeatureFlags_U32
145 DWORD m_dwFeatureFlags; 145 DWORD m_dwFeatureFlags;
@@ -189,8 +189,8 @@ typedef struct {
189 DWORD m_dwIpAddress; 189 DWORD m_dwIpAddress;
190 DWORD m_dwSubnetMask; 190 DWORD m_dwSubnetMask;
191 DWORD m_dwDefaultGateway; 191 DWORD m_dwDefaultGateway;
192 BYTE m_sHostname[32]; 192 u8 m_sHostname[32];
193 BYTE m_abVendorSpecificExt2[48]; 193 u8 m_abVendorSpecificExt2[48];
194 194
195 char *m_pszDevName; // NMT_ManufactDevName_VS (0x1008/0 local OD) 195 char *m_pszDevName; // NMT_ManufactDevName_VS (0x1008/0 local OD)
196 char *m_pszHwVersion; // NMT_ManufactHwVers_VS (0x1009/0 local OD) 196 char *m_pszHwVersion; // NMT_ManufactHwVers_VS (0x1009/0 local OD)
diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h
index d3e47cbd3c9..7abcb6c2028 100644
--- a/drivers/staging/epl/EplAmi.h
+++ b/drivers/staging/epl/EplAmi.h
@@ -69,7 +69,7 @@
69 69
70 16.09.2002 -as 70 16.09.2002 -as
71 To save code space the functions AmiSetByte and AmiGetByte 71 To save code space the functions AmiSetByte and AmiGetByte
72 are replaced by macros. For targets which assign BYTE by 72 are replaced by macros. For targets which assign u8 by
73 an 16Bit type, the definition of macros must changed to 73 an 16Bit type, the definition of macros must changed to
74 functions. 74 functions.
75 75
@@ -105,10 +105,10 @@ extern "C" {
105// 105//
106// To save code space the function AmiSetByte is replaced by 106// To save code space the function AmiSetByte is replaced by
107// an macro. 107// an macro.
108// void AmiSetByte (void * pAddr_p, BYTE bByteVal_p); 108// void AmiSetByte (void * pAddr_p, u8 bByteVal_p);
109 109
110#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(BYTE *)(pAddr_p) = (bByteVal_p);} 110#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);}
111#define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(BYTE *)(pAddr_p) = (bByteVal_p);} 111#define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);}
112 112
113void AmiSetWordToBe(void *pAddr_p, WORD wWordVal_p); 113void AmiSetWordToBe(void *pAddr_p, WORD wWordVal_p);
114void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p); 114void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p);
@@ -121,10 +121,10 @@ void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p);
121// 121//
122// To save code space the function AmiGetByte is replaced by 122// To save code space the function AmiGetByte is replaced by
123// an macro. 123// an macro.
124// BYTE AmiGetByte (void * pAddr_p); 124// u8 AmiGetByte (void * pAddr_p);
125 125
126#define AmiGetByteFromBe(pAddr_p) (*(BYTE *)(pAddr_p)) 126#define AmiGetByteFromBe(pAddr_p) (*(u8 *)(pAddr_p))
127#define AmiGetByteFromLe(pAddr_p) (*(BYTE *)(pAddr_p)) 127#define AmiGetByteFromLe(pAddr_p) (*(u8 *)(pAddr_p))
128 128
129WORD AmiGetWordFromBe(void *pAddr_p); 129WORD AmiGetWordFromBe(void *pAddr_p);
130DWORD AmiGetDwordFromBe(void *pAddr_p); 130DWORD AmiGetDwordFromBe(void *pAddr_p);
diff --git a/drivers/staging/epl/EplApiGeneric.c b/drivers/staging/epl/EplApiGeneric.c
index 7a52267aca0..2dd0b33b8be 100644
--- a/drivers/staging/epl/EplApiGeneric.c
+++ b/drivers/staging/epl/EplApiGeneric.c
@@ -556,9 +556,9 @@ tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p,
556 tEplObdSize *pEntrySize_p, 556 tEplObdSize *pEntrySize_p,
557 unsigned int uiFirstSubindex_p) 557 unsigned int uiFirstSubindex_p)
558{ 558{
559 BYTE bVarEntries; 559 u8 bVarEntries;
560 BYTE bIndexEntries; 560 u8 bIndexEntries;
561 BYTE *pbData; 561 u8 *pbData;
562 unsigned int uiSubindex; 562 unsigned int uiSubindex;
563 tEplVarParam VarParam; 563 tEplVarParam VarParam;
564 tEplObdSize EntrySize; 564 tEplObdSize EntrySize;
@@ -574,8 +574,8 @@ tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p,
574 goto Exit; 574 goto Exit;
575 } 575 }
576 576
577 pbData = (BYTE *)pVar_p; 577 pbData = (u8 *)pVar_p;
578 bVarEntries = (BYTE) * puiVarEntries_p; 578 bVarEntries = (u8) * puiVarEntries_p;
579 UsedSize = 0; 579 UsedSize = 0;
580 580
581 // init VarParam structure with default values 581 // init VarParam structure with default values
@@ -607,7 +607,7 @@ tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p,
607 // object actually has. 607 // object actually has.
608 if ((bIndexEntries > (bVarEntries + uiFirstSubindex_p - 1)) && 608 if ((bIndexEntries > (bVarEntries + uiFirstSubindex_p - 1)) &&
609 (bVarEntries != 0x00)) { 609 (bVarEntries != 0x00)) {
610 bIndexEntries = (BYTE) (bVarEntries + uiFirstSubindex_p - 1); 610 bIndexEntries = (u8) (bVarEntries + uiFirstSubindex_p - 1);
611 } 611 }
612 // map entries 612 // map entries
613 for (uiSubindex = uiFirstSubindex_p; uiSubindex <= bIndexEntries; 613 for (uiSubindex = uiFirstSubindex_p; uiSubindex <= bIndexEntries;
@@ -1012,9 +1012,9 @@ tEplKernel EplApiCbObdAccess(tEplObdCbParam *pParam_p)
1012 case 0x1F9E: // NMT_ResetCmd_U8 1012 case 0x1F9E: // NMT_ResetCmd_U8
1013 { 1013 {
1014 if (pParam_p->m_ObdEvent == kEplObdEvPreWrite) { 1014 if (pParam_p->m_ObdEvent == kEplObdEvPreWrite) {
1015 BYTE bNmtCommand; 1015 u8 bNmtCommand;
1016 1016
1017 bNmtCommand = *((BYTE *) pParam_p->m_pArg); 1017 bNmtCommand = *((u8 *) pParam_p->m_pArg);
1018 // check value range 1018 // check value range
1019 switch ((tEplNmtCommand) bNmtCommand) { 1019 switch ((tEplNmtCommand) bNmtCommand) {
1020 case kEplNmtCmdResetNode: 1020 case kEplNmtCmdResetNode:
@@ -1032,9 +1032,9 @@ tEplKernel EplApiCbObdAccess(tEplObdCbParam *pParam_p)
1032 break; 1032 break;
1033 } 1033 }
1034 } else if (pParam_p->m_ObdEvent == kEplObdEvPostWrite) { 1034 } else if (pParam_p->m_ObdEvent == kEplObdEvPostWrite) {
1035 BYTE bNmtCommand; 1035 u8 bNmtCommand;
1036 1036
1037 bNmtCommand = *((BYTE *) pParam_p->m_pArg); 1037 bNmtCommand = *((u8 *) pParam_p->m_pArg);
1038 // check value range 1038 // check value range
1039 switch ((tEplNmtCommand) bNmtCommand) { 1039 switch ((tEplNmtCommand) bNmtCommand) {
1040 case kEplNmtCmdResetNode: 1040 case kEplNmtCmdResetNode:
@@ -1187,11 +1187,11 @@ static tEplKernel EplApiProcessEvent(tEplEvent *pEplEvent_p)
1187static tEplKernel EplApiCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p) 1187static tEplKernel EplApiCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p)
1188{ 1188{
1189 tEplKernel Ret = kEplSuccessful; 1189 tEplKernel Ret = kEplSuccessful;
1190 BYTE bNmtState; 1190 u8 bNmtState;
1191 tEplApiEventArg EventArg; 1191 tEplApiEventArg EventArg;
1192 1192
1193 // save NMT state in OD 1193 // save NMT state in OD
1194 bNmtState = (BYTE) NmtStateChange_p.m_NewNmtState; 1194 bNmtState = (u8) NmtStateChange_p.m_NewNmtState;
1195 Ret = EplObdWriteEntry(0x1F8C, 0, &bNmtState, 1); 1195 Ret = EplObdWriteEntry(0x1F8C, 0, &bNmtState, 1);
1196 if (Ret != kEplSuccessful) { 1196 if (Ret != kEplSuccessful) {
1197 goto Exit; 1197 goto Exit;
@@ -1270,7 +1270,7 @@ static tEplKernel EplApiCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_
1270 case kEplNmtCsNotActive: 1270 case kEplNmtCsNotActive:
1271 { 1271 {
1272 // indicate completion of reset in NMT_ResetCmd_U8 1272 // indicate completion of reset in NMT_ResetCmd_U8
1273 bNmtState = (BYTE) kEplNmtCmdInvalidService; 1273 bNmtState = (u8) kEplNmtCmdInvalidService;
1274 Ret = EplObdWriteEntry(0x1F9E, 0, &bNmtState, 1); 1274 Ret = EplObdWriteEntry(0x1F9E, 0, &bNmtState, 1);
1275 if (Ret != kEplSuccessful) { 1275 if (Ret != kEplSuccessful) {
1276 goto Exit; 1276 goto Exit;
@@ -1413,7 +1413,7 @@ static tEplKernel EplApiUpdateDllConfig(BOOL fUpdateIdentity_p)
1413 tEplDllIdentParam DllIdentParam; 1413 tEplDllIdentParam DllIdentParam;
1414 tEplObdSize ObdSize; 1414 tEplObdSize ObdSize;
1415 WORD wTemp; 1415 WORD wTemp;
1416 BYTE bTemp; 1416 u8 bTemp;
1417 1417
1418 // configure Dll 1418 // configure Dll
1419 EPL_MEMSET(&DllConfigParam, 0, sizeof(DllConfigParam)); 1419 EPL_MEMSET(&DllConfigParam, 0, sizeof(DllConfigParam));
@@ -1633,7 +1633,7 @@ static tEplKernel EplApiUpdateObd(void)
1633{ 1633{
1634 tEplKernel Ret = kEplSuccessful; 1634 tEplKernel Ret = kEplSuccessful;
1635 WORD wTemp; 1635 WORD wTemp;
1636 BYTE bTemp; 1636 u8 bTemp;
1637 1637
1638 // set node id in OD 1638 // set node id in OD
1639 Ret = EplObdSetNodeId(EplApiInstance_g.m_InitParam.m_uiNodeId, // node id 1639 Ret = EplObdSetNodeId(EplApiInstance_g.m_InitParam.m_uiNodeId, // node id
@@ -1730,7 +1730,7 @@ static tEplKernel EplApiUpdateObd(void)
1730 }*/ 1730 }*/
1731 1731
1732 if (EplApiInstance_g.m_InitParam.m_uiMultiplCycleCnt <= 0xFF) { 1732 if (EplApiInstance_g.m_InitParam.m_uiMultiplCycleCnt <= 0xFF) {
1733 bTemp = (BYTE) EplApiInstance_g.m_InitParam.m_uiMultiplCycleCnt; 1733 bTemp = (u8) EplApiInstance_g.m_InitParam.m_uiMultiplCycleCnt;
1734 Ret = EplObdWriteEntry(0x1F98, 7, &bTemp, 1); 1734 Ret = EplObdWriteEntry(0x1F98, 7, &bTemp, 1);
1735/* if(Ret != kEplSuccessful) 1735/* if(Ret != kEplSuccessful)
1736 { 1736 {
diff --git a/drivers/staging/epl/EplApiLinuxKernel.c b/drivers/staging/epl/EplApiLinuxKernel.c
index 52f8e1bd473..a994b16d849 100644
--- a/drivers/staging/epl/EplApiLinuxKernel.c
+++ b/drivers/staging/epl/EplApiLinuxKernel.c
@@ -139,7 +139,7 @@ MODULE_DESCRIPTION("EPL API driver");
139 139
140// TracePoint support for realtime-debugging 140// TracePoint support for realtime-debugging
141#ifdef _DBG_TRACE_POINTS_ 141#ifdef _DBG_TRACE_POINTS_
142void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); 142void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);
143#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 143#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)
144#else 144#else
145#define TGT_DBG_SIGNAL_TRACE_POINT(p) 145#define TGT_DBG_SIGNAL_TRACE_POINT(p)
diff --git a/drivers/staging/epl/EplApiProcessImage.c b/drivers/staging/epl/EplApiProcessImage.c
index 869d97a4bd1..7d55086a8e4 100644
--- a/drivers/staging/epl/EplApiProcessImage.c
+++ b/drivers/staging/epl/EplApiProcessImage.c
@@ -126,10 +126,10 @@
126#if ((EPL_API_PROCESS_IMAGE_SIZE_IN > 0) || (EPL_API_PROCESS_IMAGE_SIZE_OUT > 0)) 126#if ((EPL_API_PROCESS_IMAGE_SIZE_IN > 0) || (EPL_API_PROCESS_IMAGE_SIZE_OUT > 0))
127typedef struct { 127typedef struct {
128#if EPL_API_PROCESS_IMAGE_SIZE_IN > 0 128#if EPL_API_PROCESS_IMAGE_SIZE_IN > 0
129 BYTE m_abProcessImageInput[EPL_API_PROCESS_IMAGE_SIZE_IN]; 129 u8 m_abProcessImageInput[EPL_API_PROCESS_IMAGE_SIZE_IN];
130#endif 130#endif
131#if EPL_API_PROCESS_IMAGE_SIZE_OUT > 0 131#if EPL_API_PROCESS_IMAGE_SIZE_OUT > 0
132 BYTE m_abProcessImageOutput[EPL_API_PROCESS_IMAGE_SIZE_OUT]; 132 u8 m_abProcessImageOutput[EPL_API_PROCESS_IMAGE_SIZE_OUT];
133#endif 133#endif
134 134
135} tEplApiProcessImageInstance; 135} tEplApiProcessImageInstance;
diff --git a/drivers/staging/epl/EplDll.h b/drivers/staging/epl/EplDll.h
index 36657f2daf8..cd2d25d5506 100644
--- a/drivers/staging/epl/EplDll.h
+++ b/drivers/staging/epl/EplDll.h
@@ -185,8 +185,8 @@ typedef struct {
185 DWORD m_dwIpAddress; 185 DWORD m_dwIpAddress;
186 DWORD m_dwSubnetMask; 186 DWORD m_dwSubnetMask;
187 DWORD m_dwDefaultGateway; 187 DWORD m_dwDefaultGateway;
188 BYTE m_sHostname[32]; 188 u8 m_sHostname[32];
189 BYTE m_abVendorSpecificExt2[48]; 189 u8 m_abVendorSpecificExt2[48];
190 190
191} tEplDllIdentParam; 191} tEplDllIdentParam;
192 192
diff --git a/drivers/staging/epl/EplDllCal.h b/drivers/staging/epl/EplDllCal.h
index 24460087e98..70b27b1b676 100644
--- a/drivers/staging/epl/EplDllCal.h
+++ b/drivers/staging/epl/EplDllCal.h
@@ -112,7 +112,7 @@ typedef struct {
112typedef struct { 112typedef struct {
113 tEplDllReqServiceId m_Service; 113 tEplDllReqServiceId m_Service;
114 unsigned int m_uiNodeId; 114 unsigned int m_uiNodeId;
115 BYTE m_bSoaFlag1; 115 u8 m_bSoaFlag1;
116 116
117} tEplDllCalIssueRequest; 117} tEplDllCalIssueRequest;
118 118
diff --git a/drivers/staging/epl/EplDllk.c b/drivers/staging/epl/EplDllk.c
index 8fafe752442..d22e74ee25e 100644
--- a/drivers/staging/epl/EplDllk.c
+++ b/drivers/staging/epl/EplDllk.c
@@ -121,7 +121,7 @@
121 121
122// TracePoint support for realtime-debugging 122// TracePoint support for realtime-debugging
123#ifdef _DBG_TRACE_POINTS_ 123#ifdef _DBG_TRACE_POINTS_
124void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); 124void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);
125void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 125void TgtDbgPostTraceValue(DWORD dwTraceValue_p);
126#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 126#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)
127#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 127#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v)
@@ -195,12 +195,12 @@ typedef enum {
195} tEplDllState; 195} tEplDllState;
196 196
197typedef struct { 197typedef struct {
198 BYTE m_be_abSrcMac[6]; 198 u8 m_be_abSrcMac[6];
199 tEdrvTxBuffer *m_pTxBuffer; // Buffers for Tx-Frames 199 tEdrvTxBuffer *m_pTxBuffer; // Buffers for Tx-Frames
200 unsigned int m_uiMaxTxFrames; 200 unsigned int m_uiMaxTxFrames;
201 BYTE m_bFlag1; // Flag 1 with EN, EC for PRes, StatusRes 201 u8 m_bFlag1; // Flag 1 with EN, EC for PRes, StatusRes
202 BYTE m_bMnFlag1; // Flag 1 with EA, ER from PReq, SoA of MN 202 u8 m_bMnFlag1; // Flag 1 with EA, ER from PReq, SoA of MN
203 BYTE m_bFlag2; // Flag 2 with PR and RS for PRes, StatusRes, IdentRes 203 u8 m_bFlag2; // Flag 2 with PR and RS for PRes, StatusRes, IdentRes
204 tEplDllConfigParam m_DllConfigParam; 204 tEplDllConfigParam m_DllConfigParam;
205 tEplDllIdentParam m_DllIdentParam; 205 tEplDllIdentParam m_DllIdentParam;
206 tEplDllState m_DllState; 206 tEplDllState m_DllState;
@@ -513,7 +513,7 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p,
513 EPL_C_DLL_ETHERTYPE_EPL); 513 EPL_C_DLL_ETHERTYPE_EPL);
514 // source node ID 514 // source node ID
515 AmiSetByteToLe(&pTxFrame->m_le_bSrcNodeId, 515 AmiSetByteToLe(&pTxFrame->m_le_bSrcNodeId,
516 (BYTE) EplDllkInstance_g.m_DllConfigParam. 516 (u8) EplDllkInstance_g.m_DllConfigParam.
517 m_uiNodeId); 517 m_uiNodeId);
518 // source MAC address 518 // source MAC address
519 EPL_MEMCPY(&pTxFrame->m_be_abSrcMac[0], 519 EPL_MEMCPY(&pTxFrame->m_be_abSrcMac[0],
@@ -530,7 +530,7 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p,
530 { // IdentResponses and StatusResponses are Broadcast 530 { // IdentResponses and StatusResponses are Broadcast
531 AmiSetByteToLe(&pTxFrame-> 531 AmiSetByteToLe(&pTxFrame->
532 m_le_bDstNodeId, 532 m_le_bDstNodeId,
533 (BYTE) 533 (u8)
534 EPL_C_ADR_BROADCAST); 534 EPL_C_ADR_BROADCAST);
535 break; 535 break;
536 } 536 }
@@ -549,10 +549,10 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p,
549 EPL_C_DLL_MULTICAST_SOC); 549 EPL_C_DLL_MULTICAST_SOC);
550 // destination node ID 550 // destination node ID
551 AmiSetByteToLe(&pTxFrame->m_le_bDstNodeId, 551 AmiSetByteToLe(&pTxFrame->m_le_bDstNodeId,
552 (BYTE) EPL_C_ADR_BROADCAST); 552 (u8) EPL_C_ADR_BROADCAST);
553 // reset Flags 553 // reset Flags
554 //AmiSetByteToLe(&pTxFrame->m_Data.m_Soc.m_le_bFlag1, (BYTE) 0); 554 //AmiSetByteToLe(&pTxFrame->m_Data.m_Soc.m_le_bFlag1, (u8) 0);
555 //AmiSetByteToLe(&pTxFrame->m_Data.m_Soc.m_le_bFlag2, (BYTE) 0); 555 //AmiSetByteToLe(&pTxFrame->m_Data.m_Soc.m_le_bFlag2, (u8) 0);
556 break; 556 break;
557 557
558 case kEplMsgTypeSoa: 558 case kEplMsgTypeSoa:
@@ -561,13 +561,13 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p,
561 EPL_C_DLL_MULTICAST_SOA); 561 EPL_C_DLL_MULTICAST_SOA);
562 // destination node ID 562 // destination node ID
563 AmiSetByteToLe(&pTxFrame->m_le_bDstNodeId, 563 AmiSetByteToLe(&pTxFrame->m_le_bDstNodeId,
564 (BYTE) EPL_C_ADR_BROADCAST); 564 (u8) EPL_C_ADR_BROADCAST);
565 // reset Flags 565 // reset Flags
566 //AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bFlag1, (BYTE) 0); 566 //AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bFlag1, (u8) 0);
567 //AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bFlag2, (BYTE) 0); 567 //AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bFlag2, (u8) 0);
568 // EPL profile version 568 // EPL profile version
569 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bEplVersion, 569 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bEplVersion,
570 (BYTE) EPL_SPEC_VERSION); 570 (u8) EPL_SPEC_VERSION);
571 break; 571 break;
572 572
573 case kEplMsgTypePres: 573 case kEplMsgTypePres:
@@ -576,18 +576,18 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p,
576 EPL_C_DLL_MULTICAST_PRES); 576 EPL_C_DLL_MULTICAST_PRES);
577 // destination node ID 577 // destination node ID
578 AmiSetByteToLe(&pTxFrame->m_le_bDstNodeId, 578 AmiSetByteToLe(&pTxFrame->m_le_bDstNodeId,
579 (BYTE) EPL_C_ADR_BROADCAST); 579 (u8) EPL_C_ADR_BROADCAST);
580 // reset Flags 580 // reset Flags
581 //AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.m_le_bFlag1, (BYTE) 0); 581 //AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.m_le_bFlag1, (u8) 0);
582 //AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.m_le_bFlag2, (BYTE) 0); 582 //AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.m_le_bFlag2, (u8) 0);
583 // PDO size 583 // PDO size
584 //AmiSetWordToLe(&pTxFrame->m_Data.m_Pres.m_le_wSize, 0); 584 //AmiSetWordToLe(&pTxFrame->m_Data.m_Pres.m_le_wSize, 0);
585 break; 585 break;
586 586
587 case kEplMsgTypePreq: 587 case kEplMsgTypePreq:
588 // reset Flags 588 // reset Flags
589 //AmiSetByteToLe(&pTxFrame->m_Data.m_Preq.m_le_bFlag1, (BYTE) 0); 589 //AmiSetByteToLe(&pTxFrame->m_Data.m_Preq.m_le_bFlag1, (u8) 0);
590 //AmiSetByteToLe(&pTxFrame->m_Data.m_Preq.m_le_bFlag2, (BYTE) 0); 590 //AmiSetByteToLe(&pTxFrame->m_Data.m_Preq.m_le_bFlag2, (u8) 0);
591 // PDO size 591 // PDO size
592 //AmiSetWordToLe(&pTxFrame->m_Data.m_Preq.m_le_wSize, 0); 592 //AmiSetWordToLe(&pTxFrame->m_Data.m_Preq.m_le_wSize, 0);
593 break; 593 break;
@@ -596,7 +596,7 @@ tEplKernel EplDllkCreateTxFrame(unsigned int *puiHandle_p,
596 break; 596 break;
597 } 597 }
598 // EPL message type 598 // EPL message type
599 AmiSetByteToLe(&pTxFrame->m_le_bMessageType, (BYTE) MsgType_p); 599 AmiSetByteToLe(&pTxFrame->m_le_bMessageType, (u8) MsgType_p);
600 } 600 }
601 601
602 *ppFrame_p = pTxFrame; 602 *ppFrame_p = pTxFrame;
@@ -672,7 +672,7 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p)
672 tEdrvTxBuffer *pTxBuffer; 672 tEdrvTxBuffer *pTxBuffer;
673 unsigned int uiHandle; 673 unsigned int uiHandle;
674 unsigned int uiFrameSize; 674 unsigned int uiFrameSize;
675 BYTE abMulticastMac[6]; 675 u8 abMulticastMac[6];
676 tEplDllAsyncReqPriority AsyncReqPriority; 676 tEplDllAsyncReqPriority AsyncReqPriority;
677 unsigned int uiFrameCount; 677 unsigned int uiFrameCount;
678 tEplNmtState NmtState; 678 tEplNmtState NmtState;
@@ -711,7 +711,7 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p)
711 // EPL profile version 711 // EPL profile version
712 AmiSetByteToLe(&pTxFrame->m_Data.m_Asnd.m_Payload. 712 AmiSetByteToLe(&pTxFrame->m_Data.m_Asnd.m_Payload.
713 m_IdentResponse.m_le_bEplProfileVersion, 713 m_IdentResponse.m_le_bEplProfileVersion,
714 (BYTE) EPL_SPEC_VERSION); 714 (u8) EPL_SPEC_VERSION);
715 // FeatureFlags 715 // FeatureFlags
716 AmiSetDwordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload. 716 AmiSetDwordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload.
717 m_IdentResponse.m_le_dwFeatureFlags, 717 m_IdentResponse.m_le_dwFeatureFlags,
@@ -1232,7 +1232,7 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p)
1232 } 1232 }
1233 if (uiFrameCount > 0) { 1233 if (uiFrameCount > 0) {
1234 EplDllkInstance_g.m_bFlag2 = 1234 EplDllkInstance_g.m_bFlag2 =
1235 (BYTE) (((AsyncReqPriority << 1235 (u8) (((AsyncReqPriority <<
1236 EPL_FRAME_FLAG2_PR_SHIFT) 1236 EPL_FRAME_FLAG2_PR_SHIFT)
1237 & EPL_FRAME_FLAG2_PR) 1237 & EPL_FRAME_FLAG2_PR)
1238 | (uiFrameCount & 1238 | (uiFrameCount &
@@ -1306,7 +1306,7 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p)
1306 } 1306 }
1307 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. 1307 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.
1308 m_le_bNmtStatus, 1308 m_le_bNmtStatus,
1309 (BYTE) NmtState); 1309 (u8) NmtState);
1310 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. 1310 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.
1311 m_le_bFlag2, 1311 m_le_bFlag2,
1312 EplDllkInstance_g. 1312 EplDllkInstance_g.
@@ -1532,7 +1532,7 @@ tEplKernel EplDllkSetAsndServiceIdFilter(tEplDllAsndServiceId ServiceId_p,
1532// 1532//
1533//--------------------------------------------------------------------------- 1533//---------------------------------------------------------------------------
1534 1534
1535tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, BYTE bSoaFlag1_p) 1535tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, u8 bSoaFlag1_p)
1536{ 1536{
1537 tEplKernel Ret = kEplSuccessful; 1537 tEplKernel Ret = kEplSuccessful;
1538 tEplDllkNodeInfo *pNodeInfo; 1538 tEplDllkNodeInfo *pNodeInfo;
@@ -1663,7 +1663,7 @@ tEplKernel EplDllkAddNode(tEplDllNodeInfo * pNodeInfo_p)
1663 pIntNodeInfo->m_pPreqTxBuffer = 1663 pIntNodeInfo->m_pPreqTxBuffer =
1664 &EplDllkInstance_g.m_pTxBuffer[uiHandle]; 1664 &EplDllkInstance_g.m_pTxBuffer[uiHandle];
1665 AmiSetByteToLe(&pFrame->m_le_bDstNodeId, 1665 AmiSetByteToLe(&pFrame->m_le_bDstNodeId,
1666 (BYTE) pNodeInfo_p->m_uiNodeId); 1666 (u8) pNodeInfo_p->m_uiNodeId);
1667 1667
1668 // set up destination MAC address 1668 // set up destination MAC address
1669 EPL_MEMCPY(pFrame->m_be_abDstMac, pIntNodeInfo->m_be_abMacAddr, 1669 EPL_MEMCPY(pFrame->m_be_abDstMac, pIntNodeInfo->m_be_abMacAddr,
@@ -2430,7 +2430,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p)
2430 tEplDllReqServiceId ReqServiceId; 2430 tEplDllReqServiceId ReqServiceId;
2431 unsigned int uiAsndServiceId; 2431 unsigned int uiAsndServiceId;
2432 unsigned int uiNodeId; 2432 unsigned int uiNodeId;
2433 BYTE bFlag1; 2433 u8 bFlag1;
2434 2434
2435 BENCHMARK_MOD_02_SET(3); 2435 BENCHMARK_MOD_02_SET(3);
2436 NmtState = EplNmtkGetNmtState(); 2436 NmtState = EplNmtkGetNmtState();
@@ -2465,7 +2465,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p)
2465 // update frame (NMT state, RD, RS, PR, MS, EN flags) 2465 // update frame (NMT state, RD, RS, PR, MS, EN flags)
2466 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. 2466 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.
2467 m_le_bNmtStatus, 2467 m_le_bNmtStatus,
2468 (BYTE) NmtState); 2468 (u8) NmtState);
2469 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. 2469 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.
2470 m_le_bFlag2, 2470 m_le_bFlag2,
2471 EplDllkInstance_g. 2471 EplDllkInstance_g.
@@ -2540,7 +2540,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p)
2540 // update frame (NMT state, RD, RS, PR, MS, EN flags) 2540 // update frame (NMT state, RD, RS, PR, MS, EN flags)
2541 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. 2541 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.
2542 m_le_bNmtStatus, 2542 m_le_bNmtStatus,
2543 (BYTE) NmtState); 2543 (u8) NmtState);
2544 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. 2544 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.
2545 m_le_bFlag2, 2545 m_le_bFlag2,
2546 EplDllkInstance_g. 2546 EplDllkInstance_g.
@@ -2802,7 +2802,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p)
2802 } 2802 }
2803 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. 2803 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.
2804 m_le_bNmtStatus, 2804 m_le_bNmtStatus,
2805 (BYTE) NmtState); 2805 (u8) NmtState);
2806 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres. 2806 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.
2807 m_le_bFlag2, 2807 m_le_bFlag2,
2808 EplDllkInstance_g.m_bFlag2); 2808 EplDllkInstance_g.m_bFlag2);
@@ -2887,7 +2887,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p)
2887 m_Payload. 2887 m_Payload.
2888 m_StatusResponse. 2888 m_StatusResponse.
2889 m_le_bNmtStatus, 2889 m_le_bNmtStatus,
2890 (BYTE) NmtState); 2890 (u8) NmtState);
2891 AmiSetByteToLe(&pTxFrame-> 2891 AmiSetByteToLe(&pTxFrame->
2892 m_Data.m_Asnd. 2892 m_Data.m_Asnd.
2893 m_Payload. 2893 m_Payload.
@@ -2953,7 +2953,7 @@ static void EplDllkCbFrameReceived(tEdrvRxBuffer * pRxBuffer_p)
2953 m_Payload. 2953 m_Payload.
2954 m_IdentResponse. 2954 m_IdentResponse.
2955 m_le_bNmtStatus, 2955 m_le_bNmtStatus,
2956 (BYTE) NmtState); 2956 (u8) NmtState);
2957 AmiSetByteToLe(&pTxFrame-> 2957 AmiSetByteToLe(&pTxFrame->
2958 m_Data.m_Asnd. 2958 m_Data.m_Asnd.
2959 m_Payload. 2959 m_Payload.
@@ -3285,7 +3285,7 @@ static void EplDllkCbFrameTransmitted(tEdrvTxBuffer * pTxBuffer_p)
3285 m_Payload. 3285 m_Payload.
3286 m_StatusResponse. 3286 m_StatusResponse.
3287 m_le_bNmtStatus, 3287 m_le_bNmtStatus,
3288 (BYTE) NmtState); 3288 (u8) NmtState);
3289 AmiSetByteToLe(&pTxFrame->m_Data.m_Asnd. 3289 AmiSetByteToLe(&pTxFrame->m_Data.m_Asnd.
3290 m_Payload. 3290 m_Payload.
3291 m_StatusResponse. 3291 m_StatusResponse.
@@ -3321,7 +3321,7 @@ static void EplDllkCbFrameTransmitted(tEdrvTxBuffer * pTxBuffer_p)
3321 m_Payload. 3321 m_Payload.
3322 m_IdentResponse. 3322 m_IdentResponse.
3323 m_le_bNmtStatus, 3323 m_le_bNmtStatus,
3324 (BYTE) NmtState); 3324 (u8) NmtState);
3325 AmiSetByteToLe(&pTxFrame->m_Data.m_Asnd. 3325 AmiSetByteToLe(&pTxFrame->m_Data.m_Asnd.
3326 m_Payload. 3326 m_Payload.
3327 m_IdentResponse. 3327 m_IdentResponse.
@@ -3361,12 +3361,12 @@ static void EplDllkCbFrameTransmitted(tEdrvTxBuffer * pTxBuffer_p)
3361 if ((AmiGetByteFromLe 3361 if ((AmiGetByteFromLe
3362 (&pTxFrame-> 3362 (&pTxFrame->
3363 m_le_bMessageType) 3363 m_le_bMessageType)
3364 == (BYTE) kEplMsgTypeAsnd) 3364 == (u8) kEplMsgTypeAsnd)
3365 && 3365 &&
3366 (AmiGetByteFromLe 3366 (AmiGetByteFromLe
3367 (&pTxFrame->m_Data.m_Asnd. 3367 (&pTxFrame->m_Data.m_Asnd.
3368 m_le_bServiceId) 3368 m_le_bServiceId)
3369 == (BYTE) kEplDllAsndNmtCommand)) { // post event directly to NmtMnu module 3369 == (u8) kEplDllAsndNmtCommand)) { // post event directly to NmtMnu module
3370 Event.m_EventSink = 3370 Event.m_EventSink =
3371 kEplEventSinkNmtMnu; 3371 kEplEventSinkNmtMnu;
3372 Event.m_EventType = 3372 Event.m_EventType =
@@ -3505,7 +3505,7 @@ static tEplKernel EplDllkCheckFrame(tEplFrame * pFrame_p,
3505 if (wEtherType == EPL_C_DLL_ETHERTYPE_EPL) { 3505 if (wEtherType == EPL_C_DLL_ETHERTYPE_EPL) {
3506 // source node ID 3506 // source node ID
3507 AmiSetByteToLe(&pFrame_p->m_le_bSrcNodeId, 3507 AmiSetByteToLe(&pFrame_p->m_le_bSrcNodeId,
3508 (BYTE) EplDllkInstance_g. 3508 (u8) EplDllkInstance_g.
3509 m_DllConfigParam.m_uiNodeId); 3509 m_DllConfigParam.m_uiNodeId);
3510 3510
3511 // check message type 3511 // check message type
@@ -3514,7 +3514,7 @@ static tEplKernel EplDllkCheckFrame(tEplFrame * pFrame_p,
3514 if (MsgType == 0) { 3514 if (MsgType == 0) {
3515 MsgType = kEplMsgTypeAsnd; 3515 MsgType = kEplMsgTypeAsnd;
3516 AmiSetByteToLe(&pFrame_p->m_le_bMessageType, 3516 AmiSetByteToLe(&pFrame_p->m_le_bMessageType,
3517 (BYTE) MsgType); 3517 (u8) MsgType);
3518 } 3518 }
3519 3519
3520 if (MsgType == kEplMsgTypeAsnd) { 3520 if (MsgType == kEplMsgTypeAsnd) {
@@ -3825,24 +3825,24 @@ static tEplKernel EplDllkMnSendSoa(tEplNmtState NmtState_p,
3825 // update frame (target) 3825 // update frame (target)
3826 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa. 3826 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.
3827 m_le_bReqServiceId, 3827 m_le_bReqServiceId,
3828 (BYTE) EplDllkInstance_g. 3828 (u8) EplDllkInstance_g.
3829 m_LastReqServiceId); 3829 m_LastReqServiceId);
3830 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa. 3830 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.
3831 m_le_bReqServiceTarget, 3831 m_le_bReqServiceTarget,
3832 (BYTE) EplDllkInstance_g. 3832 (u8) EplDllkInstance_g.
3833 m_uiLastTargetNodeId); 3833 m_uiLastTargetNodeId);
3834 3834
3835 } else { // invite nobody 3835 } else { // invite nobody
3836 // update frame (target) 3836 // update frame (target)
3837 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa. 3837 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.
3838 m_le_bReqServiceId, (BYTE) 0); 3838 m_le_bReqServiceId, (u8) 0);
3839 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa. 3839 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.
3840 m_le_bReqServiceTarget, (BYTE) 0); 3840 m_le_bReqServiceTarget, (u8) 0);
3841 } 3841 }
3842 3842
3843 // update frame (NMT state) 3843 // update frame (NMT state)
3844 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bNmtStatus, 3844 AmiSetByteToLe(&pTxFrame->m_Data.m_Soa.m_le_bNmtStatus,
3845 (BYTE) NmtState_p); 3845 (u8) NmtState_p);
3846 3846
3847 // send SoA frame 3847 // send SoA frame
3848 Ret = EdrvSendTxMsg(pTxBuffer); 3848 Ret = EdrvSendTxMsg(pTxBuffer);
@@ -3919,7 +3919,7 @@ static tEplKernel EplDllkMnSendPreq(tEplNmtState NmtState_p,
3919 tEplKernel Ret = kEplSuccessful; 3919 tEplKernel Ret = kEplSuccessful;
3920 tEdrvTxBuffer *pTxBuffer = NULL; 3920 tEdrvTxBuffer *pTxBuffer = NULL;
3921 tEplFrame *pTxFrame; 3921 tEplFrame *pTxFrame;
3922 BYTE bFlag1 = 0; 3922 u8 bFlag1 = 0;
3923 3923
3924 if (EplDllkInstance_g.m_pCurNodeInfo == NULL) { // start with first isochronous CN 3924 if (EplDllkInstance_g.m_pCurNodeInfo == NULL) { // start with first isochronous CN
3925 EplDllkInstance_g.m_pCurNodeInfo = 3925 EplDllkInstance_g.m_pCurNodeInfo =
@@ -3970,7 +3970,7 @@ static tEplKernel EplDllkMnSendPreq(tEplNmtState NmtState_p,
3970 if (pTxBuffer == &EplDllkInstance_g.m_pTxBuffer[EPL_DLLK_TXFRAME_PRES]) { // PRes of MN will be sent 3970 if (pTxBuffer == &EplDllkInstance_g.m_pTxBuffer[EPL_DLLK_TXFRAME_PRES]) { // PRes of MN will be sent
3971 // update NMT state 3971 // update NMT state
3972 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.m_le_bNmtStatus, 3972 AmiSetByteToLe(&pTxFrame->m_Data.m_Pres.m_le_bNmtStatus,
3973 (BYTE) NmtState_p); 3973 (u8) NmtState_p);
3974 *pDllStateProposed_p = kEplDllMsWaitSoaTrig; 3974 *pDllStateProposed_p = kEplDllMsWaitSoaTrig;
3975 } 3975 }
3976 // $$$ d.k. set EPL_FRAME_FLAG1_MS if necessary 3976 // $$$ d.k. set EPL_FRAME_FLAG1_MS if necessary
@@ -4013,7 +4013,7 @@ static tEplKernel EplDllkAsyncFrameNotReceived(tEplDllReqServiceId
4013 unsigned int uiNodeId_p) 4013 unsigned int uiNodeId_p)
4014{ 4014{
4015 tEplKernel Ret = kEplSuccessful; 4015 tEplKernel Ret = kEplSuccessful;
4016 BYTE abBuffer[18]; 4016 u8 abBuffer[18];
4017 tEplFrame *pFrame = (tEplFrame *) abBuffer; 4017 tEplFrame *pFrame = (tEplFrame *) abBuffer;
4018 tEplFrameInfo FrameInfo; 4018 tEplFrameInfo FrameInfo;
4019 4019
@@ -4024,13 +4024,13 @@ static tEplKernel EplDllkAsyncFrameNotReceived(tEplDllReqServiceId
4024 // ASnd service registered? 4024 // ASnd service registered?
4025 if (EplDllkInstance_g.m_aAsndFilter[ReqServiceId_p] == kEplDllAsndFilterAny) { // ASnd service ID is registered 4025 if (EplDllkInstance_g.m_aAsndFilter[ReqServiceId_p] == kEplDllAsndFilterAny) { // ASnd service ID is registered
4026 AmiSetByteToLe(&pFrame->m_le_bSrcNodeId, 4026 AmiSetByteToLe(&pFrame->m_le_bSrcNodeId,
4027 (BYTE) uiNodeId_p); 4027 (u8) uiNodeId_p);
4028 // EPL MsgType ASnd 4028 // EPL MsgType ASnd
4029 AmiSetByteToLe(&pFrame->m_le_bMessageType, 4029 AmiSetByteToLe(&pFrame->m_le_bMessageType,
4030 (BYTE) kEplMsgTypeAsnd); 4030 (u8) kEplMsgTypeAsnd);
4031 // ASnd Service ID 4031 // ASnd Service ID
4032 AmiSetByteToLe(&pFrame->m_Data.m_Asnd.m_le_bServiceId, 4032 AmiSetByteToLe(&pFrame->m_Data.m_Asnd.m_le_bServiceId,
4033 (BYTE) ReqServiceId_p); 4033 (u8) ReqServiceId_p);
4034 // create frame info structure 4034 // create frame info structure
4035 FrameInfo.m_pFrame = pFrame; 4035 FrameInfo.m_pFrame = pFrame;
4036 FrameInfo.m_uiFrameSize = 18; // empty non existing ASnd frame 4036 FrameInfo.m_uiFrameSize = 18; // empty non existing ASnd frame
diff --git a/drivers/staging/epl/EplDllkCal.c b/drivers/staging/epl/EplDllkCal.c
index 359083ebe12..88ce4b1145a 100644
--- a/drivers/staging/epl/EplDllkCal.c
+++ b/drivers/staging/epl/EplDllkCal.c
@@ -142,9 +142,9 @@ typedef struct {
142 tShbInstance m_ShbInstanceTxGen; // FIFO for Tx frames with generic priority 142 tShbInstance m_ShbInstanceTxGen; // FIFO for Tx frames with generic priority
143#else 143#else
144 unsigned int m_uiFrameSizeNmt; 144 unsigned int m_uiFrameSizeNmt;
145 BYTE m_abFrameNmt[1500]; 145 u8 m_abFrameNmt[1500];
146 unsigned int m_uiFrameSizeGen; 146 unsigned int m_uiFrameSizeGen;
147 BYTE m_abFrameGen[1500]; 147 u8 m_abFrameGen[1500];
148#endif 148#endif
149 149
150 tEplDllkCalStatistics m_Statistics; 150 tEplDllkCalStatistics m_Statistics;
@@ -536,7 +536,7 @@ tEplKernel EplDllkCalAsyncGetTxFrame(void *pFrame_p,
536 case kEplDllAsyncReqPrioNmt: // NMT request priority 536 case kEplDllAsyncReqPrioNmt: // NMT request priority
537 ShbError = 537 ShbError =
538 ShbCirReadDataBlock(EplDllkCalInstance_g.m_ShbInstanceTxNmt, 538 ShbCirReadDataBlock(EplDllkCalInstance_g.m_ShbInstanceTxNmt,
539 (BYTE *) pFrame_p, *puiFrameSize_p, 539 (u8 *) pFrame_p, *puiFrameSize_p,
540 &ulFrameSize); 540 &ulFrameSize);
541 // returns kShbOk, kShbDataTruncated, kShbInvalidArg, kShbNoReadableData 541 // returns kShbOk, kShbDataTruncated, kShbInvalidArg, kShbNoReadableData
542 break; 542 break;
@@ -544,7 +544,7 @@ tEplKernel EplDllkCalAsyncGetTxFrame(void *pFrame_p,
544 default: // generic priority 544 default: // generic priority
545 ShbError = 545 ShbError =
546 ShbCirReadDataBlock(EplDllkCalInstance_g.m_ShbInstanceTxGen, 546 ShbCirReadDataBlock(EplDllkCalInstance_g.m_ShbInstanceTxGen,
547 (BYTE *) pFrame_p, *puiFrameSize_p, 547 (u8 *) pFrame_p, *puiFrameSize_p,
548 &ulFrameSize); 548 &ulFrameSize);
549 // returns kShbOk, kShbDataTruncated, kShbInvalidArg, kShbNoReadableData 549 // returns kShbOk, kShbDataTruncated, kShbInvalidArg, kShbNoReadableData
550 break; 550 break;
@@ -876,7 +876,7 @@ tEplKernel EplDllkCalGetStatistics(tEplDllkCalStatistics ** ppStatistics)
876//--------------------------------------------------------------------------- 876//---------------------------------------------------------------------------
877 877
878tEplKernel EplDllkCalIssueRequest(tEplDllReqServiceId Service_p, 878tEplKernel EplDllkCalIssueRequest(tEplDllReqServiceId Service_p,
879 unsigned int uiNodeId_p, BYTE bSoaFlag1_p) 879 unsigned int uiNodeId_p, u8 bSoaFlag1_p)
880{ 880{
881 tEplKernel Ret = kEplSuccessful; 881 tEplKernel Ret = kEplSuccessful;
882 882
diff --git a/drivers/staging/epl/EplDlluCal.c b/drivers/staging/epl/EplDlluCal.c
index 7f4a1745023..06952985604 100644
--- a/drivers/staging/epl/EplDlluCal.c
+++ b/drivers/staging/epl/EplDlluCal.c
@@ -355,7 +355,7 @@ tEplKernel EplDlluCalAsyncSend(tEplFrameInfo * pFrameInfo_p,
355//--------------------------------------------------------------------------- 355//---------------------------------------------------------------------------
356 356
357tEplKernel EplDlluCalIssueRequest(tEplDllReqServiceId Service_p, 357tEplKernel EplDlluCalIssueRequest(tEplDllReqServiceId Service_p,
358 unsigned int uiNodeId_p, BYTE bSoaFlag1_p) 358 unsigned int uiNodeId_p, u8 bSoaFlag1_p)
359{ 359{
360 tEplKernel Ret = kEplSuccessful; 360 tEplKernel Ret = kEplSuccessful;
361 361
diff --git a/drivers/staging/epl/EplErrorHandlerk.c b/drivers/staging/epl/EplErrorHandlerk.c
index 120e77e5089..aeb77fb9d53 100644
--- a/drivers/staging/epl/EplErrorHandlerk.c
+++ b/drivers/staging/epl/EplErrorHandlerk.c
@@ -770,7 +770,7 @@ static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p,
770 tEplKernel Ret = kEplSuccessful; 770 tEplKernel Ret = kEplSuccessful;
771 tEplVarParam VarParam; 771 tEplVarParam VarParam;
772 tEplObdSize EntrySize; 772 tEplObdSize EntrySize;
773 BYTE bIndexEntries; 773 u8 bIndexEntries;
774 774
775 EntrySize = (tEplObdSize) sizeof(bIndexEntries); 775 EntrySize = (tEplObdSize) sizeof(bIndexEntries);
776 Ret = EplObdReadEntry(uiIndex_p, 776 Ret = EplObdReadEntry(uiIndex_p,
diff --git a/drivers/staging/epl/EplEvent.h b/drivers/staging/epl/EplEvent.h
index c3c317df96c..b543711feb6 100644
--- a/drivers/staging/epl/EplEvent.h
+++ b/drivers/staging/epl/EplEvent.h
@@ -248,7 +248,7 @@ typedef struct {
248 tEplEventSource m_EventSource; // module which posted this error event 248 tEplEventSource m_EventSource; // module which posted this error event
249 tEplKernel m_EplError; // EPL error which occured 249 tEplKernel m_EplError; // EPL error which occured
250 union { 250 union {
251 BYTE m_bArg; 251 u8 m_bArg;
252 DWORD m_dwArg; 252 DWORD m_dwArg;
253 tEplEventSource m_EventSource; // from Eventk/u module (originating error source) 253 tEplEventSource m_EventSource; // from Eventk/u module (originating error source)
254 tEplEventObdError m_ObdError; // from Obd module 254 tEplEventObdError m_ObdError; // from Obd module
diff --git a/drivers/staging/epl/EplEventk.c b/drivers/staging/epl/EplEventk.c
index 165d7e9ef4a..88ea89344dd 100644
--- a/drivers/staging/epl/EplEventk.c
+++ b/drivers/staging/epl/EplEventk.c
@@ -100,7 +100,7 @@
100 100
101// TracePoint support for realtime-debugging 101// TracePoint support for realtime-debugging
102#ifdef _DBG_TRACE_POINTS_ 102#ifdef _DBG_TRACE_POINTS_
103void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); 103void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);
104void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 104void TgtDbgPostTraceValue(DWORD dwTraceValue_p);
105#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 105#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)
106#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 106#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v)
@@ -760,7 +760,7 @@ tEplKernel EplEventkPostError(tEplEventSource EventSource_p,
760 unsigned int uiArgSize_p, void *pArg_p) 760 unsigned int uiArgSize_p, void *pArg_p)
761{ 761{
762 tEplKernel Ret; 762 tEplKernel Ret;
763 BYTE abBuffer[EPL_MAX_EVENT_ARG_SIZE]; 763 u8 abBuffer[EPL_MAX_EVENT_ARG_SIZE];
764 tEplEventError *pEventError = (tEplEventError *) abBuffer; 764 tEplEventError *pEventError = (tEplEventError *) abBuffer;
765 tEplEvent EplEvent; 765 tEplEvent EplEvent;
766 766
@@ -814,7 +814,7 @@ static void EplEventkRxSignalHandlerCb(tShbInstance pShbRxInstance_p,
814 tShbError ShbError; 814 tShbError ShbError;
815//unsigned long ulBlockCount; 815//unsigned long ulBlockCount;
816//unsigned long ulDataSize; 816//unsigned long ulDataSize;
817 BYTE abDataBuffer[sizeof(tEplEvent) + EPL_MAX_EVENT_ARG_SIZE]; 817 u8 abDataBuffer[sizeof(tEplEvent) + EPL_MAX_EVENT_ARG_SIZE];
818 // d.k.: abDataBuffer contains the complete tEplEvent structure 818 // d.k.: abDataBuffer contains the complete tEplEvent structure
819 // and behind this the argument 819 // and behind this the argument
820 820
diff --git a/drivers/staging/epl/EplEventu.c b/drivers/staging/epl/EplEventu.c
index d26e95a923a..29cb1636e59 100644
--- a/drivers/staging/epl/EplEventu.c
+++ b/drivers/staging/epl/EplEventu.c
@@ -96,7 +96,7 @@
96 96
97// TracePoint support for realtime-debugging 97// TracePoint support for realtime-debugging
98#ifdef _DBG_TRACE_POINTS_ 98#ifdef _DBG_TRACE_POINTS_
99void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); 99void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);
100void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 100void TgtDbgPostTraceValue(DWORD dwTraceValue_p);
101#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 101#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)
102#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 102#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v)
@@ -693,7 +693,7 @@ tEplKernel EplEventuPostError(tEplEventSource EventSource_p,
693 unsigned int uiArgSize_p, void *pArg_p) 693 unsigned int uiArgSize_p, void *pArg_p)
694{ 694{
695 tEplKernel Ret; 695 tEplKernel Ret;
696 BYTE abBuffer[EPL_MAX_EVENT_ARG_SIZE]; 696 u8 abBuffer[EPL_MAX_EVENT_ARG_SIZE];
697 tEplEventError *pEventError = (tEplEventError *) abBuffer; 697 tEplEventError *pEventError = (tEplEventError *) abBuffer;
698 tEplEvent EplEvent; 698 tEplEvent EplEvent;
699 699
@@ -750,7 +750,7 @@ static void EplEventuRxSignalHandlerCb(tShbInstance pShbRxInstance_p,
750 tShbError ShbError; 750 tShbError ShbError;
751//unsigned long ulBlockCount; 751//unsigned long ulBlockCount;
752//unsigned long ulDataSize; 752//unsigned long ulDataSize;
753 BYTE abDataBuffer[sizeof(tEplEvent) + EPL_MAX_EVENT_ARG_SIZE]; 753 u8 abDataBuffer[sizeof(tEplEvent) + EPL_MAX_EVENT_ARG_SIZE];
754 // d.k.: abDataBuffer contains the complete tEplEvent structure 754 // d.k.: abDataBuffer contains the complete tEplEvent structure
755 // and behind this the argument 755 // and behind this the argument
756 756
diff --git a/drivers/staging/epl/EplFrame.h b/drivers/staging/epl/EplFrame.h
index 9a7f8b9f594..0f8d59f937b 100644
--- a/drivers/staging/epl/EplFrame.h
+++ b/drivers/staging/epl/EplFrame.h
@@ -122,11 +122,11 @@
122 122
123typedef struct { 123typedef struct {
124 // Offset 17 124 // Offset 17
125 BYTE m_le_bRes1; // reserved 125 u8 m_le_bRes1; // reserved
126 // Offset 18 126 // Offset 18
127 BYTE m_le_bFlag1; // Flags: MC, PS 127 u8 m_le_bFlag1; // Flags: MC, PS
128 // Offset 19 128 // Offset 19
129 BYTE m_le_bFlag2; // Flags: res 129 u8 m_le_bFlag2; // Flags: res
130 // Offset 20 130 // Offset 20
131 tEplNetTime m_le_NetTime; // supported if D_NMT_NetTimeIsRealTime_BOOL is set 131 tEplNetTime m_le_NetTime; // supported if D_NMT_NetTimeIsRealTime_BOOL is set
132 // Offset 28 132 // Offset 28
@@ -136,54 +136,54 @@ typedef struct {
136 136
137typedef struct { 137typedef struct {
138 // Offset 17 138 // Offset 17
139 BYTE m_le_bRes1; // reserved 139 u8 m_le_bRes1; // reserved
140 // Offset 18 140 // Offset 18
141 BYTE m_le_bFlag1; // Flags: MS, EA, RD 141 u8 m_le_bFlag1; // Flags: MS, EA, RD
142 // Offset 19 142 // Offset 19
143 BYTE m_le_bFlag2; // Flags: res 143 u8 m_le_bFlag2; // Flags: res
144 // Offset 20 144 // Offset 20
145 BYTE m_le_bPdoVersion; 145 u8 m_le_bPdoVersion;
146 // Offset 21 146 // Offset 21
147 BYTE m_le_bRes2; // reserved 147 u8 m_le_bRes2; // reserved
148 // Offset 22 148 // Offset 22
149 WORD m_le_wSize; 149 WORD m_le_wSize;
150 // Offset 24 150 // Offset 24
151 BYTE m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16 */ ]; 151 u8 m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16 */ ];
152 152
153} PACK_STRUCT tEplPreqFrame; 153} PACK_STRUCT tEplPreqFrame;
154 154
155typedef struct { 155typedef struct {
156 // Offset 17 156 // Offset 17
157 BYTE m_le_bNmtStatus; // NMT state 157 u8 m_le_bNmtStatus; // NMT state
158 // Offset 18 158 // Offset 18
159 BYTE m_le_bFlag1; // Flags: MS, EN, RD 159 u8 m_le_bFlag1; // Flags: MS, EN, RD
160 // Offset 19 160 // Offset 19
161 BYTE m_le_bFlag2; // Flags: PR, RS 161 u8 m_le_bFlag2; // Flags: PR, RS
162 // Offset 20 162 // Offset 20
163 BYTE m_le_bPdoVersion; 163 u8 m_le_bPdoVersion;
164 // Offset 21 164 // Offset 21
165 BYTE m_le_bRes2; // reserved 165 u8 m_le_bRes2; // reserved
166 // Offset 22 166 // Offset 22
167 WORD m_le_wSize; 167 WORD m_le_wSize;
168 // Offset 24 168 // Offset 24
169 BYTE m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16 169 u8 m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16
170 / D_NMT_IsochrTxMaxPayload_U16 */ ]; 170 / D_NMT_IsochrTxMaxPayload_U16 */ ];
171 171
172} PACK_STRUCT tEplPresFrame; 172} PACK_STRUCT tEplPresFrame;
173 173
174typedef struct { 174typedef struct {
175 // Offset 17 175 // Offset 17
176 BYTE m_le_bNmtStatus; // NMT state 176 u8 m_le_bNmtStatus; // NMT state
177 // Offset 18 177 // Offset 18
178 BYTE m_le_bFlag1; // Flags: EA, ER 178 u8 m_le_bFlag1; // Flags: EA, ER
179 // Offset 19 179 // Offset 19
180 BYTE m_le_bFlag2; // Flags: res 180 u8 m_le_bFlag2; // Flags: res
181 // Offset 20 181 // Offset 20
182 BYTE m_le_bReqServiceId; 182 u8 m_le_bReqServiceId;
183 // Offset 21 183 // Offset 21
184 BYTE m_le_bReqServiceTarget; 184 u8 m_le_bReqServiceTarget;
185 // Offset 22 185 // Offset 22
186 BYTE m_le_bEplVersion; 186 u8 m_le_bEplVersion;
187 187
188} PACK_STRUCT tEplSoaFrame; 188} PACK_STRUCT tEplSoaFrame;
189 189
@@ -191,16 +191,16 @@ typedef struct {
191 WORD m_wEntryType; 191 WORD m_wEntryType;
192 WORD m_wErrorCode; 192 WORD m_wErrorCode;
193 tEplNetTime m_TimeStamp; 193 tEplNetTime m_TimeStamp;
194 BYTE m_abAddInfo[8]; 194 u8 m_abAddInfo[8];
195 195
196} PACK_STRUCT tEplErrHistoryEntry; 196} PACK_STRUCT tEplErrHistoryEntry;
197 197
198typedef struct { 198typedef struct {
199 // Offset 18 199 // Offset 18
200 BYTE m_le_bFlag1; // Flags: EN, EC 200 u8 m_le_bFlag1; // Flags: EN, EC
201 BYTE m_le_bFlag2; // Flags: PR, RS 201 u8 m_le_bFlag2; // Flags: PR, RS
202 BYTE m_le_bNmtStatus; // NMT state 202 u8 m_le_bNmtStatus; // NMT state
203 BYTE m_le_bRes1[3]; 203 u8 m_le_bRes1[3];
204 QWORD m_le_qwStaticError; // static error bit field 204 QWORD m_le_qwStaticError; // static error bit field
205 tEplErrHistoryEntry m_le_aErrHistoryEntry[14]; 205 tEplErrHistoryEntry m_le_aErrHistoryEntry[14];
206 206
@@ -208,12 +208,12 @@ typedef struct {
208 208
209typedef struct { 209typedef struct {
210 // Offset 18 210 // Offset 18
211 BYTE m_le_bFlag1; // Flags: res 211 u8 m_le_bFlag1; // Flags: res
212 BYTE m_le_bFlag2; // Flags: PR, RS 212 u8 m_le_bFlag2; // Flags: PR, RS
213 BYTE m_le_bNmtStatus; // NMT state 213 u8 m_le_bNmtStatus; // NMT state
214 BYTE m_le_bIdentRespFlags; // Flags: FW 214 u8 m_le_bIdentRespFlags; // Flags: FW
215 BYTE m_le_bEplProfileVersion; 215 u8 m_le_bEplProfileVersion;
216 BYTE m_le_bRes1; 216 u8 m_le_bRes1;
217 DWORD m_le_dwFeatureFlags; // NMT_FeatureFlags_U32 217 DWORD m_le_dwFeatureFlags; // NMT_FeatureFlags_U32
218 WORD m_le_wMtu; // NMT_CycleTiming_REC.AsyncMTU_U16: C_IP_MIN_MTU - C_IP_MAX_MTU 218 WORD m_le_wMtu; // NMT_CycleTiming_REC.AsyncMTU_U16: C_IP_MIN_MTU - C_IP_MAX_MTU
219 WORD m_le_wPollInSize; // NMT_CycleTiming_REC.PReqActPayload_U16 219 WORD m_le_wPollInSize; // NMT_CycleTiming_REC.PReqActPayload_U16
@@ -233,44 +233,44 @@ typedef struct {
233 DWORD m_le_dwIpAddress; 233 DWORD m_le_dwIpAddress;
234 DWORD m_le_dwSubnetMask; 234 DWORD m_le_dwSubnetMask;
235 DWORD m_le_dwDefaultGateway; 235 DWORD m_le_dwDefaultGateway;
236 BYTE m_le_sHostname[32]; 236 u8 m_le_sHostname[32];
237 BYTE m_le_abVendorSpecificExt2[48]; 237 u8 m_le_abVendorSpecificExt2[48];
238 238
239} PACK_STRUCT tEplIdentResponse; 239} PACK_STRUCT tEplIdentResponse;
240 240
241typedef struct { 241typedef struct {
242 // Offset 18 242 // Offset 18
243 BYTE m_le_bNmtCommandId; 243 u8 m_le_bNmtCommandId;
244 BYTE m_le_bRes1; 244 u8 m_le_bRes1;
245 BYTE m_le_abNmtCommandData[32]; 245 u8 m_le_abNmtCommandData[32];
246 246
247} PACK_STRUCT tEplNmtCommandService; 247} PACK_STRUCT tEplNmtCommandService;
248 248
249typedef struct { 249typedef struct {
250 BYTE m_le_bReserved; 250 u8 m_le_bReserved;
251 BYTE m_le_bTransactionId; 251 u8 m_le_bTransactionId;
252 BYTE m_le_bFlags; 252 u8 m_le_bFlags;
253 BYTE m_le_bCommandId; 253 u8 m_le_bCommandId;
254 WORD m_le_wSegmentSize; 254 WORD m_le_wSegmentSize;
255 WORD m_le_wReserved; 255 WORD m_le_wReserved;
256 BYTE m_le_abCommandData[8]; // just reserve a minimum number of bytes as a placeholder 256 u8 m_le_abCommandData[8]; // just reserve a minimum number of bytes as a placeholder
257 257
258} PACK_STRUCT tEplAsySdoCom; 258} PACK_STRUCT tEplAsySdoCom;
259 259
260// asynchronous SDO Sequence Header 260// asynchronous SDO Sequence Header
261typedef struct { 261typedef struct {
262 BYTE m_le_bRecSeqNumCon; 262 u8 m_le_bRecSeqNumCon;
263 BYTE m_le_bSendSeqNumCon; 263 u8 m_le_bSendSeqNumCon;
264 BYTE m_le_abReserved[2]; 264 u8 m_le_abReserved[2];
265 tEplAsySdoCom m_le_abSdoSeqPayload; 265 tEplAsySdoCom m_le_abSdoSeqPayload;
266 266
267} PACK_STRUCT tEplAsySdoSeq; 267} PACK_STRUCT tEplAsySdoSeq;
268 268
269typedef struct { 269typedef struct {
270 // Offset 18 270 // Offset 18
271 BYTE m_le_bNmtCommandId; 271 u8 m_le_bNmtCommandId;
272 BYTE m_le_bTargetNodeId; 272 u8 m_le_bTargetNodeId;
273 BYTE m_le_abNmtCommandData[32]; 273 u8 m_le_abNmtCommandData[32];
274 274
275} PACK_STRUCT tEplNmtRequestService; 275} PACK_STRUCT tEplNmtRequestService;
276 276
@@ -281,14 +281,14 @@ typedef union {
281 tEplNmtCommandService m_NmtCommandService; 281 tEplNmtCommandService m_NmtCommandService;
282 tEplNmtRequestService m_NmtRequestService; 282 tEplNmtRequestService m_NmtRequestService;
283 tEplAsySdoSeq m_SdoSequenceFrame; 283 tEplAsySdoSeq m_SdoSequenceFrame;
284 BYTE m_le_abPayload[256 /*D_NMT_ASndTxMaxPayload_U16 284 u8 m_le_abPayload[256 /*D_NMT_ASndTxMaxPayload_U16
285 / D_NMT_ASndRxMaxPayload_U16 */ ]; 285 / D_NMT_ASndRxMaxPayload_U16 */ ];
286 286
287} tEplAsndPayload; 287} tEplAsndPayload;
288 288
289typedef struct { 289typedef struct {
290 // Offset 17 290 // Offset 17
291 BYTE m_le_bServiceId; 291 u8 m_le_bServiceId;
292 // Offset 18 292 // Offset 18
293 tEplAsndPayload m_Payload; 293 tEplAsndPayload m_Payload;
294 294
@@ -306,17 +306,17 @@ typedef union {
306 306
307typedef struct { 307typedef struct {
308 // Offset 0 308 // Offset 0
309 BYTE m_be_abDstMac[6]; // MAC address of the addressed nodes 309 u8 m_be_abDstMac[6]; // MAC address of the addressed nodes
310 // Offset 6 310 // Offset 6
311 BYTE m_be_abSrcMac[6]; // MAC address of the transmitting node 311 u8 m_be_abSrcMac[6]; // MAC address of the transmitting node
312 // Offset 12 312 // Offset 12
313 WORD m_be_wEtherType; // Ethernet message type (big endian) 313 WORD m_be_wEtherType; // Ethernet message type (big endian)
314 // Offset 14 314 // Offset 14
315 BYTE m_le_bMessageType; // EPL message type 315 u8 m_le_bMessageType; // EPL message type
316 // Offset 15 316 // Offset 15
317 BYTE m_le_bDstNodeId; // EPL node ID of the addressed nodes 317 u8 m_le_bDstNodeId; // EPL node ID of the addressed nodes
318 // Offset 16 318 // Offset 16
319 BYTE m_le_bSrcNodeId; // EPL node ID of the transmitting node 319 u8 m_le_bSrcNodeId; // EPL node ID of the transmitting node
320 // Offset 17 320 // Offset 17
321 tEplFrameData m_Data; 321 tEplFrameData m_Data;
322 322
diff --git a/drivers/staging/epl/EplInstDef.h b/drivers/staging/epl/EplInstDef.h
index 756ac635324..29ab7fb7888 100644
--- a/drivers/staging/epl/EplInstDef.h
+++ b/drivers/staging/epl/EplInstDef.h
@@ -71,6 +71,8 @@
71#ifndef _EPLINSTDEF_H_ 71#ifndef _EPLINSTDEF_H_
72#define _EPLINSTDEF_H_ 72#define _EPLINSTDEF_H_
73 73
74#include <linux/kernel.h>
75
74// ========================================================================= 76// =========================================================================
75// types and macros for generating instances 77// types and macros for generating instances
76// ========================================================================= 78// =========================================================================
@@ -84,7 +86,7 @@ typedef enum {
84//------------------------------------------------------------------------------------------ 86//------------------------------------------------------------------------------------------
85 87
86typedef void *tEplPtrInstance; 88typedef void *tEplPtrInstance;
87typedef BYTE tEplInstanceHdl; 89typedef u8 tEplInstanceHdl;
88 90
89// define const for illegale values 91// define const for illegale values
90#define CCM_ILLINSTANCE NULL 92#define CCM_ILLINSTANCE NULL
@@ -214,8 +216,8 @@ typedef BYTE tEplInstanceHdl;
214 tFastByte InstNumber = 0; \ 216 tFastByte InstNumber = 0; \
215 tFastByte i = EPL_MAX_INSTANCES; \ 217 tFastByte i = EPL_MAX_INSTANCES; \
216 do { \ 218 do { \
217 pInstance->m_InstState = (BYTE) kStateUnused; \ 219 pInstance->m_InstState = (u8) kStateUnused; \
218 pInstance->m_bInstIndex = (BYTE) InstNumber; \ 220 pInstance->m_bInstIndex = (u8) InstNumber; \
219 pInstance++; InstNumber++; i--; \ 221 pInstance++; InstNumber++; i--; \
220 } while (i != 0); \ 222 } while (i != 0); \
221 } 223 }
@@ -243,8 +245,8 @@ typedef BYTE tEplInstanceHdl;
243 // this macro defines member variables in instance table which are needed in 245 // this macro defines member variables in instance table which are needed in
244 // all modules of Epl stack 246 // all modules of Epl stack
245#define EPL_MCO_DECL_INSTANCE_MEMBER() \ 247#define EPL_MCO_DECL_INSTANCE_MEMBER() \
246 STATIC BYTE m_InstState; \ 248 STATIC u8 m_InstState; \
247 STATIC BYTE m_bInstIndex; 249 STATIC u8 m_bInstIndex;
248 250
249#define EPL_MCO_INSTANCE_PARAM_IDX_() EPL_MCO_INSTANCE_PARAM_ (EPL_MCO_GLB_VAR (m_bInstIndex)) 251#define EPL_MCO_INSTANCE_PARAM_IDX_() EPL_MCO_INSTANCE_PARAM_ (EPL_MCO_GLB_VAR (m_bInstIndex))
250#define EPL_MCO_INSTANCE_PARAM_IDX() EPL_MCO_INSTANCE_PARAM (EPL_MCO_GLB_VAR (m_bInstIndex)) 252#define EPL_MCO_INSTANCE_PARAM_IDX() EPL_MCO_INSTANCE_PARAM (EPL_MCO_GLB_VAR (m_bInstIndex))
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;
108 108
109static tEplNmtCommand EplNmtCnuGetNmtCommand(tEplFrameInfo * pFrameInfo_p); 109static tEplNmtCommand EplNmtCnuGetNmtCommand(tEplFrameInfo * pFrameInfo_p);
110 110
111static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p); 111static BOOL EplNmtCnuNodeIdList(u8 * pbNmtCommandDate_p);
112 112
113static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p); 113static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p);
114 114
@@ -248,15 +248,15 @@ EPLDLLEXPORT tEplKernel EplNmtCnuSendNmtRequest(unsigned int uiNodeId_p,
248 EPL_MEMSET(&NmtRequestFrame.m_be_abSrcMac[0], 0x00, sizeof(NmtRequestFrame.m_be_abSrcMac)); // set by DLL 248 EPL_MEMSET(&NmtRequestFrame.m_be_abSrcMac[0], 0x00, sizeof(NmtRequestFrame.m_be_abSrcMac)); // set by DLL
249 AmiSetWordToBe(&NmtRequestFrame.m_be_wEtherType, 249 AmiSetWordToBe(&NmtRequestFrame.m_be_wEtherType,
250 EPL_C_DLL_ETHERTYPE_EPL); 250 EPL_C_DLL_ETHERTYPE_EPL);
251 AmiSetByteToLe(&NmtRequestFrame.m_le_bDstNodeId, (BYTE) EPL_C_ADR_MN_DEF_NODE_ID); // node id of the MN 251 AmiSetByteToLe(&NmtRequestFrame.m_le_bDstNodeId, (u8) EPL_C_ADR_MN_DEF_NODE_ID); // node id of the MN
252 AmiSetByteToLe(&NmtRequestFrame.m_le_bMessageType, 252 AmiSetByteToLe(&NmtRequestFrame.m_le_bMessageType,
253 (BYTE) kEplMsgTypeAsnd); 253 (u8) kEplMsgTypeAsnd);
254 AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_le_bServiceId, 254 AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_le_bServiceId,
255 (BYTE) kEplDllAsndNmtRequest); 255 (u8) kEplDllAsndNmtRequest);
256 AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload. 256 AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.
257 m_NmtRequestService.m_le_bNmtCommandId, 257 m_NmtRequestService.m_le_bNmtCommandId,
258 (BYTE) NmtCommand_p); 258 (u8) NmtCommand_p);
259 AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService.m_le_bTargetNodeId, (BYTE) uiNodeId_p); // target for the nmt command 259 AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService.m_le_bTargetNodeId, (u8) uiNodeId_p); // target for the nmt command
260 EPL_MEMSET(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService. 260 EPL_MEMSET(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService.
261 m_le_abNmtCommandData[0], 0x00, 261 m_le_abNmtCommandData[0], 0x00,
262 sizeof(NmtRequestFrame.m_Data.m_Asnd.m_Payload. 262 sizeof(NmtRequestFrame.m_Data.m_Asnd.m_Payload.
@@ -673,18 +673,18 @@ static tEplNmtCommand EplNmtCnuGetNmtCommand(tEplFrameInfo * pFrameInfo_p)
673// State: 673// State:
674// 674//
675//--------------------------------------------------------------------------- 675//---------------------------------------------------------------------------
676static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p) 676static BOOL EplNmtCnuNodeIdList(u8 * pbNmtCommandDate_p)
677{ 677{
678 BOOL fNodeIdInList; 678 BOOL fNodeIdInList;
679 unsigned int uiByteOffset; 679 unsigned int uiByteOffset;
680 BYTE bBitOffset; 680 u8 bBitOffset;
681 BYTE bNodeListByte; 681 u8 bNodeListByte;
682 682
683 // get byte-offset of the own nodeid in NodeIdList 683 // get byte-offset of the own nodeid in NodeIdList
684 // devide though 8 684 // devide though 8
685 uiByteOffset = (unsigned int)(EplNmtCnuInstance_g.m_uiNodeId >> 3); 685 uiByteOffset = (unsigned int)(EplNmtCnuInstance_g.m_uiNodeId >> 3);
686 // get bitoffset 686 // get bitoffset
687 bBitOffset = (BYTE) EplNmtCnuInstance_g.m_uiNodeId % 8; 687 bBitOffset = (u8) EplNmtCnuInstance_g.m_uiNodeId % 8;
688 688
689 bNodeListByte = AmiGetByteFromLe(&pbNmtCommandDate_p[uiByteOffset]); 689 bNodeListByte = AmiGetByteFromLe(&pbNmtCommandDate_p[uiByteOffset]);
690 if ((bNodeListByte & bBitOffset) == 0) { 690 if ((bNodeListByte & bBitOffset) == 0) {
diff --git a/drivers/staging/epl/EplNmtMnu.c b/drivers/staging/epl/EplNmtMnu.c
index 79ffdbf7fad..1c5d9d407d2 100644
--- a/drivers/staging/epl/EplNmtMnu.c
+++ b/drivers/staging/epl/EplNmtMnu.c
@@ -94,7 +94,7 @@
94 94
95// TracePoint support for realtime-debugging 95// TracePoint support for realtime-debugging
96#ifdef _DBG_TRACE_POINTS_ 96#ifdef _DBG_TRACE_POINTS_
97void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); 97void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);
98void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 98void TgtDbgPostTraceValue(DWORD dwTraceValue_p);
99#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 99#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)
100#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 100#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v)
@@ -417,7 +417,7 @@ tEplKernel EplNmtMnuSendNmtCommandEx(unsigned int uiNodeId_p,
417{ 417{
418 tEplKernel Ret = kEplSuccessful; 418 tEplKernel Ret = kEplSuccessful;
419 tEplFrameInfo FrameInfo; 419 tEplFrameInfo FrameInfo;
420 BYTE abBuffer[EPL_C_DLL_MINSIZE_NMTCMDEXT]; 420 u8 abBuffer[EPL_C_DLL_MINSIZE_NMTCMDEXT];
421 tEplFrame *pFrame = (tEplFrame *) abBuffer; 421 tEplFrame *pFrame = (tEplFrame *) abBuffer;
422 BOOL fSoftDeleteNode = FALSE; 422 BOOL fSoftDeleteNode = FALSE;
423 423
@@ -437,11 +437,11 @@ tEplKernel EplNmtMnuSendNmtCommandEx(unsigned int uiNodeId_p,
437 437
438 // build frame 438 // build frame
439 EPL_MEMSET(pFrame, 0x00, sizeof(abBuffer)); 439 EPL_MEMSET(pFrame, 0x00, sizeof(abBuffer));
440 AmiSetByteToLe(&pFrame->m_le_bDstNodeId, (BYTE) uiNodeId_p); 440 AmiSetByteToLe(&pFrame->m_le_bDstNodeId, (u8) uiNodeId_p);
441 AmiSetByteToLe(&pFrame->m_Data.m_Asnd.m_le_bServiceId, 441 AmiSetByteToLe(&pFrame->m_Data.m_Asnd.m_le_bServiceId,
442 (BYTE) kEplDllAsndNmtCommand); 442 (u8) kEplDllAsndNmtCommand);
443 AmiSetByteToLe(&pFrame->m_Data.m_Asnd.m_Payload.m_NmtCommandService. 443 AmiSetByteToLe(&pFrame->m_Data.m_Asnd.m_Payload.m_NmtCommandService.
444 m_le_bNmtCommandId, (BYTE) NmtCommand_p); 444 m_le_bNmtCommandId, (u8) NmtCommand_p);
445 if ((pNmtCommandData_p != NULL) && (uiDataSize_p > 0)) { // copy command data to frame 445 if ((pNmtCommandData_p != NULL) && (uiDataSize_p > 0)) { // copy command data to frame
446 EPL_MEMCPY(&pFrame->m_Data.m_Asnd.m_Payload.m_NmtCommandService. 446 EPL_MEMCPY(&pFrame->m_Data.m_Asnd.m_Payload.m_NmtCommandService.
447 m_le_abNmtCommandData[0], pNmtCommandData_p, 447 m_le_abNmtCommandData[0], pNmtCommandData_p,
@@ -572,7 +572,7 @@ tEplKernel EplNmtMnuTriggerStateChange(unsigned int uiNodeId_p,
572 tEplKernel Ret = kEplSuccessful; 572 tEplKernel Ret = kEplSuccessful;
573 tEplNmtMnuIntNodeEvent NodeEvent; 573 tEplNmtMnuIntNodeEvent NodeEvent;
574 tEplObdSize ObdSize; 574 tEplObdSize ObdSize;
575 BYTE bNmtState; 575 u8 bNmtState;
576 WORD wErrorCode = EPL_E_NO_ERROR; 576 WORD wErrorCode = EPL_E_NO_ERROR;
577 577
578 if ((uiNodeId_p == 0) || (uiNodeId_p >= EPL_C_ADR_BROADCAST)) { 578 if ((uiNodeId_p == 0) || (uiNodeId_p >= EPL_C_ADR_BROADCAST)) {
@@ -967,7 +967,7 @@ EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent *pEvent_p)
967 EPL_NMTMNU_TIMERARG_NODE_MASK); 967 EPL_NMTMNU_TIMERARG_NODE_MASK);
968 if (uiNodeId != 0) { 968 if (uiNodeId != 0) {
969 tEplObdSize ObdSize; 969 tEplObdSize ObdSize;
970 BYTE bNmtState; 970 u8 bNmtState;
971 tEplNmtMnuNodeInfo *pNodeInfo; 971 tEplNmtMnuNodeInfo *pNodeInfo;
972 972
973 pNodeInfo = EPL_NMTMNU_GET_NODEINFO(uiNodeId); 973 pNodeInfo = EPL_NMTMNU_GET_NODEINFO(uiNodeId);
@@ -1147,7 +1147,7 @@ EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent *pEvent_p)
1147 tEplFrame *pFrame = (tEplFrame *) pEvent_p->m_pArg; 1147 tEplFrame *pFrame = (tEplFrame *) pEvent_p->m_pArg;
1148 unsigned int uiNodeId; 1148 unsigned int uiNodeId;
1149 tEplNmtCommand NmtCommand; 1149 tEplNmtCommand NmtCommand;
1150 BYTE bNmtState; 1150 u8 bNmtState;
1151 1151
1152 uiNodeId = AmiGetByteFromLe(&pFrame->m_le_bDstNodeId); 1152 uiNodeId = AmiGetByteFromLe(&pFrame->m_le_bDstNodeId);
1153 NmtCommand = 1153 NmtCommand =
@@ -1159,30 +1159,30 @@ EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent *pEvent_p)
1159 switch (NmtCommand) { 1159 switch (NmtCommand) {
1160 case kEplNmtCmdStartNode: 1160 case kEplNmtCmdStartNode:
1161 bNmtState = 1161 bNmtState =
1162 (BYTE) (kEplNmtCsOperational & 0xFF); 1162 (u8) (kEplNmtCsOperational & 0xFF);
1163 break; 1163 break;
1164 1164
1165 case kEplNmtCmdStopNode: 1165 case kEplNmtCmdStopNode:
1166 bNmtState = (BYTE) (kEplNmtCsStopped & 0xFF); 1166 bNmtState = (u8) (kEplNmtCsStopped & 0xFF);
1167 break; 1167 break;
1168 1168
1169 case kEplNmtCmdEnterPreOperational2: 1169 case kEplNmtCmdEnterPreOperational2:
1170 bNmtState = 1170 bNmtState =
1171 (BYTE) (kEplNmtCsPreOperational2 & 0xFF); 1171 (u8) (kEplNmtCsPreOperational2 & 0xFF);
1172 break; 1172 break;
1173 1173
1174 case kEplNmtCmdEnableReadyToOperate: 1174 case kEplNmtCmdEnableReadyToOperate:
1175 // d.k. do not change expected node state, because of DS 1.0.0 7.3.1.2.1 Plain NMT State Command 1175 // d.k. do not change expected node state, because of DS 1.0.0 7.3.1.2.1 Plain NMT State Command
1176 // and because node may not change NMT state within EPL_C_NMT_STATE_TOLERANCE 1176 // and because node may not change NMT state within EPL_C_NMT_STATE_TOLERANCE
1177 bNmtState = 1177 bNmtState =
1178 (BYTE) (kEplNmtCsPreOperational2 & 0xFF); 1178 (u8) (kEplNmtCsPreOperational2 & 0xFF);
1179 break; 1179 break;
1180 1180
1181 case kEplNmtCmdResetNode: 1181 case kEplNmtCmdResetNode:
1182 case kEplNmtCmdResetCommunication: 1182 case kEplNmtCmdResetCommunication:
1183 case kEplNmtCmdResetConfiguration: 1183 case kEplNmtCmdResetConfiguration:
1184 case kEplNmtCmdSwReset: 1184 case kEplNmtCmdSwReset:
1185 bNmtState = (BYTE) (kEplNmtCsNotActive & 0xFF); 1185 bNmtState = (u8) (kEplNmtCsNotActive & 0xFF);
1186 // EplNmtMnuProcessInternalEvent() sets internal node state to kEplNmtMnuNodeStateUnknown 1186 // EplNmtMnuProcessInternalEvent() sets internal node state to kEplNmtMnuNodeStateUnknown
1187 // after next unresponded IdentRequest/StatusRequest 1187 // after next unresponded IdentRequest/StatusRequest
1188 break; 1188 break;
@@ -1927,7 +1927,7 @@ static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p,
1927 switch (NodeEvent_p) { 1927 switch (NodeEvent_p) {
1928 case kEplNmtMnuIntNodeEventIdentResponse: 1928 case kEplNmtMnuIntNodeEventIdentResponse:
1929 { 1929 {
1930 BYTE bNmtState; 1930 u8 bNmtState;
1931 1931
1932 EPL_NMTMNU_DBG_POST_TRACE_VALUE(NodeEvent_p, 1932 EPL_NMTMNU_DBG_POST_TRACE_VALUE(NodeEvent_p,
1933 uiNodeId_p, 1933 uiNodeId_p,
@@ -1954,7 +1954,7 @@ static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p,
1954 ~EPL_NMTMNU_NODE_FLAG_NOT_SCANNED; 1954 ~EPL_NMTMNU_NODE_FLAG_NOT_SCANNED;
1955 } 1955 }
1956 // update object 0x1F8F NMT_MNNodeExpState_AU8 to PreOp1 (even if local state >= PreOp2) 1956 // update object 0x1F8F NMT_MNNodeExpState_AU8 to PreOp1 (even if local state >= PreOp2)
1957 bNmtState = (BYTE) (kEplNmtCsPreOperational1 & 0xFF); 1957 bNmtState = (u8) (kEplNmtCsPreOperational1 & 0xFF);
1958 Ret = 1958 Ret =
1959 EplObduWriteEntry(0x1F8F, uiNodeId_p, &bNmtState, 1959 EplObduWriteEntry(0x1F8F, uiNodeId_p, &bNmtState,
1960 1); 1960 1);
@@ -2434,11 +2434,11 @@ static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p,
2434 2434
2435 case kEplNmtMnuIntNodeEventNmtCmdSent: 2435 case kEplNmtMnuIntNodeEventNmtCmdSent:
2436 { 2436 {
2437 BYTE bNmtState; 2437 u8 bNmtState;
2438 2438
2439 // update expected NMT state with the one that results 2439 // update expected NMT state with the one that results
2440 // from the sent NMT command 2440 // from the sent NMT command
2441 bNmtState = (BYTE) (NodeNmtState_p & 0xFF); 2441 bNmtState = (u8) (NodeNmtState_p & 0xFF);
2442 2442
2443 // write object 0x1F8F NMT_MNNodeExpState_AU8 2443 // write object 0x1F8F NMT_MNNodeExpState_AU8
2444 Ret = 2444 Ret =
@@ -2628,8 +2628,8 @@ static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p,
2628{ 2628{
2629 tEplKernel Ret = kEplSuccessful; 2629 tEplKernel Ret = kEplSuccessful;
2630 tEplObdSize ObdSize; 2630 tEplObdSize ObdSize;
2631 BYTE bNmtState; 2631 u8 bNmtState;
2632 BYTE bNmtStatePrev; 2632 u8 bNmtStatePrev;
2633 tEplNmtState ExpNmtState; 2633 tEplNmtState ExpNmtState;
2634 2634
2635 ObdSize = 1; 2635 ObdSize = 1;
@@ -2640,8 +2640,8 @@ static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p,
2640 } 2640 }
2641 // compute expected NMT state 2641 // compute expected NMT state
2642 ExpNmtState = (tEplNmtState) (bNmtState | EPL_NMT_TYPE_CS); 2642 ExpNmtState = (tEplNmtState) (bNmtState | EPL_NMT_TYPE_CS);
2643 // compute BYTE of current NMT state 2643 // compute u8 of current NMT state
2644 bNmtState = ((BYTE) NodeNmtState_p & 0xFF); 2644 bNmtState = ((u8) NodeNmtState_p & 0xFF);
2645 2645
2646 if (ExpNmtState == kEplNmtCsNotActive) { // ignore the current state, because the CN shall be not active 2646 if (ExpNmtState == kEplNmtCsNotActive) { // ignore the current state, because the CN shall be not active
2647 Ret = kEplReject; 2647 Ret = kEplReject;
diff --git a/drivers/staging/epl/EplNmtk.c b/drivers/staging/epl/EplNmtk.c
index 51df9e68ac2..18edb0b0748 100644
--- a/drivers/staging/epl/EplNmtk.c
+++ b/drivers/staging/epl/EplNmtk.c
@@ -88,7 +88,7 @@
88 88
89// TracePoint support for realtime-debugging 89// TracePoint support for realtime-debugging
90#ifdef _DBG_TRACE_POINTS_ 90#ifdef _DBG_TRACE_POINTS_
91void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); 91void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);
92void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 92void TgtDbgPostTraceValue(DWORD dwTraceValue_p);
93#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 93#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)
94#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 94#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v)
diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c
index f449f4c30a7..e55cf07a3e6 100644
--- a/drivers/staging/epl/EplObd.c
+++ b/drivers/staging/epl/EplObd.c
@@ -123,7 +123,7 @@ typedef union {
123 123
124EPL_MCO_DECL_INSTANCE_VAR() 124EPL_MCO_DECL_INSTANCE_VAR()
125 125
126BYTE abEplObdTrashObject_g[8]; 126u8 abEplObdTrashObject_g[8];
127 127
128//--------------------------------------------------------------------------- 128//---------------------------------------------------------------------------
129// local function prototypes 129// local function prototypes
@@ -833,7 +833,7 @@ EPLDLLEXPORT unsigned int EplObdGetNodeId(EPL_MCO_DECL_INSTANCE_PTR)
833{ 833{
834 tEplKernel Ret; 834 tEplKernel Ret;
835 tEplObdSize ObdSize; 835 tEplObdSize ObdSize;
836 BYTE bNodeId; 836 u8 bNodeId;
837 837
838 bNodeId = 0; 838 bNodeId = 0;
839 ObdSize = sizeof(bNodeId); 839 ObdSize = sizeof(bNodeId);
@@ -871,16 +871,16 @@ EPLDLLEXPORT tEplKernel EplObdSetNodeId(EPL_MCO_DECL_PTR_INSTANCE_PTR_ unsigned
871{ 871{
872 tEplKernel Ret; 872 tEplKernel Ret;
873 tEplObdSize ObdSize; 873 tEplObdSize ObdSize;
874 BYTE fHwBool; 874 u8 fHwBool;
875 BYTE bNodeId; 875 u8 bNodeId;
876 876
877 // check Node Id 877 // check Node Id
878 if (uiNodeId_p == EPL_C_ADR_INVALID) { 878 if (uiNodeId_p == EPL_C_ADR_INVALID) {
879 Ret = kEplInvalidNodeId; 879 Ret = kEplInvalidNodeId;
880 goto Exit; 880 goto Exit;
881 } 881 }
882 bNodeId = (BYTE) uiNodeId_p; 882 bNodeId = (u8) uiNodeId_p;
883 ObdSize = sizeof(BYTE); 883 ObdSize = sizeof(u8);
884 // write NodeId to OD entry 884 // write NodeId to OD entry
885 Ret = EplObdWriteEntry(EPL_MCO_PTR_INSTANCE_PTR_ 885 Ret = EplObdWriteEntry(EPL_MCO_PTR_INSTANCE_PTR_
886 EPL_OBD_NODE_ID_INDEX, 886 EPL_OBD_NODE_ID_INDEX,
@@ -1072,7 +1072,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned
1072 case kEplObdTypInt8: 1072 case kEplObdTypInt8:
1073 case kEplObdTypUInt8: 1073 case kEplObdTypUInt8:
1074 { 1074 {
1075 AmiSetByteToLe(pDstData_p, *((BYTE *) pSrcData)); 1075 AmiSetByteToLe(pDstData_p, *((u8 *) pSrcData));
1076 break; 1076 break;
1077 } 1077 }
1078 1078
@@ -1222,7 +1222,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign
1222 case kEplObdTypInt8: 1222 case kEplObdTypInt8:
1223 case kEplObdTypUInt8: 1223 case kEplObdTypUInt8:
1224 { 1224 {
1225 *((BYTE *) pBuffer) = AmiGetByteFromLe(pSrcData_p); 1225 *((u8 *) pBuffer) = AmiGetByteFromLe(pSrcData_p);
1226 break; 1226 break;
1227 } 1227 }
1228 1228
@@ -1503,7 +1503,7 @@ static tEplObdSize EplObdGetStrLen(void *pObjData_p,
1503{ 1503{
1504 1504
1505 tEplObdSize StrLen = 0; 1505 tEplObdSize StrLen = 0;
1506 BYTE *pbString; 1506 u8 *pbString;
1507 1507
1508 if (pObjData_p == NULL) { 1508 if (pObjData_p == NULL) {
1509 goto Exit; 1509 goto Exit;
@@ -2094,7 +2094,7 @@ static tEplKernel EplObdWriteEntryPost(EPL_MCO_DECL_INSTANCE_PTR_ tEplObdEntryPt
2094// Function: EplObdGetObjectSize() 2094// Function: EplObdGetObjectSize()
2095// 2095//
2096// Description: function to get size of object 2096// Description: function to get size of object
2097// The function determines if an object type an fixed data type (BYTE, WORD, ...) 2097// The function determines if an object type an fixed data type (u8, WORD, ...)
2098// or non fixed object (string, domain). This information is used to decide 2098// or non fixed object (string, domain). This information is used to decide
2099// if download data are stored temporary or not. For objects with fixed data length 2099// if download data are stored temporary or not. For objects with fixed data length
2100// and types a value range checking can process. 2100// and types a value range checking can process.
@@ -2463,7 +2463,7 @@ static void *EplObdGetObjectCurrentPtr(tEplObdSubEntryPtr pSubIndexEntry_p)
2463 } else { 2463 } else {
2464 Size = EplObdGetObjectSize(pSubIndexEntry_p); 2464 Size = EplObdGetObjectSize(pSubIndexEntry_p);
2465 } 2465 }
2466 pData = ((BYTE *) pData) + (Size * uiArrayIndex); 2466 pData = ((u8 *) pData) + (Size * uiArrayIndex);
2467 } 2467 }
2468 // check if VarEntry 2468 // check if VarEntry
2469 if ((pSubIndexEntry_p->m_Access & kEplObdAccVar) != 0) { 2469 if ((pSubIndexEntry_p->m_Access & kEplObdAccVar) != 0) {
@@ -2772,14 +2772,14 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_
2772 Ret = kEplSuccessful; 2772 Ret = kEplSuccessful;
2773 2773
2774 // prepare structure for STORE RESTORE callback function 2774 // prepare structure for STORE RESTORE callback function
2775 CbStore.m_bCurrentOdPart = (BYTE) CurrentOdPart_p; 2775 CbStore.m_bCurrentOdPart = (u8) CurrentOdPart_p;
2776 CbStore.m_pData = NULL; 2776 CbStore.m_pData = NULL;
2777 CbStore.m_ObjSize = 0; 2777 CbStore.m_ObjSize = 0;
2778 2778
2779 // command of first action depends on direction to access 2779 // command of first action depends on direction to access
2780#if (EPL_OBD_USE_STORE_RESTORE != FALSE) 2780#if (EPL_OBD_USE_STORE_RESTORE != FALSE)
2781 if (Direction_p == kEplObdDirLoad) { 2781 if (Direction_p == kEplObdDirLoad) {
2782 CbStore.m_bCommand = (BYTE) kEplObdCommOpenRead; 2782 CbStore.m_bCommand = (u8) kEplObdCommOpenRead;
2783 2783
2784 // call callback function for previous command 2784 // call callback function for previous command
2785 Ret = EplObdCallStoreCallback(EPL_MCO_INSTANCE_PTR_ & CbStore); 2785 Ret = EplObdCallStoreCallback(EPL_MCO_INSTANCE_PTR_ & CbStore);
@@ -2787,9 +2787,9 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_
2787 goto Exit; 2787 goto Exit;
2788 } 2788 }
2789 // set command for index and subindex loop 2789 // set command for index and subindex loop
2790 CbStore.m_bCommand = (BYTE) kEplObdCommReadObj; 2790 CbStore.m_bCommand = (u8) kEplObdCommReadObj;
2791 } else if (Direction_p == kEplObdDirStore) { 2791 } else if (Direction_p == kEplObdDirStore) {
2792 CbStore.m_bCommand = (BYTE) kEplObdCommOpenWrite; 2792 CbStore.m_bCommand = (u8) kEplObdCommOpenWrite;
2793 2793
2794 // call callback function for previous command 2794 // call callback function for previous command
2795 Ret = EplObdCallStoreCallback(EPL_MCO_INSTANCE_PTR_ & CbStore); 2795 Ret = EplObdCallStoreCallback(EPL_MCO_INSTANCE_PTR_ & CbStore);
@@ -2797,7 +2797,7 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_
2797 goto Exit; 2797 goto Exit;
2798 } 2798 }
2799 // set command for index and subindex loop 2799 // set command for index and subindex loop
2800 CbStore.m_bCommand = (BYTE) kEplObdCommWriteObj; 2800 CbStore.m_bCommand = (u8) kEplObdCommWriteObj;
2801 } 2801 }
2802#endif // (EPL_OBD_USE_STORE_RESTORE != FALSE) 2802#endif // (EPL_OBD_USE_STORE_RESTORE != FALSE)
2803 2803
@@ -2848,7 +2848,7 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_
2848 } 2848 }
2849 else 2849 else
2850 { 2850 {
2851 EplObdInitVarEntry ((tEplObdVarEntry *) (((BYTE *) pSubIndex->m_pCurrent) + (sizeof (tEplObdVarEntry) * pSubIndex->m_uiSubIndex)), 2851 EplObdInitVarEntry ((tEplObdVarEntry *) (((u8 *) pSubIndex->m_pCurrent) + (sizeof (tEplObdVarEntry) * pSubIndex->m_uiSubIndex)),
2852 pSubIndex->m_Type, ObjSize); 2852 pSubIndex->m_Type, ObjSize);
2853 } 2853 }
2854*/ 2854*/
@@ -3003,11 +3003,11 @@ static tEplKernel EplObdAccessOdPartIntern(EPL_MCO_DECL_INSTANCE_PTR_
3003#if (EPL_OBD_USE_STORE_RESTORE != FALSE) 3003#if (EPL_OBD_USE_STORE_RESTORE != FALSE)
3004 else { 3004 else {
3005 if (Direction_p == kEplObdDirLoad) { 3005 if (Direction_p == kEplObdDirLoad) {
3006 CbStore.m_bCommand = (BYTE) kEplObdCommCloseRead; 3006 CbStore.m_bCommand = (u8) kEplObdCommCloseRead;
3007 } else if (Direction_p == kEplObdDirStore) { 3007 } else if (Direction_p == kEplObdDirStore) {
3008 CbStore.m_bCommand = (BYTE) kEplObdCommCloseWrite; 3008 CbStore.m_bCommand = (u8) kEplObdCommCloseWrite;
3009 } else if (Direction_p == kEplObdDirRestore) { 3009 } else if (Direction_p == kEplObdDirRestore) {
3010 CbStore.m_bCommand = (BYTE) kEplObdCommClear; 3010 CbStore.m_bCommand = (u8) kEplObdCommClear;
3011 } else { 3011 } else {
3012 goto Exit; 3012 goto Exit;
3013 } 3013 }
diff --git a/drivers/staging/epl/EplObd.h b/drivers/staging/epl/EplObd.h
index e2dd2278a1b..eebff886bf8 100644
--- a/drivers/staging/epl/EplObd.h
+++ b/drivers/staging/epl/EplObd.h
@@ -309,7 +309,7 @@ typedef struct {
309 309
310typedef struct { 310typedef struct {
311 tEplObdSize m_Size; 311 tEplObdSize m_Size;
312 BYTE *m_pString; 312 u8 *m_pString;
313 313
314} tEplObdOString; // 000C 314} tEplObdOString; // 000C
315 315
@@ -327,8 +327,8 @@ typedef struct {
327 327
328typedef struct { 328typedef struct {
329 tEplObdSize m_Size; 329 tEplObdSize m_Size;
330 BYTE *m_pDefString; // $$$ d.k. it is unused, so we could delete it 330 u8 *m_pDefString; // $$$ d.k. it is unused, so we could delete it
331 BYTE *m_pString; 331 u8 *m_pString;
332 332
333} tEplObdOStringDef; 333} tEplObdOStringDef;
334 334
@@ -431,7 +431,7 @@ typedef struct {
431 unsigned int m_uiUpperObjIndex; // upper limit of ObjIndex 431 unsigned int m_uiUpperObjIndex; // upper limit of ObjIndex
432 tInitTabEntryCallback m_fpInitTabEntry; // will be called if ObjIndex was found 432 tInitTabEntryCallback m_fpInitTabEntry; // will be called if ObjIndex was found
433 void *m_pTabBase; // base address of table 433 void *m_pTabBase; // base address of table
434 unsigned int m_uiEntrySize; // size of table entry // 25-feb-2005 r.d.: expansion from BYTE to WORD necessary for PDO bit mapping 434 unsigned int m_uiEntrySize; // size of table entry // 25-feb-2005 r.d.: expansion from u8 to WORD necessary for PDO bit mapping
435 unsigned int m_uiMaxEntries; // max. tabel entries 435 unsigned int m_uiMaxEntries; // max. tabel entries
436 436
437} tEplObdModulTabParam; 437} tEplObdModulTabParam;
diff --git a/drivers/staging/epl/EplObdMacro.h b/drivers/staging/epl/EplObdMacro.h
index 21849b059e3..c70d17abaa1 100644
--- a/drivers/staging/epl/EplObdMacro.h
+++ b/drivers/staging/epl/EplObdMacro.h
@@ -105,8 +105,8 @@
105#define EPL_OBD_SUBINDEX_RAM_VSTRING(ind,sub,acc,name,size,val) static char szCur##ind##_##sub##_g[size+1]; \ 105#define EPL_OBD_SUBINDEX_RAM_VSTRING(ind,sub,acc,name,size,val) static char szCur##ind##_##sub##_g[size+1]; \
106 static tEplObdVStringDef xDef##ind##_##sub##_g = {size, val, szCur##ind##_##sub##_g}; 106 static tEplObdVStringDef xDef##ind##_##sub##_g = {size, val, szCur##ind##_##sub##_g};
107 107
108#define EPL_OBD_SUBINDEX_RAM_OSTRING(ind,sub,acc,name,size) static BYTE bCur##ind##_##sub##_g[size]; \ 108#define EPL_OBD_SUBINDEX_RAM_OSTRING(ind,sub,acc,name,size) static u8 bCur##ind##_##sub##_g[size]; \
109 static tEplObdOStringDef xDef##ind##_##sub##_g = {size, ((BYTE*)""), bCur##ind##_##sub##_g}; 109 static tEplObdOStringDef xDef##ind##_##sub##_g = {size, ((u8*)""), bCur##ind##_##sub##_g};
110#define EPL_OBD_SUBINDEX_RAM_DOMAIN(ind,sub,acc,name) 110#define EPL_OBD_SUBINDEX_RAM_DOMAIN(ind,sub,acc,name)
111#define EPL_OBD_SUBINDEX_RAM_USERDEF(ind,sub,typ,acc,dtyp,name,val) static dtyp xDef##ind##_##sub##_g = val; 111#define EPL_OBD_SUBINDEX_RAM_USERDEF(ind,sub,typ,acc,dtyp,name,val) static dtyp xDef##ind##_##sub##_g = val;
112#define EPL_OBD_SUBINDEX_RAM_USERDEF_RG(ind,sub,typ,acc,dtyp,name,val,low,high) static dtyp xDef##ind##_##sub##_g[3] = {val,low,high}; 112#define EPL_OBD_SUBINDEX_RAM_USERDEF_RG(ind,sub,typ,acc,dtyp,name,val,low,high) static dtyp xDef##ind##_##sub##_g[3] = {val,low,high};
diff --git a/drivers/staging/epl/EplObdu.c b/drivers/staging/epl/EplObdu.c
index da975ff01f3..d0840532a96 100644
--- a/drivers/staging/epl/EplObdu.c
+++ b/drivers/staging/epl/EplObdu.c
@@ -275,7 +275,7 @@ EPLDLLEXPORT tEplKernel EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p)
275// 275//
276//--------------------------------------------------------------------------- 276//---------------------------------------------------------------------------
277EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry *pVarEntry_p, 277EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry *pVarEntry_p,
278 BYTE bType_p, tEplObdSize ObdSize_p) 278 u8 bType_p, tEplObdSize ObdSize_p)
279{ 279{
280 EplObduCalInitVarEntry(pVarEntry_p, bType_p, ObdSize_p); 280 EplObduCalInitVarEntry(pVarEntry_p, bType_p, ObdSize_p);
281} 281}
diff --git a/drivers/staging/epl/EplObduCal.c b/drivers/staging/epl/EplObduCal.c
index fc04d9a7c0e..24058410c6b 100644
--- a/drivers/staging/epl/EplObduCal.c
+++ b/drivers/staging/epl/EplObduCal.c
@@ -297,7 +297,7 @@ EPLDLLEXPORT tEplKernel EplObduCalRegisterUserOd(tEplObdEntryPtr pUserOd_p)
297// 297//
298//--------------------------------------------------------------------------- 298//---------------------------------------------------------------------------
299EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry *pVarEntry_p, 299EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry *pVarEntry_p,
300 BYTE bType_p, tEplObdSize ObdSize_p) 300 u8 bType_p, tEplObdSize ObdSize_p)
301{ 301{
302#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) 302#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0)
303 EplObdInitVarEntry(pVarEntry_p, bType_p, ObdSize_p); 303 EplObdInitVarEntry(pVarEntry_p, bType_p, ObdSize_p);
diff --git a/drivers/staging/epl/EplPdo.h b/drivers/staging/epl/EplPdo.h
index d22ac86e85b..83cc1f7046d 100644
--- a/drivers/staging/epl/EplPdo.h
+++ b/drivers/staging/epl/EplPdo.h
@@ -104,7 +104,7 @@ typedef struct {
104 // TPDO: 0x00=PRes, MN: CnNodeId=PReq 104 // TPDO: 0x00=PRes, MN: CnNodeId=PReq
105 105
106 BOOL m_fTxRx; 106 BOOL m_fTxRx;
107 BYTE m_bMappingVersion; 107 u8 m_bMappingVersion;
108 unsigned int m_uiMaxMappingEntries; // maximum number of mapping entries, i.e. size of m_aPdoMapping 108 unsigned int m_uiMaxMappingEntries; // maximum number of mapping entries, i.e. size of m_aPdoMapping
109 tEplPdoMapping m_aPdoMapping[1]; 109 tEplPdoMapping m_aPdoMapping[1];
110 110
diff --git a/drivers/staging/epl/EplPdok.c b/drivers/staging/epl/EplPdok.c
index 3b253ffee3b..163dc53344e 100644
--- a/drivers/staging/epl/EplPdok.c
+++ b/drivers/staging/epl/EplPdok.c
@@ -319,14 +319,14 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p)
319 WORD wBitSize; 319 WORD wBitSize;
320 WORD wVarSize; 320 WORD wVarSize;
321 QWORD qwObjectMapping; 321 QWORD qwObjectMapping;
322 BYTE bMappSubindex; 322 u8 bMappSubindex;
323 BYTE bObdSubindex; 323 u8 bObdSubindex;
324 WORD wObdMappIndex; 324 WORD wObdMappIndex;
325 WORD wObdCommIndex; 325 WORD wObdCommIndex;
326 WORD wPdoId; 326 WORD wPdoId;
327 BYTE bObdData; 327 u8 bObdData;
328 BYTE bObjectCount; 328 u8 bObjectCount;
329 BYTE bFrameData; 329 u8 bFrameData;
330 BOOL fValid; 330 BOOL fValid;
331 tEplObdSize ObdSize; 331 tEplObdSize ObdSize;
332 tEplFrame *pFrame; 332 tEplFrame *pFrame;
@@ -441,7 +441,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p)
441 (WORD) (qwObjectMapping & 441 (WORD) (qwObjectMapping &
442 0x000000000000FFFFLL); 442 0x000000000000FFFFLL);
443 bObdSubindex = 443 bObdSubindex =
444 (BYTE) ((qwObjectMapping & 444 (u8) ((qwObjectMapping &
445 0x0000000000FF0000LL) >> 16); 445 0x0000000000FF0000LL) >> 16);
446 wBitOffset = 446 wBitOffset =
447 (WORD) ((qwObjectMapping & 447 (WORD) ((qwObjectMapping &
@@ -571,7 +571,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p)
571 (WORD) (qwObjectMapping & 571 (WORD) (qwObjectMapping &
572 0x000000000000FFFFLL); 572 0x000000000000FFFFLL);
573 bObdSubindex = 573 bObdSubindex =
574 (BYTE) ((qwObjectMapping & 574 (u8) ((qwObjectMapping &
575 0x0000000000FF0000LL) >> 16); 575 0x0000000000FF0000LL) >> 16);
576 wBitOffset = 576 wBitOffset =
577 (WORD) ((qwObjectMapping & 577 (WORD) ((qwObjectMapping &
diff --git a/drivers/staging/epl/EplPdou.c b/drivers/staging/epl/EplPdou.c
index 606f03269b3..4536d4dc6a4 100644
--- a/drivers/staging/epl/EplPdou.c
+++ b/drivers/staging/epl/EplPdou.c
@@ -232,10 +232,10 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p)
232 unsigned int uiPdoId; 232 unsigned int uiPdoId;
233 unsigned int uiIndexType; 233 unsigned int uiIndexType;
234 tEplObdSize ObdSize; 234 tEplObdSize ObdSize;
235 BYTE bObjectCount; 235 u8 bObjectCount;
236 QWORD qwObjectMapping; 236 QWORD qwObjectMapping;
237 tEplObdAccess AccessType; 237 tEplObdAccess AccessType;
238 BYTE bMappSubindex; 238 u8 bMappSubindex;
239 unsigned int uiCurPdoSize; 239 unsigned int uiCurPdoSize;
240 WORD wMaxPdoSize; 240 WORD wMaxPdoSize;
241 unsigned int uiSubIndex; 241 unsigned int uiSubIndex;
@@ -293,7 +293,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p)
293 if (pParam_p->m_uiSubIndex == 0) { // object mapping count accessed 293 if (pParam_p->m_uiSubIndex == 0) { // object mapping count accessed
294 294
295 // PDO is enabled or disabled 295 // PDO is enabled or disabled
296 bObjectCount = *((BYTE *) pParam_p->m_pArg); 296 bObjectCount = *((u8 *) pParam_p->m_pArg);
297 297
298 if (bObjectCount == 0) { // PDO shall be disabled 298 if (bObjectCount == 0) { // PDO shall be disabled
299 299
@@ -399,7 +399,7 @@ static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam *pParam_p,
399{ 399{
400 tEplKernel Ret = kEplSuccessful; 400 tEplKernel Ret = kEplSuccessful;
401 tEplObdSize ObdSize; 401 tEplObdSize ObdSize;
402 BYTE bObjectCount; 402 u8 bObjectCount;
403 403
404 ObdSize = 1; 404 ObdSize = 1;
405 // read number of mapped objects from OD; this indicates if the PDO is valid 405 // read number of mapped objects from OD; this indicates if the PDO is valid
diff --git a/drivers/staging/epl/EplSdoAsndu.c b/drivers/staging/epl/EplSdoAsndu.c
index a6596a51f1e..80135d27e03 100644
--- a/drivers/staging/epl/EplSdoAsndu.c
+++ b/drivers/staging/epl/EplSdoAsndu.c
@@ -339,10 +339,10 @@ tEplKernel EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p,
339 // own node id not needed -> filled by DLL 339 // own node id not needed -> filled by DLL
340 340
341 // set message type 341 // set message type
342 AmiSetByteToLe(&pSrcData_p->m_le_bMessageType, (BYTE) kEplMsgTypeAsnd); // ASnd == 0x06 342 AmiSetByteToLe(&pSrcData_p->m_le_bMessageType, (u8) kEplMsgTypeAsnd); // ASnd == 0x06
343 // target node id 343 // target node id
344 AmiSetByteToLe(&pSrcData_p->m_le_bDstNodeId, 344 AmiSetByteToLe(&pSrcData_p->m_le_bDstNodeId,
345 (BYTE) SdoAsndInstance_g. 345 (u8) SdoAsndInstance_g.
346 m_auiSdoAsndConnection[uiArray]); 346 m_auiSdoAsndConnection[uiArray]);
347 // set source-nodeid (filled by DLL 0) 347 // set source-nodeid (filled by DLL 0)
348 AmiSetByteToLe(&pSrcData_p->m_le_bSrcNodeId, 0x00); 348 AmiSetByteToLe(&pSrcData_p->m_le_bSrcNodeId, 0x00);
diff --git a/drivers/staging/epl/EplSdoAsySequ.c b/drivers/staging/epl/EplSdoAsySequ.c
index 9048905dcde..d7e007ad4d6 100644
--- a/drivers/staging/epl/EplSdoAsySequ.c
+++ b/drivers/staging/epl/EplSdoAsySequ.c
@@ -128,11 +128,11 @@ typedef enum {
128 128
129// structure for History-Buffer 129// structure for History-Buffer
130typedef struct { 130typedef struct {
131 BYTE m_bFreeEntries; 131 u8 m_bFreeEntries;
132 BYTE m_bWrite; // index of the next free buffer entry 132 u8 m_bWrite; // index of the next free buffer entry
133 BYTE m_bAck; // index of the next message which should become acknowledged 133 u8 m_bAck; // index of the next message which should become acknowledged
134 BYTE m_bRead; // index between m_bAck and m_bWrite to the next message for retransmission 134 u8 m_bRead; // index between m_bAck and m_bWrite to the next message for retransmission
135 BYTE m_aabHistoryFrame[EPL_SDO_HISTORY_SIZE] 135 u8 m_aabHistoryFrame[EPL_SDO_HISTORY_SIZE]
136 [EPL_SEQ_HISTROY_FRAME_SIZE]; 136 [EPL_SEQ_HISTROY_FRAME_SIZE];
137 unsigned int m_auiFrameSize[EPL_SDO_HISTORY_SIZE]; 137 unsigned int m_auiFrameSize[EPL_SDO_HISTORY_SIZE];
138 138
@@ -152,8 +152,8 @@ typedef enum {
152typedef struct { 152typedef struct {
153 tEplSdoConHdl m_ConHandle; 153 tEplSdoConHdl m_ConHandle;
154 tEplAsySdoState m_SdoState; 154 tEplAsySdoState m_SdoState;
155 BYTE m_bRecSeqNum; // name from view of the communication partner 155 u8 m_bRecSeqNum; // name from view of the communication partner
156 BYTE m_bSendSeqNum; // name from view of the communication partner 156 u8 m_bSendSeqNum; // name from view of the communication partner
157 tEplAsySdoConHistory m_SdoConHistory; 157 tEplAsySdoConHistory m_SdoConHistory;
158 tEplTimerHdl m_EplTimerHdl; 158 tEplTimerHdl m_EplTimerHdl;
159 unsigned int m_uiRetryCount; // retry counter 159 unsigned int m_uiRetryCount; // retry counter
@@ -214,7 +214,7 @@ static tEplKernel EplSdoAsyAddFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p,
214 unsigned int uiSize_p); 214 unsigned int uiSize_p);
215 215
216static tEplKernel EplSdoAsyAckFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p, 216static tEplKernel EplSdoAsyAckFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p,
217 BYTE bRecSeqNumber_p); 217 u8 bRecSeqNumber_p);
218 218
219static tEplKernel EplSdoAsyReadFromHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p, 219static tEplKernel EplSdoAsyReadFromHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p,
220 tEplFrame ** ppFrame_p, 220 tEplFrame ** ppFrame_p,
@@ -1498,7 +1498,7 @@ static tEplKernel EplSdoAsySeqProcess(unsigned int uiHandle_p,
1498 // frame received 1498 // frame received
1499 case kAsySdoSeqEventFrameRec: 1499 case kAsySdoSeqEventFrameRec:
1500 { 1500 {
1501 BYTE bSendSeqNumCon = 1501 u8 bSendSeqNumCon =
1502 AmiGetByteFromLe(&pRecFrame_p-> 1502 AmiGetByteFromLe(&pRecFrame_p->
1503 m_le_bSendSeqNumCon); 1503 m_le_bSendSeqNumCon);
1504 1504
@@ -2016,7 +2016,7 @@ static tEplKernel EplSdoAsySeqSendIntern(tEplAsySdoSeqCon * pAsySdoSeqCon_p,
2016 BOOL fFrameInHistory_p) 2016 BOOL fFrameInHistory_p)
2017{ 2017{
2018 tEplKernel Ret; 2018 tEplKernel Ret;
2019 BYTE abFrame[EPL_SEQ_FRAME_SIZE]; 2019 u8 abFrame[EPL_SEQ_FRAME_SIZE];
2020 tEplFrame *pEplFrame; 2020 tEplFrame *pEplFrame;
2021 unsigned int uiFreeEntries; 2021 unsigned int uiFreeEntries;
2022 2022
@@ -2154,7 +2154,7 @@ tEplKernel EplSdoAsyReceiveCb(tEplSdoConHdl ConHdl_p,
2154#endif 2154#endif
2155 2155
2156 EPL_DBGLVL_SDO_TRACE2("Handle: 0x%x , First Databyte 0x%x\n", ConHdl_p, 2156 EPL_DBGLVL_SDO_TRACE2("Handle: 0x%x , First Databyte 0x%x\n", ConHdl_p,
2157 ((BYTE *) pSdoSeqData_p)[0]); 2157 ((u8 *) pSdoSeqData_p)[0]);
2158 2158
2159 // search controll structure for this connection 2159 // search controll structure for this connection
2160 pAsySdoSeqCon = &AsySdoSequInstance_g.m_AsySdoConnection[uiCount]; 2160 pAsySdoSeqCon = &AsySdoSequInstance_g.m_AsySdoConnection[uiCount];
@@ -2328,12 +2328,12 @@ static tEplKernel EplSdoAsyAddFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p,
2328// 2328//
2329//--------------------------------------------------------------------------- 2329//---------------------------------------------------------------------------
2330static tEplKernel EplSdoAsyAckFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p, 2330static tEplKernel EplSdoAsyAckFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p,
2331 BYTE bRecSeqNumber_p) 2331 u8 bRecSeqNumber_p)
2332{ 2332{
2333 tEplKernel Ret; 2333 tEplKernel Ret;
2334 tEplAsySdoConHistory *pHistory; 2334 tEplAsySdoConHistory *pHistory;
2335 BYTE bAckIndex; 2335 u8 bAckIndex;
2336 BYTE bCurrentSeqNum; 2336 u8 bCurrentSeqNum;
2337 2337
2338 Ret = kEplSuccessful; 2338 Ret = kEplSuccessful;
2339 2339
diff --git a/drivers/staging/epl/EplSdoComu.c b/drivers/staging/epl/EplSdoComu.c
index af3d1b14674..a9325d47efb 100644
--- a/drivers/staging/epl/EplSdoComu.c
+++ b/drivers/staging/epl/EplSdoComu.c
@@ -156,14 +156,14 @@ typedef enum {
156typedef struct { 156typedef struct {
157 tEplSdoSeqConHdl m_SdoSeqConHdl; // if != 0 -> entry used 157 tEplSdoSeqConHdl m_SdoSeqConHdl; // if != 0 -> entry used
158 tEplSdoComState m_SdoComState; 158 tEplSdoComState m_SdoComState;
159 BYTE m_bTransactionId; 159 u8 m_bTransactionId;
160 unsigned int m_uiNodeId; // NodeId of the target 160 unsigned int m_uiNodeId; // NodeId of the target
161 // -> needed to reinit connection 161 // -> needed to reinit connection
162 // after timeout 162 // after timeout
163 tEplSdoTransType m_SdoTransType; // Auto, Expedited, Segmented 163 tEplSdoTransType m_SdoTransType; // Auto, Expedited, Segmented
164 tEplSdoServiceType m_SdoServiceType; // WriteByIndex, ReadByIndex 164 tEplSdoServiceType m_SdoServiceType; // WriteByIndex, ReadByIndex
165 tEplSdoType m_SdoProtType; // protocol layer: Auto, Udp, Asnd, Pdo 165 tEplSdoType m_SdoProtType; // protocol layer: Auto, Udp, Asnd, Pdo
166 BYTE *m_pData; // pointer to data 166 u8 *m_pData; // pointer to data
167 unsigned int m_uiTransSize; // number of bytes 167 unsigned int m_uiTransSize; // number of bytes
168 // to transfer 168 // to transfer
169 unsigned int m_uiTransferredByte; // number of bytes 169 unsigned int m_uiTransferredByte; // number of bytes
@@ -765,7 +765,7 @@ tEplKernel EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p,
765 goto Exit; 765 goto Exit;
766 } 766 }
767 // save pointer to abort code 767 // save pointer to abort code
768 pSdoComCon->m_pData = (BYTE *) & dwAbortCode_p; 768 pSdoComCon->m_pData = (u8 *) & dwAbortCode_p;
769 769
770 Ret = EplSdoComProcessIntern(SdoComConHdl_p, 770 Ret = EplSdoComProcessIntern(SdoComConHdl_p,
771 kEplSdoComConEventAbort, 771 kEplSdoComConEventAbort,
@@ -998,7 +998,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p,
998{ 998{
999 tEplKernel Ret; 999 tEplKernel Ret;
1000 tEplSdoComCon *pSdoComCon; 1000 tEplSdoComCon *pSdoComCon;
1001 BYTE bFlag; 1001 u8 bFlag;
1002 1002
1003#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOS)) != 0) 1003#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOS)) != 0)
1004 DWORD dwAbortCode; 1004 DWORD dwAbortCode;
@@ -1137,7 +1137,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p,
1137 pSdoComCon-> 1137 pSdoComCon->
1138 m_pData 1138 m_pData
1139 = 1139 =
1140 (BYTE 1140 (u8
1141 *) 1141 *)
1142 & 1142 &
1143 dwAbortCode; 1143 dwAbortCode;
@@ -1282,7 +1282,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p,
1282 if (pSdoComCon-> 1282 if (pSdoComCon->
1283 m_dwLastAbortCode == 1283 m_dwLastAbortCode ==
1284 0) { 1284 0) {
1285 ( /*(BYTE*) */ 1285 ( /*(u8*) */
1286 pSdoComCon-> 1286 pSdoComCon->
1287 m_pData) += 1287 m_pData) +=
1288 uiSize; 1288 uiSize;
@@ -1320,7 +1320,7 @@ static tEplKernel EplSdoComProcessIntern(tEplSdoComConHdl SdoComCon_p,
1320 pSdoComCon-> 1320 pSdoComCon->
1321 m_pData 1321 m_pData
1322 = 1322 =
1323 (BYTE 1323 (u8
1324 *) 1324 *)
1325 & 1325 &
1326 pSdoComCon-> 1326 pSdoComCon->
@@ -1986,7 +1986,7 @@ static tEplKernel EplSdoComServerInitReadByIndex(tEplSdoComCon * pSdoComCon_p,
1986 if (Ret == kEplObdSubindexNotExist) { // subentry doesn't exist 1986 if (Ret == kEplObdSubindexNotExist) { // subentry doesn't exist
1987 dwAbortCode = EPL_SDOAC_SUB_INDEX_NOT_EXIST; 1987 dwAbortCode = EPL_SDOAC_SUB_INDEX_NOT_EXIST;
1988 // send abort 1988 // send abort
1989 pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode; 1989 pSdoComCon_p->m_pData = (u8 *) & dwAbortCode;
1990 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, 1990 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,
1991 uiIndex, 1991 uiIndex,
1992 uiSubindex, 1992 uiSubindex,
@@ -1995,7 +1995,7 @@ static tEplKernel EplSdoComServerInitReadByIndex(tEplSdoComCon * pSdoComCon_p,
1995 } else if (Ret != kEplSuccessful) { // entry doesn't exist 1995 } else if (Ret != kEplSuccessful) { // entry doesn't exist
1996 dwAbortCode = EPL_SDOAC_OBJECT_NOT_EXIST; 1996 dwAbortCode = EPL_SDOAC_OBJECT_NOT_EXIST;
1997 // send abort 1997 // send abort
1998 pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode; 1998 pSdoComCon_p->m_pData = (u8 *) & dwAbortCode;
1999 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, 1999 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,
2000 uiIndex, 2000 uiIndex,
2001 uiSubindex, 2001 uiSubindex,
@@ -2013,7 +2013,7 @@ static tEplKernel EplSdoComServerInitReadByIndex(tEplSdoComCon * pSdoComCon_p,
2013 dwAbortCode = EPL_SDOAC_UNSUPPORTED_ACCESS; 2013 dwAbortCode = EPL_SDOAC_UNSUPPORTED_ACCESS;
2014 } 2014 }
2015 // send abort 2015 // send abort
2016 pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode; 2016 pSdoComCon_p->m_pData = (u8 *) & dwAbortCode;
2017 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, 2017 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,
2018 uiIndex, 2018 uiIndex,
2019 uiSubindex, 2019 uiSubindex,
@@ -2050,7 +2050,7 @@ static tEplKernel EplSdoComServerInitReadByIndex(tEplSdoComCon * pSdoComCon_p,
2050 // error -> abort 2050 // error -> abort
2051 dwAbortCode = EPL_SDOAC_GENERAL_ERROR; 2051 dwAbortCode = EPL_SDOAC_GENERAL_ERROR;
2052 // send abort 2052 // send abort
2053 pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode; 2053 pSdoComCon_p->m_pData = (u8 *) & dwAbortCode;
2054 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, 2054 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,
2055 uiIndex, 2055 uiIndex,
2056 uiSubindex, 2056 uiSubindex,
@@ -2089,11 +2089,11 @@ static tEplKernel EplSdoComServerSendFrameIntern(tEplSdoComCon * pSdoComCon_p,
2089 tEplSdoComSendType SendType_p) 2089 tEplSdoComSendType SendType_p)
2090{ 2090{
2091 tEplKernel Ret; 2091 tEplKernel Ret;
2092 BYTE abFrame[EPL_MAX_SDO_FRAME_SIZE]; 2092 u8 abFrame[EPL_MAX_SDO_FRAME_SIZE];
2093 tEplFrame *pFrame; 2093 tEplFrame *pFrame;
2094 tEplAsySdoCom *pCommandFrame; 2094 tEplAsySdoCom *pCommandFrame;
2095 unsigned int uiSizeOfFrame; 2095 unsigned int uiSizeOfFrame;
2096 BYTE bFlag; 2096 u8 bFlag;
2097 2097
2098 Ret = kEplSuccessful; 2098 Ret = kEplSuccessful;
2099 2099
@@ -2373,7 +2373,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p,
2373 tEplObdSize EntrySize; 2373 tEplObdSize EntrySize;
2374 tEplObdAccess AccessType; 2374 tEplObdAccess AccessType;
2375 DWORD dwAbortCode; 2375 DWORD dwAbortCode;
2376 BYTE *pbSrcData; 2376 u8 *pbSrcData;
2377 2377
2378 dwAbortCode = 0; 2378 dwAbortCode = 0;
2379 2379
@@ -2426,7 +2426,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p,
2426 pSdoComCon_p->m_dwLastAbortCode = EPL_SDOAC_SUB_INDEX_NOT_EXIST; 2426 pSdoComCon_p->m_dwLastAbortCode = EPL_SDOAC_SUB_INDEX_NOT_EXIST;
2427 // send abort 2427 // send abort
2428 // d.k. This is wrong: k.t. not needed send abort on end of write 2428 // d.k. This is wrong: k.t. not needed send abort on end of write
2429 /*pSdoComCon_p->m_pData = (BYTE*)pSdoComCon_p->m_dwLastAbortCode; 2429 /*pSdoComCon_p->m_pData = (u8*)pSdoComCon_p->m_dwLastAbortCode;
2430 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, 2430 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,
2431 uiIndex, 2431 uiIndex,
2432 uiSubindex, 2432 uiSubindex,
@@ -2437,7 +2437,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p,
2437 // send abort 2437 // send abort
2438 // d.k. This is wrong: k.t. not needed send abort on end of write 2438 // d.k. This is wrong: k.t. not needed send abort on end of write
2439 /* 2439 /*
2440 pSdoComCon_p->m_pData = (BYTE*)&dwAbortCode; 2440 pSdoComCon_p->m_pData = (u8*)&dwAbortCode;
2441 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, 2441 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,
2442 uiIndex, 2442 uiIndex,
2443 uiSubindex, 2443 uiSubindex,
@@ -2457,7 +2457,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p,
2457 } 2457 }
2458 // send abort 2458 // send abort
2459 // d.k. This is wrong: k.t. not needed send abort on end of write 2459 // d.k. This is wrong: k.t. not needed send abort on end of write
2460 /*pSdoComCon_p->m_pData = (BYTE*)&dwAbortCode; 2460 /*pSdoComCon_p->m_pData = (u8*)&dwAbortCode;
2461 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, 2461 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,
2462 uiIndex, 2462 uiIndex,
2463 uiSubindex, 2463 uiSubindex,
@@ -2548,7 +2548,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p,
2548 EPL_SDOAC_DATA_TYPE_LENGTH_TOO_HIGH; 2548 EPL_SDOAC_DATA_TYPE_LENGTH_TOO_HIGH;
2549 // send abort 2549 // send abort
2550 // d.k. This is wrong: k.t. not needed send abort on end of write 2550 // d.k. This is wrong: k.t. not needed send abort on end of write
2551 /*pSdoComCon_p->m_pData = (BYTE*)&dwAbortCode; 2551 /*pSdoComCon_p->m_pData = (u8*)&dwAbortCode;
2552 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, 2552 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,
2553 uiIndex, 2553 uiIndex,
2554 uiSubindex, 2554 uiSubindex,
@@ -2570,7 +2570,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p,
2570 EPL_SDOAC_GENERAL_ERROR; 2570 EPL_SDOAC_GENERAL_ERROR;
2571 // send abort 2571 // send abort
2572 // d.k. This is wrong: k.t. not needed send abort on end of write 2572 // d.k. This is wrong: k.t. not needed send abort on end of write
2573/* pSdoComCon_p->m_pData = (BYTE*)&pSdoComCon_p->m_dwLastAbortCode; 2573/* pSdoComCon_p->m_pData = (u8*)&pSdoComCon_p->m_dwLastAbortCode;
2574 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p, 2574 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,
2575 uiIndex, 2575 uiIndex,
2576 uiSubindex, 2576 uiSubindex,
@@ -2585,7 +2585,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p,
2585 pSdoComCon_p->m_uiTransSize -= uiBytesToTransfer; 2585 pSdoComCon_p->m_uiTransSize -= uiBytesToTransfer;
2586 2586
2587 // update target pointer 2587 // update target pointer
2588 ( /*(BYTE*) */ pSdoComCon_p->m_pData) += uiBytesToTransfer; 2588 ( /*(u8*) */ pSdoComCon_p->m_pData) += uiBytesToTransfer;
2589 2589
2590 // send acknowledge without any Command layer data 2590 // send acknowledge without any Command layer data
2591 Ret = EplSdoAsySeqSendData(pSdoComCon_p->m_SdoSeqConHdl, 2591 Ret = EplSdoAsySeqSendData(pSdoComCon_p->m_SdoSeqConHdl,
@@ -2597,7 +2597,7 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p,
2597 if (pSdoComCon_p->m_dwLastAbortCode != 0) { 2597 if (pSdoComCon_p->m_dwLastAbortCode != 0) {
2598 // send abort 2598 // send abort
2599 pSdoComCon_p->m_pData = 2599 pSdoComCon_p->m_pData =
2600 (BYTE *) & pSdoComCon_p->m_dwLastAbortCode; 2600 (u8 *) & pSdoComCon_p->m_dwLastAbortCode;
2601 Ret = 2601 Ret =
2602 EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex, 2602 EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex,
2603 uiSubindex, 2603 uiSubindex,
@@ -2634,12 +2634,12 @@ static tEplKernel EplSdoComServerInitWriteByIndex(tEplSdoComCon * pSdoComCon_p,
2634static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p) 2634static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p)
2635{ 2635{
2636 tEplKernel Ret; 2636 tEplKernel Ret;
2637 BYTE abFrame[EPL_MAX_SDO_FRAME_SIZE]; 2637 u8 abFrame[EPL_MAX_SDO_FRAME_SIZE];
2638 tEplFrame *pFrame; 2638 tEplFrame *pFrame;
2639 tEplAsySdoCom *pCommandFrame; 2639 tEplAsySdoCom *pCommandFrame;
2640 unsigned int uiSizeOfFrame; 2640 unsigned int uiSizeOfFrame;
2641 BYTE bFlags; 2641 u8 bFlags;
2642 BYTE *pbPayload; 2642 u8 *pbPayload;
2643 2643
2644 Ret = kEplSuccessful; 2644 Ret = kEplSuccessful;
2645 2645
@@ -2683,7 +2683,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p)
2683 m_uiTargetIndex); 2683 m_uiTargetIndex);
2684 pbPayload += 2; 2684 pbPayload += 2;
2685 AmiSetByteToLe(pbPayload, 2685 AmiSetByteToLe(pbPayload,
2686 (BYTE) pSdoComCon_p-> 2686 (u8) pSdoComCon_p->
2687 m_uiTargetSubIndex); 2687 m_uiTargetSubIndex);
2688 // calc size 2688 // calc size
2689 uiSizeOfFrame += 4; 2689 uiSizeOfFrame += 4;
@@ -2725,7 +2725,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p)
2725 m_uiTargetIndex); 2725 m_uiTargetIndex);
2726 pbPayload += 2; 2726 pbPayload += 2;
2727 AmiSetByteToLe(pbPayload, 2727 AmiSetByteToLe(pbPayload,
2728 (BYTE) 2728 (u8)
2729 pSdoComCon_p-> 2729 pSdoComCon_p->
2730 m_uiTargetSubIndex); 2730 m_uiTargetSubIndex);
2731 // on byte for reserved 2731 // on byte for reserved
@@ -2764,7 +2764,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p)
2764 m_uiTargetIndex); 2764 m_uiTargetIndex);
2765 pbPayload += 2; 2765 pbPayload += 2;
2766 AmiSetByteToLe(pbPayload, 2766 AmiSetByteToLe(pbPayload,
2767 (BYTE) 2767 (u8)
2768 pSdoComCon_p-> 2768 pSdoComCon_p->
2769 m_uiTargetSubIndex); 2769 m_uiTargetSubIndex);
2770 // + 2 -> one byte for subindex and one byte reserved 2770 // + 2 -> one byte for subindex and one byte reserved
@@ -2943,7 +2943,7 @@ static tEplKernel EplSdoComClientProcessFrame(tEplSdoComConHdl SdoComCon_p,
2943 tEplAsySdoCom * pAsySdoCom_p) 2943 tEplAsySdoCom * pAsySdoCom_p)
2944{ 2944{
2945 tEplKernel Ret; 2945 tEplKernel Ret;
2946 BYTE bBuffer; 2946 u8 bBuffer;
2947 unsigned int uiBuffer; 2947 unsigned int uiBuffer;
2948 unsigned int uiDataSize; 2948 unsigned int uiDataSize;
2949 unsigned long ulBuffer; 2949 unsigned long ulBuffer;
@@ -3219,7 +3219,7 @@ static tEplKernel EplSdoComClientSendAbort(tEplSdoComCon * pSdoComCon_p,
3219 DWORD dwAbortCode_p) 3219 DWORD dwAbortCode_p)
3220{ 3220{
3221 tEplKernel Ret; 3221 tEplKernel Ret;
3222 BYTE abFrame[EPL_MAX_SDO_FRAME_SIZE]; 3222 u8 abFrame[EPL_MAX_SDO_FRAME_SIZE];
3223 tEplFrame *pFrame; 3223 tEplFrame *pFrame;
3224 tEplAsySdoCom *pCommandFrame; 3224 tEplAsySdoCom *pCommandFrame;
3225 unsigned int uiSizeOfFrame; 3225 unsigned int uiSizeOfFrame;
diff --git a/drivers/staging/epl/EplSdoUdpu.c b/drivers/staging/epl/EplSdoUdpu.c
index 293e60fc4de..656ea242920 100644
--- a/drivers/staging/epl/EplSdoUdpu.c
+++ b/drivers/staging/epl/EplSdoUdpu.c
@@ -550,7 +550,7 @@ static int EplSdoUdpThread(void *pArg_p)
550 int iError; 550 int iError;
551 int iCount; 551 int iCount;
552 int iFreeEntry; 552 int iFreeEntry;
553 BYTE abBuffer[EPL_MAX_SDO_REC_FRAME_SIZE]; 553 u8 abBuffer[EPL_MAX_SDO_REC_FRAME_SIZE];
554 unsigned int uiSize; 554 unsigned int uiSize;
555 tEplSdoConHdl SdoConHdl; 555 tEplSdoConHdl SdoConHdl;
556 556
diff --git a/drivers/staging/epl/EplTarget.h b/drivers/staging/epl/EplTarget.h
index 0e6da210545..61a56951da9 100644
--- a/drivers/staging/epl/EplTarget.h
+++ b/drivers/staging/epl/EplTarget.h
@@ -134,8 +134,8 @@
134// functions for ethernet driver 134// functions for ethernet driver
135tEplKernel TgtInitEthIsr(void); 135tEplKernel TgtInitEthIsr(void);
136void TgtFreeEthIsr(void); 136void TgtFreeEthIsr(void);
137void TgtEnableGlobalInterrupt(BYTE fEnable_p); 137void TgtEnableGlobalInterrupt(u8 fEnable_p);
138void TgtEnableEthInterrupt0(BYTE fEnable_p, unsigned int uiInterruptMask_p); 138void TgtEnableEthInterrupt0(u8 fEnable_p, unsigned int uiInterruptMask_p);
139void TgtEnableEthInterrupt1(BYTE fEnable_p, unsigned int uiInterruptMask_p); 139void TgtEnableEthInterrupt1(u8 fEnable_p, unsigned int uiInterruptMask_p);
140 140
141#endif // #ifndef _EPLTARGET_H_ 141#endif // #ifndef _EPLTARGET_H_
diff --git a/drivers/staging/epl/ShbIpc-LinuxKernel.c b/drivers/staging/epl/ShbIpc-LinuxKernel.c
index 6ffe41008d3..497938bd09b 100644
--- a/drivers/staging/epl/ShbIpc-LinuxKernel.c
+++ b/drivers/staging/epl/ShbIpc-LinuxKernel.c
@@ -677,7 +677,7 @@ void *ShbIpcGetShMemPtr(tShbInstance pShbInstance_p)
677 pShbMemHeader = 677 pShbMemHeader =
678 ShbIpcGetShbMemHeader(ShbIpcGetShbMemInst(pShbInstance_p)); 678 ShbIpcGetShbMemHeader(ShbIpcGetShbMemInst(pShbInstance_p));
679 if (pShbMemHeader != NULL) { 679 if (pShbMemHeader != NULL) {
680 pShbShMemPtr = (BYTE *) pShbMemHeader + sizeof(tShbMemHeader); 680 pShbShMemPtr = (u8 *) pShbMemHeader + sizeof(tShbMemHeader);
681 } else { 681 } else {
682 pShbShMemPtr = NULL; 682 pShbShMemPtr = NULL;
683 } 683 }
diff --git a/drivers/staging/epl/TimerHighReskX86.c b/drivers/staging/epl/TimerHighReskX86.c
index 11ae8192323..2d657d711d8 100644
--- a/drivers/staging/epl/TimerHighReskX86.c
+++ b/drivers/staging/epl/TimerHighReskX86.c
@@ -103,7 +103,7 @@
103 103
104// TracePoint support for realtime-debugging 104// TracePoint support for realtime-debugging
105#ifdef _DBG_TRACE_POINTS_ 105#ifdef _DBG_TRACE_POINTS_
106void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); 106void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);
107void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 107void TgtDbgPostTraceValue(DWORD dwTraceValue_p);
108#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 108#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)
109#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 109#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v)
diff --git a/drivers/staging/epl/amix86.c b/drivers/staging/epl/amix86.c
index bff9dfe5ff3..7f1a5028df6 100644
--- a/drivers/staging/epl/amix86.c
+++ b/drivers/staging/epl/amix86.c
@@ -115,12 +115,12 @@ typedef struct {
115// 115//
116//--------------------------------------------------------------------------- 116//---------------------------------------------------------------------------
117 117
118//------------< write BYTE in big endian >-------------------------- 118//------------< write u8 in big endian >--------------------------
119/* 119/*
120void AmiSetByteToBe (void *pAddr_p, BYTE bByteVal_p) 120void AmiSetByteToBe (void *pAddr_p, u8 bByteVal_p)
121{ 121{
122 122
123 *(BYTE *)pAddr_p = bByteVal_p; 123 *(u8 *)pAddr_p = bByteVal_p;
124 124
125} 125}
126*/ 126*/
@@ -173,12 +173,12 @@ void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p)
173// 173//
174//--------------------------------------------------------------------------- 174//---------------------------------------------------------------------------
175 175
176//------------< write BYTE in little endian >-------------------------- 176//------------< write u8 in little endian >--------------------------
177/* 177/*
178void AmiSetByteToLe (void *pAddr_p, BYTE bByteVal_p) 178void AmiSetByteToLe (void *pAddr_p, u8 bByteVal_p)
179{ 179{
180 180
181 *(BYTE *)pAddr_p = bByteVal_p; 181 *(u8 *)pAddr_p = bByteVal_p;
182 182
183} 183}
184*/ 184*/
@@ -220,12 +220,12 @@ void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p)
220// 220//
221//--------------------------------------------------------------------------- 221//---------------------------------------------------------------------------
222 222
223//------------< read BYTE in big endian >--------------------------- 223//------------< read u8 in big endian >---------------------------
224/* 224/*
225BYTE AmiGetByteFromBe (void *pAddr_p) 225u8 AmiGetByteFromBe (void *pAddr_p)
226{ 226{
227 227
228 return ( *(BYTE *)pAddr_p ); 228 return ( *(u8 *)pAddr_p );
229 229
230} 230}
231*/ 231*/
@@ -279,12 +279,12 @@ DWORD AmiGetDwordFromBe(void *pAddr_p)
279// 279//
280//--------------------------------------------------------------------------- 280//---------------------------------------------------------------------------
281 281
282//------------< read BYTE in little endian >--------------------------- 282//------------< read u8 in little endian >---------------------------
283/* 283/*
284BYTE AmiGetByteFromLe (void *pAddr_p) 284u8 AmiGetByteFromLe (void *pAddr_p)
285{ 285{
286 286
287 return ( *(BYTE *)pAddr_p ); 287 return ( *(u8 *)pAddr_p );
288 288
289} 289}
290*/ 290*/
@@ -326,9 +326,9 @@ DWORD AmiGetDwordFromLe(void *pAddr_p)
326 326
327void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p) 327void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p)
328{ 328{
329 ((BYTE *) pAddr_p)[0] = ((BYTE *) & dwDwordVal_p)[2]; 329 ((u8 *) pAddr_p)[0] = ((u8 *) & dwDwordVal_p)[2];
330 ((BYTE *) pAddr_p)[1] = ((BYTE *) & dwDwordVal_p)[1]; 330 ((u8 *) pAddr_p)[1] = ((u8 *) & dwDwordVal_p)[1];
331 ((BYTE *) pAddr_p)[2] = ((BYTE *) & dwDwordVal_p)[0]; 331 ((u8 *) pAddr_p)[2] = ((u8 *) & dwDwordVal_p)[0];
332} 332}
333 333
334//--------------------------------------------------------------------------- 334//---------------------------------------------------------------------------
@@ -348,9 +348,9 @@ void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p)
348 348
349void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p) 349void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p)
350{ 350{
351 ((BYTE *) pAddr_p)[0] = ((BYTE *) & dwDwordVal_p)[0]; 351 ((u8 *) pAddr_p)[0] = ((u8 *) & dwDwordVal_p)[0];
352 ((BYTE *) pAddr_p)[1] = ((BYTE *) & dwDwordVal_p)[1]; 352 ((u8 *) pAddr_p)[1] = ((u8 *) & dwDwordVal_p)[1];
353 ((BYTE *) pAddr_p)[2] = ((BYTE *) & dwDwordVal_p)[2]; 353 ((u8 *) pAddr_p)[2] = ((u8 *) & dwDwordVal_p)[2];
354} 354}
355 355
356//--------------------------------------------------------------------------- 356//---------------------------------------------------------------------------
@@ -417,14 +417,14 @@ DWORD AmiGetDword24FromLe(void *pAddr_p)
417//--------------------------------------------------------------------------- 417//---------------------------------------------------------------------------
418void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p) 418void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p)
419{ 419{
420 ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[7]; 420 ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[7];
421 ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[6]; 421 ((u8 *) pAddr_p)[1] = ((u8 *) & qwQwordVal_p)[6];
422 ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[5]; 422 ((u8 *) pAddr_p)[2] = ((u8 *) & qwQwordVal_p)[5];
423 ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[4]; 423 ((u8 *) pAddr_p)[3] = ((u8 *) & qwQwordVal_p)[4];
424 ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[3]; 424 ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[3];
425 ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[2]; 425 ((u8 *) pAddr_p)[5] = ((u8 *) & qwQwordVal_p)[2];
426 ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[1]; 426 ((u8 *) pAddr_p)[6] = ((u8 *) & qwQwordVal_p)[1];
427 ((BYTE *) pAddr_p)[7] = ((BYTE *) & qwQwordVal_p)[0]; 427 ((u8 *) pAddr_p)[7] = ((u8 *) & qwQwordVal_p)[0];
428} 428}
429 429
430//--------------------------------------------------------------------------- 430//---------------------------------------------------------------------------
@@ -466,14 +466,14 @@ QWORD AmiGetQword64FromBe(void *pAddr_p)
466{ 466{
467 tqwStruct qwStruct; 467 tqwStruct qwStruct;
468 468
469 ((BYTE *) & qwStruct.m_qwQword)[0] = ((BYTE *) pAddr_p)[7]; 469 ((u8 *) & qwStruct.m_qwQword)[0] = ((u8 *) pAddr_p)[7];
470 ((BYTE *) & qwStruct.m_qwQword)[1] = ((BYTE *) pAddr_p)[6]; 470 ((u8 *) & qwStruct.m_qwQword)[1] = ((u8 *) pAddr_p)[6];
471 ((BYTE *) & qwStruct.m_qwQword)[2] = ((BYTE *) pAddr_p)[5]; 471 ((u8 *) & qwStruct.m_qwQword)[2] = ((u8 *) pAddr_p)[5];
472 ((BYTE *) & qwStruct.m_qwQword)[3] = ((BYTE *) pAddr_p)[4]; 472 ((u8 *) & qwStruct.m_qwQword)[3] = ((u8 *) pAddr_p)[4];
473 ((BYTE *) & qwStruct.m_qwQword)[4] = ((BYTE *) pAddr_p)[3]; 473 ((u8 *) & qwStruct.m_qwQword)[4] = ((u8 *) pAddr_p)[3];
474 ((BYTE *) & qwStruct.m_qwQword)[5] = ((BYTE *) pAddr_p)[2]; 474 ((u8 *) & qwStruct.m_qwQword)[5] = ((u8 *) pAddr_p)[2];
475 ((BYTE *) & qwStruct.m_qwQword)[6] = ((BYTE *) pAddr_p)[1]; 475 ((u8 *) & qwStruct.m_qwQword)[6] = ((u8 *) pAddr_p)[1];
476 ((BYTE *) & qwStruct.m_qwQword)[7] = ((BYTE *) pAddr_p)[0]; 476 ((u8 *) & qwStruct.m_qwQword)[7] = ((u8 *) pAddr_p)[0];
477 477
478 return (qwStruct.m_qwQword); 478 return (qwStruct.m_qwQword);
479} 479}
@@ -520,11 +520,11 @@ QWORD AmiGetQword64FromLe(void *pAddr_p)
520void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p) 520void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p)
521{ 521{
522 522
523 ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[4]; 523 ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[4];
524 ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[3]; 524 ((u8 *) pAddr_p)[1] = ((u8 *) & qwQwordVal_p)[3];
525 ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[2]; 525 ((u8 *) pAddr_p)[2] = ((u8 *) & qwQwordVal_p)[2];
526 ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[1]; 526 ((u8 *) pAddr_p)[3] = ((u8 *) & qwQwordVal_p)[1];
527 ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[0]; 527 ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[0];
528 528
529} 529}
530 530
@@ -547,7 +547,7 @@ void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p)
547{ 547{
548 548
549 ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; 549 ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0];
550 ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[4]; 550 ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[4];
551 551
552} 552}
553 553
@@ -621,12 +621,12 @@ QWORD AmiGetQword40FromLe(void *pAddr_p)
621void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p) 621void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p)
622{ 622{
623 623
624 ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[5]; 624 ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[5];
625 ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[4]; 625 ((u8 *) pAddr_p)[1] = ((u8 *) & qwQwordVal_p)[4];
626 ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[3]; 626 ((u8 *) pAddr_p)[2] = ((u8 *) & qwQwordVal_p)[3];
627 ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[2]; 627 ((u8 *) pAddr_p)[3] = ((u8 *) & qwQwordVal_p)[2];
628 ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[1]; 628 ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[1];
629 ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[0]; 629 ((u8 *) pAddr_p)[5] = ((u8 *) & qwQwordVal_p)[0];
630 630
631} 631}
632 632
@@ -723,13 +723,13 @@ QWORD AmiGetQword48FromLe(void *pAddr_p)
723void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p) 723void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p)
724{ 724{
725 725
726 ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[6]; 726 ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[6];
727 ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[5]; 727 ((u8 *) pAddr_p)[1] = ((u8 *) & qwQwordVal_p)[5];
728 ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[4]; 728 ((u8 *) pAddr_p)[2] = ((u8 *) & qwQwordVal_p)[4];
729 ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[3]; 729 ((u8 *) pAddr_p)[3] = ((u8 *) & qwQwordVal_p)[3];
730 ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[2]; 730 ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[2];
731 ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[1]; 731 ((u8 *) pAddr_p)[5] = ((u8 *) & qwQwordVal_p)[1];
732 ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[0]; 732 ((u8 *) pAddr_p)[6] = ((u8 *) & qwQwordVal_p)[0];
733 733
734} 734}
735 735
@@ -753,7 +753,7 @@ void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p)
753 753
754 ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; 754 ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0];
755 ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; 755 ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2];
756 ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[6]; 756 ((u8 *) pAddr_p)[6] = ((u8 *) & qwQwordVal_p)[6];
757 757
758} 758}
759 759
@@ -827,8 +827,8 @@ QWORD AmiGetQword56FromLe(void *pAddr_p)
827void AmiSetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p) 827void AmiSetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p)
828{ 828{
829 829
830 AmiSetDwordToLe(((BYTE *) pAddr_p), pTimeOfDay_p->m_dwMs & 0x0FFFFFFF); 830 AmiSetDwordToLe(((u8 *) pAddr_p), pTimeOfDay_p->m_dwMs & 0x0FFFFFFF);
831 AmiSetWordToLe(((BYTE *) pAddr_p) + 4, pTimeOfDay_p->m_wDays); 831 AmiSetWordToLe(((u8 *) pAddr_p) + 4, pTimeOfDay_p->m_wDays);
832 832
833} 833}
834 834
@@ -850,8 +850,8 @@ void AmiSetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p)
850void AmiGetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p) 850void AmiGetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p)
851{ 851{
852 852
853 pTimeOfDay_p->m_dwMs = AmiGetDwordFromLe(((BYTE *) pAddr_p)) & 0x0FFFFFFF; 853 pTimeOfDay_p->m_dwMs = AmiGetDwordFromLe(((u8 *) pAddr_p)) & 0x0FFFFFFF;
854 pTimeOfDay_p->m_wDays = AmiGetWordFromLe(((BYTE *) pAddr_p) + 4); 854 pTimeOfDay_p->m_wDays = AmiGetWordFromLe(((u8 *) pAddr_p) + 4);
855 855
856} 856}
857 857
diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c
index 4e60143a5b0..594485e2811 100644
--- a/drivers/staging/epl/demo_main.c
+++ b/drivers/staging/epl/demo_main.c
@@ -118,7 +118,7 @@ MODULE_DESCRIPTION("EPL MN demo");
118 118
119// TracePoint support for realtime-debugging 119// TracePoint support for realtime-debugging
120#ifdef _DBG_TRACE_POINTS_ 120#ifdef _DBG_TRACE_POINTS_
121void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); 121void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);
122#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 122#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)
123#else 123#else
124#define TGT_DBG_SIGNAL_TRACE_POINT(p) 124#define TGT_DBG_SIGNAL_TRACE_POINT(p)
@@ -148,25 +148,25 @@ void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p);
148// modul globale vars 148// modul globale vars
149//--------------------------------------------------------------------------- 149//---------------------------------------------------------------------------
150 150
151const BYTE abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 151const u8 abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
152 152
153BYTE bVarIn1_l; 153u8 bVarIn1_l;
154BYTE bVarOut1_l; 154u8 bVarOut1_l;
155BYTE bVarOut1Old_l; 155u8 bVarOut1Old_l;
156BYTE bModeSelect_l; // state of the pushbuttons to select the mode 156u8 bModeSelect_l; // state of the pushbuttons to select the mode
157BYTE bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed 157u8 bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed
158BYTE bSpeedSelectOld_l; // old state of the pushbuttons 158u8 bSpeedSelectOld_l; // old state of the pushbuttons
159DWORD dwLeds_l; // current state of all LEDs 159DWORD dwLeds_l; // current state of all LEDs
160BYTE bLedsRow1_l; // current state of the LEDs in row 1 160u8 bLedsRow1_l; // current state of the LEDs in row 1
161BYTE bLedsRow2_l; // current state of the LEDs in row 2 161u8 bLedsRow2_l; // current state of the LEDs in row 2
162BYTE abSelect_l[3]; // pushbuttons from CNs 162u8 abSelect_l[3]; // pushbuttons from CNs
163 163
164DWORD dwMode_l; // current mode 164DWORD dwMode_l; // current mode
165int iCurCycleCount_l; // current cycle count 165int iCurCycleCount_l; // current cycle count
166int iMaxCycleCount_l; // maximum cycle count (i.e. number of cycles until next light movement step) 166int iMaxCycleCount_l; // maximum cycle count (i.e. number of cycles until next light movement step)
167int iToggle; // indicates the light movement direction 167int iToggle; // indicates the light movement direction
168 168
169BYTE abDomain_l[3000]; 169u8 abDomain_l[3000];
170 170
171static wait_queue_head_t WaitQueueShutdown_g; // wait queue for tEplNmtEventSwitchOff 171static wait_queue_head_t WaitQueueShutdown_g; // wait queue for tEplNmtEventSwitchOff
172static atomic_t AtomicShutdown_g = ATOMIC_INIT(FALSE); 172static atomic_t AtomicShutdown_g = ATOMIC_INIT(FALSE);
@@ -263,7 +263,7 @@ static int __init EplLinInit(void)
263 EplApiInitParam.m_uiSizeOfStruct = sizeof(EplApiInitParam); 263 EplApiInitParam.m_uiSizeOfStruct = sizeof(EplApiInitParam);
264 EPL_MEMCPY(EplApiInitParam.m_abMacAddress, abMacAddr, 264 EPL_MEMCPY(EplApiInitParam.m_abMacAddress, abMacAddr,
265 sizeof(EplApiInitParam.m_abMacAddress)); 265 sizeof(EplApiInitParam.m_abMacAddress));
266// EplApiInitParam.m_abMacAddress[5] = (BYTE) EplApiInitParam.m_uiNodeId; 266// EplApiInitParam.m_abMacAddress[5] = (u8) EplApiInitParam.m_uiNodeId;
267 EplApiInitParam.m_dwFeatureFlags = -1; 267 EplApiInitParam.m_dwFeatureFlags = -1;
268 EplApiInitParam.m_dwCycleLen = uiCycleLen_g; // required for error detection 268 EplApiInitParam.m_dwCycleLen = uiCycleLen_g; // required for error detection
269 EplApiInitParam.m_uiIsochrTxMaxPayload = 100; // const 269 EplApiInitParam.m_uiIsochrTxMaxPayload = 100; // const
diff --git a/drivers/staging/epl/edrv.h b/drivers/staging/epl/edrv.h
index a45984dfb09..56b287e0318 100644
--- a/drivers/staging/epl/edrv.h
+++ b/drivers/staging/epl/edrv.h
@@ -104,7 +104,7 @@ typedef struct _tEdrvTxBuffer {
104 unsigned int m_uiTxMsgLen; // IN: length of message to be send (set for each transmit call) 104 unsigned int m_uiTxMsgLen; // IN: length of message to be send (set for each transmit call)
105 // ---------------------- 105 // ----------------------
106 unsigned int m_uiBufferNumber; // OUT: number of the buffer, set by ethernetdriver 106 unsigned int m_uiBufferNumber; // OUT: number of the buffer, set by ethernetdriver
107 BYTE *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver 107 u8 *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver
108 tEplNetTime m_NetTime; // OUT: Timestamp of end of transmission, set by ethernetdriver 108 tEplNetTime m_NetTime; // OUT: Timestamp of end of transmission, set by ethernetdriver
109 // ---------------------- 109 // ----------------------
110 unsigned int m_uiMaxBufferLen; // IN/OUT: maximum length of the buffer 110 unsigned int m_uiMaxBufferLen; // IN/OUT: maximum length of the buffer
@@ -114,21 +114,21 @@ typedef struct _tEdrvTxBuffer {
114typedef struct _tEdrvRxBuffer { 114typedef struct _tEdrvRxBuffer {
115 tEdrvBufferInFrame m_BufferInFrame; // OUT position of received buffer in an ethernet-frame 115 tEdrvBufferInFrame m_BufferInFrame; // OUT position of received buffer in an ethernet-frame
116 unsigned int m_uiRxMsgLen; // OUT: length of received buffer (without CRC) 116 unsigned int m_uiRxMsgLen; // OUT: length of received buffer (without CRC)
117 BYTE *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver 117 u8 *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver
118 tEplNetTime m_NetTime; // OUT: Timestamp of end of receiption 118 tEplNetTime m_NetTime; // OUT: Timestamp of end of receiption
119 119
120} tEdrvRxBuffer; 120} tEdrvRxBuffer;
121 121
122//typedef void (*tEdrvRxHandler) (BYTE bBufferInFrame_p, tBufferDescr * pbBuffer_p); 122//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, tBufferDescr * pbBuffer_p);
123//typedef void (*tEdrvRxHandler) (BYTE bBufferInFrame_p, BYTE * pbEthernetData_p, WORD wDataLen_p); 123//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, u8 * pbEthernetData_p, WORD wDataLen_p);
124typedef void (*tEdrvRxHandler) (tEdrvRxBuffer * pRxBuffer_p); 124typedef void (*tEdrvRxHandler) (tEdrvRxBuffer * pRxBuffer_p);
125typedef void (*tEdrvTxHandler) (tEdrvTxBuffer * pTxBuffer_p); 125typedef void (*tEdrvTxHandler) (tEdrvTxBuffer * pTxBuffer_p);
126 126
127// format of init structure 127// format of init structure
128typedef struct { 128typedef struct {
129 BYTE m_abMyMacAddr[6]; // the own MAC address 129 u8 m_abMyMacAddr[6]; // the own MAC address
130 130
131// BYTE m_bNoOfRxBuffDescr; // number of entries in rx bufferdescriptor table 131// u8 m_bNoOfRxBuffDescr; // number of entries in rx bufferdescriptor table
132// tBufferDescr * m_pRxBuffDescrTable; // rx bufferdescriptor table 132// tBufferDescr * m_pRxBuffDescrTable; // rx bufferdescriptor table
133// WORD m_wRxBufferSize; // size of the whole rx buffer 133// WORD m_wRxBufferSize; // size of the whole rx buffer
134 134
@@ -145,11 +145,11 @@ tEplKernel EdrvInit(tEdrvInitParam * pEdrvInitParam_p);
145 145
146tEplKernel EdrvShutdown(void); 146tEplKernel EdrvShutdown(void);
147 147
148tEplKernel EdrvDefineRxMacAddrEntry(BYTE * pbMacAddr_p); 148tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p);
149tEplKernel EdrvUndefineRxMacAddrEntry(BYTE * pbMacAddr_p); 149tEplKernel EdrvUndefineRxMacAddrEntry(u8 * pbMacAddr_p);
150 150
151//tEplKernel EdrvDefineUnicastEntry (BYTE * pbUCEntry_p); 151//tEplKernel EdrvDefineUnicastEntry (u8 * pbUCEntry_p);
152//tEplKernel EdrvUndfineUnicastEntry (BYTE * pbUCEntry_p); 152//tEplKernel EdrvUndfineUnicastEntry (u8 * pbUCEntry_p);
153 153
154tEplKernel EdrvAllocTxMsgBuffer(tEdrvTxBuffer * pBuffer_p); 154tEplKernel EdrvAllocTxMsgBuffer(tEdrvTxBuffer * pBuffer_p);
155tEplKernel EdrvReleaseTxMsgBuffer(tEdrvTxBuffer * pBuffer_p); 155tEplKernel EdrvReleaseTxMsgBuffer(tEdrvTxBuffer * pBuffer_p);
diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h
index 51c7409828f..f5e48e4163b 100644
--- a/drivers/staging/epl/global.h
+++ b/drivers/staging/epl/global.h
@@ -30,9 +30,6 @@
30#define TRACE printk 30#define TRACE printk
31 31
32// --- logic types --- 32// --- logic types ---
33#ifndef BYTE
34#define BYTE unsigned char
35#endif
36#ifndef WORD 33#ifndef WORD
37#define WORD unsigned short int 34#define WORD unsigned short int
38#endif 35#endif
diff --git a/drivers/staging/epl/kernel/EplDllk.h b/drivers/staging/epl/kernel/EplDllk.h
index 588e871a922..9967bdda5f5 100644
--- a/drivers/staging/epl/kernel/EplDllk.h
+++ b/drivers/staging/epl/kernel/EplDllk.h
@@ -85,7 +85,7 @@
85typedef tEplKernel(*tEplDllkCbAsync) (tEplFrameInfo * pFrameInfo_p); 85typedef tEplKernel(*tEplDllkCbAsync) (tEplFrameInfo * pFrameInfo_p);
86 86
87typedef struct { 87typedef struct {
88 BYTE m_be_abSrcMac[6]; 88 u8 m_be_abSrcMac[6];
89 89
90} tEplDllkInitParam; 90} tEplDllkInitParam;
91 91
@@ -100,8 +100,8 @@ struct _tEplDllkNodeInfo {
100 unsigned long m_ulDllErrorEvents; 100 unsigned long m_ulDllErrorEvents;
101 tEplNmtState m_NmtState; 101 tEplNmtState m_NmtState;
102 WORD m_wPresPayloadLimit; 102 WORD m_wPresPayloadLimit;
103 BYTE m_be_abMacAddr[6]; 103 u8 m_be_abMacAddr[6];
104 BYTE m_bSoaFlag1; 104 u8 m_bSoaFlag1;
105 BOOL m_fSoftDelete; // delete node after error and ignore error 105 BOOL m_fSoftDelete; // delete node after error and ignore error
106 106
107}; 107};
@@ -154,7 +154,7 @@ tEplKernel EplDllkDeleteNode(unsigned int uiNodeId_p);
154 154
155tEplKernel EplDllkSoftDeleteNode(unsigned int uiNodeId_p); 155tEplKernel EplDllkSoftDeleteNode(unsigned int uiNodeId_p);
156 156
157tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, BYTE bSoaFlag1_p); 157tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, u8 bSoaFlag1_p);
158 158
159tEplKernel EplDllkGetFirstNodeInfo(tEplDllkNodeInfo ** ppNodeInfo_p); 159tEplKernel EplDllkGetFirstNodeInfo(tEplDllkNodeInfo ** ppNodeInfo_p);
160 160
diff --git a/drivers/staging/epl/kernel/EplDllkCal.h b/drivers/staging/epl/kernel/EplDllkCal.h
index 6c4dc7e4a80..4e983c3f29e 100644
--- a/drivers/staging/epl/kernel/EplDllkCal.h
+++ b/drivers/staging/epl/kernel/EplDllkCal.h
@@ -124,7 +124,7 @@ tEplKernel EplDllkCalProcess(tEplEvent * pEvent_p);
124tEplKernel EplDllkCalAsyncClearQueues(void); 124tEplKernel EplDllkCalAsyncClearQueues(void);
125 125
126tEplKernel EplDllkCalIssueRequest(tEplDllReqServiceId Service_p, 126tEplKernel EplDllkCalIssueRequest(tEplDllReqServiceId Service_p,
127 unsigned int uiNodeId_p, BYTE bSoaFlag1_p); 127 unsigned int uiNodeId_p, u8 bSoaFlag1_p);
128 128
129tEplKernel EplDllkCalAsyncGetSoaRequest(tEplDllReqServiceId * pReqServiceId_p, 129tEplKernel EplDllkCalAsyncGetSoaRequest(tEplDllReqServiceId * pReqServiceId_p,
130 unsigned int *puiNodeId_p); 130 unsigned int *puiNodeId_p);
diff --git a/drivers/staging/epl/kernel/EplObdk.h b/drivers/staging/epl/kernel/EplObdk.h
index 30e51d0eb46..ddd1426778c 100644
--- a/drivers/staging/epl/kernel/EplObdk.h
+++ b/drivers/staging/epl/kernel/EplObdk.h
@@ -85,7 +85,7 @@
85// global variables 85// global variables
86//--------------------------------------------------------------------------- 86//---------------------------------------------------------------------------
87 87
88extern BYTE abEplObdTrashObject_g[8]; 88extern u8 abEplObdTrashObject_g[8];
89 89
90//--------------------------------------------------------------------------- 90//---------------------------------------------------------------------------
91// function prototypes 91// function prototypes
diff --git a/drivers/staging/epl/proc_fs.c b/drivers/staging/epl/proc_fs.c
index c08453d5490..62aaa7c3a35 100644
--- a/drivers/staging/epl/proc_fs.c
+++ b/drivers/staging/epl/proc_fs.c
@@ -145,7 +145,7 @@ static int EplLinProcRead(char *pcBuffer_p, char **ppcStart_p, off_t Offset_p,
145static int EplLinProcWrite(struct file *file, const char __user * buffer, 145static int EplLinProcWrite(struct file *file, const char __user * buffer,
146 unsigned long count, void *data); 146 unsigned long count, void *data);
147 147
148void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); 148void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);
149void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 149void TgtDbgPostTraceValue(DWORD dwTraceValue_p);
150 150
151EPLDLLEXPORT DWORD EplIdentuGetRunningRequests(void); 151EPLDLLEXPORT DWORD EplIdentuGetRunningRequests(void);
@@ -191,7 +191,7 @@ tEplKernel EplLinProcFree(void)
191//--------------------------------------------------------------------------- 191//---------------------------------------------------------------------------
192 192
193#ifdef _DBG_TRACE_POINTS_ 193#ifdef _DBG_TRACE_POINTS_
194void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p) 194void TgtDbgSignalTracePoint(u8 bTracePointNumber_p)
195{ 195{
196 196
197 if (bTracePointNumber_p >= 197 if (bTracePointNumber_p >=
diff --git a/drivers/staging/epl/user/EplCfgMau.h b/drivers/staging/epl/user/EplCfgMau.h
index cafe60f094b..2d911d1d724 100644
--- a/drivers/staging/epl/user/EplCfgMau.h
+++ b/drivers/staging/epl/user/EplCfgMau.h
@@ -133,18 +133,18 @@ typedef struct {
133 tEplSdoComConHdl m_SdoComConHdl; // handle for sdo connection 133 tEplSdoComConHdl m_SdoComConHdl; // handle for sdo connection
134 DWORD m_dwLastAbortCode; 134 DWORD m_dwLastAbortCode;
135 unsigned int m_uiLastIndex; // last index of configuration, to compair with actual index 135 unsigned int m_uiLastIndex; // last index of configuration, to compair with actual index
136 BYTE *m_pbConcise; // Ptr to concise DCF 136 u8 *m_pbConcise; // Ptr to concise DCF
137 BYTE *m_pbActualIndex; // Ptr to actual index in the DCF segment 137 u8 *m_pbActualIndex; // Ptr to actual index in the DCF segment
138 tfpEplCfgMaCb m_pfnCfgMaCb; // Ptr to CfgMa Callback, is call if configuration finished 138 tfpEplCfgMaCb m_pfnCfgMaCb; // Ptr to CfgMa Callback, is call if configuration finished
139 tEplKernel m_EplKernelError; // errorcode 139 tEplKernel m_EplKernelError; // errorcode
140 DWORD m_dwNumValueCopy; // numeric values are copied in this variable 140 DWORD m_dwNumValueCopy; // numeric values are copied in this variable
141 unsigned int m_uiPdoNodeId; // buffer for PDO node id 141 unsigned int m_uiPdoNodeId; // buffer for PDO node id
142 BYTE m_bNrOfMappedObject; // number of mapped objects 142 u8 m_bNrOfMappedObject; // number of mapped objects
143 unsigned int m_uiNodeId; // Epl node addresse 143 unsigned int m_uiNodeId; // Epl node addresse
144 tEplSdocState m_SdocState; // bitcoded state of the SDO transfer 144 tEplSdocState m_SdocState; // bitcoded state of the SDO transfer
145 unsigned int m_uiLastSubIndex; // last subindex of configuration 145 unsigned int m_uiLastSubIndex; // last subindex of configuration
146 BOOL m_fOneTranferOk; // atleased one transfer was successful 146 BOOL m_fOneTranferOk; // atleased one transfer was successful
147 BYTE m_bEventFlag; // for Eventsignaling to the State Maschine 147 u8 m_bEventFlag; // for Eventsignaling to the State Maschine
148 DWORD m_dwCntObjectInDcf; // number of Objects in DCF 148 DWORD m_dwCntObjectInDcf; // number of Objects in DCF
149 tEplCfgMaIndexType m_SkipCfg; // TRUE if a adsitional Configurationprocess 149 tEplCfgMaIndexType m_SkipCfg; // TRUE if a adsitional Configurationprocess
150 // have to insert e.g. PDO-mapping 150 // have to insert e.g. PDO-mapping
@@ -199,13 +199,13 @@ tEplKernel plCfgMaDelInstance(void);
199// Parameters: uiNodeId_p = NodeId of the node to configure 199// Parameters: uiNodeId_p = NodeId of the node to configure
200// pbConcise_p = pointer to DCF 200// pbConcise_p = pointer to DCF
201// fpCfgMaCb_p = pointer to callback function (should not be NULL) 201// fpCfgMaCb_p = pointer to callback function (should not be NULL)
202// SizeOfConcise_p = size of DCF in BYTE -> for future use 202// SizeOfConcise_p = size of DCF in u8 -> for future use
203// DcfType_p = type of the DCF 203// DcfType_p = type of the DCF
204// 204//
205// Returns: tCopKernel = error code 205// Returns: tCopKernel = error code
206//--------------------------------------------------------------------------- 206//---------------------------------------------------------------------------
207tEplKernel EplCfgMaStartConfig(unsigned int uiNodeId_p, 207tEplKernel EplCfgMaStartConfig(unsigned int uiNodeId_p,
208 BYTE * pbConcise_p, 208 u8 * pbConcise_p,
209 tfpEplCfgMaCb fpCfgMaCb_p, 209 tfpEplCfgMaCb fpCfgMaCb_p,
210 tEplObdSize SizeOfConcise_p, 210 tEplObdSize SizeOfConcise_p,
211 tEplCfgMaDcfTyp DcfType_p); 211 tEplCfgMaDcfTyp DcfType_p);
@@ -235,13 +235,13 @@ tEplKernel EplCfgMaStartConfigNode(unsigned int uiNodeId_p,
235// Parameters: uiNodeId_p = NodeId of the node to configure 235// Parameters: uiNodeId_p = NodeId of the node to configure
236// pbConcise_p = pointer to DCF 236// pbConcise_p = pointer to DCF
237// fpCfgMaCb_p = pointer to callback function (should not be NULL) 237// fpCfgMaCb_p = pointer to callback function (should not be NULL)
238// SizeOfConcise_p = size of DCF in BYTE -> for future use 238// SizeOfConcise_p = size of DCF in u8 -> for future use
239// DcfType_p = type of the DCF 239// DcfType_p = type of the DCF
240// 240//
241// Returns: tCopKernel = error code 241// Returns: tCopKernel = error code
242//--------------------------------------------------------------------------- 242//---------------------------------------------------------------------------
243tEplKernel EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p, 243tEplKernel EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p,
244 BYTE * pbConcise_p, 244 u8 * pbConcise_p,
245 tfpEplCfgMaCb fpCfgMaCb_p, 245 tfpEplCfgMaCb fpCfgMaCb_p,
246 tEplObdSize SizeOfConcise_p, 246 tEplObdSize SizeOfConcise_p,
247 tEplCfgMaDcfTyp DcfType_p); 247 tEplCfgMaDcfTyp DcfType_p);
@@ -253,13 +253,13 @@ tEplKernel EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p,
253// 253//
254// Parameters: uiNodeId_p = NodeId of the node to configure 254// Parameters: uiNodeId_p = NodeId of the node to configure
255// pbConcise_p = pointer to DCF 255// pbConcise_p = pointer to DCF
256// SizeOfConcise_p = size of DCF in BYTE -> for future use 256// SizeOfConcise_p = size of DCF in u8 -> for future use
257// DcfType_p = type of the DCF 257// DcfType_p = type of the DCF
258// 258//
259// Returns: tCopKernel = error code 259// Returns: tCopKernel = error code
260//--------------------------------------------------------------------------- 260//---------------------------------------------------------------------------
261tEplKernel EplCfgMaLinkDcf(unsigned int uiNodeId_p, 261tEplKernel EplCfgMaLinkDcf(unsigned int uiNodeId_p,
262 BYTE * pbConcise_p, 262 u8 * pbConcise_p,
263 tEplObdSize SizeOfConcise_p, 263 tEplObdSize SizeOfConcise_p,
264 tEplCfgMaDcfTyp DcfType_p); 264 tEplCfgMaDcfTyp DcfType_p);
265 265
diff --git a/drivers/staging/epl/user/EplDlluCal.h b/drivers/staging/epl/user/EplDlluCal.h
index 2b2232d02bb..d8395d3ae21 100644
--- a/drivers/staging/epl/user/EplDlluCal.h
+++ b/drivers/staging/epl/user/EplDlluCal.h
@@ -110,7 +110,7 @@ tEplKernel EplDlluCalDeleteNode(unsigned int uiNodeId_p);
110tEplKernel EplDlluCalSoftDeleteNode(unsigned int uiNodeId_p); 110tEplKernel EplDlluCalSoftDeleteNode(unsigned int uiNodeId_p);
111 111
112tEplKernel EplDlluCalIssueRequest(tEplDllReqServiceId Service_p, 112tEplKernel EplDlluCalIssueRequest(tEplDllReqServiceId Service_p,
113 unsigned int uiNodeId_p, BYTE bSoaFlag1_p); 113 unsigned int uiNodeId_p, u8 bSoaFlag1_p);
114 114
115#endif 115#endif
116 116
diff --git a/drivers/staging/epl/user/EplObdu.h b/drivers/staging/epl/user/EplObdu.h
index 679ff6f054f..21494b4669a 100644
--- a/drivers/staging/epl/user/EplObdu.h
+++ b/drivers/staging/epl/user/EplObdu.h
@@ -117,7 +117,7 @@ EPLDLLEXPORT tEplKernel EplObduRegisterUserOd(tEplObdEntryPtr pUserOd_p);
117 117
118// --------------------------------------------------------------------- 118// ---------------------------------------------------------------------
119EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry *pVarEntry_p, 119EPLDLLEXPORT void EplObduInitVarEntry(tEplObdVarEntry *pVarEntry_p,
120 BYTE bType_p, tEplObdSize ObdSize_p); 120 u8 bType_p, tEplObdSize ObdSize_p);
121 121
122// --------------------------------------------------------------------- 122// ---------------------------------------------------------------------
123EPLDLLEXPORT tEplObdSize EplObduGetDataSize(unsigned int uiIndex_p, 123EPLDLLEXPORT tEplObdSize EplObduGetDataSize(unsigned int uiIndex_p,
diff --git a/drivers/staging/epl/user/EplObduCal.h b/drivers/staging/epl/user/EplObduCal.h
index 2f067bfd7c1..16260566aaf 100644
--- a/drivers/staging/epl/user/EplObduCal.h
+++ b/drivers/staging/epl/user/EplObduCal.h
@@ -106,7 +106,7 @@ EPLDLLEXPORT void *EplObduCalGetObjectDataPtr(unsigned int uiIndex_p,
106EPLDLLEXPORT tEplKernel EplObduCalRegisterUserOd(tEplObdEntryPtr pUserOd_p); 106EPLDLLEXPORT tEplKernel EplObduCalRegisterUserOd(tEplObdEntryPtr pUserOd_p);
107//--------------------------------------------------------------------------- 107//---------------------------------------------------------------------------
108EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry *pVarEntry_p, 108EPLDLLEXPORT void EplObduCalInitVarEntry(tEplObdVarEntry *pVarEntry_p,
109 BYTE bType_p, tEplObdSize ObdSize_p); 109 u8 bType_p, tEplObdSize ObdSize_p);
110//--------------------------------------------------------------------------- 110//---------------------------------------------------------------------------
111EPLDLLEXPORT tEplObdSize EplObduCalGetDataSize(unsigned int uiIndex_p, 111EPLDLLEXPORT tEplObdSize EplObduCalGetDataSize(unsigned int uiIndex_p,
112 unsigned int uiSubIndex_p); 112 unsigned int uiSubIndex_p);
diff --git a/drivers/staging/epl/user/EplPdou.h b/drivers/staging/epl/user/EplPdou.h
index 8e4b711c8c5..2bed006efb7 100644
--- a/drivers/staging/epl/user/EplPdou.h
+++ b/drivers/staging/epl/user/EplPdou.h
@@ -97,12 +97,12 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p);
97// returns error if bPdoId_p is already valid 97// returns error if bPdoId_p is already valid
98/* 98/*
99tEplKernel EplPdouSetMapping( 99tEplKernel EplPdouSetMapping(
100 BYTE bPdoId_p, BOOL fTxRx_p, BYTE bNodeId, BYTE bMappingVersion, 100 u8 bPdoId_p, BOOL fTxRx_p, u8 bNodeId, u8 bMappingVersion,
101 tEplPdoMapping * pMapping_p, BYTE bMaxEntries_p); 101 tEplPdoMapping * pMapping_p, u8 bMaxEntries_p);
102 102
103tEplKernel EplPdouGetMapping( 103tEplKernel EplPdouGetMapping(
104 BYTE bPdoId_p, BOOL fTxRx_p, BYTE * pbNodeId, BYTE * pbMappingVersion, 104 u8 bPdoId_p, BOOL fTxRx_p, u8 * pbNodeId, u8 * pbMappingVersion,
105 tEplPdoMapping * pMapping_p, BYTE * pbMaxEntries_p); 105 tEplPdoMapping * pMapping_p, u8 * pbMaxEntries_p);
106*/ 106*/
107 107
108#endif // #ifndef _EPL_PDOU_H_ 108#endif // #ifndef _EPL_PDOU_H_
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-19 09:48:18 -0400