diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-09-29 08:43:08 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-09-29 08:43:08 +0000 |
| commit | 3ce2e711a04e6901fb3d7d18fc7d29a5f93ed4ea (patch) | |
| tree | 2fa3a7df494ef9fcbee1aeabc86f2c9f066bb817 /sys/dev | |
| parent | 2d2afb1a863d1f30632147c3aeef6583829a304b (diff) | |
Add support for HenTong WK-668, and match the generic DM9601 id
while here.
WK-668 id reported by mk at freeweb.ozi.nu
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/if_udav.c | 12 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index f2f22041db8..a53dade77de 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_udav.c,v 1.18 2006/06/23 06:27:11 miod Exp $ */ +/* $OpenBSD: if_udav.c,v 1.19 2006/09/29 08:43:07 jsg Exp $ */ /* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -146,13 +146,9 @@ static const struct udav_type { u_int16_t udav_flags; #define UDAV_EXT_PHY 0x0001 } udav_devs [] = { - /* Corega USB-TXC */ - {{ USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXC }, 0}, -#if 0 - /* DAVICOM DM9601 Generic? */ - /* XXX: The following ids was obtained from the data sheet. */ - {{ 0x0a46, 0x9601 }, 0}, -#endif + {{ USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXC }, 0 }, + {{ USB_VENDOR_DAVICOM, USB_PRODUCT_DAVICOM_DM9601 }, 0 }, + {{ USB_VENDOR_DAVICOM, USB_PRODUCT_DAVICOM_WK668 }, 0 } }; #define udav_lookup(v, p) ((struct udav_type *)usb_lookup(udav_devs, v, p)) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 656a42b82e2..ce49624fce2 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1,4 +1,4 @@ -$OpenBSD: usbdevs,v 1.224 2006/09/26 12:23:40 jsg Exp $ +$OpenBSD: usbdevs,v 1.225 2006/09/29 08:43:07 jsg Exp $ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ /* @@ -106,6 +106,7 @@ vendor YAMAHA 0x0499 YAMAHA vendor COMPAQ 0x049f Compaq vendor HITACHI 0x04a4 Hitachi vendor ACERP 0x04a5 Acer Peripherals +vendor DAVICOM 0x04a6 Davicom vendor VISIONEER 0x04a7 Visioneer vendor CANON 0x04a9 Canon vendor NIKON 0x04b0 Nikon @@ -906,6 +907,10 @@ product DAISY DMC 0x6901 PhotoClip product DALLAS J6502 0x4201 J-6502 speakers product DALLAS USB_FOB_IBUTTON 0x2490 USB-FOB/iBUTTON +/* Davicom products */ +product DAVICOM DM9601 0x9601 DM9601 +product DAVICOM WK668 0x0668 HenTong WK-668 + /* Dell products */ product DELL TM1180 0x8100 TrueMobile 1180 WLAN product DELL BLUETOOTH350 0x8103 Bluetooth 350 |