summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2000-10-26 22:37:05 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2000-10-26 22:37:05 +0000
commit2a37c9b9157c4fc889f5021644c4d729ecd57bb1 (patch)
tree08c8df39cca5604b4efdaf18267bbe0f33d80962
parent5b2f74ce3263cbc382af86660075dddff184e106 (diff)
Add support for ADMtek AN985 Centaur-C CardBus Ethernet interfaces. Thanks for
ADMtek for sending me a couple demo boards.
-rw-r--r--share/man/man4/cardbus.44
-rw-r--r--share/man/man4/dc.46
-rw-r--r--sys/dev/cardbus/if_dc_cardbus.c10
3 files changed, 15 insertions, 5 deletions
diff --git a/share/man/man4/cardbus.4 b/share/man/man4/cardbus.4
index b6513310c86..11bd091ca8f 100644
--- a/share/man/man4/cardbus.4
+++ b/share/man/man4/cardbus.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cardbus.4,v 1.7 2000/10/26 21:04:39 aaron Exp $
+.\" $OpenBSD: cardbus.4,v 1.8 2000/10/26 22:37:04 aaron Exp $
.\" $NetBSD: cardbus.4,v 1.4 2000/02/02 19:57:17 augustss Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -69,6 +69,8 @@ drivers, sorted by function and driver name:
.Ss Network interfaces
.Bl -tag -width speaker -offset ind -compact
.It Xr dc 4
+ADMtek AN985 Centaur-C CardBus Ethernet interfaces.
+.It Xr dc 4
Xircom X3201-based CardBus Ethernet interfaces.
.It Xr fxp 4
Intel PRO/100 CardBus II Ethernet interfaces.
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index a6a3e353976..0e2860d8b75 100644
--- a/share/man/man4/dc.4
+++ b/share/man/man4/dc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dc.4,v 1.12 2000/10/26 21:04:39 aaron Exp $
+.\" $OpenBSD: dc.4,v 1.13 2000/10/26 22:37:03 aaron Exp $
.\"
.\" Copyright (c) 1997, 1998, 1999
.\" Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -56,7 +56,7 @@ Davicom DM9100, DM9102, and DM9102A
.It
ASIX Electronics AX88140A and AX88141
.It
-ADMtek AL981 Comet and AN983 Centaur-P
+ADMtek AL981 Comet PCI, AN983 Centaur-P PCI, and AN985 Centaur-C CardBus
.It
Lite-On 82c168 and 82c169 PNIC
.It
@@ -132,7 +132,7 @@ CNet Pro110B (ASIX AX88140A)
.It
LinkSys LNE100TX v4.x (ADMtek AN983 Centaur-P)
.It
-All Xircom CardBus PC Cards, including RealPort models
+Xircom X3201-based CardBus PC Cards, including RealPort models
.El
.Pp
The
diff --git a/sys/dev/cardbus/if_dc_cardbus.c b/sys/dev/cardbus/if_dc_cardbus.c
index 7d842642bc8..bb2e892213b 100644
--- a/sys/dev/cardbus/if_dc_cardbus.c
+++ b/sys/dev/cardbus/if_dc_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_dc_cardbus.c,v 1.1 2000/10/26 20:50:44 aaron Exp $ */
+/* $OpenBSD: if_dc_cardbus.c,v 1.2 2000/10/26 22:37:04 aaron Exp $ */
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,6 +66,7 @@ struct cfattach dc_cardbus_ca = {
struct dc_type dc_cardbus_devs[] = {
{ PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21142 },
{ PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_X3201_3_21143 },
+ { PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_AN985 },
{ 0 }
};
@@ -128,6 +129,13 @@ dc_cardbus_attach(parent, self, aux)
sizeof sc->arpcom.ac_enaddr);
}
break;
+ case PCI_VENDOR_ADMTEK:
+ if (PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_ADMTEK_AN985) {
+ sc->dc_type = DC_TYPE_AN983;
+ sc->dc_flags |= DC_TX_USE_TX_INTR|DC_TX_ADMTEK_WAR;
+ sc->dc_pmode = DC_PMODE_MII;
+ }
+ break;
default:
printf(": unknown device\n");
return;