Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/IsaAcpiDxe

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)
• PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.c (modified) (2 diffs)
• PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf (modified) (4 diffs)
• PcAtChipsetPkg/IsaAcpiDxe/PcatIsaAcpi.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.c

@@ -2 +2 @@
   ISA ACPI Protocol Implementation
 
-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         
@@ -102 +102 @@
 // Table of ISA Controllers
 //
-EFI_ISA_ACPI_RESOURCE_LIST gPcatIsaAcpiDeviceList[7] = {0};
+EFI_ISA_ACPI_RESOURCE_LIST gPcatIsaAcpiDeviceList[7] = {{{0, 0}, NULL}};
 
 /**

trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf

@@ -1 +1 @@
 ## @file
-#   Component description file for PCAT ISA ACPI driver
+# IsaAcpi driver to install EFI_ISA_ACPI_PROTOCOL.
 #
-# Copyright (c) 2005 - 2011, 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        
-# http://opensource.org/licenses/bsd-license.php                                            
-#                                                                                           
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+# Copyright (c) 2005 - 2015, 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
+# http://opensource.org/licenses/bsd-license.php
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
@@ -17 +17 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = IsaAcpi
+  MODULE_UNI_FILE                = IsaAcpi.uni
   FILE_GUID                      = 38A0EC22-FBE7-4911-8BC1-176E0D6C1DBD
   MODULE_TYPE                    = UEFI_DRIVER
@@ -34 +35 @@
   BaseMemoryLib
   PcdLib
-  
+
 [Sources]
   PcatIsaAcpi.h
@@ -42 +43 @@
 
 [Protocols]
-  gEfiPciIoProtocolGuid
-  gEfiIsaAcpiProtocolGuid
+  gEfiPciIoProtocolGuid     ## TO_START
+  gEfiIsaAcpiProtocolGuid   ## BY_START
 
 [Pcd]
-  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiCom1Enable
-  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiCom2Enable
-  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiPs2KeyboardEnable
-  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiPs2MouseEnable
-  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiFloppyAEnable
-  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiFloppyBEnable
+  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiCom1Enable        ## SOMETIMES_CONSUMES
+  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiCom2Enable        ## SOMETIMES_CONSUMES
+  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiPs2KeyboardEnable ## SOMETIMES_CONSUMES
+  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiPs2MouseEnable    ## SOMETIMES_CONSUMES
+  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiFloppyAEnable     ## SOMETIMES_CONSUMES
+  gPcAtChipsetPkgTokenSpaceGuid.PcdIsaAcpiFloppyBEnable     ## SOMETIMES_CONSUMES
+[UserExtensions.TianoCore."ExtraFiles"]
+  IsaAcpiExtra.uni

trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/IsaAcpiDxe/PcatIsaAcpi.c

@@ -2 +2 @@
   EFI PCAT ISA ACPI Driver for a Generic PC Platform
 
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 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
@@ -207 +207 @@
   }
 
-  Supports &= (EFI_PCI_IO_ATTRIBUTE_ISA_IO | EFI_PCI_IO_ATTRIBUTE_ISA_IO_16);
+  Supports &= (UINT64) (EFI_PCI_IO_ATTRIBUTE_ISA_IO | EFI_PCI_IO_ATTRIBUTE_ISA_IO_16);
   if (Supports == 0 || Supports == (EFI_PCI_IO_ATTRIBUTE_ISA_IO | EFI_PCI_IO_ATTRIBUTE_ISA_IO_16)) {
     Status = EFI_UNSUPPORTED;
@@ -357 +357 @@
   }
 
-  Supports &= (EFI_PCI_IO_ATTRIBUTE_ISA_IO | EFI_PCI_IO_ATTRIBUTE_ISA_IO_16);
+  Supports &= (UINT64) (EFI_PCI_IO_ATTRIBUTE_ISA_IO | EFI_PCI_IO_ATTRIBUTE_ISA_IO_16);
 
   PcatIsaAcpiDev->PciIo->Attributes (