···634634extern "C" {635635#endif636636637637- void DumpData(char *szStr_p, BYTE *pbData_p, WORD wSize_p);637637+ void DumpData(char *szStr_p, u8 *pbData_p, WORD wSize_p);638638639639#ifdef __cplusplus640640} // von extern "C"641641#endif642642#define DEBUG_DUMP_DATA(lvl,str,ptr,siz) if ((DEBUG_GLB_LVL() & (lvl))==(lvl)) \643643- DumpData (str, (BYTE *)(ptr), (WORD)(siz));643643+ DumpData (str, (u8 *)(ptr), (WORD)(siz));644644#else645645646646#define DEBUG_DUMP_DATA(lvl,str,ptr,siz)
+14-14
drivers/staging/epl/Edrv8139.c
···234234235235// TracePoint support for realtime-debugging236236#ifdef _DBG_TRACE_POINTS_237237-void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p);237237+void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);238238void TgtDbgPostTraceValue(DWORD dwTraceValue_p);239239#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)240240#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v)···282282typedef struct {283283 struct pci_dev *m_pPciDev; // pointer to PCI device structure284284 void *m_pIoAddr; // pointer to register space of Ethernet controller285285- BYTE *m_pbRxBuf; // pointer to Rx buffer285285+ u8 *m_pbRxBuf; // pointer to Rx buffer286286 dma_addr_t m_pRxBufDma;287287- BYTE *m_pbTxBuf; // pointer to Tx buffer287287+ u8 *m_pbTxBuf; // pointer to Tx buffer288288 dma_addr_t m_pTxBufDma;289289 BOOL m_afTxBufUsed[EDRV_MAX_TX_BUFFERS];290290 unsigned int m_uiCurTxDesc;···359359// local function prototypes360360//---------------------------------------------------------------------------361361362362-static BYTE EdrvCalcHash(BYTE * pbMAC_p);362362+static u8 EdrvCalcHash(u8 * pbMAC_p);363363364364//---------------------------------------------------------------------------365365//···453453// State:454454//455455//---------------------------------------------------------------------------456456-tEplKernel EdrvDefineRxMacAddrEntry(BYTE * pbMacAddr_p)456456+tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p)457457{458458 tEplKernel Ret = kEplSuccessful;459459 DWORD dwData;460460- BYTE bHash;460460+ u8 bHash;461461462462 bHash = EdrvCalcHash(pbMacAddr_p);463463/*···494494// State:495495//496496//---------------------------------------------------------------------------497497-tEplKernel EdrvUndefineRxMacAddrEntry(BYTE * pbMacAddr_p)497497+tEplKernel EdrvUndefineRxMacAddrEntry(u8 * pbMacAddr_p)498498{499499 tEplKernel Ret = kEplSuccessful;500500 DWORD dwData;501501- BYTE bHash;501501+ u8 bHash;502502503503 bHash = EdrvCalcHash(pbMacAddr_p);504504···720720//---------------------------------------------------------------------------721721static void EdrvReinitRx(void)722722{723723- BYTE bCmd;723723+ u8 bCmd;724724725725 // simply switch off and on the receiver726726 // this will reset the CAPR register···765765 DWORD dwTxStatus;766766 DWORD dwRxStatus;767767 WORD wCurRx;768768- BYTE *pbRxBuf;768768+ u8 *pbRxBuf;769769 unsigned int uiLength;770770 int iHandled = IRQ_HANDLED;771771···12151215//#define CRC32_POLY 0xEDB88320 //12161216// G(x) = x32 + x26 + x23 + x22 + x16 + x12 + x11 + x10 + x8 + x7 + x5 + x4 + x2 + x + 11217121712181218-static BYTE EdrvCalcHash(BYTE * pbMAC_p)12181218+static u8 EdrvCalcHash(u8 * pbMAC_p)12191219{12201220 DWORD dwByteCounter;12211221 DWORD dwBitCounter;12221222 DWORD dwData;12231223 DWORD dwCrc;12241224 DWORD dwCarry;12251225- BYTE *pbData;12261226- BYTE bHash;12251225+ u8 *pbData;12261226+ u8 bHash;1227122712281228 pbData = pbMAC_p;12291229···12461246// printk("MyCRC = 0x%08lX\n", dwCrc);12471247 // only upper 6 bits (HASH_BITS) are used12481248 // which point to specific bit in the hash registers12491249- bHash = (BYTE) ((dwCrc >> (32 - HASH_BITS)) & 0x3f);12491249+ bHash = (u8) ((dwCrc >> (32 - HASH_BITS)) & 0x3f);1250125012511251 return bHash;12521252}
+1-1
drivers/staging/epl/EdrvFec.h
···9898typedef struct {9999 WORD m_wStatus; // control / status --- used by edrv, do not change in application100100 WORD m_wLength; // transfer length101101- BYTE *m_pbData; // buffer address101101+ u8 *m_pbData; // buffer address102102} tBufferDescr;103103104104#if ((TARGET_HARDWARE & TGT_CPU_MASK_) == TGT_CPU_5282)
+1-1
drivers/staging/epl/EdrvSim.h
···8383// function prototypes8484//---------------------------------------------------------------------------85858686-void EdrvRxInterruptHandler(BYTE bBufferInFrame_p, BYTE * pbEthernetData_p,8686+void EdrvRxInterruptHandler(u8 bBufferInFrame_p, u8 * pbEthernetData_p,8787 WORD wDataLen_p);88888989#endif // #ifndef _EDRVSIM_H_
+3-3
drivers/staging/epl/Epl.h
···139139 unsigned int m_uiSizeOfStruct;140140 BOOL m_fAsyncOnly; // do not need to register PRes141141 unsigned int m_uiNodeId; // local node ID142142- BYTE m_abMacAddress[6]; // local MAC address142142+ u8 m_abMacAddress[6]; // local MAC address143143144144 // 0x1F82: NMT_FeatureFlags_U32145145 DWORD m_dwFeatureFlags;···189189 DWORD m_dwIpAddress;190190 DWORD m_dwSubnetMask;191191 DWORD m_dwDefaultGateway;192192- BYTE m_sHostname[32];193193- BYTE m_abVendorSpecificExt2[48];192192+ u8 m_sHostname[32];193193+ u8 m_abVendorSpecificExt2[48];194194195195 char *m_pszDevName; // NMT_ManufactDevName_VS (0x1008/0 local OD)196196 char *m_pszHwVersion; // NMT_ManufactHwVers_VS (0x1009/0 local OD)
+7-7
drivers/staging/epl/EplAmi.h
···69697070 16.09.2002 -as7171 To save code space the functions AmiSetByte and AmiGetByte7272- are replaced by macros. For targets which assign BYTE by7272+ are replaced by macros. For targets which assign u8 by7373 an 16Bit type, the definition of macros must changed to7474 functions.7575···105105//106106// To save code space the function AmiSetByte is replaced by107107// an macro.108108-// void AmiSetByte (void * pAddr_p, BYTE bByteVal_p);108108+// void AmiSetByte (void * pAddr_p, u8 bByteVal_p);109109110110-#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(BYTE *)(pAddr_p) = (bByteVal_p);}111111-#define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(BYTE *)(pAddr_p) = (bByteVal_p);}110110+#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);}111111+#define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(u8 *)(pAddr_p) = (bByteVal_p);}112112113113void AmiSetWordToBe(void *pAddr_p, WORD wWordVal_p);114114void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p);···121121//122122// To save code space the function AmiGetByte is replaced by123123// an macro.124124-// BYTE AmiGetByte (void * pAddr_p);124124+// u8 AmiGetByte (void * pAddr_p);125125126126-#define AmiGetByteFromBe(pAddr_p) (*(BYTE *)(pAddr_p))127127-#define AmiGetByteFromLe(pAddr_p) (*(BYTE *)(pAddr_p))126126+#define AmiGetByteFromBe(pAddr_p) (*(u8 *)(pAddr_p))127127+#define AmiGetByteFromLe(pAddr_p) (*(u8 *)(pAddr_p))128128129129WORD AmiGetWordFromBe(void *pAddr_p);130130DWORD AmiGetDwordFromBe(void *pAddr_p);
+16-16
drivers/staging/epl/EplApiGeneric.c
···556556 tEplObdSize *pEntrySize_p,557557 unsigned int uiFirstSubindex_p)558558{559559- BYTE bVarEntries;560560- BYTE bIndexEntries;561561- BYTE *pbData;559559+ u8 bVarEntries;560560+ u8 bIndexEntries;561561+ u8 *pbData;562562 unsigned int uiSubindex;563563 tEplVarParam VarParam;564564 tEplObdSize EntrySize;···574574 goto Exit;575575 }576576577577- pbData = (BYTE *)pVar_p;578578- bVarEntries = (BYTE) * puiVarEntries_p;577577+ pbData = (u8 *)pVar_p;578578+ bVarEntries = (u8) * puiVarEntries_p;579579 UsedSize = 0;580580581581 // init VarParam structure with default values···607607 // object actually has.608608 if ((bIndexEntries > (bVarEntries + uiFirstSubindex_p - 1)) &&609609 (bVarEntries != 0x00)) {610610- bIndexEntries = (BYTE) (bVarEntries + uiFirstSubindex_p - 1);610610+ bIndexEntries = (u8) (bVarEntries + uiFirstSubindex_p - 1);611611 }612612 // map entries613613 for (uiSubindex = uiFirstSubindex_p; uiSubindex <= bIndexEntries;···10121012 case 0x1F9E: // NMT_ResetCmd_U810131013 {10141014 if (pParam_p->m_ObdEvent == kEplObdEvPreWrite) {10151015- BYTE bNmtCommand;10151015+ u8 bNmtCommand;1016101610171017- bNmtCommand = *((BYTE *) pParam_p->m_pArg);10171017+ bNmtCommand = *((u8 *) pParam_p->m_pArg);10181018 // check value range10191019 switch ((tEplNmtCommand) bNmtCommand) {10201020 case kEplNmtCmdResetNode:···10321032 break;10331033 }10341034 } else if (pParam_p->m_ObdEvent == kEplObdEvPostWrite) {10351035- BYTE bNmtCommand;10351035+ u8 bNmtCommand;1036103610371037- bNmtCommand = *((BYTE *) pParam_p->m_pArg);10371037+ bNmtCommand = *((u8 *) pParam_p->m_pArg);10381038 // check value range10391039 switch ((tEplNmtCommand) bNmtCommand) {10401040 case kEplNmtCmdResetNode:···11871187static tEplKernel EplApiCbNmtStateChange(tEplEventNmtStateChange NmtStateChange_p)11881188{11891189 tEplKernel Ret = kEplSuccessful;11901190- BYTE bNmtState;11901190+ u8 bNmtState;11911191 tEplApiEventArg EventArg;1192119211931193 // save NMT state in OD11941194- bNmtState = (BYTE) NmtStateChange_p.m_NewNmtState;11941194+ bNmtState = (u8) NmtStateChange_p.m_NewNmtState;11951195 Ret = EplObdWriteEntry(0x1F8C, 0, &bNmtState, 1);11961196 if (Ret != kEplSuccessful) {11971197 goto Exit;···12701270 case kEplNmtCsNotActive:12711271 {12721272 // indicate completion of reset in NMT_ResetCmd_U812731273- bNmtState = (BYTE) kEplNmtCmdInvalidService;12731273+ bNmtState = (u8) kEplNmtCmdInvalidService;12741274 Ret = EplObdWriteEntry(0x1F9E, 0, &bNmtState, 1);12751275 if (Ret != kEplSuccessful) {12761276 goto Exit;···14131413 tEplDllIdentParam DllIdentParam;14141414 tEplObdSize ObdSize;14151415 WORD wTemp;14161416- BYTE bTemp;14161416+ u8 bTemp;1417141714181418 // configure Dll14191419 EPL_MEMSET(&DllConfigParam, 0, sizeof(DllConfigParam));···16331633{16341634 tEplKernel Ret = kEplSuccessful;16351635 WORD wTemp;16361636- BYTE bTemp;16361636+ u8 bTemp;1637163716381638 // set node id in OD16391639 Ret = EplObdSetNodeId(EplApiInstance_g.m_InitParam.m_uiNodeId, // node id···17301730 }*/1731173117321732 if (EplApiInstance_g.m_InitParam.m_uiMultiplCycleCnt <= 0xFF) {17331733- bTemp = (BYTE) EplApiInstance_g.m_InitParam.m_uiMultiplCycleCnt;17331733+ bTemp = (u8) EplApiInstance_g.m_InitParam.m_uiMultiplCycleCnt;17341734 Ret = EplObdWriteEntry(0x1F98, 7, &bTemp, 1);17351735/* if(Ret != kEplSuccessful)17361736 {
+1-1
drivers/staging/epl/EplApiLinuxKernel.c
···139139140140// TracePoint support for realtime-debugging141141#ifdef _DBG_TRACE_POINTS_142142-void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p);142142+void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);143143#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)144144#else145145#define TGT_DBG_SIGNAL_TRACE_POINT(p)
···7171#ifndef _EPLINSTDEF_H_7272#define _EPLINSTDEF_H_73737474+#include <linux/kernel.h>7575+7476// =========================================================================7577// types and macros for generating instances7678// =========================================================================···8684//------------------------------------------------------------------------------------------87858886typedef void *tEplPtrInstance;8989-typedef BYTE tEplInstanceHdl;8787+typedef u8 tEplInstanceHdl;90889189// define const for illegale values9290#define CCM_ILLINSTANCE NULL···216214 tFastByte InstNumber = 0; \217215 tFastByte i = EPL_MAX_INSTANCES; \218216 do { \219219- pInstance->m_InstState = (BYTE) kStateUnused; \220220- pInstance->m_bInstIndex = (BYTE) InstNumber; \217217+ pInstance->m_InstState = (u8) kStateUnused; \218218+ pInstance->m_bInstIndex = (u8) InstNumber; \221219 pInstance++; InstNumber++; i--; \222220 } while (i != 0); \223221 }···245243 // this macro defines member variables in instance table which are needed in246244 // all modules of Epl stack247245#define EPL_MCO_DECL_INSTANCE_MEMBER() \248248- STATIC BYTE m_InstState; \249249- STATIC BYTE m_bInstIndex;246246+ STATIC u8 m_InstState; \247247+ STATIC u8 m_bInstIndex;250248251249#define EPL_MCO_INSTANCE_PARAM_IDX_() EPL_MCO_INSTANCE_PARAM_ (EPL_MCO_GLB_VAR (m_bInstIndex))252250#define EPL_MCO_INSTANCE_PARAM_IDX() EPL_MCO_INSTANCE_PARAM (EPL_MCO_GLB_VAR (m_bInstIndex))
+10-10
drivers/staging/epl/EplNmtCnu.c
···108108109109static tEplNmtCommand EplNmtCnuGetNmtCommand(tEplFrameInfo * pFrameInfo_p);110110111111-static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p);111111+static BOOL EplNmtCnuNodeIdList(u8 * pbNmtCommandDate_p);112112113113static tEplKernel EplNmtCnuCommandCb(tEplFrameInfo *pFrameInfo_p);114114···248248 EPL_MEMSET(&NmtRequestFrame.m_be_abSrcMac[0], 0x00, sizeof(NmtRequestFrame.m_be_abSrcMac)); // set by DLL249249 AmiSetWordToBe(&NmtRequestFrame.m_be_wEtherType,250250 EPL_C_DLL_ETHERTYPE_EPL);251251- AmiSetByteToLe(&NmtRequestFrame.m_le_bDstNodeId, (BYTE) EPL_C_ADR_MN_DEF_NODE_ID); // node id of the MN251251+ AmiSetByteToLe(&NmtRequestFrame.m_le_bDstNodeId, (u8) EPL_C_ADR_MN_DEF_NODE_ID); // node id of the MN252252 AmiSetByteToLe(&NmtRequestFrame.m_le_bMessageType,253253- (BYTE) kEplMsgTypeAsnd);253253+ (u8) kEplMsgTypeAsnd);254254 AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_le_bServiceId,255255- (BYTE) kEplDllAsndNmtRequest);255255+ (u8) kEplDllAsndNmtRequest);256256 AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.257257 m_NmtRequestService.m_le_bNmtCommandId,258258- (BYTE) NmtCommand_p);259259- AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService.m_le_bTargetNodeId, (BYTE) uiNodeId_p); // target for the nmt command258258+ (u8) NmtCommand_p);259259+ AmiSetByteToLe(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService.m_le_bTargetNodeId, (u8) uiNodeId_p); // target for the nmt command260260 EPL_MEMSET(&NmtRequestFrame.m_Data.m_Asnd.m_Payload.m_NmtRequestService.261261 m_le_abNmtCommandData[0], 0x00,262262 sizeof(NmtRequestFrame.m_Data.m_Asnd.m_Payload.···673673// State:674674//675675//---------------------------------------------------------------------------676676-static BOOL EplNmtCnuNodeIdList(BYTE * pbNmtCommandDate_p)676676+static BOOL EplNmtCnuNodeIdList(u8 * pbNmtCommandDate_p)677677{678678 BOOL fNodeIdInList;679679 unsigned int uiByteOffset;680680- BYTE bBitOffset;681681- BYTE bNodeListByte;680680+ u8 bBitOffset;681681+ u8 bNodeListByte;682682683683 // get byte-offset of the own nodeid in NodeIdList684684 // devide though 8685685 uiByteOffset = (unsigned int)(EplNmtCnuInstance_g.m_uiNodeId >> 3);686686 // get bitoffset687687- bBitOffset = (BYTE) EplNmtCnuInstance_g.m_uiNodeId % 8;687687+ bBitOffset = (u8) EplNmtCnuInstance_g.m_uiNodeId % 8;688688689689 bNodeListByte = AmiGetByteFromLe(&pbNmtCommandDate_p[uiByteOffset]);690690 if ((bNodeListByte & bBitOffset) == 0) {
+21-21
drivers/staging/epl/EplNmtMnu.c
···94949595// TracePoint support for realtime-debugging9696#ifdef _DBG_TRACE_POINTS_9797-void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p);9797+void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);9898void TgtDbgPostTraceValue(DWORD dwTraceValue_p);9999#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)100100#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v)···417417{418418 tEplKernel Ret = kEplSuccessful;419419 tEplFrameInfo FrameInfo;420420- BYTE abBuffer[EPL_C_DLL_MINSIZE_NMTCMDEXT];420420+ u8 abBuffer[EPL_C_DLL_MINSIZE_NMTCMDEXT];421421 tEplFrame *pFrame = (tEplFrame *) abBuffer;422422 BOOL fSoftDeleteNode = FALSE;423423···437437438438 // build frame439439 EPL_MEMSET(pFrame, 0x00, sizeof(abBuffer));440440- AmiSetByteToLe(&pFrame->m_le_bDstNodeId, (BYTE) uiNodeId_p);440440+ AmiSetByteToLe(&pFrame->m_le_bDstNodeId, (u8) uiNodeId_p);441441 AmiSetByteToLe(&pFrame->m_Data.m_Asnd.m_le_bServiceId,442442- (BYTE) kEplDllAsndNmtCommand);442442+ (u8) kEplDllAsndNmtCommand);443443 AmiSetByteToLe(&pFrame->m_Data.m_Asnd.m_Payload.m_NmtCommandService.444444- m_le_bNmtCommandId, (BYTE) NmtCommand_p);444444+ m_le_bNmtCommandId, (u8) NmtCommand_p);445445 if ((pNmtCommandData_p != NULL) && (uiDataSize_p > 0)) { // copy command data to frame446446 EPL_MEMCPY(&pFrame->m_Data.m_Asnd.m_Payload.m_NmtCommandService.447447 m_le_abNmtCommandData[0], pNmtCommandData_p,···572572 tEplKernel Ret = kEplSuccessful;573573 tEplNmtMnuIntNodeEvent NodeEvent;574574 tEplObdSize ObdSize;575575- BYTE bNmtState;575575+ u8 bNmtState;576576 WORD wErrorCode = EPL_E_NO_ERROR;577577578578 if ((uiNodeId_p == 0) || (uiNodeId_p >= EPL_C_ADR_BROADCAST)) {···967967 EPL_NMTMNU_TIMERARG_NODE_MASK);968968 if (uiNodeId != 0) {969969 tEplObdSize ObdSize;970970- BYTE bNmtState;970970+ u8 bNmtState;971971 tEplNmtMnuNodeInfo *pNodeInfo;972972973973 pNodeInfo = EPL_NMTMNU_GET_NODEINFO(uiNodeId);···11471147 tEplFrame *pFrame = (tEplFrame *) pEvent_p->m_pArg;11481148 unsigned int uiNodeId;11491149 tEplNmtCommand NmtCommand;11501150- BYTE bNmtState;11501150+ u8 bNmtState;1151115111521152 uiNodeId = AmiGetByteFromLe(&pFrame->m_le_bDstNodeId);11531153 NmtCommand =···11591159 switch (NmtCommand) {11601160 case kEplNmtCmdStartNode:11611161 bNmtState =11621162- (BYTE) (kEplNmtCsOperational & 0xFF);11621162+ (u8) (kEplNmtCsOperational & 0xFF);11631163 break;1164116411651165 case kEplNmtCmdStopNode:11661166- bNmtState = (BYTE) (kEplNmtCsStopped & 0xFF);11661166+ bNmtState = (u8) (kEplNmtCsStopped & 0xFF);11671167 break;1168116811691169 case kEplNmtCmdEnterPreOperational2:11701170 bNmtState =11711171- (BYTE) (kEplNmtCsPreOperational2 & 0xFF);11711171+ (u8) (kEplNmtCsPreOperational2 & 0xFF);11721172 break;1173117311741174 case kEplNmtCmdEnableReadyToOperate:11751175 // d.k. do not change expected node state, because of DS 1.0.0 7.3.1.2.1 Plain NMT State Command11761176 // and because node may not change NMT state within EPL_C_NMT_STATE_TOLERANCE11771177 bNmtState =11781178- (BYTE) (kEplNmtCsPreOperational2 & 0xFF);11781178+ (u8) (kEplNmtCsPreOperational2 & 0xFF);11791179 break;1180118011811181 case kEplNmtCmdResetNode:11821182 case kEplNmtCmdResetCommunication:11831183 case kEplNmtCmdResetConfiguration:11841184 case kEplNmtCmdSwReset:11851185- bNmtState = (BYTE) (kEplNmtCsNotActive & 0xFF);11851185+ bNmtState = (u8) (kEplNmtCsNotActive & 0xFF);11861186 // EplNmtMnuProcessInternalEvent() sets internal node state to kEplNmtMnuNodeStateUnknown11871187 // after next unresponded IdentRequest/StatusRequest11881188 break;···19271927 switch (NodeEvent_p) {19281928 case kEplNmtMnuIntNodeEventIdentResponse:19291929 {19301930- BYTE bNmtState;19301930+ u8 bNmtState;1931193119321932 EPL_NMTMNU_DBG_POST_TRACE_VALUE(NodeEvent_p,19331933 uiNodeId_p,···19541954 ~EPL_NMTMNU_NODE_FLAG_NOT_SCANNED;19551955 }19561956 // update object 0x1F8F NMT_MNNodeExpState_AU8 to PreOp1 (even if local state >= PreOp2)19571957- bNmtState = (BYTE) (kEplNmtCsPreOperational1 & 0xFF);19571957+ bNmtState = (u8) (kEplNmtCsPreOperational1 & 0xFF);19581958 Ret =19591959 EplObduWriteEntry(0x1F8F, uiNodeId_p, &bNmtState,19601960 1);···2434243424352435 case kEplNmtMnuIntNodeEventNmtCmdSent:24362436 {24372437- BYTE bNmtState;24372437+ u8 bNmtState;2438243824392439 // update expected NMT state with the one that results24402440 // from the sent NMT command24412441- bNmtState = (BYTE) (NodeNmtState_p & 0xFF);24412441+ bNmtState = (u8) (NodeNmtState_p & 0xFF);2442244224432443 // write object 0x1F8F NMT_MNNodeExpState_AU824442444 Ret =···26282628{26292629 tEplKernel Ret = kEplSuccessful;26302630 tEplObdSize ObdSize;26312631- BYTE bNmtState;26322632- BYTE bNmtStatePrev;26312631+ u8 bNmtState;26322632+ u8 bNmtStatePrev;26332633 tEplNmtState ExpNmtState;2634263426352635 ObdSize = 1;···26402640 }26412641 // compute expected NMT state26422642 ExpNmtState = (tEplNmtState) (bNmtState | EPL_NMT_TYPE_CS);26432643- // compute BYTE of current NMT state26442644- bNmtState = ((BYTE) NodeNmtState_p & 0xFF);26432643+ // compute u8 of current NMT state26442644+ bNmtState = ((u8) NodeNmtState_p & 0xFF);2645264526462646 if (ExpNmtState == kEplNmtCsNotActive) { // ignore the current state, because the CN shall be not active26472647 Ret = kEplReject;
+1-1
drivers/staging/epl/EplNmtk.c
···88888989// TracePoint support for realtime-debugging9090#ifdef _DBG_TRACE_POINTS_9191-void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p);9191+void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);9292void TgtDbgPostTraceValue(DWORD dwTraceValue_p);9393#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)9494#define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v)
+20-20
drivers/staging/epl/EplObd.c
···123123124124EPL_MCO_DECL_INSTANCE_VAR()125125126126-BYTE abEplObdTrashObject_g[8];126126+u8 abEplObdTrashObject_g[8];127127128128//---------------------------------------------------------------------------129129// local function prototypes···833833{834834 tEplKernel Ret;835835 tEplObdSize ObdSize;836836- BYTE bNodeId;836836+ u8 bNodeId;837837838838 bNodeId = 0;839839 ObdSize = sizeof(bNodeId);···871871{872872 tEplKernel Ret;873873 tEplObdSize ObdSize;874874- BYTE fHwBool;875875- BYTE bNodeId;874874+ u8 fHwBool;875875+ u8 bNodeId;876876877877 // check Node Id878878 if (uiNodeId_p == EPL_C_ADR_INVALID) {879879 Ret = kEplInvalidNodeId;880880 goto Exit;881881 }882882- bNodeId = (BYTE) uiNodeId_p;883883- ObdSize = sizeof(BYTE);882882+ bNodeId = (u8) uiNodeId_p;883883+ ObdSize = sizeof(u8);884884 // write NodeId to OD entry885885 Ret = EplObdWriteEntry(EPL_MCO_PTR_INSTANCE_PTR_886886 EPL_OBD_NODE_ID_INDEX,···10721072 case kEplObdTypInt8:10731073 case kEplObdTypUInt8:10741074 {10751075- AmiSetByteToLe(pDstData_p, *((BYTE *) pSrcData));10751075+ AmiSetByteToLe(pDstData_p, *((u8 *) pSrcData));10761076 break;10771077 }10781078···12221222 case kEplObdTypInt8:12231223 case kEplObdTypUInt8:12241224 {12251225- *((BYTE *) pBuffer) = AmiGetByteFromLe(pSrcData_p);12251225+ *((u8 *) pBuffer) = AmiGetByteFromLe(pSrcData_p);12261226 break;12271227 }12281228···15031503{1504150415051505 tEplObdSize StrLen = 0;15061506- BYTE *pbString;15061506+ u8 *pbString;1507150715081508 if (pObjData_p == NULL) {15091509 goto Exit;···20942094// Function: EplObdGetObjectSize()20952095//20962096// Description: function to get size of object20972097-// The function determines if an object type an fixed data type (BYTE, WORD, ...)20972097+// The function determines if an object type an fixed data type (u8, WORD, ...)20982098// or non fixed object (string, domain). This information is used to decide20992099// if download data are stored temporary or not. For objects with fixed data length21002100// and types a value range checking can process.···24632463 } else {24642464 Size = EplObdGetObjectSize(pSubIndexEntry_p);24652465 }24662466- pData = ((BYTE *) pData) + (Size * uiArrayIndex);24662466+ pData = ((u8 *) pData) + (Size * uiArrayIndex);24672467 }24682468 // check if VarEntry24692469 if ((pSubIndexEntry_p->m_Access & kEplObdAccVar) != 0) {···27722772 Ret = kEplSuccessful;2773277327742774 // prepare structure for STORE RESTORE callback function27752775- CbStore.m_bCurrentOdPart = (BYTE) CurrentOdPart_p;27752775+ CbStore.m_bCurrentOdPart = (u8) CurrentOdPart_p;27762776 CbStore.m_pData = NULL;27772777 CbStore.m_ObjSize = 0;2778277827792779 // command of first action depends on direction to access27802780#if (EPL_OBD_USE_STORE_RESTORE != FALSE)27812781 if (Direction_p == kEplObdDirLoad) {27822782- CbStore.m_bCommand = (BYTE) kEplObdCommOpenRead;27822782+ CbStore.m_bCommand = (u8) kEplObdCommOpenRead;2783278327842784 // call callback function for previous command27852785 Ret = EplObdCallStoreCallback(EPL_MCO_INSTANCE_PTR_ & CbStore);···27872787 goto Exit;27882788 }27892789 // set command for index and subindex loop27902790- CbStore.m_bCommand = (BYTE) kEplObdCommReadObj;27902790+ CbStore.m_bCommand = (u8) kEplObdCommReadObj;27912791 } else if (Direction_p == kEplObdDirStore) {27922792- CbStore.m_bCommand = (BYTE) kEplObdCommOpenWrite;27922792+ CbStore.m_bCommand = (u8) kEplObdCommOpenWrite;2793279327942794 // call callback function for previous command27952795 Ret = EplObdCallStoreCallback(EPL_MCO_INSTANCE_PTR_ & CbStore);···27972797 goto Exit;27982798 }27992799 // set command for index and subindex loop28002800- CbStore.m_bCommand = (BYTE) kEplObdCommWriteObj;28002800+ CbStore.m_bCommand = (u8) kEplObdCommWriteObj;28012801 }28022802#endif // (EPL_OBD_USE_STORE_RESTORE != FALSE)28032803···28482848 }28492849 else28502850 {28512851- EplObdInitVarEntry ((tEplObdVarEntry *) (((BYTE *) pSubIndex->m_pCurrent) + (sizeof (tEplObdVarEntry) * pSubIndex->m_uiSubIndex)),28512851+ EplObdInitVarEntry ((tEplObdVarEntry *) (((u8 *) pSubIndex->m_pCurrent) + (sizeof (tEplObdVarEntry) * pSubIndex->m_uiSubIndex)),28522852 pSubIndex->m_Type, ObjSize);28532853 }28542854*/···30033003#if (EPL_OBD_USE_STORE_RESTORE != FALSE)30043004 else {30053005 if (Direction_p == kEplObdDirLoad) {30063006- CbStore.m_bCommand = (BYTE) kEplObdCommCloseRead;30063006+ CbStore.m_bCommand = (u8) kEplObdCommCloseRead;30073007 } else if (Direction_p == kEplObdDirStore) {30083008- CbStore.m_bCommand = (BYTE) kEplObdCommCloseWrite;30083008+ CbStore.m_bCommand = (u8) kEplObdCommCloseWrite;30093009 } else if (Direction_p == kEplObdDirRestore) {30103010- CbStore.m_bCommand = (BYTE) kEplObdCommClear;30103010+ CbStore.m_bCommand = (u8) kEplObdCommClear;30113011 } else {30123012 goto Exit;30133013 }
+4-4
drivers/staging/epl/EplObd.h
···309309310310typedef struct {311311 tEplObdSize m_Size;312312- BYTE *m_pString;312312+ u8 *m_pString;313313314314} tEplObdOString; // 000C315315···327327328328typedef struct {329329 tEplObdSize m_Size;330330- BYTE *m_pDefString; // $$$ d.k. it is unused, so we could delete it331331- BYTE *m_pString;330330+ u8 *m_pDefString; // $$$ d.k. it is unused, so we could delete it331331+ u8 *m_pString;332332333333} tEplObdOStringDef;334334···431431 unsigned int m_uiUpperObjIndex; // upper limit of ObjIndex432432 tInitTabEntryCallback m_fpInitTabEntry; // will be called if ObjIndex was found433433 void *m_pTabBase; // base address of table434434- unsigned int m_uiEntrySize; // size of table entry // 25-feb-2005 r.d.: expansion from BYTE to WORD necessary for PDO bit mapping434434+ unsigned int m_uiEntrySize; // size of table entry // 25-feb-2005 r.d.: expansion from u8 to WORD necessary for PDO bit mapping435435 unsigned int m_uiMaxEntries; // max. tabel entries436436437437} tEplObdModulTabParam;
···104104 // TPDO: 0x00=PRes, MN: CnNodeId=PReq105105106106 BOOL m_fTxRx;107107- BYTE m_bMappingVersion;107107+ u8 m_bMappingVersion;108108 unsigned int m_uiMaxMappingEntries; // maximum number of mapping entries, i.e. size of m_aPdoMapping109109 tEplPdoMapping m_aPdoMapping[1];110110
···232232 unsigned int uiPdoId;233233 unsigned int uiIndexType;234234 tEplObdSize ObdSize;235235- BYTE bObjectCount;235235+ u8 bObjectCount;236236 QWORD qwObjectMapping;237237 tEplObdAccess AccessType;238238- BYTE bMappSubindex;238238+ u8 bMappSubindex;239239 unsigned int uiCurPdoSize;240240 WORD wMaxPdoSize;241241 unsigned int uiSubIndex;···293293 if (pParam_p->m_uiSubIndex == 0) { // object mapping count accessed294294295295 // PDO is enabled or disabled296296- bObjectCount = *((BYTE *) pParam_p->m_pArg);296296+ bObjectCount = *((u8 *) pParam_p->m_pArg);297297298298 if (bObjectCount == 0) { // PDO shall be disabled299299···399399{400400 tEplKernel Ret = kEplSuccessful;401401 tEplObdSize ObdSize;402402- BYTE bObjectCount;402402+ u8 bObjectCount;403403404404 ObdSize = 1;405405 // read number of mapped objects from OD; this indicates if the PDO is valid
+2-2
drivers/staging/epl/EplSdoAsndu.c
···339339 // own node id not needed -> filled by DLL340340341341 // set message type342342- AmiSetByteToLe(&pSrcData_p->m_le_bMessageType, (BYTE) kEplMsgTypeAsnd); // ASnd == 0x06342342+ AmiSetByteToLe(&pSrcData_p->m_le_bMessageType, (u8) kEplMsgTypeAsnd); // ASnd == 0x06343343 // target node id344344 AmiSetByteToLe(&pSrcData_p->m_le_bDstNodeId,345345- (BYTE) SdoAsndInstance_g.345345+ (u8) SdoAsndInstance_g.346346 m_auiSdoAsndConnection[uiArray]);347347 // set source-nodeid (filled by DLL 0)348348 AmiSetByteToLe(&pSrcData_p->m_le_bSrcNodeId, 0x00);
+14-14
drivers/staging/epl/EplSdoAsySequ.c
···128128129129// structure for History-Buffer130130typedef struct {131131- BYTE m_bFreeEntries;132132- BYTE m_bWrite; // index of the next free buffer entry133133- BYTE m_bAck; // index of the next message which should become acknowledged134134- BYTE m_bRead; // index between m_bAck and m_bWrite to the next message for retransmission135135- BYTE m_aabHistoryFrame[EPL_SDO_HISTORY_SIZE]131131+ u8 m_bFreeEntries;132132+ u8 m_bWrite; // index of the next free buffer entry133133+ u8 m_bAck; // index of the next message which should become acknowledged134134+ u8 m_bRead; // index between m_bAck and m_bWrite to the next message for retransmission135135+ u8 m_aabHistoryFrame[EPL_SDO_HISTORY_SIZE]136136 [EPL_SEQ_HISTROY_FRAME_SIZE];137137 unsigned int m_auiFrameSize[EPL_SDO_HISTORY_SIZE];138138···152152typedef struct {153153 tEplSdoConHdl m_ConHandle;154154 tEplAsySdoState m_SdoState;155155- BYTE m_bRecSeqNum; // name from view of the communication partner156156- BYTE m_bSendSeqNum; // name from view of the communication partner155155+ u8 m_bRecSeqNum; // name from view of the communication partner156156+ u8 m_bSendSeqNum; // name from view of the communication partner157157 tEplAsySdoConHistory m_SdoConHistory;158158 tEplTimerHdl m_EplTimerHdl;159159 unsigned int m_uiRetryCount; // retry counter···214214 unsigned int uiSize_p);215215216216static tEplKernel EplSdoAsyAckFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p,217217- BYTE bRecSeqNumber_p);217217+ u8 bRecSeqNumber_p);218218219219static tEplKernel EplSdoAsyReadFromHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p,220220 tEplFrame ** ppFrame_p,···14981498 // frame received14991499 case kAsySdoSeqEventFrameRec:15001500 {15011501- BYTE bSendSeqNumCon =15011501+ u8 bSendSeqNumCon =15021502 AmiGetByteFromLe(&pRecFrame_p->15031503 m_le_bSendSeqNumCon);15041504···20162016 BOOL fFrameInHistory_p)20172017{20182018 tEplKernel Ret;20192019- BYTE abFrame[EPL_SEQ_FRAME_SIZE];20192019+ u8 abFrame[EPL_SEQ_FRAME_SIZE];20202020 tEplFrame *pEplFrame;20212021 unsigned int uiFreeEntries;20222022···21542154#endif2155215521562156 EPL_DBGLVL_SDO_TRACE2("Handle: 0x%x , First Databyte 0x%x\n", ConHdl_p,21572157- ((BYTE *) pSdoSeqData_p)[0]);21572157+ ((u8 *) pSdoSeqData_p)[0]);2158215821592159 // search controll structure for this connection21602160 pAsySdoSeqCon = &AsySdoSequInstance_g.m_AsySdoConnection[uiCount];···23282328//23292329//---------------------------------------------------------------------------23302330static tEplKernel EplSdoAsyAckFrameToHistory(tEplAsySdoSeqCon * pAsySdoSeqCon_p,23312331- BYTE bRecSeqNumber_p)23312331+ u8 bRecSeqNumber_p)23322332{23332333 tEplKernel Ret;23342334 tEplAsySdoConHistory *pHistory;23352335- BYTE bAckIndex;23362336- BYTE bCurrentSeqNum;23352335+ u8 bAckIndex;23362336+ u8 bCurrentSeqNum;2337233723382338 Ret = kEplSuccessful;23392339
+29-29
drivers/staging/epl/EplSdoComu.c
···156156typedef struct {157157 tEplSdoSeqConHdl m_SdoSeqConHdl; // if != 0 -> entry used158158 tEplSdoComState m_SdoComState;159159- BYTE m_bTransactionId;159159+ u8 m_bTransactionId;160160 unsigned int m_uiNodeId; // NodeId of the target161161 // -> needed to reinit connection162162 // after timeout163163 tEplSdoTransType m_SdoTransType; // Auto, Expedited, Segmented164164 tEplSdoServiceType m_SdoServiceType; // WriteByIndex, ReadByIndex165165 tEplSdoType m_SdoProtType; // protocol layer: Auto, Udp, Asnd, Pdo166166- BYTE *m_pData; // pointer to data166166+ u8 *m_pData; // pointer to data167167 unsigned int m_uiTransSize; // number of bytes168168 // to transfer169169 unsigned int m_uiTransferredByte; // number of bytes···765765 goto Exit;766766 }767767 // save pointer to abort code768768- pSdoComCon->m_pData = (BYTE *) & dwAbortCode_p;768768+ pSdoComCon->m_pData = (u8 *) & dwAbortCode_p;769769770770 Ret = EplSdoComProcessIntern(SdoComConHdl_p,771771 kEplSdoComConEventAbort,···998998{999999 tEplKernel Ret;10001000 tEplSdoComCon *pSdoComCon;10011001- BYTE bFlag;10011001+ u8 bFlag;1002100210031003#if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDOS)) != 0)10041004 DWORD dwAbortCode;···11371137 pSdoComCon->11381138 m_pData11391139 =11401140- (BYTE11401140+ (u811411141 *)11421142 &11431143 dwAbortCode;···12821282 if (pSdoComCon->12831283 m_dwLastAbortCode ==12841284 0) {12851285- ( /*(BYTE*) */12851285+ ( /*(u8*) */12861286 pSdoComCon->12871287 m_pData) +=12881288 uiSize;···13201320 pSdoComCon->13211321 m_pData13221322 =13231323- (BYTE13231323+ (u813241324 *)13251325 &13261326 pSdoComCon->···19861986 if (Ret == kEplObdSubindexNotExist) { // subentry doesn't exist19871987 dwAbortCode = EPL_SDOAC_SUB_INDEX_NOT_EXIST;19881988 // send abort19891989- pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode;19891989+ pSdoComCon_p->m_pData = (u8 *) & dwAbortCode;19901990 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,19911991 uiIndex,19921992 uiSubindex,···19951995 } else if (Ret != kEplSuccessful) { // entry doesn't exist19961996 dwAbortCode = EPL_SDOAC_OBJECT_NOT_EXIST;19971997 // send abort19981998- pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode;19981998+ pSdoComCon_p->m_pData = (u8 *) & dwAbortCode;19991999 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,20002000 uiIndex,20012001 uiSubindex,···20132013 dwAbortCode = EPL_SDOAC_UNSUPPORTED_ACCESS;20142014 }20152015 // send abort20162016- pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode;20162016+ pSdoComCon_p->m_pData = (u8 *) & dwAbortCode;20172017 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,20182018 uiIndex,20192019 uiSubindex,···20502050 // error -> abort20512051 dwAbortCode = EPL_SDOAC_GENERAL_ERROR;20522052 // send abort20532053- pSdoComCon_p->m_pData = (BYTE *) & dwAbortCode;20532053+ pSdoComCon_p->m_pData = (u8 *) & dwAbortCode;20542054 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,20552055 uiIndex,20562056 uiSubindex,···20892089 tEplSdoComSendType SendType_p)20902090{20912091 tEplKernel Ret;20922092- BYTE abFrame[EPL_MAX_SDO_FRAME_SIZE];20922092+ u8 abFrame[EPL_MAX_SDO_FRAME_SIZE];20932093 tEplFrame *pFrame;20942094 tEplAsySdoCom *pCommandFrame;20952095 unsigned int uiSizeOfFrame;20962096- BYTE bFlag;20962096+ u8 bFlag;2097209720982098 Ret = kEplSuccessful;20992099···23732373 tEplObdSize EntrySize;23742374 tEplObdAccess AccessType;23752375 DWORD dwAbortCode;23762376- BYTE *pbSrcData;23762376+ u8 *pbSrcData;2377237723782378 dwAbortCode = 0;23792379···24262426 pSdoComCon_p->m_dwLastAbortCode = EPL_SDOAC_SUB_INDEX_NOT_EXIST;24272427 // send abort24282428 // d.k. This is wrong: k.t. not needed send abort on end of write24292429- /*pSdoComCon_p->m_pData = (BYTE*)pSdoComCon_p->m_dwLastAbortCode;24292429+ /*pSdoComCon_p->m_pData = (u8*)pSdoComCon_p->m_dwLastAbortCode;24302430 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,24312431 uiIndex,24322432 uiSubindex,···24372437 // send abort24382438 // d.k. This is wrong: k.t. not needed send abort on end of write24392439 /*24402440- pSdoComCon_p->m_pData = (BYTE*)&dwAbortCode;24402440+ pSdoComCon_p->m_pData = (u8*)&dwAbortCode;24412441 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,24422442 uiIndex,24432443 uiSubindex,···24572457 }24582458 // send abort24592459 // d.k. This is wrong: k.t. not needed send abort on end of write24602460- /*pSdoComCon_p->m_pData = (BYTE*)&dwAbortCode;24602460+ /*pSdoComCon_p->m_pData = (u8*)&dwAbortCode;24612461 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,24622462 uiIndex,24632463 uiSubindex,···25482548 EPL_SDOAC_DATA_TYPE_LENGTH_TOO_HIGH;25492549 // send abort25502550 // d.k. This is wrong: k.t. not needed send abort on end of write25512551- /*pSdoComCon_p->m_pData = (BYTE*)&dwAbortCode;25512551+ /*pSdoComCon_p->m_pData = (u8*)&dwAbortCode;25522552 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,25532553 uiIndex,25542554 uiSubindex,···25702570 EPL_SDOAC_GENERAL_ERROR;25712571 // send abort25722572 // d.k. This is wrong: k.t. not needed send abort on end of write25732573-/* pSdoComCon_p->m_pData = (BYTE*)&pSdoComCon_p->m_dwLastAbortCode;25732573+/* pSdoComCon_p->m_pData = (u8*)&pSdoComCon_p->m_dwLastAbortCode;25742574 Ret = EplSdoComServerSendFrameIntern(pSdoComCon_p,25752575 uiIndex,25762576 uiSubindex,···25852585 pSdoComCon_p->m_uiTransSize -= uiBytesToTransfer;2586258625872587 // update target pointer25882588- ( /*(BYTE*) */ pSdoComCon_p->m_pData) += uiBytesToTransfer;25882588+ ( /*(u8*) */ pSdoComCon_p->m_pData) += uiBytesToTransfer;2589258925902590 // send acknowledge without any Command layer data25912591 Ret = EplSdoAsySeqSendData(pSdoComCon_p->m_SdoSeqConHdl,···25972597 if (pSdoComCon_p->m_dwLastAbortCode != 0) {25982598 // send abort25992599 pSdoComCon_p->m_pData =26002600- (BYTE *) & pSdoComCon_p->m_dwLastAbortCode;26002600+ (u8 *) & pSdoComCon_p->m_dwLastAbortCode;26012601 Ret =26022602 EplSdoComServerSendFrameIntern(pSdoComCon_p, uiIndex,26032603 uiSubindex,···26342634static tEplKernel EplSdoComClientSend(tEplSdoComCon * pSdoComCon_p)26352635{26362636 tEplKernel Ret;26372637- BYTE abFrame[EPL_MAX_SDO_FRAME_SIZE];26372637+ u8 abFrame[EPL_MAX_SDO_FRAME_SIZE];26382638 tEplFrame *pFrame;26392639 tEplAsySdoCom *pCommandFrame;26402640 unsigned int uiSizeOfFrame;26412641- BYTE bFlags;26422642- BYTE *pbPayload;26412641+ u8 bFlags;26422642+ u8 *pbPayload;2643264326442644 Ret = kEplSuccessful;26452645···26832683 m_uiTargetIndex);26842684 pbPayload += 2;26852685 AmiSetByteToLe(pbPayload,26862686- (BYTE) pSdoComCon_p->26862686+ (u8) pSdoComCon_p->26872687 m_uiTargetSubIndex);26882688 // calc size26892689 uiSizeOfFrame += 4;···27252725 m_uiTargetIndex);27262726 pbPayload += 2;27272727 AmiSetByteToLe(pbPayload,27282728- (BYTE)27282728+ (u8)27292729 pSdoComCon_p->27302730 m_uiTargetSubIndex);27312731 // on byte for reserved···27642764 m_uiTargetIndex);27652765 pbPayload += 2;27662766 AmiSetByteToLe(pbPayload,27672767- (BYTE)27672767+ (u8)27682768 pSdoComCon_p->27692769 m_uiTargetSubIndex);27702770 // + 2 -> one byte for subindex and one byte reserved···29432943 tEplAsySdoCom * pAsySdoCom_p)29442944{29452945 tEplKernel Ret;29462946- BYTE bBuffer;29462946+ u8 bBuffer;29472947 unsigned int uiBuffer;29482948 unsigned int uiDataSize;29492949 unsigned long ulBuffer;···32193219 DWORD dwAbortCode_p)32203220{32213221 tEplKernel Ret;32223222- BYTE abFrame[EPL_MAX_SDO_FRAME_SIZE];32223222+ u8 abFrame[EPL_MAX_SDO_FRAME_SIZE];32233223 tEplFrame *pFrame;32243224 tEplAsySdoCom *pCommandFrame;32253225 unsigned int uiSizeOfFrame;
+1-1
drivers/staging/epl/EplSdoUdpu.c
···550550 int iError;551551 int iCount;552552 int iFreeEntry;553553- BYTE abBuffer[EPL_MAX_SDO_REC_FRAME_SIZE];553553+ u8 abBuffer[EPL_MAX_SDO_REC_FRAME_SIZE];554554 unsigned int uiSize;555555 tEplSdoConHdl SdoConHdl;556556
+3-3
drivers/staging/epl/EplTarget.h
···134134// functions for ethernet driver135135tEplKernel TgtInitEthIsr(void);136136void TgtFreeEthIsr(void);137137-void TgtEnableGlobalInterrupt(BYTE fEnable_p);138138-void TgtEnableEthInterrupt0(BYTE fEnable_p, unsigned int uiInterruptMask_p);139139-void TgtEnableEthInterrupt1(BYTE fEnable_p, unsigned int uiInterruptMask_p);137137+void TgtEnableGlobalInterrupt(u8 fEnable_p);138138+void TgtEnableEthInterrupt0(u8 fEnable_p, unsigned int uiInterruptMask_p);139139+void TgtEnableEthInterrupt1(u8 fEnable_p, unsigned int uiInterruptMask_p);140140141141#endif // #ifndef _EPLTARGET_H_
···118118119119// TracePoint support for realtime-debugging120120#ifdef _DBG_TRACE_POINTS_121121-void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p);121121+void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);122122#define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p)123123#else124124#define TGT_DBG_SIGNAL_TRACE_POINT(p)···148148// modul globale vars149149//---------------------------------------------------------------------------150150151151-const BYTE abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };151151+const u8 abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };152152153153-BYTE bVarIn1_l;154154-BYTE bVarOut1_l;155155-BYTE bVarOut1Old_l;156156-BYTE bModeSelect_l; // state of the pushbuttons to select the mode157157-BYTE bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed158158-BYTE bSpeedSelectOld_l; // old state of the pushbuttons153153+u8 bVarIn1_l;154154+u8 bVarOut1_l;155155+u8 bVarOut1Old_l;156156+u8 bModeSelect_l; // state of the pushbuttons to select the mode157157+u8 bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed158158+u8 bSpeedSelectOld_l; // old state of the pushbuttons159159DWORD dwLeds_l; // current state of all LEDs160160-BYTE bLedsRow1_l; // current state of the LEDs in row 1161161-BYTE bLedsRow2_l; // current state of the LEDs in row 2162162-BYTE abSelect_l[3]; // pushbuttons from CNs160160+u8 bLedsRow1_l; // current state of the LEDs in row 1161161+u8 bLedsRow2_l; // current state of the LEDs in row 2162162+u8 abSelect_l[3]; // pushbuttons from CNs163163164164DWORD 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 direction168168169169-BYTE abDomain_l[3000];169169+u8 abDomain_l[3000];170170171171static wait_queue_head_t WaitQueueShutdown_g; // wait queue for tEplNmtEventSwitchOff172172static atomic_t AtomicShutdown_g = ATOMIC_INIT(FALSE);···263263 EplApiInitParam.m_uiSizeOfStruct = sizeof(EplApiInitParam);264264 EPL_MEMCPY(EplApiInitParam.m_abMacAddress, abMacAddr,265265 sizeof(EplApiInitParam.m_abMacAddress));266266-// EplApiInitParam.m_abMacAddress[5] = (BYTE) EplApiInitParam.m_uiNodeId;266266+// EplApiInitParam.m_abMacAddress[5] = (u8) EplApiInitParam.m_uiNodeId;267267 EplApiInitParam.m_dwFeatureFlags = -1;268268 EplApiInitParam.m_dwCycleLen = uiCycleLen_g; // required for error detection269269 EplApiInitParam.m_uiIsochrTxMaxPayload = 100; // const
+10-10
drivers/staging/epl/edrv.h
···104104 unsigned int m_uiTxMsgLen; // IN: length of message to be send (set for each transmit call)105105 // ----------------------106106 unsigned int m_uiBufferNumber; // OUT: number of the buffer, set by ethernetdriver107107- BYTE *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver107107+ u8 *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver108108 tEplNetTime m_NetTime; // OUT: Timestamp of end of transmission, set by ethernetdriver109109 // ----------------------110110 unsigned int m_uiMaxBufferLen; // IN/OUT: maximum length of the buffer···114114typedef struct _tEdrvRxBuffer {115115 tEdrvBufferInFrame m_BufferInFrame; // OUT position of received buffer in an ethernet-frame116116 unsigned int m_uiRxMsgLen; // OUT: length of received buffer (without CRC)117117- BYTE *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver117117+ u8 *m_pbBuffer; // OUT: pointer to the buffer, set by ethernetdriver118118 tEplNetTime m_NetTime; // OUT: Timestamp of end of receiption119119120120} tEdrvRxBuffer;121121122122-//typedef void (*tEdrvRxHandler) (BYTE bBufferInFrame_p, tBufferDescr * pbBuffer_p);123123-//typedef void (*tEdrvRxHandler) (BYTE bBufferInFrame_p, BYTE * pbEthernetData_p, WORD wDataLen_p);122122+//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, tBufferDescr * pbBuffer_p);123123+//typedef void (*tEdrvRxHandler) (u8 bBufferInFrame_p, u8 * pbEthernetData_p, WORD wDataLen_p);124124typedef void (*tEdrvRxHandler) (tEdrvRxBuffer * pRxBuffer_p);125125typedef void (*tEdrvTxHandler) (tEdrvTxBuffer * pTxBuffer_p);126126127127// format of init structure128128typedef struct {129129- BYTE m_abMyMacAddr[6]; // the own MAC address129129+ u8 m_abMyMacAddr[6]; // the own MAC address130130131131-// BYTE m_bNoOfRxBuffDescr; // number of entries in rx bufferdescriptor table131131+// u8 m_bNoOfRxBuffDescr; // number of entries in rx bufferdescriptor table132132// tBufferDescr * m_pRxBuffDescrTable; // rx bufferdescriptor table133133// WORD m_wRxBufferSize; // size of the whole rx buffer134134···145145146146tEplKernel EdrvShutdown(void);147147148148-tEplKernel EdrvDefineRxMacAddrEntry(BYTE * pbMacAddr_p);149149-tEplKernel EdrvUndefineRxMacAddrEntry(BYTE * pbMacAddr_p);148148+tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p);149149+tEplKernel EdrvUndefineRxMacAddrEntry(u8 * pbMacAddr_p);150150151151-//tEplKernel EdrvDefineUnicastEntry (BYTE * pbUCEntry_p);152152-//tEplKernel EdrvUndfineUnicastEntry (BYTE * pbUCEntry_p);151151+//tEplKernel EdrvDefineUnicastEntry (u8 * pbUCEntry_p);152152+//tEplKernel EdrvUndfineUnicastEntry (u8 * pbUCEntry_p);153153154154tEplKernel EdrvAllocTxMsgBuffer(tEdrvTxBuffer * pBuffer_p);155155tEplKernel EdrvReleaseTxMsgBuffer(tEdrvTxBuffer * pBuffer_p);
-3
drivers/staging/epl/global.h
···3030#define TRACE printk31313232// --- logic types ---3333-#ifndef BYTE3434-#define BYTE unsigned char3535-#endif3633#ifndef WORD3734#define WORD unsigned short int3835#endif
+4-4
drivers/staging/epl/kernel/EplDllk.h
···8585typedef tEplKernel(*tEplDllkCbAsync) (tEplFrameInfo * pFrameInfo_p);86868787typedef struct {8888- BYTE m_be_abSrcMac[6];8888+ u8 m_be_abSrcMac[6];89899090} tEplDllkInitParam;9191···100100 unsigned long m_ulDllErrorEvents;101101 tEplNmtState m_NmtState;102102 WORD m_wPresPayloadLimit;103103- BYTE m_be_abMacAddr[6];104104- BYTE m_bSoaFlag1;103103+ u8 m_be_abMacAddr[6];104104+ u8 m_bSoaFlag1;105105 BOOL m_fSoftDelete; // delete node after error and ignore error106106107107};···154154155155tEplKernel EplDllkSoftDeleteNode(unsigned int uiNodeId_p);156156157157-tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, BYTE bSoaFlag1_p);157157+tEplKernel EplDllkSetFlag1OfNode(unsigned int uiNodeId_p, u8 bSoaFlag1_p);158158159159tEplKernel EplDllkGetFirstNodeInfo(tEplDllkNodeInfo ** ppNodeInfo_p);160160
+1-1
drivers/staging/epl/kernel/EplDllkCal.h
···124124tEplKernel EplDllkCalAsyncClearQueues(void);125125126126tEplKernel EplDllkCalIssueRequest(tEplDllReqServiceId Service_p,127127- unsigned int uiNodeId_p, BYTE bSoaFlag1_p);127127+ unsigned int uiNodeId_p, u8 bSoaFlag1_p);128128129129tEplKernel EplDllkCalAsyncGetSoaRequest(tEplDllReqServiceId * pReqServiceId_p,130130 unsigned int *puiNodeId_p);
+1-1
drivers/staging/epl/kernel/EplObdk.h
···8585// global variables8686//---------------------------------------------------------------------------87878888-extern BYTE abEplObdTrashObject_g[8];8888+extern u8 abEplObdTrashObject_g[8];89899090//---------------------------------------------------------------------------9191// function prototypes
···133133 tEplSdoComConHdl m_SdoComConHdl; // handle for sdo connection134134 DWORD m_dwLastAbortCode;135135 unsigned int m_uiLastIndex; // last index of configuration, to compair with actual index136136- BYTE *m_pbConcise; // Ptr to concise DCF137137- BYTE *m_pbActualIndex; // Ptr to actual index in the DCF segment136136+ 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 variable141141 unsigned int m_uiPdoNodeId; // buffer for PDO node id142142- BYTE m_bNrOfMappedObject; // number of mapped objects142142+ u8 m_bNrOfMappedObject; // number of mapped objects143143 unsigned int m_uiNodeId; // Epl node addresse144144 tEplSdocState m_SdocState; // bitcoded state of the SDO transfer145145 unsigned int m_uiLastSubIndex; // last subindex of configuration146146 BOOL m_fOneTranferOk; // atleased one transfer was successful147147- BYTE m_bEventFlag; // for Eventsignaling to the State Maschine147147+ u8 m_bEventFlag; // for Eventsignaling to the State Maschine148148 DWORD m_dwCntObjectInDcf; // number of Objects in DCF149149 tEplCfgMaIndexType m_SkipCfg; // TRUE if a adsitional Configurationprocess150150 // have to insert e.g. PDO-mapping···199199// Parameters: uiNodeId_p = NodeId of the node to configure200200// pbConcise_p = pointer to DCF201201// fpCfgMaCb_p = pointer to callback function (should not be NULL)202202-// SizeOfConcise_p = size of DCF in BYTE -> for future use202202+// SizeOfConcise_p = size of DCF in u8 -> for future use203203// DcfType_p = type of the DCF204204//205205// Returns: tCopKernel = error code206206//---------------------------------------------------------------------------207207tEplKernel EplCfgMaStartConfig(unsigned int uiNodeId_p,208208- BYTE * pbConcise_p,208208+ u8 * pbConcise_p,209209 tfpEplCfgMaCb fpCfgMaCb_p,210210 tEplObdSize SizeOfConcise_p,211211 tEplCfgMaDcfTyp DcfType_p);···235235// Parameters: uiNodeId_p = NodeId of the node to configure236236// pbConcise_p = pointer to DCF237237// fpCfgMaCb_p = pointer to callback function (should not be NULL)238238-// SizeOfConcise_p = size of DCF in BYTE -> for future use238238+// SizeOfConcise_p = size of DCF in u8 -> for future use239239// DcfType_p = type of the DCF240240//241241// Returns: tCopKernel = error code242242//---------------------------------------------------------------------------243243tEplKernel EplCfgMaStartConfigNodeDcf(unsigned int uiNodeId_p,244244- BYTE * pbConcise_p,244244+ u8 * pbConcise_p,245245 tfpEplCfgMaCb fpCfgMaCb_p,246246 tEplObdSize SizeOfConcise_p,247247 tEplCfgMaDcfTyp DcfType_p);···253253//254254// Parameters: uiNodeId_p = NodeId of the node to configure255255// pbConcise_p = pointer to DCF256256-// SizeOfConcise_p = size of DCF in BYTE -> for future use256256+// SizeOfConcise_p = size of DCF in u8 -> for future use257257// DcfType_p = type of the DCF258258//259259// Returns: tCopKernel = error code260260//---------------------------------------------------------------------------261261tEplKernel EplCfgMaLinkDcf(unsigned int uiNodeId_p,262262- BYTE * pbConcise_p,262262+ u8 * pbConcise_p,263263 tEplObdSize SizeOfConcise_p,264264 tEplCfgMaDcfTyp DcfType_p);265265
+1-1
drivers/staging/epl/user/EplDlluCal.h
···110110tEplKernel EplDlluCalSoftDeleteNode(unsigned int uiNodeId_p);111111112112tEplKernel EplDlluCalIssueRequest(tEplDllReqServiceId Service_p,113113- unsigned int uiNodeId_p, BYTE bSoaFlag1_p);113113+ unsigned int uiNodeId_p, u8 bSoaFlag1_p);114114115115#endif116116