diff options
| author | Paul Saab <ps@FreeBSD.org> | 2000-06-18 05:50:16 +0000 |
|---|---|---|
| committer | Paul Saab <ps@FreeBSD.org> | 2000-06-18 05:50:16 +0000 |
| commit | 9e672f19b50b770adf1c3b8fce8305ba82b8c2dd (patch) | |
| tree | 7d47fc8441237a37a8b6f2911af4005fe2ff9961 | |
| parent | 7013252cf883a3a8a529b6b6eee2e2036129a325 (diff) | |
Notes
| -rw-r--r-- | sys/dev/ed/if_ed.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index bc5c07785d81..4e55f3707594 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -1006,18 +1006,16 @@ ed_probe_Novell_generic(dev, port_rid, flags) ed_pio_writemem(sc, test_pattern, 8192, sizeof(test_pattern)); ed_pio_readmem(sc, 8192, test_buffer, sizeof(test_pattern)); - if (bcmp(test_pattern, test_buffer, sizeof(test_pattern)) == 0) { - /* could be either an NE1000 or a Linksys ethernet controller */ - linksys = ed_get_Linksys(sc); - if (linksys) { - outb(sc->nic_addr + ED_P0_DCR, ED_DCR_WTS | ED_DCR_FT1 | ED_DCR_LS); - sc->isa16bit = 1; - sc->type = ED_TYPE_NE2000; - sc->type_str = "Linksys"; - } else { - sc->type = ED_TYPE_NE1000; - sc->type_str = "NE1000"; - } + /* Check for Linksys first. */ + linksys = ed_get_Linksys(sc); + if (linksys) { + outb(sc->nic_addr + ED_P0_DCR, ED_DCR_WTS | ED_DCR_FT1 | ED_DCR_LS); + sc->isa16bit = 1; + sc->type = ED_TYPE_NE2000; + sc->type_str = "Linksys"; + } else if (bcmp(test_pattern, test_buffer, sizeof(test_pattern)) == 0) { + sc->type = ED_TYPE_NE1000; + sc->type_str = "NE1000"; } else { /* neither an NE1000 nor a Linksys - try NE2000 */ |