[src/trunk]: src/sys/arch/evbarm/fdt Allow USB keyboards to attach as console...

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

details:   https://anonhg.NetBSD.org/src/rev/bd73529ef59b
branches:  trunk
changeset: 356230:bd73529ef59b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Sep 10 23:03:06 2017 +0000

description:
Allow USB keyboards to attach as console devices.

diffstat:

 sys/arch/evbarm/fdt/fdt_machdep.c |  14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diffs (49 lines):

diff -r ec28234c68c1 -r bd73529ef59b sys/arch/evbarm/fdt/fdt_machdep.c
--- a/sys/arch/evbarm/fdt/fdt_machdep.c Sun Sep 10 22:51:48 2017 +0000
+++ b/sys/arch/evbarm/fdt/fdt_machdep.c Sun Sep 10 23:03:06 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.13 2017/08/24 11:33:28 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.14 2017/09/10 23:03:06 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.13 2017/08/24 11:33:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.14 2017/09/10 23:03:06 jmcneill Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -36,6 +36,8 @@
 #include "opt_multiprocessor.h"
 #include "opt_cpuoptions.h"
 
+#include "ukbd.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -71,6 +73,10 @@
 
 #include <arm/fdt/arm_fdtvar.h>
 
+#if NUKBD > 0
+#include <dev/usb/ukbdvar.h>
+#endif
+
 #ifdef MEMORY_DISK_DYNAMIC
 #include <dev/md.h>
 #endif
@@ -504,6 +510,10 @@
 
        cons->consinit(&faa, uart_freq);
 
+#if NUKBD > 0
+       ukbd_cnattach();        /* allow USB keyboard to become console */
+#endif
+
        initialized = true;
 }