diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-03-31 12:29:33 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-03-31 12:29:33 +0000 |
| commit | c555c99234e548a7665c81a3f9cd5d55e9d69545 (patch) | |
| tree | 4a527340d431f34e1a0dd1cda4ce9d53fb8ad5bf /sys | |
| parent | 3deddb5bf641086c65d0747ad3e75955bc570a7a (diff) | |
sync
(I forgot: previous change to usbdevs was OK jsg@)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 8 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 63afbcd1f33..cca8ed7e4c5 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.674 2016/01/08 09:31:57 mpi Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.675 2016/03/31 12:29:32 reyk Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.662 2016/01/08 09:31:32 mpi Exp + * OpenBSD: usbdevs,v 1.663 2016/03/31 12:27:48 reyk Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -630,6 +630,7 @@ #define USB_VENDOR_TPLINK 0x2357 /* TP-Link */ #define USB_VENDOR_WMR 0x2405 /* West Mountain Radio */ #define USB_VENDOR_TRIPPLITE 0x2478 /* Tripp-Lite */ +#define USB_VENDOR_ARUBA 0x2626 /* Aruba */ #define USB_VENDOR_NHJ 0x2770 /* NHJ */ #define USB_VENDOR_ASUSTEK 0x2821 /* ASUSTeK Computer */ #define USB_VENDOR_PLANEX 0x2c02 /* Planex Communications */ @@ -1007,6 +1008,9 @@ /* Arkmicro products */ #define USB_PRODUCT_ARKMICRO_ARK3116 0x0232 /* ARK3116 Serial */ +/* Aruba products */ +#define USB_PRODUCT_ARUBA_CP210X 0xea60 /* CP210x Serial */ + /* Asahi Optical products */ #define USB_PRODUCT_ASAHIOPTICAL_OPTIO230 0x0004 /* PENTAX Optio230 */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index ca44dd9cdfc..1edf7dedbf8 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.668 2016/01/08 09:31:57 mpi Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.669 2016/03/31 12:29:32 reyk Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.662 2016/01/08 09:31:32 mpi Exp + * OpenBSD: usbdevs,v 1.663 2016/03/31 12:27:48 reyk Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -986,6 +986,10 @@ const struct usb_known_product usb_known_products[] = { "ARK3116 Serial", }, { + USB_VENDOR_ARUBA, USB_PRODUCT_ARUBA_CP210X, + "CP210x Serial", + }, + { USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO230, "PENTAX Optio230", }, @@ -13798,6 +13802,10 @@ const struct usb_known_vendor usb_known_vendors[] = { "Tripp-Lite", }, { + USB_VENDOR_ARUBA, + "Aruba", + }, + { USB_VENDOR_NHJ, "NHJ", }, |