diff options
| author | dg <dg@FreeBSD.org> | 1993-07-15 17:53:14 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1993-07-15 17:53:14 +0000 |
| commit | 25bd55627585fbce3330a173cb309cb5fd364767 (patch) | |
| tree | 2d3b523153c2efb7a70dfc4a1a555e14d696e5a4 /sys/isa | |
| parent | 11fc15d53f760d42b22fe441368b6a2fc1b99807 (diff) | |
| download | FreeBSD-src-25bd55627585fbce3330a173cb309cb5fd364767.zip FreeBSD-src-25bd55627585fbce3330a173cb309cb5fd364767.tar.gz | |
Modified attach printf's so that the output is compatible with the "new"
way of doing things. There still remain several drivers that need to
be updated. Also added a compile-time option to pccons to switch the
control and caps-lock keys (REVERSE_CAPS_CTRL) - added for my personal
sanity.
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/fd.c | 22 | ||||
| -rw-r--r-- | sys/isa/sio.c | 4 |
2 files changed, 12 insertions, 14 deletions
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; |
