Changeset 53336 in vbox

Timestamp:

Nov 14, 2014 5:29:57 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96931

Message:

EFI: Clean up the graphics driver.

Location:

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg

Files:

• VBoxPkg.dec (modified) (1 diff)
• VBoxVgaDxe/VBoxVga.c (modified) (3 diffs)
• VBoxVgaDxe/VBoxVgaDxe.inf (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxPkg.dec

@@ -50 +50 @@
         gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0|UINT32|0x00001004
         gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0|UINT32|0x00001005
+        gVBoxVgaPkgTokenSpaceGuid.PcdDriverSupportedEfiVersion|0x0002000a|UINT32|0x00010003
 
 ## XXX - boot mode - gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode|1|UINT32|0x00001006

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVga.c

@@ -515 +515 @@
                       &gEfiGraphicsOutputProtocolGuid,
                       &Private->GraphicsOutput,
-#if 0
                       &gEfiEdidDiscoveredProtocolGuid,
                       &Private->EdidDiscovered,
                       &gEfiEdidActiveProtocolGuid,
                       &Private->EdidActive,
-#endif
                       NULL
                       );
@@ -1063 +1061 @@
   ASSERT_EFI_ERROR (Status);
 
-#if 0
   //
   // Install EFI Driver Supported EFI Version Protocol required for
@@ -1073 +1070 @@
                   &gEfiDriverSupportedEfiVersionProtocolGuid,
                   &gVBoxVgaDriverSupportedEfiVersion,
+                  &gEfiAppleFrameBufferInfoGuid,
+                  &gAppleFrameBufferInfo,
                   NULL
                   );
   ASSERT_EFI_ERROR (Status);
-#endif
-  Status = gBS->InstallMultipleProtocolInterfaces (
-      &ImageHandle,
-      &gEfiAppleFrameBufferInfoGuid,
-      &gAppleFrameBufferInfo,
-      NULL
-                                                   );
-  ASSERT_EFI_ERROR (Status);
-
 
   return Status;

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaDxe.inf

@@ -62 +62 @@
   ENTRY_POINT                    = InitializeVBoxVga
 
-  PCI_VENDOR_ID  = 0x1013
-  PCI_DEVICE_ID  = 0x00A8
+  PCI_VENDOR_ID  = 0x80EE
+  PCI_DEVICE_ID  = 0xBEEF
   PCI_CLASS_CODE = 0x030000
   PCI_REVISION   = 0x00
@@ -116 +116 @@
   gVBoxVgaPkgTokenSpaceGuid.PcdSupportGop
   gVBoxVgaPkgTokenSpaceGuid.PcdSupportUga
+
+[Pcd]
+  gVBoxVgaPkgTokenSpaceGuid.PcdDriverSupportedEfiVersion