diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/amd64/fpu.c | 10 | ||||
-rw-r--r-- | sys/amd64/isa/npx.c | 10 | ||||
-rw-r--r-- | sys/dev/fdc/fdc.c | 22 | ||||
-rw-r--r-- | sys/dev/sio/sio.c | 4 | ||||
-rw-r--r-- | sys/i386/eisa/aha1742.c | 7 | ||||
-rw-r--r-- | sys/i386/isa/aha1542.c | 18 | ||||
-rw-r--r-- | sys/i386/isa/aha1742.c | 7 | ||||
-rw-r--r-- | sys/i386/isa/fd.c | 22 | ||||
-rw-r--r-- | sys/i386/isa/npx.c | 10 | ||||
-rw-r--r-- | sys/i386/isa/sio.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/wd.c | 7 | ||||
-rw-r--r-- | sys/isa/fd.c | 22 | ||||
-rw-r--r-- | sys/isa/sio.c | 4 |
13 files changed, 64 insertions, 83 deletions
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 73392fa..54638fb 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -45,7 +45,7 @@ * are using trap 16 handling. * */ -static char rcsid[] = "$Header: /usr/bill/working/sys/i386/isa/RCS/npx.c,v 1.2 92/01/21 14:34:27 william Exp $"; +static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/npx.c,v 1.1.1.1 1993/06/12 14:58:00 rgrimes Exp $"; #include "npx.h" #if NNPX > 0 @@ -329,13 +329,13 @@ npxattach(dvp) struct isa_device *dvp; { if (npx_ex16) - printf(" <Errors reported via Exception 16>"); + printf("npx%d: Errors reported via Exception 16\n",dvp->id_unit); else if (npx_irq13) - printf(" <Errors reported via IRQ 13>"); + printf("npx%d: Errors reported via IRQ 13\n",dvp->id_unit); else if (npx_exists) - printf(" <Error reporting broken, using 387 emulator>"); + printf("npx%d: Error reporting broken, using 387 emulator\n",dvp->id_unit); else - printf(" <387 Emulator>"); + 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 73392fa..54638fb 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/isa/npx.c @@ -45,7 +45,7 @@ * are using trap 16 handling. * */ -static char rcsid[] = "$Header: /usr/bill/working/sys/i386/isa/RCS/npx.c,v 1.2 92/01/21 14:34:27 william Exp $"; +static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/npx.c,v 1.1.1.1 1993/06/12 14:58:00 rgrimes Exp $"; #include "npx.h" #if NNPX > 0 @@ -329,13 +329,13 @@ npxattach(dvp) struct isa_device *dvp; { if (npx_ex16) - printf(" <Errors reported via Exception 16>"); + printf("npx%d: Errors reported via Exception 16\n",dvp->id_unit); else if (npx_irq13) - printf(" <Errors reported via IRQ 13>"); + printf("npx%d: Errors reported via IRQ 13\n",dvp->id_unit); else if (npx_exists) - printf(" <Error reporting broken, using 387 emulator>"); + printf("npx%d: Error reporting broken, using 387 emulator\n",dvp->id_unit); else - printf(" <387 Emulator>"); + printf("npx%d: 387 Emulator\n",dvp->id_unit); npxinit(__INITIAL_NPXCW__); return (1); /* XXX unused */ } diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index a461e81..ca92b16 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -46,12 +46,15 @@ * Largely rewritten to handle multiple controllers and drives * By Julian Elischer, Sun Apr 4 16:34:33 WST 1993 */ -char rev[] = "$Revision: 1.10 $"; +char rev[] = "$Revision: 1.1.1.1 $"; /* - * $Header: /usr/src/sys.386bsd/i386/isa/RCS/fd.c,v 1.10 93/04/13 16:53:29 root Exp $ + * $Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/fd.c,v 1.1.1.1 1993/06/12 14:58:02 rgrimes Exp $ */ /* - * $Log: fd.c,v $ + * $Log: fd.c,v $ + * Revision 1.1.1.1 1993/06/12 14:58:02 rgrimes + * Initial import, 0.1 + pk 0.2.4-B1 + * * Revision 1.10 93/04/13 16:53:29 root * make sure turning off a drive motor doesn't deselect another * drive active at the time. @@ -304,22 +307,16 @@ struct isa_device *dev; fd_data[fdu].track = -2; fd_data[fdu].fdc = fdc; fd_data[fdu].fdsu = fdsu; - /* yes, announce it */ - if (!hdr) - printf(" drives "); - else - printf(", "); - printf("%d: ", fdu); - + printf("fd%d: unit %d type ", fdcu, fdu); if ((fdt & 0xf0) == RTCFDT_12M) { - printf("1.2M"); + printf("1.2MB 5.25in\n"); fd_data[fdu].type = 1; fd_data[fdu].ft = fd_types + 1; } if ((fdt & 0xf0) == RTCFDT_144M) { - printf("1.44M"); + printf("1.44MB 3.5in\n"); fd_data[fdu].type = 0; fd_data[fdu].ft = fd_types + 0; } @@ -329,7 +326,6 @@ struct isa_device *dev; hdr = 1; } - printf(" %s ",rev); /* Set transfer to 500kbps */ outb(fdc->baseport+fdctl,0); /*XXX*/ } diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 38503fd..6d10cf5 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -40,7 +40,7 @@ * into the patch kit. Added in sioselect * from com.c. Added port 4 support. */ -static char rcsid[] = "$Header: /usr/bill/working/sys/i386/isa/RCS/com.c,v 1.2 92/01/21 14:34:11 william Exp $"; +static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/sio.c,v 1.1.1.1 1993/06/12 14:57:57 rgrimes Exp $"; #include "sio.h" #if NSIO > 0 @@ -465,6 +465,7 @@ sioattach(isdp) outb(iobase + com_scr, 0x5a); scr2 = inb(iobase + com_scr); outb(iobase + com_scr, scr); + printf("sio%d: type", unit); if (scr1 != 0xa5 || scr2 != 0x5a) printf(" <8250>"); else { @@ -487,6 +488,7 @@ sioattach(isdp) } outb(iobase + com_fifo, 0); } + printf("\n"); #ifdef COM_MULTIPORT if (COM_ISMULTIPORT(isdp)) { struct isa_device *masterdev; diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c index 721f6f7..655ba4e 100644 --- a/sys/i386/eisa/aha1742.c +++ b/sys/i386/eisa/aha1742.c @@ -520,7 +520,6 @@ struct isa_dev *dev; #ifdef __386BSD__ /* 386BSD */ dev->id_irq = (1 << ahb_data[unit].vect); dev->id_drq = -1; /* use EISA dma */ - printf("\n **"); #endif __386BSD__ ahb_unit++; @@ -537,7 +536,7 @@ struct isa_dev *dev; #ifdef __386BSD__ - printf(" probing for scsi devices**\n"); + printf("**probing for scsi devices**\n"); #endif __386BSD__ /***********************************************\ @@ -551,9 +550,6 @@ struct isa_dev *dev; { ahb_timeout(0); } -#ifdef __386BSD__ - printf("ahb%d",unit); -#endif __386BSD__ return; } @@ -864,7 +860,6 @@ int unit; * level * \***********************************************/ #ifdef __386BSD__ - printf("ahb%d reading board settings, ",unit); #define PRNT(x) #else __386BSD__ printf("ahb%d:",unit); diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c index 85271fc..31034ba 100644 --- a/sys/i386/isa/aha1542.c +++ b/sys/i386/isa/aha1542.c @@ -28,6 +28,9 @@ /* * HISTORY * $Log: aha1542.c,v $ + * Revision 1.1.1.1 1993/06/12 14:57:59 rgrimes + * Initial import, 0.1 + pk 0.2.4-B1 + * * Revision 1.6 1992/08/24 21:01:58 jason * many changes and bugfixes for osf1 * @@ -620,7 +623,6 @@ struct isa_dev *dev; panic("Unable to add aha interrupt handler"); #endif /* !defined(OSF) */ #ifdef __386BSD__ - printf("\n **"); #else __386BSD__ printf("port=%x spl=%d\n", dev->dev_addr, dev->dev_spl); @@ -638,7 +640,7 @@ struct isa_dev *dev; int unit = dev->dev_unit; #ifdef __386BSD__ - printf(" probing for scsi devices**\n"); + printf("**probing for scsi devices**\n"); #endif __386BSD__ /***********************************************\ * ask the adapter what subunits are present * @@ -651,9 +653,6 @@ struct isa_dev *dev; { aha_timeout(0); } -#ifdef __386BSD__ - printf("aha%d",unit); -#endif __386BSD__ return; } @@ -938,7 +937,6 @@ int unit; * level * \***********************************************/ #ifdef __386BSD__ - printf("aha%d reading board settings, ",unit); #define PRNT(x) #else __386BSD__ printf("aha%d:",unit); @@ -1387,21 +1385,21 @@ int unit; { speed++; } - printf("%d nSEC ok, use ",retval); +/* XXX printf("%d nSEC ok, use ",retval); */ retval2 = aha_bus_speed_check(unit,speed); if(retval2 == HAD_ERROR) /* retval is slowest already */ { - printf("marginal "); +/* XXX printf("marginal "); */ retval2 = retval; } if(retval2) { - printf("%d nSEC ",retval2); +/* XXX printf("%d nSEC ",retval2); */ return(retval2); } else { - printf(".. slower failed, abort.\n",retval); +/* XXX printf(".. slower failed, abort.\n",retval); */ return(0); } diff --git a/sys/i386/isa/aha1742.c b/sys/i386/isa/aha1742.c index 721f6f7..655ba4e 100644 --- a/sys/i386/isa/aha1742.c +++ b/sys/i386/isa/aha1742.c @@ -520,7 +520,6 @@ struct isa_dev *dev; #ifdef __386BSD__ /* 386BSD */ dev->id_irq = (1 << ahb_data[unit].vect); dev->id_drq = -1; /* use EISA dma */ - printf("\n **"); #endif __386BSD__ ahb_unit++; @@ -537,7 +536,7 @@ struct isa_dev *dev; #ifdef __386BSD__ - printf(" probing for scsi devices**\n"); + printf("**probing for scsi devices**\n"); #endif __386BSD__ /***********************************************\ @@ -551,9 +550,6 @@ struct isa_dev *dev; { ahb_timeout(0); } -#ifdef __386BSD__ - printf("ahb%d",unit); -#endif __386BSD__ return; } @@ -864,7 +860,6 @@ int unit; * level * \***********************************************/ #ifdef __386BSD__ - printf("ahb%d reading board settings, ",unit); #define PRNT(x) #else __386BSD__ printf("ahb%d:",unit); diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index a461e81..ca92b16 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -46,12 +46,15 @@ * Largely rewritten to handle multiple controllers and drives * By Julian Elischer, Sun Apr 4 16:34:33 WST 1993 */ -char rev[] = "$Revision: 1.10 $"; +char rev[] = "$Revision: 1.1.1.1 $"; /* - * $Header: /usr/src/sys.386bsd/i386/isa/RCS/fd.c,v 1.10 93/04/13 16:53:29 root Exp $ + * $Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/fd.c,v 1.1.1.1 1993/06/12 14:58:02 rgrimes Exp $ */ /* - * $Log: fd.c,v $ + * $Log: fd.c,v $ + * Revision 1.1.1.1 1993/06/12 14:58:02 rgrimes + * Initial import, 0.1 + pk 0.2.4-B1 + * * Revision 1.10 93/04/13 16:53:29 root * make sure turning off a drive motor doesn't deselect another * drive active at the time. @@ -304,22 +307,16 @@ struct isa_device *dev; fd_data[fdu].track = -2; fd_data[fdu].fdc = fdc; fd_data[fdu].fdsu = fdsu; - /* yes, announce it */ - if (!hdr) - printf(" drives "); - else - printf(", "); - printf("%d: ", fdu); - + printf("fd%d: unit %d type ", fdcu, fdu); if ((fdt & 0xf0) == RTCFDT_12M) { - printf("1.2M"); + printf("1.2MB 5.25in\n"); fd_data[fdu].type = 1; fd_data[fdu].ft = fd_types + 1; } if ((fdt & 0xf0) == RTCFDT_144M) { - printf("1.44M"); + printf("1.44MB 3.5in\n"); fd_data[fdu].type = 0; fd_data[fdu].ft = fd_types + 0; } @@ -329,7 +326,6 @@ struct isa_device *dev; hdr = 1; } - printf(" %s ",rev); /* Set transfer to 500kbps */ outb(fdc->baseport+fdctl,0); /*XXX*/ } diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 73392fa..54638fb 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -45,7 +45,7 @@ * are using trap 16 handling. * */ -static char rcsid[] = "$Header: /usr/bill/working/sys/i386/isa/RCS/npx.c,v 1.2 92/01/21 14:34:27 william Exp $"; +static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/npx.c,v 1.1.1.1 1993/06/12 14:58:00 rgrimes Exp $"; #include "npx.h" #if NNPX > 0 @@ -329,13 +329,13 @@ npxattach(dvp) struct isa_device *dvp; { if (npx_ex16) - printf(" <Errors reported via Exception 16>"); + printf("npx%d: Errors reported via Exception 16\n",dvp->id_unit); else if (npx_irq13) - printf(" <Errors reported via IRQ 13>"); + printf("npx%d: Errors reported via IRQ 13\n",dvp->id_unit); else if (npx_exists) - printf(" <Error reporting broken, using 387 emulator>"); + printf("npx%d: Error reporting broken, using 387 emulator\n",dvp->id_unit); else - printf(" <387 Emulator>"); + printf("npx%d: 387 Emulator\n",dvp->id_unit); npxinit(__INITIAL_NPXCW__); return (1); /* XXX unused */ } diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 38503fd..6d10cf5 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -40,7 +40,7 @@ * into the patch kit. Added in sioselect * from com.c. Added port 4 support. */ -static char rcsid[] = "$Header: /usr/bill/working/sys/i386/isa/RCS/com.c,v 1.2 92/01/21 14:34:11 william Exp $"; +static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/sio.c,v 1.1.1.1 1993/06/12 14:57:57 rgrimes Exp $"; #include "sio.h" #if NSIO > 0 @@ -465,6 +465,7 @@ sioattach(isdp) outb(iobase + com_scr, 0x5a); scr2 = inb(iobase + com_scr); outb(iobase + com_scr, scr); + printf("sio%d: type", unit); if (scr1 != 0xa5 || scr2 != 0x5a) printf(" <8250>"); else { @@ -487,6 +488,7 @@ sioattach(isdp) } outb(iobase + com_fifo, 0); } + printf("\n"); #ifdef COM_MULTIPORT if (COM_ISMULTIPORT(isdp)) { struct isa_device *masterdev; diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index 1f3794c..63ebf13 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -231,7 +231,7 @@ wdattach(struct isa_device *dvp) if(wdgetctlr(unit, du) == 0) { int i, blank; char c; - printf(" %d:<", unit); + printf("wd%d: unit %d type ", unit, unit); for (i = blank = 0 ; i < sizeof(du->dk_params.wdp_model); i++) { char c = du->dk_params.wdp_model[i]; @@ -246,13 +246,12 @@ wdattach(struct isa_device *dvp) else printf("%c", c); } - printf(">"); + printf("\n"); du->dk_unit = unit; } else { /* old ST506 controller */ - printf(" %d:<wdgetctlr failed, assuming OK>", - unit); + printf("wd%d: unit %d type old ST506\n", unit, unit); } } return(1); diff --git a/sys/isa/fd.c b/sys/isa/fd.c index a461e81..ca92b16 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -46,12 +46,15 @@ * Largely rewritten to handle multiple controllers and drives * By Julian Elischer, Sun Apr 4 16:34:33 WST 1993 */ -char rev[] = "$Revision: 1.10 $"; +char rev[] = "$Revision: 1.1.1.1 $"; /* - * $Header: /usr/src/sys.386bsd/i386/isa/RCS/fd.c,v 1.10 93/04/13 16:53:29 root Exp $ + * $Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/fd.c,v 1.1.1.1 1993/06/12 14:58:02 rgrimes Exp $ */ /* - * $Log: fd.c,v $ + * $Log: fd.c,v $ + * Revision 1.1.1.1 1993/06/12 14:58:02 rgrimes + * Initial import, 0.1 + pk 0.2.4-B1 + * * Revision 1.10 93/04/13 16:53:29 root * make sure turning off a drive motor doesn't deselect another * drive active at the time. @@ -304,22 +307,16 @@ struct isa_device *dev; fd_data[fdu].track = -2; fd_data[fdu].fdc = fdc; fd_data[fdu].fdsu = fdsu; - /* yes, announce it */ - if (!hdr) - printf(" drives "); - else - printf(", "); - printf("%d: ", fdu); - + printf("fd%d: unit %d type ", fdcu, fdu); if ((fdt & 0xf0) == RTCFDT_12M) { - printf("1.2M"); + printf("1.2MB 5.25in\n"); fd_data[fdu].type = 1; fd_data[fdu].ft = fd_types + 1; } if ((fdt & 0xf0) == RTCFDT_144M) { - printf("1.44M"); + printf("1.44MB 3.5in\n"); fd_data[fdu].type = 0; fd_data[fdu].ft = fd_types + 0; } @@ -329,7 +326,6 @@ struct isa_device *dev; hdr = 1; } - printf(" %s ",rev); /* Set transfer to 500kbps */ outb(fdc->baseport+fdctl,0); /*XXX*/ } diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 38503fd..6d10cf5 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -40,7 +40,7 @@ * into the patch kit. Added in sioselect * from com.c. Added port 4 support. */ -static char rcsid[] = "$Header: /usr/bill/working/sys/i386/isa/RCS/com.c,v 1.2 92/01/21 14:34:11 william Exp $"; +static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/sio.c,v 1.1.1.1 1993/06/12 14:57:57 rgrimes Exp $"; #include "sio.h" #if NSIO > 0 @@ -465,6 +465,7 @@ sioattach(isdp) outb(iobase + com_scr, 0x5a); scr2 = inb(iobase + com_scr); outb(iobase + com_scr, scr); + printf("sio%d: type", unit); if (scr1 != 0xa5 || scr2 != 0x5a) printf(" <8250>"); else { @@ -487,6 +488,7 @@ sioattach(isdp) } outb(iobase + com_fifo, 0); } + printf("\n"); #ifdef COM_MULTIPORT if (COM_ISMULTIPORT(isdp)) { struct isa_device *masterdev; |