summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2013-11-17 13:53:45 +0000
committerjsg <jsg@openbsd.org>2013-11-17 13:53:45 +0000
commit1bb9d2003fe33f7cffe40a13ddac1d0a98be6d54 (patch)
treed3e27ee119c4b40617f39cb48d3233295262f499
parentDistinguish between inteldrm and radeondrm. (diff)
downloadwireguard-openbsd-1bb9d2003fe33f7cffe40a13ddac1d0a98be6d54.tar.xz
wireguard-openbsd-1bb9d2003fe33f7cffe40a13ddac1d0a98be6d54.zip
correct some iodata strings and add ETX-US2
from ISIHARA Takanori
-rw-r--r--share/man/man4/aue.48
-rw-r--r--sys/dev/usb/if_aue.c3
-rw-r--r--sys/dev/usb/usbdevs9
3 files changed, 12 insertions, 8 deletions
diff --git a/share/man/man4/aue.4 b/share/man/man4/aue.4
index 554e22ac74a..af4fca99372 100644
--- a/share/man/man4/aue.4
+++ b/share/man/man4/aue.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aue.4,v 1.36 2013/07/16 16:05:48 schwarze Exp $
+.\" $OpenBSD: aue.4,v 1.37 2013/11/17 13:57:03 jsg Exp $
.\" $NetBSD: aue.4,v 1.9 2002/07/11 00:23:31 rh Exp $
.\"
.\" Copyright (c) 1997, 1998, 1999
@@ -33,7 +33,7 @@
.\"
.\" $FreeBSD: src/share/man/man4/aue.4,v 1.2 2000/01/07 22:18:47 wpaul Exp $
.\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: November 17 2013 $
.Dt AUE 4
.Os
.Sh NAME
@@ -79,7 +79,9 @@ This includes the following adapters:
.It Tn GIGABYTE GN-BR402W
.It Tn Hawking UF100
.It Tn HP HN210E
-.It Tn I/O DATA USB ETTX
+.It Tn I/O DATA USB ET/TX
+.It Tn I/O DATA USB ET/TX-S
+.It Tn I/O DATA ETX-US2
.It Tn Kingston KNU101TX
.It Tn Laneed LD-USBL/TX
.It Tn Linksys USB100TX
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index e360f27e4f9..9345f2c5061 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_aue.c,v 1.90 2013/11/15 10:17:39 pirofti Exp $ */
+/* $OpenBSD: if_aue.c,v 1.91 2013/11/17 13:57:03 jsg Exp $ */
/* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -184,6 +184,7 @@ const struct aue_type aue_devs[] = {
{{ USB_VENDOR_HP, USB_PRODUCT_HP_HN210E}, PII },
{{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX}, 0 },
{{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTXS}, PII },
+ {{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_ETXUS2}, PII },
{{ USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX}, 0 },
{{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX1}, LSYS|PII },
{{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T}, LSYS },
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 3010acde6ae..ae1fb1127d6 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.613 2013/11/15 19:42:20 sasano Exp $
+$OpenBSD: usbdevs,v 1.614 2013/11/17 13:53:45 jsg Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -2213,13 +2213,14 @@ product INTREPIDCS NEOVI 0x0701 NeoVI Blue
/* I/O DATA products */
product IODATA USBSSMRW 0x0314 USB-SSMRW SD-card
product IODATA USBSDRW 0x031e USB-SDRW SD-card
-product IODATA USBETT 0x0901 USB ETT
-product IODATA USBETTX 0x0904 USB ETTX
-product IODATA USBETTXS 0x0913 USB ETTX
+product IODATA USBETT 0x0901 USB ET/T
+product IODATA USBETTX 0x0904 USB ET/TX
+product IODATA USBETTXS 0x0913 USB ET/TX-S
product IODATA USBWNB11A 0x0919 USB WN-B11
product IODATA USBWNB11 0x0922 USB Airport WN-B11
product IODATA USBWNG54US 0x0928 USB WN-G54/US
product IODATA USBWNG54US_NF 0x0929 USB WN-G54/US
+product IODATA ETXUS2 0x092a ETX-US2
product IODATA ETGUS2 0x0930 ETG-US2
product IODATA FT232R 0x093c FT232R
product IODATA WNGDNUS2 0x093f WN-GDN/US2