Changeset 58515 in vbox

Timestamp:

Oct 30, 2015 12:56:07 AM (9 years ago)

Author:

vboxsync

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

103836

Message:

PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.c: Replaced some myserious #if 0 we've added with #ifndef VBOX; commented or #ifdef'ed other changes we've made.

File:

• trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.c (modified) (12 diffs)

trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.c

@@ -87 +87 @@
 };
 
+#ifdef VBOX
 static EFI_STATUS GetPciIo(EFI_DRIVER_BINDING_PROTOCOL *This, EFI_HANDLE hController, EFI_PCI_IO_PROTOCOL **ppPciIo)
 {
@@ -107 +108 @@
     return Status;
 }
+#endif /* VBOX */
 
 /**
@@ -165 +167 @@
 {
   EFI_STATUS                Status;
+  EFI_PCI_IO_PROTOCOL       *PciIo;
   UINT8                     PciClass;
   UINT8                     PciSubClass;
@@ -171 +174 @@
   // Attempt to Open PCI I/O Protocol
   //
-  EFI_PCI_IO_PROTOCOL       *PciIo;
-#if 0
+#ifndef VBOX
   Status = gBS->OpenProtocol (
                   Controller,
@@ -182 +184 @@
                   );
 #else
-    Status = GetPciIo(This, Controller, &PciIo);
+  Status = GetPciIo(This, Controller, &PciIo);
 #endif
   if (EFI_ERROR (Status)) {
@@ -217 +219 @@
   // Examine Ide PCI Configuration table fields
   //
+#ifndef VBOX
+  if ((PciClass != PCI_CLASS_MASS_STORAGE) || (PciSubClass != PCI_CLASS_MASS_STORAGE_IDE)) {
+#else
   if (   (PciClass != PCI_CLASS_MASS_STORAGE)
       || (   PciSubClass != PCI_CLASS_MASS_STORAGE_IDE
           && PciSubClass != 0x6 /* SATA */)) {
+#endif
     Status = EFI_UNSUPPORTED;
   }
@@ -256 +262 @@
 {
   EFI_STATUS           Status;
-
-#if 0
+#ifndef VBOX
+  EFI_PCI_IO_PROTOCOL  *PciIo;
+
   //
   // Now test and open the EfiPciIoProtocol
@@ -264 +271 @@
                   Controller,
                   &gEfiPciIoProtocolGuid,
-                  (VOID **) &gEfiIdeControllerInit->PciIo,
+                  (VOID **) &PciIo,
                   This->DriverBindingHandle,
                   Controller,
@@ -287 +294 @@
   // Install IDE_CONTROLLER_INIT protocol
   //
-  Status = gBS->InstallMultipleProtocolInterfaces (
+  return gBS->InstallMultipleProtocolInterfaces (
                 &Controller,
-                &gEfiIdeControllerInitProtocolGuid, &gEfiIdeControllerInit.Core,
+                &gEfiIdeControllerInitProtocolGuid, &gEfiIdeControllerInit.Core, /* VBox: We added .Core, probably for warnings. */
                 NULL
                 );
-  return Status;
 }
 
@@ -336 +342 @@
   // Make sure the protocol was produced by this driver
   //
-  if ((void *)IdeControllerInit != (void *)&gEfiIdeControllerInit) {
+  if ((void *)IdeControllerInit != (void *)&gEfiIdeControllerInit) { /* VBox: Dunno why we're doing the (void *) thing, types should be the same... */
     return EFI_UNSUPPORTED;
   }
@@ -345 +351 @@
   Status = gBS->UninstallMultipleProtocolInterfaces (
                   Controller,
-                  &gEfiIdeControllerInitProtocolGuid, &gEfiIdeControllerInit.Core,
+                  &gEfiIdeControllerInitProtocolGuid, &gEfiIdeControllerInit.Core, /* VBox: We added .Core, probably for warnings. */
                   NULL
                   );
@@ -414 +420 @@
   // Channel number (0 based, either 0 or 1)
   //
+#ifdef VBOX
   VBoxLogFlowFuncEnter();
   VBoxLogFlowFuncMarkVar(Channel, "%d");
   *MaxDevices = 0;
   *Enabled = FALSE;
+#endif
   if (Channel < ICH_IDE_MAX_CHANNEL) {
 #ifdef VBOX