Fixed unexpected timeout in Usb MassStorage Driver.

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbBusDxe / UsbDesc.c

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
index ffed1493c684d3ddff4d89ccf1bb7d110229ba3c..c9e1755fded79eb2c573d762c02655f54ee13657 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
@@ -208,7 +208,7 @@ UsbCreateDesc (
 \r
   if ((Len <= Offset)      || (Len < Offset + DescLen) ||\r
       (Head->Type != Type) || (Head->Len != DescLen)) {\r
-    USB_ERROR (("UsbCreateDesc: met mal-format descriptor\n"));\r
+    DEBUG (( EFI_D_ERROR, "UsbCreateDesc: met mal-format descriptor\n"));\r
     return NULL;\r
   }\r
 \r
@@ -254,7 +254,7 @@ UsbParseInterfaceDesc (
   Setting   = UsbCreateDesc (DescBuf, Len, USB_DESC_TYPE_INTERFACE, &Used);\r
 \r
   if (Setting == NULL) {\r
-    USB_ERROR (("UsbParseInterfaceDesc: failed to create interface descriptor\n"));\r
+    DEBUG (( EFI_D_ERROR, "UsbParseInterfaceDesc: failed to create interface descriptor\n"));\r
     return NULL;\r
   }\r
 \r
@@ -265,7 +265,7 @@ UsbParseInterfaceDesc (
   //\r
   NumEp  = Setting->Desc.NumEndpoints;\r
 \r
-  USB_DEBUG (("UsbParseInterfaceDesc: interface %d(setting %d) has %d endpoints\n",\r
+  DEBUG (( EFI_D_INFO, "UsbParseInterfaceDesc: interface %d(setting %d) has %d endpoints\n",\r
               Setting->Desc.InterfaceNumber, Setting->Desc.AlternateSetting, NumEp));\r
 \r
   if (NumEp == 0) {\r
@@ -285,7 +285,7 @@ UsbParseInterfaceDesc (
     Ep = UsbCreateDesc (DescBuf + Offset, Len - Offset, USB_DESC_TYPE_ENDPOINT, &Used);\r
 \r
     if (Ep == NULL) {\r
-      USB_ERROR (("UsbParseInterfaceDesc: failed to create endpoint(index %d)\n", Index));\r
+      DEBUG (( EFI_D_ERROR, "UsbParseInterfaceDesc: failed to create endpoint(index %d)\n", Index));\r
       goto ON_ERROR;\r
     }\r
 \r
@@ -345,7 +345,7 @@ UsbParseConfigDesc (
     goto ON_ERROR;\r
   }\r
 \r
-  USB_DEBUG (("UsbParseConfigDesc: config %d has %d interfaces\n",\r
+  DEBUG (( EFI_D_INFO, "UsbParseConfigDesc: config %d has %d interfaces\n",\r
                 Config->Desc.ConfigurationValue, NumIf));\r
 \r
   for (Index = 0; Index < NumIf; Index++) {\r
@@ -373,11 +373,11 @@ UsbParseConfigDesc (
     Setting = UsbParseInterfaceDesc (DescBuf, Len, &Consumed);\r
 \r
     if ((Setting == NULL)) {\r
-      USB_ERROR (("UsbParseConfigDesc: failed to parse interface setting\n"));\r
+      DEBUG (( EFI_D_ERROR, "UsbParseConfigDesc: failed to parse interface setting\n"));\r
       goto ON_ERROR;\r
 \r
     } else if (Setting->Desc.InterfaceNumber >= NumIf) {\r
-      USB_ERROR (("UsbParseConfigDesc: mal-formated interface descriptor\n"));\r
+      DEBUG (( EFI_D_ERROR, "UsbParseConfigDesc: mal-formated interface descriptor\n"));\r
 \r
       UsbFreeInterfaceDesc (Setting);\r
       goto ON_ERROR;\r
@@ -464,7 +464,7 @@ UsbCtrlRequest (
              Direction,\r
              Buf,\r
              &Len,\r
-             50 * USB_STALL_1_MS,\r
+             USB_GENERAL_DEVICE_REQUEST_TIMEOUT,\r
              &UsbDev->Translator,\r
              &Result\r
              );\r
@@ -554,7 +554,7 @@ UsbGetMaxPacketSize0 (
       return EFI_SUCCESS;\r
     }\r
 \r
-    gBS->Stall (100 * USB_STALL_1_MS);\r
+    gBS->Stall (USB_RETRY_MAX_PACK_SIZE_STALL);\r
   }\r
 \r
   return EFI_DEVICE_ERROR;\r
@@ -747,13 +747,13 @@ UsbGetOneConfig (
   Status = UsbCtrlGetDesc (UsbDev, USB_DESC_TYPE_CONFIG, Index, 0, &Desc, 8);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    USB_ERROR (("UsbGetOneConfig: failed to get descript length(%d) %r\n",\r
+    DEBUG (( EFI_D_ERROR, "UsbGetOneConfig: failed to get descript length(%d) %r\n",\r
                 Status, Desc.TotalLength));\r
 \r
     return NULL;\r
   }\r
 \r
-  USB_DEBUG (("UsbGetOneConfig: total length is %d\n", Desc.TotalLength));\r
+  DEBUG (( EFI_D_INFO, "UsbGetOneConfig: total length is %d\n", Desc.TotalLength));\r
 \r
   Buf = AllocateZeroPool (Desc.TotalLength);\r
 \r
@@ -764,7 +764,7 @@ UsbGetOneConfig (
   Status = UsbCtrlGetDesc (UsbDev, USB_DESC_TYPE_CONFIG, Index, 0, Buf, Desc.TotalLength);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    USB_ERROR (("UsbGetOneConfig: failed to get full descript %r\n", Status));\r
+    DEBUG (( EFI_D_ERROR, "UsbGetOneConfig: failed to get full descript %r\n", Status));\r
 \r
     gBS->FreePool (Buf);\r
     return NULL;\r
@@ -805,7 +805,7 @@ UsbBuildDescTable (
   Status = UsbGetDevDesc (UsbDev);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    USB_ERROR (("UsbBuildDescTable: failed to get device descriptor - %r\n", Status));\r
+    DEBUG (( EFI_D_ERROR, "UsbBuildDescTable: failed to get device descriptor - %r\n", Status));\r
     return Status;\r
   }\r
 \r
@@ -817,7 +817,7 @@ UsbBuildDescTable (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  USB_DEBUG (("UsbBuildDescTable: device has %d configures\n", NumConfig));\r
+  DEBUG (( EFI_D_INFO, "UsbBuildDescTable: device has %d configures\n", NumConfig));\r
 \r
   //\r
   // Read each configurations, then parse them\r
@@ -826,7 +826,7 @@ UsbBuildDescTable (
     Config = UsbGetOneConfig (UsbDev, Index);\r
 \r
     if (Config == NULL) {\r
-      USB_ERROR (("UsbBuildDescTable: failed to get configure (index %d)\n", Index));\r
+      DEBUG (( EFI_D_ERROR, "UsbBuildDescTable: failed to get configure (index %d)\n", Index));\r
 \r
       //\r
       // If we can get the default descriptor, it is likely that the\r
@@ -844,7 +844,7 @@ UsbBuildDescTable (
     gBS->FreePool (Config);\r
 \r
     if (ConfigDesc == NULL) {\r
-      USB_ERROR (("UsbBuildDescTable: failed to parse configure (index %d)\n", Index));\r
+      DEBUG (( EFI_D_ERROR, "UsbBuildDescTable: failed to parse configure (index %d)\n", Index));\r
 \r
       //\r
       // If we can get the default descriptor, it is likely that the\r
@@ -867,7 +867,7 @@ UsbBuildDescTable (
   Status = UsbBuildLangTable (UsbDev);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    USB_DEBUG (("UsbBuildDescTable: get language ID table %r\n", Status));\r
+    DEBUG (( EFI_D_ERROR, "UsbBuildDescTable: get language ID table %r\n", Status));\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -981,7 +981,7 @@ UsbIoClearFeature (
                     UsbIo,\r
                     &DevReq,\r
                     EfiUsbNoData,\r
-                    10 * USB_STALL_1_MS,\r
+                    USB_CLEAR_FEATURE_REQUEST_TIMEOUT,\r
                     NULL,\r
                     0,\r
                     &UsbResult\r