tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/VirtioNetDxe: Fix build errors on VS2012 (IA32 & X64) 

These changes were needed in addition to the silence.patch
that Laszlo posted on May 28.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14420 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jordan Justen 2013-06-14 07:41:05 +00:00 committed by jljusten
parent 9f3acbb5c9
commit 8258c4e643
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OvmfPkg/VirtioNetDxe/SnpGetStatus.c
View File

@ -4,7 +4,7 @@
any.
Copyright (C) 2013, Red Hat, Inc.
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
@ -136,12 +136,12 @@ VirtioNetGetStatus (
UsedElemIdx = Dev->TxLastUsed++ % Dev->TxRing.QueueSize;
DescIdx = Dev->TxRing.Used.UsedElem[UsedElemIdx].Id;
ASSERT (DescIdx < 2 * Dev->TxMaxPending - 1);
ASSERT (DescIdx < (UINT32) (2 * Dev->TxMaxPending - 1));
//
// report buffer address to caller that has been enqueued by caller
//
*TxBuf = (VOID *) Dev->TxRing.Desc[DescIdx + 1].Addr;
*TxBuf = (VOID *)(UINTN) Dev->TxRing.Desc[DescIdx + 1].Addr;
//
// now this descriptor can be used again to enqueue a transmit buffer

4
OvmfPkg/VirtioNetDxe/SnpReceive.c
View File

@ -3,7 +3,7 @@
Implementation of the SNP.Receive() function and its private helpers if any.
Copyright (C) 2013, Red Hat, Inc.
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
@ -142,7 +142,7 @@ VirtioNetReceive (
*HeaderSize = Dev->Snm.MediaHeaderSize;
}
RxPtr = (UINT8 *)Dev->RxRing.Desc[DescIdx + 1].Addr;
RxPtr = (UINT8 *)(UINTN) Dev->RxRing.Desc[DescIdx + 1].Addr;
CopyMem (Buffer, RxPtr, RxLen);
if (DestAddr != NULL) {

4
OvmfPkg/VirtioNetDxe/SnpTransmit.c
View File

@ -3,7 +3,7 @@
Implementation of the SNP.Transmit() function and its private helpers if any.
Copyright (C) 2013, Red Hat, Inc.
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
@ -140,7 +140,7 @@ VirtioNetTransmit (
*Ptr++ = (UINT8) (*Protocol >> 8);
*Ptr++ = (UINT8) *Protocol;
ASSERT (Ptr - (UINT8 *) Buffer == Dev->Snm.MediaHeaderSize);
ASSERT ((UINTN) (Ptr - (UINT8 *) Buffer) == Dev->Snm.MediaHeaderSize);
}
//