summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>1997-03-25 03:13:05 +0000
committerache <ache@FreeBSD.org>1997-03-25 03:13:05 +0000
commit0b0ae0cc74d7be9e07e13301a81f830dd2f9896e (patch)
tree2c873430831cec537e5923cd8434cfab787601e3 /sys
parentadeb640108cb8124d6d694c647a639eae7685f86 (diff)
downloadFreeBSD-src-0b0ae0cc74d7be9e07e13301a81f830dd2f9896e.zip
FreeBSD-src-0b0ae0cc74d7be9e07e13301a81f830dd2f9896e.tar.gz
Follow config intention for iobase:
print "at <not configured>" for iobase == -1 (autodetect not happens) and not print anything for iobase == -2 (none) Old code treat this two special config numbers as big port numbers.
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/isa/isa.c21
-rw-r--r--sys/i386/isa/isa.c21
2 files changed, 26 insertions, 16 deletions
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 0b49bba..a563b89 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $Id$
+ * $Id: isa.c,v 1.77 1997/02/22 09:36:40 peter Exp $
*/
/*
@@ -393,11 +393,15 @@ config_isadev_c(isdp, mp, reconfig)
if (!isdp->id_reconfig) {
printf("%s%d", dp->name, isdp->id_unit);
if (id_alive != -1) {
- printf(" at 0x%x", isdp->id_iobase);
- if (isdp->id_iobase + id_alive - 1 !=
- isdp->id_iobase) {
- printf("-0x%x",
- isdp->id_iobase + id_alive - 1);
+ if (isdp->id_iobase == -1)
+ printf(" at <not configured>");
+ else if (isdp->id_iobase != -2) {
+ printf(" at 0x%x", isdp->id_iobase);
+ if (isdp->id_iobase + id_alive - 1 !=
+ isdp->id_iobase) {
+ printf("-0x%x",
+ isdp->id_iobase + id_alive - 1);
+ }
}
}
if (isdp->id_irq)
@@ -450,9 +454,10 @@ config_isadev_c(isdp, mp, reconfig)
if (!isdp->id_reconfig) {
printf("%s%d not found",
dp->name, isdp->id_unit);
- if (isdp->id_iobase) {
+ if (isdp->id_iobase == -1)
+ printf(" at <not configured>");
+ else if (isdp->id_iobase != -2)
printf(" at 0x%x", isdp->id_iobase);
- }
printf("\n");
}
}
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 0b49bba..a563b89 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $Id$
+ * $Id: isa.c,v 1.77 1997/02/22 09:36:40 peter Exp $
*/
/*
@@ -393,11 +393,15 @@ config_isadev_c(isdp, mp, reconfig)
if (!isdp->id_reconfig) {
printf("%s%d", dp->name, isdp->id_unit);
if (id_alive != -1) {
- printf(" at 0x%x", isdp->id_iobase);
- if (isdp->id_iobase + id_alive - 1 !=
- isdp->id_iobase) {
- printf("-0x%x",
- isdp->id_iobase + id_alive - 1);
+ if (isdp->id_iobase == -1)
+ printf(" at <not configured>");
+ else if (isdp->id_iobase != -2) {
+ printf(" at 0x%x", isdp->id_iobase);
+ if (isdp->id_iobase + id_alive - 1 !=
+ isdp->id_iobase) {
+ printf("-0x%x",
+ isdp->id_iobase + id_alive - 1);
+ }
}
}
if (isdp->id_irq)
@@ -450,9 +454,10 @@ config_isadev_c(isdp, mp, reconfig)
if (!isdp->id_reconfig) {
printf("%s%d not found",
dp->name, isdp->id_unit);
- if (isdp->id_iobase) {
+ if (isdp->id_iobase == -1)
+ printf(" at <not configured>");
+ else if (isdp->id_iobase != -2)
printf(" at 0x%x", isdp->id_iobase);
- }
printf("\n");
}
}
OpenPOWER on IntegriCloud