Merge in some fix from R8 on USB Bus driver:

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

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.c
index 096b10a831181dbb88f135d272dadcd6d7748519..608ea9f8b69baa7dbf1a9f9db4b14479dee1e796 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.c
@@ -150,8 +150,7 @@ UsbIoControlTransfer (
 \r
       goto ON_EXIT;\r
     }\r
-\r
-    USB_DEBUG (("UsbIoControlTransfer: configure changed!!! Do NOT use old UsbIo!!!\n"));\r
+    DEBUG ((EFI_D_INFO, "UsbIoControlTransfer: configure changed!!! Do NOT use old UsbIo!!!\n"));\r
 \r
     if (Dev->ActiveConfig != NULL) {\r
       UsbRemoveConfig (Dev);\r
@@ -827,7 +826,7 @@ UsbIoPortReset (
   Status = HubIf->HubApi->ResetPort (HubIf, Dev->ParentPort);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    USB_ERROR (("UsbIoPortReset: failed to reset hub port %d@hub  %d, %r \n",\r
+    DEBUG (( EFI_D_ERROR, "UsbIoPortReset: failed to reset hub port %d@hub  %d, %r \n",\r
                 Dev->ParentPort, Dev->ParentAddr, Status));\r
 \r
     goto ON_EXIT;\r
@@ -843,7 +842,7 @@ UsbIoPortReset (
   Status        = UsbSetAddress (Dev, Address);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    USB_ERROR (("UsbIoPortReset: failed to set address for device %d - %r\n",\r
+    DEBUG (( EFI_D_ERROR, "UsbIoPortReset: failed to set address for device %d - %r\n",\r
                 Address, Status));\r
 \r
     goto ON_EXIT;\r
@@ -859,7 +858,7 @@ UsbIoPortReset (
     Status = UsbSetConfig (Dev, Dev->ActiveConfig->Desc.ConfigurationValue);\r
 \r
     if (EFI_ERROR (Status)) {\r
-      USB_ERROR (("UsbIoPortReset: failed to set configure for device %d - %r\n",\r
+      DEBUG (( EFI_D_ERROR, "UsbIoPortReset: failed to set configure for device %d - %r\n",\r
                   Address, Status));\r
     }\r
   }\r
@@ -1105,7 +1104,7 @@ UsbBusControllerDriverStart (
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    USB_ERROR (("UsbBusStart: Failed to open device path %r\n", Status));\r
+    DEBUG (( EFI_D_ERROR, "UsbBusStart: Failed to open device path %r\n", Status));\r
 \r
     gBS->FreePool (UsbBus);\r
     return Status;\r
@@ -1138,7 +1137,7 @@ UsbBusControllerDriverStart (
                    );\r
 \r
   if (EFI_ERROR (Status) && EFI_ERROR (Status2)) {\r
-    USB_ERROR (("UsbBusStart: Failed to open USB_HC/USB2_HC %r\n", Status));\r
+    DEBUG (( EFI_D_ERROR, "UsbBusStart: Failed to open USB_HC/USB2_HC %r\n", Status));\r
 \r
     Status = EFI_DEVICE_ERROR;\r
     goto CLOSE_HC;\r
@@ -1169,10 +1168,14 @@ UsbBusControllerDriverStart (
   RootIf->Device          = RootHub;\r
   RootIf->DevicePath      = UsbBus->DevicePath;\r
 \r
+  \r
+  UsbHcReset (UsbBus, EFI_USB_HC_RESET_GLOBAL);\r
+  UsbHcSetState (UsbBus, EfiUsbHcStateOperational);\r
+\r
   Status                  = mUsbRootHubApi.Init (RootIf);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    USB_ERROR (("UsbBusStart: Failed to init root hub %r\n", Status));\r
+    DEBUG (( EFI_D_ERROR, "UsbBusStart: Failed to init root hub %r\n", Status));\r
     goto FREE_ROOTHUB;\r
   }\r
 \r
@@ -1189,16 +1192,14 @@ UsbBusControllerDriverStart (
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    USB_ERROR (("UsbBusStart: Failed to install bus protocol %r\n", Status));\r
+    DEBUG (( EFI_D_ERROR, "UsbBusStart: Failed to install bus protocol %r\n", Status));\r
 \r
     mUsbRootHubApi.Release (RootIf);\r
     goto FREE_ROOTHUB;\r
   }\r
 \r
-  UsbHcReset (UsbBus, EFI_USB_HC_RESET_GLOBAL);\r
-  UsbHcSetState (UsbBus, EfiUsbHcStateOperational);\r
 \r
-  USB_DEBUG (("UsbBusStart: usb bus started on %x, root hub %x\n", Controller, RootIf));\r
+  DEBUG (( EFI_D_INFO, "UsbBusStart: usb bus started on %x, root hub %x\n", Controller, RootIf));\r
   return EFI_SUCCESS;\r
 \r
 FREE_ROOTHUB:\r
@@ -1233,7 +1234,7 @@ CLOSE_HC:
 \r
   gBS->FreePool (UsbBus);\r
 \r
-  USB_ERROR (("UsbBusStart: Failed to start bus driver %r\n", Status));\r
+  DEBUG (( EFI_D_ERROR, "UsbBusStart: Failed to start bus driver %r\n", Status));\r
   return Status;\r
 }\r
 \r
@@ -1306,7 +1307,7 @@ UsbBusControllerDriverStop (
     return EFI_SUCCESS;\r
   }\r
 \r
-  USB_DEBUG (("UsbBusStop: usb bus stopped on %x\n", Controller));\r
+  DEBUG (( EFI_D_INFO, "UsbBusStop: usb bus stopped on %x\n", Controller));\r
 \r
   //\r
   // Locate USB_BUS for the current host controller\r