Print irq informations in pckbc_set_inputhandler().

ok miod@

diff --git a/sys/arch/sgi/hpc/pckbc_hpc.c b/sys/arch/sgi/hpc/pckbc_hpc.c
index 0e67ef7..1964833 100644 (file)
--- a/sys/arch/sgi/hpc/pckbc_hpc.c
+++ b/sys/arch/sgi/hpc/pckbc_hpc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pckbc_hpc.c,v 1.2 2012/10/03 22:46:09 miod Exp $      */
+/*     $OpenBSD: pckbc_hpc.c,v 1.3 2015/05/04 09:33:45 mpi Exp $       */
 /* $NetBSD: pckbc_hpc.c,v 1.9 2008/03/15 13:23:24 cube Exp $    */
 
 /*
@@ -134,8 +134,7 @@ pckbc_hpc_intr_establish(struct pckbc_softc *sc, pckbc_slot_t slot)
 
        if (hpc_intr_establish(msc->sc_irq, IPL_TTY, pckbcintr, sc,
            sc->sc_dv.dv_xname) == NULL) {
-               printf("%s: unable to establish interrupt for %s slot\n",
-                   sc->sc_dv.dv_xname, pckbc_slot_names[slot]);
+               printf(": unable to establish interrupt");
        } else {
                msc->sc_hasintr = 1;
        }

diff --git a/sys/dev/isa/pckbc_isa.c b/sys/dev/isa/pckbc_isa.c
index 607eea4..1bd6bfb 100644 (file)
--- a/sys/dev/isa/pckbc_isa.c
+++ b/sys/dev/isa/pckbc_isa.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pckbc_isa.c,v 1.15 2015/03/14 03:38:47 jsg Exp $      */
+/*     $OpenBSD: pckbc_isa.c,v 1.16 2015/05/04 09:33:46 mpi Exp $      */
 /*     $NetBSD: pckbc_isa.c,v 1.2 2000/03/23 07:01:35 thorpej Exp $    */
 
 /*
@@ -185,10 +185,8 @@ pckbc_isa_intr_establish(struct pckbc_softc *sc, pckbc_slot_t slot)
        rv = isa_intr_establish(isc->sc_ic, isc->sc_irq[slot], IST_EDGE,
            IPL_TTY, pckbcintr, sc, sc->sc_dv.dv_xname);
        if (rv == NULL) {
-               printf("%s: unable to establish interrupt for %s slot\n",
-                   sc->sc_dv.dv_xname, pckbc_slot_names[slot]);
+               printf(": unable to establish interrupt");
        } else {
-               printf("%s: using irq %d for %s slot\n", sc->sc_dv.dv_xname,
-                   isc->sc_irq[slot], pckbc_slot_names[slot]);
+               printf(": using irq %d", isc->sc_irq[slot]);
        }
 }

diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c
index 1fa2443..6bd4ed5 100644 (file)
--- a/sys/dev/pckbc/pckbd.c
+++ b/sys/dev/pckbc/pckbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbd.c,v 1.41 2015/03/16 01:54:47 jcs Exp $ */
+/* $OpenBSD: pckbd.c,v 1.42 2015/05/04 09:33:46 mpi Exp $ */
 /* $NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp $ */
 
 /*-
@@ -362,8 +362,6 @@ pckbdattach(struct device *parent, struct device *self, void *aux)
        struct wskbddev_attach_args a;
        u_char cmd[1];
 
-       printf("\n");
-
        isconsole = pckbd_is_console(pa->pa_tag, pa->pa_slot);
 
        if (isconsole) {
@@ -404,6 +402,8 @@ pckbdattach(struct device *parent, struct device *self, void *aux)
        a.accessops = &pckbd_accessops;
        a.accesscookie = sc;
 
+       printf("\n");
+
        /*
         * Attach the wskbd, saving a handle to it.
         */

diff --git a/sys/dev/pckbc/pms.c b/sys/dev/pckbc/pms.c
index 9ff6c72..d346361 100644 (file)
--- a/sys/dev/pckbc/pms.c
+++ b/sys/dev/pckbc/pms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pms.c,v 1.59 2015/04/10 08:48:08 stsp Exp $ */
+/* $OpenBSD: pms.c,v 1.60 2015/05/04 09:33:46 mpi Exp $ */
 /* $NetBSD: psm.c,v 1.11 2000/06/05 22:20:57 sommerfeld Exp $ */
 
 /*-
@@ -680,11 +680,11 @@ pmsattach(struct device *parent, struct device *self, void *aux)
 
        sc->sc_kbctag = pa->pa_tag;
 
-       printf("\n");
-
        pckbc_set_inputhandler(sc->sc_kbctag, PCKBC_AUX_SLOT,
            pmsinput, sc, DEVNAME(sc));
 
+       printf("\n");
+
        a.accessops = &pms_accessops;
        a.accesscookie = sc;