Changeset 48730 in vbox for trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.c

Timestamp:

Sep 27, 2013 12:28:22 PM (11 years ago)

Author:

vboxsync

Message:

EFI: Use VBox prefix for our stuff so that it's obvious what's our stuff and what isn't. Also, I do NOT like anyone but iprt/log.h defining LogXXX macros!

File:

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

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

@@ -90 +90 @@
 {
     EFI_STATUS Status = EFI_INVALID_PARAMETER;
-    LogFlowFuncEnter();
+    VBoxLogFlowFuncEnter();
     if (!ppPciIo)
     {
-        LogFlowFuncLeaveRC(Status);
+        VBoxLogFlowFuncLeaveRC(Status);
         return Status;
     }
@@ -104 +104 @@
                     EFI_OPEN_PROTOCOL_BY_DRIVER
                     );
-    LogFlowFuncLeaveRC(Status);
+    VBoxLogFlowFuncLeaveRC(Status);
     return Status;
 }
@@ -414 +414 @@
   // Channel number (0 based, either 0 or 1)
   //
-  LogFlowFuncEnter();
-  LogFlowFuncMarkVar(Channel, "%d");
+  VBoxLogFlowFuncEnter();
+  VBoxLogFlowFuncMarkVar(Channel, "%d");
   *MaxDevices = 0;
   *Enabled = FALSE;
@@ -430 +430 @@
         UINT64  u8DH = 0;
         ASSERT(pPciIo);
-        LogFlowFuncMarkVar(u8Device, "%d");
+        VBoxLogFlowFuncMarkVar(u8Device, "%d");
         if (u8Device == 0)
             u8DH = 0xa0;
@@ -437 +437 @@
         else
         {
-            LogFlowFuncLeaveRC(EFI_INVALID_PARAMETER);
+            VBoxLogFlowFuncLeaveRC(EFI_INVALID_PARAMETER);
             return EFI_INVALID_PARAMETER;
         }
@@ -452 +452 @@
                 return EFI_INVALID_PARAMETER;
         }
-        LogFlowFuncMarkVar(u8DH, "%x");
-        LogFlowFuncMarkVar(u64IoBase, "%llx");
+        VBoxLogFlowFuncMarkVar(u8DH, "%x");
+        VBoxLogFlowFuncMarkVar(u64IoBase, "%llx");
         pPciIo->Io.Write(pPciIo, EfiPciIoWidthUint8, EFI_PCI_IO_PASS_THROUGH_BAR, u64IoBase + 6, 1, (void *)&u8DH);
 
@@ -473 +473 @@
         pPciIo->Io.Read(pPciIo, EfiPciIoWidthUint8, EFI_PCI_IO_PASS_THROUGH_BAR, u64IoBase + 3, 1, (void *)&u8SN);
 
-        LogFlowFuncMarkVar(u8CS, "%x");
-        LogFlowFuncMarkVar(u8SN, "%x");
+        VBoxLogFlowFuncMarkVar(u8CS, "%x");
+        VBoxLogFlowFuncMarkVar(u8SN, "%x");
 
         fEnabled = (u8CS == 0xaa && u8SN == 0x55);
@@ -488 +488 @@
     *MaxDevices = ICH_IDE_MAX_DEVICES;
 #endif /* !VBOX */
-    LogFlowFuncMarkVar(*MaxDevices, "%d");
-    LogFlowFuncMarkVar(*Enabled, "%d");
-    LogFlowFuncLeaveRC(EFI_SUCCESS);
+    VBoxLogFlowFuncMarkVar(*MaxDevices, "%d");
+    VBoxLogFlowFuncMarkVar(*Enabled, "%d");
+    VBoxLogFlowFuncLeaveRC(EFI_SUCCESS);
     return EFI_SUCCESS;
   }