Update SCSI modules to use new macros defined in UefiLib.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6564 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 9833f035bec0c58f210f3483252997a468d1ba0d..9b9a5d5e14f7f92aeeb8d7983abd34acaa58643e 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -1105,7 +1105,7 @@ DiscoverScsiDevice (
 \r
   Status = ScsiInquiryCommand (\r
             &ScsiIoDevice->ScsiIo,\r
-            EFI_SCSI_STALL_SECONDS (1),\r
+            EFI_TIMER_PERIOD_SECONDS (1),\r
             (VOID *) &SenseData,\r
             &SenseDataLength,\r
             &HostAdapterStatus,\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
index 2775b3fe73595cfd62effcfce5a2bb86b866af28..895d48388ba10e01277dd890b4a45648f227d0bd 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
@@ -35,10 +35,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DevicePathLib.h>\r
 \r
 #include <IndustryStandard/Scsi.h>\r
-//\r
-// 1000 * 1000 * 10\r
-//\r
-#define ONE_SECOND_TIMER      10000000  \r
 \r
 #define SCSI_IO_DEV_SIGNATURE EFI_SIGNATURE_32 ('s', 'c', 'i', 'o')\r
 \r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 9451932cfca031f60d956fcbc64c23ffe032c49d..d2a751a8ed5d316b33790d275e5fe1aada36e9db 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -876,7 +876,7 @@ ScsiDiskInquiryDevice (
 \r
   Status = ScsiInquiryCommand (\r
             ScsiDiskDevice->ScsiIo,\r
-            EFI_SCSI_STALL_SECONDS (1),\r
+            EFI_TIMER_PERIOD_SECONDS (1),\r
             NULL,\r
             &SenseDataLength,\r
             &HostAdapterStatus,\r
@@ -1002,7 +1002,7 @@ ScsiDiskTestUnitReady (
   //\r
   Status = ScsiTestUnitReadyCommand (\r
             ScsiDiskDevice->ScsiIo,\r
-            EFI_SCSI_STALL_SECONDS (1),\r
+            EFI_TIMER_PERIOD_SECONDS (1),\r
             NULL,\r
             &SenseDataLength,\r
             &HostAdapterStatus,\r
@@ -1192,7 +1192,7 @@ ScsiDiskReadCapacity (
   //\r
   CommandStatus = ScsiReadCapacityCommand (\r
                     ScsiDiskDevice->ScsiIo,\r
-                    EFI_SCSI_STALL_SECONDS (1),\r
+                    EFI_TIMER_PERIOD_SECONDS (1),\r
                     NULL,\r
                     &SenseDataLength,\r
                     &HostAdapterStatus,\r
@@ -1409,7 +1409,7 @@ ScsiDiskRequestSenseKeys (
   for (SenseReq = TRUE; SenseReq;) {\r
     Status = ScsiRequestSenseCommand (\r
               ScsiDiskDevice->ScsiIo,\r
-              EFI_SCSI_STALL_SECONDS (2),\r
+              EFI_TIMER_PERIOD_SECONDS (2),\r
               PtrSenseData,\r
               &SenseDataLength,\r
               &HostAdapterStatus,\r
@@ -1567,7 +1567,7 @@ ScsiDiskReadSectors (
     }\r
 \r
     ByteCount = SectorCount * BlockSize;\r
-    Timeout   = EFI_SCSI_STALL_SECONDS (2);\r
+    Timeout   = EFI_TIMER_PERIOD_SECONDS (2);\r
 \r
     MaxRetry  = 2;\r
     for (Index = 0; Index < MaxRetry; Index++) {\r
@@ -1671,7 +1671,7 @@ ScsiDiskWriteSectors (
     }\r
 \r
     ByteCount = SectorCount * BlockSize;\r
-    Timeout   = EFI_SCSI_STALL_SECONDS (2);\r
+    Timeout   = EFI_TIMER_PERIOD_SECONDS (2);\r
     MaxRetry  = 2;\r
     for (Index = 0; Index < MaxRetry; Index++) {\r
       Status = ScsiDiskWrite10 (\r