diff options
| author | dg <dg@FreeBSD.org> | 1995-11-15 07:45:56 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1995-11-15 07:45:56 +0000 |
| commit | 3a54d792b99d7661ec7d2f2c0d85bfa9951482f4 (patch) | |
| tree | cec532b65ca9295e77d7653d0d623e68657de6a1 /sys/dev/ed | |
| parent | b8666f3ff54a9bcfe568d6c2fd4d51648ce6a439 (diff) | |
| download | FreeBSD-src-3a54d792b99d7661ec7d2f2c0d85bfa9951482f4.zip FreeBSD-src-3a54d792b99d7661ec7d2f2c0d85bfa9951482f4.tar.gz | |
Correct the bogus probe for 8216/8416 cards...it was broken.
Submitted by: Steve Piette <steve@simon.chi.il.US>
Diffstat (limited to 'sys/dev/ed')
| -rw-r--r-- | sys/dev/ed/if_ed.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 7af27f4..62ab975 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/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.83 1995/10/31 18:41:08 phk Exp $ + * $Id: if_ed.c,v 1.84 1995/11/04 17:07:20 bde Exp $ */ #include "ed.h" @@ -508,25 +508,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); @@ -541,9 +532,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; } |
