regen

2 files changed, 64 insertions, 64 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 4bbf7affedf..88f04c5d6e8 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.718 2020/01/05 08:59:00 jsg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.719 2020/01/05 10:13:49 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.706 2020/01/05 08:58:25 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.707 2020/01/05 10:13:14 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -180,7 +180,6 @@
 #define	USB_VENDOR_ATEN	0x0557		/* ATEN International */
 #define	USB_VENDOR_SAMSUNG	0x055d		/* Samsung */
 #define	USB_VENDOR_MUSTEK	0x055f		/* Mustek Systems */
-#define	USB_VENDOR_MUSTEK2	0x0665		/* Mustek Systems */
 #define	USB_VENDOR_TELEX	0x0562		/* Telex Communications */
 #define	USB_VENDOR_PERACOM	0x0565		/* Peracom Networks */
 #define	USB_VENDOR_ALCOR2	0x0566		/* Alcor Micro */
@@ -207,10 +206,10 @@
 #define	USB_VENDOR_THRUSTMASTER	0x05a4		/* Thrustmaster */
 #define	USB_VENDOR_CISCOLINKSYS3	0x05a6		/* Cisco-Linksys */
 #define	USB_VENDOR_OMNIVISION	0x05a9		/* OmniVision */
-#define	USB_VENDOR_JINGMOLD	0x05af		/* Jing Mold */
 #define	USB_VENDOR_INSYSTEM	0x05ab		/* In-System Design */
 #define	USB_VENDOR_APPLE	0x05ac		/* Apple Computer */
 #define	USB_VENDOR_YCCABLE	0x05ad		/* Y.C. Cable */
+#define	USB_VENDOR_JINGMOLD	0x05af		/* Jing Mold */
 #define	USB_VENDOR_DIGI	0x05c5		/* Digi International */
 #define	USB_VENDOR_QUALCOMM	0x05c6		/* Qualcomm */
 #define	USB_VENDOR_QTRONIX	0x05c7		/* Qtronix */
@@ -248,6 +247,7 @@
 #define	USB_VENDOR_TEAC	0x0644		/* TEAC */
 #define	USB_VENDOR_SGI	0x065e		/* Silicon Graphics */
 #define	USB_VENDOR_SANWASUPPLY	0x0663		/* Sanwa Supply */
+#define	USB_VENDOR_MUSTEK2	0x0665		/* Mustek Systems */
 #define	USB_VENDOR_LINKSYS	0x066b		/* Linksys */
 #define	USB_VENDOR_ACERSA	0x066e		/* Acer Semiconductor America */
 #define	USB_VENDOR_SIGMATEL	0x066f		/* Sigmatel */
@@ -270,8 +270,8 @@
 #define	USB_VENDOR_PHIDGETS	0x06c2		/* Phidgets */
 #define	USB_VENDOR_BIZLINK	0x06c4		/* Bizlink International */
 #define	USB_VENDOR_KEYSPAN	0x06cd		/* Keyspan */
-#define	USB_VENDOR_LIEBERT	0x06da		/* Liebert */
 #define	USB_VENDOR_AASHIMA	0x06d6		/* Aashima Technology */
+#define	USB_VENDOR_LIEBERT	0x06da		/* Liebert */
 #define	USB_VENDOR_MULTITECH	0x06e0		/* MultiTech */
 #define	USB_VENDOR_ADS	0x06e1		/* ADS Technologies */
 #define	USB_VENDOR_ALCATELM	0x06e4		/* Alcatel Microelectronics */
@@ -332,9 +332,9 @@
 #define	USB_VENDOR_ZOOM	0x0803		/* Zoom Telephonics */
 #define	USB_VENDOR_BROADLOGIC	0x0827		/* BroadLogic */
 #define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring */
-#define	USB_VENDOR_ACTIONSTAR	0x0835		/* Action Star Enterprise */
 #define	USB_VENDOR_PALM	0x0830		/* Palm Computing */
 #define	USB_VENDOR_SOURCENEXT	0x0833		/* SOURCENEXT */
+#define	USB_VENDOR_ACTIONSTAR	0x0835		/* Action Star Enterprise */
 #define	USB_VENDOR_ACCTON	0x083a		/* Accton Technology */
 #define	USB_VENDOR_DIAMOND	0x0841		/* Diamond */
 #define	USB_VENDOR_NETGEAR	0x0846		/* BayNETGEAR */
@@ -410,8 +410,8 @@
 #define	USB_VENDOR_CHENSOURCE	0x0ad2		/* Chen-Source */
 #define	USB_VENDOR_NEODIO	0x0aec		/* Neodio */
 #define	USB_VENDOR_OPTION	0x0af0		/* Option */
-#define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
 #define	USB_VENDOR_ASUS	0x0b05		/* ASUS */
+#define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
 #define	USB_VENDOR_OCT	0x0b39		/* Omnidirectional Control Technology */
 #define	USB_VENDOR_TEKRAM	0x0b3b		/* Tekram Technology */
 #define	USB_VENDOR_HAL	0x0b41		/* HAL Corporation */
@@ -465,18 +465,18 @@
 #define	USB_VENDOR_OTI	0x0ea0		/* Ours Technology */
 #define	USB_VENDOR_PILOTECH	0x0eaf		/* Pilotech */
 #define	USB_VENDOR_NOVATECH	0x0eb0		/* Nova Tech */
-#define	USB_VENDOR_EGALAX	0x0eef		/* eGalax */
 #define	USB_VENDOR_ITEGNO	0x0eba		/* iTegno */
 #define	USB_VENDOR_NORITAKE	0x0eda		/* Noritake itron Corp */
+#define	USB_VENDOR_EGALAX	0x0eef		/* eGalax */
 #define	USB_VENDOR_XIRING	0x0f14		/* XIRING */
 #define	USB_VENDOR_AIRPRIME	0x0f3d		/* Airprime */
-#define	USB_VENDOR_LARSENBRUSGAARD	0x0fd8		/* Larsen and Brusgaard */
-#define	USB_VENDOR_OREGONSCI	0x0fde		/* Oregon Scientific */
-#define	USB_VENDOR_UNKNOWN4	0x0fe6		/* Unknown Vendor */
 #define	USB_VENDOR_VTECH	0x0f88		/* VTech */
 #define	USB_VENDOR_FALCOM	0x0f94		/* Falcom Wireless Communications */
 #define	USB_VENDOR_RIM	0x0fca		/* Research In Motion */
 #define	USB_VENDOR_DYNASTREAM	0x0fcf		/* Dynastream Innovations */
+#define	USB_VENDOR_LARSENBRUSGAARD	0x0fd8		/* Larsen and Brusgaard */
+#define	USB_VENDOR_OREGONSCI	0x0fde		/* Oregon Scientific */
+#define	USB_VENDOR_UNKNOWN4	0x0fe6		/* Unknown Vendor */
 #define	USB_VENDOR_DVICO	0x0fe9		/* DViCO */
 #define	USB_VENDOR_QUALCOMM2	0x1004		/* Qualcomm */
 #define	USB_VENDOR_MOTOROLA4	0x100d		/* Motorola */
@@ -561,8 +561,8 @@
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics */
 #define	USB_VENDOR_CLIPSAL	0x166a		/* Clipsal */
-#define	USB_VENDOR_ATHEROS	0x168c		/* Atheros Communications */
 #define	USB_VENDOR_CISCOLINKSYS2	0x167b		/* Cisco-Linksys */
+#define	USB_VENDOR_ATHEROS	0x168c		/* Atheros Communications */
 #define	USB_VENDOR_GIGASET	0x1690		/* Gigaset */
 #define	USB_VENDOR_GLOBALSUN	0x16ab		/* Global Sun Technology */
 #define	USB_VENDOR_VOTI	0x16c0		/* Van Ooijen Technische Informatica */
@@ -596,13 +596,13 @@
 #define	USB_VENDOR_BAYER	0x1a79		/* Bayer Health Care */
 #define	USB_VENDOR_WCH2	0x1a86		/* QinHeng Electronics */
 #define	USB_VENDOR_SEL	0x1adb		/* Schweitzer Engineering Laboratories */
-#define	USB_VENDOR_SILABS5	0x1ba4		/* Silicon Labs */
 #define	USB_VENDOR_CORSAIR	0x1b1c		/* Corsair */
 #define	USB_VENDOR_MATRIXORB	0x1b3d		/* Matrix Orbital */
 #define	USB_VENDOR_TORADEX	0x1b67		/* Toradex inc. */
 #define	USB_VENDOR_FUSHICAI	0x1b71		/* Fushicai */
 #define	USB_VENDOR_OVISLINK	0x1b75		/* OvisLink */
 #define	USB_VENDOR_TML	0x1b91		/* The Mobility Lab */
+#define	USB_VENDOR_SILABS5	0x1ba4		/* Silicon Labs */
 #define	USB_VENDOR_TCTMOBILE	0x1bbb		/* TCT Mobile */
 #define	USB_VENDOR_MDS	0x1bc8		/* MDS */
 #define	USB_VENDOR_ALTI2	0x1bc9		/* Alti-2 */
@@ -619,8 +619,8 @@
 #define	USB_VENDOR_FESTO	0x1e29		/* Festo */
 #define	USB_VENDOR_MODACOM	0x1eb8		/* Modacom */
 #define	USB_VENDOR_AIRTIES	0x1eda		/* AirTies */
-#define	USB_VENDOR_VERTEX	0x1fe7		/* Vertex Wireless Co., Ltd. */
 #define	USB_VENDOR_LAKESHORE	0x1fb9		/* Lake Shore */
+#define	USB_VENDOR_VERTEX	0x1fe7		/* Vertex Wireless Co., Ltd. */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
 #define	USB_VENDOR_PLANEX2	0x2019		/* Planex Communications */
 #define	USB_VENDOR_ENCORE	0x203d		/* Encore */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index ac70505ef57..3b44af92ba1 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.712 2020/01/05 08:59:00 jsg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.713 2020/01/05 10:13:49 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.706 2020/01/05 08:58:25 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.707 2020/01/05 10:13:14 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -12198,10 +12198,6 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Mustek Systems",
 	},
 	{
-	    USB_VENDOR_MUSTEK2,
-	    "Mustek Systems",
-	},
-	{
 	    USB_VENDOR_TELEX,
 	    "Telex Communications",
 	},
@@ -12306,10 +12302,6 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "OmniVision",
 	},
 	{
-	    USB_VENDOR_JINGMOLD,
-	    "Jing Mold",
-	},
-	{
 	    USB_VENDOR_INSYSTEM,
 	    "In-System Design",
 	},
@@ -12322,6 +12314,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Y.C. Cable",
 	},
 	{
+	    USB_VENDOR_JINGMOLD,
+	    "Jing Mold",
+	},
+	{
 	    USB_VENDOR_DIGI,
 	    "Digi International",
 	},
@@ -12470,6 +12466,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Sanwa Supply",
 	},
 	{
+	    USB_VENDOR_MUSTEK2,
+	    "Mustek Systems",
+	},
+	{
 	    USB_VENDOR_LINKSYS,
 	    "Linksys",
 	},
@@ -12558,14 +12558,14 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Keyspan",
 	},
 	{
-	    USB_VENDOR_LIEBERT,
-	    "Liebert",
-	},
-	{
 	    USB_VENDOR_AASHIMA,
 	    "Aashima Technology",
 	},
 	{
+	    USB_VENDOR_LIEBERT,
+	    "Liebert",
+	},
+	{
 	    USB_VENDOR_MULTITECH,
 	    "MultiTech",
 	},
@@ -12806,10 +12806,6 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Handspring",
 	},
 	{
-	    USB_VENDOR_ACTIONSTAR,
-	    "Action Star Enterprise",
-	},
-	{
 	    USB_VENDOR_PALM,
 	    "Palm Computing",
 	},
@@ -12818,6 +12814,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "SOURCENEXT",
 	},
 	{
+	    USB_VENDOR_ACTIONSTAR,
+	    "Action Star Enterprise",
+	},
+	{
 	    USB_VENDOR_ACCTON,
 	    "Accton Technology",
 	},
@@ -13118,14 +13118,14 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Option",
 	},
 	{
-	    USB_VENDOR_TODOS,
-	    "Todos Data System",
-	},
-	{
 	    USB_VENDOR_ASUS,
 	    "ASUS",
 	},
 	{
+	    USB_VENDOR_TODOS,
+	    "Todos Data System",
+	},
+	{
 	    USB_VENDOR_OCT,
 	    "Omnidirectional Control Technology",
 	},
@@ -13338,10 +13338,6 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Nova Tech",
 	},
 	{
-	    USB_VENDOR_EGALAX,
-	    "eGalax",
-	},
-	{
 	    USB_VENDOR_ITEGNO,
 	    "iTegno",
 	},
@@ -13350,6 +13346,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Noritake itron Corp",
 	},
 	{
+	    USB_VENDOR_EGALAX,
+	    "eGalax",
+	},
+	{
 	    USB_VENDOR_XIRING,
 	    "XIRING",
 	},
@@ -13358,18 +13358,6 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Airprime",
 	},
 	{
-	    USB_VENDOR_LARSENBRUSGAARD,
-	    "Larsen and Brusgaard",
-	},
-	{
-	    USB_VENDOR_OREGONSCI,
-	    "Oregon Scientific",
-	},
-	{
-	    USB_VENDOR_UNKNOWN4,
-	    "Unknown Vendor",
-	},
-	{
 	    USB_VENDOR_VTECH,
 	    "VTech",
 	},
@@ -13386,6 +13374,18 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Dynastream Innovations",
 	},
 	{
+	    USB_VENDOR_LARSENBRUSGAARD,
+	    "Larsen and Brusgaard",
+	},
+	{
+	    USB_VENDOR_OREGONSCI,
+	    "Oregon Scientific",
+	},
+	{
+	    USB_VENDOR_UNKNOWN4,
+	    "Unknown Vendor",
+	},
+	{
 	    USB_VENDOR_DVICO,
 	    "DViCO",
 	},
@@ -13722,14 +13722,14 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Clipsal",
 	},
 	{
-	    USB_VENDOR_ATHEROS,
-	    "Atheros Communications",
-	},
-	{
 	    USB_VENDOR_CISCOLINKSYS2,
 	    "Cisco-Linksys",
 	},
 	{
+	    USB_VENDOR_ATHEROS,
+	    "Atheros Communications",
+	},
+	{
 	    USB_VENDOR_GIGASET,
 	    "Gigaset",
 	},
@@ -13862,10 +13862,6 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Schweitzer Engineering Laboratories",
 	},
 	{
-	    USB_VENDOR_SILABS5,
-	    "Silicon Labs",
-	},
-	{
 	    USB_VENDOR_CORSAIR,
 	    "Corsair",
 	},
@@ -13890,6 +13886,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "The Mobility Lab",
 	},
 	{
+	    USB_VENDOR_SILABS5,
+	    "Silicon Labs",
+	},
+	{
 	    USB_VENDOR_TCTMOBILE,
 	    "TCT Mobile",
 	},
@@ -13954,14 +13954,14 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "AirTies",
 	},
 	{
-	    USB_VENDOR_VERTEX,
-	    "Vertex Wireless Co., Ltd.",
-	},
-	{
 	    USB_VENDOR_LAKESHORE,
 	    "Lake Shore",
 	},
 	{
+	    USB_VENDOR_VERTEX,
+	    "Vertex Wireless Co., Ltd.",
+	},
+	{
 	    USB_VENDOR_DLINK,
 	    "D-Link",
 	},