2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
/* usb.c - USB Hub Support. */
|
|
|
|
|
/*
|
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
|
|
|
|
* Copyright (C) 2008 Free Software Foundation, Inc.
|
|
|
|
|
*
|
|
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <grub/dl.h>
|
|
|
|
|
#include <grub/mm.h>
|
|
|
|
|
#include <grub/usb.h>
|
|
|
|
|
#include <grub/misc.h>
|
|
|
|
|
|
|
|
|
|
/* USB Supports 127 devices, with device 0 as special case. */
|
|
|
|
|
static struct grub_usb_device *grub_usb_devs[128];
|
|
|
|
|
|
|
|
|
|
/* Add a device that currently has device number 0 and resides on
|
|
|
|
|
CONTROLLER, the Hub reported that the device speed is SPEED. */
|
|
|
|
|
static grub_usb_device_t
|
|
|
|
|
grub_usb_hub_add_dev (grub_usb_controller_t controller, grub_usb_speed_t speed)
|
|
|
|
|
{
|
|
|
|
|
grub_usb_device_t dev;
|
|
|
|
|
int i;
|
|
|
|
|
|
2009-07-16 22:14:09 +00:00
|
|
|
|
dev = grub_zalloc (sizeof (struct grub_usb_device));
|
2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
if (! dev)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
dev->controller = *controller;
|
|
|
|
|
dev->speed = speed;
|
|
|
|
|
|
|
|
|
|
grub_usb_device_initialize (dev);
|
|
|
|
|
|
|
|
|
|
/* Assign a new address to the device. */
|
|
|
|
|
for (i = 1; i < 128; i++)
|
|
|
|
|
{
|
|
|
|
|
if (! grub_usb_devs[i])
|
|
|
|
|
break;
|
|
|
|
|
}
|
2009-12-22 09:18:18 +00:00
|
|
|
|
if (i == 128)
|
2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
{
|
2009-12-24 22:53:05 +00:00
|
|
|
|
grub_error (GRUB_ERR_IO, "can't assign address to USB device");
|
2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_usb_control_msg (dev,
|
|
|
|
|
(GRUB_USB_REQTYPE_OUT
|
|
|
|
|
| GRUB_USB_REQTYPE_STANDARD
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_DEV),
|
|
|
|
|
GRUB_USB_REQ_SET_ADDRESS,
|
|
|
|
|
i, 0, 0, NULL);
|
2009-12-22 09:18:18 +00:00
|
|
|
|
|
2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
dev->addr = i;
|
|
|
|
|
dev->initialized = 1;
|
|
|
|
|
grub_usb_devs[i] = dev;
|
|
|
|
|
|
|
|
|
|
return dev;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_usb_add_hub (grub_usb_device_t dev)
|
|
|
|
|
{
|
|
|
|
|
struct grub_usb_usb_hubdesc hubdesc;
|
|
|
|
|
grub_err_t err;
|
|
|
|
|
int i;
|
2010-07-05 17:02:05 +00:00
|
|
|
|
grub_uint64_t timeout;
|
|
|
|
|
grub_usb_device_t next_dev;
|
|
|
|
|
|
|
|
|
|
err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
|
|
|
|
|
| GRUB_USB_REQTYPE_CLASS
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_DEV),
|
|
|
|
|
GRUB_USB_REQ_GET_DESCRIPTOR,
|
|
|
|
|
(GRUB_USB_DESCRIPTOR_HUB << 8) | 0,
|
|
|
|
|
0, sizeof (hubdesc), (char *) &hubdesc);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
grub_dprintf ("usb", "Hub descriptor:\n\t\t len:%d, typ:0x%02x, cnt:%d, char:0x%02x, pwg:%d, curr:%d\n",
|
|
|
|
|
hubdesc.length, hubdesc.type, hubdesc.portcnt,
|
|
|
|
|
hubdesc.characteristics, hubdesc.pwdgood,
|
|
|
|
|
hubdesc.current);
|
|
|
|
|
|
|
|
|
|
/* Activate the first configuration. Hubs should have only one conf. */
|
|
|
|
|
grub_dprintf ("usb", "Hub set configuration\n");
|
|
|
|
|
grub_usb_set_configuration (dev, 1);
|
|
|
|
|
|
|
|
|
|
/* Power on all Hub ports. */
|
|
|
|
|
for (i = 1; i <= hubdesc.portcnt; i++)
|
|
|
|
|
{
|
|
|
|
|
grub_dprintf ("usb", "Power on - port %d\n", i);
|
|
|
|
|
/* Power on the port and wait for possible device connect */
|
|
|
|
|
err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
|
|
|
|
|
| GRUB_USB_REQTYPE_CLASS
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_OTHER),
|
|
|
|
|
GRUB_USB_REQ_SET_FEATURE,
|
|
|
|
|
GRUB_USB_HUB_FEATURE_PORT_POWER,
|
|
|
|
|
i, 0, NULL);
|
|
|
|
|
/* Just ignore the device if some error happened */
|
|
|
|
|
if (err)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
/* Wait for port power-on */
|
|
|
|
|
if (hubdesc.pwdgood >= 50)
|
|
|
|
|
grub_millisleep (hubdesc.pwdgood * 2);
|
|
|
|
|
else
|
|
|
|
|
grub_millisleep (100);
|
|
|
|
|
|
2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
/* Iterate over the Hub ports. */
|
|
|
|
|
for (i = 1; i <= hubdesc.portcnt; i++)
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t status;
|
|
|
|
|
|
|
|
|
|
/* Get the port status. */
|
|
|
|
|
err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
|
|
|
|
|
| GRUB_USB_REQTYPE_CLASS
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_OTHER),
|
2010-07-05 17:02:05 +00:00
|
|
|
|
GRUB_USB_REQ_GET_STATUS,
|
2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
0, i, sizeof (status), (char *) &status);
|
|
|
|
|
/* Just ignore the device if the Hub does not report the
|
|
|
|
|
status. */
|
|
|
|
|
if (err)
|
|
|
|
|
continue;
|
2010-07-05 17:02:05 +00:00
|
|
|
|
grub_dprintf ("usb", "Hub port %d status: 0x%02x\n", i, status);
|
|
|
|
|
|
2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
/* If connected, reset and enable the port. */
|
|
|
|
|
if (status & GRUB_USB_HUB_STATUS_CONNECTED)
|
|
|
|
|
{
|
|
|
|
|
grub_usb_speed_t speed;
|
|
|
|
|
|
|
|
|
|
/* Determine the device speed. */
|
|
|
|
|
if (status & GRUB_USB_HUB_STATUS_LOWSPEED)
|
|
|
|
|
speed = GRUB_USB_SPEED_LOW;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (status & GRUB_USB_HUB_STATUS_HIGHSPEED)
|
|
|
|
|
speed = GRUB_USB_SPEED_HIGH;
|
|
|
|
|
else
|
|
|
|
|
speed = GRUB_USB_SPEED_FULL;
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-05 17:02:05 +00:00
|
|
|
|
/* A device is actually connected to this port.
|
|
|
|
|
* Now do reset of port. */
|
|
|
|
|
grub_dprintf ("usb", "Reset hub port - port %d\n", i);
|
2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
|
|
|
|
|
| GRUB_USB_REQTYPE_CLASS
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_OTHER),
|
2010-07-05 17:02:05 +00:00
|
|
|
|
GRUB_USB_REQ_SET_FEATURE,
|
|
|
|
|
GRUB_USB_HUB_FEATURE_PORT_RESET,
|
|
|
|
|
i, 0, 0);
|
2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
/* If the Hub does not cooperate for this port, just skip
|
|
|
|
|
the port. */
|
|
|
|
|
if (err)
|
|
|
|
|
continue;
|
|
|
|
|
|
2010-07-05 17:02:05 +00:00
|
|
|
|
/* Wait for reset procedure done */
|
|
|
|
|
timeout = grub_get_time_ms () + 1000;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
/* Get the port status. */
|
|
|
|
|
err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
|
|
|
|
|
| GRUB_USB_REQTYPE_CLASS
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_OTHER),
|
|
|
|
|
GRUB_USB_REQ_GET_STATUS,
|
|
|
|
|
0, i, sizeof (status), (char *) &status);
|
|
|
|
|
}
|
|
|
|
|
while (!err &&
|
|
|
|
|
!(status & GRUB_USB_HUB_STATUS_C_PORT_RESET) &&
|
|
|
|
|
(grub_get_time_ms() < timeout) );
|
|
|
|
|
if (err || !(status & GRUB_USB_HUB_STATUS_C_PORT_RESET) )
|
|
|
|
|
continue;
|
|
|
|
|
|
2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
/* Add the device and assign a device address to it. */
|
2010-07-05 17:02:05 +00:00
|
|
|
|
grub_dprintf ("usb", "Call hub_add_dev - port %d\n", i);
|
|
|
|
|
next_dev = grub_usb_hub_add_dev (&dev->controller, speed);
|
|
|
|
|
if (! next_dev)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* If the device is a Hub, scan it for more devices. */
|
|
|
|
|
if (next_dev->descdev.class == 0x09)
|
|
|
|
|
grub_usb_add_hub (next_dev);
|
2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/scsi.c'.
(grub_emu_SOURCES) [grub_emu_SOURCES]: Add `disk/usbms.c',
`util/usb.c', `bus/usb/usb.c' and `commands/usbtest.c'.
(grub_emu_LDFLAGS): Add `$(LIBUSB)'.
(pkglib_MODULES): Add `usb.mod', `uhci.mod', `ohci.mod',
`usbtest.mod' and `usbms.mod'.
(usb_mod_SOURCES, usb_mod_CFLAGS, usb_mod_LDFLAGS)
(usbtest_mod_SOURCES, usbtest_mod_CFLAGS, usbtest_mod_LDFLAGS)
(uhci_mod_SOURCES, uhci_mod_CFLAGS, uhci_mod_LDFLAGS,
(ohci_mod_SOURCES, ohci_mod_CFLAGS, ohci_mod_LDFLAGS)
(usbms_mod_SOURCES, usbms_mod_CFLAGS, usbms_mod_LDFLAGS): New
variables.
* disk/usbms.c: New file.
* include/grub/usb.h: Likewise.
* include/grub/usbtrans.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* bus/usb/usbtrans.c: Likewise.
* bus/usb/ohci.c: Likewise.
* bus/usb/uhci.c: Likewise.
* bus/usb/usbhub.c: Likewise.
* bus/usb/usb.c: Likewise.
* commands/usbtest.c: Likewise.
* util/usb.c: Likewise.
* include/grub/err.h (grub_err_t): Add `GRUB_ERR_IO'.
* configure.ac: Test for libusb presence.
* util/grub-emu.c (main) [HAVE_LIBUSB_H]: Call `grub_libusb_init'.
2009-02-08 17:58:32 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_usb_err_t
|
|
|
|
|
grub_usb_root_hub (grub_usb_controller_t controller)
|
|
|
|
|
{
|
|
|
|
|
grub_err_t err;
|
|
|
|
|
int ports;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* Query the number of ports the root Hub has. */
|
|
|
|
|
ports = controller->dev->hubports (controller);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ports; i++)
|
|
|
|
|
{
|
|
|
|
|
grub_usb_speed_t speed = controller->dev->detect_dev (controller, i);
|
|
|
|
|
|
|
|
|
|
if (speed != GRUB_USB_SPEED_NONE)
|
|
|
|
|
{
|
|
|
|
|
grub_usb_device_t dev;
|
|
|
|
|
|
|
|
|
|
/* Enable the port. */
|
|
|
|
|
err = controller->dev->portstatus (controller, i, 1);
|
|
|
|
|
if (err)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* Enable the port and create a device. */
|
|
|
|
|
dev = grub_usb_hub_add_dev (controller, speed);
|
|
|
|
|
if (! dev)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* If the device is a Hub, scan it for more devices. */
|
|
|
|
|
if (dev->descdev.class == 0x09)
|
|
|
|
|
grub_usb_add_hub (dev);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return GRUB_USB_ERR_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
grub_usb_iterate (int (*hook) (grub_usb_device_t dev))
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 128; i++)
|
|
|
|
|
{
|
|
|
|
|
if (grub_usb_devs[i])
|
|
|
|
|
{
|
|
|
|
|
if (hook (grub_usb_devs[i]))
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|