Shorten dmesg if no keyboard is plugged.

3 files changed, 7 insertions, 10 deletions

diff --git a/sys/arch/sparc/dev/z8530kbd.c b/sys/arch/sparc/dev/z8530kbd.c
index 72eb74283e4..4fdb08ce063 100644
--- a/sys/arch/sparc/dev/z8530kbd.c
+++ b/sys/arch/sparc/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530kbd.c,v 1.4 2003/06/02 23:27:54 millert Exp $	*/
+/*	$OpenBSD: z8530kbd.c,v 1.5 2005/03/06 23:23:08 miod Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -402,7 +402,6 @@ zskbd_attach(parent, self, aux)
 		zs_modem(zst, 0);
 		splx(s);
 
-		printf("%s: no keyboard\n", self->dv_xname);
 		return;
 	}
 
@@ -597,7 +596,7 @@ zskbd_init(zst)
 		}
 	}
 	if (tries == 0)
-		printf(": reset timeout\n");
+		printf(": no keyboard\n");
 	splx(s);
 
 	return tries;
diff --git a/sys/arch/sparc64/dev/comkbd_ebus.c b/sys/arch/sparc64/dev/comkbd_ebus.c
index d4d375bd12b..9bc4a8d1078 100644
--- a/sys/arch/sparc64/dev/comkbd_ebus.c
+++ b/sys/arch/sparc64/dev/comkbd_ebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: comkbd_ebus.c,v 1.14 2003/06/24 21:54:39 henric Exp $	*/
+/*	$OpenBSD: comkbd_ebus.c,v 1.15 2005/03/06 23:23:10 miod Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -234,8 +234,7 @@ comkbd_attach(parent, self, aux)
 		return;
 	}
 
-	if (!comkbd_init(sc)) {
-		printf("%s: no keyboard\n", self->dv_xname);
+	if (comkbd_init(sc) == 0) {
 		return;
 	}
 
@@ -609,7 +608,7 @@ comkbd_init(sc)
 			break;
 	}
 	if (tries == 0)
-		printf(": reset timeout\n");
+		printf(": no keyboard\n");
 	else
 		printf(": layout %d\n", sc->sc_layout);
 
diff --git a/sys/arch/sparc64/dev/z8530kbd.c b/sys/arch/sparc64/dev/z8530kbd.c
index ef53e0ad124..2fce127f176 100644
--- a/sys/arch/sparc64/dev/z8530kbd.c
+++ b/sys/arch/sparc64/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530kbd.c,v 1.15 2003/06/02 23:27:55 millert Exp $	*/
+/*	$OpenBSD: z8530kbd.c,v 1.16 2005/03/06 23:23:10 miod Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -396,7 +396,6 @@ zskbd_attach(parent, self, aux)
 		zs_modem(zst, 0);
 		splx(s);
 
-		printf("%s: no keyboard\n", self->dv_xname);
 		return;
 	}
 
@@ -567,7 +566,7 @@ zskbd_init(zst)
 		break;
 	}
 	if (tries == 0)
-		printf(": reset timeout\n");
+		printf(": no keyboard\n");
 	else
 		printf(": layout %d\n", zst->zst_layout);
 	splx(s);