[Midnightbsd-cvs] src [10316] trunk/usr.sbin/usbconfig: sync usbconfig

[laffer1 at midnightbsd.org]

Revision: 10316
          http://svnweb.midnightbsd.org/src/?rev=10316
Author:   laffer1
Date:     2018-06-03 15:06:58 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
sync usbconfig

Modified Paths:
--------------
    trunk/usr.sbin/usbconfig/dump.c
    trunk/usr.sbin/usbconfig/usbconfig.c

Modified: trunk/usr.sbin/usbconfig/dump.c
===================================================================
--- trunk/usr.sbin/usbconfig/dump.c	2018-06-03 19:03:42 UTC (rev 10315)
+++ trunk/usr.sbin/usbconfig/dump.c	2018-06-03 19:06:58 UTC (rev 10316)
@@ -1,4 +1,5 @@
 /* $MidnightBSD$ */
+/* $FreeBSD: stable/10/usr.sbin/usbconfig/dump.c 274702 2014-11-19 08:56:38Z hselasky $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *
@@ -110,7 +111,6 @@
 				printf(" <OUT>\n");
 			return;
 		}
-
 		if (strcmp(field, "bmAttributes") == 0) {
 			switch (value & 0x03) {
 			case 0:
@@ -142,7 +142,6 @@
 			return;
 		}
 	}
-
 	if ((field[0] == 'i') && (field[1] != 'd')) {
 		/* Indirect String Descriptor */
 		if (value == 0) {
@@ -157,7 +156,84 @@
 		printf(" <%s>\n", temp_string);
 		return;
 	}
+	if (strlen(plevel) == 2 || strlen(plevel) == 6) {
 
+		/* Device and Interface Descriptor class codes */
+
+		if (strcmp(field, "bInterfaceClass") == 0 ||
+		    strcmp(field, "bDeviceClass") == 0) {
+
+			switch (value) {
+			case 0x00:
+				printf(" <Probed by interface class>\n");
+				break;
+			case 0x01:
+				printf(" <Audio device>\n");
+				break;
+			case 0x02:
+				printf(" <Communication device>\n");
+				break;
+			case 0x03:
+				printf(" <HID device>\n");
+				break;
+			case 0x05:
+				printf(" <Physical device>\n");
+				break;
+			case 0x06:
+				printf(" <Still imaging>\n");
+				break;
+			case 0x07:
+				printf(" <Printer device>\n");
+				break;
+			case 0x08:
+				printf(" <Mass storage>\n");
+				break;
+			case 0x09:
+				printf(" <HUB>\n");
+				break;
+			case 0x0A:
+				printf(" <CDC-data>\n");
+				break;
+			case 0x0B:
+				printf(" <Smart card>\n");
+				break;
+			case 0x0D:
+				printf(" <Content security>\n");
+				break;
+			case 0x0E:
+				printf(" <Video device>\n");
+				break;
+			case 0x0F:
+				printf(" <Personal healthcare>\n");
+				break;
+			case 0x10:
+				printf(" <Audio and video device>\n");
+				break;
+			case 0x11:
+				printf(" <Billboard device>\n");
+				break;
+			case 0xDC:
+				printf(" <Diagnostic device>\n");
+				break;
+			case 0xE0:
+				printf(" <Wireless controller>\n");
+				break;
+			case 0xEF:
+				printf(" <Miscellaneous device>\n");
+				break;
+			case 0xFE:
+				printf(" <Application specific>\n");
+				break;
+			case 0xFF:
+				printf(" <Vendor specific>\n");
+				break;
+			default:
+				printf(" <Unknown>\n");
+				break;
+			}
+			return;
+		}
+	}
 	/* No additional information */
 	printf("\n");
 }
@@ -390,8 +466,8 @@
 			printf("STRING_0x%02x = ", str_index);
 			len = (uint8_t)pbuf[0];
 			for (n = 0; n != len; n++) {
-				printf("0x%02x%s", (uint8_t)pbuf[n], 
-				    (n != (len-1)) ? ", " : "");
+				printf("0x%02x%s", (uint8_t)pbuf[n],
+				    (n != (len - 1)) ? ", " : "");
 			}
 			printf("\n");
 		}

Modified: trunk/usr.sbin/usbconfig/usbconfig.c
===================================================================
--- trunk/usr.sbin/usbconfig/usbconfig.c	2018-06-03 19:03:42 UTC (rev 10315)
+++ trunk/usr.sbin/usbconfig/usbconfig.c	2018-06-03 19:06:58 UTC (rev 10316)
@@ -1,4 +1,5 @@
 /* $MidnightBSD$ */
+/* $FreeBSD: stable/10/usr.sbin/usbconfig/usbconfig.c 248236 2013-03-13 12:23:14Z hselasky $ */
 /*-
  * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved.
  *
@@ -33,6 +34,7 @@
 #include <grp.h>
 #include <errno.h>
 #include <ctype.h>
+#include <sys/types.h>
 
 #include <libusb20_desc.h>
 #include <libusb20.h>