diff options
Diffstat (limited to 'sys/dev/pcmcia')
| -rw-r--r-- | sys/dev/pcmcia/com_pcmcia.c | 5 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_ep_pcmcia.c | 9 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmcia_cis_quirks.c | 6 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmciadevs | 3 |
4 files changed, 17 insertions, 6 deletions
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c index 473078498e3..d720ec558d3 100644 --- a/sys/dev/pcmcia/com_pcmcia.c +++ b/sys/dev/pcmcia/com_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_pcmcia.c,v 1.18 1999/08/12 09:02:58 niklas Exp $ */ +/* $OpenBSD: com_pcmcia.c,v 1.19 1999/08/14 05:47:41 fgsch Exp $ */ /* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */ /*- @@ -365,7 +365,8 @@ com_pcmcia_enable1(sc) return(ret); if ((psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3C562) || - (psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3CXEM556)) { + (psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3CXEM556) || + (psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3CXEM556B)) { int reg; /* turn off the ethernet-disable bit */ diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c index ae024322fab..78ab0e8d2ab 100644 --- a/sys/dev/pcmcia/if_ep_pcmcia.c +++ b/sys/dev/pcmcia/if_ep_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_pcmcia.c,v 1.16 1999/08/08 01:17:23 niklas Exp $ */ +/* $OpenBSD: if_ep_pcmcia.c,v 1.17 1999/08/14 05:47:41 fgsch Exp $ */ /* $NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $ */ /*- @@ -159,6 +159,10 @@ struct ep_pcmcia_product { 0, 0, PCMCIA_STR_3COM_3CXEM556 }, + { PCMCIA_PRODUCT_3COM_3CXEM556B,EP_CHIPSET_3C509, + 0, 0, + PCMCIA_STR_3COM_3CXEM556B }, + #ifdef notyet { PCMCIA_PRODUCT_3COM_3C574, EP_CHIPSET_BOOMERANG, EP_FLAGS_MII, 0, @@ -232,7 +236,8 @@ ep_pcmcia_enable1(sc) return (ret); if ((psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3C562) || - (psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3CXEM556)) { + (psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3CXEM556) || + (psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3CXEM556B)) { int reg; /* turn off the serial-disable bit */ diff --git a/sys/dev/pcmcia/pcmcia_cis_quirks.c b/sys/dev/pcmcia/pcmcia_cis_quirks.c index 3947632c74b..d3a408caa9d 100644 --- a/sys/dev/pcmcia/pcmcia_cis_quirks.c +++ b/sys/dev/pcmcia/pcmcia_cis_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcmcia_cis_quirks.c,v 1.1 1999/01/28 04:58:31 fgsch Exp $ */ +/* $OpenBSD: pcmcia_cis_quirks.c,v 1.2 1999/08/14 05:47:41 fgsch Exp $ */ /* $NetBSD: pcmcia_cis_quirks.c,v 1.3 1998/12/29 09:00:28 marc Exp $ */ /* @@ -116,6 +116,10 @@ static struct pcmcia_cis_quirk pcmcia_cis_quirks[] = { &pcmcia_3cxem556_func0, &pcmcia_3cxem556_func0_cfe0 }, { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556, PCMCIA_CIS_INVALID, &pcmcia_3cxem556_func1, &pcmcia_3cxem556_func1_cfe0 }, + { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556B, PCMCIA_CIS_INVALID, + &pcmcia_3cxem556_func0, &pcmcia_3cxem556_func0_cfe0 }, + { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556B, PCMCIA_CIS_INVALID, + &pcmcia_3cxem556_func1, &pcmcia_3cxem556_func1_cfe0 }, { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_SVEC_LANCARD, &pcmcia_sveclancard_func0, &pcmcia_sveclancard_func0_cfe0 }, }; diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs index 0a74b3f7639..54d3ee0f551 100644 --- a/sys/dev/pcmcia/pcmciadevs +++ b/sys/dev/pcmcia/pcmciadevs @@ -1,4 +1,4 @@ - $OpenBSD: pcmciadevs,v 1.19 1999/08/13 21:10:48 deraadt Exp $ + $OpenBSD: pcmciadevs,v 1.20 1999/08/14 05:47:41 fgsch Exp $ /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */ /* @@ -78,6 +78,7 @@ product ADAPTEC APA1460_2 0x0002 Adaptec APA-1460/B SCSI Host Adapter product BREEZECOM BREEZENET 0x0102 BreezeCOM BreezeNET IEEE 802.11 FHSS /* 3COM Products */ +product 3COM 3CXEM556B 0x003d 3Com/Megahertz 3CXEM556B-INT Ethernet/Modem product 3COM 3CXEM556 0x0035 3Com/Megahertz 3CXEM556 Ethernet/Modem product 3COM 3C562 0x0562 3Com 3c562 33.6 Modem/10Mbps Ethernet product 3COM 3C589 0x0589 3Com 3c589 |