vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert latest two Aleš' commits

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-07-06 01:55:26 +02:00
parent f1f7d19ead
commit 75d959ea7c
3 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2010-07-05 Colin Watson <cjwatson@ubuntu.com>
* docs/grub.texi (Features): Update list of supported file systems. * docs/grub.texi (Features): Update list of supported file systems.

19
bus/usb/uhci.c
View file

@ -612,23 +612,8 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
status = grub_uhci_readreg16 (u, reg); status = grub_uhci_readreg16 (u, reg);
grub_dprintf ("uhci", "detect=0x%02x\n", status); 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. */ /* 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? */ /* Wait for the reset to complete. XXX: How long exactly? */
grub_millisleep (50); /* For root hub should be nominaly 50ms */ 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); grub_millisleep (10);
/* Enable the port. */ /* Enable the port. */
grub_uhci_writereg16 (u, reg, 1 << 2); grub_uhci_writereg16 (u, reg, enable << 2);
grub_millisleep (10); grub_millisleep (10);
grub_dprintf ("uhci", "waiting for the port to be enabled\n"); grub_dprintf ("uhci", "waiting for the port to be enabled\n");

1
bus/usb/usbhub.c
View file

@ -21,7 +21,6 @@
#include <grub/mm.h> #include <grub/mm.h>
#include <grub/usb.h> #include <grub/usb.h>
#include <grub/misc.h> #include <grub/misc.h>
#include <grub/time.h>
/* USB Supports 127 devices, with device 0 as special case. */ /* USB Supports 127 devices, with device 0 as special case. */
static struct grub_usb_device *grub_usb_devs[128]; static struct grub_usb_device *grub_usb_devs[128];