Repair probe messages a bit. Previously, we'd print the ethernet
address, and additional information. Then the printing of the ethernet address was moved into ether_attach, and so we were printing orphaned information about the card. Now the probe message is prefixed by edX:. Prepare for it to move under bootverbose, but don't move it there yet (the || 1 trick).
This commit is contained in:
parent
20b49aeb76
commit
960915d7da
@ -1756,22 +1756,25 @@ ed_attach(dev)
|
||||
ether_ifattach(ifp, sc->arpcom.ac_enaddr);
|
||||
/* device attach does transition from UNCONFIGURED to IDLE state */
|
||||
|
||||
if (sc->type_str && (*sc->type_str != 0))
|
||||
printf("type %s ", sc->type_str);
|
||||
else
|
||||
printf("type unknown (0x%x) ", sc->type);
|
||||
if (bootverbose || 1) {
|
||||
if (sc->type_str && (*sc->type_str != 0))
|
||||
device_printf(dev, "type %s ", sc->type_str);
|
||||
else
|
||||
device_printf(dev, "type unknown (0x%x) ", sc->type);
|
||||
|
||||
if (sc->vendor == ED_VENDOR_HP)
|
||||
printf("(%s %s IO)", (sc->hpp_id & ED_HPP_ID_16_BIT_ACCESS) ?
|
||||
"16-bit" : "32-bit",
|
||||
sc->hpp_mem_start ? "memory mapped" : "regular");
|
||||
else
|
||||
printf("%s ", sc->isa16bit ? "(16 bit)" : "(8 bit)");
|
||||
|
||||
printf("%s\n", (((sc->vendor == ED_VENDOR_3COM) ||
|
||||
(sc->vendor == ED_VENDOR_HP)) &&
|
||||
(ifp->if_flags & IFF_ALTPHYS)) ? " tranceiver disabled" : "");
|
||||
if (sc->vendor == ED_VENDOR_HP)
|
||||
printf("(%s %s IO)",
|
||||
(sc->hpp_id & ED_HPP_ID_16_BIT_ACCESS) ?
|
||||
"16-bit" : "32-bit",
|
||||
sc->hpp_mem_start ? "memory mapped" : "regular");
|
||||
else
|
||||
printf("%s ", sc->isa16bit ? "(16 bit)" : "(8 bit)");
|
||||
|
||||
printf("%s\n", (((sc->vendor == ED_VENDOR_3COM) ||
|
||||
(sc->vendor == ED_VENDOR_HP)) &&
|
||||
(ifp->if_flags & IFF_ALTPHYS)) ?
|
||||
" tranceiver disabled" : "");
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user