MdeModulePkg: Clean up source files

[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 4c29b611213dcbd0901b78b47fe3d988e3c050a5..3bd18b2a3e952b1eda0c054f52a578683f8b5c25 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
@@ -2,7 +2,7 @@
   Implementation of the USB mass storage Bulk-Only Transport protocol,\r
   according to USB Mass Storage Class Bulk-Only Transport, Revision 1.0.\r
 \r
-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -272,7 +272,7 @@ UsbBotDataTransfer (
                             );\r
   if (EFI_ERROR (Status)) {\r
     if (USB_IS_ERROR (Result, EFI_USB_ERR_STALL)) {\r
-      DEBUG ((EFI_D_INFO, "UsbBotDataTransfer: (%r)\n", Status));      \r
+      DEBUG ((EFI_D_INFO, "UsbBotDataTransfer: (%r)\n", Status));\r
       DEBUG ((EFI_D_INFO, "UsbBotDataTransfer: DataIn Stall\n"));\r
       UsbClearEndpointStall (UsbBot->UsbIo, Endpoint->EndpointAddress);\r
     } else if (USB_IS_ERROR (Result, EFI_USB_ERR_NAK)) {\r
@@ -432,11 +432,7 @@ UsbBotExecCommand (
   // whether it succeeds or fails.\r
   //\r
   TransLen = (UINTN) DataLen;\r
-  Status   = UsbBotDataTransfer (UsbBot, DataDir, Data, &TransLen, Timeout);\r
-  if (Status == EFI_DEVICE_ERROR) {\r
-    DEBUG ((EFI_D_ERROR, "UsbBotExecCommand: UsbBotDataTransfer (%r)\n", Status));\r
-    return Status;\r
-  }\r
+  UsbBotDataTransfer (UsbBot, DataDir, Data, &TransLen, Timeout);\r
 \r
   //\r
   // Get the status, if that succeeds, interpret the result\r
@@ -556,8 +552,10 @@ UsbBotGetMaxLun (
   UINT32                  Result;\r
   UINT32                  Timeout;\r
 \r
-  ASSERT (Context);\r
-  \r
+  if (Context == NULL || MaxLun == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
   UsbBot = (USB_BOT_PROTOCOL *) Context;\r
 \r
   //\r
@@ -580,8 +578,20 @@ UsbBotGetMaxLun (
                             1,\r
                             &Result\r
                             );\r
+  if (EFI_ERROR (Status) || *MaxLun > USB_BOT_MAX_LUN) {\r
+    //\r
+    // If the Get LUN request returns an error or the MaxLun is larger than\r
+    // the maximum LUN value (0x0f) supported by the USB Mass Storage Class\r
+    // Bulk-Only Transport Spec, then set MaxLun to 0.\r
+    //\r
+    // This improves compatibility with USB FLASH drives that have a single LUN\r
+    // and either do not return a max LUN value or return an invalid maximum LUN\r
+    // value.\r
+    //\r
+    *MaxLun = 0;\r
+  }\r
 \r
-  return Status;\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 /**\r