Changeset 58460 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Disk/PartitionDxe

Timestamp:

Oct 28, 2015 8:34:41 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: Merged in changes from ../UDK2014.SP1/.

Location:

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Disk/PartitionDxe

Files:

• Apple.c (modified) (2 diffs)
• Partition.c (modified) (1 diff)
• Partition.h (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Disk/PartitionDxe/Apple.c

@@ -86 +86 @@
   IN  EFI_HANDLE                   Handle,
   IN  EFI_DISK_IO_PROTOCOL         *DiskIo,
+  IN  EFI_DISK_IO2_PROTOCOL        *DiskIo2,
   IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,
   IN  EFI_BLOCK_IO2_PROTOCOL       *BlockIo2,
@@ -207 +208 @@
               Handle,
               DiskIo,
+              DiskIo2,
               BlockIo,
               BlockIo2,

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c

@@ -199 +199 @@
                   );
 #ifdef VBOX
-    VBoxLogFlowFuncLeaveRC(Status);
+  VBoxLogFlowFuncLeaveRC(Status);
 #endif
   return Status;

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h

@@ -433 +433 @@
   Install child handles if the Handle supports Apple format.
 
-  @param  This              Calling context.
-  @param  Handle            Parent Handle.
-  @param  DiskIo            Parent DiskIo interface.
-  @param  BlockIo           Parent BlockIo interface.
+  @param[in]  This              Calling context.
+  @param[in]  Handle            Parent Handle.
+  @param[in]  DiskIo            Parent DiskIo interface.
+  @param[in]  DiskIo2           Parent DiskIo2 interface.
+  @param[in]  BlockIo           Parent BlockIo interface.
   @param[in]  BlockIo2          Parent BlockIo2 interface.
-  @param  DevicePath        Parent Device Path.
+  @param[in]  DevicePath        Parent Device Path.
 
   @retval EFI_SUCCESS       A child handle was added.
@@ -447 +448 @@
 EFI_STATUS
 PartitionInstallAppleChildHandles (
-  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,
-  IN  EFI_HANDLE                   Handle,
-  IN  EFI_DISK_IO_PROTOCOL         *DiskIo,
-  IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,
-  IN  EFI_BLOCK_IO2_PROTOCOL       *BlockIo2,
-  IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath
-  );
-#endif
-
-typedef
-EFI_STATUS
-(*PARTITION_DETECT_ROUTINE) (
   IN  EFI_DRIVER_BINDING_PROTOCOL  *This,
   IN  EFI_HANDLE                   Handle,
@@ -467 +456 @@
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath
   );
-
 #endif
+
+typedef
+EFI_STATUS
+(*PARTITION_DETECT_ROUTINE) (
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,
+  IN  EFI_HANDLE                   Handle,
+  IN  EFI_DISK_IO_PROTOCOL         *DiskIo,
+  IN  EFI_DISK_IO2_PROTOCOL        *DiskIo2,
+  IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,
+  IN  EFI_BLOCK_IO2_PROTOCOL       *BlockIo2,
+  IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath
+  );
+
+#endif