diff options
| author | Kevin Kirspel <kevin-kirspel@idexx.com> | 2017-05-17 08:40:30 -0400 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-05-19 07:24:30 +0200 |
| commit | b51279b544a9edb25a6627e6204f87b12c6de8fa (patch) | |
| tree | 96caae6744bcef34fec4a8ccf62a5beaf8b075d4 | |
| parent | Add USB UGEN support for RTEMS (diff) | |
| download | rtems-libbsd-b51279b544a9edb25a6627e6204f87b12c6de8fa.tar.bz2 | |
Modify FREEBSD USB keyboard drivers for use in RTEMS
| -rw-r--r-- | freebsd/sys/dev/usb/input/ukbd.c | 2 | ||||
| -rw-r--r-- | rtemsbsd/include/rtems/bsd/local/opt_kbd.h | 1 | ||||
| -rw-r--r-- | rtemsbsd/include/rtems/bsd/local/opt_ukbd.h | 1 |
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 */ |