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

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

drivers/staging/epl/Epl.h

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ typedef struct { 
	DWORD m_dwProductCode;	// NMT_IdentityObject_REC.ProductCode_U32

	DWORD m_dwRevisionNumber;	// NMT_IdentityObject_REC.RevisionNo_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_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

drivers/staging/epl/EplAmi.h

+19 −19
Original line number Diff line number Diff line
@@ -177,8 +177,8 @@ DWORD AmiGetDword24FromLe(void *pAddr_p); 
//

//---------------------------------------------------------------------------



void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p);

void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p);

void AmiSetQword40ToBe(void *pAddr_p, u64 qwQwordVal_p);

void AmiSetQword40ToLe(void *pAddr_p, u64 qwQwordVal_p);



//---------------------------------------------------------------------------

//
@@ -188,12 +188,12 @@ void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p); 
//

// Parameters:  pAddr_p         = pointer to source buffer

//

// Return:      QWORD

// Return:      u64

//

//---------------------------------------------------------------------------



QWORD AmiGetQword40FromBe(void *pAddr_p);

QWORD AmiGetQword40FromLe(void *pAddr_p);

u64 AmiGetQword40FromBe(void *pAddr_p);

u64 AmiGetQword40FromLe(void *pAddr_p);



//---------------------------------------------------------------------------

//
@@ -208,8 +208,8 @@ QWORD AmiGetQword40FromLe(void *pAddr_p); 
//

//---------------------------------------------------------------------------



void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p);

void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p);

void AmiSetQword48ToBe(void *pAddr_p, u64 qwQwordVal_p);

void AmiSetQword48ToLe(void *pAddr_p, u64 qwQwordVal_p);



//---------------------------------------------------------------------------

//
@@ -219,12 +219,12 @@ void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p); 
//

// Parameters:  pAddr_p         = pointer to source buffer

//

// Return:      QWORD

// Return:      u64

//

//---------------------------------------------------------------------------



QWORD AmiGetQword48FromBe(void *pAddr_p);

QWORD AmiGetQword48FromLe(void *pAddr_p);

u64 AmiGetQword48FromBe(void *pAddr_p);

u64 AmiGetQword48FromLe(void *pAddr_p);



//---------------------------------------------------------------------------

//
@@ -239,8 +239,8 @@ QWORD AmiGetQword48FromLe(void *pAddr_p); 
//

//---------------------------------------------------------------------------



void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p);

void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p);

void AmiSetQword56ToBe(void *pAddr_p, u64 qwQwordVal_p);

void AmiSetQword56ToLe(void *pAddr_p, u64 qwQwordVal_p);



//---------------------------------------------------------------------------

//
@@ -250,12 +250,12 @@ void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p); 
//

// Parameters:  pAddr_p         = pointer to source buffer

//

// Return:      QWORD

// Return:      u64

//

//---------------------------------------------------------------------------



QWORD AmiGetQword56FromBe(void *pAddr_p);

QWORD AmiGetQword56FromLe(void *pAddr_p);

u64 AmiGetQword56FromBe(void *pAddr_p);

u64 AmiGetQword56FromLe(void *pAddr_p);



//---------------------------------------------------------------------------

//
@@ -270,8 +270,8 @@ QWORD AmiGetQword56FromLe(void *pAddr_p); 
//

//---------------------------------------------------------------------------



void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p);

void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p);

void AmiSetQword64ToBe(void *pAddr_p, u64 qwQwordVal_p);

void AmiSetQword64ToLe(void *pAddr_p, u64 qwQwordVal_p);



//---------------------------------------------------------------------------

//
@@ -285,8 +285,8 @@ void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p); 
//

//---------------------------------------------------------------------------



QWORD AmiGetQword64FromBe(void *pAddr_p);

QWORD AmiGetQword64FromLe(void *pAddr_p);

u64 AmiGetQword64FromBe(void *pAddr_p);

u64 AmiGetQword64FromLe(void *pAddr_p);



//---------------------------------------------------------------------------

//

drivers/staging/epl/EplDll.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ typedef struct { 
	DWORD m_dwProductCode;	// NMT_IdentityObject_REC.ProductCode_U32

	DWORD m_dwRevisionNumber;	// NMT_IdentityObject_REC.RevisionNo_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_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

drivers/staging/epl/EplFrame.h

+3 −3
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ typedef struct { 
	// Offset 20

	tEplNetTime m_le_NetTime;	// supported if D_NMT_NetTimeIsRealTime_BOOL is set

	// 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;
@@ -201,7 +201,7 @@ typedef struct { 
	u8 m_le_bFlag2;	// Flags: PR, RS

	u8 m_le_bNmtStatus;	// NMT state

	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];



} PACK_STRUCT tEplStatusResponse;
@@ -225,7 +225,7 @@ typedef struct { 
	DWORD m_le_dwProductCode;	// NMT_IdentityObject_REC.ProductCode_U32

	DWORD m_le_dwRevisionNumber;	// NMT_IdentityObject_REC.RevisionNo_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_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

drivers/staging/epl/EplObd.c

+19 −19
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned 
	case kEplObdTypInt40:

	case kEplObdTypUInt40:

		{

			AmiSetQword40ToLe(pDstData_p, *((QWORD *) pSrcData));

			AmiSetQword40ToLe(pDstData_p, *((u64 *) pSrcData));

			break;

		}
@@ -1113,7 +1113,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned 
	case kEplObdTypInt48:

	case kEplObdTypUInt48:

		{

			AmiSetQword48ToLe(pDstData_p, *((QWORD *) pSrcData));

			AmiSetQword48ToLe(pDstData_p, *((u64 *) pSrcData));

			break;

		}
@@ -1121,7 +1121,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned 
	case kEplObdTypInt56:

	case kEplObdTypUInt56:

		{

			AmiSetQword56ToLe(pDstData_p, *((QWORD *) pSrcData));

			AmiSetQword56ToLe(pDstData_p, *((u64 *) pSrcData));

			break;

		}
@@ -1130,7 +1130,7 @@ EPLDLLEXPORT tEplKernel EplObdReadEntryToLe(EPL_MCO_DECL_INSTANCE_PTR_ unsigned 
	case kEplObdTypUInt64:

	case kEplObdTypReal64:

		{

			AmiSetQword64ToLe(pDstData_p, *((QWORD *) pSrcData));

			AmiSetQword64ToLe(pDstData_p, *((u64 *) pSrcData));

			break;

		}
@@ -1191,7 +1191,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign 
	tEplObdCbParam CbParam;

	void *pDstData;

	tEplObdSize ObdSize;

	QWORD qwBuffer;

	u64 qwBuffer;

	void *pBuffer = &qwBuffer;



	Ret = EplObdWriteEntryPre(EPL_MCO_INSTANCE_PTR_
@@ -1255,7 +1255,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign 
	case kEplObdTypInt40:

	case kEplObdTypUInt40:

		{

			*((QWORD *) pBuffer) = AmiGetQword40FromLe(pSrcData_p);

			*((u64 *) pBuffer) = AmiGetQword40FromLe(pSrcData_p);

			break;

		}
@@ -1263,7 +1263,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign 
	case kEplObdTypInt48:

	case kEplObdTypUInt48:

		{

			*((QWORD *) pBuffer) = AmiGetQword48FromLe(pSrcData_p);

			*((u64 *) pBuffer) = AmiGetQword48FromLe(pSrcData_p);

			break;

		}
@@ -1271,7 +1271,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign 
	case kEplObdTypInt56:

	case kEplObdTypUInt56:

		{

			*((QWORD *) pBuffer) = AmiGetQword56FromLe(pSrcData_p);

			*((u64 *) pBuffer) = AmiGetQword56FromLe(pSrcData_p);

			break;

		}
@@ -1280,7 +1280,7 @@ EPLDLLEXPORT tEplKernel EplObdWriteEntryFromLe(EPL_MCO_DECL_INSTANCE_PTR_ unsign 
	case kEplObdTypUInt64:

	case kEplObdTypReal64:

		{

			*((QWORD *) pBuffer) = AmiGetQword64FromLe(pSrcData_p);

			*((u64 *) pBuffer) = AmiGetQword64FromLe(pSrcData_p);

			break;

		}
@@ -1740,18 +1740,18 @@ static tEplKernel EplObdCheckObjectRange(tEplObdSubEntryPtr pSubindexEntry_p, 
	case kEplObdTypInt64:



		// switch to lower limit

		pRangeData = ((signed QWORD *)pRangeData) + 1;

		pRangeData = ((signed u64 *)pRangeData) + 1;



		// check if value is to low

		if (*((signed QWORD *)pData_p) < *((signed QWORD *)pRangeData)) {

		if (*((signed u64 *)pData_p) < *((signed u64 *)pRangeData)) {

			Ret = kEplObdValueTooLow;

			break;

		}

		// switch to higher limit

		pRangeData = ((signed QWORD *)pRangeData) + 1;

		pRangeData = ((signed u64 *)pRangeData) + 1;



		// check if value is to high

		if (*((signed QWORD *)pData_p) > *((signed QWORD *)pRangeData)) {

		if (*((signed u64 *)pData_p) > *((signed u64 *)pRangeData)) {

			Ret = kEplObdValueTooHigh;

		}
@@ -1764,20 +1764,20 @@ static tEplKernel EplObdCheckObjectRange(tEplObdSubEntryPtr pSubindexEntry_p, 
	case kEplObdTypUInt64:



		// switch to lower limit

		pRangeData = ((unsigned QWORD *)pRangeData) + 1;

		pRangeData = ((unsigned u64 *)pRangeData) + 1;



		// check if value is to low

		if (*((unsigned QWORD *)pData_p) <

		    *((unsigned QWORD *)pRangeData)) {

		if (*((unsigned u64 *)pData_p) <

		    *((unsigned u64 *)pRangeData)) {

			Ret = kEplObdValueTooLow;

			break;

		}

		// switch to higher limit

		pRangeData = ((unsigned QWORD *)pRangeData) + 1;

		pRangeData = ((unsigned u64 *)pRangeData) + 1;



		// check if value is to high

		if (*((unsigned QWORD *)pData_p) >

		    *((unsigned QWORD *)pRangeData)) {

		if (*((unsigned u64 *)pData_p) >

		    *((unsigned u64 *)pRangeData)) {

			Ret = kEplObdValueTooHigh;

		}