Remove the 4.8 version of the USB device info ioctl.

ok deraadt@

2 files changed, 2 insertions, 44 deletions

diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 2b45f895025..2f678e51bc6 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.81 2012/05/15 12:48:32 mpi Exp $	*/
+/*	$OpenBSD: usb.c,v 1.82 2013/03/16 09:58:40 mpi Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -626,26 +626,6 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, struct proc *p)
 		break;
 	}
 
-	case USB_DEVICEINFO_48:
-	{
-		struct usb_device_info_48 *di_48 = (void *)data;
-		struct usb_device_info di_tmp;
-		int addr = di_48->udi_addr;
-		usbd_device_handle dev;
-
-		if (addr < 1 || addr >= USB_MAX_DEVICES)
-			return (EINVAL);
-		dev = sc->sc_bus->devices[addr];
-		if (dev == NULL)
-			return (ENXIO);
-
-		bzero(&di_tmp, sizeof(struct usb_device_info));
-		bcopy(di_48, &di_tmp, sizeof(struct usb_device_info_48));
-		usbd_fill_deviceinfo(dev, &di_tmp, 1);
-		bcopy(&di_tmp, di_48, sizeof(struct usb_device_info_48));
-		break;
-	}
-
 	case USB_DEVICESTATS:
 		*(struct usb_device_stats *)data = sc->sc_bus->stats;
 		break;
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index bec14753811..bf71960edf7 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.h,v 1.41 2012/06/20 10:51:27 fgsch Exp $ */
+/*	$OpenBSD: usb.h,v 1.42 2013/03/16 09:58:40 mpi 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 $	*/
 
@@ -622,27 +622,6 @@ struct usb_device_info {
 	char		udi_serial[USB_MAX_STRING_LEN];
 };
 
-/* OpenBSD <= 4.8 version, to be removed eventually */
-struct usb_device_info_48 {
-	u_int8_t	udi_bus;
-	u_int8_t	udi_addr;	/* device address */
-	char		udi_product[USB_MAX_STRING_LEN];
-	char		udi_vendor[USB_MAX_STRING_LEN];
-	char		udi_release[8];
-	u_int16_t	udi_productNo;
-	u_int16_t	udi_vendorNo;
-	u_int16_t	udi_releaseNo;
-	u_int8_t	udi_class;
-	u_int8_t	udi_subclass;
-	u_int8_t	udi_protocol;
-	u_int8_t	udi_config;
-	u_int8_t	udi_speed;
-	int		udi_power;	/* power consumption in mA, 0 if selfpowered */
-	int		udi_nports;
-	char		udi_devnames[USB_MAX_DEVNAMES][USB_MAX_DEVNAMELEN];
-	u_int8_t	udi_ports[16];/* hub only: addresses of devices on ports */
-};
-
 struct usb_ctl_report {
 	int	ucr_report;
 	u_char	ucr_data[1024];	/* filled data size will vary */
@@ -657,7 +636,6 @@ struct usb_device_stats {
 #define USB_SETDEBUG		_IOW ('U', 2, unsigned int)
 #define USB_DISCOVER		_IO  ('U', 3)
 #define USB_DEVICEINFO		_IOWR('U', 4, struct usb_device_info)
-#define USB_DEVICEINFO_48	_IOWR('U', 4, struct usb_device_info_48)
 #define USB_DEVICESTATS		_IOR ('U', 5, struct usb_device_stats)
 
 /* Generic HID device */