diff options
| -rw-r--r-- | sys/dev/usb/usb.h | 7 | ||||
| -rw-r--r-- | sys/dev/usb/usb_subr.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usbdivar.h | 3 |
3 files changed, 3 insertions, 13 deletions
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h index bf9e7290a67..07a631cb7eb 100644 --- a/sys/dev/usb/usb.h +++ b/sys/dev/usb/usb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.h,v 1.38 2011/11/09 21:45:50 sthen Exp $ */ +/* $OpenBSD: usb.h,v 1.39 2012/01/08 13:12:38 miod Exp $ */ /* $NetBSD: usb.h,v 1.69 2002/09/22 23:20:50 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */ @@ -588,14 +588,11 @@ struct usb_ctl_report_desc { u_char ucrd_data[1024]; /* filled data size will vary */ }; -typedef struct { u_int32_t cookie; } usb_event_cookie_t; - #define USB_MAX_DEVNAMES 4 #define USB_MAX_DEVNAMELEN 16 struct usb_device_info { u_int8_t udi_bus; u_int8_t udi_addr; /* device address */ - usb_event_cookie_t udi_cookie; char udi_product[USB_MAX_STRING_LEN]; char udi_vendor[USB_MAX_STRING_LEN]; char udi_release[8]; @@ -625,7 +622,6 @@ struct usb_device_info { struct usb_device_info_48 { u_int8_t udi_bus; u_int8_t udi_addr; /* device address */ - usb_event_cookie_t udi_cookie; char udi_product[USB_MAX_STRING_LEN]; char udi_vendor[USB_MAX_STRING_LEN]; char udi_release[8]; @@ -670,7 +666,6 @@ struct usb_event { } ue_ctrlr; struct usb_device_info ue_device; struct { - usb_event_cookie_t ue_cookie; char ue_devname[16]; } ue_driver; } u; diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index a0f3154eb3a..067617f1d58 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_subr.c,v 1.80 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: usb_subr.c,v 1.81 2012/01/08 13:12:38 miod Exp $ */ /* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -73,8 +73,6 @@ void usbd_kill_pipe(usbd_pipe_handle); usbd_status usbd_probe_and_attach(struct device *, usbd_device_handle, int, int); -u_int32_t usb_cookie_no = 0; - #ifdef USBVERBOSE #include <dev/usb/usbdevs_data.h> #endif /* USBVERBOSE */ @@ -1098,7 +1096,6 @@ usbd_new_device(struct device *parent, usbd_bus_handle bus, int depth, } dev->speed = speed; dev->langid = USBD_NOLANG; - dev->cookie.cookie = ++usb_cookie_no; /* Establish the default pipe. */ err = usbd_setup_pipe(dev, 0, &dev->def_ep, USBD_DEFAULT_INTERVAL, @@ -1361,7 +1358,6 @@ usbd_fill_deviceinfo(usbd_device_handle dev, struct usb_device_info *di, di->udi_bus = dev->bus->bdev.dv_unit; di->udi_addr = dev->address; - di->udi_cookie = dev->cookie; usbd_devinfo_vp(dev, di->udi_vendor, sizeof(di->udi_vendor), di->udi_product, sizeof(di->udi_product), usedev); usbd_printBCD(di->udi_release, sizeof di->udi_release, diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h index 52d6ade7563..ca746c7950f 100644 --- a/sys/dev/usb/usbdivar.h +++ b/sys/dev/usb/usbdivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdivar.h,v 1.42 2011/01/16 22:35:29 jakemsr Exp $ */ +/* $OpenBSD: usbdivar.h,v 1.43 2012/01/08 13:12:38 miod Exp $ */ /* $NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */ @@ -135,7 +135,6 @@ struct usbd_device { u_int16_t power; /* mA the device uses */ int16_t langid; /* language for strings */ #define USBD_NOLANG (-1) - usb_event_cookie_t cookie; /* unique connection id */ struct usbd_port *powersrc; /* upstream hub port, or 0 */ struct usbd_device *myhub; /* upstream hub */ struct usbd_port *myhsport; /* closest high speed port */ |