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>
|
2010-06-02 19:54:51 +00:00
|
|
|
|
#include <grub/time.h>
|
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
|
|
|
|
|
2010-07-08 20:54:35 +00:00
|
|
|
|
#define GRUB_USBHUB_MAX_DEVICES 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
|
|
|
|
/* USB Supports 127 devices, with device 0 as special case. */
|
2010-07-08 20:54:35 +00:00
|
|
|
|
static struct grub_usb_device *grub_usb_devs[GRUB_USBHUB_MAX_DEVICES];
|
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
|
|
|
|
|
2010-08-29 23:04:07 +00:00
|
|
|
|
static int rescan = 0;
|
2013-03-19 19:35:21 +00:00
|
|
|
|
static int npending = 0;
|
2010-08-29 23:04:07 +00:00
|
|
|
|
|
2010-06-02 19:54:51 +00:00
|
|
|
|
struct grub_usb_hub
|
|
|
|
|
{
|
|
|
|
|
struct grub_usb_hub *next;
|
|
|
|
|
grub_usb_controller_t controller;
|
|
|
|
|
int nports;
|
2010-08-20 17:34:29 +00:00
|
|
|
|
struct grub_usb_device **devices;
|
2013-03-20 16:07:08 +00:00
|
|
|
|
struct grub_usb_hub_port *ports;
|
2010-06-02 19:54:51 +00:00
|
|
|
|
grub_usb_device_t dev;
|
|
|
|
|
};
|
|
|
|
|
|
2011-03-23 11:05:13 +00:00
|
|
|
|
static struct grub_usb_hub *hubs;
|
2013-03-19 22:06:44 +00:00
|
|
|
|
static grub_usb_controller_dev_t grub_usb_list;
|
2010-06-02 19:54:51 +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
|
|
|
|
/* 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
|
2011-10-01 18:18:47 +00:00
|
|
|
|
grub_usb_hub_add_dev (grub_usb_controller_t controller,
|
|
|
|
|
grub_usb_speed_t speed,
|
2013-04-12 18:42:46 +00:00
|
|
|
|
int split_hubport, int split_hubaddr)
|
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
|
|
|
|
{
|
|
|
|
|
grub_usb_device_t dev;
|
|
|
|
|
int i;
|
2010-07-08 20:54:35 +00:00
|
|
|
|
grub_usb_err_t err;
|
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
|
|
|
|
|
2013-03-19 19:25:09 +00:00
|
|
|
|
grub_boot_time ("Attaching USB device");
|
|
|
|
|
|
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;
|
2013-04-12 18:42:46 +00:00
|
|
|
|
dev->split_hubport = split_hubport;
|
|
|
|
|
dev->split_hubaddr = split_hubaddr;
|
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
|
|
|
|
|
2010-07-08 20:54:35 +00:00
|
|
|
|
err = grub_usb_device_initialize (dev);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
grub_free (dev);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
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
|
|
|
|
|
|
|
|
|
/* Assign a new address to the device. */
|
2010-07-08 20:54:35 +00:00
|
|
|
|
for (i = 1; i < GRUB_USBHUB_MAX_DEVICES; 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
|
|
|
|
{
|
|
|
|
|
if (! grub_usb_devs[i])
|
|
|
|
|
break;
|
|
|
|
|
}
|
2010-07-08 20:54:35 +00:00
|
|
|
|
if (i == GRUB_USBHUB_MAX_DEVICES)
|
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");
|
2010-07-08 20:54:35 +00:00
|
|
|
|
for (i = 0; i < 8; i++)
|
|
|
|
|
grub_free (dev->config[i].descconf);
|
|
|
|
|
grub_free (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 NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-08 20:54:35 +00:00
|
|
|
|
err = 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);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
for (i = 0; i < 8; i++)
|
|
|
|
|
grub_free (dev->config[i].descconf);
|
|
|
|
|
grub_free (dev);
|
|
|
|
|
return 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;
|
|
|
|
|
|
2012-02-01 15:13:17 +00:00
|
|
|
|
grub_dprintf ("usb", "Added new usb device: %p, addr=%d\n",
|
|
|
|
|
dev, i);
|
2013-04-12 18:42:46 +00:00
|
|
|
|
grub_dprintf ("usb", "speed=%d, split_hubport=%d, split_hubaddr=%d\n",
|
|
|
|
|
speed, split_hubport, split_hubaddr);
|
2011-10-01 18:18:47 +00:00
|
|
|
|
|
2010-07-08 20:54:35 +00:00
|
|
|
|
/* Wait "recovery interval", spec. says 2ms */
|
|
|
|
|
grub_millisleep (2);
|
2013-03-19 19:25:09 +00:00
|
|
|
|
|
|
|
|
|
grub_boot_time ("Probing USB device driver");
|
2010-07-08 20:54:35 +00:00
|
|
|
|
|
|
|
|
|
grub_usb_device_attach (dev);
|
2013-03-19 19:25:09 +00:00
|
|
|
|
|
|
|
|
|
grub_boot_time ("Attached USB device");
|
2010-07-08 20:54:35 +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
|
|
|
|
return dev;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-08-20 17:34:29 +00:00
|
|
|
|
static grub_usb_err_t
|
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
|
|
|
|
grub_usb_add_hub (grub_usb_device_t dev)
|
|
|
|
|
{
|
|
|
|
|
struct grub_usb_usb_hubdesc hubdesc;
|
2011-03-23 11:18:21 +00:00
|
|
|
|
grub_usb_err_t err;
|
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
|
|
|
|
int i;
|
2010-06-21 19:12:20 +00:00
|
|
|
|
|
|
|
|
|
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);
|
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
|
|
|
|
|
2010-06-21 19:12:20 +00:00
|
|
|
|
/* Activate the first configuration. Hubs should have only one conf. */
|
|
|
|
|
grub_dprintf ("usb", "Hub set configuration\n");
|
|
|
|
|
grub_usb_set_configuration (dev, 1);
|
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
|
|
|
|
|
2010-08-20 17:34:29 +00:00
|
|
|
|
dev->nports = hubdesc.portcnt;
|
2013-03-19 22:06:44 +00:00
|
|
|
|
dev->children = grub_zalloc (hubdesc.portcnt * sizeof (dev->children[0]));
|
|
|
|
|
dev->ports = grub_zalloc (dev->nports * sizeof (dev->ports[0]));
|
|
|
|
|
if (!dev->children || !dev->ports)
|
|
|
|
|
{
|
|
|
|
|
grub_free (dev->children);
|
|
|
|
|
grub_free (dev->ports);
|
|
|
|
|
return GRUB_USB_ERR_INTERNAL;
|
|
|
|
|
}
|
2010-08-20 17:34:29 +00:00
|
|
|
|
|
2010-06-21 19:12:20 +00:00
|
|
|
|
/* 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 */
|
2010-08-29 23:04:07 +00:00
|
|
|
|
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);
|
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
|
|
|
|
}
|
|
|
|
|
|
2010-08-29 23:04:07 +00:00
|
|
|
|
/* Rest will be done on next usb poll. */
|
2010-08-21 21:09:37 +00:00
|
|
|
|
for (i = 0; i < dev->config[0].interf[0].descif->endpointcnt;
|
|
|
|
|
i++)
|
|
|
|
|
{
|
|
|
|
|
struct grub_usb_desc_endp *endp = NULL;
|
|
|
|
|
endp = &dev->config[0].interf[0].descendp[i];
|
|
|
|
|
|
|
|
|
|
if ((endp->endp_addr & 128) && grub_usb_get_ep_type(endp)
|
|
|
|
|
== GRUB_USB_EP_INTERRUPT)
|
|
|
|
|
{
|
2012-01-14 14:44:34 +00:00
|
|
|
|
grub_size_t len;
|
2010-08-21 21:09:37 +00:00
|
|
|
|
dev->hub_endpoint = endp;
|
2012-01-14 14:44:34 +00:00
|
|
|
|
len = endp->maxpacket;
|
|
|
|
|
if (len > sizeof (dev->statuschange))
|
|
|
|
|
len = sizeof (dev->statuschange);
|
2010-08-21 21:09:37 +00:00
|
|
|
|
dev->hub_transfer
|
2013-03-19 10:19:36 +00:00
|
|
|
|
= grub_usb_bulk_read_background (dev, endp, len,
|
2010-08-21 21:09:37 +00:00
|
|
|
|
(char *) &dev->statuschange);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-08-29 23:04:07 +00:00
|
|
|
|
rescan = 1;
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-02 19:54:51 +00:00
|
|
|
|
static void
|
2010-08-20 17:34:29 +00:00
|
|
|
|
attach_root_port (struct grub_usb_hub *hub, int portno,
|
2010-06-02 19:54:51 +00:00
|
|
|
|
grub_usb_speed_t speed)
|
|
|
|
|
{
|
|
|
|
|
grub_usb_device_t dev;
|
|
|
|
|
grub_err_t err;
|
2013-03-19 19:35:21 +00:00
|
|
|
|
|
|
|
|
|
grub_boot_time ("After detect_dev");
|
2010-06-02 19:54:51 +00:00
|
|
|
|
|
|
|
|
|
/* Enable the port. */
|
2010-08-20 17:34:29 +00:00
|
|
|
|
err = hub->controller->dev->portstatus (hub->controller, portno, 1);
|
2010-06-02 19:54:51 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return;
|
2010-09-18 11:49:15 +00:00
|
|
|
|
hub->controller->dev->pending_reset = grub_get_time_ms () + 5000;
|
2013-03-19 19:35:21 +00:00
|
|
|
|
npending++;
|
2010-06-02 19:54:51 +00:00
|
|
|
|
|
2011-05-16 06:50:21 +00:00
|
|
|
|
grub_millisleep (10);
|
|
|
|
|
|
2013-03-19 19:35:21 +00:00
|
|
|
|
grub_boot_time ("Port enabled");
|
|
|
|
|
|
2010-06-02 19:54:51 +00:00
|
|
|
|
/* Enable the port and create a device. */
|
2013-04-12 18:42:46 +00:00
|
|
|
|
/* High speed device needs not transaction translation
|
|
|
|
|
and full/low speed device cannot be connected to EHCI root hub
|
|
|
|
|
and full/low speed device connected to OHCI/UHCI needs not
|
|
|
|
|
transaction translation - e.g. hubport and hubaddr should be
|
|
|
|
|
always none (zero) for any device connected to any root hub. */
|
|
|
|
|
dev = grub_usb_hub_add_dev (hub->controller, speed, 0, 0);
|
2010-09-18 11:49:15 +00:00
|
|
|
|
hub->controller->dev->pending_reset = 0;
|
2013-03-19 19:35:21 +00:00
|
|
|
|
npending--;
|
2010-06-02 19:54:51 +00:00
|
|
|
|
if (! dev)
|
|
|
|
|
return;
|
|
|
|
|
|
2010-08-20 17:34:29 +00:00
|
|
|
|
hub->devices[portno] = dev;
|
|
|
|
|
|
2010-06-02 19:54:51 +00:00
|
|
|
|
/* If the device is a Hub, scan it for more devices. */
|
|
|
|
|
if (dev->descdev.class == 0x09)
|
|
|
|
|
grub_usb_add_hub (dev);
|
2013-03-19 19:25:09 +00:00
|
|
|
|
|
|
|
|
|
grub_boot_time ("Attached root port");
|
2010-06-02 19:54:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-03-19 22:06:44 +00:00
|
|
|
|
/* Iterate over all controllers found by the driver. */
|
|
|
|
|
static int
|
|
|
|
|
grub_usb_controller_dev_register_iter (grub_usb_controller_t controller, void *data)
|
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
|
|
|
|
{
|
2013-03-19 22:06:44 +00:00
|
|
|
|
grub_usb_controller_dev_t usb = data;
|
2010-06-02 19:54:51 +00:00
|
|
|
|
struct grub_usb_hub *hub;
|
2013-03-19 22:06:44 +00:00
|
|
|
|
|
|
|
|
|
controller->dev = usb;
|
2010-06-02 19:54:51 +00:00
|
|
|
|
|
2013-03-19 19:25:09 +00:00
|
|
|
|
grub_boot_time ("Registering USB root hub");
|
|
|
|
|
|
2010-06-02 19:54:51 +00:00
|
|
|
|
hub = grub_malloc (sizeof (*hub));
|
|
|
|
|
if (!hub)
|
|
|
|
|
return GRUB_USB_ERR_INTERNAL;
|
|
|
|
|
|
|
|
|
|
hub->next = hubs;
|
|
|
|
|
hubs = hub;
|
|
|
|
|
hub->controller = grub_malloc (sizeof (*controller));
|
|
|
|
|
if (!hub->controller)
|
2010-07-08 20:54:35 +00:00
|
|
|
|
{
|
|
|
|
|
grub_free (hub);
|
|
|
|
|
return GRUB_USB_ERR_INTERNAL;
|
|
|
|
|
}
|
2010-06-02 19:54:51 +00:00
|
|
|
|
|
|
|
|
|
grub_memcpy (hub->controller, controller, sizeof (*controller));
|
|
|
|
|
hub->dev = 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
|
|
|
|
|
|
|
|
|
/* Query the number of ports the root Hub has. */
|
2010-06-02 19:54:51 +00:00
|
|
|
|
hub->nports = controller->dev->hubports (controller);
|
2010-08-20 17:34:29 +00:00
|
|
|
|
hub->devices = grub_zalloc (sizeof (hub->devices[0]) * hub->nports);
|
2013-03-20 16:07:08 +00:00
|
|
|
|
hub->ports = grub_zalloc (sizeof (hub->ports[0]) * hub->nports);
|
|
|
|
|
if (!hub->devices || !hub->ports)
|
2010-06-02 19:54:51 +00:00
|
|
|
|
{
|
2013-03-19 22:06:44 +00:00
|
|
|
|
grub_free (hub->devices);
|
2013-03-20 16:07:08 +00:00
|
|
|
|
grub_free (hub->ports);
|
2010-07-08 20:54:35 +00:00
|
|
|
|
grub_free (hub->controller);
|
2010-06-02 19:54:51 +00:00
|
|
|
|
grub_free (hub);
|
2013-03-19 22:06:44 +00:00
|
|
|
|
grub_print_error ();
|
|
|
|
|
return 0;
|
2010-06-02 19:54:51 +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
|
|
|
|
|
2013-03-19 22:06:44 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
grub_usb_controller_dev_unregister (grub_usb_controller_dev_t usb)
|
|
|
|
|
{
|
|
|
|
|
grub_usb_controller_dev_t *p, q;
|
|
|
|
|
|
|
|
|
|
for (p = &grub_usb_list, q = *p; q; p = &(q->next), q = q->next)
|
|
|
|
|
if (q == usb)
|
|
|
|
|
{
|
|
|
|
|
*p = q->next;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
grub_usb_controller_dev_register (grub_usb_controller_dev_t usb)
|
|
|
|
|
{
|
|
|
|
|
int portno;
|
|
|
|
|
int continue_waiting = 0;
|
|
|
|
|
struct grub_usb_hub *hub;
|
|
|
|
|
|
|
|
|
|
usb->next = grub_usb_list;
|
|
|
|
|
grub_usb_list = usb;
|
|
|
|
|
|
|
|
|
|
if (usb->iterate)
|
|
|
|
|
usb->iterate (grub_usb_controller_dev_register_iter, usb);
|
|
|
|
|
|
|
|
|
|
grub_boot_time ("waiting for stable power on USB root\n");
|
|
|
|
|
|
|
|
|
|
while (1)
|
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
|
|
|
|
{
|
2013-03-19 22:06:44 +00:00
|
|
|
|
for (hub = hubs; hub; hub = hub->next)
|
|
|
|
|
if (hub->controller->dev == usb)
|
|
|
|
|
{
|
|
|
|
|
/* Wait for completion of insertion and stable power (USB spec.)
|
|
|
|
|
* Should be at least 100ms, some devices requires more...
|
|
|
|
|
* There is also another thing - some devices have worse contacts
|
|
|
|
|
* and connected signal is unstable for some time - we should handle
|
|
|
|
|
* it - but prevent deadlock in case when device is too faulty... */
|
|
|
|
|
for (portno = 0; portno < hub->nports; portno++)
|
|
|
|
|
{
|
|
|
|
|
grub_usb_speed_t speed;
|
|
|
|
|
int changed = 0;
|
|
|
|
|
|
|
|
|
|
speed = hub->controller->dev->detect_dev (hub->controller, portno,
|
|
|
|
|
&changed);
|
|
|
|
|
|
2013-03-20 16:07:08 +00:00
|
|
|
|
if (hub->ports[portno].state == PORT_STATE_NORMAL
|
2013-03-19 22:06:44 +00:00
|
|
|
|
&& speed != GRUB_USB_SPEED_NONE)
|
|
|
|
|
{
|
2013-03-20 16:07:08 +00:00
|
|
|
|
hub->ports[portno].soft_limit_time = grub_get_time_ms () + 250;
|
|
|
|
|
hub->ports[portno].hard_limit_time = hub->ports[portno].soft_limit_time + 1750;
|
|
|
|
|
hub->ports[portno].state = PORT_STATE_WAITING_FOR_STABLE_POWER;
|
|
|
|
|
grub_boot_time ("Scheduling stable power wait for port %p:%d",
|
|
|
|
|
usb, portno);
|
2013-03-19 22:06:44 +00:00
|
|
|
|
continue_waiting++;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2013-03-20 16:07:08 +00:00
|
|
|
|
if (hub->ports[portno].state == PORT_STATE_WAITING_FOR_STABLE_POWER
|
2013-03-19 22:06:44 +00:00
|
|
|
|
&& speed == GRUB_USB_SPEED_NONE)
|
|
|
|
|
{
|
2013-03-20 16:07:08 +00:00
|
|
|
|
hub->ports[portno].soft_limit_time = grub_get_time_ms () + 250;
|
2013-03-19 22:06:44 +00:00
|
|
|
|
continue;
|
|
|
|
|
}
|
2013-03-20 16:07:08 +00:00
|
|
|
|
if (hub->ports[portno].state == PORT_STATE_WAITING_FOR_STABLE_POWER
|
|
|
|
|
&& grub_get_time_ms () > hub->ports[portno].soft_limit_time)
|
2013-03-19 22:06:44 +00:00
|
|
|
|
{
|
2013-03-20 16:07:08 +00:00
|
|
|
|
hub->ports[portno].state = PORT_STATE_STABLE_POWER;
|
|
|
|
|
grub_boot_time ("Got stable power wait for port %p:%d",
|
|
|
|
|
usb, portno);
|
2013-03-19 22:06:44 +00:00
|
|
|
|
continue_waiting--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2013-03-20 16:07:08 +00:00
|
|
|
|
if (hub->ports[portno].state == PORT_STATE_WAITING_FOR_STABLE_POWER
|
|
|
|
|
&& grub_get_time_ms () > hub->ports[portno].hard_limit_time)
|
2013-03-19 22:06:44 +00:00
|
|
|
|
{
|
2013-03-20 16:07:08 +00:00
|
|
|
|
hub->ports[portno].state = PORT_STATE_FAILED_DEVICE;
|
2013-03-19 22:06:44 +00:00
|
|
|
|
continue_waiting--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!continue_waiting)
|
|
|
|
|
break;
|
|
|
|
|
grub_millisleep (1);
|
2010-06-02 19:54:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-03-19 22:06:44 +00:00
|
|
|
|
grub_boot_time ("After the stable power wait on USB root");
|
2013-03-19 19:25:09 +00:00
|
|
|
|
|
2013-03-19 22:06:44 +00:00
|
|
|
|
for (hub = hubs; hub; hub = hub->next)
|
|
|
|
|
if (hub->controller->dev == usb)
|
|
|
|
|
for (portno = 0; portno < hub->nports; portno++)
|
2013-03-20 16:07:08 +00:00
|
|
|
|
if (hub->ports[portno].state == PORT_STATE_STABLE_POWER)
|
2013-03-19 22:06:44 +00:00
|
|
|
|
{
|
|
|
|
|
grub_usb_speed_t speed;
|
|
|
|
|
int changed = 0;
|
2013-03-20 16:07:08 +00:00
|
|
|
|
hub->ports[portno].state = PORT_STATE_NORMAL;
|
2013-03-19 22:06:44 +00:00
|
|
|
|
speed = hub->controller->dev->detect_dev (hub->controller, portno, &changed);
|
|
|
|
|
attach_root_port (hub, portno, speed);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_boot_time ("USB root hub registered");
|
2010-06-02 19:54:51 +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
|
|
|
|
|
2010-08-20 17:34:29 +00:00
|
|
|
|
static void detach_device (grub_usb_device_t dev);
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
detach_device (grub_usb_device_t dev)
|
|
|
|
|
{
|
|
|
|
|
unsigned i;
|
|
|
|
|
int k;
|
|
|
|
|
if (!dev)
|
|
|
|
|
return;
|
|
|
|
|
if (dev->descdev.class == GRUB_USB_CLASS_HUB)
|
|
|
|
|
{
|
2010-08-21 21:09:37 +00:00
|
|
|
|
if (dev->hub_transfer)
|
|
|
|
|
grub_usb_cancel_transfer (dev->hub_transfer);
|
|
|
|
|
|
2010-08-20 17:34:29 +00:00
|
|
|
|
for (i = 0; i < dev->nports; i++)
|
|
|
|
|
detach_device (dev->children[i]);
|
|
|
|
|
grub_free (dev->children);
|
|
|
|
|
}
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE (dev->config); i++)
|
|
|
|
|
if (dev->config[i].descconf)
|
|
|
|
|
for (k = 0; k < dev->config[i].descconf->numif; k++)
|
|
|
|
|
{
|
|
|
|
|
struct grub_usb_interface *inter = &dev->config[i].interf[k];
|
|
|
|
|
if (inter && inter->detach_hook)
|
|
|
|
|
inter->detach_hook (dev, i, k);
|
|
|
|
|
}
|
|
|
|
|
grub_usb_devs[dev->addr] = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-03-19 22:06:44 +00:00
|
|
|
|
static int
|
|
|
|
|
wait_power_nonroot_hub (grub_usb_device_t dev)
|
|
|
|
|
{
|
|
|
|
|
grub_usb_err_t err;
|
|
|
|
|
int continue_waiting = 0;
|
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
|
|
for (i = 1; i <= dev->nports; i++)
|
|
|
|
|
if (dev->ports[i - 1].state == PORT_STATE_WAITING_FOR_STABLE_POWER)
|
|
|
|
|
{
|
|
|
|
|
grub_uint64_t tm;
|
|
|
|
|
grub_uint32_t current_status = 0;
|
|
|
|
|
|
|
|
|
|
/* 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 (current_status),
|
|
|
|
|
(char *) ¤t_status);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
dev->ports[i - 1].state = PORT_STATE_FAILED_DEVICE;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
tm = grub_get_time_ms ();
|
|
|
|
|
if (!(current_status & GRUB_USB_HUB_STATUS_PORT_CONNECTED))
|
|
|
|
|
dev->ports[i - 1].soft_limit_time = tm + 250;
|
|
|
|
|
if (tm >= dev->ports[i - 1].soft_limit_time)
|
|
|
|
|
{
|
|
|
|
|
if (dev->controller.dev->pending_reset)
|
|
|
|
|
continue;
|
|
|
|
|
/* Now do reset of port. */
|
|
|
|
|
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_RESET,
|
|
|
|
|
i, 0, 0);
|
|
|
|
|
dev->ports[i - 1].state = PORT_STATE_NORMAL;
|
2013-03-20 16:21:13 +00:00
|
|
|
|
grub_boot_time ("Resetting port %p:%d", dev, i - 1);
|
2013-03-19 22:06:44 +00:00
|
|
|
|
|
|
|
|
|
rescan = 1;
|
|
|
|
|
/* We cannot reset more than one device at the same time !
|
|
|
|
|
* Resetting more devices together results in very bad
|
|
|
|
|
* situation: more than one device has default address 0
|
|
|
|
|
* at the same time !!!
|
|
|
|
|
* Additionaly, we cannot perform another reset
|
|
|
|
|
* anywhere on the same OHCI controller until
|
|
|
|
|
* we will finish addressing of reseted device ! */
|
|
|
|
|
dev->controller.dev->pending_reset = grub_get_time_ms () + 5000;
|
|
|
|
|
npending++;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (tm >= dev->ports[i - 1].hard_limit_time)
|
|
|
|
|
{
|
|
|
|
|
dev->ports[i - 1].state = PORT_STATE_FAILED_DEVICE;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
continue_waiting = 1;
|
|
|
|
|
}
|
|
|
|
|
return continue_waiting && dev->controller.dev->pending_reset == 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-08 20:54:35 +00:00
|
|
|
|
static void
|
|
|
|
|
poll_nonroot_hub (grub_usb_device_t dev)
|
|
|
|
|
{
|
2010-09-21 15:13:04 +00:00
|
|
|
|
grub_usb_err_t err;
|
2010-08-20 17:34:29 +00:00
|
|
|
|
unsigned i;
|
2010-08-21 21:09:37 +00:00
|
|
|
|
grub_uint8_t changed;
|
2012-01-14 14:44:34 +00:00
|
|
|
|
grub_size_t actual, len;
|
2010-08-21 21:09:37 +00:00
|
|
|
|
|
|
|
|
|
if (!dev->hub_transfer)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
err = grub_usb_check_transfer (dev->hub_transfer, &actual);
|
|
|
|
|
|
|
|
|
|
if (err == GRUB_USB_ERR_WAIT)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
changed = dev->statuschange;
|
|
|
|
|
|
2012-01-14 14:44:34 +00:00
|
|
|
|
len = dev->hub_endpoint->maxpacket;
|
|
|
|
|
if (len > sizeof (dev->statuschange))
|
|
|
|
|
len = sizeof (dev->statuschange);
|
2010-08-21 21:09:37 +00:00
|
|
|
|
dev->hub_transfer
|
2013-03-19 10:19:36 +00:00
|
|
|
|
= grub_usb_bulk_read_background (dev, dev->hub_endpoint, len,
|
2010-08-21 21:09:37 +00:00
|
|
|
|
(char *) &dev->statuschange);
|
|
|
|
|
|
|
|
|
|
if (err || actual == 0 || changed == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
2010-07-08 20:54:35 +00:00
|
|
|
|
/* Iterate over the Hub ports. */
|
2010-08-20 17:34:29 +00:00
|
|
|
|
for (i = 1; i <= dev->nports; i++)
|
2010-07-08 20:54:35 +00:00
|
|
|
|
{
|
|
|
|
|
grub_uint32_t status;
|
|
|
|
|
|
2013-03-19 22:06:44 +00:00
|
|
|
|
if (!(changed & (1 << i))
|
|
|
|
|
|| dev->ports[i - 1].state == PORT_STATE_WAITING_FOR_STABLE_POWER)
|
2010-08-21 21:09:37 +00:00
|
|
|
|
continue;
|
|
|
|
|
|
2010-07-08 20:54:35 +00:00
|
|
|
|
/* 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);
|
2010-08-21 21:09:37 +00:00
|
|
|
|
|
2011-05-18 13:37:18 +00:00
|
|
|
|
grub_dprintf ("usb", "dev = %p, i = %d, status = %08x\n",
|
2011-10-01 18:18:47 +00:00
|
|
|
|
dev, i, status);
|
2010-08-29 23:04:07 +00:00
|
|
|
|
|
2010-07-08 20:54:35 +00:00
|
|
|
|
if (err)
|
|
|
|
|
continue;
|
2010-08-20 17:34:29 +00:00
|
|
|
|
|
2010-08-21 21:09:37 +00:00
|
|
|
|
/* FIXME: properly handle these conditions. */
|
|
|
|
|
if (status & GRUB_USB_HUB_STATUS_C_PORT_ENABLED)
|
|
|
|
|
grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
|
|
|
|
|
| GRUB_USB_REQTYPE_CLASS
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_OTHER),
|
|
|
|
|
GRUB_USB_REQ_CLEAR_FEATURE,
|
|
|
|
|
GRUB_USB_HUB_FEATURE_C_PORT_ENABLED, i, 0, 0);
|
|
|
|
|
|
|
|
|
|
if (status & GRUB_USB_HUB_STATUS_C_PORT_SUSPEND)
|
|
|
|
|
grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
|
|
|
|
|
| GRUB_USB_REQTYPE_CLASS
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_OTHER),
|
|
|
|
|
GRUB_USB_REQ_CLEAR_FEATURE,
|
|
|
|
|
GRUB_USB_HUB_FEATURE_C_PORT_SUSPEND, i, 0, 0);
|
|
|
|
|
|
|
|
|
|
if (status & GRUB_USB_HUB_STATUS_C_PORT_OVERCURRENT)
|
|
|
|
|
grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
|
|
|
|
|
| GRUB_USB_REQTYPE_CLASS
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_OTHER),
|
|
|
|
|
GRUB_USB_REQ_CLEAR_FEATURE,
|
|
|
|
|
GRUB_USB_HUB_FEATURE_C_PORT_OVERCURRENT, i, 0, 0);
|
|
|
|
|
|
2010-09-18 11:49:15 +00:00
|
|
|
|
if (!dev->controller.dev->pending_reset &&
|
|
|
|
|
(status & GRUB_USB_HUB_STATUS_C_PORT_CONNECTED))
|
2010-08-20 17:34:29 +00:00
|
|
|
|
{
|
2010-08-29 23:04:07 +00:00
|
|
|
|
grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
|
|
|
|
|
| GRUB_USB_REQTYPE_CLASS
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_OTHER),
|
|
|
|
|
GRUB_USB_REQ_CLEAR_FEATURE,
|
|
|
|
|
GRUB_USB_HUB_FEATURE_C_PORT_CONNECTED, i, 0, 0);
|
|
|
|
|
|
|
|
|
|
detach_device (dev->children[i - 1]);
|
|
|
|
|
dev->children[i - 1] = NULL;
|
2010-07-08 20:54:35 +00:00
|
|
|
|
|
2010-08-29 23:04:07 +00:00
|
|
|
|
/* Connected and status of connection changed ? */
|
|
|
|
|
if (status & GRUB_USB_HUB_STATUS_PORT_CONNECTED)
|
|
|
|
|
{
|
2013-03-19 19:25:09 +00:00
|
|
|
|
grub_boot_time ("Before the stable power wait portno=%d", i);
|
2010-09-18 11:49:15 +00:00
|
|
|
|
/* A device is actually connected to this port. */
|
2013-03-19 19:25:09 +00:00
|
|
|
|
/* Wait for completion of insertion and stable power (USB spec.)
|
|
|
|
|
* Should be at least 100ms, some devices requires more...
|
|
|
|
|
* There is also another thing - some devices have worse contacts
|
|
|
|
|
* and connected signal is unstable for some time - we should handle
|
|
|
|
|
* it - but prevent deadlock in case when device is too faulty... */
|
2013-03-19 22:06:44 +00:00
|
|
|
|
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;
|
2013-03-20 16:21:13 +00:00
|
|
|
|
grub_boot_time ("Scheduling stable power wait for port %p:%d",
|
|
|
|
|
dev, i - 1);
|
2013-03-19 22:06:44 +00:00
|
|
|
|
continue;
|
2010-08-29 23:04:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (status & GRUB_USB_HUB_STATUS_C_PORT_RESET)
|
2010-07-08 20:54:35 +00:00
|
|
|
|
{
|
2010-08-29 23:04:07 +00:00
|
|
|
|
grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
|
|
|
|
|
| GRUB_USB_REQTYPE_CLASS
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_OTHER),
|
|
|
|
|
GRUB_USB_REQ_CLEAR_FEATURE,
|
|
|
|
|
GRUB_USB_HUB_FEATURE_C_PORT_RESET, i, 0, 0);
|
2010-07-08 20:54:35 +00:00
|
|
|
|
|
2013-03-19 19:25:09 +00:00
|
|
|
|
grub_boot_time ("Port %d reset", i);
|
|
|
|
|
|
2010-08-29 23:04:07 +00:00
|
|
|
|
if (status & GRUB_USB_HUB_STATUS_PORT_CONNECTED)
|
2010-07-08 20:54:35 +00:00
|
|
|
|
{
|
2010-08-29 23:04:07 +00:00
|
|
|
|
grub_usb_speed_t speed;
|
|
|
|
|
grub_usb_device_t next_dev;
|
2013-04-12 18:42:46 +00:00
|
|
|
|
int split_hubport = 0;
|
|
|
|
|
int split_hubaddr = 0;
|
2010-08-29 23:04:07 +00:00
|
|
|
|
|
|
|
|
|
/* Determine the device speed. */
|
|
|
|
|
if (status & GRUB_USB_HUB_STATUS_PORT_LOWSPEED)
|
|
|
|
|
speed = GRUB_USB_SPEED_LOW;
|
2010-07-08 20:54:35 +00:00
|
|
|
|
else
|
2010-08-29 23:04:07 +00:00
|
|
|
|
{
|
|
|
|
|
if (status & GRUB_USB_HUB_STATUS_PORT_HIGHSPEED)
|
|
|
|
|
speed = GRUB_USB_SPEED_HIGH;
|
|
|
|
|
else
|
|
|
|
|
speed = GRUB_USB_SPEED_FULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Wait a recovery time after reset, spec. says 10ms */
|
|
|
|
|
grub_millisleep (10);
|
|
|
|
|
|
2013-04-12 18:42:46 +00:00
|
|
|
|
/* Find correct values for SPLIT hubport and hubaddr */
|
|
|
|
|
if (speed == GRUB_USB_SPEED_HIGH)
|
|
|
|
|
{
|
|
|
|
|
/* HIGH speed device needs not transaction translation */
|
|
|
|
|
split_hubport = 0;
|
|
|
|
|
split_hubaddr = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* FULL/LOW device needs hub port and hub address
|
|
|
|
|
for transaction translation (if connected to EHCI) */
|
|
|
|
|
if (dev->speed == GRUB_USB_SPEED_HIGH)
|
|
|
|
|
{
|
|
|
|
|
/* This port is the first FULL/LOW speed port
|
|
|
|
|
in the chain from root hub. Attached device
|
|
|
|
|
should use its port number and hub address */
|
|
|
|
|
split_hubport = i;
|
|
|
|
|
split_hubaddr = dev->addr;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* This port is NOT the first FULL/LOW speed port
|
|
|
|
|
in the chain from root hub. Attached device
|
|
|
|
|
should use values inherited from some parent
|
|
|
|
|
HIGH speed hub - if any. */
|
|
|
|
|
split_hubport = dev->split_hubport;
|
|
|
|
|
split_hubaddr = dev->split_hubaddr;
|
|
|
|
|
}
|
|
|
|
|
|
2010-08-29 23:04:07 +00:00
|
|
|
|
/* Add the device and assign a device address to it. */
|
2013-04-12 18:42:46 +00:00
|
|
|
|
next_dev = grub_usb_hub_add_dev (&dev->controller, speed,
|
|
|
|
|
split_hubport, split_hubaddr);
|
2013-03-19 19:35:21 +00:00
|
|
|
|
if (dev->controller.dev->pending_reset)
|
|
|
|
|
{
|
|
|
|
|
dev->controller.dev->pending_reset = 0;
|
|
|
|
|
npending--;
|
|
|
|
|
}
|
2010-08-29 23:04:07 +00:00
|
|
|
|
if (! next_dev)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
dev->children[i - 1] = next_dev;
|
|
|
|
|
|
|
|
|
|
/* If the device is a Hub, scan it for more devices. */
|
|
|
|
|
if (next_dev->descdev.class == 0x09)
|
|
|
|
|
grub_usb_add_hub (next_dev);
|
2010-07-08 20:54:35 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-02 19:54:51 +00:00
|
|
|
|
void
|
2013-03-19 19:35:21 +00:00
|
|
|
|
grub_usb_poll_devices (int wait_for_completion)
|
2010-06-02 19:54:51 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_usb_hub *hub;
|
2010-07-08 20:54:35 +00:00
|
|
|
|
int i;
|
2010-06-02 19:54:51 +00:00
|
|
|
|
|
|
|
|
|
for (hub = hubs; hub; hub = hub->next)
|
|
|
|
|
{
|
|
|
|
|
/* Do we have to recheck number of ports? */
|
2010-07-08 20:54:35 +00:00
|
|
|
|
/* No, it should be never changed, it should be constant. */
|
2010-06-02 19:54:51 +00:00
|
|
|
|
for (i = 0; i < hub->nports; 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
|
|
|
|
{
|
2010-09-18 11:49:15 +00:00
|
|
|
|
grub_usb_speed_t speed = GRUB_USB_SPEED_NONE;
|
2010-08-20 17:34:29 +00:00
|
|
|
|
int changed = 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
|
|
|
|
|
2013-03-19 19:35:21 +00:00
|
|
|
|
if (hub->controller->dev->pending_reset)
|
2010-09-18 11:49:15 +00:00
|
|
|
|
{
|
|
|
|
|
/* Check for possible timeout */
|
|
|
|
|
if (grub_get_time_ms () > hub->controller->dev->pending_reset)
|
|
|
|
|
{
|
|
|
|
|
/* Something went wrong, reset device was not
|
|
|
|
|
* addressed properly, timeout happened */
|
|
|
|
|
hub->controller->dev->pending_reset = 0;
|
2013-03-19 19:35:21 +00:00
|
|
|
|
npending--;
|
2010-09-18 11:49:15 +00:00
|
|
|
|
speed = hub->controller->dev->detect_dev (hub->controller,
|
|
|
|
|
i, &changed);
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-08-20 17:34:29 +00:00
|
|
|
|
if (changed)
|
2010-07-08 20:54:35 +00:00
|
|
|
|
{
|
2010-08-20 17:34:29 +00:00
|
|
|
|
detach_device (hub->devices[i]);
|
|
|
|
|
hub->devices[i] = NULL;
|
|
|
|
|
if (speed != GRUB_USB_SPEED_NONE)
|
|
|
|
|
attach_root_port (hub, i, speed);
|
2010-07-08 20:54:35 +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
|
|
|
|
}
|
|
|
|
|
}
|
2010-07-08 20:54:35 +00:00
|
|
|
|
|
2010-08-29 23:04:07 +00:00
|
|
|
|
while (1)
|
2010-07-08 20:54:35 +00:00
|
|
|
|
{
|
2010-08-29 23:04:07 +00:00
|
|
|
|
rescan = 0;
|
|
|
|
|
|
|
|
|
|
/* We should check changes of non-root hubs too. */
|
|
|
|
|
for (i = 0; i < GRUB_USBHUB_MAX_DEVICES; i++)
|
|
|
|
|
{
|
|
|
|
|
grub_usb_device_t dev = grub_usb_devs[i];
|
|
|
|
|
|
|
|
|
|
if (dev && dev->descdev.class == 0x09)
|
|
|
|
|
poll_nonroot_hub (dev);
|
|
|
|
|
}
|
2013-03-19 22:06:44 +00:00
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
int continue_waiting = 0;
|
|
|
|
|
for (i = 0; i < GRUB_USBHUB_MAX_DEVICES; i++)
|
|
|
|
|
{
|
|
|
|
|
grub_usb_device_t dev = grub_usb_devs[i];
|
|
|
|
|
|
|
|
|
|
if (dev && dev->descdev.class == 0x09)
|
|
|
|
|
continue_waiting = continue_waiting || wait_power_nonroot_hub (dev);
|
|
|
|
|
}
|
|
|
|
|
if (!continue_waiting)
|
|
|
|
|
break;
|
|
|
|
|
grub_millisleep (1);
|
|
|
|
|
}
|
|
|
|
|
|
2013-03-19 19:35:21 +00:00
|
|
|
|
if (!(rescan || (npending && wait_for_completion)))
|
2010-08-29 23:04:07 +00:00
|
|
|
|
break;
|
2013-03-19 22:06:44 +00:00
|
|
|
|
grub_millisleep (25);
|
2010-07-08 20:54:35 +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
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2013-01-21 21:02:24 +00:00
|
|
|
|
grub_usb_iterate (grub_usb_iterate_hook_t hook, void *hook_data)
|
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
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2010-07-08 20:54:35 +00:00
|
|
|
|
for (i = 0; i < GRUB_USBHUB_MAX_DEVICES; 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
|
|
|
|
{
|
|
|
|
|
if (grub_usb_devs[i])
|
|
|
|
|
{
|
2013-01-21 21:02:24 +00:00
|
|
|
|
if (hook (grub_usb_devs[i], hook_data))
|
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 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|