From bb9c06c1ceaeeac79fb26acaa60d48d99da9d34e Mon Sep 17 00:00:00 2001 From: Mike Smith Date: Fri, 23 Jun 2000 08:19:50 +0000 Subject: [PATCH] Make the PnP 'slopsucker' quiet in the !bootverbose case - the real NPX probe happens much earlier, and may come to very different conclusions about the system's NPX setup. --- sys/amd64/amd64/fpu.c | 6 +++++- sys/amd64/isa/npx.c | 6 +++++- sys/i386/isa/npx.c | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 20cd19ee06e..637853e2526 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -939,7 +939,11 @@ static struct isa_pnp_id npxisa_ids[] = { static int npxisa_probe(device_t dev) { - return (ISA_PNP_PROBE(device_get_parent(dev), dev, npxisa_ids)); + int result; + if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, npxisa_ids)) <= 0) { + device_quiet(dev); + } + return(result); } static int diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c index 20cd19ee06e..637853e2526 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/isa/npx.c @@ -939,7 +939,11 @@ static struct isa_pnp_id npxisa_ids[] = { static int npxisa_probe(device_t dev) { - return (ISA_PNP_PROBE(device_get_parent(dev), dev, npxisa_ids)); + int result; + if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, npxisa_ids)) <= 0) { + device_quiet(dev); + } + return(result); } static int diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 20cd19ee06e..637853e2526 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -939,7 +939,11 @@ static struct isa_pnp_id npxisa_ids[] = { static int npxisa_probe(device_t dev) { - return (ISA_PNP_PROBE(device_get_parent(dev), dev, npxisa_ids)); + int result; + if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, npxisa_ids)) <= 0) { + device_quiet(dev); + } + return(result); } static int