Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/UefiCpuPkg/CpuIo2Dxe

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c (modified) (2 diffs)
• UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c

@@ -2 +2 @@
   Produces the CPU I/O 2 Protocol.
 
-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 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         
@@ -117 +117 @@
   // Check to see if Width is in the valid range
   //
-  if (Width < 0 || Width >= EfiCpuIoWidthMaximum) {
+  if ((UINT32)Width >= EfiCpuIoWidthMaximum) {
     return EFI_INVALID_PARAMETER;
   }

trunk/src/VBox/Devices/EFI/Firmware/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf

@@ -1 +1 @@
 ## @file
-#  Produces the CPU I/O 2 Protocol.
+#  Produces the CPU I/O 2 Protocol by using the services of the I/O Library.
 #
-#  This DXE driver produces of the CPU I/O 2 Protocol, as introduced by PI 1.2.
-#
-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2014, 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
@@ -18 +16 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = CpuIo2Dxe
+  MODULE_UNI_FILE                = CpuIo2Dxe.uni
   FILE_GUID                      = A19B1FE7-C1BC-49F8-875F-54A5D542443F
   MODULE_TYPE                    = DXE_DRIVER
@@ -48 +47 @@
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  CpuIo2DxeExtra.uni