···207207typedef struct {208208 tEplSdoComConHdl m_SdoComConHdl;209209 tEplSdoComConState m_SdoComConState;210210- DWORD m_dwAbortCode;210210+ u32 m_dwAbortCode;211211 tEplSdoAccessType m_SdoAccessType;212212 unsigned int m_uiNodeId; // NodeId of the target213213 unsigned int m_uiTargetIndex; // index which was accessed
···128128// currently no Timer functions are needed by EPL stack129129// so they are not implemented yet130130//void TgtTimerInit(void);131131-//DWORD TgtGetTickCount(void);131131+//u32 TgtGetTickCount(void);132132//void TgtGetNetTime(tEplNetTime * pNetTime_p);133133134134// functions for ethernet driver
+1-1
drivers/staging/epl/TimerHighReskX86.c
···104104// TracePoint support for realtime-debugging105105#ifdef _DBG_TRACE_POINTS_106106void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);107107-void TgtDbgPostTraceValue(DWORD dwTraceValue_p);107107+void TgtDbgPostTraceValue(u32 dwTraceValue_p);108108#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)109109#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v)110110#else
···156156u8 bModeSelect_l; // state of the pushbuttons to select the mode157157u8 bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed158158u8 bSpeedSelectOld_l; // old state of the pushbuttons159159-DWORD dwLeds_l; // current state of all LEDs159159+u32 dwLeds_l; // current state of all LEDs160160u8 bLedsRow1_l; // current state of the LEDs in row 1161161u8 bLedsRow2_l; // current state of the LEDs in row 2162162u8 abSelect_l[3]; // pushbuttons from CNs163163164164-DWORD dwMode_l; // current mode164164+u32 dwMode_l; // current mode165165int iCurCycleCount_l; // current cycle count166166int iMaxCycleCount_l; // maximum cycle count (i.e. number of cycles until next light movement step)167167int iToggle; // indicates the light movement direction···171171static wait_queue_head_t WaitQueueShutdown_g; // wait queue for tEplNmtEventSwitchOff172172static atomic_t AtomicShutdown_g = ATOMIC_INIT(FALSE);173173174174-static DWORD dw_le_CycleLen_g;174174+static u32 dw_le_CycleLen_g;175175176176static uint uiNodeId_g = EPL_C_ADR_INVALID;177177module_param_named(nodeid, uiNodeId_g, uint, 0);···401401402402 // configure IP address of virtual network interface403403 // for TCP/IP communication over the POWERLINK network404404- sprintf(sBuffer, "%lu.%lu.%lu.%lu",404404+ sprintf(sBuffer, "%u.%u.%u.%u",405405 (EplApiInitParam.m_dwIpAddress >> 24),406406 ((EplApiInitParam.m_dwIpAddress >> 16) & 0xFF),407407 ((EplApiInitParam.m_dwIpAddress >> 8) & 0xFF),···515515516516 case kEplNmtGsResetCommunication:517517 {518518- DWORD dwBuffer;518518+ u32 dwBuffer;519519520520 // configure OD for MN in state ResetComm after reseting the OD521521 // TODO: setup your own network configuration here···677677678678 case kEplEventSourceDllk:679679 { // error occured within the data link layer (e.g. interrupt processing)680680- // the DWORD argument contains the DLL state and the NMT event681681- printk(" val=%lX\n",680680+ // the u32 argument contains the DLL state and the NMT event681681+ printk(" val=%X\n",682682 pEventArg_p->m_InternalError.683683 m_Arg.m_dwArg);684684 break;
-3
drivers/staging/epl/global.h
···2929#ifndef WORD3030#define WORD unsigned short int3131#endif3232-#ifndef DWORD3333-#define DWORD unsigned long int3434-#endif3532#ifndef BOOL3633#define BOOL unsigned char3734#endif
+1-1
drivers/staging/epl/kernel/EplDllk.h
···9696 struct _tEplDllkNodeInfo *m_pNextNodeInfo;9797 struct _tEdrvTxBuffer *m_pPreqTxBuffer;9898 unsigned int m_uiNodeId;9999- DWORD m_dwPresTimeout;9999+ u32 m_dwPresTimeout;100100 unsigned long m_ulDllErrorEvents;101101 tEplNmtState m_NmtState;102102 WORD m_wPresPayloadLimit;
···131131typedef struct {132132 tEplCfgState m_CfgState; // state of the configuration state maschine133133 tEplSdoComConHdl m_SdoComConHdl; // handle for sdo connection134134- DWORD m_dwLastAbortCode;134134+ u32 m_dwLastAbortCode;135135 unsigned int m_uiLastIndex; // last index of configuration, to compair with actual index136136 u8 *m_pbConcise; // Ptr to concise DCF137137 u8 *m_pbActualIndex; // Ptr to actual index in the DCF segment138138 tfpEplCfgMaCb m_pfnCfgMaCb; // Ptr to CfgMa Callback, is call if configuration finished139139 tEplKernel m_EplKernelError; // errorcode140140- DWORD m_dwNumValueCopy; // numeric values are copied in this variable140140+ u32 m_dwNumValueCopy; // numeric values are copied in this variable141141 unsigned int m_uiPdoNodeId; // buffer for PDO node id142142 u8 m_bNrOfMappedObject; // number of mapped objects143143 unsigned int m_uiNodeId; // Epl node addresse···145145 unsigned int m_uiLastSubIndex; // last subindex of configuration146146 BOOL m_fOneTranferOk; // atleased one transfer was successful147147 u8 m_bEventFlag; // for Eventsignaling to the State Maschine148148- DWORD m_dwCntObjectInDcf; // number of Objects in DCF148148+ u32 m_dwCntObjectInDcf; // number of Objects in DCF149149 tEplCfgMaIndexType m_SkipCfg; // TRUE if a adsitional Configurationprocess150150 // have to insert e.g. PDO-mapping151151 WORD m_wTimeOutCnt; // Timeout Counter, break configuration is