From b51279b544a9edb25a6627e6204f87b12c6de8fa Mon Sep 17 00:00:00 2001 From: Kevin Kirspel Date: Wed, 17 May 2017 08:40:30 -0400 Subject: Modify FREEBSD USB keyboard drivers for use in RTEMS --- freebsd/sys/dev/usb/input/ukbd.c | 2 ++ rtemsbsd/include/rtems/bsd/local/opt_kbd.h | 1 + rtemsbsd/include/rtems/bsd/local/opt_ukbd.h | 1 + 3 files changed, 4 insertions(+) create mode 100644 rtemsbsd/include/rtems/bsd/local/opt_kbd.h create mode 100644 rtemsbsd/include/rtems/bsd/local/opt_ukbd.h 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 */ -- cgit v1.2.3