Revision: 13904
http://edk2.svn.sourceforge.net/edk2/?rev=13904&view=rev
Author: vanjeff
Date: 2012-11-01 02:53:52 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Sync patch r13863 from main trunk.
Use %lx to print UINT64 value instead of %x.
Revision Links:
--------------
http://edk2.svn.sourceforge.net/edk2/?rev=13863&view=rev
Modified Paths:
--------------
branches/UDK2010.SR1/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
branches/UDK2010.SR1/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
Modified:
branches/UDK2010.SR1/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
2012-11-01 02:10:31 UTC (rev 13903)
+++ branches/UDK2010.SR1/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
2012-11-01 02:53:52 UTC (rev 13904)
@@ -334,7 +334,7 @@
DEBUG ((
EFI_D_INFO,
- " BAR[%d]: Type = %s; Alignment = 0x%x;\tLength = 0x%x;\tOffset =
0x%02x\n",
+ " BAR[%d]: Type = %s; Alignment = 0x%lx;\tLength = 0x%lx;\tOffset =
0x%02x\n",
Index, mBarTypeStr[MIN (PciIoDevice->PciBar[Index].BarType,
PciBarTypeMaxType)],
PciIoDevice->PciBar[Index].Alignment, PciIoDevice->PciBar[Index].Length,
PciIoDevice->PciBar[Index].Offset
));
@@ -347,7 +347,7 @@
DEBUG ((
EFI_D_INFO,
- " VFBAR[%d]: Type = %s; Alignment = 0x%x;\tLength = 0x%x;\tOffset =
0x%02x\n",
+ " VFBAR[%d]: Type = %s; Alignment = 0x%lx;\tLength = 0x%lx;\tOffset =
0x%02x\n",
Index, mBarTypeStr[MIN (PciIoDevice->VfPciBar[Index].BarType,
PciBarTypeMaxType)],
PciIoDevice->VfPciBar[Index].Alignment,
PciIoDevice->VfPciBar[Index].Length, PciIoDevice->VfPciBar[Index].Offset
));
@@ -980,8 +980,8 @@
if (IS_PCI_LPC (&PciIoDevice->Pci)) {
Attributes |= EFI_PCI_IO_ATTRIBUTE_ISA_MOTHERBOARD_IO;
- Attributes |= (mReserveIsaAliases ? EFI_PCI_IO_ATTRIBUTE_ISA_IO : \
- EFI_PCI_IO_ATTRIBUTE_ISA_IO_16);
+ Attributes |= (mReserveIsaAliases ? (UINT64)
EFI_PCI_IO_ATTRIBUTE_ISA_IO : \
+ (UINT64)
EFI_PCI_IO_ATTRIBUTE_ISA_IO_16);
}
if (IS_PCI_BRIDGE (&PciIoDevice->Pci) || IS_CARDBUS_BRIDGE
(&PciIoDevice->Pci)) {
@@ -1007,8 +1007,8 @@
if (IS_PCI_VGA (&PciIoDevice->Pci)) {
Attributes |= EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY;
- Attributes |= (mReserveVgaAliases ? EFI_PCI_IO_ATTRIBUTE_VGA_IO : \
- EFI_PCI_IO_ATTRIBUTE_VGA_IO_16);
+ Attributes |= (mReserveVgaAliases ? (UINT64)
EFI_PCI_IO_ATTRIBUTE_VGA_IO : \
+ (UINT64)
EFI_PCI_IO_ATTRIBUTE_VGA_IO_16);
}
}
Modified: branches/UDK2010.SR1/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
2012-11-01 02:10:31 UTC (rev 13903)
+++ branches/UDK2010.SR1/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
2012-11-01 02:53:52 UTC (rev 13904)
@@ -1,7 +1,7 @@
/** @file
Internal library implementation for PCI Bus module.
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2012, 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 distribution. The full text of the license may be
found at
@@ -182,7 +182,7 @@
if ((BridgeResource != NULL) && (BridgeResource->Length != 0)) {
DEBUG ((
- EFI_D_INFO, "Type = %s; Base = 0x%x;\tLength = 0x%x;\tAlignment =
0x%x\n",
+ EFI_D_INFO, "Type = %s; Base = 0x%lx;\tLength = 0x%lx;\tAlignment =
0x%lx\n",
mBarTypeStr[MIN (BridgeResource->ResType, PciBarTypeMaxType)],
BridgeResource->PciDev->PciBar[BridgeResource->Bar].BaseAddress,
BridgeResource->Length, BridgeResource->Alignment
@@ -195,7 +195,7 @@
if (Resource->ResourceUsage == PciResUsageTypical) {
Bar = Resource->Virtual ? Resource->PciDev->VfPciBar :
Resource->PciDev->PciBar;
DEBUG ((
- EFI_D_INFO, " Base = 0x%x;\tLength = 0x%x;\tAlignment = 0x%x;\tOwner
= %s ",
+ EFI_D_INFO, " Base = 0x%lx;\tLength = 0x%lx;\tAlignment =
0x%lx;\tOwner = %s ",
Bar[Resource->Bar].BaseAddress, Resource->Length,
Resource->Alignment,
IS_PCI_BRIDGE (&Resource->PciDev->Pci) ? L"PPB" :
IS_CARDBUS_BRIDGE (&Resource->PciDev->Pci) ? L"P2C" :
@@ -225,7 +225,7 @@
));
}
} else {
- DEBUG ((EFI_D_INFO, " Padding:Length = 0x%x;\tAlignment = 0x%x\n",
Resource->Length, Resource->Alignment));
+ DEBUG ((EFI_D_INFO, " Padding:Length = 0x%lx;\tAlignment = 0x%lx\n",
Resource->Length, Resource->Alignment));
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
