summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdodd <mdodd@FreeBSD.org>2000-01-23 08:46:21 +0000
committermdodd <mdodd@FreeBSD.org>2000-01-23 08:46:21 +0000
commitaacbc50c12f2b0dd1ad60459b29889bdddb90e3d (patch)
treeb76cc1d2d3fde4fd78166ef5e1c50ff045c91b16
parent48769ea871efb3220ebb00766ff84b1181cdd8ba (diff)
downloadFreeBSD-src-aacbc50c12f2b0dd1ad60459b29889bdddb90e3d.zip
FreeBSD-src-aacbc50c12f2b0dd1ad60459b29889bdddb90e3d.tar.gz
Fix a bug in the last commit. >> 4 instead of >> 8. *bap*
Fix a long-standing bug where I used a 'break;' instead of a 'continue;'; you had to have multiple ISA boards in non-PnP mode with an 'unknown' board with a lower MAC address to find this one. Since I have 4 3c5x9 boards in my test box I was somewhat confused when this happened. :) Make the messages printed by ep_isa_identify() a little more consistent; we'll only see them in verbose boot mode but it makes me feel better if they look nice.
-rw-r--r--sys/dev/ep/if_ep_isa.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ep/if_ep_isa.c b/sys/dev/ep/if_ep_isa.c
index 6eb257f..a4e9ac6 100644
--- a/sys/dev/ep/if_ep_isa.c
+++ b/sys/dev/ep/if_ep_isa.c
@@ -139,7 +139,7 @@ ep_isa_match_id (id, isa_devs)
* return something so that it will work; be annoying
* so that the user will tell us about it though.
*/
- if ((id >> 8) == ISA_ID_3C509_XXX) {
+ if ((id >> 4) == ISA_ID_3C509_XXX) {
return ("Unknown 3c509; notify maintainer!");
}
return (NULL);
@@ -211,7 +211,7 @@ ep_isa_identify (driver_t *driver, device_t parent)
device_printf(parent, "if_ep: unknown ID 0x%08x\n",
isa_id);
}
- break;
+ continue;
}
/* Retreive IRQ */
@@ -232,8 +232,8 @@ ep_isa_identify (driver_t *driver, device_t parent)
data = get_eeprom_data(ELINK_ID_PORT, EEPROM_INT_CONFIG_1);
if (data & ICW1_IAS_PNP) {
if (bootverbose) {
- device_printf(parent, "if_ep: Adapter at 0x%03x in PnP mode!\n",
- ioport);
+ device_printf(parent, "if_ep: <%s> at 0x%03x in PnP mode!\n",
+ desc, ioport);
}
/* Set the adaptor tag so that the next card can be found. */
outb(ELINK_ID_PORT, tag--);
@@ -251,8 +251,8 @@ ep_isa_identify (driver_t *driver, device_t parent)
outw(ioport + EP_COMMAND, WINDOW_SELECT | 0);
data = inw(ioport + EP_W0_EEPROM_COMMAND);
if (data & EEPROM_TST_MODE) {
- device_printf(parent, "if_ep: Adapter at 0x%03x in TEST mode! Erase pencil mark.\n",
- ioport);
+ device_printf(parent, "if_ep: <%s> at port 0x%03x in TEST mode! Erase pencil mark.\n",
+ desc, ioport);
continue;
}
OpenPOWER on IntegriCloud