summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--freebsd/sys/dev/usb/input/ukbd.c2
-rw-r--r--rtemsbsd/include/rtems/bsd/local/opt_kbd.h1
-rw-r--r--rtemsbsd/include/rtems/bsd/local/opt_ukbd.h1
3 files changed, 4 insertions, 0 deletions
diff --git a/freebsd/sys/dev/usb/input/ukbd.c b/freebsd/sys/dev/usb/input/ukbd.c
index 5c6f5583..e463f5ee 100644
--- a/freebsd/sys/dev/usb/input/ukbd.c
+++ b/freebsd/sys/dev/usb/input/ukbd.c
@@ -1994,8 +1994,10 @@ ukbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
/*
* XXX Check if someone is calling us from a critical section:
*/
+#ifndef __rtems__
if (curthread->td_critnest != 0)
return (EDEADLK);
+#endif /* __rtems__ */
/*
* XXX KDGKBSTATE, KDSKBSTATE and KDSETLED can be called from any
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_kbd.h b/rtemsbsd/include/rtems/bsd/local/opt_kbd.h
new file mode 100644
index 00000000..a0686759
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_kbd.h
@@ -0,0 +1 @@
+#define KBD_INSTALL_CDEV 1
diff --git a/rtemsbsd/include/rtems/bsd/local/opt_ukbd.h b/rtemsbsd/include/rtems/bsd/local/opt_ukbd.h
new file mode 100644
index 00000000..936ffd88
--- /dev/null
+++ b/rtemsbsd/include/rtems/bsd/local/opt_ukbd.h
@@ -0,0 +1 @@
+/* EMPTY */