summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-09-29 01:18:34 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-09-29 01:18:34 +0000
commitf557be28dddfe7e2ba761fc32ee2c90aff77d01f (patch)
treef0be4c32dca9aa870bac3c155f6e93d221e1ff31 /sys
parentfef13764abdbb8ad784e1617746f90817c7f14f1 (diff)
sync
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/files.usb6
-rw-r--r--sys/dev/usb/usbdevs.h9
-rw-r--r--sys/dev/usb/usbdevs_data.h22
3 files changed, 32 insertions, 5 deletions
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index e98aad87a8c..d5c5e9ef96a 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-# $OpenBSD: files.usb,v 1.49 2005/08/01 03:03:14 david Exp $
+# $OpenBSD: files.usb,v 1.50 2005/09/29 01:18:32 deraadt Exp $
# $NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $
#
# Config file and device description for machine-independent USB code.
@@ -81,6 +81,10 @@ device ums: hid, wsmousedev
attach ums at uhidbus
file dev/usb/ums.c ums
+# Cypress microcontroller based serial adpaters
+device ucycom: hid
+attach ucycom at uhidbus
+file dev/usb/ucycom.c ucycom needs-flag
# Printers
device ulpt
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 095f0b61715..01231f69ebe 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs.h,v 1.172 2005/09/19 21:33:27 deraadt Exp $ */
+/* $OpenBSD: usbdevs.h,v 1.173 2005/09/29 01:18:33 deraadt Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.168 2005/09/19 21:33:07 deraadt Exp
+ * OpenBSD: usbdevs,v 1.169 2005/09/29 01:18:05 deraadt Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -387,6 +387,7 @@
#define USB_VENDOR_MSI 0x0db0 /* Micro Star International */
#define USB_VENDOR_ELCON 0x0db7 /* ELCON Systemtechnik */
#define USB_VENDOR_HAWKING 0x0e66 /* Hawking */
+#define USB_VENDOR_GMATE 0x0373 /* G.Mate */
#define USB_VENDOR_OTI 0x0ea0 /* Ours Technology */
#define USB_VENDOR_PILOTECH 0x0eaf /* Pilotech */
#define USB_VENDOR_AIRPRIME 0x0f3d /* Airprime */
@@ -937,6 +938,9 @@
/* Fujitsu protducts */
#define USB_PRODUCT_FUJITSU_AH_F401U 0x105b /* AH-F401U Air H device */
+/* G.Mate */
+#define USB_PRODUCT_GMATE_YP3X00 0x1001 /* YP3X00 PDA */
+
/* Garmin International products */
#define USB_PRODUCT_GARMIN_IQUE3600 0x0004 /* Ique 3600 */
@@ -1403,6 +1407,7 @@
/* NetChip Technology Products */
#define USB_PRODUCT_NETCHIP_TURBOCONNECT 0x1080 /* Turbo-Connect */
#define USB_PRODUCT_NETCHIP_CLIK40 0xa140 /* Clik! 40 */
+#define USB_PRODUCT_NETCHIP_ETHERNETGADGET 0xa4a2 /* EthernetGadget */
/* Netgear products */
#define USB_PRODUCT_NETGEAR_EA101 0x1001 /* Ethernet */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index e01ff5ad5d2..67615c1822f 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.171 2005/09/19 21:33:27 deraadt Exp $ */
+/* $OpenBSD: usbdevs_data.h,v 1.172 2005/09/29 01:18:33 deraadt Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.168 2005/09/19 21:33:07 deraadt Exp
+ * OpenBSD: usbdevs,v 1.169 2005/09/29 01:18:05 deraadt Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -1817,6 +1817,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"AH-F401U Air H device",
},
{
+ USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00,
+ 0,
+ "G.Mate",
+ "YP3X00 PDA",
+ },
+ {
USB_VENDOR_GARMIN, USB_PRODUCT_GARMIN_IQUE3600,
0,
"Garmin International",
@@ -3719,6 +3725,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"Clik! 40",
},
{
+ USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET,
+ 0,
+ "NetChip Technology",
+ "EthernetGadget",
+ },
+ {
USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
0,
"BayNETGEAR",
@@ -7523,6 +7535,12 @@ const struct usb_knowndev usb_knowndevs[] = {
NULL,
},
{
+ USB_VENDOR_GMATE, 0,
+ USB_KNOWNDEV_NOPROD,
+ "G.Mate",
+ NULL,
+ },
+ {
USB_VENDOR_OTI, 0,
USB_KNOWNDEV_NOPROD,
"Ours Technology",