Skip to content

L
linux
Commit a5c30d94 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: epl: remove QWORD 

It's u64 in kernelspace, not QWORD.

Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2ed53cf8
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 92 deletions
drivers/staging/epl/Epl.h
View file @ a5c30d94
...@@ -181,7 +181,7 @@ typedef struct { ...@@ -181,7 +181,7 @@ typedef struct {
DWORD m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 DWORD m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32
DWORD m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 DWORD m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32
DWORD m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 DWORD m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32
QWORD m_qwVendorSpecificExt1; u64 m_qwVendorSpecificExt1;
DWORD m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 DWORD m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32
DWORD m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 DWORD m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32
DWORD m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device DWORD m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device
......
drivers/staging/epl/EplAmi.h
View file @ a5c30d94
...@@ -177,8 +177,8 @@ DWORD AmiGetDword24FromLe(void *pAddr_p); ...@@ -177,8 +177,8 @@ DWORD AmiGetDword24FromLe(void *pAddr_p);
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p); void AmiSetQword40ToBe(void *pAddr_p, u64 qwQwordVal_p);
void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p); void AmiSetQword40ToLe(void *pAddr_p, u64 qwQwordVal_p);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
...@@ -188,12 +188,12 @@ void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p); ...@@ -188,12 +188,12 @@ void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p);
// //
// Parameters: pAddr_p = pointer to source buffer // Parameters: pAddr_p = pointer to source buffer
// //
// Return: QWORD // Return: u64
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword40FromBe(void *pAddr_p); u64 AmiGetQword40FromBe(void *pAddr_p);
QWORD AmiGetQword40FromLe(void *pAddr_p); u64 AmiGetQword40FromLe(void *pAddr_p);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
...@@ -208,8 +208,8 @@ QWORD AmiGetQword40FromLe(void *pAddr_p); ...@@ -208,8 +208,8 @@ QWORD AmiGetQword40FromLe(void *pAddr_p);
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p); void AmiSetQword48ToBe(void *pAddr_p, u64 qwQwordVal_p);
void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p); void AmiSetQword48ToLe(void *pAddr_p, u64 qwQwordVal_p);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
...@@ -219,12 +219,12 @@ void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p); ...@@ -219,12 +219,12 @@ void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p);
// //
// Parameters: pAddr_p = pointer to source buffer // Parameters: pAddr_p = pointer to source buffer
// //
// Return: QWORD // Return: u64
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword48FromBe(void *pAddr_p); u64 AmiGetQword48FromBe(void *pAddr_p);
QWORD AmiGetQword48FromLe(void *pAddr_p); u64 AmiGetQword48FromLe(void *pAddr_p);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
...@@ -239,8 +239,8 @@ QWORD AmiGetQword48FromLe(void *pAddr_p); ...@@ -239,8 +239,8 @@ QWORD AmiGetQword48FromLe(void *pAddr_p);
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p); void AmiSetQword56ToBe(void *pAddr_p, u64 qwQwordVal_p);
void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p); void AmiSetQword56ToLe(void *pAddr_p, u64 qwQwordVal_p);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
...@@ -250,12 +250,12 @@ void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p); ...@@ -250,12 +250,12 @@ void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p);
// //
// Parameters: pAddr_p = pointer to source buffer // Parameters: pAddr_p = pointer to source buffer
// //
// Return: QWORD // Return: u64
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword56FromBe(void *pAddr_p); u64 AmiGetQword56FromBe(void *pAddr_p);
QWORD AmiGetQword56FromLe(void *pAddr_p); u64 AmiGetQword56FromLe(void *pAddr_p);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
...@@ -270,8 +270,8 @@ QWORD AmiGetQword56FromLe(void *pAddr_p); ...@@ -270,8 +270,8 @@ QWORD AmiGetQword56FromLe(void *pAddr_p);
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p); void AmiSetQword64ToBe(void *pAddr_p, u64 qwQwordVal_p);
void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p); void AmiSetQword64ToLe(void *pAddr_p, u64 qwQwordVal_p);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
...@@ -285,8 +285,8 @@ void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p); ...@@ -285,8 +285,8 @@ void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p);
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword64FromBe(void *pAddr_p); u64 AmiGetQword64FromBe(void *pAddr_p);
QWORD AmiGetQword64FromLe(void *pAddr_p); u64 AmiGetQword64FromLe(void *pAddr_p);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
......
drivers/staging/epl/EplDll.h
View file @ a5c30d94
...@@ -177,7 +177,7 @@ typedef struct { ...@@ -177,7 +177,7 @@ typedef struct {
DWORD m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 DWORD m_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32
DWORD m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 DWORD m_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32
DWORD m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 DWORD m_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32
QWORD m_qwVendorSpecificExt1; u64 m_qwVendorSpecificExt1;
DWORD m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 DWORD m_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32
DWORD m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 DWORD m_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32
DWORD m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device DWORD m_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device
......
drivers/staging/epl/EplFrame.h
View file @ a5c30d94
...@@ -130,7 +130,7 @@ typedef struct { ...@@ -130,7 +130,7 @@ typedef struct {
// Offset 20 // Offset 20
tEplNetTime m_le_NetTime; // supported if D_NMT_NetTimeIsRealTime_BOOL is set tEplNetTime m_le_NetTime; // supported if D_NMT_NetTimeIsRealTime_BOOL is set
// Offset 28 // Offset 28
QWORD m_le_RelativeTime; // in us (supported if D_NMT_RelativeTime_BOOL is set) u64 m_le_RelativeTime; // in us (supported if D_NMT_RelativeTime_BOOL is set)
} PACK_STRUCT tEplSocFrame; } PACK_STRUCT tEplSocFrame;
...@@ -201,7 +201,7 @@ typedef struct { ...@@ -201,7 +201,7 @@ typedef struct {
u8 m_le_bFlag2; // Flags: PR, RS u8 m_le_bFlag2; // Flags: PR, RS
u8 m_le_bNmtStatus; // NMT state u8 m_le_bNmtStatus; // NMT state
u8 m_le_bRes1[3]; u8 m_le_bRes1[3];
QWORD m_le_qwStaticError; // static error bit field u64 m_le_qwStaticError; // static error bit field
tEplErrHistoryEntry m_le_aErrHistoryEntry[14]; tEplErrHistoryEntry m_le_aErrHistoryEntry[14];
} PACK_STRUCT tEplStatusResponse; } PACK_STRUCT tEplStatusResponse;
...@@ -225,7 +225,7 @@ typedef struct { ...@@ -225,7 +225,7 @@ typedef struct {
DWORD m_le_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32 DWORD m_le_dwProductCode; // NMT_IdentityObject_REC.ProductCode_U32
DWORD m_le_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32 DWORD m_le_dwRevisionNumber; // NMT_IdentityObject_REC.RevisionNo_U32
DWORD m_le_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32 DWORD m_le_dwSerialNumber; // NMT_IdentityObject_REC.SerialNo_U32
QWORD m_le_qwVendorSpecificExt1; u64 m_le_qwVendorSpecificExt1;
DWORD m_le_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32 DWORD m_le_dwVerifyConfigurationDate; // CFM_VerifyConfiguration_REC.ConfDate_U32
DWORD m_le_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32 DWORD m_le_dwVerifyConfigurationTime; // CFM_VerifyConfiguration_REC.ConfTime_U32
DWORD m_le_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device DWORD m_le_dwApplicationSwDate; // PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device
......
drivers/staging/epl/EplObd.c
View file @ a5c30d94
...@@ -1105,7 +1105,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned ...@@ -1105,7 +1105,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned
case kEplObdTypInt40: case kEplObdTypInt40:
case kEplObdTypUInt40: case kEplObdTypUInt40:
{ {
AmiSetQword40ToLe(pDstData_p, *((QWORD *) pSrcData)); AmiSetQword40ToLe(pDstData_p, *((u64 *) pSrcData));
break; break;
} }
...@@ -1113,7 +1113,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned ...@@ -1113,7 +1113,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned
case kEplObdTypInt48: case kEplObdTypInt48:
case kEplObdTypUInt48: case kEplObdTypUInt48:
{ {
AmiSetQword48ToLe(pDstData_p, *((QWORD *) pSrcData)); AmiSetQword48ToLe(pDstData_p, *((u64 *) pSrcData));
break; break;
} }
...@@ -1121,7 +1121,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned ...@@ -1121,7 +1121,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned
case kEplObdTypInt56: case kEplObdTypInt56:
case kEplObdTypUInt56: case kEplObdTypUInt56:
{ {
AmiSetQword56ToLe(pDstData_p, *((QWORD *) pSrcData)); AmiSetQword56ToLe(pDstData_p, *((u64 *) pSrcData));
break; break;
} }
...@@ -1130,7 +1130,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned ...@@ -1130,7 +1130,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned
case kEplObdTypUInt64: case kEplObdTypUInt64:
case kEplObdTypReal64: case kEplObdTypReal64:
{ {
AmiSetQword64ToLe(pDstData_p, *((QWORD *) pSrcData)); AmiSetQword64ToLe(pDstData_p, *((u64 *) pSrcData));
break; break;
} }
...@@ -1191,7 +1191,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign ...@@ -1191,7 +1191,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign
tEplObdCbParam CbParam; tEplObdCbParam CbParam;
void *pDstData; void *pDstData;
tEplObdSize ObdSize; tEplObdSize ObdSize;
QWORD qwBuffer; u64 qwBuffer;
void *pBuffer = &qwBuffer; void *pBuffer = &qwBuffer;
Ret = EplObdWriteEntryPre(EPL_MCO_INSTANCE_PTR_ Ret = EplObdWriteEntryPre(EPL_MCO_INSTANCE_PTR_
...@@ -1255,7 +1255,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign ...@@ -1255,7 +1255,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign
case kEplObdTypInt40: case kEplObdTypInt40:
case kEplObdTypUInt40: case kEplObdTypUInt40:
{ {
*((QWORD *) pBuffer) = AmiGetQword40FromLe(pSrcData_p); *((u64 *) pBuffer) = AmiGetQword40FromLe(pSrcData_p);
break; break;
} }
...@@ -1263,7 +1263,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign ...@@ -1263,7 +1263,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign
case kEplObdTypInt48: case kEplObdTypInt48:
case kEplObdTypUInt48: case kEplObdTypUInt48:
{ {
*((QWORD *) pBuffer) = AmiGetQword48FromLe(pSrcData_p); *((u64 *) pBuffer) = AmiGetQword48FromLe(pSrcData_p);
break; break;
} }
...@@ -1271,7 +1271,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign ...@@ -1271,7 +1271,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign
case kEplObdTypInt56: case kEplObdTypInt56:
case kEplObdTypUInt56: case kEplObdTypUInt56:
{ {
*((QWORD *) pBuffer) = AmiGetQword56FromLe(pSrcData_p); *((u64 *) pBuffer) = AmiGetQword56FromLe(pSrcData_p);
break; break;
} }
...@@ -1280,7 +1280,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign ...@@ -1280,7 +1280,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign
case kEplObdTypUInt64: case kEplObdTypUInt64:
case kEplObdTypReal64: case kEplObdTypReal64:
{ {
*((QWORD *) pBuffer) = AmiGetQword64FromLe(pSrcData_p); *((u64 *) pBuffer) = AmiGetQword64FromLe(pSrcData_p);
break; break;
} }
...@@ -1740,18 +1740,18 @@ static tEplKernel EplObdCheckObjectRange(tEplObdSubEntryPtr pSubindexEntry_p, ...@@ -1740,18 +1740,18 @@ static tEplKernel EplObdCheckObjectRange(tEplObdSubEntryPtr pSubindexEntry_p,
case kEplObdTypInt64: case kEplObdTypInt64:
// switch to lower limit // switch to lower limit
pRangeData = ((signed QWORD *)pRangeData) + 1; pRangeData = ((signed u64 *)pRangeData) + 1;
// check if value is to low // check if value is to low
if (*((signed QWORD *)pData_p) < *((signed QWORD *)pRangeData)) { if (*((signed u64 *)pData_p) < *((signed u64 *)pRangeData)) {
Ret = kEplObdValueTooLow; Ret = kEplObdValueTooLow;
break; break;
} }
// switch to higher limit // switch to higher limit
pRangeData = ((signed QWORD *)pRangeData) + 1; pRangeData = ((signed u64 *)pRangeData) + 1;
// check if value is to high // check if value is to high
if (*((signed QWORD *)pData_p) > *((signed QWORD *)pRangeData)) { if (*((signed u64 *)pData_p) > *((signed u64 *)pRangeData)) {
Ret = kEplObdValueTooHigh; Ret = kEplObdValueTooHigh;
} }
...@@ -1764,20 +1764,20 @@ static tEplKernel EplObdCheckObjectRange(tEplObdSubEntryPtr pSubindexEntry_p, ...@@ -1764,20 +1764,20 @@ static tEplKernel EplObdCheckObjectRange(tEplObdSubEntryPtr pSubindexEntry_p,
case kEplObdTypUInt64: case kEplObdTypUInt64:
// switch to lower limit // switch to lower limit
pRangeData = ((unsigned QWORD *)pRangeData) + 1; pRangeData = ((unsigned u64 *)pRangeData) + 1;
// check if value is to low // check if value is to low
if (*((unsigned QWORD *)pData_p) < if (*((unsigned u64 *)pData_p) <
*((unsigned QWORD *)pRangeData)) { *((unsigned u64 *)pRangeData)) {
Ret = kEplObdValueTooLow; Ret = kEplObdValueTooLow;
break; break;
} }
// switch to higher limit // switch to higher limit
pRangeData = ((unsigned QWORD *)pRangeData) + 1; pRangeData = ((unsigned u64 *)pRangeData) + 1;
// check if value is to high // check if value is to high
if (*((unsigned QWORD *)pData_p) > if (*((unsigned u64 *)pData_p) >
*((unsigned QWORD *)pRangeData)) { *((unsigned u64 *)pRangeData)) {
Ret = kEplObdValueTooHigh; Ret = kEplObdValueTooHigh;
} }
......
drivers/staging/epl/EplObd.h
View file @ a5c30d94
...@@ -68,11 +68,11 @@ ...@@ -68,11 +68,11 @@
****************************************************************************/ ****************************************************************************/
#include "EplInc.h"
#ifndef _EPLOBD_H_ #ifndef _EPLOBD_H_
#define _EPLOBD_H_ #define _EPLOBD_H_
#include "EplInc.h"
// ============================================================================ // ============================================================================
// defines // defines
// ============================================================================ // ============================================================================
...@@ -255,15 +255,15 @@ typedef unsigned char tEplObdDomain; // 000F ...@@ -255,15 +255,15 @@ typedef unsigned char tEplObdDomain; // 000F
typedef signed long tEplObdInteger24; // 0010 typedef signed long tEplObdInteger24; // 0010
typedef unsigned long tEplObdUnsigned24; // 0016 typedef unsigned long tEplObdUnsigned24; // 0016
typedef signed QWORD tEplObdInteger40; // 0012 typedef s64 tEplObdInteger40; // 0012
typedef signed QWORD tEplObdInteger48; // 0013 typedef s64 tEplObdInteger48; // 0013
typedef signed QWORD tEplObdInteger56; // 0014 typedef s64 tEplObdInteger56; // 0014
typedef signed QWORD tEplObdInteger64; // 0015 typedef s64 tEplObdInteger64; // 0015
typedef unsigned QWORD tEplObdUnsigned40; // 0018 typedef u64 tEplObdUnsigned40; // 0018
typedef unsigned QWORD tEplObdUnsigned48; // 0019 typedef u64 tEplObdUnsigned48; // 0019
typedef unsigned QWORD tEplObdUnsigned56; // 001A typedef u64 tEplObdUnsigned56; // 001A
typedef unsigned QWORD tEplObdUnsigned64; // 001B typedef u64 tEplObdUnsigned64; // 001B
typedef double tEplObdReal64; // 0011 typedef double tEplObdReal64; // 0011
......
drivers/staging/epl/EplPdok.c
View file @ a5c30d94
...@@ -318,7 +318,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p) ...@@ -318,7 +318,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p)
WORD wBitOffset; WORD wBitOffset;
WORD wBitSize; WORD wBitSize;
WORD wVarSize; WORD wVarSize;
QWORD qwObjectMapping; u64 qwObjectMapping;
u8 bMappSubindex; u8 bMappSubindex;
u8 bObdSubindex; u8 bObdSubindex;
WORD wObdMappIndex; WORD wObdMappIndex;
...@@ -423,7 +423,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p) ...@@ -423,7 +423,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p)
// process mapping // process mapping
for (bMappSubindex = 1; bMappSubindex <= bObjectCount; for (bMappSubindex = 1; bMappSubindex <= bObjectCount;
bMappSubindex++) { bMappSubindex++) {
ObdSize = 8; // QWORD ObdSize = 8; // u64
// read object mapping from OD // read object mapping from OD
Ret = Ret =
EplObdReadEntry(wObdMappIndex, EplObdReadEntry(wObdMappIndex,
...@@ -553,7 +553,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p) ...@@ -553,7 +553,7 @@ tEplKernel EplPdokProcess(tEplEvent * pEvent_p)
// process mapping // process mapping
for (bMappSubindex = 1; bMappSubindex <= bObjectCount; for (bMappSubindex = 1; bMappSubindex <= bObjectCount;
bMappSubindex++) { bMappSubindex++) {
ObdSize = 8; // QWORD ObdSize = 8; // u64
// read object mapping from OD // read object mapping from OD
Ret = Ret =
EplObdReadEntry(wObdMappIndex, EplObdReadEntry(wObdMappIndex,
......
drivers/staging/epl/EplPdou.c
View file @ a5c30d94
...@@ -152,13 +152,13 @@ ...@@ -152,13 +152,13 @@
static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam *pParam_p, static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam *pParam_p,
unsigned int uiIndex_p); unsigned int uiIndex_p);
static void EplPdouDecodeObjectMapping(QWORD qwObjectMapping_p, static void EplPdouDecodeObjectMapping(u64 qwObjectMapping_p,
unsigned int *puiIndex_p, unsigned int *puiIndex_p,
unsigned int *puiSubIndex_p, unsigned int *puiSubIndex_p,
unsigned int *puiBitOffset_p, unsigned int *puiBitOffset_p,
unsigned int *puiBitSize_p); unsigned int *puiBitSize_p);
static tEplKernel EplPdouCheckObjectMapping(QWORD qwObjectMapping_p, static tEplKernel EplPdouCheckObjectMapping(u64 qwObjectMapping_p,
tEplObdAccess AccessType_p, tEplObdAccess AccessType_p,
DWORD * pdwAbortCode_p, DWORD * pdwAbortCode_p,
unsigned int *puiPdoSize_p); unsigned int *puiPdoSize_p);
...@@ -233,7 +233,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p) ...@@ -233,7 +233,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p)
unsigned int uiIndexType; unsigned int uiIndexType;
tEplObdSize ObdSize; tEplObdSize ObdSize;
u8 bObjectCount; u8 bObjectCount;
QWORD qwObjectMapping; u64 qwObjectMapping;
tEplObdAccess AccessType; tEplObdAccess AccessType;
u8 bMappSubindex; u8 bMappSubindex;
unsigned int uiCurPdoSize; unsigned int uiCurPdoSize;
...@@ -326,7 +326,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p) ...@@ -326,7 +326,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p)
for (bMappSubindex = 1; bMappSubindex <= bObjectCount; for (bMappSubindex = 1; bMappSubindex <= bObjectCount;
bMappSubindex++) { bMappSubindex++) {
// read object mapping from OD // read object mapping from OD
ObdSize = sizeof(qwObjectMapping); // QWORD ObdSize = sizeof(qwObjectMapping); // u64
Ret = EplObduReadEntry(pParam_p->m_uiIndex, Ret = EplObduReadEntry(pParam_p->m_uiIndex,
bMappSubindex, &qwObjectMapping, bMappSubindex, &qwObjectMapping,
&ObdSize); &ObdSize);
...@@ -360,7 +360,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p) ...@@ -360,7 +360,7 @@ tEplKernel EplPdouCbObdAccess(tEplObdCbParam *pParam_p)
} }
// check existence of object and validity of object length // check existence of object and validity of object length
qwObjectMapping = *((QWORD *) pParam_p->m_pArg); qwObjectMapping = *((u64 *) pParam_p->m_pArg);
Ret = EplPdouCheckObjectMapping(qwObjectMapping, Ret = EplPdouCheckObjectMapping(qwObjectMapping,
AccessType, AccessType,
...@@ -439,7 +439,7 @@ static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam *pParam_p, ...@@ -439,7 +439,7 @@ static tEplKernel EplPdouCheckPdoValidity(tEplObdCbParam *pParam_p,
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void EplPdouDecodeObjectMapping(QWORD qwObjectMapping_p, static void EplPdouDecodeObjectMapping(u64 qwObjectMapping_p,
unsigned int *puiIndex_p, unsigned int *puiIndex_p,
unsigned int *puiSubIndex_p, unsigned int *puiSubIndex_p,
unsigned int *puiBitOffset_p, unsigned int *puiBitOffset_p,
...@@ -480,7 +480,7 @@ static void EplPdouDecodeObjectMapping(QWORD qwObjectMapping_p, ...@@ -480,7 +480,7 @@ static void EplPdouDecodeObjectMapping(QWORD qwObjectMapping_p,
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static tEplKernel EplPdouCheckObjectMapping(QWORD qwObjectMapping_p, static tEplKernel EplPdouCheckObjectMapping(u64 qwObjectMapping_p,
tEplObdAccess AccessType_p, tEplObdAccess AccessType_p,
DWORD * pdwAbortCode_p, DWORD * pdwAbortCode_p,
unsigned int *puiPdoSize_p) unsigned int *puiPdoSize_p)
......
drivers/staging/epl/amix86.c
View file @ a5c30d94
...@@ -89,7 +89,7 @@ typedef struct { ...@@ -89,7 +89,7 @@ typedef struct {
} tdwStruct; } tdwStruct;
typedef struct { typedef struct {
QWORD m_qwQword; u64 m_qwQword;
} tqwStruct; } tqwStruct;
...@@ -415,7 +415,7 @@ DWORD AmiGetDword24FromLe(void *pAddr_p) ...@@ -415,7 +415,7 @@ DWORD AmiGetDword24FromLe(void *pAddr_p)
// State: not tested // State: not tested
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p) void AmiSetQword64ToBe(void *pAddr_p, u64 qwQwordVal_p)
{ {
((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[7]; ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[7];
((u8 *) pAddr_p)[1] = ((u8 *) & qwQwordVal_p)[6]; ((u8 *) pAddr_p)[1] = ((u8 *) & qwQwordVal_p)[6];
...@@ -441,11 +441,11 @@ void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p) ...@@ -441,11 +441,11 @@ void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p)
// State: not tested // State: not tested
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p) void AmiSetQword64ToLe(void *pAddr_p, u64 qwQwordVal_p)
{ {
QWORD *pqwDst; u64 *pqwDst;
pqwDst = (QWORD *) pAddr_p; pqwDst = (u64 *) pAddr_p;
*pqwDst = qwQwordVal_p; *pqwDst = qwQwordVal_p;
} }
...@@ -462,7 +462,7 @@ void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p) ...@@ -462,7 +462,7 @@ void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p)
// State: not tested // State: not tested
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword64FromBe(void *pAddr_p) u64 AmiGetQword64FromBe(void *pAddr_p)
{ {
tqwStruct qwStruct; tqwStruct qwStruct;
...@@ -491,7 +491,7 @@ QWORD AmiGetQword64FromBe(void *pAddr_p) ...@@ -491,7 +491,7 @@ QWORD AmiGetQword64FromBe(void *pAddr_p)
// State: not tested // State: not tested
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword64FromLe(void *pAddr_p) u64 AmiGetQword64FromLe(void *pAddr_p)
{ {
tqwStruct *pqwStruct; tqwStruct *pqwStruct;
tqwStruct qwStruct; tqwStruct qwStruct;
...@@ -517,7 +517,7 @@ QWORD AmiGetQword64FromLe(void *pAddr_p) ...@@ -517,7 +517,7 @@ QWORD AmiGetQword64FromLe(void *pAddr_p)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p) void AmiSetQword40ToBe(void *pAddr_p, u64 qwQwordVal_p)
{ {
((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[4]; ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[4];
...@@ -543,7 +543,7 @@ void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p) ...@@ -543,7 +543,7 @@ void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p) void AmiSetQword40ToLe(void *pAddr_p, u64 qwQwordVal_p)
{ {
((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0];
...@@ -559,13 +559,13 @@ void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p) ...@@ -559,13 +559,13 @@ void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p)
// //
// Parameters: pAddr_p = pointer to source buffer // Parameters: pAddr_p = pointer to source buffer
// //
// Return: QWORD // Return: u64
// //
// State: not tested // State: not tested
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword40FromBe(void *pAddr_p) u64 AmiGetQword40FromBe(void *pAddr_p)
{ {
tqwStruct qwStruct; tqwStruct qwStruct;
...@@ -585,13 +585,13 @@ QWORD AmiGetQword40FromBe(void *pAddr_p) ...@@ -585,13 +585,13 @@ QWORD AmiGetQword40FromBe(void *pAddr_p)
// //
// Parameters: pAddr_p = pointer to source buffer // Parameters: pAddr_p = pointer to source buffer
// //
// Return: QWORD // Return: u64
// //
// State: not tested // State: not tested
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword40FromLe(void *pAddr_p) u64 AmiGetQword40FromLe(void *pAddr_p)
{ {
tqwStruct qwStruct; tqwStruct qwStruct;
...@@ -618,7 +618,7 @@ QWORD AmiGetQword40FromLe(void *pAddr_p) ...@@ -618,7 +618,7 @@ QWORD AmiGetQword40FromLe(void *pAddr_p)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p) void AmiSetQword48ToBe(void *pAddr_p, u64 qwQwordVal_p)
{ {
((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[5]; ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[5];
...@@ -645,7 +645,7 @@ void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p) ...@@ -645,7 +645,7 @@ void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p) void AmiSetQword48ToLe(void *pAddr_p, u64 qwQwordVal_p)
{ {
((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0];
...@@ -661,13 +661,13 @@ void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p) ...@@ -661,13 +661,13 @@ void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p)
// //
// Parameters: pAddr_p = pointer to source buffer // Parameters: pAddr_p = pointer to source buffer
// //
// Return: QWORD // Return: u64
// //
// State: not tested // State: not tested
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword48FromBe(void *pAddr_p) u64 AmiGetQword48FromBe(void *pAddr_p)
{ {
tqwStruct qwStruct; tqwStruct qwStruct;
...@@ -687,13 +687,13 @@ QWORD AmiGetQword48FromBe(void *pAddr_p) ...@@ -687,13 +687,13 @@ QWORD AmiGetQword48FromBe(void *pAddr_p)
// //
// Parameters: pAddr_p = pointer to source buffer // Parameters: pAddr_p = pointer to source buffer
// //
// Return: QWORD // Return: u64
// //
// State: not tested // State: not tested
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword48FromLe(void *pAddr_p) u64 AmiGetQword48FromLe(void *pAddr_p)
{ {
tqwStruct qwStruct; tqwStruct qwStruct;
...@@ -720,7 +720,7 @@ QWORD AmiGetQword48FromLe(void *pAddr_p) ...@@ -720,7 +720,7 @@ QWORD AmiGetQword48FromLe(void *pAddr_p)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p) void AmiSetQword56ToBe(void *pAddr_p, u64 qwQwordVal_p)
{ {
((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[6]; ((u8 *) pAddr_p)[0] = ((u8 *) & qwQwordVal_p)[6];
...@@ -748,7 +748,7 @@ void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p) ...@@ -748,7 +748,7 @@ void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p) void AmiSetQword56ToLe(void *pAddr_p, u64 qwQwordVal_p)
{ {
((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0]; ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0];
...@@ -765,13 +765,13 @@ void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p) ...@@ -765,13 +765,13 @@ void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p)
// //
// Parameters: pAddr_p = pointer to source buffer // Parameters: pAddr_p = pointer to source buffer
// //
// Return: QWORD // Return: u64
// //
// State: not tested // State: not tested
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword56FromBe(void *pAddr_p) u64 AmiGetQword56FromBe(void *pAddr_p)
{ {
tqwStruct qwStruct; tqwStruct qwStruct;
...@@ -791,13 +791,13 @@ QWORD AmiGetQword56FromBe(void *pAddr_p) ...@@ -791,13 +791,13 @@ QWORD AmiGetQword56FromBe(void *pAddr_p)
// //
// Parameters: pAddr_p = pointer to source buffer // Parameters: pAddr_p = pointer to source buffer
// //
// Return: QWORD // Return: u64
// //
// State: not tested // State: not tested
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
QWORD AmiGetQword56FromLe(void *pAddr_p) u64 AmiGetQword56FromLe(void *pAddr_p)
{ {
tqwStruct qwStruct; tqwStruct qwStruct;
......
drivers/staging/epl/global.h
View file @ a5c30d94
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
#define _GLOBAL_H_ #define _GLOBAL_H_
#ifndef QWORD
#define QWORD long long int
#endif
#define TRACE printk #define TRACE printk
// --- logic types --- // --- logic types ---
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7