summaryrefslogtreecommitdiff
path: root/MdeModulePkg/Bus/Scsi
diff options
context:
space:
mode:
authorLiming Gao <liming.gao@intel.com>2018-06-27 21:08:52 +0800
committerLiming Gao <liming.gao@intel.com>2018-06-28 11:19:45 +0800
commitd1102dba7210b95e41d06c2338a22ba6af248645 (patch)
tree8b4af076b5d6f2aa7f35563d4defcca4d4bfdd87 /MdeModulePkg/Bus/Scsi
parentca79bab7af4770c5eb578f6d495af01705aedb79 (diff)
downloadedk2-d1102dba7210b95e41d06c2338a22ba6af248645.zip
edk2-d1102dba7210b95e41d06c2338a22ba6af248645.tar.gz
edk2-d1102dba7210b95e41d06c2338a22ba6af248645.tar.bz2
MdeModulePkg: Clean up source files
1. Do not use tab characters 2. No trailing white space in one line 3. All files must end with CRLF Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao <liming.gao@intel.com> Reviewed-by: Star Zeng <star.zeng@intel.com>
Diffstat (limited to 'MdeModulePkg/Bus/Scsi')
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c116
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h60
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni4
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf10
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni6
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c4
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c126
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h60
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni4
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf8
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni6
11 files changed, 202 insertions, 202 deletions
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 21034aa..11a7f2a 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -2,7 +2,7 @@
SCSI Bus driver that layers on every SCSI Pass Thru and
Extended SCSI Pass Thru protocol in the system.
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -188,7 +188,7 @@ SCSIBusDriverBindingSupported (
SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);
//
- // 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.
//
@@ -217,7 +217,7 @@ SCSIBusDriverBindingSupported (
&gEfiExtScsiPassThruProtocolGuid,
This->DriverBindingHandle,
Controller
- );
+ );
return EFI_SUCCESS;
} else {
//
@@ -232,7 +232,7 @@ SCSIBusDriverBindingSupported (
&gEfiExtScsiPassThruProtocolGuid,
This->DriverBindingHandle,
Controller
- );
+ );
if (!EFI_ERROR(Status)) {
return EFI_SUCCESS;
}
@@ -240,7 +240,7 @@ SCSIBusDriverBindingSupported (
}
//
- // Come here in 2 condition:
+ // Come here in 2 condition:
// 1. ExtPassThru doesn't exist.
// 2. ExtPassThru exists but RemainingDevicePath is invalid.
//
@@ -252,22 +252,22 @@ SCSIBusDriverBindingSupported (
Controller,
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.
//
if ((RemainingDevicePath != NULL) && !IsDevicePathEnd (RemainingDevicePath)) {
Status = PassThru->GetTargetLun (PassThru, RemainingDevicePath, &ScsiTargetId.ScsiId.Scsi, &Lun);
}
-
+
gBS->CloseProtocol (
Controller,
&gEfiScsiPassThruProtocolGuid,
@@ -325,10 +325,10 @@ SCSIBusDriverBindingStart (
FromFirstTarget = FALSE;
ExtScsiSupport = FALSE;
PassThruStatus = EFI_SUCCESS;
-
+
TargetId = &ScsiTargetId.ScsiId.ExtScsi[0];
SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);
-
+
DevicePathStatus = gBS->OpenProtocol (
Controller,
&gEfiDevicePathProtocolGuid,
@@ -348,10 +348,10 @@ SCSIBusDriverBindingStart (
EFI_PROGRESS_CODE,
(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.
//
@@ -386,13 +386,13 @@ SCSIBusDriverBindingStart (
This->DriverBindingHandle,
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.
//
ExtScsiSupport = TRUE;
@@ -405,7 +405,7 @@ SCSIBusDriverBindingStart (
EFI_OPEN_PROTOCOL_BY_DRIVER
);
}
-
+
if (Status != EFI_ALREADY_STARTED) {
//
// Go through here means either ExtPassThru or PassThru Protocol is successfully opened
@@ -423,14 +423,14 @@ SCSIBusDriverBindingStart (
if (ScsiBusDev->ExtScsiSupport) {
ScsiBusDev->ExtScsiInterface = ExtScsiInterface;
} else {
- ScsiBusDev->ScsiInterface = ScsiInterface;
+ ScsiBusDev->ScsiInterface = ScsiInterface;
}
//
// Install EFI_SCSI_BUS_PROTOCOL to the controller handle, So ScsiBusDev could be
// 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,
&gEfiCallerIdGuid,
@@ -472,17 +472,17 @@ SCSIBusDriverBindingStart (
Lun = 0;
if (RemainingDevicePath == NULL) {
//
- // If RemainingDevicePath is NULL,
+ // If RemainingDevicePath is NULL,
// must enumerate all SCSI devices anyway
//
FromFirstTarget = TRUE;
} 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);
}
@@ -494,7 +494,7 @@ SCSIBusDriverBindingStart (
//
// If RemainingDevicePath is the End of Device Path Node,
// skip enumerate any device and return EFI_SUCESSS
- //
+ //
ScanOtherPuns = FALSE;
}
@@ -539,11 +539,11 @@ SCSIBusDriverBindingStart (
return EFI_SUCCESS;
ErrorExit:
-
+
if (ScsiBusDev != NULL) {
FreePool (ScsiBusDev);
}
-
+
if (ExtScsiSupport) {
gBS->CloseProtocol (
Controller,
@@ -578,7 +578,7 @@ ErrorExit:
restrictions for this service. DisconnectController() must follow these
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
@param NumberOfChildren Number of Handles in ChildHandleBuffer. If number of
@@ -650,7 +650,7 @@ SCSIBusDriverBindingStop (
);
//
// 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.
//
gBS->CloseProtocol (
@@ -763,11 +763,11 @@ SCSIBusDriverBindingStop (
@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
EFIAPI
@@ -833,7 +833,7 @@ ScsiGetDeviceLocation (
@retval EFI_DEVICE_ERROR Errors encountered when resetting the SCSI bus.
@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.
**/
EFI_STATUS
@@ -893,7 +893,7 @@ ScsiResetDevice (
(EFI_IO_BUS_ATA_ATAPI | EFI_IOB_PC_RESET),
ScsiIoDevice->ScsiBusDeviceData->DevicePath
);
-
+
CopyMem (Target,&ScsiIoDevice->Pun, TARGET_MAX_BYTES);
@@ -917,47 +917,47 @@ ScsiResetDevice (
Sends a SCSI Request Packet to the SCSI Controller for execution.
@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.
**/
EFI_STATUS
@@ -973,10 +973,10 @@ ScsiExecuteSCSICommand (
UINT8 Target[TARGET_MAX_BYTES];
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;
}
@@ -1258,7 +1258,7 @@ ScsiScanCreateDevice (
return EFI_SUCCESS;
ErrorExit:
-
+
//
// The memory space for ScsiDevicePath is allocated in
// ScsiPassThru->BuildDevicePath() function; It is no longer used
@@ -1365,7 +1365,7 @@ DiscoverScsiDevice (
ScsiDeviceFound = FALSE;
goto Done;
}
-
+
//
// Retrieved inquiry data successfully
//
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
index babf86f..a637042 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
@@ -1,7 +1,7 @@
/** @file
Header file for SCSI Bus Driver.
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -41,7 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
typedef union {
UINT32 Scsi;
- UINT8 ExtScsi[4];
+ UINT8 ExtScsi[4];
} SCSI_ID;
typedef struct _SCSI_TARGET_ID {
@@ -79,7 +79,7 @@ typedef struct _EFI_SCSI_BUS_PROTOCOL {
typedef struct _SCSI_BUS_DEVICE {
UINTN Signature;
EFI_SCSI_BUS_PROTOCOL BusIdentify;
- BOOLEAN ExtScsiSupport;
+ BOOLEAN ExtScsiSupport;
EFI_SCSI_PASS_THRU_PROTOCOL *ScsiInterface;
EFI_EXT_SCSI_PASS_THRU_PROTOCOL *ExtScsiInterface;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
@@ -92,7 +92,7 @@ typedef struct {
EFI_HANDLE Handle;
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;
SCSI_BUS_DEVICE *ScsiBusDeviceData;
@@ -174,7 +174,7 @@ SCSIBusDriverBindingStart (
restrictions for this service. DisconnectController() must follow these
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
@param NumberOfChildren Number of Handles in ChildHandleBuffer. If number of
@@ -327,11 +327,11 @@ ScsiBusComponentNameGetControllerName (
@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
EFIAPI
@@ -370,7 +370,7 @@ ScsiGetDeviceLocation (
@retval EFI_DEVICE_ERROR Errors encountered when resetting the SCSI bus.
@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.
**/
EFI_STATUS
@@ -400,47 +400,47 @@ ScsiResetDevice (
Sends a SCSI Request Packet to the SCSI Controller for execution.
@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.
**/
EFI_STATUS
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni
index d1a338b..122c1a4 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni
@@ -4,13 +4,13 @@
// 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>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
// 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.
//
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
index 18ffd88..abcd267 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
@@ -2,16 +2,16 @@
# The SCSI bus driver scans all SCSI devices and creates a device handle for each of them.
# 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>
+#
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# 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.
-#
+#
##
[Defines]
@@ -29,7 +29,7 @@
#
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-# DRIVER_BINDING = gSCSIBusDriverBinding
+# DRIVER_BINDING = gSCSIBusDriverBinding
# COMPONENT_NAME = gScsiBusComponentName
# COMPONENT_NAME2 = gScsiBusComponentName2
#
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni
index bc09a5e..29b08bc 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni
@@ -1,7 +1,7 @@
// /** @file
// ScsiBus Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@
//
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"SCSI Bus DXE Driver"
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
index 08b71d0..f2da7af 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
@@ -1,7 +1,7 @@
/** @file
UEFI Component Name(2) protocol implementation for SCSI disk driver.
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -183,7 +183,7 @@ ScsiDiskComponentNameGetControllerName (
if (ChildHandle != NULL) {
return EFI_UNSUPPORTED;
}
-
+
//
// Make sure this driver is currently managing ControllerHandle
//
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 6a0a193..0d63c85 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -1,7 +1,7 @@
/** @file
SCSI disk driver that layers on every SCSI IO protocol in the system.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -79,9 +79,9 @@ FreeAlignedBuffer (
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.
@@ -356,7 +356,7 @@ ScsiDiskDriverBindingStart (
);
return EFI_SUCCESS;
}
- }
+ }
}
gBS->FreePool (ScsiDiskDevice->SenseData);
@@ -368,7 +368,7 @@ ScsiDiskDriverBindingStart (
Controller
);
return Status;
-
+
}
@@ -380,7 +380,7 @@ ScsiDiskDriverBindingStart (
restrictions for this service. DisconnectController() must follow these
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
@param NumberOfChildren Number of Handles in ChildHandleBuffer. If number of
@@ -1720,7 +1720,7 @@ Done:
@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
@retval EFI_SUCCESS Successfully to detect media
@@ -1855,7 +1855,7 @@ ScsiDiskDetectMedia (
} else {
break;
}
- } else {
+ } else {
Retry++;
if (!NeedRetry || (Retry >= MaxRetry)) {
goto EXIT;
@@ -2059,7 +2059,7 @@ ScsiDiskInquiryDevice (
EFI_SCSI_PAGE_CODE_BLOCK_LIMITS_VPD
);
if (!EFI_ERROR (Status)) {
- ScsiDiskDevice->BlkIo.Media->OptimalTransferLengthGranularity =
+ ScsiDiskDevice->BlkIo.Media->OptimalTransferLengthGranularity =
(BlockLimits->OptimalTransferLengthGranularity2 << 8) |
BlockLimits->OptimalTransferLengthGranularity1;
@@ -2111,7 +2111,7 @@ ScsiDiskInquiryDevice (
} else if (Status == EFI_NOT_READY) {
*NeedRetry = TRUE;
return EFI_DEVICE_ERROR;
-
+
} else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {
*NeedRetry = FALSE;
return EFI_DEVICE_ERROR;
@@ -2147,7 +2147,7 @@ ScsiDiskInquiryDevice (
*NeedRetry = FALSE;
return EFI_DEVICE_ERROR;
}
-
+
//
// if goes here, meant ScsiInquiryCommand() failed.
// if ScsiDiskRequestSenseKeys() succeeds at last,
@@ -2303,7 +2303,7 @@ ScsiDiskTestUnitReady (
@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
@retval EFI_DEVICE_ERROR Indicates that error occurs
@@ -2444,7 +2444,7 @@ ScsiDiskReadCapacity (
*NeedRetry = FALSE;
//
- // 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
//
CommandStatus = ScsiReadCapacityCommand (
@@ -2508,12 +2508,12 @@ ScsiDiskReadCapacity (
// go ahead to check HostAdapterStatus and TargetStatus
// (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) {
//
// reset the scsi channel
@@ -2536,7 +2536,7 @@ ScsiDiskReadCapacity (
*NeedRetry = FALSE;
return EFI_DEVICE_ERROR;
}
-
+
//
// if goes here, meant ScsiReadCapacityCommand() failed.
// if ScsiDiskRequestSenseKeys() succeeds at last,
@@ -2616,7 +2616,7 @@ CheckHostAdapterStatus (
@param TargetStatus Target status
@retval EFI_NOT_READY Device is NOT ready.
- @retval EFI_DEVICE_ERROR
+ @retval EFI_DEVICE_ERROR
@retval EFI_SUCCESS
**/
@@ -2708,20 +2708,20 @@ ScsiDiskRequestSenseKeys (
);
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;
}
@@ -2743,7 +2743,7 @@ ScsiDiskRequestSenseKeys (
// no more sense key or number of sense keys exceeds predefined,
// 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;
}
@@ -2777,9 +2777,9 @@ GetMediaInfo (
(Capacity10->LastLba2 << 16) |
(Capacity10->LastLba1 << 8) |
Capacity10->LastLba0;
-
+
ScsiDiskDevice->BlkIo.Media->BlockSize = (Capacity10->BlockSize3 << 24) |
- (Capacity10->BlockSize2 << 16) |
+ (Capacity10->BlockSize2 << 16) |
(Capacity10->BlockSize1 << 8) |
Capacity10->BlockSize0;
ScsiDiskDevice->BlkIo.Media->LowestAlignedLba = 0;
@@ -2799,7 +2799,7 @@ GetMediaInfo (
*Ptr = Capacity16->LastLba7;
ScsiDiskDevice->BlkIo.Media->BlockSize = (Capacity16->BlockSize3 << 24) |
- (Capacity16->BlockSize2 << 16) |
+ (Capacity16->BlockSize2 << 16) |
(Capacity16->BlockSize1 << 8) |
Capacity16->BlockSize0;
@@ -2870,7 +2870,7 @@ ScsiDiskReadSectors (
BlocksRemaining = NumberOfBlocks;
BlockSize = ScsiDiskDevice->BlkIo.Media->BlockSize;
-
+
//
// limit the data bytes that can be transferred by one Read(10) or Read(16) Command
//
@@ -3114,7 +3114,7 @@ ScsiDiskWriteSectors (
&ByteCount,
Lba,
SectorCount
- );
+ );
}
if (!EFI_ERROR (Status)) {
break;
@@ -4994,7 +4994,7 @@ ScsiDiskIsHardwareError (
SensePtr = SenseData;
for (Index = 0; Index < SenseCounts; Index++) {
-
+
//
// Sense Key is EFI_SCSI_SK_HARDWARE_ERROR (0x4)
//
@@ -5071,7 +5071,7 @@ ScsiDiskIsResetBefore (
SensePtr = SenseData;
for (Index = 0; Index < SenseCounts; Index++) {
-
+
//
// Sense Key is EFI_SCSI_SK_UNIT_ATTENTION (0x6)
// Additional Sense Code is EFI_SCSI_ASC_RESET (0x29)
@@ -5092,7 +5092,7 @@ ScsiDiskIsResetBefore (
@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.
@retval FALSE Drive is NOT ready.
@@ -5187,7 +5187,7 @@ ScsiDiskHaveSenseKey (
SensePtr = SenseData;
for (Index = 0; Index < SenseCounts; Index++) {
-
+
//
// Sense Key is SK_NO_SENSE (0x0)
//
@@ -5234,18 +5234,18 @@ ReleaseScsiDiskDeviceResources (
/**
Determine if Block Io & Block Io2 should be produced.
-
+
@param ChildHandle Child Handle to retrieve Parent information.
-
+
@retval TRUE Should produce Block Io & Block Io2.
@retval FALSE Should not produce Block Io & Block Io2.
-**/
+**/
BOOLEAN
DetermineInstallBlockIo (
IN EFI_HANDLE ChildHandle
- )
+ )
{
EFI_SCSI_PASS_THRU_PROTOCOL *ScsiPassThru;
EFI_EXT_SCSI_PASS_THRU_PROTOCOL *ExtScsiPassThru;
@@ -5271,7 +5271,7 @@ DetermineInstallBlockIo (
return TRUE;
}
}
-
+
return FALSE;
}
@@ -5280,23 +5280,23 @@ DetermineInstallBlockIo (
specified by ProtocolGuid is present on a ControllerHandle and opened by
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
GetParentProtocol (
IN EFI_GUID *ProtocolGuid,
IN EFI_HANDLE ChildHandle
- )
+ )
{
UINTN Index;
UINTN HandleCount;
- VOID *Interface;
+ VOID *Interface;
EFI_STATUS Status;
EFI_HANDLE *HandleBuffer;
@@ -5316,7 +5316,7 @@ GetParentProtocol (
}
//
- // 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++) {
Status = EfiTestChildHandle (HandleBuffer[Index], ChildHandle, ProtocolGuid);
@@ -5331,7 +5331,7 @@ GetParentProtocol (
gBS->FreePool (HandleBuffer);
return NULL;
-}
+}
/**
Determine if EFI Erase Block Protocol should be produced.
@@ -5468,7 +5468,7 @@ Done:
/**
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.
@@ -5477,9 +5477,9 @@ Done:
@param[in, out] InquiryDataSize Pointer to the value for the inquiry data size.
@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
**/
EFI_STATUS
@@ -5511,16 +5511,16 @@ ScsiDiskInfoInquiry (
This function is used by the IDE bus driver to get identify data. Data format
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.
@param[in, out] IdentifyDataSize Pointer to the value for the identify data
size.
@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
**/
EFI_STATUS
@@ -5536,7 +5536,7 @@ ScsiDiskInfoIdentify (
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;
}
@@ -5554,8 +5554,8 @@ ScsiDiskInfoIdentify (
/**
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.
@param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL instance.
@@ -5585,7 +5585,7 @@ ScsiDiskInfoSenseData (
/**
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.
@@ -5626,11 +5626,11 @@ ScsiDiskInfoWhichIde (
via SCSI Request Packet.
@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 (
IN OUT SCSI_DISK_DEV *ScsiDiskDevice
@@ -5666,8 +5666,8 @@ AtapiIdentifyDevice (
@param ScsiDiskDevice The pointer of SCSI_DISK_DEV.
@param ChildHandle Child handle to install DiskInfo protocol.
-
-**/
+
+**/
VOID
InitializeInstallDiskInfo (
IN SCSI_DISK_DEV *ScsiDiskDevice,
@@ -5683,7 +5683,7 @@ InitializeInstallDiskInfo (
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);
//
@@ -5715,7 +5715,7 @@ InitializeInstallDiskInfo (
ScsiDiskDevice->Channel = AtapiDevicePath->PrimarySecondary;
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);
} else {
@@ -5726,7 +5726,7 @@ InitializeInstallDiskInfo (
ScsiDiskDevice->Channel = SataDevicePath->HBAPortNumber;
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);
}
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
index 6e9f032..bb62326 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
@@ -1,7 +1,7 @@
/** @file
Header file for SCSI Disk Driver.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -86,7 +86,7 @@ typedef struct {
//
SCSI_UNMAP_PARAM_INFO UnmapInfo;
BOOLEAN BlockLimitsVpdSupported;
-
+
//
// The flag indicates if 16-byte command can be used
//
@@ -251,7 +251,7 @@ ScsiDiskDriverBindingStart (
restrictions for this service. DisconnectController() must follow these
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
@param NumberOfChildren Number of Handles in ChildHandleBuffer. If number of
@@ -646,7 +646,7 @@ ScsiDiskEraseBlocks (
/**
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.
@@ -655,9 +655,9 @@ ScsiDiskEraseBlocks (
@param[in, out] InquiryDataSize Pointer to the value for the inquiry data size.
@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
**/
EFI_STATUS
@@ -675,16 +675,16 @@ ScsiDiskInfoInquiry (
This function is used by the IDE bus driver to get identify data. Data format
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.
@param[in, out] IdentifyDataSize Pointer to the value for the identify data
size.
@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
**/
EFI_STATUS
@@ -698,8 +698,8 @@ ScsiDiskInfoIdentify (
/**
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.
@param[in] This Pointer to the EFI_DISK_INFO_PROTOCOL instance.
@@ -725,7 +725,7 @@ ScsiDiskInfoSenseData (
/**
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.
@@ -747,7 +747,7 @@ ScsiDiskInfoWhichIde (
@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
@retval EFI_SUCCESS Successfully to detect media
@@ -790,7 +790,7 @@ ScsiDiskTestUnitReady (
@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
@retval EFI_DEVICE_ERROR Indicates that error occurs
@@ -849,7 +849,7 @@ CheckHostAdapterStatus (
@param TargetStatus Target status
@retval EFI_NOT_READY Device is NOT ready.
- @retval EFI_DEVICE_ERROR
+ @retval EFI_DEVICE_ERROR
@retval EFI_SUCCESS
**/
@@ -1071,7 +1071,7 @@ ScsiDiskRead16 (
IN UINT64 StartLba,
IN UINT32 SectorCount
);
-
+
/**
Submit Write(16) Command.
@@ -1095,7 +1095,7 @@ ScsiDiskWrite16 (
IN OUT UINT32 *DataLength,
IN UINT64 StartLba,
IN UINT32 SectorCount
- );
+ );
/**
Submit Async Read(10) command.
@@ -1326,7 +1326,7 @@ ScsiDiskIsResetBefore (
@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.
@retval FALSE Drive is NOT ready.
@@ -1368,14 +1368,14 @@ ReleaseScsiDiskDeviceResources (
/**
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
@@ -1391,26 +1391,26 @@ DetermineInstallBlockIo (
@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
- );
+ );
/**
Search protocol database and check to see if the protocol
specified by ProtocolGuid is present on a ControllerHandle and opened by
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
GetParentProtocol (
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni
index 73f8096..a5db55c 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni
@@ -3,13 +3,13 @@
//
// 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>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
// 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.
//
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
index 3fbc589..397d314 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
@@ -2,16 +2,16 @@
# 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 and Block I/O2 Protocol on
# the device handle.
-#
-# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+#
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# 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.
-#
+#
##
[Defines]
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
index 2c7fdfb..08b0e37 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
@@ -1,7 +1,7 @@
// /** @file
// ScsiDisk Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@
//
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"SCSI Disk DXE Driver"
generated by cgit v1.1 at 2024-07-30 19:37:00 +0000