diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-06-09 00:45:26 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-06-09 00:45:26 +0000 |
| commit | ad3b82873cd8f1fee5d5dfd5f79ddbb055fe063e (patch) | |
| tree | 04165b38d76417594f6d7a5b37f08d7fc9701d34 | |
| parent | 710b73ded0c2dd4f503f9440532611f7dd845e23 (diff) | |
Add support for 3c656, which is just the 3c575 + 56k modem. Thanks to
xav@quakeserver.org for testing.
| -rw-r--r-- | sys/dev/cardbus/com_cardbus.c | 4 | ||||
| -rw-r--r-- | sys/dev/cardbus/if_xl_cardbus.c | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c index 11734204620..fd776155719 100644 --- a/sys/dev/cardbus/com_cardbus.c +++ b/sys/dev/cardbus/com_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_cardbus.c,v 1.1 2000/05/15 06:26:58 niklas Exp $ */ +/* $OpenBSD: com_cardbus.c,v 1.2 2000/06/09 00:45:25 aaron Exp $ */ /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */ /* @@ -125,6 +125,8 @@ static struct csdev { CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO }, { CARDBUS_VENDOR_INTEL, CARDBUS_PRODUCT_INTEL_MODEM56, CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO } + { CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_MODEM56, + CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO } }; static const int ncsdevs = sizeof(csdevs) / sizeof(csdevs[0]); diff --git a/sys/dev/cardbus/if_xl_cardbus.c b/sys/dev/cardbus/if_xl_cardbus.c index d24fd484f94..c9aacf41c41 100644 --- a/sys/dev/cardbus/if_xl_cardbus.c +++ b/sys/dev/cardbus/if_xl_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xl_cardbus.c,v 1.1 2000/04/08 05:50:52 aaron Exp $ */ +/* $OpenBSD: if_xl_cardbus.c,v 1.2 2000/06/09 00:45:25 aaron Exp $ */ /* $NetBSD: if_xl_cardbus.c,v 1.13 2000/03/07 00:32:52 mycroft Exp $ */ /* @@ -156,6 +156,13 @@ const struct xl_cardbus_product { XL_3C575B, "3c575C-TX Ethernet" }, + { CARDBUS_PRODUCT_3COM_3CCFE656B, + /* XL_CONF_90XB|XL_CONF_MII, */ 0, + CARDBUS_COMMAND_IO_ENABLE | CARDBUS_COMMAND_MEM_ENABLE | + CARDBUS_COMMAND_MASTER_ENABLE, + XL_3C575B, + "3c656-TX Ethernet" }, + { 0, 0, 0, |