summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2003-10-01 23:37:13 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2003-10-01 23:37:13 +0000
commit0cfbafec03b4d0927fce8bbcbd63b598e42f8cc4 (patch)
tree519aa48b81c87fbb5a211528a7a4d25e1875f6f3
parentd1486aa9ec48d0aaa42dd64dec3117fb54bc6482 (diff)
it turned that only adding the cardbus part was not enough to have
D-Link DFE690 working. add the missing bits here. from Joshua Johnson <joshua.johnson at charter dot net>.
-rw-r--r--sys/dev/ic/rtl81x9.c6
-rw-r--r--sys/dev/ic/rtl81x9reg.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index 529926a1cf4..6d4844ce1ac 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtl81x9.c,v 1.20 2003/02/11 19:20:27 mickey Exp $ */
+/* $OpenBSD: rtl81x9.c,v 1.21 2003/10/01 23:37:12 fgsch Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -1219,8 +1219,8 @@ rl_attach(sc)
rl_read_eeprom(sc, (caddr_t)&rl_did, RL_EE_PCI_DID, addr_len, 1, 0);
if (rl_did == RT_DEVICEID_8139 || rl_did == ACCTON_DEVICEID_5030 ||
- rl_did == DELTA_DEVICEID_8139 || rl_did == ADDTRON_DEVICEID_8139
- || rl_did == DLINK_DEVICEID_8139)
+ rl_did == DELTA_DEVICEID_8139 || rl_did == ADDTRON_DEVICEID_8139 ||
+ rl_did == DLINK_DEVICEID_8139 || rl_did == DLINK_DEVICEID_8139_2)
sc->rl_type = RL_8139;
else if (rl_did == RT_DEVICEID_8129)
sc->rl_type = RL_8129;
diff --git a/sys/dev/ic/rtl81x9reg.h b/sys/dev/ic/rtl81x9reg.h
index 58b475dfbba..2433383d497 100644
--- a/sys/dev/ic/rtl81x9reg.h
+++ b/sys/dev/ic/rtl81x9reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtl81x9reg.h,v 1.7 2002/10/15 16:02:10 mickey Exp $ */
+/* $OpenBSD: rtl81x9reg.h,v 1.8 2003/10/01 23:37:12 fgsch Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -442,6 +442,7 @@ struct rl_softc {
/* D-Link device IDs */
#define DLINK_DEVICEID_8139 0x1300
+#define DLINK_DEVICEID_8139_2 0x1340
/*
* PCI low memory base and low I/O base register, and