diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-03 16:25:02 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-03 16:25:02 -0600 |
commit | e64b7e3367eb7356bc7699a6d82c37eb0ec2fade (patch) | |
tree | 0126cfaa285b12bfcb2ca2a5cdc51b011e4b21ee /apps/nshlib/nsh_consolemain.c | |
parent | e196cbac058b891f899a57e05383e911e848c1b8 (diff) | |
download | nuttx-e64b7e3367eb7356bc7699a6d82c37eb0ec2fade.tar.gz nuttx-e64b7e3367eb7356bc7699a6d82c37eb0ec2fade.tar.bz2 nuttx-e64b7e3367eb7356bc7699a6d82c37eb0ec2fade.zip |
NSH: Add an option to take stdin from a USB keyboard device
Diffstat (limited to 'apps/nshlib/nsh_consolemain.c')
-rw-r--r-- | apps/nshlib/nsh_consolemain.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/nshlib/nsh_consolemain.c b/apps/nshlib/nsh_consolemain.c index 42353d3f4..a8e7bd72a 100644 --- a/apps/nshlib/nsh_consolemain.c +++ b/apps/nshlib/nsh_consolemain.c @@ -45,7 +45,7 @@ #include "nsh.h" #include "nsh_console.h" -#ifndef HAVE_USB_CONSOLE +#if !defined(HAVE_USB_CONSOLE) && !defined(HAVE_USB_KEYBOARD) /**************************************************************************** * Pre-processor Definitions @@ -84,8 +84,8 @@ * function does not normally return (see below). * * This version of nsh_consolmain handles generic /dev/console character - * devices (see nsh_usbdev.c for another version for special USB console - * devices). + * devices (see nsh_usbconsole.c and usb_usbkeyboard for other versions + * for special USB console devices). * * Input Parameters: * Standard task start-up arguments. These are not used. argc may be @@ -127,4 +127,4 @@ int nsh_consolemain(int argc, char *argv[]) return ret; } -#endif /* !HAVE_USB_CONSOLE */ +#endif /* !HAVE_USB_CONSOLE && !HAVE_USB_KEYBOARD */ |