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

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

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
index 3f4d0fc4d35d9ac67f9f5064dfafa1ce3faac6b6..3277fa993221e5a29f8b063f37afba83af168435 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
@@ -25,9 +25,6 @@ Revision History
 #include "UsbMass.h"\r
 #include "UsbMassBot.h"\r
 \r
-UINTN mUsbBotInfo  = DEBUG_INFO;\r
-UINTN mUsbBotError = DEBUG_ERROR;\r
-\r
 STATIC\r
 EFI_STATUS\r
 UsbBotResetDevice (\r
@@ -83,7 +80,7 @@ UsbBotInit (
   Status = UsbIo->UsbGetInterfaceDescriptor (UsbIo, &UsbBot->Interface);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((mUsbBotError, "UsbBotInit: Get invalid BOT interface (%r)\n", Status));\r
+    DEBUG ((EFI_D_ERROR, "UsbBotInit: Get invalid BOT interface (%r)\n", Status));\r
     goto ON_ERROR;\r
   }\r
 \r
@@ -120,7 +117,7 @@ UsbBotInit (
   }\r
 \r
   if ((UsbBot->BulkInEndpoint == NULL) || (UsbBot->BulkOutEndpoint == NULL)) {\r
-    DEBUG ((mUsbBotError, "UsbBotInit: In/Out Endpoint invalid\n"));\r
+    DEBUG ((EFI_D_ERROR, "UsbBotInit: In/Out Endpoint invalid\n"));\r
     Status = EFI_UNSUPPORTED;\r
     goto ON_ERROR;\r
   }\r
@@ -277,9 +274,9 @@ UsbBotDataTransfer (
                             &Result\r
                             );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((mUsbBotError, "UsbBotDataTransfer: (%r)\n", Status));\r
+    DEBUG ((EFI_D_ERROR, "UsbBotDataTransfer: (%r)\n", Status));\r
     if (USB_IS_ERROR (Result, EFI_USB_ERR_STALL)) {\r
-      DEBUG ((mUsbBotError, "UsbBotDataTransfer: DataIn Stall\n"));\r
+      DEBUG ((EFI_D_ERROR, "UsbBotDataTransfer: DataIn Stall\n"));\r
       UsbClearEndpointStall (UsbBot->UsbIo, Endpoint->EndpointAddress);\r
     } else if (USB_IS_ERROR (Result, EFI_USB_ERR_NAK)) {\r
       Status = EFI_NOT_READY;\r
@@ -323,7 +320,7 @@ UsbBotGetStatus (
   EFI_USB_IO_PROTOCOL       *UsbIo;\r
   UINT32                    Index;\r
   UINTN                     Timeout;\r
-  \r
+\r
   *CmdStatus = USB_BOT_COMMAND_ERROR;\r
   Status     = EFI_DEVICE_ERROR;\r
   Endpoint   = UsbBot->BulkInEndpoint->EndpointAddress;\r
@@ -346,9 +343,9 @@ UsbBotGetStatus (
                       &Result\r
                       );\r
     if (EFI_ERROR(Status)) {\r
-      DEBUG ((mUsbBotError, "UsbBotGetStatus (%r)\n", Status));\r
+      DEBUG ((EFI_D_ERROR, "UsbBotGetStatus (%r)\n", Status));\r
       if (USB_IS_ERROR (Result, EFI_USB_ERR_STALL)) {\r
-        DEBUG ((mUsbBotError, "UsbBotGetStatus: DataIn Stall\n"));\r
+        DEBUG ((EFI_D_ERROR, "UsbBotGetStatus: DataIn Stall\n"));\r
         UsbClearEndpointStall (UsbIo, Endpoint);\r
       }\r
       continue;\r
@@ -358,13 +355,13 @@ UsbBotGetStatus (
       //\r
       // Invalid Csw need perform reset recovery\r
       //\r
-      DEBUG ((mUsbBotError, "UsbBotGetStatus: Device return a invalid signature\n"));\r
+      DEBUG ((EFI_D_ERROR, "UsbBotGetStatus: Device return a invalid signature\n"));\r
       Status = UsbBotResetDevice (UsbBot, FALSE);\r
     } else if (Csw.CmdStatus == USB_BOT_COMMAND_ERROR) {\r
       //\r
       // Respond phase error need perform reset recovery\r
       //\r
-      DEBUG ((mUsbBotError, "UsbBotGetStatus: Device return a phase error\n"));\r
+      DEBUG ((EFI_D_ERROR, "UsbBotGetStatus: Device return a phase error\n"));\r
       Status = UsbBotResetDevice (UsbBot, FALSE);\r
     } else {\r
 \r
@@ -426,7 +423,7 @@ UsbBotExecCommand (
   //\r
   Status = UsbBotSendCommand (UsbBot, Cmd, CmdLen, DataDir, DataLen);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((mUsbBotError, "UsbBotExecCommand: UsbBotSendCommand (%r)\n", Status));\r
+    DEBUG ((EFI_D_ERROR, "UsbBotExecCommand: UsbBotSendCommand (%r)\n", Status));\r
     return Status;\r
   }\r
 \r
@@ -443,7 +440,7 @@ UsbBotExecCommand (
   //\r
   Status = UsbBotGetStatus (UsbBot, DataLen, &Result);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((mUsbBotError, "UsbBotExecCommand: UsbBotGetStatus (%r)\n", Status));\r
+    DEBUG ((EFI_D_ERROR, "UsbBotExecCommand: UsbBotGetStatus (%r)\n", Status));\r
     return Status;\r
   }\r
 \r
@@ -512,7 +509,7 @@ UsbBotResetDevice (
                             );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((mUsbBotError, "UsbBotResetDevice: (%r)\n", Status));\r
+    DEBUG ((EFI_D_ERROR, "UsbBotResetDevice: (%r)\n", Status));\r
     return Status;\r
   }\r
 \r