Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Staging: epl: remove DWORD 



It's u32 in kernelspace, not DWORD.

Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a5c30d94

drivers/staging/epl/Debug.h

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ extern "C" { 
                                                    DEBUG_LVL_ASSERT_TRACE4 ( \

                                                        "Assertion failed: line %d file '%s'\n" \

                                                        "    -> '%s'\n" \

                                                        "    -> 0x%08lX\n", __LINE__, __FILE__, str, (DWORD) p1); \

                                                        "    -> 0x%08lX\n", __LINE__, __FILE__, str, (u32) p1); \

                                                    while (1); }

drivers/staging/epl/Edrv8139.c

+27 −27
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ 
// TracePoint support for realtime-debugging

#ifdef _DBG_TRACE_POINTS_

void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);

void TgtDbgPostTraceValue(DWORD dwTraceValue_p);

void TgtDbgPostTraceValue(u32 dwTraceValue_p);

#define TGT_DBG_SIGNAL_TRACE_POINT(p)   TgtDbgSignalTracePoint(p)

#define TGT_DBG_POST_TRACE_VALUE(v)     TgtDbgPostTraceValue(v)

#else
@@ -456,7 +456,7 @@ tEplKernel EdrvShutdown(void) 
tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p)

{

	tEplKernel Ret = kEplSuccessful;

	DWORD dwData;

	u32 dwData;

	u8 bHash;



	bHash = EdrvCalcHash(pbMacAddr_p);
@@ -497,7 +497,7 @@ tEplKernel EdrvDefineRxMacAddrEntry(u8 * pbMacAddr_p) 
tEplKernel EdrvUndefineRxMacAddrEntry(u8 * pbMacAddr_p)

{

	tEplKernel Ret = kEplSuccessful;

	DWORD dwData;

	u32 dwData;

	u8 bHash;



	bHash = EdrvCalcHash(pbMacAddr_p);
@@ -532,7 +532,7 @@ tEplKernel EdrvUndefineRxMacAddrEntry(u8 * pbMacAddr_p) 
tEplKernel EdrvAllocTxMsgBuffer(tEdrvTxBuffer * pBuffer_p)

{

	tEplKernel Ret = kEplSuccessful;

	DWORD i;

	u32 i;



	if (pBuffer_p->m_uiMaxBufferLen > EDRV_MAX_FRAME_SIZE) {

		Ret = kEplEdrvNoFreeBufEntry;
@@ -605,7 +605,7 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p) 
{

	tEplKernel Ret = kEplSuccessful;

	unsigned int uiBufferNumber;

	DWORD dwTemp;

	u32 dwTemp;



	uiBufferNumber = pBuffer_p->m_uiBufferNumber;
@@ -620,8 +620,8 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p) 
		dwTemp =

		    EDRV_REGDW_READ((EDRV_REGDW_TSD0 +

				     (EdrvInstance_l.m_uiCurTxDesc *

				      sizeof(DWORD))));

		printk("%s InvOp TSD%u = 0x%08lX", __func__,

				      sizeof(u32))));

		printk("%s InvOp TSD%u = 0x%08X", __func__,

		       EdrvInstance_l.m_uiCurTxDesc, dwTemp);

		printk("  Cmd = 0x%02X\n",

		       (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND));
@@ -640,22 +640,22 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p) 
	}

	// set DMA address of buffer

	EDRV_REGDW_WRITE((EDRV_REGDW_TSAD0 +

			  (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD))),

			  (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32))),

			 (EdrvInstance_l.m_pTxBufDma +

			  (uiBufferNumber * EDRV_MAX_FRAME_SIZE)));

	dwTemp =

	    EDRV_REGDW_READ((EDRV_REGDW_TSAD0 +

			     (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD))));

			     (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32))));

//    printk("%s TSAD%u = 0x%08lX", __func__, EdrvInstance_l.m_uiCurTxDesc, dwTemp);



	// start transmission

	EDRV_REGDW_WRITE((EDRV_REGDW_TSD0 +

			  (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD))),

			  (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32))),

			 (EDRV_REGDW_TSD_TXTH_DEF | pBuffer_p->m_uiTxMsgLen));

	dwTemp =

	    EDRV_REGDW_READ((EDRV_REGDW_TSD0 +

			     (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD))));

//    printk(" TSD%u = 0x%08lX / 0x%08lX\n", EdrvInstance_l.m_uiCurTxDesc, dwTemp, (DWORD)(EDRV_REGDW_TSD_TXTH_DEF | pBuffer_p->m_uiTxMsgLen));

			     (EdrvInstance_l.m_uiCurTxDesc * sizeof(u32))));

//    printk(" TSD%u = 0x%08lX / 0x%08lX\n", EdrvInstance_l.m_uiCurTxDesc, dwTemp, (u32)(EDRV_REGDW_TSD_TXTH_DEF | pBuffer_p->m_uiTxMsgLen));



      Exit:

	return Ret;
@@ -762,8 +762,8 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, 
	tEdrvRxBuffer RxBuffer;

	tEdrvTxBuffer *pTxBuffer;

	WORD wStatus;

	DWORD dwTxStatus;

	DWORD dwRxStatus;

	u32 dwTxStatus;

	u32 dwRxStatus;

	WORD wCurRx;

	u8 *pbRxBuf;

	unsigned int uiLength;
@@ -793,7 +793,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, 
		dwTxStatus =

		    EDRV_REGDW_READ((EDRV_REGDW_TSD0 +

				     (EdrvInstance_l.m_uiCurTxDesc *

				      sizeof(DWORD))));

				      sizeof(u32))));

		if ((dwTxStatus & (EDRV_REGDW_TSD_TOK | EDRV_REGDW_TSD_TABT | EDRV_REGDW_TSD_TUN)) != 0) {	// transmit finished

			EdrvInstance_l.m_uiCurTxDesc =

			    (EdrvInstance_l.m_uiCurTxDesc + 1) & 0x03;
@@ -855,8 +855,8 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, 
			// calculate pointer to current frame in receive buffer

			pbRxBuf = EdrvInstance_l.m_pbRxBuf + wCurRx;



			// read receive status DWORD

			dwRxStatus = le32_to_cpu(*((DWORD *) pbRxBuf));

			// read receive status u32

			dwRxStatus = le32_to_cpu(*((u32 *) pbRxBuf));



			// calculate length of received frame

			uiLength = dwRxStatus >> 16;
@@ -896,7 +896,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, 
				    m_pfnRxHandler(&RxBuffer);

			}



			// calulate new offset (DWORD aligned)

			// calulate new offset (u32 aligned)

			wCurRx =

			    (WORD) ((wCurRx + uiLength + sizeof(dwRxStatus) +

				     3) & ~0x3);
@@ -941,7 +941,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, 
static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)

{

	int iResult = 0;

	DWORD dwTemp;

	u32 dwTemp;



	if (EdrvInstance_l.m_pPciDev != NULL) {	// Edrv is already connected to a PCI device

		printk("%s device %s discarded\n", __func__,
@@ -1008,7 +1008,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId) 
	dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TCR);

	if (((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_C)

	    && ((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_D)) {	// unsupported chip

		printk("%s Unsupported chip! TCR = 0x%08lX\n", __func__,

		printk("%s Unsupported chip! TCR = 0x%08X\n", __func__,

		       dwTemp);

		iResult = -ENODEV;

		goto Exit;
@@ -1043,11 +1043,11 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId) 
            printk("%s set local MAC address\n", __func__);

            // write this MAC address to controller

            EDRV_REGDW_WRITE(EDRV_REGDW_IDR0,

                le32_to_cpu(*((DWORD*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[0])));

                le32_to_cpu(*((u32*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[0])));

            dwTemp = EDRV_REGDW_READ(EDRV_REGDW_IDR0);



            EDRV_REGDW_WRITE(EDRV_REGDW_IDR4,

                le32_to_cpu(*((DWORD*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[4])));

                le32_to_cpu(*((u32*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[4])));

            dwTemp = EDRV_REGDW_READ(EDRV_REGDW_IDR4);

            break;

        }
@@ -1217,11 +1217,11 @@ static void EdrvRemoveOne(struct pci_dev *pPciDev) 


static u8 EdrvCalcHash(u8 * pbMAC_p)

{

	DWORD dwByteCounter;

	DWORD dwBitCounter;

	DWORD dwData;

	DWORD dwCrc;

	DWORD dwCarry;

	u32 dwByteCounter;

	u32 dwBitCounter;

	u32 dwData;

	u32 dwCrc;

	u32 dwCarry;

	u8 *pbData;

	u8 bHash;

drivers/staging/epl/Epl.h

+19 −19
Original line number Diff line number Diff line
@@ -142,22 +142,22 @@ typedef struct { 
	u8 m_abMacAddress[6];	// local MAC address



	// 0x1F82: NMT_FeatureFlags_U32

	DWORD m_dwFeatureFlags;

	u32 m_dwFeatureFlags;

	// Cycle Length (0x1006: NMT_CycleLen_U32) in [us]

	DWORD m_dwCycleLen;	// required for error detection

	u32 m_dwCycleLen;	// required for error detection

	// 0x1F98: NMT_CycleTiming_REC

	// 0x1F98.1: IsochrTxMaxPayload_U16

	unsigned int m_uiIsochrTxMaxPayload;	// const

	// 0x1F98.2: IsochrRxMaxPayload_U16

	unsigned int m_uiIsochrRxMaxPayload;	// const

	// 0x1F98.3: PResMaxLatency_U32

	DWORD m_dwPresMaxLatency;	// const in [ns], only required for IdentRes

	u32 m_dwPresMaxLatency;	// const in [ns], only required for IdentRes

	// 0x1F98.4: PReqActPayloadLimit_U16

	unsigned int m_uiPreqActPayloadLimit;	// required for initialisation (+28 bytes)

	// 0x1F98.5: PResActPayloadLimit_U16

	unsigned int m_uiPresActPayloadLimit;	// required for initialisation of Pres frame (+28 bytes)

	// 0x1F98.6: ASndMaxLatency_U32

	DWORD m_dwAsndMaxLatency;	// const in [ns], only required for IdentRes

	u32 m_dwAsndMaxLatency;	// const in [ns], only required for IdentRes

	// 0x1F98.7: MultiplCycleCnt_U8

	unsigned int m_uiMultiplCycleCnt;	// required for error detection

	// 0x1F98.8: AsyncMTU_U16
@@ -167,28 +167,28 @@ typedef struct { 
	// $$$ Multiplexed Slot



	// 0x1C14: DLL_LossOfFrameTolerance_U32 in [ns]

	DWORD m_dwLossOfFrameTolerance;

	u32 m_dwLossOfFrameTolerance;



	// 0x1F8A: NMT_MNCycleTiming_REC

	// 0x1F8A.1: WaitSoCPReq_U32 in [ns]

	DWORD m_dwWaitSocPreq;

	u32 m_dwWaitSocPreq;



	// 0x1F8A.2: AsyncSlotTimeout_U32 in [ns]

	DWORD m_dwAsyncSlotTimeout;

	u32 m_dwAsyncSlotTimeout;



	DWORD m_dwDeviceType;	// NMT_DeviceType_U32

	DWORD m_dwVendorId;	// NMT_IdentityObject_REC.VendorId_U32

	DWORD m_dwProductCode;	// NMT_IdentityObject_REC.ProductCode_U32

	DWORD m_dwRevisionNumber;	// NMT_IdentityObject_REC.RevisionNo_U32

	DWORD m_dwSerialNumber;	// NMT_IdentityObject_REC.SerialNo_U32

	u32 m_dwDeviceType;	// NMT_DeviceType_U32

	u32 m_dwVendorId;	// NMT_IdentityObject_REC.VendorId_U32

	u32 m_dwProductCode;	// NMT_IdentityObject_REC.ProductCode_U32

	u32 m_dwRevisionNumber;	// NMT_IdentityObject_REC.RevisionNo_U32

	u32 m_dwSerialNumber;	// NMT_IdentityObject_REC.SerialNo_U32

	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

	DWORD m_dwApplicationSwTime;	// PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device

	DWORD m_dwIpAddress;

	DWORD m_dwSubnetMask;

	DWORD m_dwDefaultGateway;

	u32 m_dwVerifyConfigurationDate;	// CFM_VerifyConfiguration_REC.ConfDate_U32

	u32 m_dwVerifyConfigurationTime;	// CFM_VerifyConfiguration_REC.ConfTime_U32

	u32 m_dwApplicationSwDate;	// PDL_LocVerApplSw_REC.ApplSwDate_U32 on programmable device or date portion of NMT_ManufactSwVers_VS on non-programmable device

	u32 m_dwApplicationSwTime;	// PDL_LocVerApplSw_REC.ApplSwTime_U32 on programmable device or time portion of NMT_ManufactSwVers_VS on non-programmable device

	u32 m_dwIpAddress;

	u32 m_dwSubnetMask;

	u32 m_dwDefaultGateway;

	u8 m_sHostname[32];

	u8 m_abVendorSpecificExt2[48];

drivers/staging/epl/EplAmi.h

+9 −9
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ extern "C" { 
#define AmiSetByteToLe(pAddr_p, bByteVal_p)  {*(u8 *)(pAddr_p) = (bByteVal_p);}



void AmiSetWordToBe(void *pAddr_p, WORD wWordVal_p);

void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p);

void AmiSetDwordToBe(void *pAddr_p, u32 dwDwordVal_p);

void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p);

void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p);

void AmiSetDwordToLe(void *pAddr_p, u32 dwDwordVal_p);



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

//
@@ -127,9 +127,9 @@ void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p); 
#define AmiGetByteFromLe(pAddr_p)  (*(u8 *)(pAddr_p))



WORD AmiGetWordFromBe(void *pAddr_p);

DWORD AmiGetDwordFromBe(void *pAddr_p);

u32 AmiGetDwordFromBe(void *pAddr_p);

WORD AmiGetWordFromLe(void *pAddr_p);

DWORD AmiGetDwordFromLe(void *pAddr_p);

u32 AmiGetDwordFromLe(void *pAddr_p);



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

//
@@ -144,8 +144,8 @@ DWORD AmiGetDwordFromLe(void *pAddr_p); 
//

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



void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p);

void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p);

void AmiSetDword24ToBe(void *pAddr_p, u32 dwDwordVal_p);

void AmiSetDword24ToLe(void *pAddr_p, u32 dwDwordVal_p);



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

//
@@ -155,12 +155,12 @@ void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p); 
//

// Parameters:  pAddr_p         = pointer to source buffer

//

// Return:      DWORD           = read value

// Return:      u32           = read value

//

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



DWORD AmiGetDword24FromBe(void *pAddr_p);

DWORD AmiGetDword24FromLe(void *pAddr_p);

u32 AmiGetDword24FromBe(void *pAddr_p);

u32 AmiGetDword24FromLe(void *pAddr_p);



//#ifdef USE_VAR64

drivers/staging/epl/EplApiGeneric.c

+2 −2
Original line number Diff line number Diff line
@@ -997,8 +997,8 @@ tEplKernel EplApiCbObdAccess(tEplObdCbParam *pParam_p) 
		{

			if ((pParam_p->m_ObdEvent == kEplObdEvPostWrite)

			    && (pParam_p->m_uiSubIndex == 3)

			    && (*((DWORD *) pParam_p->m_pArg) != 0)) {

				DWORD dwVerifyConfInvalid = 0;

			    && (*((u32 *) pParam_p->m_pArg) != 0)) {

				u32 dwVerifyConfInvalid = 0;

				// set CFM_VerifyConfiguration_REC.VerifyConfInvalid_U32 to 0

				Ret =

				    EplObdWriteEntry(0x1020, 4,