1. Added EFI_MEDIA_CHANGED and EFI_INVALID_PARAMETER returns in UsbMassReadBlocks().

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbMassStorageDxe / UsbMassBoot.c

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index 1299059c074f067afac77822d54fd011eab7adf0..8dd7ada7d648503a38b6faefd59778cdca54abf8 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -167,7 +167,7 @@ UsbBootRequestSense (
                         &CmdResult\r
                         );\r
   if (EFI_ERROR (Status) || CmdResult != USB_MASS_CMD_SUCCESS) {\r
                         &CmdResult\r
                         );\r
   if (EFI_ERROR (Status) || CmdResult != USB_MASS_CMD_SUCCESS) {\r

-    DEBUG ((mUsbMscError, "UsbBootRequestSense: (%r) CmdResult=0x%x\n", Status, CmdResult));\r
+    DEBUG ((EFI_D_ERROR, "UsbBootRequestSense: (%r) CmdResult=0x%x\n", Status, CmdResult));\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r


@@ -225,7 +225,7 @@ UsbBootRequestSense (
     break;\r
   }\r
 \r
     break;\r
   }\r
 \r

-  DEBUG ((mUsbMscInfo, "UsbBootRequestSense: (%r) with sense key %x/%x/%x\n",\r
+  DEBUG ((EFI_D_INFO, "UsbBootRequestSense: (%r) with sense key %x/%x/%x\n",\r

           Status,\r
           USB_BOOT_SENSE_KEY (SenseData.SenseKey),\r
           SenseData.ASC,\r
           Status,\r
           USB_BOOT_SENSE_KEY (SenseData.SenseKey),\r
           SenseData.ASC,\r


@@ -291,7 +291,7 @@ UsbBootExecCmd (
     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r

-  DEBUG ((mUsbMscInfo, "UsbBootExecCmd: Fail to Exec 0x%x Cmd /w %r\n",\r
+  DEBUG ((EFI_D_INFO, "UsbBootExecCmd: Fail to Exec 0x%x Cmd /w %r\n",\r

           *(UINT8 *)Cmd ,Status));\r
 \r
   return UsbBootRequestSense (UsbMass);\r
           *(UINT8 *)Cmd ,Status));\r
 \r
   return UsbBootRequestSense (UsbMass);\r


@@ -349,7 +349,7 @@ UsbBootExecCmdWithRetry (
                DataDir,\r
                Data,\r
                DataLen,\r
                DataDir,\r
                Data,\r
                DataLen,\r

-               Timeout * (Index + 1)\r
+               Timeout\r

                );\r
     if (Status == EFI_SUCCESS ||\r
         Status == EFI_MEDIA_CHANGED) {\r
                );\r
     if (Status == EFI_SUCCESS ||\r
         Status == EFI_MEDIA_CHANGED) {\r


@@ -513,7 +513,7 @@ UsbBootReadCapacity (
     return EFI_NOT_READY;\r
   }\r
 \r
     return EFI_NOT_READY;\r
   }\r
 \r

-  DEBUG ((mUsbMscInfo, "UsbBootReadCapacity Success LBA=%ld BlockSize=%d\n",\r
+  DEBUG ((EFI_D_INFO, "UsbBootReadCapacity Success LBA=%ld BlockSize=%d\n",\r

           Media->LastBlock, Media->BlockSize));\r
 \r
   return EFI_SUCCESS;\r
           Media->LastBlock, Media->BlockSize));\r
 \r
   return EFI_SUCCESS;\r


@@ -603,7 +603,7 @@ UsbBootGetParams (
 \r
   Status = UsbBootInquiry (UsbMass);\r
   if (EFI_ERROR (Status)) {\r
 \r
   Status = UsbBootInquiry (UsbMass);\r
   if (EFI_ERROR (Status)) {\r

-    DEBUG ((mUsbMscError, "UsbBootGetParams: UsbBootInquiry (%r)\n", Status));\r
+    DEBUG ((EFI_D_ERROR, "UsbBootGetParams: UsbBootInquiry (%r)\n", Status));\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r


@@ -670,7 +670,7 @@ UsbBootDetectMedia (
 \r
   Status = UsbBootIsUnitReady (UsbMass);\r
   if (EFI_ERROR (Status)) {\r
 \r
   Status = UsbBootIsUnitReady (UsbMass);\r
   if (EFI_ERROR (Status)) {\r

-    DEBUG ((mUsbMscError, "UsbBootDetectMedia: UsbBootIsUnitReady (%r)\n", Status));\r
+    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: UsbBootIsUnitReady (%r)\n", Status));\r

     goto ON_ERROR;\r
   }\r
 \r
     goto ON_ERROR;\r
   }\r
 \r


@@ -687,7 +687,7 @@ UsbBootDetectMedia (
 \r
   Status = UsbBootReadCapacity (UsbMass);\r
   if (EFI_ERROR (Status)) {\r
 \r
   Status = UsbBootReadCapacity (UsbMass);\r
   if (EFI_ERROR (Status)) {\r

-    DEBUG ((mUsbMscError, "UsbBootDetectMedia: UsbBootReadCapacity (%r)\n", Status));\r
+    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: UsbBootReadCapacity (%r)\n", Status));\r

     goto ON_ERROR;\r
   }\r
 \r
     goto ON_ERROR;\r
   }\r
 \r


@@ -709,7 +709,7 @@ ON_ERROR:
       (Media->LastBlock != OldMedia.LastBlock)) {\r
 \r
     OldTpl = UsbGetCurrentTpl ();\r
       (Media->LastBlock != OldMedia.LastBlock)) {\r
 \r
     OldTpl = UsbGetCurrentTpl ();\r

-    DEBUG ((mUsbMscError, "UsbBootDetectMedia: TPL before reinstall BlockIoProtocol is %d\n", OldTpl));\r
+    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: TPL before reinstall BlockIoProtocol is %d\n", OldTpl));\r

 \r
     gBS->RestoreTPL (TPL_CALLBACK);\r
 \r
 \r
     gBS->RestoreTPL (TPL_CALLBACK);\r
 \r


@@ -720,7 +720,7 @@ ON_ERROR:
            &UsbMass->BlockIo\r
            );\r
 \r
            &UsbMass->BlockIo\r
            );\r
 \r

-    DEBUG ((mUsbMscError, "UsbBootDetectMedia: TPL after reinstall is %d\n", UsbGetCurrentTpl()));\r
+    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: TPL after reinstall is %d\n", UsbGetCurrentTpl()));\r

     ASSERT (UsbGetCurrentTpl () == TPL_CALLBACK);\r
 \r
     gBS->RaiseTPL (OldTpl);\r
     ASSERT (UsbGetCurrentTpl () == TPL_CALLBACK);\r
 \r
     gBS->RaiseTPL (OldTpl);\r