Changeset 58466 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Scsi

Timestamp:

Oct 29, 2015 4:30:44 AM (9 years ago)

Author:

vboxsync

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

103777

Message:

EFI/Firmware: Merged in the svn:eol-style, svn:mime-type and trailing whitespace cleanup that was done after the initial UDK2014.SP1 import: svn merge ^{/vendor/edk2/UDK2014.SP1} /vendor/edk2/current .

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c (modified) (26 diffs)
• MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h (modified) (7 diffs)
• MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf (modified) (3 diffs)
• MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c (modified) (1 diff)
• MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c (modified) (41 diffs)
• MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h (modified) (17 diffs)
• MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c

@@ -189 +189 @@
 
   //
-  // To keep backward compatibility, UEFI ExtPassThru Protocol is supported as well as 
+  // To keep backward compatibility, UEFI ExtPassThru Protocol is supported as well as
   // EFI PassThru Protocol. From priority perspective, ExtPassThru Protocol is firstly
   // tried to open on host controller handle. If fails, then PassThru Protocol is tried instead.
@@ -218 +218 @@
              This->DriverBindingHandle,
              Controller
-             );      
+             );
       return EFI_SUCCESS;
     } else {
@@ -233 +233 @@
              This->DriverBindingHandle,
              Controller
-             );      
+             );
       if (!EFI_ERROR(Status)) {
         return EFI_SUCCESS;
@@ -241 +241 @@
 
   //
-  // Come here in 2 condition: 
+  // Come here in 2 condition:
   // 1. ExtPassThru doesn't exist.
   // 2. ExtPassThru exists but RemainingDevicePath is invalid.
@@ -253 +253 @@
                   EFI_OPEN_PROTOCOL_BY_DRIVER
                   );
-  
+
   if (Status == EFI_ALREADY_STARTED) {
     return EFI_SUCCESS;
   }
-  
+
   if (EFI_ERROR (Status)) {
     return Status;
   }
-  
+
   //
   // Test RemainingDevicePath is valid or not.
@@ -268 +268 @@
     Status = PassThru->GetTargetLun (PassThru, RemainingDevicePath, &ScsiTargetId.ScsiId.Scsi, &Lun);
   }
-  
+
   gBS->CloseProtocol (
          Controller,
@@ -326 +326 @@
   ExtScsiSupport  = FALSE;
   PassThruStatus  = EFI_SUCCESS;
-  
+
   TargetId = &ScsiTargetId.ScsiId.ExtScsi[0];
   SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);
-  
+
   DevicePathStatus = gBS->OpenProtocol (
                             Controller,
@@ -349 +349 @@
     (EFI_IO_BUS_SCSI | EFI_IOB_PC_INIT),
     ParentDevicePath
-    );  
-
-  //
-  // To keep backward compatibility, UEFI ExtPassThru Protocol is supported as well as 
+    );
+
+  //
+  // To keep backward compatibility, UEFI ExtPassThru Protocol is supported as well as
   // EFI PassThru Protocol. From priority perspective, ExtPassThru Protocol is firstly
   // tried to open on host controller handle. If fails, then PassThru Protocol is tried instead.
@@ -387 +387 @@
                Controller
                );
-      } 
+      }
       return Status;
-    } 
+    }
   } else {
     //
-    // Succeed to open ExtPassThru Protocol, and meanwhile open PassThru Protocol 
-    // with BY_DRIVER if it is also present on the handle. The intent is to prevent 
+    // Succeed to open ExtPassThru Protocol, and meanwhile open PassThru Protocol
+    // with BY_DRIVER if it is also present on the handle. The intent is to prevent
     // another SCSI Bus Driver to work on the same host handle.
     //
@@ -406 +406 @@
                             );
   }
-    
+
   if (Status != EFI_ALREADY_STARTED) {
     //
@@ -424 +424 @@
       ScsiBusDev->ExtScsiInterface = ExtScsiInterface;
     } else {
-      ScsiBusDev->ScsiInterface    = ScsiInterface;    
+      ScsiBusDev->ScsiInterface    = ScsiInterface;
     }
 
@@ -431 +431 @@
     // retrieved on this controller handle. With ScsiBusDev, we can know which PassThru
     // Protocol is present on the handle, UEFI ExtPassThru Protocol or EFI PassThru Protocol.
-    // 
+    //
     Status = gBS->InstallProtocolInterface (
                     &Controller,
@@ -473 +473 @@
   if (RemainingDevicePath == NULL) {
     //
-    // If RemainingDevicePath is NULL, 
+    // If RemainingDevicePath is NULL,
     // must enumerate all SCSI devices anyway
     //
@@ -479 +479 @@
   } else if (!IsDevicePathEnd (RemainingDevicePath)) {
     //
-    // If RemainingDevicePath isn't the End of Device Path Node, 
+    // If RemainingDevicePath isn't the End of Device Path Node,
     // only scan the specified device by RemainingDevicePath
     //
     if (ScsiBusDev->ExtScsiSupport) {
-      Status = ScsiBusDev->ExtScsiInterface->GetTargetLun (ScsiBusDev->ExtScsiInterface, RemainingDevicePath, &TargetId, &Lun);  
+      Status = ScsiBusDev->ExtScsiInterface->GetTargetLun (ScsiBusDev->ExtScsiInterface, RemainingDevicePath, &TargetId, &Lun);
     } else {
       Status = ScsiBusDev->ScsiInterface->GetTargetLun (ScsiBusDev->ScsiInterface, RemainingDevicePath, &ScsiTargetId.ScsiId.Scsi, &Lun);
@@ -495 +495 @@
     // If RemainingDevicePath is the End of Device Path Node,
     // skip enumerate any device and return EFI_SUCESSS
-    // 
+    //
     ScanOtherPuns = FALSE;
   }
@@ -540 +540 @@
 
 ErrorExit:
-  
+
   if (ScsiBusDev != NULL) {
     FreePool (ScsiBusDev);
   }
-  
+
   if (ExtScsiSupport) {
     gBS->CloseProtocol (
@@ -579 +579 @@
   calling restrictions. If any other agent wishes to call Stop() it must also
   follow these calling restrictions.
-  
+
   @param  This              Protocol instance pointer.
   @param  ControllerHandle  Handle of device to stop driver on
@@ -651 +651 @@
       //
       // When Start() succeeds to open ExtPassThru, it always tries to open PassThru BY_DRIVER.
-      // Its intent is to prevent another SCSI Bus Driver from woking on the same host handle. 
+      // Its intent is to prevent another SCSI Bus Driver from woking on the same host handle.
       // So Stop() needs to try to close PassThru if present here.
       //
@@ -764 +764 @@
   @param  This          Protocol instance pointer.
   @param  DeviceType    A pointer to the device type information retrieved from
-                        the SCSI Controller. 
+                        the SCSI Controller.
 
   @retval EFI_SUCCESS             Retrieves the device type information successfully.
   @retval EFI_INVALID_PARAMETER   The DeviceType is NULL.
-  
+
 **/
 EFI_STATUS
@@ -834 +834 @@
   @retval  EFI_UNSUPPORTED   The bus reset operation is not supported by the
                              SCSI Host Controller.
-  @retval  EFI_TIMEOUT       A timeout occurred while attempting to reset 
+  @retval  EFI_TIMEOUT       A timeout occurred while attempting to reset
                              the SCSI bus.
 **/
@@ -894 +894 @@
     ScsiIoDevice->ScsiBusDeviceData->DevicePath
     );
-  
+
   CopyMem (Target,&ScsiIoDevice->Pun, TARGET_MAX_BYTES);
 
@@ -918 +918 @@
 
   @param  This            Protocol instance pointer.
-  @param  CommandPacket   The SCSI request packet to send to the SCSI 
+  @param  CommandPacket   The SCSI request packet to send to the SCSI
                           Controller specified by the device handle.
   @param  Event           If the SCSI bus where the SCSI device is attached
-                          does not support non-blocking I/O, then Event is 
-                          ignored, and blocking I/O is performed.  
+                          does not support non-blocking I/O, then Event is
+                          ignored, and blocking I/O is performed.
                           If Event is NULL, then blocking I/O is performed.
-                          If Event is not NULL and non-blocking I/O is 
+                          If Event is not NULL and non-blocking I/O is
                           supported, then non-blocking I/O is performed,
                           and Event will be signaled when the SCSI Request
                           Packet completes.
 
-  @retval EFI_SUCCESS         The SCSI Request Packet was sent by the host 
-                              successfully, and TransferLength bytes were 
-                              transferred to/from DataBuffer.See 
-                              HostAdapterStatus, TargetStatus, 
+  @retval EFI_SUCCESS         The SCSI Request Packet was sent by the host
+                              successfully, and TransferLength bytes were
+                              transferred to/from DataBuffer.See
+                              HostAdapterStatus, TargetStatus,
                               SenseDataLength, and SenseData in that order
                               for additional status information.
-  @retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed, 
+  @retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed,
                               but the entire DataBuffer could not be transferred.
                               The actual number of bytes transferred is returned
-                              in TransferLength. See HostAdapterStatus, 
-                              TargetStatus, SenseDataLength, and SenseData in 
+                              in TransferLength. See HostAdapterStatus,
+                              TargetStatus, SenseDataLength, and SenseData in
                               that order for additional status information.
-  @retval EFI_NOT_READY       The SCSI Request Packet could not be sent because 
-                              there are too many SCSI Command Packets already 
+  @retval EFI_NOT_READY       The SCSI Request Packet could not be sent because
+                              there are too many SCSI Command Packets already
                               queued.The caller may retry again later.
-  @retval EFI_DEVICE_ERROR    A device error occurred while attempting to send 
-                              the SCSI Request Packet. See HostAdapterStatus, 
-                              TargetStatus, SenseDataLength, and SenseData in 
+  @retval EFI_DEVICE_ERROR    A device error occurred while attempting to send
+                              the SCSI Request Packet. See HostAdapterStatus,
+                              TargetStatus, SenseDataLength, and SenseData in
                               that order for additional status information.
-  @retval EFI_INVALID_PARAMETER  The contents of CommandPacket are invalid.  
-                                 The SCSI Request Packet was not sent, so no 
+  @retval EFI_INVALID_PARAMETER  The contents of CommandPacket are invalid.
+                                 The SCSI Request Packet was not sent, so no
                                  additional status information is available.
   @retval EFI_UNSUPPORTED     The command described by the SCSI Request Packet
-                              is not supported by the SCSI initiator(i.e., SCSI 
+                              is not supported by the SCSI initiator(i.e., SCSI
                               Host Controller). The SCSI Request Packet was not
-                              sent, so no additional status information is 
+                              sent, so no additional status information is
                               available.
-  @retval EFI_TIMEOUT         A timeout occurred while waiting for the SCSI 
+  @retval EFI_TIMEOUT         A timeout occurred while waiting for the SCSI
                               Request Packet to execute. See HostAdapterStatus,
-                              TargetStatus, SenseDataLength, and SenseData in 
+                              TargetStatus, SenseDataLength, and SenseData in
                               that order for additional status information.
 **/
@@ -974 +974 @@
   EFI_EVENT                                   PacketEvent;
   EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *ExtRequestPacket;
-  SCSI_EVENT_DATA                             EventData;                                     
+  SCSI_EVENT_DATA                             EventData;
 
   PacketEvent = NULL;
-  
+
   if (Packet == NULL) {
     return EFI_INVALID_PARAMETER;
@@ -1230 +1230 @@
 
 ErrorExit:
-  
+
   //
   // The memory space for ScsiDevicePath is allocated in
@@ -1305 +1305 @@
     if (!EFI_ERROR (Status)) {
       break;
-    } else if ((Status == EFI_BAD_BUFFER_SIZE) || 
+    } else if ((Status == EFI_BAD_BUFFER_SIZE) ||
                (Status == EFI_INVALID_PARAMETER) ||
                (Status == EFI_UNSUPPORTED)) {
@@ -1317 +1317 @@
     goto Done;
   }
-  
+
   //
   // Retrieved inquiry data successfully

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h

@@ -42 +42 @@
 typedef union {
   UINT32  Scsi;
-  UINT8   ExtScsi[4];   
+  UINT8   ExtScsi[4];
 } SCSI_ID;
 
@@ -80 +80 @@
   UINTN                                 Signature;
   EFI_SCSI_BUS_PROTOCOL                 BusIdentify;
-  BOOLEAN                               ExtScsiSupport; 
+  BOOLEAN                               ExtScsiSupport;
   EFI_SCSI_PASS_THRU_PROTOCOL           *ScsiInterface;
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL       *ExtScsiInterface;
@@ -93 +93 @@
   EFI_SCSI_IO_PROTOCOL               ScsiIo;
   EFI_DEVICE_PATH_PROTOCOL           *DevicePath;
-  BOOLEAN                            ExtScsiSupport; 
+  BOOLEAN                            ExtScsiSupport;
   EFI_SCSI_PASS_THRU_PROTOCOL        *ScsiPassThru;
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL    *ExtScsiPassThru;
@@ -175 +175 @@
   calling restrictions. If any other agent wishes to call Stop() it must also
   follow these calling restrictions.
-  
+
   @param  This              Protocol instance pointer.
   @param  ControllerHandle  Handle of device to stop driver on
@@ -328 +328 @@
   @param  This          Protocol instance pointer.
   @param  DeviceType    A pointer to the device type information retrieved from
-                        the SCSI Controller. 
+                        the SCSI Controller.
 
   @retval EFI_SUCCESS             Retrieves the device type information successfully.
   @retval EFI_INVALID_PARAMETER   The DeviceType is NULL.
-  
+
 **/
 EFI_STATUS
@@ -371 +371 @@
   @retval  EFI_UNSUPPORTED   The bus reset operation is not supported by the
                              SCSI Host Controller.
-  @retval  EFI_TIMEOUT       A timeout occurred while attempting to reset 
+  @retval  EFI_TIMEOUT       A timeout occurred while attempting to reset
                              the SCSI bus.
 **/
@@ -401 +401 @@
 
   @param  This            Protocol instance pointer.
-  @param  CommandPacket   The SCSI request packet to send to the SCSI 
+  @param  CommandPacket   The SCSI request packet to send to the SCSI
                           Controller specified by the device handle.
   @param  Event           If the SCSI bus where the SCSI device is attached
-                          does not support non-blocking I/O, then Event is 
-                          ignored, and blocking I/O is performed.  
+                          does not support non-blocking I/O, then Event is
+                          ignored, and blocking I/O is performed.
                           If Event is NULL, then blocking I/O is performed.
-                          If Event is not NULL and non-blocking I/O is 
+                          If Event is not NULL and non-blocking I/O is
                           supported, then non-blocking I/O is performed,
                           and Event will be signaled when the SCSI Request
                           Packet completes.
 
-  @retval EFI_SUCCESS         The SCSI Request Packet was sent by the host 
-                              successfully, and TransferLength bytes were 
-                              transferred to/from DataBuffer.See 
-                              HostAdapterStatus, TargetStatus, 
+  @retval EFI_SUCCESS         The SCSI Request Packet was sent by the host
+                              successfully, and TransferLength bytes were
+                              transferred to/from DataBuffer.See
+                              HostAdapterStatus, TargetStatus,
                               SenseDataLength, and SenseData in that order
                               for additional status information.
-  @retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed, 
+  @retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed,
                               but the entire DataBuffer could not be transferred.
                               The actual number of bytes transferred is returned
-                              in TransferLength. See HostAdapterStatus, 
-                              TargetStatus, SenseDataLength, and SenseData in 
+                              in TransferLength. See HostAdapterStatus,
+                              TargetStatus, SenseDataLength, and SenseData in
                               that order for additional status information.
-  @retval EFI_NOT_READY       The SCSI Request Packet could not be sent because 
-                              there are too many SCSI Command Packets already 
+  @retval EFI_NOT_READY       The SCSI Request Packet could not be sent because
+                              there are too many SCSI Command Packets already
                               queued.The caller may retry again later.
-  @retval EFI_DEVICE_ERROR    A device error occurred while attempting to send 
-                              the SCSI Request Packet. See HostAdapterStatus, 
-                              TargetStatus, SenseDataLength, and SenseData in 
+  @retval EFI_DEVICE_ERROR    A device error occurred while attempting to send
+                              the SCSI Request Packet. See HostAdapterStatus,
+                              TargetStatus, SenseDataLength, and SenseData in
                               that order for additional status information.
-  @retval EFI_INVALID_PARAMETER  The contents of CommandPacket are invalid.  
-                                 The SCSI Request Packet was not sent, so no 
+  @retval EFI_INVALID_PARAMETER  The contents of CommandPacket are invalid.
+                                 The SCSI Request Packet was not sent, so no
                                  additional status information is available.
   @retval EFI_UNSUPPORTED     The command described by the SCSI Request Packet
-                              is not supported by the SCSI initiator(i.e., SCSI 
+                              is not supported by the SCSI initiator(i.e., SCSI
                               Host Controller). The SCSI Request Packet was not
-                              sent, so no additional status information is 
+                              sent, so no additional status information is
                               available.
-  @retval EFI_TIMEOUT         A timeout occurred while waiting for the SCSI 
+  @retval EFI_TIMEOUT         A timeout occurred while waiting for the SCSI
                               Request Packet to execute. See HostAdapterStatus,
-                              TargetStatus, SenseDataLength, and SenseData in 
+                              TargetStatus, SenseDataLength, and SenseData in
                               that order for additional status information.
 **/

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

@@ -3 +3 @@
 #  Note that the driver will install the Device Path Protocol and SCSI I/O Protocol on
 #  these handles.
-#  
+#
 #  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
@@ -9 +9 @@
 #  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.
-#  
+#
 ##
 
@@ -30 +30 @@
 #  VALID_ARCHITECTURES              =  IA32 X64 IPF EBC
 #
-#  DRIVER_BINDING                =  gSCSIBusDriverBinding                        
+#  DRIVER_BINDING                =  gSCSIBusDriverBinding
 #  COMPONENT_NAME                =  gScsiBusComponentName
 #  COMPONENT_NAME2               =  gScsiBusComponentName2

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c

@@ -184 +184 @@
     return EFI_UNSUPPORTED;
   }
-  
+
   //
   // Make sure this driver is currently managing ControllerHandle

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c

@@ -80 +80 @@
   The user code starts with this function.
 
-  @param  ImageHandle    The firmware allocated handle for the EFI image.  
+  @param  ImageHandle    The firmware allocated handle for the EFI image.
   @param  SystemTable    A pointer to the EFI System Table.
-  
+
   @retval EFI_SUCCESS       The entry point is executed successfully.
   @retval other             Some error occurs when executing this entry point.
@@ -331 +331 @@
         return EFI_SUCCESS;
       }
-    } 
+    }
   }
 
@@ -343 +343 @@
          );
   return Status;
-  
+
 }
 
@@ -355 +355 @@
   calling restrictions. If any other agent wishes to call Stop() it must
   also follow these calling restrictions.
-  
+
   @param  This              Protocol instance pointer.
   @param  ControllerHandle  Handle of device to stop driver on
@@ -731 +731 @@
   @param  ScsiDiskDevice    The pointer of SCSI_DISK_DEV
   @param  MustReadCapacity  The flag about reading device capacity
-  @param  MediaChange       The pointer of flag indicates if media has changed 
+  @param  MediaChange       The pointer of flag indicates if media has changed
 
   @retval EFI_DEVICE_ERROR  Indicates that error occurs
@@ -866 +866 @@
           break;
         }
-      } else {   
+      } else {
         Retry++;
         if (!NeedRetry || (Retry >= MaxRetry)) {
@@ -1033 +1033 @@
                      );
           if (!EFI_ERROR (Status)) {
-            ScsiDiskDevice->BlkIo.Media->OptimalTransferLengthGranularity = 
+            ScsiDiskDevice->BlkIo.Media->OptimalTransferLengthGranularity =
               (BlockLimits->OptimalTransferLengthGranularity2 << 8) |
                BlockLimits->OptimalTransferLengthGranularity1;
@@ -1052 +1052 @@
     *NeedRetry = TRUE;
     return EFI_DEVICE_ERROR;
- 
+
   } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {
     *NeedRetry = FALSE;
@@ -1088 +1088 @@
     return EFI_DEVICE_ERROR;
   }
-  
+
   //
   // if goes here, meant ScsiInquiryCommand() failed.
@@ -1244 +1244 @@
   @param  ScsiDiskDevice     The pointer of SCSI_DISK_DEV
   @param  SenseData          The pointer of EFI_SCSI_SENSE_DATA
-  @param  NumberOfSenseKeys  The number of sense key  
+  @param  NumberOfSenseKeys  The number of sense key
   @param  Action             The pointer of action which indicates what is need to do next
 
@@ -1385 +1385 @@
 
   //
-  // submit Read Capacity(10) Command. If it returns capacity of FFFFFFFFh, 
+  // submit Read Capacity(10) Command. If it returns capacity of FFFFFFFFh,
   // 16 byte command should be used to access large hard disk >2TB
   //
@@ -1449 +1449 @@
    // (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)
    //
- 
+
    Status = CheckHostAdapterStatus (HostAdapterStatus);
    if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {
      *NeedRetry = TRUE;
      return EFI_DEVICE_ERROR;
- 
+
    } else if (Status == EFI_DEVICE_ERROR) {
     //
@@ -1477 +1477 @@
     return EFI_DEVICE_ERROR;
   }
-  
+
   //
   // if goes here, meant ScsiReadCapacityCommand() failed.
@@ -1557 +1557 @@
 
   @retval EFI_NOT_READY       Device is NOT ready.
-  @retval EFI_DEVICE_ERROR 
+  @retval EFI_DEVICE_ERROR
   @retval EFI_SUCCESS
 
@@ -1650 +1650 @@
      if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {
         FallStatus = EFI_SUCCESS;
-  
+
      } else if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {
        *NeedRetry  = TRUE;
        FallStatus  = EFI_DEVICE_ERROR;
- 
+
      } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {
        *NeedRetry  = FALSE;
        FallStatus  = EFI_DEVICE_ERROR;
- 
+
      } else if (Status == EFI_DEVICE_ERROR) {
         if (AskResetIfError) {
           ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);
         }
-  
+
         FallStatus = EFI_DEVICE_ERROR;
     }
@@ -1685 +1685 @@
     // skip the loop.
     //
-    if ((PtrSenseData->Sense_Key == EFI_SCSI_SK_NO_SENSE) || 
+    if ((PtrSenseData->Sense_Key == EFI_SCSI_SK_NO_SENSE) ||
         (*NumberOfSenseKeys == ScsiDiskDevice->SenseDataNumber)) {
       SenseReq = FALSE;
@@ -1719 +1719 @@
                                               (Capacity10->LastLba1 << 8)  |
                                                Capacity10->LastLba0;
-  
+
     ScsiDiskDevice->BlkIo.Media->BlockSize = (Capacity10->BlockSize3 << 24) |
-                                             (Capacity10->BlockSize2 << 16) | 
+                                             (Capacity10->BlockSize2 << 16) |
                                              (Capacity10->BlockSize1 << 8)  |
                                               Capacity10->BlockSize0;
@@ -1738 +1738 @@
 
     ScsiDiskDevice->BlkIo.Media->BlockSize = (Capacity16->BlockSize3 << 24) |
-                                             (Capacity16->BlockSize2 << 16) | 
+                                             (Capacity16->BlockSize2 << 16) |
                                              (Capacity16->BlockSize1 << 8)  |
                                               Capacity16->BlockSize0;
@@ -1801 +1801 @@
   BlocksRemaining   = NumberOfBlocks;
   BlockSize         = ScsiDiskDevice->BlkIo.Media->BlockSize;
-  
+
   //
   // limit the data bytes that can be transferred by one Read(10) or Read(16) Command
@@ -2025 +2025 @@
                   Lba,
                   SectorCount
-                  );         
+                  );
         }
       if (!EFI_ERROR (Status)) {
@@ -2695 +2695 @@
 
   for (Index = 0; Index < SenseCounts; Index++) {
-    
+
     //
     // Sense Key is EFI_SCSI_SK_HARDWARE_ERROR (0x4)
@@ -2772 +2772 @@
 
   for (Index = 0; Index < SenseCounts; Index++) {
-    
+
     //
     // Sense Key is EFI_SCSI_SK_UNIT_ATTENTION (0x6)
@@ -2793 +2793 @@
   @param  SenseData    The pointer of EFI_SCSI_SENSE_DATA
   @param  SenseCounts  The number of sense key
-  @param  RetryLater   The flag means if need a retry 
+  @param  RetryLater   The flag means if need a retry
 
   @retval TRUE  Drive is ready.
@@ -2888 +2888 @@
 
   for (Index = 0; Index < SenseCounts; Index++) {
-    
+
     //
     // Sense Key is SK_NO_SENSE (0x0)
@@ -2935 +2935 @@
 /**
   Determine if Block Io should be produced.
-  
+
 
   @param  ChildHandle  Child Handle to retrieve Parent information.
-  
+
   @retval  TRUE    Should produce Block Io.
   @retval  FALSE   Should not produce Block Io.
 
-**/  
+**/
 BOOLEAN
 DetermineInstallBlockIo (
   IN  EFI_HANDLE      ChildHandle
-  )  
+  )
 {
   EFI_SCSI_PASS_THRU_PROTOCOL           *ScsiPassThru;
@@ -2972 +2972 @@
     }
   }
-  
+
   return FALSE;
 }
@@ -2981 +2981 @@
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
   If the ControllerHandle is found, then the protocol specified by ProtocolGuid
-  will be opened on it.  
-  
+  will be opened on it.
+
 
   @param  ProtocolGuid   ProtocolGuid pointer.
   @param  ChildHandle    Child Handle to retrieve Parent information.
-  
-**/ 
+
+**/
 VOID *
 EFIAPI
@@ -2993 +2993 @@
   IN  EFI_GUID                          *ProtocolGuid,
   IN  EFI_HANDLE                        ChildHandle
-  ) 
+  )
 {
   UINTN                                 Index;
   UINTN                                 HandleCount;
-  VOID                                  *Interface;  
+  VOID                                  *Interface;
   EFI_STATUS                            Status;
   EFI_HANDLE                            *HandleBuffer;
@@ -3017 +3017 @@
 
   //
-  // Iterate to find who is parent handle that is opened with ProtocolGuid by ChildHandle 
+  // Iterate to find who is parent handle that is opened with ProtocolGuid by ChildHandle
   //
   for (Index = 0; Index < HandleCount; Index++) {
@@ -3032 +3032 @@
   gBS->FreePool (HandleBuffer);
   return NULL;
-} 
+}
 
 /**
   Provides inquiry information for the controller type.
-  
+
   This function is used by the IDE bus driver to get inquiry data.  Data format
   of Identify data is defined by the Interface GUID.
@@ -3045 +3045 @@
 
   @retval EFI_SUCCESS            The command was accepted without any errors.
-  @retval EFI_NOT_FOUND          Device does not support this data class 
-  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device 
-  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough 
+  @retval EFI_NOT_FOUND          Device does not support this data class
+  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device
+  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough
 
 **/
@@ -3079 +3079 @@
   of Identify data is defined by the Interface GUID.
 
-  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL 
+  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL
                                     instance.
   @param[in, out] IdentifyData      Pointer to a buffer for the identify data.
@@ -3086 +3086 @@
 
   @retval EFI_SUCCESS            The command was accepted without any errors.
-  @retval EFI_NOT_FOUND          Device does not support this data class 
-  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device 
-  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough 
+  @retval EFI_NOT_FOUND          Device does not support this data class
+  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device
+  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough
 
 **/
@@ -3104 +3104 @@
   if (CompareGuid (&This->Interface, &gEfiDiskInfoScsiInterfaceGuid) || CompareGuid (&This->Interface, &gEfiDiskInfoUfsInterfaceGuid)) {
     //
-    // Physical SCSI bus does not support this data class. 
+    // Physical SCSI bus does not support this data class.
     //
     return EFI_NOT_FOUND;
@@ -3122 +3122 @@
 /**
   Provides sense data information for the controller type.
-  
-  This function is used by the IDE bus driver to get sense data. 
+
+  This function is used by the IDE bus driver to get sense data.
   Data format of Sense data is defined by the Interface GUID.
 
@@ -3153 +3153 @@
   This function is used by the IDE bus driver to get controller information.
 
-  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance. 
+  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance.
   @param[out] IdeChannel   Pointer to the Ide Channel number.  Primary or secondary.
   @param[out] IdeDevice    Pointer to the Ide Device number.  Master or slave.
@@ -3194 +3194 @@
 
   @param  ScsiDiskDevice  The pointer of SCSI_DISK_DEV
-  
+
   @retval EFI_SUCCESS     The ATAPI device identify data were retrieved successfully.
   @retval others          Some error occurred during the identification that ATAPI device.
 
-**/  
+**/
 EFI_STATUS
 AtapiIdentifyDevice (
@@ -3234 +3234 @@
   @param  ScsiDiskDevice  The pointer of SCSI_DISK_DEV.
   @param  ChildHandle     Child handle to install DiskInfo protocol.
-  
-**/  
+
+**/
 VOID
 InitializeInstallDiskInfo (
@@ -3251 +3251 @@
   Status = gBS->HandleProtocol (ChildHandle, &gEfiDevicePathProtocolGuid, (VOID **) &DevicePathNode);
   //
-  // Device Path protocol must be installed on the device handle. 
+  // Device Path protocol must be installed on the device handle.
   //
   ASSERT_EFI_ERROR (Status);
@@ -3283 +3283 @@
             ScsiDiskDevice->Device = AtapiDevicePath->SlaveMaster;
             //
-            // Update the DiskInfo.Interface to IDE interface GUID for the physical ATAPI device. 
+            // Update the DiskInfo.Interface to IDE interface GUID for the physical ATAPI device.
             //
             CopyGuid (&ScsiDiskDevice->DiskInfo.Interface, &gEfiDiskInfoIdeInterfaceGuid);
@@ -3294 +3294 @@
             ScsiDiskDevice->Device = SataDevicePath->PortMultiplierPortNumber;
             //
-            // Update the DiskInfo.Interface to AHCI interface GUID for the physical AHCI device. 
+            // Update the DiskInfo.Interface to AHCI interface GUID for the physical AHCI device.
             //
             CopyGuid (&ScsiDiskDevice->DiskInfo.Interface, &gEfiDiskInfoAhciInterfaceGuid);

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h

@@ -71 +71 @@
   UINT32                    Device;
   ATAPI_IDENTIFY_DATA       IdentifyData;
-  
+
   //
   // The flag indicates if 16-byte command can be used
@@ -167 +167 @@
   calling restrictions. If any other agent wishes to call Stop() it must
   also follow these calling restrictions.
-  
+
   @param  This              Protocol instance pointer.
   @param  ControllerHandle  Handle of device to stop driver on
@@ -413 +413 @@
 /**
   Provides inquiry information for the controller type.
-  
+
   This function is used by the IDE bus driver to get inquiry data.  Data format
   of Identify data is defined by the Interface GUID.
@@ -422 +422 @@
 
   @retval EFI_SUCCESS            The command was accepted without any errors.
-  @retval EFI_NOT_FOUND          Device does not support this data class 
-  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device 
-  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough 
+  @retval EFI_NOT_FOUND          Device does not support this data class
+  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device
+  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough
 
 **/
@@ -442 +442 @@
   of Identify data is defined by the Interface GUID.
 
-  @param[in]     This               Pointer to the EFI_DISK_INFO_PROTOCOL 
+  @param[in]     This               Pointer to the EFI_DISK_INFO_PROTOCOL
                                     instance.
   @param[in, out] IdentifyData      Pointer to a buffer for the identify data.
@@ -449 +449 @@
 
   @retval EFI_SUCCESS            The command was accepted without any errors.
-  @retval EFI_NOT_FOUND          Device does not support this data class 
-  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device 
-  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough 
+  @retval EFI_NOT_FOUND          Device does not support this data class
+  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device
+  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough
 
 **/
@@ -465 +465 @@
 /**
   Provides sense data information for the controller type.
-  
-  This function is used by the IDE bus driver to get sense data. 
+
+  This function is used by the IDE bus driver to get sense data.
   Data format of Sense data is defined by the Interface GUID.
 
@@ -492 +492 @@
   This function is used by the IDE bus driver to get controller information.
 
-  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance. 
+  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance.
   @param[out] IdeChannel   Pointer to the Ide Channel number.  Primary or secondary.
   @param[out] IdeDevice    Pointer to the Ide Device number.  Master or slave.
@@ -514 +514 @@
   @param  ScsiDiskDevice    The pointer of SCSI_DISK_DEV
   @param  MustReadCapacity  The flag about reading device capacity
-  @param  MediaChange       The pointer of flag indicates if media has changed 
+  @param  MediaChange       The pointer of flag indicates if media has changed
 
   @retval EFI_DEVICE_ERROR  Indicates that error occurs
@@ -557 +557 @@
   @param  ScsiDiskDevice     The pointer of SCSI_DISK_DEV
   @param  SenseData          The pointer of EFI_SCSI_SENSE_DATA
-  @param  NumberOfSenseKeys  The number of sense key  
+  @param  NumberOfSenseKeys  The number of sense key
   @param  Action             The pointer of action which indicates what is need to do next
 
@@ -616 +616 @@
 
   @retval EFI_NOT_READY       Device is NOT ready.
-  @retval EFI_DEVICE_ERROR 
+  @retval EFI_DEVICE_ERROR
   @retval EFI_SUCCESS
 
@@ -790 +790 @@
   IN     UINT32                SectorCount
   );
-  
+
 /**
   Submit Write(16) Command.
@@ -814 +814 @@
   IN     UINT64                StartLba,
   IN     UINT32                SectorCount
-  );  
+  );
 
 /**
@@ -913 +913 @@
   @param  SenseData    The pointer of EFI_SCSI_SENSE_DATA
   @param  SenseCounts  The number of sense key
-  @param  RetryLater   The flag means if need a retry 
+  @param  RetryLater   The flag means if need a retry
 
   @retval TRUE  Drive is ready.
@@ -955 +955 @@
 /**
   Determine if Block Io should be produced.
-  
+
 
   @param  ChildHandle  Child Handle to retrieve Parent information.
-  
+
   @retval  TRUE    Should produce Block Io.
   @retval  FALSE   Should not produce Block Io.
 
-**/  
+**/
 BOOLEAN
 DetermineInstallBlockIo (
@@ -978 +978 @@
   @param  ScsiDiskDevice  The pointer of SCSI_DISK_DEV.
   @param  ChildHandle     Child handle to install DiskInfo protocol.
-  
-**/  
+
+**/
 VOID
 InitializeInstallDiskInfo (
   IN  SCSI_DISK_DEV   *ScsiDiskDevice,
   IN  EFI_HANDLE      ChildHandle
-  ); 
+  );
 
 /**
@@ -991 +991 @@
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
   If the ControllerHandle is found, then the protocol specified by ProtocolGuid
-  will be opened on it.  
-  
+  will be opened on it.
+
 
   @param  ProtocolGuid   ProtocolGuid pointer.
   @param  ChildHandle    Child Handle to retrieve Parent information.
-  
-**/ 
+
+**/
 VOID *
 EFIAPI

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

@@ -2 +2 @@
 #  The Scsi Disk driver is used to retrieve the media info in the attached SCSI disk.
 #  It detects the SCSI disk media and installs Block I/O Protocol on the device handle.
-#  
+#
 #  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
@@ -8 +8 @@
 #  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.
-#  
+#
 ##