Make MdeModulePkg GCC clean.

[mirror_edk2.git] / MdeModulePkg / Bus / Scsi / ScsiDiskDxe / ScsiDisk.c

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index e85f99ba94f7ccd92b5494198cdc1794b96f44bd..61d6e4068efd1ffe7b506fca412fdafa97eedb90 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -16,21 +16,15 @@ Module Name:
 Abstract:\r
 \r
 --*/\r
-//\r
-// The package level header files this module uses\r
-//\r
+\r
 #include <PiDxe.h>\r
 \r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
+\r
 #include <Protocol/ScsiIo.h>\r
 #include <Protocol/ComponentName.h>\r
 #include <Protocol/BlockIo.h>\r
 #include <Protocol/DriverBinding.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
+\r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/UefiLib.h>\r
@@ -926,7 +920,7 @@ Returns:
   InquiryDataLength = sizeof (EFI_SCSI_INQUIRY_DATA);\r
   SenseDataLength   = 0;\r
 \r
-  Status = SubmitInquiryCommand (\r
+  Status = ScsiInquiryCommand (\r
             ScsiDiskDevice->ScsiIo,\r
             EfiScsiStallSeconds (1),\r
             NULL,\r
@@ -987,9 +981,9 @@ Returns:
   }\r
   \r
   //\r
-  // if goes here, meant SubmitInquiryCommand() failed.\r
+  // if goes here, meant ScsiInquiryCommand() failed.\r
   // if ScsiDiskRequestSenseKeys() succeeds at last,\r
-  // better retry SubmitInquiryCommand(). (by setting *NeedRetry = TRUE)\r
+  // better retry ScsiInquiryCommand(). (by setting *NeedRetry = TRUE)\r
   //\r
   MaxRetry = 3;\r
   for (Index = 0; Index < MaxRetry; Index++) {\r
@@ -1063,7 +1057,7 @@ ScsiDiskTestUnitReady (
   //\r
   // Parameter 3 and 4: do not require sense data, retrieve it when needed.\r
   //\r
-  Status = SubmitTestUnitReadyCommand (\r
+  Status = ScsiTestUnitReadyCommand (\r
             ScsiDiskDevice->ScsiIo,\r
             EfiScsiStallSeconds (1),\r
             NULL,\r
@@ -1281,7 +1275,7 @@ Returns:
   //\r
   // submit Read Capacity Command. in this call,not request sense data\r
   //\r
-  CommandStatus = SubmitReadCapacityCommand (\r
+  CommandStatus = ScsiReadCapacityCommand (\r
                     ScsiDiskDevice->ScsiIo,\r
                     EfiScsiStallSeconds (1),\r
                     NULL,\r
@@ -1343,9 +1337,9 @@ Returns:
   }\r
   \r
   //\r
-  // if goes here, meant SubmitReadCapacityCommand() failed.\r
+  // if goes here, meant ScsiReadCapacityCommand() failed.\r
   // if ScsiDiskRequestSenseKeys() succeeds at last,\r
-  // better retry SubmitReadCapacityCommand(). (by setting *NeedRetry = TRUE)\r
+  // better retry ScsiReadCapacityCommand(). (by setting *NeedRetry = TRUE)\r
   //\r
   MaxRetry = 3;\r
   for (Index = 0; Index < MaxRetry; Index++) {\r
@@ -1520,7 +1514,7 @@ ScsiDiskRequestSenseKeys (
 \r
   for (SenseReq = TRUE; SenseReq;) {\r
 \r
-    Status = SubmitRequestSenseCommand (\r
+    Status = ScsiRequestSenseCommand (\r
               ScsiDiskDevice->ScsiIo,\r
               EfiScsiStallSeconds (2),\r
               PtrSenseData,\r
@@ -1900,7 +1894,7 @@ Returns:
   *NeedRetry          = FALSE;\r
   *NumberOfSenseKeys  = 0;\r
   SenseDataLength     = 0;\r
-  Status = SubmitRead10Command (\r
+  Status = ScsiRead10Command (\r
             ScsiDiskDevice->ScsiIo,\r
             Timeout,\r
             NULL,\r
@@ -1959,7 +1953,7 @@ Returns:
   *NeedRetry          = FALSE;\r
   *NumberOfSenseKeys  = 0;\r
   SenseDataLength     = 0;\r
-  Status = SubmitWrite10Command (\r
+  Status = ScsiWrite10Command (\r
             ScsiDiskDevice->ScsiIo,\r
             Timeout,\r
             NULL,\r