aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/epl/Debug.h4
-rw-r--r--drivers/staging/epl/Edrv8139.c20
-rw-r--r--drivers/staging/epl/EdrvFec.h4
-rw-r--r--drivers/staging/epl/EdrvSim.h2
-rw-r--r--drivers/staging/epl/Epl.h4
-rw-r--r--drivers/staging/epl/EplAmi.h8
-rw-r--r--drivers/staging/epl/EplApiGeneric.c24
-rw-r--r--drivers/staging/epl/EplDll.h4
-rw-r--r--drivers/staging/epl/EplDllk.c10
-rw-r--r--drivers/staging/epl/EplFrame.h22
-rw-r--r--drivers/staging/epl/EplNmt.h2
-rw-r--r--drivers/staging/epl/EplNmtMnu.c20
-rw-r--r--drivers/staging/epl/EplObd.c6
-rw-r--r--drivers/staging/epl/EplObd.h4
-rw-r--r--drivers/staging/epl/EplPdo.h4
-rw-r--r--drivers/staging/epl/EplPdok.c28
-rw-r--r--drivers/staging/epl/EplPdou.c2
-rw-r--r--drivers/staging/epl/EplSdoAsySequ.c6
-rw-r--r--drivers/staging/epl/EplSdoComu.c16
-rw-r--r--drivers/staging/epl/amix86.c30
-rw-r--r--drivers/staging/epl/demo_main.c2
-rw-r--r--drivers/staging/epl/edrv.h4
-rw-r--r--drivers/staging/epl/global.h3
-rw-r--r--drivers/staging/epl/kernel/EplDllk.h2
-rw-r--r--drivers/staging/epl/proc_fs.c4
-rw-r--r--drivers/staging/epl/user/EplCfgMau.h2
-rw-r--r--drivers/staging/epl/user/EplNmtMnu.h6
27 files changed, 120 insertions, 123 deletions
diff --git a/drivers/staging/epl/Debug.h b/drivers/staging/epl/Debug.h
index 94646b28db3..851a22213ad 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, u8 *pbData_p, WORD wSize_p); 637 void DumpData(char *szStr_p, u8 *pbData_p, u16 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, (u8 *)(ptr), (WORD)(siz)); 643 DumpData (str, (u8 *)(ptr), (u16)(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 c8fcc4e815b..c0709a5836f 100644
--- a/drivers/staging/epl/Edrv8139.c
+++ b/drivers/staging/epl/Edrv8139.c
@@ -464,9 +464,9 @@ tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p)
464 dwData = ether_crc(6, pbMacAddr_p); 464 dwData = ether_crc(6, pbMacAddr_p);
465 465
466 printk("EdrvDefineRxMacAddrEntry('%02X:%02X:%02X:%02X:%02X:%02X') hash = %u / %u ether_crc = 0x%08lX\n", 466 printk("EdrvDefineRxMacAddrEntry('%02X:%02X:%02X:%02X:%02X:%02X') hash = %u / %u ether_crc = 0x%08lX\n",
467 (WORD) pbMacAddr_p[0], (WORD) pbMacAddr_p[1], (WORD) pbMacAddr_p[2], 467 (u16) pbMacAddr_p[0], (u16) pbMacAddr_p[1], (u16) pbMacAddr_p[2],
468 (WORD) pbMacAddr_p[3], (WORD) pbMacAddr_p[4], (WORD) pbMacAddr_p[5], 468 (u16) pbMacAddr_p[3], (u16) pbMacAddr_p[4], (u16) pbMacAddr_p[5],
469 (WORD) bHash, (WORD) (dwData >> 26), dwData); 469 (u16) bHash, (u16) (dwData >> 26), dwData);
470*/ 470*/
471 if (bHash > 31) { 471 if (bHash > 31) {
472 dwData = EDRV_REGDW_READ(EDRV_REGDW_MAR4); 472 dwData = EDRV_REGDW_READ(EDRV_REGDW_MAR4);
@@ -624,7 +624,7 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p)
624 printk("%s InvOp TSD%u = 0x%08X", __func__, 624 printk("%s InvOp TSD%u = 0x%08X", __func__,
625 EdrvInstance_l.m_uiCurTxDesc, dwTemp); 625 EdrvInstance_l.m_uiCurTxDesc, dwTemp);
626 printk(" Cmd = 0x%02X\n", 626 printk(" Cmd = 0x%02X\n",
627 (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); 627 (u16) EDRV_REGB_READ(EDRV_REGB_COMMAND));
628 goto Exit; 628 goto Exit;
629 } 629 }
630 // save pointer to buffer structure for TxHandler 630 // save pointer to buffer structure for TxHandler
@@ -761,10 +761,10 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p,
761// EdrvInterruptHandler(); 761// EdrvInterruptHandler();
762 tEdrvRxBuffer RxBuffer; 762 tEdrvRxBuffer RxBuffer;
763 tEdrvTxBuffer *pTxBuffer; 763 tEdrvTxBuffer *pTxBuffer;
764 WORD wStatus; 764 u16 wStatus;
765 u32 dwTxStatus; 765 u32 dwTxStatus;
766 u32 dwRxStatus; 766 u32 dwRxStatus;
767 WORD wCurRx; 767 u16 wCurRx;
768 u8 *pbRxBuf; 768 u8 *pbRxBuf;
769 unsigned int uiLength; 769 unsigned int uiLength;
770 int iHandled = IRQ_HANDLED; 770 int iHandled = IRQ_HANDLED;
@@ -898,7 +898,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p,
898 898
899 // calulate new offset (u32 aligned) 899 // calulate new offset (u32 aligned)
900 wCurRx = 900 wCurRx =
901 (WORD) ((wCurRx + uiLength + sizeof(dwRxStatus) + 901 (u16) ((wCurRx + uiLength + sizeof(dwRxStatus) +
902 3) & ~0x3); 902 3) & ~0x3);
903 EDRV_TRACE_CAPR(wCurRx - 0x10); 903 EDRV_TRACE_CAPR(wCurRx - 0x10);
904 EDRV_REGW_WRITE(EDRV_REGW_CAPR, wCurRx - 0x10); 904 EDRV_REGW_WRITE(EDRV_REGW_CAPR, wCurRx - 0x10);
@@ -1087,7 +1087,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
1087 dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TSAD3); 1087 dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TSAD3);
1088 1088
1089 printk(" Command = 0x%02X\n", 1089 printk(" Command = 0x%02X\n",
1090 (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); 1090 (u16) EDRV_REGB_READ(EDRV_REGB_COMMAND));
1091 1091
1092 // set pointer for receive buffer in controller 1092 // set pointer for receive buffer in controller
1093 printk("%s set pointer to Rx buffer\n", __func__); 1093 printk("%s set pointer to Rx buffer\n", __func__);
@@ -1098,7 +1098,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
1098 EDRV_REGB_WRITE(EDRV_REGB_COMMAND, 1098 EDRV_REGB_WRITE(EDRV_REGB_COMMAND,
1099 (EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE)); 1099 (EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE));
1100 printk(" Command = 0x%02X\n", 1100 printk(" Command = 0x%02X\n",
1101 (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); 1101 (u16) EDRV_REGB_READ(EDRV_REGB_COMMAND));
1102 1102
1103 // clear missed packet counter to enable Rx/Tx process 1103 // clear missed packet counter to enable Rx/Tx process
1104 EDRV_REGDW_WRITE(EDRV_REGDW_MPC, 0); 1104 EDRV_REGDW_WRITE(EDRV_REGDW_MPC, 0);
@@ -1123,7 +1123,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
1123 // enable transmitter and receiver 1123 // enable transmitter and receiver
1124 printk("%s enable Tx and Rx", __func__); 1124 printk("%s enable Tx and Rx", __func__);
1125 EDRV_REGB_WRITE(EDRV_REGB_COMMAND, (EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE)); 1125 EDRV_REGB_WRITE(EDRV_REGB_COMMAND, (EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE));
1126 printk(" Command = 0x%02X\n", (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); 1126 printk(" Command = 0x%02X\n", (u16) EDRV_REGB_READ(EDRV_REGB_COMMAND));
1127*/ 1127*/
1128 // disable early interrupts 1128 // disable early interrupts
1129 EDRV_REGW_WRITE(EDRV_REGW_MULINT, 0); 1129 EDRV_REGW_WRITE(EDRV_REGW_MULINT, 0);
diff --git a/drivers/staging/epl/EdrvFec.h b/drivers/staging/epl/EdrvFec.h
index 42bb8d32643..56728d1e95e 100644
--- a/drivers/staging/epl/EdrvFec.h
+++ b/drivers/staging/epl/EdrvFec.h
@@ -96,8 +96,8 @@
96 96
97// Rx and Tx buffer descriptor format 97// Rx and Tx buffer descriptor format
98typedef struct { 98typedef struct {
99 WORD m_wStatus; // control / status --- used by edrv, do not change in application 99 u16 m_wStatus; // control / status --- used by edrv, do not change in application
100 WORD m_wLength; // transfer length 100 u16 m_wLength; // transfer length
101 u8 *m_pbData; // buffer address 101 u8 *m_pbData; // buffer address
102} tBufferDescr; 102} tBufferDescr;
103 103
diff --git a/drivers/staging/epl/EdrvSim.h b/drivers/staging/epl/EdrvSim.h
index 9cbafb6295a..191ec1457d2 100644
--- a/drivers/staging/epl/EdrvSim.h
+++ b/drivers/staging/epl/EdrvSim.h
@@ -84,6 +84,6 @@
84//--------------------------------------------------------------------------- 84//---------------------------------------------------------------------------
85 85
86void EdrvRxInterruptHandler(u8 bBufferInFrame_p, u8 * pbEthernetData_p, 86void EdrvRxInterruptHandler(u8 bBufferInFrame_p, u8 * pbEthernetData_p,
87 WORD wDataLen_p); 87 u16 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 6fc15891549..7f22b04022b 100644
--- a/drivers/staging/epl/Epl.h
+++ b/drivers/staging/epl/Epl.h
@@ -89,7 +89,7 @@ typedef struct {
89 unsigned int m_uiNodeId; 89 unsigned int m_uiNodeId;
90 tEplNmtState m_NmtState; 90 tEplNmtState m_NmtState;
91 tEplNmtNodeEvent m_NodeEvent; 91 tEplNmtNodeEvent m_NodeEvent;
92 WORD m_wErrorCode; // EPL error code if m_NodeEvent == kEplNmtNodeEventError 92 u16 m_wErrorCode; // EPL error code if m_NodeEvent == kEplNmtNodeEventError
93 BOOL m_fMandatory; 93 BOOL m_fMandatory;
94 94
95} tEplApiEventNode; 95} tEplApiEventNode;
@@ -97,7 +97,7 @@ typedef struct {
97typedef struct { 97typedef struct {
98 tEplNmtState m_NmtState; // local NMT state 98 tEplNmtState m_NmtState; // local NMT state
99 tEplNmtBootEvent m_BootEvent; 99 tEplNmtBootEvent m_BootEvent;
100 WORD m_wErrorCode; // EPL error code if m_BootEvent == kEplNmtBootEventError 100 u16 m_wErrorCode; // EPL error code if m_BootEvent == kEplNmtBootEventError
101 101
102} tEplApiEventBoot; 102} tEplApiEventBoot;
103 103
diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h
index 4a323ad4f29..3b46ea11442 100644
--- a/drivers/staging/epl/EplAmi.h
+++ b/drivers/staging/epl/EplAmi.h
@@ -110,9 +110,9 @@ extern "C" {
110#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);} 110#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);}
111#define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(u8 *)(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, u16 wWordVal_p);
114void AmiSetDwordToBe(void *pAddr_p, u32 dwDwordVal_p); 114void AmiSetDwordToBe(void *pAddr_p, u32 dwDwordVal_p);
115void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p); 115void AmiSetWordToLe(void *pAddr_p, u16 wWordVal_p);
116void AmiSetDwordToLe(void *pAddr_p, u32 dwDwordVal_p); 116void AmiSetDwordToLe(void *pAddr_p, u32 dwDwordVal_p);
117 117
118//--------------------------------------------------------------------------- 118//---------------------------------------------------------------------------
@@ -126,9 +126,9 @@ void AmiSetDwordToLe(void *pAddr_p, u32 dwDwordVal_p);
126#define AmiGetByteFromBe(pAddr_p) (*(u8 *)(pAddr_p)) 126#define AmiGetByteFromBe(pAddr_p) (*(u8 *)(pAddr_p))
127#define AmiGetByteFromLe(pAddr_p) (*(u8 *)(pAddr_p)) 127#define AmiGetByteFromLe(pAddr_p) (*(u8 *)(pAddr_p))
128 128
129WORD AmiGetWordFromBe(void *pAddr_p); 129u16 AmiGetWordFromBe(void *pAddr_p);
130u32 AmiGetDwordFromBe(void *pAddr_p); 130u32 AmiGetDwordFromBe(void *pAddr_p);
131WORD AmiGetWordFromLe(void *pAddr_p); 131u16 AmiGetWordFromLe(void *pAddr_p);
132u32 AmiGetDwordFromLe(void *pAddr_p); 132u32 AmiGetDwordFromLe(void *pAddr_p);
133 133
134//--------------------------------------------------------------------------- 134//---------------------------------------------------------------------------
diff --git a/drivers/staging/epl/EplApiGeneric.c b/drivers/staging/epl/EplApiGeneric.c
index 431b19de0ed..c4419569183 100644
--- a/drivers/staging/epl/EplApiGeneric.c
+++ b/drivers/staging/epl/EplApiGeneric.c
@@ -183,11 +183,11 @@ static tEplKernel EplApiCbSdoCon(tEplSdoComFinished *pSdoComFinished_p);
183static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p, 183static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p,
184 tEplNmtNodeEvent NodeEvent_p, 184 tEplNmtNodeEvent NodeEvent_p,
185 tEplNmtState NmtState_p, 185 tEplNmtState NmtState_p,
186 WORD wErrorCode_p, BOOL fMandatory_p); 186 u16 wErrorCode_p, BOOL fMandatory_p);
187 187
188static tEplKernel EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, 188static tEplKernel EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p,
189 tEplNmtState NmtState_p, 189 tEplNmtState NmtState_p,
190 WORD wErrorCode_p); 190 u16 wErrorCode_p);
191#endif 191#endif
192 192
193#if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) 193#if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0)
@@ -1412,7 +1412,7 @@ static tEplKernel EplApiUpdateDllConfig(BOOL fUpdateIdentity_p)
1412 tEplDllConfigParam DllConfigParam; 1412 tEplDllConfigParam DllConfigParam;
1413 tEplDllIdentParam DllIdentParam; 1413 tEplDllIdentParam DllIdentParam;
1414 tEplObdSize ObdSize; 1414 tEplObdSize ObdSize;
1415 WORD wTemp; 1415 u16 wTemp;
1416 u8 bTemp; 1416 u8 bTemp;
1417 1417
1418 // configure Dll 1418 // configure Dll
@@ -1632,7 +1632,7 @@ static tEplKernel EplApiUpdateDllConfig(BOOL fUpdateIdentity_p)
1632static tEplKernel EplApiUpdateObd(void) 1632static tEplKernel EplApiUpdateObd(void)
1633{ 1633{
1634 tEplKernel Ret = kEplSuccessful; 1634 tEplKernel Ret = kEplSuccessful;
1635 WORD wTemp; 1635 u16 wTemp;
1636 u8 bTemp; 1636 u8 bTemp;
1637 1637
1638 // set node id in OD 1638 // set node id in OD
@@ -1675,14 +1675,14 @@ static tEplKernel EplApiUpdateObd(void)
1675 } */ 1675 } */
1676 } 1676 }
1677 1677
1678 wTemp = (WORD) EplApiInstance_g.m_InitParam.m_uiIsochrTxMaxPayload; 1678 wTemp = (u16) EplApiInstance_g.m_InitParam.m_uiIsochrTxMaxPayload;
1679 Ret = EplObdWriteEntry(0x1F98, 1, &wTemp, 2); 1679 Ret = EplObdWriteEntry(0x1F98, 1, &wTemp, 2);
1680/* if(Ret != kEplSuccessful) 1680/* if(Ret != kEplSuccessful)
1681 { 1681 {
1682 goto Exit; 1682 goto Exit;
1683 }*/ 1683 }*/
1684 1684
1685 wTemp = (WORD) EplApiInstance_g.m_InitParam.m_uiIsochrRxMaxPayload; 1685 wTemp = (u16) EplApiInstance_g.m_InitParam.m_uiIsochrRxMaxPayload;
1686 Ret = EplObdWriteEntry(0x1F98, 2, &wTemp, 2); 1686 Ret = EplObdWriteEntry(0x1F98, 2, &wTemp, 2);
1687/* if(Ret != kEplSuccessful) 1687/* if(Ret != kEplSuccessful)
1688 { 1688 {
@@ -1701,7 +1701,7 @@ static tEplKernel EplApiUpdateObd(void)
1701 if (EplApiInstance_g.m_InitParam.m_uiPreqActPayloadLimit <= 1701 if (EplApiInstance_g.m_InitParam.m_uiPreqActPayloadLimit <=
1702 EPL_C_DLL_ISOCHR_MAX_PAYL) { 1702 EPL_C_DLL_ISOCHR_MAX_PAYL) {
1703 wTemp = 1703 wTemp =
1704 (WORD) EplApiInstance_g.m_InitParam.m_uiPreqActPayloadLimit; 1704 (u16) EplApiInstance_g.m_InitParam.m_uiPreqActPayloadLimit;
1705 Ret = EplObdWriteEntry(0x1F98, 4, &wTemp, 2); 1705 Ret = EplObdWriteEntry(0x1F98, 4, &wTemp, 2);
1706/* if(Ret != kEplSuccessful) 1706/* if(Ret != kEplSuccessful)
1707 { 1707 {
@@ -1712,7 +1712,7 @@ static tEplKernel EplApiUpdateObd(void)
1712 if (EplApiInstance_g.m_InitParam.m_uiPresActPayloadLimit <= 1712 if (EplApiInstance_g.m_InitParam.m_uiPresActPayloadLimit <=
1713 EPL_C_DLL_ISOCHR_MAX_PAYL) { 1713 EPL_C_DLL_ISOCHR_MAX_PAYL) {
1714 wTemp = 1714 wTemp =
1715 (WORD) EplApiInstance_g.m_InitParam.m_uiPresActPayloadLimit; 1715 (u16) EplApiInstance_g.m_InitParam.m_uiPresActPayloadLimit;
1716 Ret = EplObdWriteEntry(0x1F98, 5, &wTemp, 2); 1716 Ret = EplObdWriteEntry(0x1F98, 5, &wTemp, 2);
1717/* if(Ret != kEplSuccessful) 1717/* if(Ret != kEplSuccessful)
1718 { 1718 {
@@ -1740,7 +1740,7 @@ static tEplKernel EplApiUpdateObd(void)
1740 1740
1741 if (EplApiInstance_g.m_InitParam.m_uiAsyncMtu <= 1741 if (EplApiInstance_g.m_InitParam.m_uiAsyncMtu <=
1742 EPL_C_DLL_MAX_ASYNC_MTU) { 1742 EPL_C_DLL_MAX_ASYNC_MTU) {
1743 wTemp = (WORD) EplApiInstance_g.m_InitParam.m_uiAsyncMtu; 1743 wTemp = (u16) EplApiInstance_g.m_InitParam.m_uiAsyncMtu;
1744 Ret = EplObdWriteEntry(0x1F98, 8, &wTemp, 2); 1744 Ret = EplObdWriteEntry(0x1F98, 8, &wTemp, 2);
1745/* if(Ret != kEplSuccessful) 1745/* if(Ret != kEplSuccessful)
1746 { 1746 {
@@ -1749,7 +1749,7 @@ static tEplKernel EplApiUpdateObd(void)
1749 } 1749 }
1750 1750
1751 if (EplApiInstance_g.m_InitParam.m_uiPrescaler <= 1000) { 1751 if (EplApiInstance_g.m_InitParam.m_uiPrescaler <= 1000) {
1752 wTemp = (WORD) EplApiInstance_g.m_InitParam.m_uiPrescaler; 1752 wTemp = (u16) EplApiInstance_g.m_InitParam.m_uiPrescaler;
1753 Ret = EplObdWriteEntry(0x1F98, 9, &wTemp, 2); 1753 Ret = EplObdWriteEntry(0x1F98, 9, &wTemp, 2);
1754 // ignore return code 1754 // ignore return code
1755 Ret = kEplSuccessful; 1755 Ret = kEplSuccessful;
@@ -1944,7 +1944,7 @@ static tEplKernel EplApiCbSdoCon(tEplSdoComFinished *pSdoComFinished_p)
1944static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p, 1944static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p,
1945 tEplNmtNodeEvent NodeEvent_p, 1945 tEplNmtNodeEvent NodeEvent_p,
1946 tEplNmtState NmtState_p, 1946 tEplNmtState NmtState_p,
1947 WORD wErrorCode_p, BOOL fMandatory_p) 1947 u16 wErrorCode_p, BOOL fMandatory_p)
1948{ 1948{
1949 tEplKernel Ret; 1949 tEplKernel Ret;
1950 tEplApiEventArg EventArg; 1950 tEplApiEventArg EventArg;
@@ -1987,7 +1987,7 @@ static tEplKernel EplApiCbNodeEvent(unsigned int uiNodeId_p,
1987 1987
1988static tEplKernel EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p, 1988static tEplKernel EplApiCbBootEvent(tEplNmtBootEvent BootEvent_p,
1989 tEplNmtState NmtState_p, 1989 tEplNmtState NmtState_p,
1990 WORD wErrorCode_p) 1990 u16 wErrorCode_p)
1991{ 1991{
1992 tEplKernel Ret; 1992 tEplKernel Ret;
1993 tEplApiEventArg EventArg; 1993 tEplApiEventArg EventArg;
diff --git a/drivers/staging/epl/EplDll.h b/drivers/staging/epl/EplDll.h
index 79be2c23f8b..b960199bd0e 100644
--- a/drivers/staging/epl/EplDll.h
+++ b/drivers/staging/epl/EplDll.h
@@ -192,8 +192,8 @@ typedef struct {
192 192
193typedef struct { 193typedef struct {
194 unsigned int m_uiNodeId; 194 unsigned int m_uiNodeId;
195 WORD m_wPreqPayloadLimit; // object 0x1F8B: NMT_MNPReqPayloadLimitList_AU16 195 u16 m_wPreqPayloadLimit; // object 0x1F8B: NMT_MNPReqPayloadLimitList_AU16
196 WORD m_wPresPayloadLimit; // object 0x1F8D: NMT_PResPayloadLimitList_AU16 196 u16 m_wPresPayloadLimit; // object 0x1F8D: NMT_PResPayloadLimitList_AU16
197 u32 m_dwPresTimeout; // object 0x1F92: NMT_MNCNPResTimeout_AU32 197 u32 m_dwPresTimeout; // object 0x1F92: NMT_MNCNPResTimeout_AU32
198 198
199} tEplDllNodeInfo; 199} tEplDllNodeInfo;
diff --git a/drivers/staging/epl/EplDllk.c b/drivers/staging/epl/EplDllk.c
index 53f05d9b37a..25d2c34325d 100644
--- a/drivers/staging/epl/EplDllk.c
+++ b/drivers/staging/epl/EplDllk.c
@@ -720,18 +720,18 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p)
720 // MTU 720 // MTU
721 AmiSetWordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload. 721 AmiSetWordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload.
722 m_IdentResponse.m_le_wMtu, 722 m_IdentResponse.m_le_wMtu,
723 (WORD) EplDllkInstance_g. 723 (u16) EplDllkInstance_g.
724 m_DllConfigParam.m_uiAsyncMtu); 724 m_DllConfigParam.m_uiAsyncMtu);
725 // PollInSize 725 // PollInSize
726 AmiSetWordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload. 726 AmiSetWordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload.
727 m_IdentResponse.m_le_wPollInSize, 727 m_IdentResponse.m_le_wPollInSize,
728 (WORD) EplDllkInstance_g. 728 (u16) EplDllkInstance_g.
729 m_DllConfigParam. 729 m_DllConfigParam.
730 m_uiPreqActPayloadLimit); 730 m_uiPreqActPayloadLimit);
731 // PollOutSize 731 // PollOutSize
732 AmiSetWordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload. 732 AmiSetWordToLe(&pTxFrame->m_Data.m_Asnd.m_Payload.
733 m_IdentResponse.m_le_wPollOutSize, 733 m_IdentResponse.m_le_wPollOutSize,
734 (WORD) EplDllkInstance_g. 734 (u16) EplDllkInstance_g.
735 m_DllConfigParam. 735 m_DllConfigParam.
736 m_uiPresActPayloadLimit); 736 m_uiPresActPayloadLimit);
737 // ResponseTime / PresMaxLatency 737 // ResponseTime / PresMaxLatency
@@ -935,7 +935,7 @@ tEplKernel EplDllkProcess(tEplEvent * pEvent_p)
935// EplDllkInstance_g.m_aNodeInfo[uiIndex].m_uiNodeId = uiIndex + 1; 935// EplDllkInstance_g.m_aNodeInfo[uiIndex].m_uiNodeId = uiIndex + 1;
936 EplDllkInstance_g.m_aNodeInfo[uiIndex]. 936 EplDllkInstance_g.m_aNodeInfo[uiIndex].
937 m_wPresPayloadLimit = 937 m_wPresPayloadLimit =
938 (WORD) EplDllkInstance_g. 938 (u16) EplDllkInstance_g.
939 m_DllConfigParam. 939 m_DllConfigParam.
940 m_uiIsochrRxMaxPayload; 940 m_uiIsochrRxMaxPayload;
941 } 941 }
@@ -3484,7 +3484,7 @@ static tEplKernel EplDllkCheckFrame(tEplFrame * pFrame_p,
3484 unsigned int uiFrameSize_p) 3484 unsigned int uiFrameSize_p)
3485{ 3485{
3486 tEplMsgType MsgType; 3486 tEplMsgType MsgType;
3487 WORD wEtherType; 3487 u16 wEtherType;
3488 3488
3489 // check frame 3489 // check frame
3490 if (pFrame_p != NULL) { 3490 if (pFrame_p != NULL) {
diff --git a/drivers/staging/epl/EplFrame.h b/drivers/staging/epl/EplFrame.h
index 9ca42427474..ba1ae9e9e90 100644
--- a/drivers/staging/epl/EplFrame.h
+++ b/drivers/staging/epl/EplFrame.h
@@ -146,7 +146,7 @@ typedef struct {
146 // Offset 21 146 // Offset 21
147 u8 m_le_bRes2; // reserved 147 u8 m_le_bRes2; // reserved
148 // Offset 22 148 // Offset 22
149 WORD m_le_wSize; 149 u16 m_le_wSize;
150 // Offset 24 150 // Offset 24
151 u8 m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16 */ ]; 151 u8 m_le_abPayload[256 /*D_NMT_IsochrRxMaxPayload_U16 */ ];
152 152
@@ -164,7 +164,7 @@ typedef struct {
164 // Offset 21 164 // Offset 21
165 u8 m_le_bRes2; // reserved 165 u8 m_le_bRes2; // reserved
166 // Offset 22 166 // Offset 22
167 WORD m_le_wSize; 167 u16 m_le_wSize;
168 // Offset 24 168 // Offset 24
169 u8 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 */ ];
@@ -188,8 +188,8 @@ typedef struct {
188} PACK_STRUCT tEplSoaFrame; 188} PACK_STRUCT tEplSoaFrame;
189 189
190typedef struct { 190typedef struct {
191 WORD m_wEntryType; 191 u16 m_wEntryType;
192 WORD m_wErrorCode; 192 u16 m_wErrorCode;
193 tEplNetTime m_TimeStamp; 193 tEplNetTime m_TimeStamp;
194 u8 m_abAddInfo[8]; 194 u8 m_abAddInfo[8];
195 195
@@ -215,11 +215,11 @@ typedef struct {
215 u8 m_le_bEplProfileVersion; 215 u8 m_le_bEplProfileVersion;
216 u8 m_le_bRes1; 216 u8 m_le_bRes1;
217 u32 m_le_dwFeatureFlags; // NMT_FeatureFlags_U32 217 u32 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 u16 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 u16 m_le_wPollInSize; // NMT_CycleTiming_REC.PReqActPayload_U16
220 WORD m_le_wPollOutSize; // NMT_CycleTiming_REC.PResActPayload_U16 220 u16 m_le_wPollOutSize; // NMT_CycleTiming_REC.PResActPayload_U16
221 u32 m_le_dwResponseTime; // NMT_CycleTiming_REC.PResMaxLatency_U32 221 u32 m_le_dwResponseTime; // NMT_CycleTiming_REC.PResMaxLatency_U32
222 WORD m_le_wRes2; 222 u16 m_le_wRes2;
223 u32 m_le_dwDeviceType; // NMT_DeviceType_U32 223 u32 m_le_dwDeviceType; // NMT_DeviceType_U32
224 u32 m_le_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 224 u32 m_le_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32
225 u32 m_le_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 225 u32 m_le_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32
@@ -251,8 +251,8 @@ typedef struct {
251 u8 m_le_bTransactionId; 251 u8 m_le_bTransactionId;
252 u8 m_le_bFlags; 252 u8 m_le_bFlags;
253 u8 m_le_bCommandId; 253 u8 m_le_bCommandId;
254 WORD m_le_wSegmentSize; 254 u16 m_le_wSegmentSize;
255 WORD m_le_wReserved; 255 u16 m_le_wReserved;
256 u8 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;
@@ -310,7 +310,7 @@ typedef struct {
310 // Offset 6 310 // Offset 6
311 u8 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 u16 m_be_wEtherType; // Ethernet message type (big endian)
314 // Offset 14 314 // Offset 14
315 u8 m_le_bMessageType; // EPL message type 315 u8 m_le_bMessageType; // EPL message type
316 // Offset 15 316 // Offset 15
diff --git a/drivers/staging/epl/EplNmt.h b/drivers/staging/epl/EplNmt.h
index 4c11e5bc74a..e351b55eea6 100644
--- a/drivers/staging/epl/EplNmt.h
+++ b/drivers/staging/epl/EplNmt.h
@@ -185,7 +185,7 @@ typedef struct {
185typedef struct { 185typedef struct {
186 unsigned int m_uiNodeId; // NodeId 186 unsigned int m_uiNodeId; // NodeId
187 tEplNmtState m_NmtState; // NMT state (remember distinguish between MN / CN) 187 tEplNmtState m_NmtState; // NMT state (remember distinguish between MN / CN)
188 WORD m_wErrorCode; // EPL error code in case of NMT state NotActive 188 u16 m_wErrorCode; // EPL error code in case of NMT state NotActive
189 189
190} tEplHeartbeatEvent; 190} tEplHeartbeatEvent;
191 191
diff --git a/drivers/staging/epl/EplNmtMnu.c b/drivers/staging/epl/EplNmtMnu.c
index fd4f6d9e73d..30a9f1ec73e 100644
--- a/drivers/staging/epl/EplNmtMnu.c
+++ b/drivers/staging/epl/EplNmtMnu.c
@@ -212,7 +212,7 @@ typedef struct {
212 tEplTimerHdl m_TimerHdlLonger; // 2nd timer for NMT command EnableReadyToOp and CheckCommunication 212 tEplTimerHdl m_TimerHdlLonger; // 2nd timer for NMT command EnableReadyToOp and CheckCommunication
213 tEplNmtMnuNodeState m_NodeState; // internal node state (kind of sub state of NMT state) 213 tEplNmtMnuNodeState m_NodeState; // internal node state (kind of sub state of NMT state)
214 u32 m_dwNodeCfg; // subindex from 0x1F81 214 u32 m_dwNodeCfg; // subindex from 0x1F81
215 WORD m_wFlags; // flags: CN is being accessed isochronously 215 u16 m_wFlags; // flags: CN is being accessed isochronously
216 216
217} tEplNmtMnuNodeInfo; 217} tEplNmtMnuNodeInfo;
218 218
@@ -224,7 +224,7 @@ typedef struct {
224 unsigned long m_ulStatusRequestDelay; // in [ms] (object 0x1006 * EPL_C_NMT_STATREQ_CYCLE) 224 unsigned long m_ulStatusRequestDelay; // in [ms] (object 0x1006 * EPL_C_NMT_STATREQ_CYCLE)
225 unsigned long m_ulTimeoutReadyToOp; // in [ms] (object 0x1F89/5) 225 unsigned long m_ulTimeoutReadyToOp; // in [ms] (object 0x1F89/5)
226 unsigned long m_ulTimeoutCheckCom; // in [ms] (object 0x1006 * MultiplexedCycleCount) 226 unsigned long m_ulTimeoutCheckCom; // in [ms] (object 0x1006 * MultiplexedCycleCount)
227 WORD m_wFlags; // global flags 227 u16 m_wFlags; // global flags
228 u32 m_dwNmtStartup; // object 0x1F80 NMT_StartUp_U32 228 u32 m_dwNmtStartup; // object 0x1F80 NMT_StartUp_U32
229 tEplNmtMnuCbNodeEvent m_pfnCbNodeEvent; 229 tEplNmtMnuCbNodeEvent m_pfnCbNodeEvent;
230 tEplNmtMnuCbBootEvent m_pfnCbBootEvent; 230 tEplNmtMnuCbBootEvent m_pfnCbBootEvent;
@@ -252,7 +252,7 @@ static tEplKernel EplNmtMnuCbStatusResponse(unsigned int uiNodeId_p,
252static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p, 252static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p,
253 tEplNmtMnuNodeInfo * pNodeInfo_p, 253 tEplNmtMnuNodeInfo * pNodeInfo_p,
254 tEplNmtState NodeNmtState_p, 254 tEplNmtState NodeNmtState_p,
255 WORD wErrorCode_p, 255 u16 wErrorCode_p,
256 tEplNmtState LocalNmtState_p); 256 tEplNmtState LocalNmtState_p);
257 257
258static tEplKernel EplNmtMnuStartBootStep1(void); 258static tEplKernel EplNmtMnuStartBootStep1(void);
@@ -271,7 +271,7 @@ static tEplKernel EplNmtMnuStartNodes(void);
271 271
272static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p, 272static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p,
273 tEplNmtState NodeNmtState_p, 273 tEplNmtState NodeNmtState_p,
274 WORD wErrorCode_p, 274 u16 wErrorCode_p,
275 tEplNmtMnuIntNodeEvent 275 tEplNmtMnuIntNodeEvent
276 NodeEvent_p); 276 NodeEvent_p);
277 277
@@ -573,7 +573,7 @@ tEplKernel EplNmtMnuTriggerStateChange(unsigned int uiNodeId_p,
573 tEplNmtMnuIntNodeEvent NodeEvent; 573 tEplNmtMnuIntNodeEvent NodeEvent;
574 tEplObdSize ObdSize; 574 tEplObdSize ObdSize;
575 u8 bNmtState; 575 u8 bNmtState;
576 WORD wErrorCode = EPL_E_NO_ERROR; 576 u16 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)) {
579 Ret = kEplInvalidNodeId; 579 Ret = kEplInvalidNodeId;
@@ -1257,7 +1257,7 @@ EPLDLLEXPORT tEplKernel EplNmtMnuProcessEvent(tEplEvent *pEvent_p)
1257 1257
1258tEplKernel EplNmtMnuGetDiagnosticInfo(unsigned int *puiMandatorySlaveCount_p, 1258tEplKernel EplNmtMnuGetDiagnosticInfo(unsigned int *puiMandatorySlaveCount_p,
1259 unsigned int *puiSignalSlaveCount_p, 1259 unsigned int *puiSignalSlaveCount_p,
1260 WORD *pwFlags_p) 1260 u16 *pwFlags_p)
1261{ 1261{
1262 tEplKernel Ret = kEplSuccessful; 1262 tEplKernel Ret = kEplSuccessful;
1263 1263
@@ -1377,7 +1377,7 @@ static tEplKernel EplNmtMnuCbIdentResponse(unsigned int uiNodeId_p,
1377 } else { // node answered IdentRequest 1377 } else { // node answered IdentRequest
1378 tEplObdSize ObdSize; 1378 tEplObdSize ObdSize;
1379 u32 dwDevType; 1379 u32 dwDevType;
1380 WORD wErrorCode = EPL_E_NO_ERROR; 1380 u16 wErrorCode = EPL_E_NO_ERROR;
1381 tEplNmtState NmtState = 1381 tEplNmtState NmtState =
1382 (tEplNmtState) (AmiGetByteFromLe 1382 (tEplNmtState) (AmiGetByteFromLe
1383 (&pIdentResponse_p-> 1383 (&pIdentResponse_p->
@@ -1909,7 +1909,7 @@ static tEplKernel EplNmtMnuStartNodes(void)
1909 1909
1910static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p, 1910static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p,
1911 tEplNmtState NodeNmtState_p, 1911 tEplNmtState NodeNmtState_p,
1912 WORD wErrorCode_p, 1912 u16 wErrorCode_p,
1913 tEplNmtMnuIntNodeEvent 1913 tEplNmtMnuIntNodeEvent
1914 NodeEvent_p) 1914 NodeEvent_p)
1915{ 1915{
@@ -2623,7 +2623,7 @@ static tEplKernel EplNmtMnuProcessInternalEvent(unsigned int uiNodeId_p,
2623static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p, 2623static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p,
2624 tEplNmtMnuNodeInfo * pNodeInfo_p, 2624 tEplNmtMnuNodeInfo * pNodeInfo_p,
2625 tEplNmtState NodeNmtState_p, 2625 tEplNmtState NodeNmtState_p,
2626 WORD wErrorCode_p, 2626 u16 wErrorCode_p,
2627 tEplNmtState LocalNmtState_p) 2627 tEplNmtState LocalNmtState_p)
2628{ 2628{
2629 tEplKernel Ret = kEplSuccessful; 2629 tEplKernel Ret = kEplSuccessful;
@@ -2699,7 +2699,7 @@ static tEplKernel EplNmtMnuCheckNmtState(unsigned int uiNodeId_p,
2699 } else if ((ExpNmtState != NodeNmtState_p) 2699 } else if ((ExpNmtState != NodeNmtState_p)
2700 && !((ExpNmtState == kEplNmtCsPreOperational1) 2700 && !((ExpNmtState == kEplNmtCsPreOperational1)
2701 && (NodeNmtState_p == kEplNmtCsPreOperational2))) { // CN is not in expected NMT state (without the exceptions above) 2701 && (NodeNmtState_p == kEplNmtCsPreOperational2))) { // CN is not in expected NMT state (without the exceptions above)
2702 WORD wbeErrorCode; 2702 u16 wbeErrorCode;
2703 2703
2704 if ((pNodeInfo_p-> 2704 if ((pNodeInfo_p->
2705 m_wFlags & EPL_NMTMNU_NODE_FLAG_NOT_SCANNED) != 0) { 2705 m_wFlags & EPL_NMTMNU_NODE_FLAG_NOT_SCANNED) != 0) {
diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c
index ab0966ea655..e90c4949d6a 100644
--- a/drivers/staging/epl/EplObd.c
+++ b/drivers/staging/epl/EplObd.c
@@ -1080,7 +1080,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned
1080 case kEplObdTypInt16: 1080 case kEplObdTypInt16:
1081 case kEplObdTypUInt16: 1081 case kEplObdTypUInt16:
1082 { 1082 {
1083 AmiSetWordToLe(pDstData_p, *((WORD *) pSrcData)); 1083 AmiSetWordToLe(pDstData_p, *((u16 *) pSrcData));
1084 break; 1084 break;
1085 } 1085 }
1086 1086
@@ -1230,7 +1230,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign
1230 case kEplObdTypInt16: 1230 case kEplObdTypInt16:
1231 case kEplObdTypUInt16: 1231 case kEplObdTypUInt16:
1232 { 1232 {
1233 *((WORD *) pBuffer) = AmiGetWordFromLe(pSrcData_p); 1233 *((u16 *) pBuffer) = AmiGetWordFromLe(pSrcData_p);
1234 break; 1234 break;
1235 } 1235 }
1236 1236
@@ -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 (u8, WORD, ...) 2097// The function determines if an object type an fixed data type (u8, u16, ...)
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.
diff --git a/drivers/staging/epl/EplObd.h b/drivers/staging/epl/EplObd.h
index ed7f091c0a0..6bb5a278068 100644
--- a/drivers/staging/epl/EplObd.h
+++ b/drivers/staging/epl/EplObd.h
@@ -206,7 +206,7 @@ typedef unsigned int tEplObdSize; // For all objects as objects size are used an
206// ------------------------------------------------------------------------- 206// -------------------------------------------------------------------------
207 207
208// types of objects in object dictionary 208// types of objects in object dictionary
209// DS-301 defines these types as WORD 209// DS-301 defines these types as u16
210typedef enum { 210typedef enum {
211// types which are always supported 211// types which are always supported
212 kEplObdTypBool = 0x0001, 212 kEplObdTypBool = 0x0001,
@@ -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 u8 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 u16 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/EplPdo.h b/drivers/staging/epl/EplPdo.h
index 83cc1f7046d..0b3ad5bc7d5 100644
--- a/drivers/staging/epl/EplPdo.h
+++ b/drivers/staging/epl/EplPdo.h
@@ -90,8 +90,8 @@
90 90
91typedef struct { 91typedef struct {
92 void *m_pVar; 92 void *m_pVar;
93 WORD m_wOffset; // in Bits 93 u16 m_wOffset; // in Bits
94 WORD m_wSize; // in Bits 94 u16 m_wSize; // in Bits
95 BOOL m_fNumeric; // numeric value -> use AMI functions 95 BOOL m_fNumeric; // numeric value -> use AMI functions
96 96
97} tEplPdoMapping; 97} tEplPdoMapping;
diff --git a/drivers/staging/epl/EplPdok.c b/drivers/staging/epl/EplPdok.c
index 848fdb1e387..db9b3f08384 100644
--- a/drivers/staging/epl/EplPdok.c
+++ b/drivers/staging/epl/EplPdok.c
@@ -314,16 +314,16 @@ tEplKernel EplPdokCbSoa(tEplFrameInfo * pFrameInfo_p)
314tEplKernel EplPdokProcess(tEplEvent * pEvent_p) 314tEplKernel EplPdokProcess(tEplEvent * pEvent_p)
315{ 315{
316 tEplKernel Ret = kEplSuccessful; 316 tEplKernel Ret = kEplSuccessful;
317 WORD wPdoSize; 317 u16 wPdoSize;
318 WORD wBitOffset; 318 u16 wBitOffset;
319 WORD wBitSize; 319 u16 wBitSize;
320 WORD wVarSize; 320 u16 wVarSize;
321 u64 qwObjectMapping; 321 u64 qwObjectMapping;
322 u8 bMappSubindex; 322 u8 bMappSubindex;
323 u8 bObdSubindex; 323 u8 bObdSubindex;
324 WORD wObdMappIndex; 324 u16 wObdMappIndex;
325 WORD wObdCommIndex; 325 u16 wObdCommIndex;
326 WORD wPdoId; 326 u16 wPdoId;
327 u8 bObdData; 327 u8 bObdData;
328 u8 bObjectCount; 328 u8 bObjectCount;
329 u8 bFrameData; 329 u8 bFrameData;
@@ -438,16 +438,16 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p)
438 } 438 }
439 // decode object mapping 439 // decode object mapping
440 wObdCommIndex = 440 wObdCommIndex =
441 (WORD) (qwObjectMapping & 441 (u16) (qwObjectMapping &
442 0x000000000000FFFFLL); 442 0x000000000000FFFFLL);
443 bObdSubindex = 443 bObdSubindex =
444 (u8) ((qwObjectMapping & 444 (u8) ((qwObjectMapping &
445 0x0000000000FF0000LL) >> 16); 445 0x0000000000FF0000LL) >> 16);
446 wBitOffset = 446 wBitOffset =
447 (WORD) ((qwObjectMapping & 447 (u16) ((qwObjectMapping &
448 0x0000FFFF00000000LL) >> 32); 448 0x0000FFFF00000000LL) >> 32);
449 wBitSize = 449 wBitSize =
450 (WORD) ((qwObjectMapping & 450 (u16) ((qwObjectMapping &
451 0xFFFF000000000000LL) >> 48); 451 0xFFFF000000000000LL) >> 48);
452 452
453 // check if object exceeds PDO size 453 // check if object exceeds PDO size
@@ -568,21 +568,21 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p)
568 } 568 }
569 // decode object mapping 569 // decode object mapping
570 wObdCommIndex = 570 wObdCommIndex =
571 (WORD) (qwObjectMapping & 571 (u16) (qwObjectMapping &
572 0x000000000000FFFFLL); 572 0x000000000000FFFFLL);
573 bObdSubindex = 573 bObdSubindex =
574 (u8) ((qwObjectMapping & 574 (u8) ((qwObjectMapping &
575 0x0000000000FF0000LL) >> 16); 575 0x0000000000FF0000LL) >> 16);
576 wBitOffset = 576 wBitOffset =
577 (WORD) ((qwObjectMapping & 577 (u16) ((qwObjectMapping &
578 0x0000FFFF00000000LL) >> 32); 578 0x0000FFFF00000000LL) >> 32);
579 wBitSize = 579 wBitSize =
580 (WORD) ((qwObjectMapping & 580 (u16) ((qwObjectMapping &
581 0xFFFF000000000000LL) >> 48); 581 0xFFFF000000000000LL) >> 48);
582 582
583 // calculate max PDO size 583 // calculate max PDO size
584 ObdSize = wBitSize >> 3; 584 ObdSize = wBitSize >> 3;
585 wVarSize = (wBitOffset >> 3) + (WORD) ObdSize; 585 wVarSize = (wBitOffset >> 3) + (u16) ObdSize;
586 if ((unsigned int)(wVarSize + 24) > pFrameInfo->m_uiFrameSize) { // TPDO is too short 586 if ((unsigned int)(wVarSize + 24) > pFrameInfo->m_uiFrameSize) { // TPDO is too short
587 // $$$ raise PDO error, set Ret 587 // $$$ raise PDO error, set Ret
588 goto Exit; 588 goto Exit;
diff --git a/drivers/staging/epl/EplPdou.c b/drivers/staging/epl/EplPdou.c
index 857ab513db1..d6d06242d74 100644
--- a/drivers/staging/epl/EplPdou.c
+++ b/drivers/staging/epl/EplPdou.c
@@ -237,7 +237,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p)
237 tEplObdAccess AccessType; 237 tEplObdAccess AccessType;
238 u8 bMappSubindex; 238 u8 bMappSubindex;
239 unsigned int uiCurPdoSize; 239 unsigned int uiCurPdoSize;
240 WORD wMaxPdoSize; 240 u16 wMaxPdoSize;
241 unsigned int uiSubIndex; 241 unsigned int uiSubIndex;
242 242
243 // fetch PDO ID 243 // fetch PDO ID
diff --git a/drivers/staging/epl/EplSdoAsySequ.c b/drivers/staging/epl/EplSdoAsySequ.c
index d7e007ad4d6..256d7086634 100644
--- a/drivers/staging/epl/EplSdoAsySequ.c
+++ b/drivers/staging/epl/EplSdoAsySequ.c
@@ -2422,8 +2422,8 @@ static tEplKernel EplSdoAsyReadFromHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p,
2422 // check if entries are available for reading 2422 // check if entries are available for reading
2423 if ((pHistory->m_bFreeEntries < EPL_SDO_HISTORY_SIZE) 2423 if ((pHistory->m_bFreeEntries < EPL_SDO_HISTORY_SIZE)
2424 && (pHistory->m_bWrite != pHistory->m_bRead)) { 2424 && (pHistory->m_bWrite != pHistory->m_bRead)) {
2425// PRINTF4("EplSdoAsyReadFromHistory(): init = %d, read = %u, write = %u, ack = %u", (int) fInitRead_p, (WORD)pHistory->m_bRead, (WORD)pHistory->m_bWrite, (WORD)pHistory->m_bAck); 2425// PRINTF4("EplSdoAsyReadFromHistory(): init = %d, read = %u, write = %u, ack = %u", (int) fInitRead_p, (u16)pHistory->m_bRead, (u16)pHistory->m_bWrite, (u16)pHistory->m_bAck);
2426// PRINTF2(", free entries = %u, next frame size = %u\n", (WORD)pHistory->m_bFreeEntries, pHistory->m_auiFrameSize[pHistory->m_bRead]); 2426// PRINTF2(", free entries = %u, next frame size = %u\n", (u16)pHistory->m_bFreeEntries, pHistory->m_auiFrameSize[pHistory->m_bRead]);
2427 2427
2428 // return pointer to stored frame 2428 // return pointer to stored frame
2429 *ppFrame_p = 2429 *ppFrame_p =
@@ -2439,7 +2439,7 @@ static tEplKernel EplSdoAsyReadFromHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p,
2439 } 2439 }
2440 2440
2441 } else { 2441 } else {
2442// PRINTF3("EplSdoAsyReadFromHistory(): read = %u, ack = %u, free entries = %u, no frame\n", (WORD)pHistory->m_bRead, (WORD)pHistory->m_bAck, (WORD)pHistory->m_bFreeEntries); 2442// PRINTF3("EplSdoAsyReadFromHistory(): read = %u, ack = %u, free entries = %u, no frame\n", (u16)pHistory->m_bRead, (u16)pHistory->m_bAck, (u16)pHistory->m_bFreeEntries);
2443 2443
2444 // no more frames to send 2444 // no more frames to send
2445 // return null pointer 2445 // return null pointer
diff --git a/drivers/staging/epl/EplSdoComu.c b/drivers/staging/epl/EplSdoComu.c
index 1f71b5c6e5f..bf35afab152 100644
--- a/drivers/staging/epl/EplSdoComu.c
+++ b/drivers/staging/epl/EplSdoComu.c
@@ -814,7 +814,7 @@ tEplKernel EplSdoComReceiveCb(tEplSdoSeqConHdl SdoSeqConHdl_p,
814 814
815 EPL_DBGLVL_SDO_TRACE3 815 EPL_DBGLVL_SDO_TRACE3
816 ("EplSdoComReceiveCb SdoSeqConHdl: 0x%X, First Byte of pAsySdoCom_p: 0x%02X, uiDataSize_p: 0x%04X\n", 816 ("EplSdoComReceiveCb SdoSeqConHdl: 0x%X, First Byte of pAsySdoCom_p: 0x%02X, uiDataSize_p: 0x%04X\n",
817 SdoSeqConHdl_p, (WORD) pAsySdoCom_p->m_le_abCommandData[0], 817 SdoSeqConHdl_p, (u16) pAsySdoCom_p->m_le_abCommandData[0],
818 uiDataSize_p); 818 uiDataSize_p);
819 819
820 return Ret; 820 return Ret;
@@ -2166,7 +2166,7 @@ static tEplKernel EplSdoComServerSendFrameIntern(tEplSdoComCon * pSdoComCon_p,
2166 // set size of frame 2166 // set size of frame
2167 AmiSetWordToLe(&pCommandFrame-> 2167 AmiSetWordToLe(&pCommandFrame->
2168 m_le_wSegmentSize, 2168 m_le_wSegmentSize,
2169 (WORD) pSdoComCon_p-> 2169 (u16) pSdoComCon_p->
2170 m_uiTransSize); 2170 m_uiTransSize);
2171 2171
2172 // correct byte-counter 2172 // correct byte-counter
@@ -2296,7 +2296,7 @@ static tEplKernel EplSdoComServerSendFrameIntern(tEplSdoComCon * pSdoComCon_p,
2296 // set segment size 2296 // set segment size
2297 AmiSetWordToLe(&pCommandFrame-> 2297 AmiSetWordToLe(&pCommandFrame->
2298 m_le_wSegmentSize, 2298 m_le_wSegmentSize,
2299 (WORD) pSdoComCon_p-> 2299 (u16) pSdoComCon_p->
2300 m_uiTransSize); 2300 m_uiTransSize);
2301 2301
2302 // send frame 2302 // send frame
@@ -2679,7 +2679,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p)
2679 2679
2680 // create command header 2680 // create command header
2681 AmiSetWordToLe(pbPayload, 2681 AmiSetWordToLe(pbPayload,
2682 (WORD) pSdoComCon_p-> 2682 (u16) pSdoComCon_p->
2683 m_uiTargetIndex); 2683 m_uiTargetIndex);
2684 pbPayload += 2; 2684 pbPayload += 2;
2685 AmiSetByteToLe(pbPayload, 2685 AmiSetByteToLe(pbPayload,
@@ -2720,7 +2720,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p)
2720 bFlags); 2720 bFlags);
2721 // create command header 2721 // create command header
2722 AmiSetWordToLe(pbPayload, 2722 AmiSetWordToLe(pbPayload,
2723 (WORD) 2723 (u16)
2724 pSdoComCon_p-> 2724 pSdoComCon_p->
2725 m_uiTargetIndex); 2725 m_uiTargetIndex);
2726 pbPayload += 2; 2726 pbPayload += 2;
@@ -2759,7 +2759,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p)
2759 2759
2760 // create command header 2760 // create command header
2761 AmiSetWordToLe(pbPayload, 2761 AmiSetWordToLe(pbPayload,
2762 (WORD) 2762 (u16)
2763 pSdoComCon_p-> 2763 pSdoComCon_p->
2764 m_uiTargetIndex); 2764 m_uiTargetIndex);
2765 pbPayload += 2; 2765 pbPayload += 2;
@@ -2783,7 +2783,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p)
2783 // fill rest of header 2783 // fill rest of header
2784 AmiSetWordToLe(&pCommandFrame-> 2784 AmiSetWordToLe(&pCommandFrame->
2785 m_le_wSegmentSize, 2785 m_le_wSegmentSize,
2786 (WORD) (4 + 2786 (u16) (4 +
2787 pSdoComCon_p-> 2787 pSdoComCon_p->
2788 m_uiTransSize)); 2788 m_uiTransSize));
2789 2789
@@ -2854,7 +2854,7 @@ static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p)
2854 AmiSetWordToLe 2854 AmiSetWordToLe
2855 (&pCommandFrame-> 2855 (&pCommandFrame->
2856 m_le_wSegmentSize, 2856 m_le_wSegmentSize,
2857 (WORD) 2857 (u16)
2858 pSdoComCon_p-> 2858 pSdoComCon_p->
2859 m_uiTransSize); 2859 m_uiTransSize);
2860 bFlags = 0x30; 2860 bFlags = 0x30;
diff --git a/drivers/staging/epl/amix86.c b/drivers/staging/epl/amix86.c
index 60fb6efbaf2..d40ad918d3b 100644
--- a/drivers/staging/epl/amix86.c
+++ b/drivers/staging/epl/amix86.c
@@ -79,7 +79,7 @@
79//--------------------------------------------------------------------------- 79//---------------------------------------------------------------------------
80 80
81typedef struct { 81typedef struct {
82 WORD m_wWord; 82 u16 m_wWord;
83 83
84} twStruct; 84} twStruct;
85 85
@@ -125,15 +125,15 @@ void AmiSetByteToBe (void *pAddr_p, u8 bByteVal_p)
125} 125}
126*/ 126*/
127 127
128//------------< write WORD in big endian >-------------------------- 128//------------< write u16 in big endian >--------------------------
129 129
130void AmiSetWordToBe(void * pAddr_p, WORD wWordVal_p) 130void AmiSetWordToBe(void * pAddr_p, u16 wWordVal_p)
131{ 131{
132 twStruct *pwStruct; 132 twStruct *pwStruct;
133 twStruct wValue; 133 twStruct wValue;
134 134
135 wValue.m_wWord = (WORD) ((wWordVal_p & 0x00FF) << 8); //LSB to MSB 135 wValue.m_wWord = (u16) ((wWordVal_p & 0x00FF) << 8); //LSB to MSB
136 wValue.m_wWord |= (WORD) ((wWordVal_p & 0xFF00) >> 8); //MSB to LSB 136 wValue.m_wWord |= (u16) ((wWordVal_p & 0xFF00) >> 8); //MSB to LSB
137 137
138 pwStruct = (twStruct *) pAddr_p; 138 pwStruct = (twStruct *) pAddr_p;
139 pwStruct->m_wWord = wValue.m_wWord; 139 pwStruct->m_wWord = wValue.m_wWord;
@@ -183,9 +183,9 @@ void AmiSetByteToLe (void *pAddr_p, u8 bByteVal_p)
183} 183}
184*/ 184*/
185 185
186//------------< write WORD in little endian >-------------------------- 186//------------< write u16 in little endian >--------------------------
187 187
188void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p) 188void AmiSetWordToLe(void *pAddr_p, u16 wWordVal_p)
189{ 189{
190 twStruct *pwStruct; 190 twStruct *pwStruct;
191 191
@@ -230,17 +230,17 @@ u8 AmiGetByteFromBe (void *pAddr_p)
230} 230}
231*/ 231*/
232 232
233//------------< read WORD in big endian >--------------------------- 233//------------< read u16 in big endian >---------------------------
234 234
235WORD AmiGetWordFromBe(void *pAddr_p) 235u16 AmiGetWordFromBe(void *pAddr_p)
236{ 236{
237 twStruct *pwStruct; 237 twStruct *pwStruct;
238 twStruct wValue; 238 twStruct wValue;
239 239
240 pwStruct = (twStruct *) pAddr_p; 240 pwStruct = (twStruct *) pAddr_p;
241 241
242 wValue.m_wWord = (WORD) ((pwStruct->m_wWord & 0x00FF) << 8); //LSB to MSB 242 wValue.m_wWord = (u16) ((pwStruct->m_wWord & 0x00FF) << 8); //LSB to MSB
243 wValue.m_wWord |= (WORD) ((pwStruct->m_wWord & 0xFF00) >> 8); //MSB to LSB 243 wValue.m_wWord |= (u16) ((pwStruct->m_wWord & 0xFF00) >> 8); //MSB to LSB
244 244
245 return (wValue.m_wWord); 245 return (wValue.m_wWord);
246 246
@@ -289,9 +289,9 @@ u8 AmiGetByteFromLe (void *pAddr_p)
289} 289}
290*/ 290*/
291 291
292//------------< read WORD in little endian >--------------------------- 292//------------< read u16 in little endian >---------------------------
293 293
294WORD AmiGetWordFromLe(void *pAddr_p) 294u16 AmiGetWordFromLe(void *pAddr_p)
295{ 295{
296 twStruct *pwStruct; 296 twStruct *pwStruct;
297 297
@@ -649,7 +649,7 @@ void AmiSetQword48ToLe(void *pAddr_p, u64 qwQwordVal_p)
649{ 649{
650 650
651 ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0]; 651 ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0];
652 ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; 652 ((u16 *) pAddr_p)[2] = ((u16 *) & qwQwordVal_p)[2];
653 653
654} 654}
655 655
@@ -752,7 +752,7 @@ void AmiSetQword56ToLe(void *pAddr_p, u64 qwQwordVal_p)
752{ 752{
753 753
754 ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0]; 754 ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0];
755 ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; 755 ((u16 *) pAddr_p)[2] = ((u16 *) & qwQwordVal_p)[2];
756 ((u8 *) pAddr_p)[6] = ((u8 *) & qwQwordVal_p)[6]; 756 ((u8 *) pAddr_p)[6] = ((u8 *) & qwQwordVal_p)[6];
757 757
758} 758}
diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c
index 9a10f1cf167..74ab74f80f9 100644
--- a/drivers/staging/epl/demo_main.c
+++ b/drivers/staging/epl/demo_main.c
@@ -810,7 +810,7 @@ tEplKernel AppCbSync(void)
810 bVarOut1Old_l = bVarOut1_l; 810 bVarOut1Old_l = bVarOut1_l;
811 // set LEDs 811 // set LEDs
812 812
813// printk("bVarIn = 0x%02X bVarOut = 0x%02X\n", (WORD) bVarIn_l, (WORD) bVarOut_l); 813// printk("bVarIn = 0x%02X bVarOut = 0x%02X\n", (u16) bVarIn_l, (u16) bVarOut_l);
814 } 814 }
815 if (uiNodeId_g != EPL_C_ADR_MN_DEF_NODE_ID) { 815 if (uiNodeId_g != EPL_C_ADR_MN_DEF_NODE_ID) {
816 bVarIn1_l++; 816 bVarIn1_l++;
diff --git a/drivers/staging/epl/edrv.h b/drivers/staging/epl/edrv.h
index 56b287e0318..62b4e77e069 100644
--- a/drivers/staging/epl/edrv.h
+++ b/drivers/staging/epl/edrv.h
@@ -120,7 +120,7 @@ typedef struct _tEdrvRxBuffer {
120} tEdrvRxBuffer; 120} tEdrvRxBuffer;
121 121
122//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, tBufferDescr * pbBuffer_p); 122//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, tBufferDescr * pbBuffer_p);
123//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, u8 * pbEthernetData_p, WORD wDataLen_p); 123//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, u8 * pbEthernetData_p, u16 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
@@ -130,7 +130,7 @@ typedef struct {
130 130
131// u8 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// u16 m_wRxBufferSize; // size of the whole rx buffer
134 134
135 tEdrvRxHandler m_pfnRxHandler; 135 tEdrvRxHandler m_pfnRxHandler;
136 tEdrvTxHandler m_pfnTxHandler; 136 tEdrvTxHandler m_pfnTxHandler;
diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h
index b54842ba7ed..8c52d97ec9c 100644
--- a/drivers/staging/epl/global.h
+++ b/drivers/staging/epl/global.h
@@ -26,9 +26,6 @@
26#define TRACE printk 26#define TRACE printk
27 27
28// --- logic types --- 28// --- logic types ---
29#ifndef WORD
30#define WORD unsigned short int
31#endif
32#ifndef BOOL 29#ifndef BOOL
33#define BOOL unsigned char 30#define BOOL unsigned char
34#endif 31#endif
diff --git a/drivers/staging/epl/kernel/EplDllk.h b/drivers/staging/epl/kernel/EplDllk.h
index 31ab0585f8e..adc35dca7f1 100644
--- a/drivers/staging/epl/kernel/EplDllk.h
+++ b/drivers/staging/epl/kernel/EplDllk.h
@@ -99,7 +99,7 @@ struct _tEplDllkNodeInfo {
99 u32 m_dwPresTimeout; 99 u32 m_dwPresTimeout;
100 unsigned long m_ulDllErrorEvents; 100 unsigned long m_ulDllErrorEvents;
101 tEplNmtState m_NmtState; 101 tEplNmtState m_NmtState;
102 WORD m_wPresPayloadLimit; 102 u16 m_wPresPayloadLimit;
103 u8 m_be_abMacAddr[6]; 103 u8 m_be_abMacAddr[6];
104 u8 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
diff --git a/drivers/staging/epl/proc_fs.c b/drivers/staging/epl/proc_fs.c
index a3235a12922..e82ab0c0b56 100644
--- a/drivers/staging/epl/proc_fs.c
+++ b/drivers/staging/epl/proc_fs.c
@@ -263,7 +263,7 @@ static int EplLinProcRead(char *pcBuffer_p,
263 // ---- EPL state ---- 263 // ---- EPL state ----
264 nSize += snprintf(pcBuffer_p + nSize, nBufferSize_p - nSize, 264 nSize += snprintf(pcBuffer_p + nSize, nBufferSize_p - nSize,
265 "NMT state: 0x%04X\n", 265 "NMT state: 0x%04X\n",
266 (WORD) EplNmtkGetNmtState()); 266 (u16) EplNmtkGetNmtState());
267 267
268 EplDllkCalGetStatistics(&pDllkCalStats); 268 EplDllkCalGetStatistics(&pDllkCalStats);
269 269
@@ -286,7 +286,7 @@ static int EplLinProcRead(char *pcBuffer_p,
286 { 286 {
287 unsigned int uiMandatorySlaveCount; 287 unsigned int uiMandatorySlaveCount;
288 unsigned int uiSignalSlaveCount; 288 unsigned int uiSignalSlaveCount;
289 WORD wFlags; 289 u16 wFlags;
290 290
291 EplNmtMnuGetDiagnosticInfo(&uiMandatorySlaveCount, 291 EplNmtMnuGetDiagnosticInfo(&uiMandatorySlaveCount,
292 &uiSignalSlaveCount, &wFlags); 292 &uiSignalSlaveCount, &wFlags);
diff --git a/drivers/staging/epl/user/EplCfgMau.h b/drivers/staging/epl/user/EplCfgMau.h
index 9ffe51cac70..b5ee972b90b 100644
--- a/drivers/staging/epl/user/EplCfgMau.h
+++ b/drivers/staging/epl/user/EplCfgMau.h
@@ -148,7 +148,7 @@ typedef struct {
148 u32 m_dwCntObjectInDcf; // number of Objects in DCF 148 u32 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
151 WORD m_wTimeOutCnt; // Timeout Counter, break configuration is 151 u16 m_wTimeOutCnt; // Timeout Counter, break configuration is
152 // m_wTimeOutCnt == CFGMA_MAX_TIMEOUT 152 // m_wTimeOutCnt == CFGMA_MAX_TIMEOUT
153 153
154} tEplCfgMaNode; 154} tEplCfgMaNode;
diff --git a/drivers/staging/epl/user/EplNmtMnu.h b/drivers/staging/epl/user/EplNmtMnu.h
index 478baae2121..8206c5ad29b 100644
--- a/drivers/staging/epl/user/EplNmtMnu.h
+++ b/drivers/staging/epl/user/EplNmtMnu.h
@@ -84,12 +84,12 @@
84typedef tEplKernel(* tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, 84typedef tEplKernel(* tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p,
85 tEplNmtNodeEvent NodeEvent_p, 85 tEplNmtNodeEvent NodeEvent_p,
86 tEplNmtState NmtState_p, 86 tEplNmtState NmtState_p,
87 WORD wErrorCode_p, 87 u16 wErrorCode_p,
88 BOOL fMandatory_p); 88 BOOL fMandatory_p);
89 89
90typedef tEplKernel(* tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p, 90typedef tEplKernel(* tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p,
91 tEplNmtState NmtState_p, 91 tEplNmtState NmtState_p,
92 WORD wErrorCode_p); 92 u16 wErrorCode_p);
93 93
94//--------------------------------------------------------------------------- 94//---------------------------------------------------------------------------
95// function prototypes 95// function prototypes
@@ -122,7 +122,7 @@ tEplKernel EplNmtMnuGetDiagnosticInfo(unsigned int
122 *puiMandatorySlaveCount_p, 122 *puiMandatorySlaveCount_p,
123 unsigned int 123 unsigned int
124 *puiSignalSlaveCount_p, 124 *puiSignalSlaveCount_p,
125 WORD * pwFlags_p); 125 u16 * pwFlags_p);
126 126
127#endif 127#endif
128 128
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-19 11:34:36 -0400