Additional axe devices found in Linux driver.

7 files changed, 61 insertions, 15 deletions

diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware
index a6909dad59b..951a67c9f6a 100644
--- a/distrib/notes/alpha/hardware
+++ b/distrib/notes/alpha/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.50 2005/02/12 05:44:46 jsg Exp $
+dnl	$OpenBSD: hardware,v 1.51 2005/02/12 10:21:04 jsg Exp $
 OpenBSD/MACHINE OSREV is expected to run on the following hardware.
 If you have hardware that is listed here and are unable to run
 OpenBSD, or if you are able to run OpenBSD on hardware not listed
@@ -373,14 +373,21 @@ work. It's our best guess that they do, but any feedback is appreciated.
 			SMC EZ Connect USB
 			SOHOware NUB100
 		ASIX Electronics AX88172 USB Ethernet adapters, including:
-		    Buffalo(MELCO) LUA-U2-KTX
-		    Corega FEther USB2-TX
-		    D-Link DUBE100
-		    LinkSys USB200M
-		    Netgear FA120
-		    Sitecom LN-029
-		    SnapPort USB 2.0 LAN Adapter
-		    System TALKS SGC-X2UL
+			ATEN UC210T
+			Billionton Systems USB2AR
+			Buffalo(MELCO) LUA-U2-KTX
+			Corega FEther USB2-TX
+			D-Link DUBE100
+			Hawking UF200
+			Intellinet USB 2.0 to Ethernet (rev A)
+			LinkSys USB200M
+			Netgear FA120
+			Sitecom LN-029
+			SnapPort USB 2.0 LAN Adapter
+			ST Lab USB 2.0 Fast Ethernet
+			Surecom EP-1427X-2
+			System TALKS SGC-X2UL
+			TRENDnet TU2-ET100
 		AMD LANCE and PCnet-based PCI adapters (le), including: [*]
 			BOCALANcard/PCI
 			AT&T StarLAN 10, EN100, and StarLAN Fiber
diff --git a/distrib/notes/amd64/hardware b/distrib/notes/amd64/hardware
index b974fb0ef2a..de5c8d30d28 100644
--- a/distrib/notes/amd64/hardware
+++ b/distrib/notes/amd64/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.31 2005/02/12 05:44:46 jsg Exp $
+dnl	$OpenBSD: hardware,v 1.32 2005/02/12 10:21:04 jsg Exp $
 OpenBSD/MACHINE OSREV should work on all Athlon 64-based and
 compatible designs.
 
@@ -250,14 +250,21 @@ dnl		YENTA-compatible PCI-CardBus bridges
 		    SMC EZ Connect USB
 		    SOHOware NUB100
 		ASIX Electronics AX88172 USB Ethernet adapters, including:
+		    ATEN UC210T
+		    Billionton Systems USB2AR
 		    Buffalo(MELCO) LUA-U2-KTX
 		    Corega FEther USB2-TX
 		    D-Link DUBE100
+		    Hawking UF200
+		    Intellinet USB 2.0 to Ethernet (rev A)
 		    LinkSys USB200M
 		    Netgear FA120
 		    Sitecom LN-029
 		    SnapPort USB 2.0 LAN Adapter
+		    ST Lab USB 2.0 Fast Ethernet
+		    Surecom EP-1427X-2
 		    System TALKS SGC-X2UL
+		    TRENDnet TU2-ET100
 		AMD PCnet-based PCI Ethernet adapters, including:
 		    BOCALANcard/PCI
 		    AT&T StarLAN 10, EN100, and StarLAN Fiber
diff --git a/distrib/notes/cats/hardware b/distrib/notes/cats/hardware
index 804df46813e..c349fe03e41 100644
--- a/distrib/notes/cats/hardware
+++ b/distrib/notes/cats/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.15 2005/02/12 05:44:46 jsg Exp $
+dnl	$OpenBSD: hardware,v 1.16 2005/02/12 10:21:04 jsg Exp $
 OpenBSD/MACHINE runs on the Chalice/Simtec StrongARM 110 Evaluation Board.
 
 Supported devices {:-include-:}:
@@ -101,14 +101,21 @@ Supported devices {:-include-:}:
 		    SMC EZ Connect USB
 		    SOHOware NUB100
 		ASIX Electronics AX88172 USB Ethernet adapters, including:
+		    ATEN UC210T
+		    Billionton Systems USB2AR
 		    Buffalo(MELCO) LUA-U2-KTX
 		    Corega FEther USB2-TX
 		    D-Link DUBE100
+		    Hawking UF200
+		    Intellinet USB 2.0 to Ethernet (rev A)
 		    LinkSys USB200M
 		    Netgear FA120
 		    Sitecom LN-029
 		    SnapPort USB 2.0 LAN Adapter
+		    ST Lab USB 2.0 Fast Ethernet
+		    Surecom EP-1427X-2
 		    System TALKS SGC-X2UL
+		    TRENDnet TU2-ET100
 		CATC USB-EL1210A-based USB adapters, including:
 		    CATC Netmate and Netmate II
 		    Belkin F5U011/F5U111
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 15c8b20eb74..e5416b27eb4 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.177 2005/02/12 05:44:46 jsg Exp $
+dnl	$OpenBSD: hardware,v 1.178 2005/02/12 10:21:04 jsg Exp $
 OpenBSD/MACHINE OSREV works across a broad range of standard PCs and
 clones, with a wide variety of processors and I/O bus architectures.  It
 can be expected to install and run with minimal difficulties on most
@@ -333,14 +333,21 @@ Supported hardware {:-include-:}:
 		    SMC EZ Connect USB
 		    SOHOware NUB100
 		ASIX Electronics AX88172 USB Ethernet adapters, including:
+		    ATEN UC210T
+		    Billionton Systems USB2AR
 		    Buffalo(MELCO) LUA-U2-KTX
 		    Corega FEther USB2-TX
 		    D-Link DUBE100
+		    Hawking UF200
+		    Intellinet USB 2.0 to Ethernet (rev A)
 		    LinkSys USB200M
 		    Netgear FA120
 		    Sitecom LN-029
 		    SnapPort USB 2.0 LAN Adapter
+		    ST Lab USB 2.0 Fast Ethernet
+		    Surecom EP-1427X-2
 		    System TALKS SGC-X2UL
+		    TRENDnet TU2-ET100
 		AMD LANCE and PCnet-based ISA Ethernet adapters, including: [B]
 		    Novell NE1500T
 		    Novell NE2100
diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware
index ec5f333ee91..e9e83f796f4 100644
--- a/distrib/notes/sparc64/hardware
+++ b/distrib/notes/sparc64/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.81 2005/02/12 05:44:46 jsg Exp $
+dnl	$OpenBSD: hardware,v 1.82 2005/02/12 10:21:05 jsg Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- SBUS based workstations:
 		Ultra 1
@@ -139,14 +139,21 @@ dnl		PCI Alteon Tigon I/II PCI Gigabit Ethernet boards (ti)
 		    SMC EZ Connect USB
 		    SOHOware NUB100
 		ASIX Electronics AX88172 USB Ethernet adapters, including:
+		    ATEN UC210T
+		    Billionton Systems USB2AR
 		    Buffalo(MELCO) LUA-U2-KTX
 		    Corega FEther USB2-TX
 		    D-Link DUBE100
+		    Hawking UF200
+		    Intellinet USB 2.0 to Ethernet (rev A)
 		    LinkSys USB200M
 		    Netgear FA120
 		    Sitecom LN-029
 		    SnapPort USB 2.0 LAN Adapter
+		    ST Lab USB 2.0 Fast Ethernet
+		    Surecom EP-1427X-2
 		    System TALKS SGC-X2UL
+		    TRENDnet TU2-ET100
 		CATC USB-EL1210A-based USB adapters, including:
 		    CATC Netmate and Netmate II
 		    Belkin F5U011/F5U111
diff --git a/share/man/man4/axe.4 b/share/man/man4/axe.4
index 2c0e3f31871..a33d500c0a0 100644
--- a/share/man/man4/axe.4
+++ b/share/man/man4/axe.4
@@ -29,7 +29,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/axe.4,v 1.3 2003/05/29 21:28:35 ru Exp $
-.\" $OpenBSD: axe.4,v 1.12 2005/02/05 23:58:17 jsg Exp $
+.\" $OpenBSD: axe.4,v 1.13 2005/02/12 10:21:04 jsg Exp $
 .\"
 .Dd April 20, 2003
 .Dt AXE 4
@@ -47,14 +47,21 @@ driver provides support for USB Ethernet adapters based on the ASIX
 Electronics AX88172 USB 2.0 chipset, including the following:
 .Pp
 .Bl -tag -width Ds -offset indent -compact
+.It ATEN UC210T
+.It Billionton Systems USB2AR
 .It Buffalo(MELCO) LUA-U2-KTX
 .It Corega FEther USB2-TX
 .It D-Link DUBE100
+.It Hawking UF200
+.It Intellinet USB 2.0 to Ethernet (rev A)
 .It LinkSys USB200M
 .It Netgear FA120
 .It Sitecom LN-029
 .It SnapPort USB 2.0 LAN Adapter
+.It ST Lab USB 2.0 Fast Ethernet
+.It Surecom EP-1427X-2
 .It System TALKS SGC-X2UL
+.It TRENDnet TU2-ET100
 .El
 .Pp
 The AX88172 is a USB 2.0 device which contains a 10/100
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 59888aa212e..1fd1662a3df 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axe.c,v 1.22 2005/01/03 22:45:52 brad Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.23 2005/02/12 10:21:04 jsg Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -156,8 +156,12 @@ int	axedebug = 0;
  * Various supported device vendors/products.
  */
 Static const struct axe_type axe_devs[] = {
+	{ { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UF200}, 0 },
+	{ { USB_VENDOR_ACERCM, USB_PRODUCT_ACERCM_EP1427X2}, 0 },
 	{ { USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172}, 0 },
+	{ { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC210T}, 0 },
 	{ { USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_SNAPPORT}, 0 },
+	{ { USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB2AR}, 0},
 	{ { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB2_TX }, 0},
 	{ { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100}, 0 },
 	{ { USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M}, 0 },