summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/man/man4/cdce.410
-rw-r--r--sys/dev/usb/if_cdce.c4
-rw-r--r--sys/dev/usb/usbdevs7
3 files changed, 14 insertions, 7 deletions
diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4
index 87a86af0657..ff2468d14bd 100644
--- a/share/man/man4/cdce.4
+++ b/share/man/man4/cdce.4
@@ -25,7 +25,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: cdce.4,v 1.4 2005/05/25 07:54:24 david Exp $
+.\" $OpenBSD: cdce.4,v 1.5 2005/09/29 01:18:06 deraadt Exp $
.\"
.Dd July 20, 2004
.Dt CDCE 4
@@ -43,10 +43,10 @@ based on the USB Communication Device Class (CDC) and Ethernet subclass,
including the following:
.Pp
.Bl -bullet -compact
-.It
-Prolific PL-2501
-.It
-Sharp Zaurus
+.It Prolific PL-2501
+.It Sharp Zaurus
+.It G.Mate YP3X00
+.It NetChip EthernetGadget
.El
.Pp
The USB bridge appears as a regular network interface on both sides,
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index 9e64e219839..83de7aa82c8 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cdce.c,v 1.10 2005/08/01 05:36:48 brad Exp $ */
+/* $OpenBSD: if_cdce.c,v 1.11 2005/09/29 01:18:05 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -96,6 +96,8 @@ Static const struct cdce_type cdce_devs[] = {
{{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600 }, CDCE_ZAURUS | CDCE_NO_UNION },
{{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C700 }, CDCE_ZAURUS | CDCE_NO_UNION },
{{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C750 }, CDCE_ZAURUS | CDCE_NO_UNION },
+ {{ USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00 }, CDCE_NO_UNION },
+ {{ USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET }, CDCE_NO_UNION },
};
#define cdce_lookup(v, p) ((const struct cdce_type *)usb_lookup(cdce_devs, v, p))
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 8931d5edcc3..7945466ac47 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$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 $ */
/*
@@ -380,6 +380,7 @@ vendor CONCEPTRONIC 0x0d8e Conceptronic
vendor MSI 0x0db0 Micro Star International
vendor ELCON 0x0db7 ELCON Systemtechnik
vendor HAWKING 0x0e66 Hawking
+vendor GMATE 0x0373 G.Mate
vendor OTI 0x0ea0 Ours Technology
vendor PILOTECH 0x0eaf Pilotech
vendor AIRPRIME 0x0f3d Airprime
@@ -930,6 +931,9 @@ product FUJIPHOTO MASS0100 0x0100 Mass Storage
/* Fujitsu protducts */
product FUJITSU AH_F401U 0x105b AH-F401U Air H device
+/* G.Mate */
+product GMATE YP3X00 0x1001 YP3X00 PDA
+
/* Garmin International products */
product GARMIN IQUE3600 0x0004 Ique 3600
@@ -1396,6 +1400,7 @@ product NEODIO ND5010 0x5010 Multi-format Flash Controller
/* NetChip Technology Products */
product NETCHIP TURBOCONNECT 0x1080 Turbo-Connect
product NETCHIP CLIK40 0xa140 Clik! 40
+product NETCHIP ETHERNETGADGET 0xa4a2 EthernetGadget
/* Netgear products */
product NETGEAR EA101 0x1001 Ethernet