Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: epl: remove DWORD

It's u32 in kernelspace, not DWORD.

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>

+203 -206
+1 -1
drivers/staging/epl/Debug.h
··· 666 666 DEBUG_LVL_ASSERT_TRACE4 ( \ 667 667 "Assertion failed: line %d file '%s'\n" \ 668 668 " -> '%s'\n" \ 669 - " -> 0x%08lX\n", __LINE__, __FILE__, str, (DWORD) p1); \ 669 + " -> 0x%08lX\n", __LINE__, __FILE__, str, (u32) p1); \ 670 670 while (1); } 671 671 672 672
+27 -27
drivers/staging/epl/Edrv8139.c
··· 235 235 // TracePoint support for realtime-debugging 236 236 #ifdef _DBG_TRACE_POINTS_ 237 237 void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); 238 - void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 238 + void TgtDbgPostTraceValue(u32 dwTraceValue_p); 239 239 #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 240 240 #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 241 241 #else ··· 456 456 tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p) 457 457 { 458 458 tEplKernel Ret = kEplSuccessful; 459 - DWORD dwData; 459 + u32 dwData; 460 460 u8 bHash; 461 461 462 462 bHash = EdrvCalcHash(pbMacAddr_p); ··· 497 497 tEplKernel EdrvUndefineRxMacAddrEntry(u8 * pbMacAddr_p) 498 498 { 499 499 tEplKernel Ret = kEplSuccessful; 500 - DWORD dwData; 500 + u32 dwData; 501 501 u8 bHash; 502 502 503 503 bHash = EdrvCalcHash(pbMacAddr_p); ··· 532 532 tEplKernel EdrvAllocTxMsgBuffer(tEdrvTxBuffer * pBuffer_p) 533 533 { 534 534 tEplKernel Ret = kEplSuccessful; 535 - DWORD i; 535 + u32 i; 536 536 537 537 if (pBuffer_p->m_uiMaxBufferLen > EDRV_MAX_FRAME_SIZE) { 538 538 Ret = kEplEdrvNoFreeBufEntry; ··· 605 605 { 606 606 tEplKernel Ret = kEplSuccessful; 607 607 unsigned int uiBufferNumber; 608 - DWORD dwTemp; 608 + u32 dwTemp; 609 609 610 610 uiBufferNumber = pBuffer_p->m_uiBufferNumber; 611 611 ··· 620 620 dwTemp = 621 621 EDRV_REGDW_READ((EDRV_REGDW_TSD0 + 622 622 (EdrvInstance_l.m_uiCurTxDesc * 623 - sizeof(DWORD)))); 624 - printk("%s InvOp TSD%u = 0x%08lX", __func__, 623 + sizeof(u32)))); 624 + printk("%s InvOp TSD%u = 0x%08X", __func__, 625 625 EdrvInstance_l.m_uiCurTxDesc, dwTemp); 626 626 printk(" Cmd = 0x%02X\n", 627 627 (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); ··· 640 640 } 641 641 // set DMA address of buffer 642 642 EDRV_REGDW_WRITE((EDRV_REGDW_TSAD0 + 643 - (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD))), 643 + (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32))), 644 644 (EdrvInstance_l.m_pTxBufDma + 645 645 (uiBufferNumber * EDRV_MAX_FRAME_SIZE))); 646 646 dwTemp = 647 647 EDRV_REGDW_READ((EDRV_REGDW_TSAD0 + 648 - (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD)))); 648 + (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32)))); 649 649 // printk("%s TSAD%u = 0x%08lX", __func__, EdrvInstance_l.m_uiCurTxDesc, dwTemp); 650 650 651 651 // start transmission 652 652 EDRV_REGDW_WRITE((EDRV_REGDW_TSD0 + 653 - (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD))), 653 + (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32))), 654 654 (EDRV_REGDW_TSD_TXTH_DEF | pBuffer_p->m_uiTxMsgLen)); 655 655 dwTemp = 656 656 EDRV_REGDW_READ((EDRV_REGDW_TSD0 + 657 - (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD)))); 658 - // printk(" TSD%u = 0x%08lX / 0x%08lX\n", EdrvInstance_l.m_uiCurTxDesc, dwTemp, (DWORD)(EDRV_REGDW_TSD_TXTH_DEF | pBuffer_p->m_uiTxMsgLen)); 657 + (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32)))); 658 + // printk(" TSD%u = 0x%08lX / 0x%08lX\n", EdrvInstance_l.m_uiCurTxDesc, dwTemp, (u32)(EDRV_REGDW_TSD_TXTH_DEF | pBuffer_p->m_uiTxMsgLen)); 659 659 660 660 Exit: 661 661 return Ret; ··· 762 762 tEdrvRxBuffer RxBuffer; 763 763 tEdrvTxBuffer *pTxBuffer; 764 764 WORD wStatus; 765 - DWORD dwTxStatus; 766 - DWORD dwRxStatus; 765 + u32 dwTxStatus; 766 + u32 dwRxStatus; 767 767 WORD wCurRx; 768 768 u8 *pbRxBuf; 769 769 unsigned int uiLength; ··· 793 793 dwTxStatus = 794 794 EDRV_REGDW_READ((EDRV_REGDW_TSD0 + 795 795 (EdrvInstance_l.m_uiCurTxDesc * 796 - sizeof(DWORD)))); 796 + sizeof(u32)))); 797 797 if ((dwTxStatus & (EDRV_REGDW_TSD_TOK | EDRV_REGDW_TSD_TABT | EDRV_REGDW_TSD_TUN)) != 0) { // transmit finished 798 798 EdrvInstance_l.m_uiCurTxDesc = 799 799 (EdrvInstance_l.m_uiCurTxDesc + 1) & 0x03; ··· 855 855 // calculate pointer to current frame in receive buffer 856 856 pbRxBuf = EdrvInstance_l.m_pbRxBuf + wCurRx; 857 857 858 - // read receive status DWORD 859 - dwRxStatus = le32_to_cpu(*((DWORD *) pbRxBuf)); 858 + // read receive status u32 859 + dwRxStatus = le32_to_cpu(*((u32 *) pbRxBuf)); 860 860 861 861 // calculate length of received frame 862 862 uiLength = dwRxStatus >> 16; ··· 896 896 m_pfnRxHandler(&RxBuffer); 897 897 } 898 898 899 - // calulate new offset (DWORD aligned) 899 + // calulate new offset (u32 aligned) 900 900 wCurRx = 901 901 (WORD) ((wCurRx + uiLength + sizeof(dwRxStatus) + 902 902 3) & ~0x3); ··· 941 941 static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId) 942 942 { 943 943 int iResult = 0; 944 - DWORD dwTemp; 944 + u32 dwTemp; 945 945 946 946 if (EdrvInstance_l.m_pPciDev != NULL) { // Edrv is already connected to a PCI device 947 947 printk("%s device %s discarded\n", __func__, ··· 1008 1008 dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TCR); 1009 1009 if (((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_C) 1010 1010 && ((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_D)) { // unsupported chip 1011 - printk("%s Unsupported chip! TCR = 0x%08lX\n", __func__, 1011 + printk("%s Unsupported chip! TCR = 0x%08X\n", __func__, 1012 1012 dwTemp); 1013 1013 iResult = -ENODEV; 1014 1014 goto Exit; ··· 1043 1043 printk("%s set local MAC address\n", __func__); 1044 1044 // write this MAC address to controller 1045 1045 EDRV_REGDW_WRITE(EDRV_REGDW_IDR0, 1046 - le32_to_cpu(*((DWORD*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[0]))); 1046 + le32_to_cpu(*((u32*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[0]))); 1047 1047 dwTemp = EDRV_REGDW_READ(EDRV_REGDW_IDR0); 1048 1048 1049 1049 EDRV_REGDW_WRITE(EDRV_REGDW_IDR4, 1050 - le32_to_cpu(*((DWORD*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[4]))); 1050 + le32_to_cpu(*((u32*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[4]))); 1051 1051 dwTemp = EDRV_REGDW_READ(EDRV_REGDW_IDR4); 1052 1052 break; 1053 1053 } ··· 1217 1217 1218 1218 static u8 EdrvCalcHash(u8 * pbMAC_p) 1219 1219 { 1220 - DWORD dwByteCounter; 1221 - DWORD dwBitCounter; 1222 - DWORD dwData; 1223 - DWORD dwCrc; 1224 - DWORD dwCarry; 1220 + u32 dwByteCounter; 1221 + u32 dwBitCounter; 1222 + u32 dwData; 1223 + u32 dwCrc; 1224 + u32 dwCarry; 1225 1225 u8 *pbData; 1226 1226 u8 bHash; 1227 1227
+19 -19
drivers/staging/epl/Epl.h
··· 142 142 u8 m_abMacAddress[6]; // local MAC address 143 143 144 144 // 0x1F82: NMT_FeatureFlags_U32 145 - DWORD m_dwFeatureFlags; 145 + u32 m_dwFeatureFlags; 146 146 // Cycle Length (0x1006: NMT_CycleLen_U32) in [us] 147 - DWORD m_dwCycleLen; // required for error detection 147 + u32 m_dwCycleLen; // required for error detection 148 148 // 0x1F98: NMT_CycleTiming_REC 149 149 // 0x1F98.1: IsochrTxMaxPayload_U16 150 150 unsigned int m_uiIsochrTxMaxPayload; // const 151 151 // 0x1F98.2: IsochrRxMaxPayload_U16 152 152 unsigned int m_uiIsochrRxMaxPayload; // const 153 153 // 0x1F98.3: PResMaxLatency_U32 154 - DWORD m_dwPresMaxLatency; // const in [ns], only required for IdentRes 154 + u32 m_dwPresMaxLatency; // const in [ns], only required for IdentRes 155 155 // 0x1F98.4: PReqActPayloadLimit_U16 156 156 unsigned int m_uiPreqActPayloadLimit; // required for initialisation (+28 bytes) 157 157 // 0x1F98.5: PResActPayloadLimit_U16 158 158 unsigned int m_uiPresActPayloadLimit; // required for initialisation of Pres frame (+28 bytes) 159 159 // 0x1F98.6: ASndMaxLatency_U32 160 - DWORD m_dwAsndMaxLatency; // const in [ns], only required for IdentRes 160 + u32 m_dwAsndMaxLatency; // const in [ns], only required for IdentRes 161 161 // 0x1F98.7: MultiplCycleCnt_U8 162 162 unsigned int m_uiMultiplCycleCnt; // required for error detection 163 163 // 0x1F98.8: AsyncMTU_U16 ··· 167 167 // $$$ Multiplexed Slot 168 168 169 169 // 0x1C14: DLL_LossOfFrameTolerance_U32 in [ns] 170 - DWORD m_dwLossOfFrameTolerance; 170 + u32 m_dwLossOfFrameTolerance; 171 171 172 172 // 0x1F8A: NMT_MNCycleTiming_REC 173 173 // 0x1F8A.1: WaitSoCPReq_U32 in [ns] 174 - DWORD m_dwWaitSocPreq; 174 + u32 m_dwWaitSocPreq; 175 175 176 176 // 0x1F8A.2: AsyncSlotTimeout_U32 in [ns] 177 - DWORD m_dwAsyncSlotTimeout; 177 + u32 m_dwAsyncSlotTimeout; 178 178 179 - DWORD m_dwDeviceType; // NMT_DeviceType_U32 180 - DWORD m_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 181 - DWORD m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 182 - DWORD m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 183 - DWORD m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 179 + u32 m_dwDeviceType; // NMT_DeviceType_U32 180 + u32 m_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 181 + u32 m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 182 + u32 m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 183 + u32 m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 184 184 u64 m_qwVendorSpecificExt1; 185 - DWORD m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 186 - DWORD m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 187 - DWORD m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device 188 - DWORD m_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device 189 - DWORD m_dwIpAddress; 190 - DWORD m_dwSubnetMask; 191 - DWORD m_dwDefaultGateway; 185 + u32 m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 186 + u32 m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 187 + u32 m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device 188 + u32 m_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device 189 + u32 m_dwIpAddress; 190 + u32 m_dwSubnetMask; 191 + u32 m_dwDefaultGateway; 192 192 u8 m_sHostname[32]; 193 193 u8 m_abVendorSpecificExt2[48]; 194 194
+9 -9
drivers/staging/epl/EplAmi.h
··· 111 111 #define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);} 112 112 113 113 void AmiSetWordToBe(void *pAddr_p, WORD wWordVal_p); 114 - void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p); 114 + void AmiSetDwordToBe(void *pAddr_p, u32 dwDwordVal_p); 115 115 void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p); 116 - void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p); 116 + void AmiSetDwordToLe(void *pAddr_p, u32 dwDwordVal_p); 117 117 118 118 //--------------------------------------------------------------------------- 119 119 // ··· 127 127 #define AmiGetByteFromLe(pAddr_p) (*(u8 *)(pAddr_p)) 128 128 129 129 WORD AmiGetWordFromBe(void *pAddr_p); 130 - DWORD AmiGetDwordFromBe(void *pAddr_p); 130 + u32 AmiGetDwordFromBe(void *pAddr_p); 131 131 WORD AmiGetWordFromLe(void *pAddr_p); 132 - DWORD AmiGetDwordFromLe(void *pAddr_p); 132 + u32 AmiGetDwordFromLe(void *pAddr_p); 133 133 134 134 //--------------------------------------------------------------------------- 135 135 // ··· 144 144 // 145 145 //--------------------------------------------------------------------------- 146 146 147 - void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p); 148 - void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p); 147 + void AmiSetDword24ToBe(void *pAddr_p, u32 dwDwordVal_p); 148 + void AmiSetDword24ToLe(void *pAddr_p, u32 dwDwordVal_p); 149 149 150 150 //--------------------------------------------------------------------------- 151 151 // ··· 155 155 // 156 156 // Parameters: pAddr_p = pointer to source buffer 157 157 // 158 - // Return: DWORD = read value 158 + // Return: u32 = read value 159 159 // 160 160 //--------------------------------------------------------------------------- 161 161 162 - DWORD AmiGetDword24FromBe(void *pAddr_p); 163 - DWORD AmiGetDword24FromLe(void *pAddr_p); 162 + u32 AmiGetDword24FromBe(void *pAddr_p); 163 + u32 AmiGetDword24FromLe(void *pAddr_p); 164 164 165 165 //#ifdef USE_VAR64 166 166
+2 -2
drivers/staging/epl/EplApiGeneric.c
··· 997 997 { 998 998 if ((pParam_p->m_ObdEvent == kEplObdEvPostWrite) 999 999 && (pParam_p->m_uiSubIndex == 3) 1000 - && (*((DWORD *) pParam_p->m_pArg) != 0)) { 1001 - DWORD dwVerifyConfInvalid = 0; 1000 + && (*((u32 *) pParam_p->m_pArg) != 0)) { 1001 + u32 dwVerifyConfInvalid = 0; 1002 1002 // set CFM_VerifyConfiguration_REC.VerifyConfInvalid_U32 to 0 1003 1003 Ret = 1004 1004 EplObdWriteEntry(0x1020, 4,
+20 -20
drivers/staging/epl/EplDll.h
··· 135 135 unsigned int m_uiNodeId; // local node ID 136 136 137 137 // 0x1F82: NMT_FeatureFlags_U32 138 - DWORD m_dwFeatureFlags; 138 + u32 m_dwFeatureFlags; 139 139 // Cycle Length (0x1006: NMT_CycleLen_U32) in [us] 140 - DWORD m_dwCycleLen; // required for error detection 140 + u32 m_dwCycleLen; // required for error detection 141 141 // 0x1F98: NMT_CycleTiming_REC 142 142 // 0x1F98.1: IsochrTxMaxPayload_U16 143 143 unsigned int m_uiIsochrTxMaxPayload; // const 144 144 // 0x1F98.2: IsochrRxMaxPayload_U16 145 145 unsigned int m_uiIsochrRxMaxPayload; // const 146 146 // 0x1F98.3: PResMaxLatency_U32 147 - DWORD m_dwPresMaxLatency; // const in [ns], only required for IdentRes 147 + u32 m_dwPresMaxLatency; // const in [ns], only required for IdentRes 148 148 // 0x1F98.4: PReqActPayloadLimit_U16 149 149 unsigned int m_uiPreqActPayloadLimit; // required for initialisation (+24 bytes) 150 150 // 0x1F98.5: PResActPayloadLimit_U16 151 151 unsigned int m_uiPresActPayloadLimit; // required for initialisation of Pres frame (+24 bytes) 152 152 // 0x1F98.6: ASndMaxLatency_U32 153 - DWORD m_dwAsndMaxLatency; // const in [ns], only required for IdentRes 153 + u32 m_dwAsndMaxLatency; // const in [ns], only required for IdentRes 154 154 // 0x1F98.7: MultiplCycleCnt_U8 155 155 unsigned int m_uiMultiplCycleCnt; // required for error detection 156 156 // 0x1F98.8: AsyncMTU_U16 ··· 159 159 // $$$ Multiplexed Slot 160 160 161 161 // 0x1C14: DLL_LossOfFrameTolerance_U32 in [ns] 162 - DWORD m_dwLossOfFrameTolerance; 162 + u32 m_dwLossOfFrameTolerance; 163 163 164 164 // 0x1F8A: NMT_MNCycleTiming_REC 165 165 // 0x1F8A.1: WaitSoCPReq_U32 in [ns] 166 - DWORD m_dwWaitSocPreq; 166 + u32 m_dwWaitSocPreq; 167 167 168 168 // 0x1F8A.2: AsyncSlotTimeout_U32 in [ns] 169 - DWORD m_dwAsyncSlotTimeout; 169 + u32 m_dwAsyncSlotTimeout; 170 170 171 171 } tEplDllConfigParam; 172 172 173 173 typedef struct { 174 174 unsigned int m_uiSizeOfStruct; 175 - DWORD m_dwDeviceType; // NMT_DeviceType_U32 176 - DWORD m_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 177 - DWORD m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 178 - DWORD m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 179 - DWORD m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 175 + u32 m_dwDeviceType; // NMT_DeviceType_U32 176 + u32 m_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 177 + u32 m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 178 + u32 m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 179 + u32 m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 180 180 u64 m_qwVendorSpecificExt1; 181 - DWORD m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 182 - DWORD m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 183 - DWORD m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device 184 - DWORD m_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device 185 - DWORD m_dwIpAddress; 186 - DWORD m_dwSubnetMask; 187 - DWORD m_dwDefaultGateway; 181 + u32 m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 182 + u32 m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 183 + u32 m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device 184 + u32 m_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device 185 + u32 m_dwIpAddress; 186 + u32 m_dwSubnetMask; 187 + u32 m_dwDefaultGateway; 188 188 u8 m_sHostname[32]; 189 189 u8 m_abVendorSpecificExt2[48]; 190 190 ··· 194 194 unsigned int m_uiNodeId; 195 195 WORD m_wPreqPayloadLimit; // object 0x1F8B: NMT_MNPReqPayloadLimitList_AU16 196 196 WORD m_wPresPayloadLimit; // object 0x1F8D: NMT_PResPayloadLimitList_AU16 197 - DWORD m_dwPresTimeout; // object 0x1F92: NMT_MNCNPResTimeout_AU32 197 + u32 m_dwPresTimeout; // object 0x1F92: NMT_MNCNPResTimeout_AU32 198 198 199 199 } tEplDllNodeInfo; 200 200
+6 -6
drivers/staging/epl/EplDllk.c
··· 122 122 // TracePoint support for realtime-debugging 123 123 #ifdef _DBG_TRACE_POINTS_ 124 124 void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); 125 - void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 125 + void TgtDbgPostTraceValue(u32 dwTraceValue_p); 126 126 #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 127 127 #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 128 128 #else ··· 3154 3154 3155 3155 Exit: 3156 3156 if (Ret != kEplSuccessful) { 3157 - DWORD dwArg; 3157 + u32 dwArg; 3158 3158 3159 3159 BENCHMARK_MOD_02_TOGGLE(9); 3160 3160 ··· 3448 3448 3449 3449 Exit: 3450 3450 if (Ret != kEplSuccessful) { 3451 - DWORD dwArg; 3451 + u32 dwArg; 3452 3452 3453 3453 BENCHMARK_MOD_02_TOGGLE(9); 3454 3454 ··· 3582 3582 3583 3583 Exit: 3584 3584 if (Ret != kEplSuccessful) { 3585 - DWORD dwArg; 3585 + u32 dwArg; 3586 3586 3587 3587 BENCHMARK_MOD_02_TOGGLE(9); 3588 3588 ··· 3638 3638 3639 3639 Exit: 3640 3640 if (Ret != kEplSuccessful) { 3641 - DWORD dwArg; 3641 + u32 dwArg; 3642 3642 3643 3643 BENCHMARK_MOD_02_TOGGLE(9); 3644 3644 ··· 3691 3691 3692 3692 Exit: 3693 3693 if (Ret != kEplSuccessful) { 3694 - DWORD dwArg; 3694 + u32 dwArg; 3695 3695 3696 3696 BENCHMARK_MOD_02_TOGGLE(9); 3697 3697
+12 -12
drivers/staging/epl/EplErrorHandlerk.c
··· 97 97 //--------------------------------------------------------------------------- 98 98 99 99 typedef struct { 100 - DWORD m_dwCumulativeCnt; // subindex 1 101 - DWORD m_dwThresholdCnt; // subindex 2 102 - DWORD m_dwThreshold; // subindex 3 100 + u32 m_dwCumulativeCnt; // subindex 1 101 + u32 m_dwThresholdCnt; // subindex 2 102 + u32 m_dwThreshold; // subindex 3 103 103 104 104 } tEplErrorHandlerkErrorCounter; 105 105 ··· 112 112 #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) 113 113 tEplErrorHandlerkErrorCounter m_MnCrcErr; // object 0x1C00 114 114 tEplErrorHandlerkErrorCounter m_MnCycTimeExceed; // object 0x1C02 115 - DWORD m_adwMnCnLossPresCumCnt[254]; // object 0x1C07 116 - DWORD m_adwMnCnLossPresThrCnt[254]; // object 0x1C08 117 - DWORD m_adwMnCnLossPresThreshold[254]; // object 0x1C09 115 + u32 m_adwMnCnLossPresCumCnt[254]; // object 0x1C07 116 + u32 m_adwMnCnLossPresThrCnt[254]; // object 0x1C08 117 + u32 m_adwMnCnLossPresThreshold[254]; // object 0x1C09 118 118 BOOL m_afMnCnLossPresEvent[254]; 119 119 #endif 120 120 ··· 135 135 unsigned int uiIndex_p); 136 136 137 137 #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) 138 - static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p, 138 + static tEplKernel EplErrorHandlerkLinkArray(u32 * pdwValue_p, 139 139 unsigned int uiValueCount_p, 140 140 unsigned int uiIndex_p); 141 141 #endif ··· 713 713 tEplVarParam VarParam; 714 714 715 715 VarParam.m_pData = &pErrorCounter_p->m_dwCumulativeCnt; 716 - VarParam.m_Size = sizeof(DWORD); 716 + VarParam.m_Size = sizeof(u32); 717 717 VarParam.m_uiIndex = uiIndex_p; 718 718 VarParam.m_uiSubindex = 0x01; 719 719 VarParam.m_ValidFlag = kVarValidAll; ··· 723 723 } 724 724 725 725 VarParam.m_pData = &pErrorCounter_p->m_dwThresholdCnt; 726 - VarParam.m_Size = sizeof(DWORD); 726 + VarParam.m_Size = sizeof(u32); 727 727 VarParam.m_uiIndex = uiIndex_p; 728 728 VarParam.m_uiSubindex = 0x02; 729 729 VarParam.m_ValidFlag = kVarValidAll; ··· 733 733 } 734 734 735 735 VarParam.m_pData = &pErrorCounter_p->m_dwThreshold; 736 - VarParam.m_Size = sizeof(DWORD); 736 + VarParam.m_Size = sizeof(u32); 737 737 VarParam.m_uiIndex = uiIndex_p; 738 738 VarParam.m_uiSubindex = 0x03; 739 739 VarParam.m_ValidFlag = kVarValidAll; ··· 763 763 //--------------------------------------------------------------------------- 764 764 765 765 #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) 766 - static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p, 766 + static tEplKernel EplErrorHandlerkLinkArray(u32 * pdwValue_p, 767 767 unsigned int uiValueCount_p, 768 768 unsigned int uiIndex_p) 769 769 { ··· 786 786 uiValueCount_p = bIndexEntries; 787 787 } 788 788 789 - VarParam.m_Size = sizeof(DWORD); 789 + VarParam.m_Size = sizeof(u32); 790 790 VarParam.m_uiIndex = uiIndex_p; 791 791 VarParam.m_ValidFlag = kVarValidAll; 792 792
+1 -1
drivers/staging/epl/EplEvent.h
··· 249 249 tEplKernel m_EplError; // EPL error which occured 250 250 union { 251 251 u8 m_bArg; 252 - DWORD m_dwArg; 252 + u32 m_dwArg; 253 253 tEplEventSource m_EventSource; // from Eventk/u module (originating error source) 254 254 tEplEventObdError m_ObdError; // from Obd module 255 255 // tEplErrHistoryEntry m_HistoryEntry; // from Nmtk/u module
+1 -1
drivers/staging/epl/EplEventk.c
··· 101 101 // TracePoint support for realtime-debugging 102 102 #ifdef _DBG_TRACE_POINTS_ 103 103 void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); 104 - void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 104 + void TgtDbgPostTraceValue(u32 dwTraceValue_p); 105 105 #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 106 106 #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 107 107 #else
+1 -1
drivers/staging/epl/EplEventu.c
··· 97 97 // TracePoint support for realtime-debugging 98 98 #ifdef _DBG_TRACE_POINTS_ 99 99 void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); 100 - void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 100 + void TgtDbgPostTraceValue(u32 dwTraceValue_p); 101 101 #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 102 102 #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 103 103 #else
+14 -14
drivers/staging/epl/EplFrame.h
··· 214 214 u8 m_le_bIdentRespFlags; // Flags: FW 215 215 u8 m_le_bEplProfileVersion; 216 216 u8 m_le_bRes1; 217 - DWORD m_le_dwFeatureFlags; // NMT_FeatureFlags_U32 217 + u32 m_le_dwFeatureFlags; // NMT_FeatureFlags_U32 218 218 WORD m_le_wMtu; // NMT_CycleTiming_REC.AsyncMTU_U16: C_IP_MIN_MTU - C_IP_MAX_MTU 219 219 WORD m_le_wPollInSize; // NMT_CycleTiming_REC.PReqActPayload_U16 220 220 WORD m_le_wPollOutSize; // NMT_CycleTiming_REC.PResActPayload_U16 221 - DWORD m_le_dwResponseTime; // NMT_CycleTiming_REC.PResMaxLatency_U32 221 + u32 m_le_dwResponseTime; // NMT_CycleTiming_REC.PResMaxLatency_U32 222 222 WORD m_le_wRes2; 223 - DWORD m_le_dwDeviceType; // NMT_DeviceType_U32 224 - DWORD m_le_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 225 - DWORD m_le_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 226 - DWORD m_le_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 227 - DWORD m_le_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 223 + u32 m_le_dwDeviceType; // NMT_DeviceType_U32 224 + u32 m_le_dwVendorId; // NMT_IdentityObject_REC.VendorId_U32 225 + u32 m_le_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 226 + u32 m_le_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 227 + u32 m_le_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 228 228 u64 m_le_qwVendorSpecificExt1; 229 - DWORD m_le_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 230 - DWORD m_le_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 231 - DWORD m_le_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device 232 - DWORD m_le_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device 233 - DWORD m_le_dwIpAddress; 234 - DWORD m_le_dwSubnetMask; 235 - DWORD m_le_dwDefaultGateway; 229 + u32 m_le_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 230 + u32 m_le_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 231 + u32 m_le_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device 232 + u32 m_le_dwApplicationSwTime; // PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device 233 + u32 m_le_dwIpAddress; 234 + u32 m_le_dwSubnetMask; 235 + u32 m_le_dwDefaultGateway; 236 236 u8 m_le_sHostname[32]; 237 237 u8 m_le_abVendorSpecificExt2[48]; 238 238
+2 -2
drivers/staging/epl/EplIdentu.c
··· 386 386 // 387 387 //--------------------------------------------------------------------------- 388 388 389 - EPLDLLEXPORT DWORD EplIdentuGetRunningRequests(void) 389 + EPLDLLEXPORT u32 EplIdentuGetRunningRequests(void) 390 390 { 391 - DWORD dwReqs = 0; 391 + u32 dwReqs = 0; 392 392 unsigned int uiIndex; 393 393 394 394 for (uiIndex = 0; uiIndex < 32; uiIndex++) {
+4 -4
drivers/staging/epl/EplInc.h
··· 140 140 141 141 // IEEE 1588 conformant net time structure 142 142 typedef struct { 143 - DWORD m_dwSec; 144 - DWORD m_dwNanoSec; 143 + u32 m_dwSec; 144 + u32 m_dwNanoSec; 145 145 146 146 } tEplNetTime; 147 147 ··· 154 154 // ------------------------------------------------------------------------- 155 155 156 156 #define EPL_SPEC_VERSION 0x20 // ETHERNET Powerlink V. 2.0 157 - #define EPL_STACK_VERSION(ver,rev,rel) ((((DWORD)(ver)) & 0xFF)|((((DWORD)(rev))&0xFF)<<8)|(((DWORD)(rel))<<16)) 158 - #define EPL_OBJ1018_VERSION(ver,rev,rel) ((((DWORD)(ver))<<16) |(((DWORD)(rev))&0xFFFF)) 157 + #define EPL_STACK_VERSION(ver,rev,rel) ((((u32)(ver)) & 0xFF)|((((u32)(rev))&0xFF)<<8)|(((u32)(rel))<<16)) 158 + #define EPL_OBJ1018_VERSION(ver,rev,rel) ((((u32)(ver))<<16) |(((u32)(rev))&0xFFFF)) 159 159 #define EPL_STRING_VERSION(ver,rev,rel) "V" #ver "." #rev " r" #rel 160 160 161 161 #include "EplVersion.h"
+10 -10
drivers/staging/epl/EplNmtMnu.c
··· 95 95 // TracePoint support for realtime-debugging 96 96 #ifdef _DBG_TRACE_POINTS_ 97 97 void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); 98 - void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 98 + void TgtDbgPostTraceValue(u32 dwTraceValue_p); 99 99 #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 100 100 #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 101 101 #else ··· 211 211 tEplTimerHdl m_TimerHdlStatReq; // timer to delay StatusRequests and IdentRequests 212 212 tEplTimerHdl m_TimerHdlLonger; // 2nd timer for NMT command EnableReadyToOp and CheckCommunication 213 213 tEplNmtMnuNodeState m_NodeState; // internal node state (kind of sub state of NMT state) 214 - DWORD m_dwNodeCfg; // subindex from 0x1F81 214 + u32 m_dwNodeCfg; // subindex from 0x1F81 215 215 WORD m_wFlags; // flags: CN is being accessed isochronously 216 216 217 217 } tEplNmtMnuNodeInfo; ··· 225 225 unsigned long m_ulTimeoutReadyToOp; // in [ms] (object 0x1F89/5) 226 226 unsigned long m_ulTimeoutCheckCom; // in [ms] (object 0x1006 * MultiplexedCycleCount) 227 227 WORD m_wFlags; // global flags 228 - DWORD m_dwNmtStartup; // object 0x1F80 NMT_StartUp_U32 228 + u32 m_dwNmtStartup; // object 0x1F80 NMT_StartUp_U32 229 229 tEplNmtMnuCbNodeEvent m_pfnCbNodeEvent; 230 230 tEplNmtMnuCbBootEvent m_pfnCbBootEvent; 231 231 ··· 673 673 // build the configuration with infos from OD 674 674 case kEplNmtGsResetConfiguration: 675 675 { 676 - DWORD dwTimeout; 676 + u32 dwTimeout; 677 677 tEplObdSize ObdSize; 678 678 679 679 // read object 0x1F80 NMT_StartUp_U32 ··· 785 785 // node processes only async frames 786 786 case kEplNmtMsPreOperational1: 787 787 { 788 - DWORD dwTimeout; 788 + u32 dwTimeout; 789 789 tEplTimerArg TimerArg; 790 790 tEplObdSize ObdSize; 791 791 tEplEvent Event; ··· 1291 1291 // 1292 1292 //--------------------------------------------------------------------------- 1293 1293 /* 1294 - DWORD EplNmtMnuGetRunningTimerStatReq(void) 1294 + u32 EplNmtMnuGetRunningTimerStatReq(void) 1295 1295 { 1296 1296 tEplKernel Ret = kEplSuccessful; 1297 1297 unsigned int uiIndex; ··· 1376 1376 kEplNmtMnuIntNodeEventNoIdentResponse); 1377 1377 } else { // node answered IdentRequest 1378 1378 tEplObdSize ObdSize; 1379 - DWORD dwDevType; 1379 + u32 dwDevType; 1380 1380 WORD wErrorCode = EPL_E_NO_ERROR; 1381 1381 tEplNmtState NmtState = 1382 1382 (tEplNmtState) (AmiGetByteFromLe ··· 1466 1466 tEplKernel Ret = kEplSuccessful; 1467 1467 unsigned int uiSubIndex; 1468 1468 unsigned int uiLocalNodeId; 1469 - DWORD dwNodeCfg; 1469 + u32 dwNodeCfg; 1470 1470 tEplObdSize ObdSize; 1471 1471 1472 1472 // $$$ d.k.: save current time for 0x1F89/2 MNTimeoutPreOp1_U32 ··· 1626 1626 { 1627 1627 tEplKernel Ret = kEplSuccessful; 1628 1628 tEplDllNodeInfo DllNodeInfo; 1629 - DWORD dwNodeCfg; 1629 + u32 dwNodeCfg; 1630 1630 tEplObdSize ObdSize; 1631 1631 tEplTimerArg TimerArg; 1632 1632 ··· 1775 1775 tEplNmtMnuNodeInfo * pNodeInfo_p) 1776 1776 { 1777 1777 tEplKernel Ret = kEplSuccessful; 1778 - DWORD dwNodeCfg; 1778 + u32 dwNodeCfg; 1779 1779 tEplTimerArg TimerArg; 1780 1780 1781 1781 dwNodeCfg = pNodeInfo_p->m_dwNodeCfg;
+1 -1
drivers/staging/epl/EplNmtk.c
··· 89 89 // TracePoint support for realtime-debugging 90 90 #ifdef _DBG_TRACE_POINTS_ 91 91 void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); 92 - void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 92 + void TgtDbgPostTraceValue(u32 dwTraceValue_p); 93 93 #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 94 94 #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 95 95 #else
+3 -3
drivers/staging/epl/EplNmtu.c
··· 382 382 // node listens for EPL-Frames and check timeout 383 383 case kEplNmtCsNotActive: 384 384 { 385 - DWORD dwBuffer; 385 + u32 dwBuffer; 386 386 tEplObdSize ObdSize; 387 387 tEplTimerArg TimerArg; 388 388 ··· 475 475 // node listens for EPL-Frames and check timeout 476 476 case kEplNmtMsNotActive: 477 477 { 478 - DWORD dwBuffer; 478 + u32 dwBuffer; 479 479 tEplObdSize ObdSize; 480 480 tEplTimerArg TimerArg; 481 481 ··· 544 544 // node processes only async frames 545 545 case kEplNmtMsPreOperational1: 546 546 { 547 - DWORD dwBuffer = 0; 547 + u32 dwBuffer = 0; 548 548 tEplObdSize ObdSize; 549 549 tEplTimerArg TimerArg; 550 550
+4 -4
drivers/staging/epl/EplObd.c
··· 1088 1088 case kEplObdTypInt24: 1089 1089 case kEplObdTypUInt24: 1090 1090 { 1091 - AmiSetDword24ToLe(pDstData_p, *((DWORD *) pSrcData)); 1091 + AmiSetDword24ToLe(pDstData_p, *((u32 *) pSrcData)); 1092 1092 break; 1093 1093 } 1094 1094 ··· 1097 1097 case kEplObdTypUInt32: 1098 1098 case kEplObdTypReal32: 1099 1099 { 1100 - AmiSetDwordToLe(pDstData_p, *((DWORD *) pSrcData)); 1100 + AmiSetDwordToLe(pDstData_p, *((u32 *) pSrcData)); 1101 1101 break; 1102 1102 } 1103 1103 ··· 1238 1238 case kEplObdTypInt24: 1239 1239 case kEplObdTypUInt24: 1240 1240 { 1241 - *((DWORD *) pBuffer) = AmiGetDword24FromLe(pSrcData_p); 1241 + *((u32 *) pBuffer) = AmiGetDword24FromLe(pSrcData_p); 1242 1242 break; 1243 1243 } 1244 1244 ··· 1247 1247 case kEplObdTypUInt32: 1248 1248 case kEplObdTypReal32: 1249 1249 { 1250 - *((DWORD *) pBuffer) = AmiGetDwordFromLe(pSrcData_p); 1250 + *((u32 *) pBuffer) = AmiGetDwordFromLe(pSrcData_p); 1251 1251 break; 1252 1252 } 1253 1253
+1 -1
drivers/staging/epl/EplObd.h
··· 370 370 unsigned int m_uiIndex; 371 371 unsigned int m_uiSubIndex; 372 372 void *m_pArg; 373 - DWORD m_dwAbortCode; 373 + u32 m_dwAbortCode; 374 374 375 375 } tEplObdCbParam; 376 376
+1 -1
drivers/staging/epl/EplObdMacro.h
··· 80 80 81 81 // #pragma message ("EPL_OBD_CREATE_ROM_DATA") 82 82 83 - #define EPL_OBD_BEGIN() static DWORD dwObd_OBK_g = 0x0000; 83 + #define EPL_OBD_BEGIN() static u32 dwObd_OBK_g = 0x0000; 84 84 #define EPL_OBD_END() 85 85 86 86 //---------------------------------------------------------------------------------------
+2 -2
drivers/staging/epl/EplPdou.c
··· 160 160 161 161 static tEplKernel EplPdouCheckObjectMapping(u64 qwObjectMapping_p, 162 162 tEplObdAccess AccessType_p, 163 - DWORD * pdwAbortCode_p, 163 + u32 * pdwAbortCode_p, 164 164 unsigned int *puiPdoSize_p); 165 165 166 166 //=========================================================================// ··· 482 482 483 483 static tEplKernel EplPdouCheckObjectMapping(u64 qwObjectMapping_p, 484 484 tEplObdAccess AccessType_p, 485 - DWORD * pdwAbortCode_p, 485 + u32 * pdwAbortCode_p, 486 486 unsigned int *puiPdoSize_p) 487 487 { 488 488 tEplKernel Ret = kEplSuccessful;
+1 -1
drivers/staging/epl/EplSdo.h
··· 207 207 typedef struct { 208 208 tEplSdoComConHdl m_SdoComConHdl; 209 209 tEplSdoComConState m_SdoComConState; 210 - DWORD m_dwAbortCode; 210 + u32 m_dwAbortCode; 211 211 tEplSdoAccessType m_SdoAccessType; 212 212 unsigned int m_uiNodeId; // NodeId of the target 213 213 unsigned int m_uiTargetIndex; // index which was accessed
+1 -1
drivers/staging/epl/EplSdoAsndu.c
··· 321 321 //--------------------------------------------------------------------------- 322 322 tEplKernel EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, 323 323 tEplFrame *pSrcData_p, 324 - DWORD dwDataSize_p) 324 + u32 dwDataSize_p) 325 325 { 326 326 tEplKernel Ret; 327 327 unsigned int uiArray;
+18 -18
drivers/staging/epl/EplSdoComu.c
··· 174 174 // the SDO transfer 175 175 void *m_pUserArg; // user definable argument pointer 176 176 177 - DWORD m_dwLastAbortCode; // save the last abort code 177 + u32 m_dwLastAbortCode; // save the last abort code 178 178 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) 179 179 // only for client 180 180 unsigned int m_uiTargetIndex; // index to access ··· 246 246 tEplAsySdoCom * pAsySdoCom_p); 247 247 248 248 static tEplKernel EplSdoComClientSendAbort(tEplSdoComCon * pSdoComCon_p, 249 - DWORD dwAbortCode_p); 249 + u32 dwAbortCode_p); 250 250 #endif 251 251 252 252 /***************************************************************************/ ··· 747 747 //--------------------------------------------------------------------------- 748 748 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) 749 749 tEplKernel EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, 750 - DWORD dwAbortCode_p) 750 + u32 dwAbortCode_p) 751 751 { 752 752 tEplKernel Ret; 753 753 tEplSdoComCon *pSdoComCon; ··· 1001 1001 u8 bFlag; 1002 1002 1003 1003 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOS)) != 0) 1004 - DWORD dwAbortCode; 1004 + u32 dwAbortCode; 1005 1005 unsigned int uiSize; 1006 1006 #endif 1007 1007 ··· 1666 1666 case kEplSdoComConEventAbort: 1667 1667 { 1668 1668 EplSdoComClientSendAbort(pSdoComCon, 1669 - *((DWORD *) 1669 + *((u32 *) 1670 1670 pSdoComCon-> 1671 1671 m_pData)); 1672 1672 ··· 1674 1674 pSdoComCon->m_bTransactionId++; 1675 1675 // call callback of application 1676 1676 pSdoComCon->m_dwLastAbortCode = 1677 - *((DWORD *) pSdoComCon->m_pData); 1677 + *((u32 *) pSdoComCon->m_pData); 1678 1678 Ret = 1679 1679 EplSdoComTransferFinished 1680 1680 (SdoComCon_p, pSdoComCon, ··· 1868 1868 case kEplSdoComConEventAbort: 1869 1869 { 1870 1870 EplSdoComClientSendAbort(pSdoComCon, 1871 - *((DWORD *) 1871 + *((u32 *) 1872 1872 pSdoComCon-> 1873 1873 m_pData)); 1874 1874 ··· 1879 1879 kEplSdoComStateClientConnected; 1880 1880 // call callback of application 1881 1881 pSdoComCon->m_dwLastAbortCode = 1882 - *((DWORD *) pSdoComCon->m_pData); 1882 + *((u32 *) pSdoComCon->m_pData); 1883 1883 Ret = 1884 1884 EplSdoComTransferFinished 1885 1885 (SdoComCon_p, pSdoComCon, ··· 1964 1964 unsigned int uiSubindex; 1965 1965 tEplObdSize EntrySize; 1966 1966 tEplObdAccess AccessType; 1967 - DWORD dwAbortCode; 1967 + u32 dwAbortCode; 1968 1968 1969 1969 dwAbortCode = 0; 1970 1970 ··· 2323 2323 2324 2324 // copy abortcode to frame 2325 2325 AmiSetDwordToLe(&pCommandFrame->m_le_abCommandData[0], 2326 - *((DWORD *) pSdoComCon_p->m_pData)); 2326 + *((u32 *) pSdoComCon_p->m_pData)); 2327 2327 2328 2328 // set size of segment 2329 2329 AmiSetWordToLe(&pCommandFrame->m_le_wSegmentSize, 2330 - sizeof(DWORD)); 2330 + sizeof(u32)); 2331 2331 2332 2332 // update counter 2333 - pSdoComCon_p->m_uiTransferredByte = sizeof(DWORD); 2333 + pSdoComCon_p->m_uiTransferredByte = sizeof(u32); 2334 2334 pSdoComCon_p->m_uiTransSize = 0; 2335 2335 2336 2336 // calc framesize 2337 - uiSizeOfFrame += sizeof(DWORD); 2337 + uiSizeOfFrame += sizeof(u32); 2338 2338 Ret = EplSdoAsySeqSendData(pSdoComCon_p->m_SdoSeqConHdl, 2339 2339 uiSizeOfFrame, pFrame); 2340 2340 break; ··· 2372 2372 unsigned int uiBytesToTransfer; 2373 2373 tEplObdSize EntrySize; 2374 2374 tEplObdAccess AccessType; 2375 - DWORD dwAbortCode; 2375 + u32 dwAbortCode; 2376 2376 u8 *pbSrcData; 2377 2377 2378 2378 dwAbortCode = 0; ··· 3216 3216 //--------------------------------------------------------------------------- 3217 3217 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOC)) != 0) 3218 3218 static tEplKernel EplSdoComClientSendAbort(tEplSdoComCon * pSdoComCon_p, 3219 - DWORD dwAbortCode_p) 3219 + u32 dwAbortCode_p) 3220 3220 { 3221 3221 tEplKernel Ret; 3222 3222 u8 abFrame[EPL_MAX_SDO_FRAME_SIZE]; ··· 3249 3249 AmiSetDwordToLe(&pCommandFrame->m_le_abCommandData[0], dwAbortCode_p); 3250 3250 3251 3251 // set size of segment 3252 - AmiSetWordToLe(&pCommandFrame->m_le_wSegmentSize, sizeof(DWORD)); 3252 + AmiSetWordToLe(&pCommandFrame->m_le_wSegmentSize, sizeof(u32)); 3253 3253 3254 3254 // update counter 3255 - pSdoComCon_p->m_uiTransferredByte = sizeof(DWORD); 3255 + pSdoComCon_p->m_uiTransferredByte = sizeof(u32); 3256 3256 pSdoComCon_p->m_uiTransSize = 0; 3257 3257 3258 3258 // calc framesize 3259 - uiSizeOfFrame += sizeof(DWORD); 3259 + uiSizeOfFrame += sizeof(u32); 3260 3260 3261 3261 // save abort code 3262 3262 pSdoComCon_p->m_dwLastAbortCode = dwAbortCode_p;
+2 -2
drivers/staging/epl/EplSdoUdpu.c
··· 431 431 // 432 432 //--------------------------------------------------------------------------- 433 433 tEplKernel EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, 434 - tEplFrame *pSrcData_p, DWORD dwDataSize_p) 434 + tEplFrame *pSrcData_p, u32 dwDataSize_p) 435 435 { 436 436 tEplKernel Ret; 437 437 int iError; ··· 536 536 // Parameters: lpParameter = pointer to parameter type tEplSdoUdpThreadPara 537 537 // 538 538 // 539 - // Returns: DWORD = errorcode 539 + // Returns: u32 = errorcode 540 540 // 541 541 // 542 542 // State:
+1 -1
drivers/staging/epl/EplTarget.h
··· 128 128 // currently no Timer functions are needed by EPL stack 129 129 // so they are not implemented yet 130 130 //void TgtTimerInit(void); 131 - //DWORD TgtGetTickCount(void); 131 + //u32 TgtGetTickCount(void); 132 132 //void TgtGetNetTime(tEplNetTime * pNetTime_p); 133 133 134 134 // functions for ethernet driver
+1 -1
drivers/staging/epl/TimerHighReskX86.c
··· 104 104 // TracePoint support for realtime-debugging 105 105 #ifdef _DBG_TRACE_POINTS_ 106 106 void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); 107 - void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 107 + void TgtDbgPostTraceValue(u32 dwTraceValue_p); 108 108 #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) 109 109 #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) 110 110 #else
+18 -18
drivers/staging/epl/amix86.c
··· 84 84 } twStruct; 85 85 86 86 typedef struct { 87 - DWORD m_dwDword; 87 + u32 m_dwDword; 88 88 89 89 } tdwStruct; 90 90 ··· 140 140 141 141 } 142 142 143 - //------------< write DWORD in big endian >------------------------- 143 + //------------< write u32 in big endian >------------------------- 144 144 145 - void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p) 145 + void AmiSetDwordToBe(void *pAddr_p, u32 dwDwordVal_p) 146 146 { 147 147 tdwStruct *pdwStruct; 148 148 tdwStruct dwValue; ··· 194 194 195 195 } 196 196 197 - //------------< write DWORD in little endian >------------------------- 197 + //------------< write u32 in little endian >------------------------- 198 198 199 - void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p) 199 + void AmiSetDwordToLe(void *pAddr_p, u32 dwDwordVal_p) 200 200 { 201 201 tdwStruct *pdwStruct; 202 202 ··· 246 246 247 247 } 248 248 249 - //------------< read DWORD in big endian >-------------------------- 249 + //------------< read u32 in big endian >-------------------------- 250 250 251 - DWORD AmiGetDwordFromBe(void *pAddr_p) 251 + u32 AmiGetDwordFromBe(void *pAddr_p) 252 252 { 253 253 tdwStruct *pdwStruct; 254 254 tdwStruct dwValue; ··· 299 299 return (pwStruct->m_wWord); 300 300 } 301 301 302 - //------------< read DWORD in little endian >-------------------------- 302 + //------------< read u32 in little endian >-------------------------- 303 303 304 - DWORD AmiGetDwordFromLe(void *pAddr_p) 304 + u32 AmiGetDwordFromLe(void *pAddr_p) 305 305 { 306 306 tdwStruct *pdwStruct; 307 307 ··· 324 324 // 325 325 //--------------------------------------------------------------------------- 326 326 327 - void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p) 327 + void AmiSetDword24ToBe(void *pAddr_p, u32 dwDwordVal_p) 328 328 { 329 329 ((u8 *) pAddr_p)[0] = ((u8 *) & dwDwordVal_p)[2]; 330 330 ((u8 *) pAddr_p)[1] = ((u8 *) & dwDwordVal_p)[1]; ··· 346 346 // 347 347 //--------------------------------------------------------------------------- 348 348 349 - void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p) 349 + void AmiSetDword24ToLe(void *pAddr_p, u32 dwDwordVal_p) 350 350 { 351 351 ((u8 *) pAddr_p)[0] = ((u8 *) & dwDwordVal_p)[0]; 352 352 ((u8 *) pAddr_p)[1] = ((u8 *) & dwDwordVal_p)[1]; ··· 361 361 // 362 362 // Parameters: pAddr_p = pointer to source buffer 363 363 // 364 - // Return: DWORD = read value 364 + // Return: u32 = read value 365 365 // 366 366 // State: not tested 367 367 // 368 368 //--------------------------------------------------------------------------- 369 - DWORD AmiGetDword24FromBe(void *pAddr_p) 369 + u32 AmiGetDword24FromBe(void *pAddr_p) 370 370 { 371 371 tdwStruct dwStruct; 372 372 ··· 384 384 // 385 385 // Parameters: pAddr_p = pointer to source buffer 386 386 // 387 - // Return: DWORD = read value 387 + // Return: u32 = read value 388 388 // 389 389 // State: not tested 390 390 // 391 391 //--------------------------------------------------------------------------- 392 - DWORD AmiGetDword24FromLe(void *pAddr_p) 392 + u32 AmiGetDword24FromLe(void *pAddr_p) 393 393 { 394 394 tdwStruct dwStruct; 395 395 ··· 546 546 void AmiSetQword40ToLe(void *pAddr_p, u64 qwQwordVal_p) 547 547 { 548 548 549 - ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; 549 + ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0]; 550 550 ((u8 *) pAddr_p)[4] = ((u8 *) & qwQwordVal_p)[4]; 551 551 552 552 } ··· 648 648 void AmiSetQword48ToLe(void *pAddr_p, u64 qwQwordVal_p) 649 649 { 650 650 651 - ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; 651 + ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0]; 652 652 ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; 653 653 654 654 } ··· 751 751 void AmiSetQword56ToLe(void *pAddr_p, u64 qwQwordVal_p) 752 752 { 753 753 754 - ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; 754 + ((u32 *) pAddr_p)[0] = ((u32 *) & qwQwordVal_p)[0]; 755 755 ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2]; 756 756 ((u8 *) pAddr_p)[6] = ((u8 *) & qwQwordVal_p)[6]; 757 757
+7 -7
drivers/staging/epl/demo_main.c
··· 156 156 u8 bModeSelect_l; // state of the pushbuttons to select the mode 157 157 u8 bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed 158 158 u8 bSpeedSelectOld_l; // old state of the pushbuttons 159 - DWORD dwLeds_l; // current state of all LEDs 159 + u32 dwLeds_l; // current state of all LEDs 160 160 u8 bLedsRow1_l; // current state of the LEDs in row 1 161 161 u8 bLedsRow2_l; // current state of the LEDs in row 2 162 162 u8 abSelect_l[3]; // pushbuttons from CNs 163 163 164 - DWORD dwMode_l; // current mode 164 + u32 dwMode_l; // current mode 165 165 int iCurCycleCount_l; // current cycle count 166 166 int iMaxCycleCount_l; // maximum cycle count (i.e. number of cycles until next light movement step) 167 167 int iToggle; // indicates the light movement direction ··· 171 171 static wait_queue_head_t WaitQueueShutdown_g; // wait queue for tEplNmtEventSwitchOff 172 172 static atomic_t AtomicShutdown_g = ATOMIC_INIT(FALSE); 173 173 174 - static DWORD dw_le_CycleLen_g; 174 + static u32 dw_le_CycleLen_g; 175 175 176 176 static uint uiNodeId_g = EPL_C_ADR_INVALID; 177 177 module_param_named(nodeid, uiNodeId_g, uint, 0); ··· 401 401 402 402 // configure IP address of virtual network interface 403 403 // for TCP/IP communication over the POWERLINK network 404 - sprintf(sBuffer, "%lu.%lu.%lu.%lu", 404 + sprintf(sBuffer, "%u.%u.%u.%u", 405 405 (EplApiInitParam.m_dwIpAddress >> 24), 406 406 ((EplApiInitParam.m_dwIpAddress >> 16) & 0xFF), 407 407 ((EplApiInitParam.m_dwIpAddress >> 8) & 0xFF), ··· 515 515 516 516 case kEplNmtGsResetCommunication: 517 517 { 518 - DWORD dwBuffer; 518 + u32 dwBuffer; 519 519 520 520 // configure OD for MN in state ResetComm after reseting the OD 521 521 // TODO: setup your own network configuration here ··· 677 677 678 678 case kEplEventSourceDllk: 679 679 { // error occured within the data link layer (e.g. interrupt processing) 680 - // the DWORD argument contains the DLL state and the NMT event 681 - printk(" val=%lX\n", 680 + // the u32 argument contains the DLL state and the NMT event 681 + printk(" val=%X\n", 682 682 pEventArg_p->m_InternalError. 683 683 m_Arg.m_dwArg); 684 684 break;
-3
drivers/staging/epl/global.h
··· 29 29 #ifndef WORD 30 30 #define WORD unsigned short int 31 31 #endif 32 - #ifndef DWORD 33 - #define DWORD unsigned long int 34 - #endif 35 32 #ifndef BOOL 36 33 #define BOOL unsigned char 37 34 #endif
+1 -1
drivers/staging/epl/kernel/EplDllk.h
··· 96 96 struct _tEplDllkNodeInfo *m_pNextNodeInfo; 97 97 struct _tEdrvTxBuffer *m_pPreqTxBuffer; 98 98 unsigned int m_uiNodeId; 99 - DWORD m_dwPresTimeout; 99 + u32 m_dwPresTimeout; 100 100 unsigned long m_ulDllErrorEvents; 101 101 tEplNmtState m_NmtState; 102 102 WORD m_wPresPayloadLimit;
+6 -6
drivers/staging/epl/proc_fs.c
··· 129 129 130 130 #ifdef _DBG_TRACE_POINTS_ 131 131 atomic_t aatmDbgTracePoint_l[DBG_TRACE_POINTS]; 132 - DWORD adwDbgTraceValue_l[DBG_TRACE_VALUES]; 133 - DWORD dwDbgTraceValueOld_l; 132 + u32 adwDbgTraceValue_l[DBG_TRACE_VALUES]; 133 + u32 dwDbgTraceValueOld_l; 134 134 unsigned int uiDbgTraceValuePos_l; 135 135 spinlock_t spinlockDbgTraceValue_l; 136 136 unsigned long ulDbTraceValueFlags_l; ··· 146 146 unsigned long count, void *data); 147 147 148 148 void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); 149 - void TgtDbgPostTraceValue(DWORD dwTraceValue_p); 149 + void TgtDbgPostTraceValue(u32 dwTraceValue_p); 150 150 151 - EPLDLLEXPORT DWORD EplIdentuGetRunningRequests(void); 151 + EPLDLLEXPORT u32 EplIdentuGetRunningRequests(void); 152 152 153 153 //=========================================================================// 154 154 // // ··· 207 207 208 208 } 209 209 210 - void TgtDbgPostTraceValue(DWORD dwTraceValue_p) 210 + void TgtDbgPostTraceValue(u32 dwTraceValue_p) 211 211 { 212 212 213 213 spin_lock_irqsave(&spinlockDbgTraceValue_l, ulDbTraceValueFlags_l); ··· 279 279 #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) 280 280 // fetch running IdentRequests 281 281 nSize += snprintf(pcBuffer_p + nSize, nBufferSize_p - nSize, 282 - "running IdentRequests: 0x%08lX\n", 282 + "running IdentRequests: 0x%08X\n", 283 283 EplIdentuGetRunningRequests()); 284 284 285 285 // fetch state of NmtMnu module
+3 -3
drivers/staging/epl/user/EplCfgMau.h
··· 131 131 typedef struct { 132 132 tEplCfgState m_CfgState; // state of the configuration state maschine 133 133 tEplSdoComConHdl m_SdoComConHdl; // handle for sdo connection 134 - DWORD m_dwLastAbortCode; 134 + u32 m_dwLastAbortCode; 135 135 unsigned int m_uiLastIndex; // last index of configuration, to compair with actual index 136 136 u8 *m_pbConcise; // Ptr to concise DCF 137 137 u8 *m_pbActualIndex; // Ptr to actual index in the DCF segment 138 138 tfpEplCfgMaCb m_pfnCfgMaCb; // Ptr to CfgMa Callback, is call if configuration finished 139 139 tEplKernel m_EplKernelError; // errorcode 140 - DWORD m_dwNumValueCopy; // numeric values are copied in this variable 140 + u32 m_dwNumValueCopy; // numeric values are copied in this variable 141 141 unsigned int m_uiPdoNodeId; // buffer for PDO node id 142 142 u8 m_bNrOfMappedObject; // number of mapped objects 143 143 unsigned int m_uiNodeId; // Epl node addresse ··· 145 145 unsigned int m_uiLastSubIndex; // last subindex of configuration 146 146 BOOL m_fOneTranferOk; // atleased one transfer was successful 147 147 u8 m_bEventFlag; // for Eventsignaling to the State Maschine 148 - DWORD m_dwCntObjectInDcf; // number of Objects in DCF 148 + u32 m_dwCntObjectInDcf; // number of Objects in DCF 149 149 tEplCfgMaIndexType m_SkipCfg; // TRUE if a adsitional Configurationprocess 150 150 // have to insert e.g. PDO-mapping 151 151 WORD m_wTimeOutCnt; // Timeout Counter, break configuration is
+1 -1
drivers/staging/epl/user/EplSdoAsndu.h
··· 98 98 99 99 tEplKernel EplSdoAsnduSendData(tEplSdoConHdl SdoConHandle_p, 100 100 tEplFrame *pSrcData_p, 101 - DWORD dwDataSize_p); 101 + u32 dwDataSize_p); 102 102 103 103 tEplKernel EplSdoAsnduDelCon(tEplSdoConHdl SdoConHandle_p); 104 104
+1 -1
drivers/staging/epl/user/EplSdoComu.h
··· 108 108 tEplSdoComFinished *pSdoComFinished_p); 109 109 110 110 tEplKernel EplSdoComSdoAbort(tEplSdoComConHdl SdoComConHdl_p, 111 - DWORD dwAbortCode_p); 111 + u32 dwAbortCode_p); 112 112 113 113 #endif 114 114
+1 -1
drivers/staging/epl/user/EplSdoUdpu.h
··· 99 99 unsigned int uiTargetNodeId_p); 100 100 101 101 tEplKernel EplSdoUdpuSendData(tEplSdoConHdl SdoConHandle_p, 102 - tEplFrame *pSrcData_p, DWORD dwDataSize_p); 102 + tEplFrame *pSrcData_p, u32 dwDataSize_p); 103 103 104 104 tEplKernel EplSdoUdpuDelCon(tEplSdoConHdl SdoConHandle_p); 105 105