From dc37dfab7839bf806e8b708af3594f4351d24c83 Mon Sep 17 00:00:00 2001 From: joe Date: Wed, 2 Jan 2002 20:16:53 +0000 Subject: Sync usb.h with NetBSD, apart from usb_device_info.speed, which requires logic changes. For now leave it as usb_device_info.lowspeed. It will get addressed when the usb.c code is sync'd. --- sys/dev/usb/usb_subr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/dev/usb/usb_subr.c') diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index f14c02a..f17e515 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1032,7 +1032,7 @@ usbd_new_device(device_ptr_t parent, usbd_bus_handle bus, int depth, return (err); } - usbd_add_event(USB_EVENT_ATTACH, dev); + usbd_add_event(USB_EVENT_CTRLR_ATTACH, dev); return (USBD_NORMAL_COMPLETION); } @@ -1172,15 +1172,15 @@ usbd_fill_deviceinfo(usbd_device_handle dev, struct usb_device_info *di, if (dev->subdevs != NULL) { for (i = 0; dev->subdevs[i] && - i < MAXDEVNAMES; i++) { + i < USB_MAX_DEVNAMES; i++) { strncpy(di->devnames[i], USBDEVPTRNAME(dev->subdevs[i]), - MAXDEVNAMELEN); - di->devnames[i][MAXDEVNAMELEN-1] = '\0'; + USB_MAX_DEVNAMELEN); + di->devnames[i][USB_MAX_DEVNAMELEN-1] = '\0'; } } else { i = 0; } - for (/*i is set */; i < MAXDEVNAMES; i++) + for (/*i is set */; i < USB_MAX_DEVNAMES; i++) di->devnames[i][0] = 0; /* empty */ if (dev->hub) { -- cgit v1.1