d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from NetBSD: revision 1.72

Browse Source 
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.
This commit is contained in:
Josef Karthauser 2002-04-01 18:03:00 +00:00
parent 84aa7f035a
commit 8d6c171c25
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/usb/usb_subr.c
View File

@ -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$ */ /* $FreeBSD$ */
/* /*
@ -873,9 +873,6 @@ usbd_probe_and_attach(device_ptr_t parent, usbd_device_handle dev,
uaa.usegeneric = 1; uaa.usegeneric = 1;
uaa.configno = UHUB_UNK_CONFIGURATION; uaa.configno = UHUB_UNK_CONFIGURATION;
uaa.ifaceno = UHUB_UNK_INTERFACE; 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); dv = USB_DO_ATTACH(dev, bdev, parent, &uaa, usbd_print, usbd_submatch);
if (dv != NULL) { if (dv != NULL) {
dev->subdevs = malloc(2 * sizeof dv, M_USB, M_NOWAIT); 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_status
usbd_new_device(device_ptr_t parent, usbd_bus_handle bus, int depth, 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; usbd_device_handle dev;
usb_device_descriptor_t *dd; 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 addr;
int i; int i;
DPRINTF(("usbd_new_device bus=%p port=%d depth=%d speed=%d\n", DPRINTF(("usbd_new_device bus=%p port=%d depth=%d lowspeed=%d\n",
bus, port, depth, speed)); bus, port, depth, lowspeed));
addr = usbd_getnewaddr(bus); addr = usbd_getnewaddr(bus);
if (addr < 0) { if (addr < 0) {
printf("%s: No free USB addresses, new device ignored.\n", printf("%s: No free USB addresses, new device ignored.\n",