[src/trunk]: src/sys/arch/amiga/dev kbd(4) and ms(4) carry multiple interface...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/483d4f9ac109
branches:  trunk
changeset: 379494:483d4f9ac109
user:      rin <rin%NetBSD.org@localhost>
date:      Thu Jun 03 07:31:20 2021 +0000

description:
kbd(4) and ms(4) carry multiple interface attributes. They are configurable
both as standalone drivers for legacy framebuffer console, or parents of
wskbd(4) and wsmouse(4), respectively. For the latter, be explicit about
using "wskbddev" and "wsmousedev" interface attributes for children.

diffstat:

 sys/arch/amiga/dev/kbd.c |  5 +++--
 sys/arch/amiga/dev/ms.c  |  8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r 3346c5fcf81c -r 483d4f9ac109 sys/arch/amiga/dev/kbd.c
--- a/sys/arch/amiga/dev/kbd.c  Thu Jun 03 07:06:22 2021 +0000
+++ b/sys/arch/amiga/dev/kbd.c  Thu Jun 03 07:31:20 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kbd.c,v 1.59 2021/04/24 23:36:24 thorpej Exp $ */
+/*     $NetBSD: kbd.c,v 1.60 2021/06/03 07:31:20 rin Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.59 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.60 2021/06/03 07:31:20 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -220,6 +220,7 @@ kbdattach(device_t parent, device_t self
                waa.accessops = &kbd_accessops;
                waa.accesscookie = NULL;
                kbd_softc.k_wskbddev = config_found(self, &waa, wskbddevprint,
+                   CFARG_IATTR, "wskbddev",
                    CFARG_EOL);
 
                kbd_softc.k_pollingmode = 0;
diff -r 3346c5fcf81c -r 483d4f9ac109 sys/arch/amiga/dev/ms.c
--- a/sys/arch/amiga/dev/ms.c   Thu Jun 03 07:06:22 2021 +0000
+++ b/sys/arch/amiga/dev/ms.c   Thu Jun 03 07:31:20 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ms.c,v 1.40 2021/04/24 23:36:24 thorpej Exp $ */
+/*     $NetBSD: ms.c,v 1.41 2021/06/03 07:31:20 rin Exp $ */
 
 /*
  * based on:
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.40 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.41 2021/06/03 07:31:20 rin Exp $");
 
 /*
  * Mouse driver.
@@ -202,7 +202,9 @@ msattach(device_t parent, device_t self,
                
                sc->sc_ports[i].ms_wsenabled = 0;
                sc->sc_ports[i].ms_wsmousedev = 
-                   config_found(self, &waa, wsmousedevprint, CFARG_EOL);
+                   config_found(self, &waa, wsmousedevprint,
+                       CFARG_IATTR, "wsmousedev",
+                       CFARG_EOL);
 #endif
        }
 }