Introduce a new knob to force the first USB keyboard as console input.

By setting "machdep.forceukbd=1" you can now use your USB keyboard in
ddb(4) even if your BIOS emulates a pckbd(4).

ok tom@, kettenis@, deraadt@

2 files changed, 5 insertions, 4 deletions

diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index e68738a3a06..ab63d70946c 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbc.c,v 1.49 2015/05/24 10:57:47 miod Exp $ */
+/* $OpenBSD: pckbc.c,v 1.50 2017/03/11 11:55:03 mpi Exp $ */
 /* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */
 
 /*
@@ -81,12 +81,11 @@ int pckbc_attach_slot(struct pckbc_softc *, pckbc_slot_t, int);
 int pckbc_submatch_locators(struct device *, void *, void *);
 int pckbc_submatch(struct device *, void *, void *);
 int pckbcprint(void *, const char *);
-void pckbc_release_console(void);
 
 struct pckbc_internal pckbc_consdata;
 int pckbc_console_attached;
 
-static int pckbc_console;
+int pckbc_console;
 static struct pckbc_slotdata pckbc_cons_slotdata;
 
 static int pckbc_wait_output(bus_space_tag_t, bus_space_handle_t);
diff --git a/sys/dev/ic/pckbcvar.h b/sys/dev/ic/pckbcvar.h
index 8adc5d97be7..bc254bcf7a0 100644
--- a/sys/dev/ic/pckbcvar.h
+++ b/sys/dev/ic/pckbcvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbcvar.h,v 1.15 2015/05/24 10:57:47 miod Exp $ */
+/* $OpenBSD: pckbcvar.h,v 1.16 2017/03/11 11:55:03 mpi Exp $ */
 /* $NetBSD: pckbcvar.h,v 1.4 2000/06/09 04:58:35 soda Exp $ */
 
 /*
@@ -110,6 +110,8 @@ void pckbc_reset(struct pckbc_softc *);
 void pckbc_stop(struct pckbc_softc *);
 int pckbcintr(void *);
 
+void pckbc_release_console(void);
+
 /*
  * Device configuration flags (cf_flags).
  */