summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-03-07 01:28:46 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-03-07 01:28:46 +0000
commit9ee2db8a44b1084b2b07e742f60ccd5563a2d1b2 (patch)
treed52ed724dc3830b0ab275d8ff61592b99d625f7e /sys/arch/sparc/dev
parent949450cd84686d2323c0c0c4286a086ee404b428 (diff)
Shorten dmesg on ss4.
Diffstat (limited to 'sys/arch/sparc/dev')
-rw-r--r--sys/arch/sparc/dev/tcx.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c
index e7c004e3524..291894432a8 100644
--- a/sys/arch/sparc/dev/tcx.c
+++ b/sys/arch/sparc/dev/tcx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcx.c,v 1.21 2004/11/29 22:07:37 miod Exp $ */
+/* $OpenBSD: tcx.c,v 1.22 2005/03/07 01:28:45 miod Exp $ */
/* $NetBSD: tcx.c,v 1.8 1997/07/29 09:58:14 fair Exp $ */
/*
@@ -198,12 +198,10 @@ tcxattach(parent, self, args)
char *nam = NULL;
node = ca->ca_ra.ra_node;
- nam = getpropstring(node, "model");
- printf(": %s\n", nam);
if (ca->ca_ra.ra_nreg < TCX_NREG) {
- printf("\n%s: expected %d registers, got %d\n",
- self->dv_xname, TCX_NREG, ca->ca_ra.ra_nreg);
+ printf(": expected %d registers, got %d\n",
+ TCX_NREG, ca->ca_ra.ra_nreg);
return;
}
@@ -265,8 +263,11 @@ tcxattach(parent, self, args)
sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev);
- printf("%s: %dx%d, id %d, rev %d, sense %d\n",
- self->dv_xname, sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height,
+ nam = getpropstring(node, "model");
+ if (*nam != '\0')
+ printf(": %s\n%s", nam, self->dv_xname);
+ printf(": %dx%d, id %d, rev %d, sense %d\n",
+ sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height,
(sc->sc_thc->thc_config & THC_CFG_FBID) >> THC_CFG_FBID_SHIFT,
(sc->sc_thc->thc_config & THC_CFG_REV) >> THC_CFG_REV_SHIFT,
(sc->sc_thc->thc_config & THC_CFG_SENSE) >> THC_CFG_SENSE_SHIFT