dmesg output at boottime now tries to print out information as
soon as it is available. The output looks much more like Sunos.
This commit is contained in:
deraadt
parent
b7bc235229
commit
183a26440d
|
|
@ -537,7 +537,7 @@ struct isa_dev *dev;
|
|||
|
||||
|
||||
#ifdef __386BSD__
|
||||
printf(" probing for scsi devices**\n");
|
||||
printf("ahb%d: probing for scsi devices..\n", unit);
|
||||
#endif __386BSD__
|
||||
|
||||
/***********************************************\
|
||||
|
|
@ -551,9 +551,6 @@ struct isa_dev *dev;
|
|||
{
|
||||
ahb_timeout(0);
|
||||
}
|
||||
#ifdef __386BSD__
|
||||
printf("ahb%d",unit);
|
||||
#endif __386BSD__
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,11 @@
|
|||
/*
|
||||
* HISTORY
|
||||
* $Log: aha1542.c,v $
|
||||
* Revision 1.1 1993/03/21 18:04:42 cgd
|
||||
* Revision 1.2 1993/04/08 08:26:46 deraadt
|
||||
* dmesg output at boottime now tries to print out information as
|
||||
* soon as it is available. The output looks much more like Sunos.
|
||||
*
|
||||
* Revision 1.1 1993/03/21 18:09:54 cgd
|
||||
* after 0.2.2 "stable" patches applied
|
||||
*
|
||||
* Revision 1.6 1992/08/24 21:01:58 jason
|
||||
|
|
@ -641,7 +645,7 @@ struct isa_dev *dev;
|
|||
int unit = dev->dev_unit;
|
||||
|
||||
#ifdef __386BSD__
|
||||
printf(" probing for scsi devices**\n");
|
||||
printf("aha%d: probing for scsi devices..\n", unit);
|
||||
#endif __386BSD__
|
||||
/***********************************************\
|
||||
* ask the adapter what subunits are present *
|
||||
|
|
@ -654,11 +658,7 @@ struct isa_dev *dev;
|
|||
{
|
||||
aha_timeout(0);
|
||||
}
|
||||
#ifdef __386BSD__
|
||||
printf("aha%d",unit);
|
||||
#endif __386BSD__
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -537,7 +537,7 @@ struct isa_dev *dev;
|
|||
|
||||
|
||||
#ifdef __386BSD__
|
||||
printf(" probing for scsi devices**\n");
|
||||
printf("ahb%d: probing for scsi devices..\n", unit);
|
||||
#endif __386BSD__
|
||||
|
||||
/***********************************************\
|
||||
|
|
@ -551,9 +551,6 @@ struct isa_dev *dev;
|
|||
{
|
||||
ahb_timeout(0);
|
||||
}
|
||||
#ifdef __386BSD__
|
||||
printf("ahb%d",unit);
|
||||
#endif __386BSD__
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
* 09 Aug 92 Christoph Robitschko Correct minor number on com ports
|
||||
* 10 Feb 93 Jordan K. Hubbard Added select code
|
||||
*/
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/arch/i386/isa/Attic/com.c,v 1.3 1993/03/27 09:24:42 cgd Exp $";
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/arch/i386/isa/Attic/com.c,v 1.4 1993/04/08 08:26:50 deraadt Exp $";
|
||||
|
||||
#include "com.h"
|
||||
#if NCOM > 0
|
||||
|
|
@ -153,7 +153,7 @@ struct isa_device *isdp;
|
|||
DELAY(100);
|
||||
if ((inb(port+com_iir) & IIR_FIFO_MASK) == IIR_FIFO_MASK) {
|
||||
com_hasfifo |= 1 << unit;
|
||||
printf(" fifo");
|
||||
printf("com%d: fifo\n", isdp->id_unit);
|
||||
}
|
||||
|
||||
outb(port+com_ier, 0);
|
||||
|
|
|
|||
|
|
@ -148,7 +148,6 @@ fdattach(struct isa_device *dev)
|
|||
if (unit >= NFDC)
|
||||
return;
|
||||
|
||||
printf(": controller has:\n");
|
||||
for (fdutab = isa_biotab_fdc; fdutab->id_driver != 0; fdutab++) {
|
||||
fdunit = fdutab->id_unit;
|
||||
if (fdunit >= NFD)
|
||||
|
|
@ -176,12 +175,12 @@ fdattach(struct isa_device *dev)
|
|||
continue;
|
||||
|
||||
if ((fdt & 0xf0) == RTCFDT_12M) {
|
||||
printf("fd%d: <1.2M> on fdc%d slave %d\n", fddrive,
|
||||
printf("fd%d at fdc%d slave %d: <1.2M>\n", fddrive,
|
||||
dev->id_unit, fdunit);
|
||||
fd_unit[fdunit].type = 2;
|
||||
}
|
||||
if ((fdt & 0xf0) == RTCFDT_144M) {
|
||||
printf("fd%d: <1.44M> on fdc%d slave %d\n", fddrive,
|
||||
printf("fd%d at fdc%d slave %d: <1.44M>\n", fddrive,
|
||||
dev->id_unit, fdunit);
|
||||
fd_unit[fdunit].type = 1;
|
||||
}
|
||||
|
|
@ -190,7 +189,6 @@ fdattach(struct isa_device *dev)
|
|||
|
||||
fd_turnoff(fddrive);
|
||||
}
|
||||
printf("fdc%d", dev->id_unit);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -184,7 +184,6 @@ isattach(dvp)
|
|||
ifp->if_unit = unit;
|
||||
ifp->if_name = isdriver.name ;
|
||||
ifp->if_mtu = ETHERMTU;
|
||||
printf (" ethernet address %s", ether_sprintf(is->ns_addr)) ;
|
||||
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
|
||||
ifp->if_init = isinit;
|
||||
ifp->if_output = ether_output;
|
||||
|
|
@ -193,6 +192,8 @@ isattach(dvp)
|
|||
ifp->if_reset = isreset;
|
||||
ifp->if_watchdog = 0;
|
||||
if_attach(ifp);
|
||||
|
||||
printf("is%d: ethernet address %s\n", unit, ether_sprintf(is->ns_addr));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,11 @@
|
|||
* BPF trailer support added by David Greenman, 1/7/93
|
||||
*
|
||||
* $Log: if_we.c,v $
|
||||
* Revision 1.3 1993/03/24 23:54:19 cgd
|
||||
* Revision 1.4 1993/04/08 08:26:54 deraadt
|
||||
* dmesg output at boottime now tries to print out information as
|
||||
* soon as it is available. The output looks much more like Sunos.
|
||||
*
|
||||
* Revision 1.3 1993/03/24 23:54:19 cgd
|
||||
* brought in drivers from David Greenman's (davidg@implode.rain.com)
|
||||
* BPF package
|
||||
*
|
||||
|
|
@ -342,7 +346,7 @@ weattach(is)
|
|||
/*
|
||||
* Banner...
|
||||
*/
|
||||
printf(" %saddr %s",
|
||||
printf("we%d: %saddr %s\n", is->id_unit,
|
||||
(sc->we_type & WD_ETHERNET) ? "enet" : "slan",
|
||||
ether_sprintf(sc->we_addr));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* @(#)isa.c 7.2 (Berkeley) 5/13/91
|
||||
*/
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/arch/i386/isa/Attic/isa.c,v 1.2 1993/03/21 18:04:42 cgd Exp $";
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/arch/i386/isa/Attic/isa.c,v 1.3 1993/04/08 08:26:55 deraadt Exp $";
|
||||
|
||||
/*
|
||||
* code to manage AT bus
|
||||
|
|
@ -215,20 +215,24 @@ config_isadev(isdp, mp)
|
|||
isdp->id_alive = (*dp->probe)(isdp);
|
||||
if (isdp->id_alive) {
|
||||
printf("%s%d", dp->name, isdp->id_unit);
|
||||
(*dp->attach)(isdp);
|
||||
printf(" at 0x%x ", isdp->id_iobase);
|
||||
if(isdp->id_irq)
|
||||
printf("irq %d ", ffs(isdp->id_irq)-1);
|
||||
if (isdp->id_drq != -1)
|
||||
printf("drq %d ", isdp->id_drq);
|
||||
printf("on isa\n");
|
||||
|
||||
(*dp->attach)(isdp);
|
||||
if(isdp->id_irq) {
|
||||
int intrno;
|
||||
|
||||
intrno = ffs(isdp->id_irq)-1;
|
||||
printf("irq %d ", intrno);
|
||||
INTREN(isdp->id_irq);
|
||||
if(mp)INTRMASK(*mp,isdp->id_irq);
|
||||
if(mp)
|
||||
INTRMASK(*mp,isdp->id_irq);
|
||||
setidt(ICU_OFFSET+intrno, isdp->id_intr,
|
||||
SDT_SYS386IGT, SEL_KPL);
|
||||
}
|
||||
if (isdp->id_drq != -1) printf("drq %d ", isdp->id_drq);
|
||||
printf("on isa\n");
|
||||
}
|
||||
return (1);
|
||||
} else return(0);
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
* 14 Mar 93 Chris G. Demetriou Moved pg() to i386/cons.c, code
|
||||
* cleanup, removed ctl-alt-del.
|
||||
*/
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/arch/i386/isa/Attic/pccons.c,v 1.2 1993/03/21 18:04:42 cgd Exp $";
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/arch/i386/isa/Attic/pccons.c,v 1.3 1993/04/08 08:26:57 deraadt Exp $";
|
||||
|
||||
/*
|
||||
* code to work keyboard & display for PC-style console
|
||||
|
|
@ -281,9 +281,11 @@ struct isa_device *dev;
|
|||
u_short *cp = Crtat + (CGA_BUF-MONO_BUF)/CHR;
|
||||
u_short was;
|
||||
|
||||
printf("pc%d: ", dev->id_unit);
|
||||
if (vs.color == 0)
|
||||
printf("<mono>");
|
||||
else printf("<color>");
|
||||
printf("mono");
|
||||
else printf("color");
|
||||
printf("\n");
|
||||
cursor(0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -450,7 +450,7 @@ struct isa_dev *dev;
|
|||
|
||||
|
||||
#ifdef __386BSD__
|
||||
printf(" probing for scsi devices**\n");
|
||||
printf("uha%d: probing for scsi devices..", unit);
|
||||
#endif __386BSD__
|
||||
|
||||
/***********************************************\
|
||||
|
|
@ -465,11 +465,6 @@ struct isa_dev *dev;
|
|||
{
|
||||
uha_timeout(0);
|
||||
}
|
||||
|
||||
|
||||
#ifdef __386BSD__
|
||||
printf("uha%d",unit);
|
||||
#endif __386BSD__
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ wdattach(struct isa_device *dvp)
|
|||
int i, blank;
|
||||
if(first==0) {
|
||||
first = 1;
|
||||
printf(": controller <", dvp->id_unit);
|
||||
printf("wdc%d: <", dvp->id_unit);
|
||||
|
||||
for (i=blank=0; i<sizeof(du->dk_params.wdp_model); i++) {
|
||||
char c = du->dk_params.wdp_model[i];
|
||||
|
|
@ -273,15 +273,14 @@ wdattach(struct isa_device *dvp)
|
|||
}
|
||||
printf(">\n");
|
||||
}
|
||||
printf("wd%d: on wdc%d slave %d\n", lunit, dvp->id_unit, unit);
|
||||
printf("wd%d at wdc%d slave %d\n", lunit, dvp->id_unit, unit);
|
||||
} else {
|
||||
/*printf("wd%d: on wdc%d slave %d -- error\n",
|
||||
/*printf("wd%d at wdc%d slave %d -- error\n",
|
||||
lunit, dvp->id_unit, unit);*/
|
||||
wddrives[lunit] = 0;
|
||||
free(du, M_TEMP);
|
||||
}
|
||||
}
|
||||
printf("wdc%d", dvp->id_unit);
|
||||
return(1);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ wdattach(struct isa_device *dvp)
|
|||
int i, blank;
|
||||
if(first==0) {
|
||||
first = 1;
|
||||
printf(": controller <", dvp->id_unit);
|
||||
printf("wdc%d: <", dvp->id_unit);
|
||||
|
||||
for (i=blank=0; i<sizeof(du->dk_params.wdp_model); i++) {
|
||||
char c = du->dk_params.wdp_model[i];
|
||||
|
|
@ -273,15 +273,14 @@ wdattach(struct isa_device *dvp)
|
|||
}
|
||||
printf(">\n");
|
||||
}
|
||||
printf("wd%d: on wdc%d slave %d\n", lunit, dvp->id_unit, unit);
|
||||
printf("wd%d at wdc%d slave %d\n", lunit, dvp->id_unit, unit);
|
||||
} else {
|
||||
/*printf("wd%d: on wdc%d slave %d -- error\n",
|
||||
/*printf("wd%d at wdc%d slave %d -- error\n",
|
||||
lunit, dvp->id_unit, unit);*/
|
||||
wddrives[lunit] = 0;
|
||||
free(du, M_TEMP);
|
||||
}
|
||||
}
|
||||
printf("wdc%d", dvp->id_unit);
|
||||
return(1);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -537,7 +537,7 @@ struct isa_dev *dev;
|
|||
|
||||
|
||||
#ifdef __386BSD__
|
||||
printf(" probing for scsi devices**\n");
|
||||
printf("ahb%d: probing for scsi devices..\n", unit);
|
||||
#endif __386BSD__
|
||||
|
||||
/***********************************************\
|
||||
|
|
@ -551,9 +551,6 @@ struct isa_dev *dev;
|
|||
{
|
||||
ahb_timeout(0);
|
||||
}
|
||||
#ifdef __386BSD__
|
||||
printf("ahb%d",unit);
|
||||
#endif __386BSD__
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
* 09 Aug 92 Christoph Robitschko Correct minor number on com ports
|
||||
* 10 Feb 93 Jordan K. Hubbard Added select code
|
||||
*/
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/dev/ic/com.c,v 1.3 1993/03/27 09:24:42 cgd Exp $";
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/dev/ic/com.c,v 1.4 1993/04/08 08:26:50 deraadt Exp $";
|
||||
|
||||
#include "com.h"
|
||||
#if NCOM > 0
|
||||
|
|
@ -153,7 +153,7 @@ struct isa_device *isdp;
|
|||
DELAY(100);
|
||||
if ((inb(port+com_iir) & IIR_FIFO_MASK) == IIR_FIFO_MASK) {
|
||||
com_hasfifo |= 1 << unit;
|
||||
printf(" fifo");
|
||||
printf("com%d: fifo\n", isdp->id_unit);
|
||||
}
|
||||
|
||||
outb(port+com_ier, 0);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,11 @@
|
|||
/*
|
||||
* HISTORY
|
||||
* $Log: aha1542.c,v $
|
||||
* Revision 1.1 1993/03/21 18:04:42 cgd
|
||||
* Revision 1.2 1993/04/08 08:26:46 deraadt
|
||||
* dmesg output at boottime now tries to print out information as
|
||||
* soon as it is available. The output looks much more like Sunos.
|
||||
*
|
||||
* Revision 1.1 1993/03/21 18:09:54 cgd
|
||||
* after 0.2.2 "stable" patches applied
|
||||
*
|
||||
* Revision 1.6 1992/08/24 21:01:58 jason
|
||||
|
|
@ -641,7 +645,7 @@ struct isa_dev *dev;
|
|||
int unit = dev->dev_unit;
|
||||
|
||||
#ifdef __386BSD__
|
||||
printf(" probing for scsi devices**\n");
|
||||
printf("aha%d: probing for scsi devices..\n", unit);
|
||||
#endif __386BSD__
|
||||
/***********************************************\
|
||||
* ask the adapter what subunits are present *
|
||||
|
|
@ -654,11 +658,7 @@ struct isa_dev *dev;
|
|||
{
|
||||
aha_timeout(0);
|
||||
}
|
||||
#ifdef __386BSD__
|
||||
printf("aha%d",unit);
|
||||
#endif __386BSD__
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
* 09 Aug 92 Christoph Robitschko Correct minor number on com ports
|
||||
* 10 Feb 93 Jordan K. Hubbard Added select code
|
||||
*/
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/dev/isa/Attic/com.c,v 1.3 1993/03/27 09:24:42 cgd Exp $";
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/dev/isa/Attic/com.c,v 1.4 1993/04/08 08:26:50 deraadt Exp $";
|
||||
|
||||
#include "com.h"
|
||||
#if NCOM > 0
|
||||
|
|
@ -153,7 +153,7 @@ struct isa_device *isdp;
|
|||
DELAY(100);
|
||||
if ((inb(port+com_iir) & IIR_FIFO_MASK) == IIR_FIFO_MASK) {
|
||||
com_hasfifo |= 1 << unit;
|
||||
printf(" fifo");
|
||||
printf("com%d: fifo\n", isdp->id_unit);
|
||||
}
|
||||
|
||||
outb(port+com_ier, 0);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* @(#)isa.c 7.2 (Berkeley) 5/13/91
|
||||
*/
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/dev/isa/isa.c,v 1.2 1993/03/21 18:04:42 cgd Exp $";
|
||||
static char rcsid[] = "$Header: /cvsroot/src/sys/dev/isa/isa.c,v 1.3 1993/04/08 08:26:55 deraadt Exp $";
|
||||
|
||||
/*
|
||||
* code to manage AT bus
|
||||
|
|
@ -215,20 +215,24 @@ config_isadev(isdp, mp)
|
|||
isdp->id_alive = (*dp->probe)(isdp);
|
||||
if (isdp->id_alive) {
|
||||
printf("%s%d", dp->name, isdp->id_unit);
|
||||
(*dp->attach)(isdp);
|
||||
printf(" at 0x%x ", isdp->id_iobase);
|
||||
if(isdp->id_irq)
|
||||
printf("irq %d ", ffs(isdp->id_irq)-1);
|
||||
if (isdp->id_drq != -1)
|
||||
printf("drq %d ", isdp->id_drq);
|
||||
printf("on isa\n");
|
||||
|
||||
(*dp->attach)(isdp);
|
||||
if(isdp->id_irq) {
|
||||
int intrno;
|
||||
|
||||
intrno = ffs(isdp->id_irq)-1;
|
||||
printf("irq %d ", intrno);
|
||||
INTREN(isdp->id_irq);
|
||||
if(mp)INTRMASK(*mp,isdp->id_irq);
|
||||
if(mp)
|
||||
INTRMASK(*mp,isdp->id_irq);
|
||||
setidt(ICU_OFFSET+intrno, isdp->id_intr,
|
||||
SDT_SYS386IGT, SEL_KPL);
|
||||
}
|
||||
if (isdp->id_drq != -1) printf("drq %d ", isdp->id_drq);
|
||||
printf("on isa\n");
|
||||
}
|
||||
return (1);
|
||||
} else return(0);
|
||||
|
|
|
|||
|
|
@ -450,7 +450,7 @@ struct isa_dev *dev;
|
|||
|
||||
|
||||
#ifdef __386BSD__
|
||||
printf(" probing for scsi devices**\n");
|
||||
printf("uha%d: probing for scsi devices..", unit);
|
||||
#endif __386BSD__
|
||||
|
||||
/***********************************************\
|
||||
|
|
@ -465,11 +465,6 @@ struct isa_dev *dev;
|
|||
{
|
||||
uha_timeout(0);
|
||||
}
|
||||
|
||||
|
||||
#ifdef __386BSD__
|
||||
printf("uha%d",unit);
|
||||
#endif __386BSD__
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ wdattach(struct isa_device *dvp)
|
|||
int i, blank;
|
||||
if(first==0) {
|
||||
first = 1;
|
||||
printf(": controller <", dvp->id_unit);
|
||||
printf("wdc%d: <", dvp->id_unit);
|
||||
|
||||
for (i=blank=0; i<sizeof(du->dk_params.wdp_model); i++) {
|
||||
char c = du->dk_params.wdp_model[i];
|
||||
|
|
@ -273,15 +273,14 @@ wdattach(struct isa_device *dvp)
|
|||
}
|
||||
printf(">\n");
|
||||
}
|
||||
printf("wd%d: on wdc%d slave %d\n", lunit, dvp->id_unit, unit);
|
||||
printf("wd%d at wdc%d slave %d\n", lunit, dvp->id_unit, unit);
|
||||
} else {
|
||||
/*printf("wd%d: on wdc%d slave %d -- error\n",
|
||||
/*printf("wd%d at wdc%d slave %d -- error\n",
|
||||
lunit, dvp->id_unit, unit);*/
|
||||
wddrives[lunit] = 0;
|
||||
free(du, M_TEMP);
|
||||
}
|
||||
}
|
||||
printf("wdc%d", dvp->id_unit);
|
||||
return(1);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue