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.
This commit is contained in:
Bill Paul 1995-03-05 04:06:44 +00:00
parent 383fc89445
commit bf3e3428b6
3 changed files with 18 additions and 18 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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)