Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small beginnings of podulebus convergence: Have podule drivers print colons 

in attach messages, rather than doing it in podulebusprint().
This commit is contained in:
bjh21 2001-03-17 18:46:25 +00:00
parent bfc2063e69
commit 17b6222740
14 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/arm32/podulebus/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.26 1999/09/30 22:59:53 thorpej Exp $ */
/* $NetBSD: asc.c,v 1.27 2001/03/17 18:46:25 bjh21 Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@ -179,7 +179,7 @@ ascattach(pdp, dp, auxp)
(void)get_bootconf_option(boot_args, "asc.hostid",
BOOTOPT_TYPE_INT, &sbic->sc_link.scsipi_scsi.adapter_target);
printf(" hostid=%d", sbic->sc_link.scsipi_scsi.adapter_target);
printf(": hostid=%d", sbic->sc_link.scsipi_scsi.adapter_target);
#if ASC_POLL > 0
if (boot_args) {

4
sys/arch/arm32/podulebus/cosc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cosc.c,v 1.11 1999/09/30 22:59:53 thorpej Exp $ */
/* $NetBSD: cosc.c,v 1.12 2001/03/17 18:46:25 bjh21 Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@ -133,6 +133,8 @@ coscattach(pdp, dp, auxp)
sc->sc_podule = pa->pa_podule;
podules[sc->sc_podule_number].attached = 1;
printf(":");
if (pa->pa_podule->manufacturer == MANUFACTURER_ACORN
&& pa->pa_podule->product == PODULE_ACORN_SCSI)
printf(" Faulty expansion card identity\n");

4
sys/arch/arm32/podulebus/csa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: csa.c,v 1.7 2000/03/25 15:27:54 tsutsui Exp $ */
/* $NetBSD: csa.c,v 1.8 2001/03/17 18:46:25 bjh21 Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -186,7 +186,7 @@ csa_attach(parent, self, aux)
BOOTOPT_TYPE_INT, &sc->sc_ncr5380.sc_link.scsipi_scsi.adapter_target);
sc->sc_ncr5380.sc_adapter.scsipi_minphys = minphys;
printf(" host=%d, using 8 bit PIO",
printf(": host=%d, using 8 bit PIO",
sc->sc_ncr5380.sc_link.scsipi_scsi.adapter_target);
sc->sc_irqstatus = (u_char *)pa->pa_podule->slow_base + CSA_INTR_OFFSET;

4
sys/arch/arm32/podulebus/csc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: csc.c,v 1.8 2000/06/29 08:53:02 mrg Exp $ */
/* $NetBSD: csc.c,v 1.9 2001/03/17 18:46:25 bjh21 Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -179,7 +179,7 @@ cscattach(pdp, dp, auxp)
(void)get_bootconf_option(boot_args, "csc.hostid",
BOOTOPT_TYPE_INT, &sc->sc_softc.sc_link.scsipi_scsi.adapter_target);
printf(" host=%d", sc->sc_softc.sc_link.scsipi_scsi.adapter_target);
printf(": host=%d", sc->sc_softc.sc_link.scsipi_scsi.adapter_target);
sc->sc_softc.sc_ih.ih_func = csc_intr;
sc->sc_softc.sc_ih.ih_arg = &sc->sc_softc;

6
sys/arch/arm32/podulebus/icside.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: icside.c,v 1.11 1998/12/03 18:24:30 bouyer Exp $ */
/* $NetBSD: icside.c,v 1.12 2001/03/17 18:46:25 bjh21 Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@ -208,10 +208,10 @@ icside_attach(parent, self, aux)
/* Report the version and name */
if (ide == NULL || ide->name == NULL) {
printf(" rev %d is unsupported\n", id);
printf(": rev %d is unsupported\n", id);
return;
} else
printf(" %s\n", ide->name);
printf(": %s\n", ide->name);
/*
* Ok we need our own bus tag as the register spacing

4
sys/arch/arm32/podulebus/if_ea.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ea.c,v 1.24 2000/11/15 01:02:12 thorpej Exp $ */
/* $NetBSD: if_ea.c,v 1.25 2001/03/17 18:46:25 bjh21 Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe
@ -326,7 +326,7 @@ eaattach(parent, self, aux)
/* Print out some information for the user. */
printf(" SEEQ8005 address %s", ether_sprintf(myaddr));
printf(": SEEQ8005 address %s", ether_sprintf(myaddr));
sc->sc_irqclaimed = 0;

6
sys/arch/arm32/podulebus/if_eb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_eb.c,v 1.27 2001/01/20 02:41:19 lukem Exp $ */
/* $NetBSD: if_eb.c,v 1.28 2001/03/17 18:46:25 bjh21 Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe
@ -331,10 +331,10 @@ ebattach(parent, self, aux)
/* Print out some information for the user. */
if ((id & 0xf0) == 0xa0)
printf(" SEEQ80C04 rev %x address %s", id & 0x0f,
printf(": SEEQ80C04 rev %x address %s", id & 0x0f,
ether_sprintf(myaddr));
else
printf(" SEEQ???? rev %02x address %s", id,
printf(": SEEQ???? rev %02x address %s", id,
ether_sprintf(myaddr));
sc->sc_irqclaimed = 0;

4
sys/arch/arm32/podulebus/if_ie.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ie.c,v 1.28 2000/11/15 01:02:12 thorpej Exp $ */
/* $NetBSD: if_ie.c,v 1.29 2001/03/17 18:46:26 bjh21 Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@ -464,7 +464,7 @@ void ieattach ( struct device *parent, struct device *self, void *aux )
/* "Hmm," said nuts, "what if the attach fails" */
/* Write some pretty things on the annoucement line */
printf ( " %s using %dk card ram",
printf ( ": %s using %dk card ram",
ether_sprintf(hwaddr),
((NRXBUF*IE_RXBUF_SIZE)+(NTXBUF*IE_TXBUF_SIZE))/1024 );

4
sys/arch/arm32/podulebus/if_ne_pbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ne_pbus.c,v 1.4 2001/02/13 19:17:13 bjh21 Exp $ */
/* $NetBSD: if_ne_pbus.c,v 1.5 2001/03/17 18:46:26 bjh21 Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -251,7 +251,7 @@ ne_pbus_attach(parent, self, aux)
}
/* Report the interface name */
printf(" %s ethernet\n", ne->name);
printf(": %s ethernet\n", ne->name);
/*
* Ok we need our own bus tag as the register spacing

4
sys/arch/arm32/podulebus/oak.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: oak.c,v 1.18 2000/03/25 15:27:54 tsutsui Exp $ */
/* $NetBSD: oak.c,v 1.19 2001/03/17 18:46:26 bjh21 Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -159,7 +159,7 @@ oak_attach(parent, self, aux)
BOOTOPT_TYPE_INT, &sc->sc_ncr5380.sc_link.scsipi_scsi.adapter_target);
sc->sc_ncr5380.sc_adapter.scsipi_minphys = minphys;
printf(" host=%d, using 8 bit PIO\n",
printf(": host=%d, using 8 bit PIO\n",
sc->sc_ncr5380.sc_link.scsipi_scsi.adapter_target);
ncr5380_attach(&sc->sc_ncr5380);

6
sys/arch/arm32/podulebus/podulebus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: podulebus.c,v 1.35 2001/02/27 20:23:13 reinoud Exp $ */
/* $NetBSD: podulebus.c,v 1.36 2001/03/17 18:46:26 bjh21 Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -115,9 +115,9 @@ podulebusprint(aux, name)
}
if (pa->pa_podule->slottype == SLOT_POD)
printf(" [ podule %d ]:", pa->pa_podule_number);
printf(" [ podule %d ]", pa->pa_podule_number);
else if (pa->pa_podule->slottype == SLOT_NET)
printf(" [ netslot %d ]:", pa->pa_podule_number - MAX_PODULES);
printf(" [ netslot %d ]", pa->pa_podule_number - MAX_PODULES);
else
panic("Invalid slot type\n");

4
sys/arch/arm32/podulebus/ptsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ptsc.c,v 1.25 2000/06/29 08:53:02 mrg Exp $ */
/* $NetBSD: ptsc.c,v 1.26 2001/03/17 18:46:26 bjh21 Exp $ */
/*
* Copyright (c) 1995 Scott Stevens
@ -186,7 +186,7 @@ ptscattach(pdp, dp, auxp)
(void)get_bootconf_option(boot_args, "ptsc.hostid",
BOOTOPT_TYPE_INT, &sc->sc_softc.sc_link.scsipi_scsi.adapter_target);
printf(" host=%d", sc->sc_softc.sc_link.scsipi_scsi.adapter_target);
printf(": host=%d", sc->sc_softc.sc_link.scsipi_scsi.adapter_target);
sc->sc_softc.sc_ih.ih_func = ptsc_intr;
sc->sc_softc.sc_ih.ih_arg = &sc->sc_softc;

4
sys/arch/arm32/podulebus/rapide.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rapide.c,v 1.13 2001/02/27 20:27:17 reinoud Exp $ */
/* $NetBSD: rapide.c,v 1.14 2001/03/17 18:46:26 bjh21 Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@ -229,7 +229,7 @@ rapide_attach(parent, self, aux)
sc->sc_version = bus_space_read_1(iot, ctlioh, VERSION_REGISTER_OFFSET) & VERSION_REGISTER_MASK;
/* bus_space_unmap(iot, ctl_ioh, CONTROL_REGISTER_SPACE);*/
printf(" Issue %d\n", sc->sc_version + 1);
printf(": Issue %d\n", sc->sc_version + 1);
if (sc->sc_version != VERSION_2_ID)
return;

3
sys/arch/arm32/podulebus/simide.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: simide.c,v 1.10 1998/12/03 18:24:30 bouyer Exp $ */
/* $NetBSD: simide.c,v 1.11 2001/03/17 18:46:26 bjh21 Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@ -213,6 +213,7 @@ simide_attach(parent, self, aux)
status = bus_space_read_1(sc->sc_ctliot, sc->sc_ctlioh,
STATUS_REGISTER_OFFSET);
printf(":");
/* If any of the bits in STATUS_FAULT are zero then we have a fault. */
if ((status & STATUS_FAULT) != STATUS_FAULT)
printf(" card/cable fault (%02x) -", status);