From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 5 Jul 2010 23:55:26 +0000 (+0200)
Subject: Revert latest two Aleš' commits
X-Git-Tag: 1.99~749
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75d959ea7c4d0a6768afb2fab7a6b934c8cd3960;p=thirdparty%2Fgrub.git

Revert latest two Aleš' commits
---

diff --git a/ChangeLog b/ChangeLog
index 5b5717c18..81dfc1c78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-2010-07-05  Ales Nesrsta <starous@volny.cz>
-	* bus/usb/usbhub.c, usbtrans.h: Simple USB hub support
-	* bus/usb/uhci.c: UHCI portstatus correction
-
 2010-07-05  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Features): Update list of supported file systems.
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index e85f07a6f..1510f98e8 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -612,23 +612,8 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
   status = grub_uhci_readreg16 (u, reg);
   grub_dprintf ("uhci", "detect=0x%02x\n", status);
 
-  if (!enable) /* We don't need reset port */
-    {
-      /* Disable the port.  */
-      grub_uhci_writereg16 (u, reg, 0 << 2);
-      grub_dprintf ("uhci", "waiting for the port to be disabled\n");
-      endtime = grub_get_time_ms () + 1000;
-      while ((grub_uhci_readreg16 (u, reg) & (1 << 2)))
-        if (grub_get_time_ms () > endtime)
-          return grub_error (GRUB_ERR_IO, "UHCI Timed out");
-
-      status = grub_uhci_readreg16 (u, reg);
-      grub_dprintf ("uhci", ">3detect=0x%02x\n", status);
-      return GRUB_ERR_NONE;
-    }
-    
   /* Reset the port.  */
-  grub_uhci_writereg16 (u, reg, 1 << 9);
+  grub_uhci_writereg16 (u, reg, enable << 9);
 
   /* Wait for the reset to complete.  XXX: How long exactly?  */
   grub_millisleep (50); /* For root hub should be nominaly 50ms */
@@ -638,7 +623,7 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
   grub_millisleep (10);
 
   /* Enable the port.  */
-  grub_uhci_writereg16 (u, reg, 1 << 2);
+  grub_uhci_writereg16 (u, reg, enable << 2);
   grub_millisleep (10);
 
   grub_dprintf ("uhci", "waiting for the port to be enabled\n");
diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index 2bbc850d0..034ccbe8d 100644
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -21,7 +21,6 @@
 #include <grub/mm.h>
 #include <grub/usb.h>
 #include <grub/misc.h>
-#include <grub/time.h>
 
 /* USB Supports 127 devices, with device 0 as special case.  */
 static struct grub_usb_device *grub_usb_devs[128];