Slight improve in USB-related boot-time checkpoints.

diff --git a/ChangeLog b/ChangeLog
index 69c764b56d39d162a1e30171ddaa8d42cf150e36..5e6369cf42eaf8153d2cc866fe8c48763ed08565 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Slight improve in USB-related boot-time checkpoints.
+
 2013-03-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/boottime.c: Fix copyright header.

diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c
index a5a24afb6feaeb4ba0d27c467fde9dc3601bab8c..e902fcd7e4691bca8dae929ef9a4d5c74ec0e6eb 100644 (file)
--- a/grub-core/bus/usb/ehci.c
+++ b/grub-core/bus/usb/ehci.c
@@ -1699,6 +1699,8 @@ grub_ehci_portstatus (grub_usb_controller_t dev,
 
   grub_dprintf ("ehci", "portstatus: enable\n");
 
+  grub_boot_time ("Resetting port %d", port);
+
   /* Now we will do reset - if HIGH speed device connected, it will
    * result in Enabled state, otherwise port remains disabled. */
   /* Set RESET bit for 50ms */
@@ -1708,7 +1710,6 @@ grub_ehci_portstatus (grub_usb_controller_t dev,
   /* Reset RESET bit and wait for the end of reset */
   grub_ehci_port_resbits (e, port, GRUB_EHCI_PORT_RESET);
   endtime = grub_get_time_ms () + 1000;
-  grub_boot_time ("Resetting port %d", port);
   while (grub_ehci_port_read (e, port) & GRUB_EHCI_PORT_RESET)
     if (grub_get_time_ms () > endtime)
       return grub_error (GRUB_ERR_IO,

diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
index fd7b94e8c76171944ffd9cab75b152897f1a9bd8..6fc9d021cb32e1dc9160f7b8aab145b1fa46b67c 100644 (file)
--- a/grub-core/bus/usb/usbhub.c
+++ b/grub-core/bus/usb/usbhub.c
@@ -452,7 +452,7 @@ wait_power_nonroot_hub (grub_usb_device_t dev)
                                  GRUB_USB_HUB_FEATURE_PORT_RESET,
                                  i, 0, 0);
            dev->ports[i - 1].state = PORT_STATE_NORMAL;
-           grub_boot_time ("Resetting port %d", i);
+           grub_boot_time ("Resetting port %p:%d", dev, i - 1);
 
            rescan = 1;
            /* We cannot reset more than one device at the same time !
@@ -573,6 +573,8 @@ poll_nonroot_hub (grub_usb_device_t dev)
              dev->ports[i - 1].soft_limit_time = grub_get_time_ms () + 250;
              dev->ports[i - 1].hard_limit_time = dev->ports[i - 1].soft_limit_time + 1750;
              dev->ports[i - 1].state = PORT_STATE_WAITING_FOR_STABLE_POWER;
+             grub_boot_time ("Scheduling stable power wait for port %p:%d",
+                             dev, i - 1);
              continue;
            }
        }
@@ -664,8 +666,6 @@ grub_usb_poll_devices (int wait_for_completion)
        }
     }
 
-  grub_boot_time ("Probing USB device driver");
-
   while (1)
     {
       rescan = 0;