summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2013-12-17 12:51:18 +0000
committerderaadt <deraadt@openbsd.org>2013-12-17 12:51:18 +0000
commit8d61d78d29cd2ea80623c65cc35e60148746f8cb (patch)
treea194e0991ace0f30ed30c2643ee83e4768975060 /sys
parentelan products; Thomas Pfaff (diff)
downloadwireguard-openbsd-8d61d78d29cd2ea80623c65cc35e60148746f8cb.tar.xz
wireguard-openbsd-8d61d78d29cd2ea80623c65cc35e60148746f8cb.zip
sync
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/usbdevs.h8
-rw-r--r--sys/dev/usb/usbdevs_data.h12
2 files changed, 16 insertions, 4 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index b93e1f4a69c..f42aadc2c49 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs.h,v 1.628 2013/12/13 17:40:56 yuo Exp $ */
+/* $OpenBSD: usbdevs.h,v 1.629 2013/12/17 12:51:18 deraadt Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.617 2013/12/13 17:38:38 yuo Exp
+ * OpenBSD: usbdevs,v 1.618 2013/12/17 12:51:14 deraadt Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -155,6 +155,7 @@
#define USB_VENDOR_ANNABOOKS 0x04ed /* Annabooks */
#define USB_VENDOR_JVC 0x04f1 /* JVC */
#define USB_VENDOR_CHICONY 0x04f2 /* Chicony Electronics */
+#define USB_VENDOR_ELAN 0x04f3 /* Elan */
#define USB_VENDOR_BROTHER 0x04f9 /* Brother Industries */
#define USB_VENDOR_DALLAS 0x04fa /* Dallas Semiconductor */
#define USB_VENDOR_ACER 0x0502 /* Acer */
@@ -1577,6 +1578,9 @@
#define USB_PRODUCT_EIZO_HUB 0x0000 /* hub */
#define USB_PRODUCT_EIZO_MONITOR 0x0001 /* monitor */
+/* Elan Microelectronics products */
+#define USB_PRODUCT_ELAN_BARCODE 0x0001 /* Barcode Scanner */
+
/* ELCON Systemtechnik products */
#define USB_PRODUCT_ELCON_PLAN 0x0002 /* Goldpfeil P-LAN */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index f958ad21edc..c6ada784a3d 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.622 2013/12/13 17:40:56 yuo Exp $ */
+/* $OpenBSD: usbdevs_data.h,v 1.623 2013/12/17 12:51:18 deraadt Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.617 2013/12/13 17:38:38 yuo Exp
+ * OpenBSD: usbdevs,v 1.618 2013/12/17 12:51:14 deraadt Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -2678,6 +2678,10 @@ const struct usb_known_product usb_known_products[] = {
"monitor",
},
{
+ USB_VENDOR_ELAN, USB_PRODUCT_ELAN_BARCODE,
+ "Barcode Scanner",
+ },
+ {
USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN,
"Goldpfeil P-LAN",
},
@@ -11270,6 +11274,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
"Chicony Electronics",
},
{
+ USB_VENDOR_ELAN,
+ "Elan",
+ },
+ {
USB_VENDOR_BROTHER,
"Brother Industries",
},