Module Name: src
Committed By: jmcneill
Date: Sun Sep 10 23:03:06 UTC 2017
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
Allow USB keyboards to attach as console devices.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/fdt/fdt_machdep.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/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.13 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.14
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.13 Thu Aug 24 11:33:28 2017
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Sun Sep 10 23:03:06 2017
@@ -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 <[email protected]>
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep.
#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 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep.
#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 @@ consinit(void)
cons->consinit(&faa, uart_freq);
+#if NUKBD > 0
+ ukbd_cnattach(); /* allow USB keyboard to become console */
+#endif
+
initialized = true;
}
