diff options
| author | peter <peter@FreeBSD.org> | 1999-09-13 19:14:43 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-09-13 19:14:43 +0000 |
| commit | 1ee886d2fdc5ab4886746eefebad1385ee314cda (patch) | |
| tree | 7bf5e116e915883c8901e975a1decc303b094ab2 /sys | |
| parent | e2715abf6606c5df936aca4b441fbf1c92f17b01 (diff) | |
| download | FreeBSD-src-1ee886d2fdc5ab4886746eefebad1385ee314cda.zip FreeBSD-src-1ee886d2fdc5ab4886746eefebad1385ee314cda.tar.gz | |
The sense of probes has inverted. They return an error, rather than
true/false. Fix ed_probe_HP_pclanp() so that it doesn't "succeed" on
non-existing hardware.
Submitted by: Mark Hittinger <bugs@freebsd.netcom.com>
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ed/if_ed.c | 14 | ||||
| -rw-r--r-- | sys/i386/isa/if_ed.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 78fe9ee..42537ab 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -1386,7 +1386,7 @@ ed_probe_HP_pclanp(dev) (inb(sc->asic_addr + ED_HPP_ID + 1) != 0x48) || ((inb(sc->asic_addr + ED_HPP_ID + 2) & 0xF0) != 0) || (inb(sc->asic_addr + ED_HPP_ID + 3) != 0x53)) - return 0; + return ENXIO; /* * Read the MAC address and verify checksum on the address. @@ -1400,7 +1400,7 @@ ed_probe_HP_pclanp(dev) checksum += inb(sc->asic_addr + ED_HPP_MAC_ADDR + ETHER_ADDR_LEN); if (checksum != 0xFF) - return 0; + return ENXIO; /* * Verify that the software model number is 0. @@ -1409,7 +1409,7 @@ ed_probe_HP_pclanp(dev) outw(sc->asic_addr + ED_HPP_PAGING, ED_HPP_PAGE_ID); if (((sc->hpp_id = inw(sc->asic_addr + ED_HPP_PAGE_4)) & ED_HPP_ID_SOFT_MODEL_MASK) != 0x0000) - return 0; + return ENXIO; /* * Read in and save the current options configured on card. @@ -1440,7 +1440,7 @@ ed_probe_HP_pclanp(dev) DELAY(5000); if (!(inb(sc->nic_addr + ED_P0_ISR) & ED_ISR_RST)) - return 0; /* reset did not complete */ + return ENXIO; /* reset did not complete */ /* * Read out configuration information. @@ -1455,7 +1455,7 @@ ed_probe_HP_pclanp(dev) */ if (irq >= (sizeof(ed_hpp_intr_val) / sizeof(ed_hpp_intr_val[0]))) - return 0; + return ENXIO; /* * If the kernel IRQ was specified with a '?' use the cards idea @@ -1520,7 +1520,7 @@ ed_probe_HP_pclanp(dev) return (error); if (mem_addr != conf_maddr) - return 0; + return ENXIO; error = ed_alloc_memory(dev, 0, memsize); if (error) @@ -1608,7 +1608,7 @@ ed_probe_HP_pclanp(dev) if (bcmp(test_pattern, test_buffer, sizeof(test_pattern))) - return 0; + return ENXIO; } return (ED_HPP_IO_PORTS); diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index 78fe9ee..42537ab 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -1386,7 +1386,7 @@ ed_probe_HP_pclanp(dev) (inb(sc->asic_addr + ED_HPP_ID + 1) != 0x48) || ((inb(sc->asic_addr + ED_HPP_ID + 2) & 0xF0) != 0) || (inb(sc->asic_addr + ED_HPP_ID + 3) != 0x53)) - return 0; + return ENXIO; /* * Read the MAC address and verify checksum on the address. @@ -1400,7 +1400,7 @@ ed_probe_HP_pclanp(dev) checksum += inb(sc->asic_addr + ED_HPP_MAC_ADDR + ETHER_ADDR_LEN); if (checksum != 0xFF) - return 0; + return ENXIO; /* * Verify that the software model number is 0. @@ -1409,7 +1409,7 @@ ed_probe_HP_pclanp(dev) outw(sc->asic_addr + ED_HPP_PAGING, ED_HPP_PAGE_ID); if (((sc->hpp_id = inw(sc->asic_addr + ED_HPP_PAGE_4)) & ED_HPP_ID_SOFT_MODEL_MASK) != 0x0000) - return 0; + return ENXIO; /* * Read in and save the current options configured on card. @@ -1440,7 +1440,7 @@ ed_probe_HP_pclanp(dev) DELAY(5000); if (!(inb(sc->nic_addr + ED_P0_ISR) & ED_ISR_RST)) - return 0; /* reset did not complete */ + return ENXIO; /* reset did not complete */ /* * Read out configuration information. @@ -1455,7 +1455,7 @@ ed_probe_HP_pclanp(dev) */ if (irq >= (sizeof(ed_hpp_intr_val) / sizeof(ed_hpp_intr_val[0]))) - return 0; + return ENXIO; /* * If the kernel IRQ was specified with a '?' use the cards idea @@ -1520,7 +1520,7 @@ ed_probe_HP_pclanp(dev) return (error); if (mem_addr != conf_maddr) - return 0; + return ENXIO; error = ed_alloc_memory(dev, 0, memsize); if (error) @@ -1608,7 +1608,7 @@ ed_probe_HP_pclanp(dev) if (bcmp(test_pattern, test_buffer, sizeof(test_pattern))) - return 0; + return ENXIO; } return (ED_HPP_IO_PORTS); |
