diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-06 08:09:33 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-06 08:09:33 -0600 |
| commit | f310c3bb4d17d0810dbe9d39c3a081927f007fc5 (patch) | |
| tree | a39f135ae5589d89d76f5330bcbf058b0f6a1e79 /apps/nshlib | |
| parent | c3070812dbaca9e6368097eae94f406a5a19f21f (diff) | |
| download | nuttx-f310c3bb4d17d0810dbe9d39c3a081927f007fc5.tar.gz nuttx-f310c3bb4d17d0810dbe9d39c3a081927f007fc5.tar.bz2 nuttx-f310c3bb4d17d0810dbe9d39c3a081927f007fc5.zip | |
NSH Keyboard Input: Worked okay until you try to disabled the keyboard
Diffstat (limited to 'apps/nshlib')
| -rw-r--r-- | apps/nshlib/nsh.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h index f15eaf5d6..ac7f7fbc9 100644 --- a/apps/nshlib/nsh.h +++ b/apps/nshlib/nsh.h @@ -171,18 +171,26 @@ */ #undef HAVE_USB_KEYBOARD -#if defined(CONFIG_USBHOST) && !defined(HAVE_USB_CONSOLE) + +/* Check pre-requisites */ + +#if !defined(CONFIG_USBHOST) || !defined(CONFIG_USBHOST_HIDKBD) || \ + defined(HAVE_USB_CONSOLE) +# undef CONFIG_NSH_USBKBD +#endif + +/* Check default settings */ + +#if defined(CONFIG_NSH_USBKBD) /* Check for a USB HID keyboard in the configuration */ -# ifdef CONFIG_USBHOST_HIDKBD -# define HAVE_USB_KEYBOARD 1 +# define HAVE_USB_KEYBOARD 1 /* The default keyboard device is /dev/kbda */ -# ifndef NSH_USBKBD_DEVNAME -# define NSH_USBKBD_DEVNAME "/dev/kbda" -# endif +# ifndef NSH_USBKBD_DEVNAME +# define NSH_USBKBD_DEVNAME "/dev/kbda" # endif #endif /* HAVE_USB_KEYBOARD */ |