diff options
| author | wpaul <wpaul@FreeBSD.org> | 1995-03-05 04:06:44 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 1995-03-05 04:06:44 +0000 |
| commit | e07b647f3fa723cd93a7c1fdc508536d4fba5abb (patch) | |
| tree | 722f76869dca4a446dacbd216c9da2f13f0afd5d | |
| parent | 9e1c56ebfa275886067c4acef26adb1a7b94bdb3 (diff) | |
| download | FreeBSD-src-e07b647f3fa723cd93a7c1fdc508536d4fba5abb.zip FreeBSD-src-e07b647f3fa723cd93a7c1fdc508536d4fba5abb.tar.gz | |
Changed the printf()s in npxattach a bit so you don't end up with
messages like this:
wdc0 at 0x1f0-0x1f7 irq 14 on isa
wdc0: unit 0 (wd0): <ST506>
wd0: size unknown, using BIOS values: 615 cyl, 4 head, 17 sec, bytes/sec 512
npx0 at 0xf0-0xff irq 13 on motherboard
npx0: changing root device to wd0a
^^^^^^
The spurious 'npx0: ' pops up if you have a 386 with a 387 FPU.
| -rw-r--r-- | sys/amd64/amd64/fpu.c | 12 | ||||
| -rw-r--r-- | sys/amd64/isa/npx.c | 12 | ||||
| -rw-r--r-- | sys/i386/isa/npx.c | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index ccd55bd..47e43d5 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.19 1995/02/17 19:38:13 bde Exp $ + * $Id: npx.c,v 1.20 1995/02/23 17:32:38 bde Exp $ */ #include "npx.h" @@ -338,20 +338,20 @@ int npxattach(dvp) struct isa_device *dvp; { - printf("npx%d: ", dvp->id_unit); if (npx_ex16) - printf("INT 16 interface\n"); + printf("npx%d: INT 16 interface\n", dvp->id_unit); else if (npx_irq13) ; /* higher level has printed "irq 13" */ #if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) else if (npx_exists) { - printf("error reporting broken; using 387 emulator\n"); + printf("npx%d: error reporting broken; using 387 emulator\n", + dvp->id_unit); npx_exists = 0; } else - printf("387 emulator\n"); + printf("npx%d: 387 emulator\n",dvp->id_unit); #else else - printf("no 387 emulator in kernel!\n"); + printf("npx%d: no 387 emulator in kernel!\n", dvp->id_unit); #endif npxinit(__INITIAL_NPXCW__); if (npx_exists) diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c index ccd55bd..47e43d5 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/isa/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.19 1995/02/17 19:38:13 bde Exp $ + * $Id: npx.c,v 1.20 1995/02/23 17:32:38 bde Exp $ */ #include "npx.h" @@ -338,20 +338,20 @@ int npxattach(dvp) struct isa_device *dvp; { - printf("npx%d: ", dvp->id_unit); if (npx_ex16) - printf("INT 16 interface\n"); + printf("npx%d: INT 16 interface\n", dvp->id_unit); else if (npx_irq13) ; /* higher level has printed "irq 13" */ #if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) else if (npx_exists) { - printf("error reporting broken; using 387 emulator\n"); + printf("npx%d: error reporting broken; using 387 emulator\n", + dvp->id_unit); npx_exists = 0; } else - printf("387 emulator\n"); + printf("npx%d: 387 emulator\n",dvp->id_unit); #else else - printf("no 387 emulator in kernel!\n"); + printf("npx%d: no 387 emulator in kernel!\n", dvp->id_unit); #endif npxinit(__INITIAL_NPXCW__); if (npx_exists) diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index ccd55bd..47e43d5 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.19 1995/02/17 19:38:13 bde Exp $ + * $Id: npx.c,v 1.20 1995/02/23 17:32:38 bde Exp $ */ #include "npx.h" @@ -338,20 +338,20 @@ int npxattach(dvp) struct isa_device *dvp; { - printf("npx%d: ", dvp->id_unit); if (npx_ex16) - printf("INT 16 interface\n"); + printf("npx%d: INT 16 interface\n", dvp->id_unit); else if (npx_irq13) ; /* higher level has printed "irq 13" */ #if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) else if (npx_exists) { - printf("error reporting broken; using 387 emulator\n"); + printf("npx%d: error reporting broken; using 387 emulator\n", + dvp->id_unit); npx_exists = 0; } else - printf("387 emulator\n"); + printf("npx%d: 387 emulator\n",dvp->id_unit); #else else - printf("no 387 emulator in kernel!\n"); + printf("npx%d: no 387 emulator in kernel!\n", dvp->id_unit); #endif npxinit(__INITIAL_NPXCW__); if (npx_exists) |
