From 3d7b880e84dc48c67cf00008f1aa19d467a8db25 Mon Sep 17 00:00:00 2001 From: thompsa Date: Wed, 27 May 2009 23:12:02 +0000 Subject: Allocate the usb serial, manufacturer and product strings rather than use char arrays in the usb_device struct. This also eliminates USB_HAVE_STRINGS. --- sys/dev/usb/usb_util.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'sys/dev/usb/usb_util.c') diff --git a/sys/dev/usb/usb_util.c b/sys/dev/usb/usb_util.c index 5eba73c..d4dc2ab 100644 --- a/sys/dev/usb/usb_util.c +++ b/sys/dev/usb/usb_util.c @@ -78,7 +78,6 @@ device_delete_all_children(device_t dev) void device_set_usb2_desc(device_t dev) { -#if USB_HAVE_STRINGS struct usb2_attach_arg *uaa; struct usb2_device *udev; struct usb2_interface *iface; @@ -121,7 +120,6 @@ device_set_usb2_desc(device_t dev) device_set_desc_copy(dev, temp_p); device_printf(dev, "<%s> on %s\n", temp_p, device_get_nameunit(udev->bus->bdev)); -#endif } /*------------------------------------------------------------------------* @@ -181,7 +179,6 @@ usb2_printBCD(char *p, uint16_t p_len, uint16_t bcd) * This function removes spaces at the beginning and the end of the string * pointed to by the "p" argument. *------------------------------------------------------------------------*/ -#if USB_HAVE_STRINGS void usb2_trim_spaces(char *p) { @@ -198,7 +195,6 @@ usb2_trim_spaces(char *p) e = p; *e = 0; /* kill trailing spaces */ } -#endif /*------------------------------------------------------------------------* * usb2_make_str_desc - convert an ASCII string into a UNICODE string -- cgit v1.1