diff options
| author | joe <joe@FreeBSD.org> | 2002-04-01 18:03:00 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2002-04-01 18:03:00 +0000 |
| commit | ec9b97db7d161806d55a1ed7173fe1e46f2957a2 (patch) | |
| tree | edf190946e5f289c625d549cde9af3b9cb78c1e7 /sys | |
| parent | 5049ab3bd5d6d482b13d68deac391e204cb1725a (diff) | |
| download | FreeBSD-src-ec9b97db7d161806d55a1ed7173fe1e46f2957a2.zip FreeBSD-src-ec9b97db7d161806d55a1ed7173fe1e46f2957a2.tar.gz | |
Merge from NetBSD: revision 1.72
Part of this got merged in a previous commit, but not all.
revision 1.72
date: 2000/04/14 14:13:56; author: augustss; state: Exp; lines: +34 -27
Make attach of ugen work as it should so product&vendor locators
can be used.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/usb_subr.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index e234e86..b4051b4 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: usb_subr.c,v 1.71 2000/03/29 18:24:53 augustss Exp $ */ +/* $NetBSD: usb_subr.c,v 1.72 2000/04/14 14:13:56 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -873,9 +873,6 @@ usbd_probe_and_attach(device_ptr_t parent, usbd_device_handle dev, uaa.usegeneric = 1; uaa.configno = UHUB_UNK_CONFIGURATION; uaa.ifaceno = UHUB_UNK_INTERFACE; - uaa.vendor = UHUB_UNK_VENDOR; - uaa.product = UHUB_UNK_PRODUCT; - uaa.release = UHUB_UNK_RELEASE; dv = USB_DO_ATTACH(dev, bdev, parent, &uaa, usbd_print, usbd_submatch); if (dv != NULL) { dev->subdevs = malloc(2 * sizeof dv, M_USB, M_NOWAIT); @@ -907,7 +904,7 @@ usbd_probe_and_attach(device_ptr_t parent, usbd_device_handle dev, */ usbd_status usbd_new_device(device_ptr_t parent, usbd_bus_handle bus, int depth, - int speed, int port, struct usbd_port *up) + int lowspeed, int port, struct usbd_port *up) { usbd_device_handle dev; usb_device_descriptor_t *dd; @@ -915,8 +912,8 @@ usbd_new_device(device_ptr_t parent, usbd_bus_handle bus, int depth, int addr; int i; - DPRINTF(("usbd_new_device bus=%p port=%d depth=%d speed=%d\n", - bus, port, depth, speed)); + DPRINTF(("usbd_new_device bus=%p port=%d depth=%d lowspeed=%d\n", + bus, port, depth, lowspeed)); addr = usbd_getnewaddr(bus); if (addr < 0) { printf("%s: No free USB addresses, new device ignored.\n", |
