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 - Generic USB interfaces. */
|
|
|
|
|
/*
|
|
|
|
|
* 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 17:52:17 +00:00
|
|
|
|
#include <grub/list.h>
|
2010-08-20 17:34:29 +00:00
|
|
|
|
#include <grub/term.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
|
|
|
|
|
|
|
|
|
static grub_usb_controller_dev_t grub_usb_list;
|
2010-06-02 19:54:51 +00:00
|
|
|
|
struct grub_usb_attach_desc *attach_hooks;
|
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
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
grub_usb_controller_dev_register (grub_usb_controller_dev_t usb)
|
|
|
|
|
{
|
|
|
|
|
auto int iterate_hook (grub_usb_controller_t dev);
|
|
|
|
|
|
|
|
|
|
/* Iterate over all controllers found by the driver. */
|
|
|
|
|
int iterate_hook (grub_usb_controller_t dev)
|
|
|
|
|
{
|
|
|
|
|
dev->dev = usb;
|
|
|
|
|
|
|
|
|
|
/* Enable the ports of the USB Root Hub. */
|
|
|
|
|
grub_usb_root_hub (dev);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
usb->next = grub_usb_list;
|
|
|
|
|
grub_usb_list = usb;
|
|
|
|
|
|
|
|
|
|
if (usb->iterate)
|
|
|
|
|
usb->iterate (iterate_hook);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
int
|
|
|
|
|
grub_usb_controller_iterate (int (*hook) (grub_usb_controller_t dev))
|
|
|
|
|
{
|
|
|
|
|
grub_usb_controller_dev_t p;
|
|
|
|
|
|
|
|
|
|
auto int iterate_hook (grub_usb_controller_t dev);
|
|
|
|
|
|
|
|
|
|
int iterate_hook (grub_usb_controller_t dev)
|
|
|
|
|
{
|
|
|
|
|
dev->dev = p;
|
|
|
|
|
if (hook (dev))
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Iterate over all controller drivers. */
|
|
|
|
|
for (p = grub_usb_list; p; p = p->next)
|
|
|
|
|
{
|
|
|
|
|
/* Iterate over the busses of the controllers. XXX: Actually, a
|
|
|
|
|
hub driver should do this. */
|
|
|
|
|
if (p->iterate (iterate_hook))
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
grub_usb_err_t
|
|
|
|
|
grub_usb_clear_halt (grub_usb_device_t dev, int endpoint)
|
|
|
|
|
{
|
|
|
|
|
dev->toggle[endpoint] = 0;
|
|
|
|
|
return grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
|
|
|
|
|
| GRUB_USB_REQTYPE_STANDARD
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_ENDP),
|
|
|
|
|
GRUB_USB_REQ_CLEAR_FEATURE,
|
|
|
|
|
GRUB_USB_FEATURE_ENDP_HALT,
|
|
|
|
|
endpoint, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_usb_err_t
|
|
|
|
|
grub_usb_set_configuration (grub_usb_device_t dev, int configuration)
|
|
|
|
|
{
|
2010-06-02 14:49:22 +00:00
|
|
|
|
grub_memset (dev->toggle, 0, sizeof (dev->toggle));
|
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_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
|
|
|
|
|
| GRUB_USB_REQTYPE_STANDARD
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_DEV),
|
|
|
|
|
GRUB_USB_REQ_SET_CONFIGURATION, configuration,
|
|
|
|
|
0, 0, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_usb_err_t
|
|
|
|
|
grub_usb_get_descriptor (grub_usb_device_t dev,
|
|
|
|
|
grub_uint8_t type, grub_uint8_t index,
|
|
|
|
|
grub_size_t size, char *data)
|
|
|
|
|
{
|
|
|
|
|
return grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
|
|
|
|
|
| GRUB_USB_REQTYPE_STANDARD
|
|
|
|
|
| GRUB_USB_REQTYPE_TARGET_DEV),
|
|
|
|
|
GRUB_USB_REQ_GET_DESCRIPTOR,
|
|
|
|
|
(type << 8) | index,
|
|
|
|
|
0, size, data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct grub_usb_desc_endp *
|
|
|
|
|
grub_usb_get_endpdescriptor (grub_usb_device_t usbdev, int addr)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < usbdev->config[0].descconf->numif; i++)
|
|
|
|
|
{
|
|
|
|
|
struct grub_usb_desc_if *interf;
|
|
|
|
|
int j;
|
|
|
|
|
|
|
|
|
|
interf = usbdev->config[0].interf[i].descif;
|
|
|
|
|
|
|
|
|
|
for (j = 0; j < interf->endpointcnt; j++)
|
|
|
|
|
{
|
|
|
|
|
struct grub_usb_desc_endp *endp;
|
|
|
|
|
endp = &usbdev->config[0].interf[i].descendp[j];
|
|
|
|
|
|
|
|
|
|
if (endp->endp_addr == addr)
|
|
|
|
|
return endp;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_usb_err_t
|
|
|
|
|
grub_usb_device_initialize (grub_usb_device_t dev)
|
|
|
|
|
{
|
|
|
|
|
struct grub_usb_desc_device *descdev;
|
|
|
|
|
struct grub_usb_desc_config config;
|
|
|
|
|
grub_usb_err_t err;
|
|
|
|
|
int i;
|
|
|
|
|
|
2010-05-31 12:11:41 +00:00
|
|
|
|
/* First we have to read first 8 bytes only and determine
|
|
|
|
|
* max. size of packet */
|
|
|
|
|
dev->descdev.maxsize0 = 0; /* invalidating, for safety only, can be removed if it is sure it is zero here */
|
|
|
|
|
err = grub_usb_get_descriptor (dev, GRUB_USB_DESCRIPTOR_DEVICE,
|
2010-06-21 19:12:20 +00:00
|
|
|
|
0, 8, (char *) &dev->descdev);
|
2010-05-31 12:11:41 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
/* Now we have valid value in dev->descdev.maxsize0,
|
|
|
|
|
* so we can read whole device descriptor */
|
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_get_descriptor (dev, GRUB_USB_DESCRIPTOR_DEVICE,
|
|
|
|
|
0, sizeof (struct grub_usb_desc_device),
|
|
|
|
|
(char *) &dev->descdev);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
descdev = &dev->descdev;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 8; i++)
|
|
|
|
|
dev->config[i].descconf = NULL;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < descdev->configcnt; i++)
|
|
|
|
|
{
|
|
|
|
|
int pos;
|
|
|
|
|
int currif;
|
|
|
|
|
char *data;
|
|
|
|
|
|
|
|
|
|
/* First just read the first 4 bytes of the configuration
|
|
|
|
|
descriptor, after that it is known how many bytes really have
|
|
|
|
|
to be read. */
|
|
|
|
|
err = grub_usb_get_descriptor (dev, GRUB_USB_DESCRIPTOR_CONFIG, i, 4,
|
|
|
|
|
(char *) &config);
|
|
|
|
|
|
|
|
|
|
data = grub_malloc (config.totallen);
|
|
|
|
|
if (! data)
|
|
|
|
|
{
|
|
|
|
|
err = GRUB_USB_ERR_INTERNAL;
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dev->config[i].descconf = (struct grub_usb_desc_config *) data;
|
|
|
|
|
err = grub_usb_get_descriptor (dev, GRUB_USB_DESCRIPTOR_CONFIG, i,
|
|
|
|
|
config.totallen, data);
|
|
|
|
|
if (err)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* Skip the configuration descriptor. */
|
2010-08-01 21:08:03 +00:00
|
|
|
|
pos = dev->config[i].descconf->length;
|
2009-06-10 21:04:23 +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
|
|
|
|
/* Read all interfaces. */
|
|
|
|
|
for (currif = 0; currif < dev->config[i].descconf->numif; currif++)
|
|
|
|
|
{
|
2010-08-01 21:08:03 +00:00
|
|
|
|
while (pos < config.totallen
|
|
|
|
|
&& ((struct grub_usb_desc *)&data[pos])->type
|
|
|
|
|
!= GRUB_USB_DESCRIPTOR_INTERFACE)
|
|
|
|
|
pos += ((struct grub_usb_desc *)&data[pos])->length;
|
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->config[i].interf[currif].descif
|
|
|
|
|
= (struct grub_usb_desc_if *) &data[pos];
|
2010-08-01 21:08:03 +00:00
|
|
|
|
pos += dev->config[i].interf[currif].descif->length;
|
|
|
|
|
|
|
|
|
|
while (pos < config.totallen
|
|
|
|
|
&& ((struct grub_usb_desc *)&data[pos])->type
|
|
|
|
|
!= GRUB_USB_DESCRIPTOR_ENDPOINT)
|
|
|
|
|
pos += ((struct grub_usb_desc *)&data[pos])->length;
|
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
|
|
|
|
|
|
|
|
|
/* Point to the first endpoint. */
|
|
|
|
|
dev->config[i].interf[currif].descendp
|
|
|
|
|
= (struct grub_usb_desc_endp *) &data[pos];
|
|
|
|
|
pos += (sizeof (struct grub_usb_desc_endp)
|
|
|
|
|
* dev->config[i].interf[currif].descif->endpointcnt);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-08 20:54:35 +00:00
|
|
|
|
return GRUB_USB_ERR_NONE;
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 8; i++)
|
|
|
|
|
grub_free (dev->config[i].descconf);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void grub_usb_device_attach (grub_usb_device_t dev)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2010-06-02 19:54:51 +00:00
|
|
|
|
/* XXX: Just check configuration 0 for now. */
|
|
|
|
|
for (i = 0; i < dev->config[0].descconf->numif; i++)
|
|
|
|
|
{
|
|
|
|
|
struct grub_usb_desc_if *interf;
|
|
|
|
|
struct grub_usb_attach_desc *desc;
|
|
|
|
|
|
|
|
|
|
interf = dev->config[0].interf[i].descif;
|
|
|
|
|
|
|
|
|
|
grub_dprintf ("usb", "iterate: interf=%d, class=%d, subclass=%d, protocol=%d\n",
|
|
|
|
|
i, interf->class, interf->subclass, interf->protocol);
|
|
|
|
|
|
|
|
|
|
if (dev->config[0].interf[i].attached)
|
|
|
|
|
continue;
|
2010-09-18 11:49:15 +00:00
|
|
|
|
|
2010-06-02 19:54:51 +00:00
|
|
|
|
for (desc = attach_hooks; desc; desc = desc->next)
|
|
|
|
|
if (interf->class == desc->class && desc->hook (dev, 0, i))
|
|
|
|
|
dev->config[0].interf[i].attached = 1;
|
2010-07-17 01:58:23 +00:00
|
|
|
|
|
|
|
|
|
if (dev->config[0].interf[i].attached)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
switch (interf->class)
|
|
|
|
|
{
|
|
|
|
|
case GRUB_USB_CLASS_MASS_STORAGE:
|
|
|
|
|
grub_dl_load ("usbms");
|
|
|
|
|
break;
|
|
|
|
|
case GRUB_USB_CLASS_HID:
|
|
|
|
|
grub_dl_load ("usb_keyboard");
|
|
|
|
|
break;
|
2010-07-18 10:53:35 +00:00
|
|
|
|
case 0xff:
|
2010-07-18 14:31:42 +00:00
|
|
|
|
/* FIXME: don't load useless modules. */
|
|
|
|
|
grub_dl_load ("usbserial_ftdi");
|
2010-07-18 19:36:00 +00:00
|
|
|
|
grub_dl_load ("usbserial_pl2303");
|
2010-07-18 10:53:35 +00:00
|
|
|
|
break;
|
2010-07-17 01:58:23 +00:00
|
|
|
|
}
|
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-06-02 17:52:17 +00:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
grub_usb_register_attach_hook_class (struct grub_usb_attach_desc *desc)
|
|
|
|
|
{
|
|
|
|
|
auto int usb_iterate (grub_usb_device_t dev);
|
|
|
|
|
|
|
|
|
|
int usb_iterate (grub_usb_device_t usbdev)
|
|
|
|
|
{
|
|
|
|
|
struct grub_usb_desc_device *descdev = &usbdev->descdev;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (descdev->class != 0 || descdev->subclass || descdev->protocol != 0
|
|
|
|
|
|| descdev->configcnt == 0)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* XXX: Just check configuration 0 for now. */
|
|
|
|
|
for (i = 0; i < usbdev->config[0].descconf->numif; i++)
|
|
|
|
|
{
|
|
|
|
|
struct grub_usb_desc_if *interf;
|
|
|
|
|
|
|
|
|
|
interf = usbdev->config[0].interf[i].descif;
|
|
|
|
|
|
|
|
|
|
grub_dprintf ("usb", "iterate: interf=%d, class=%d, subclass=%d, protocol=%d\n",
|
|
|
|
|
i, interf->class, interf->subclass, interf->protocol);
|
|
|
|
|
|
|
|
|
|
if (usbdev->config[0].interf[i].attached)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (interf->class != desc->class)
|
|
|
|
|
continue;
|
|
|
|
|
if (desc->hook (usbdev, 0, i))
|
|
|
|
|
usbdev->config[0].interf[i].attached = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
desc->next = attach_hooks;
|
|
|
|
|
attach_hooks = desc;
|
|
|
|
|
|
|
|
|
|
grub_usb_iterate (usb_iterate);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
grub_usb_unregister_attach_hook_class (struct grub_usb_attach_desc *desc)
|
|
|
|
|
{
|
|
|
|
|
grub_list_remove (GRUB_AS_LIST_P (&attach_hooks), GRUB_AS_LIST (desc));
|
|
|
|
|
}
|
2010-08-20 17:34:29 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
GRUB_MOD_INIT(usb)
|
|
|
|
|
{
|
|
|
|
|
grub_term_poll_usb = grub_usb_poll_devices;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
GRUB_MOD_FINI(usb)
|
|
|
|
|
{
|
|
|
|
|
grub_term_poll_usb = NULL;
|
|
|
|
|
}
|