diff options
| author | David Greenman <dg@FreeBSD.org> | 1995-11-15 07:46:35 +0000 |
|---|---|---|
| committer | David Greenman <dg@FreeBSD.org> | 1995-11-15 07:46:35 +0000 |
| commit | 26f0d64ac25ef175ec731bc948f08bf870579cc2 (patch) | |
| tree | 36edfd9d09bed0035e6121a4f05201c43a707409 | |
| parent | a0ca111e06ebc78881a9c98a50c78badea7f0e99 (diff) | |
Notes
| -rw-r--r-- | sys/i386/isa/if_ed.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index f5086fddb718..fa10e60c51d4 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -13,7 +13,7 @@ * the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000, * and a variety of similar clones. * - * $Id: if_ed.c,v 1.73.4.1 1995/07/28 12:18:39 davidg Exp $ + * $Id: if_ed.c,v 1.73.4.2 1995/09/12 06:12:23 davidg Exp $ */ #include "ed.h" @@ -390,25 +390,16 @@ ed_probe_WD80x3(isa_dev) isa16bit = 1; break; case ED_TYPE_SMC8216C: /* 8216 has 16K shared mem -- 8416 has 8K */ - (unsigned int) *(isa_dev->id_maddr+8192) = (unsigned int)0; - if ((unsigned int) *(isa_dev->id_maddr+8192)) { - sc->type_str = "SMC8416C/SMC8416BT"; - sc->kdc.kdc_description = - "Ethernet adapter: SMC 8416C or 8416BT"; - memsize = 8192; - } else { + case ED_TYPE_SMC8216T: + if (sc->type = ED_TYPE_SMC8216C) { sc->type_str = "SMC8216/SMC8216C"; sc->kdc.kdc_description = "Ethernet adapter: SMC 8216 or 8216C"; - memsize = 16384; + } else { + sc->type_str = "SMC8216T"; + sc->kdc.kdc_description = + "Ethernet adapter: SMC 8216T"; } - isa16bit = 1; - sc->is790 = 1; - break; - case ED_TYPE_SMC8216T: - sc->type_str = "SMC8216T"; - sc->kdc.kdc_description = - "Ethernet adapter: SMC 8216T"; outb(sc->asic_addr + ED_WD790_HWR, inb(sc->asic_addr + ED_WD790_HWR) | ED_WD790_HWR_SWH); @@ -423,9 +414,16 @@ ed_probe_WD80x3(isa_dev) memsize = 16384; break; case ED_WD790_RAR_SZ8: - sc->type_str = "SMC8416T"; - sc->kdc.kdc_description = - "Ethernet adapter: SMC 8416T"; + /* 8216 has 16K shared mem -- 8416 has 8K */ + if (sc->type = ED_TYPE_SMC8216C) { + sc->type_str = "SMC8416C/SMC8416BT"; + sc->kdc.kdc_description = + "Ethernet adapter: SMC 8416C or 8416BT"; + } else { + sc->type_str = "SMC8416T"; + sc->kdc.kdc_description = + "Ethernet adapter: SMC 8416T"; + } memsize = 8192; break; } |