Module Name: src
Committed By: rin
Date: Thu Jun 3 07:31:20 UTC 2021
Modified Files:
src/sys/arch/amiga/dev: kbd.c ms.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/amiga/dev/kbd.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amiga/dev/ms.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/kbd.c
diff -u src/sys/arch/amiga/dev/kbd.c:1.59 src/sys/arch/amiga/dev/kbd.c:1.60
--- src/sys/arch/amiga/dev/kbd.c:1.59 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/kbd.c Thu Jun 3 07:31:20 2021
@@ -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;
Index: src/sys/arch/amiga/dev/ms.c
diff -u src/sys/arch/amiga/dev/ms.c:1.40 src/sys/arch/amiga/dev/ms.c:1.41
--- src/sys/arch/amiga/dev/ms.c:1.40 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/ms.c Thu Jun 3 07:31:20 2021
@@ -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
}
}
