From 600f527fc62149b6465d4a1abc37e2eb6865ed49 Mon Sep 17 00:00:00 2001 From: David Greenman Date: Sat, 11 Jun 1994 05:17:15 +0000 Subject: [PATCH] Fix from Bruce Evans: Set npx_exists = 0 in the case of broken error reporting. --- sys/amd64/amd64/fpu.c | 6 ++++-- sys/amd64/isa/npx.c | 6 ++++-- sys/i386/isa/npx.c | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 17400bdbb29..a3ce1e2bad7 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -321,10 +321,12 @@ npxattach(dvp) struct isa_device *dvp; { if (!npx_ex16 && !npx_irq13) { - if (npx_exists) + if (npx_exists) { printf("npx%d: Error reporting broken, using 387 emulator\n",dvp->id_unit); - else + npx_exists = 0; + } else { printf("npx%d: 387 Emulator\n",dvp->id_unit); + } } npxinit(__INITIAL_NPXCW__); return (1); /* XXX unused */ diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c index 17400bdbb29..a3ce1e2bad7 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/isa/npx.c @@ -321,10 +321,12 @@ npxattach(dvp) struct isa_device *dvp; { if (!npx_ex16 && !npx_irq13) { - if (npx_exists) + if (npx_exists) { printf("npx%d: Error reporting broken, using 387 emulator\n",dvp->id_unit); - else + npx_exists = 0; + } else { printf("npx%d: 387 Emulator\n",dvp->id_unit); + } } npxinit(__INITIAL_NPXCW__); return (1); /* XXX unused */ diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 17400bdbb29..a3ce1e2bad7 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -321,10 +321,12 @@ npxattach(dvp) struct isa_device *dvp; { if (!npx_ex16 && !npx_irq13) { - if (npx_exists) + if (npx_exists) { printf("npx%d: Error reporting broken, using 387 emulator\n",dvp->id_unit); - else + npx_exists = 0; + } else { printf("npx%d: 387 Emulator\n",dvp->id_unit); + } } npxinit(__INITIAL_NPXCW__); return (1); /* XXX unused */