Remove the unused usb device/event cookie, saves a couple of bytes.
We might want to keep this just because NetBSD has it, but it serves no
visible purpose. I think I've checked their code some time ago and they
don't do anything useful with it either (IIRC).
Index: sys/dev/usb/usb.h
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/dev/usb/usb.h,v
retrieving revision 1.38
diff -u -p -r1.38 usb.h
--- sys/dev/usb/usb.h 9 Nov 2011 21:45:50 -0000 1.38
+++ sys/dev/usb/usb.h 12 Dec 2011 02:01:26 -0000
@@ -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;
Index: sys/dev/usb/usb_subr.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/dev/usb/usb_subr.c,v
retrieving revision 1.80
diff -u -p -r1.80 usb_subr.c
--- sys/dev/usb/usb_subr.c 25 Jan 2011 20:03:36 -0000 1.80
+++ sys/dev/usb/usb_subr.c 12 Dec 2011 02:01:26 -0000
@@ -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, u
}
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
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,
Index: sys/dev/usb/usbdivar.h
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/dev/usb/usbdivar.h,v
retrieving revision 1.42
diff -u -p -r1.42 usbdivar.h
--- sys/dev/usb/usbdivar.h 16 Jan 2011 22:35:29 -0000 1.42
+++ sys/dev/usb/usbdivar.h 12 Dec 2011 02:01:26 -0000
@@ -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 */
