From f310c3bb4d17d0810dbe9d39c3a081927f007fc5 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sun, 6 Jul 2014 08:09:33 -0600
Subject: NSH Keyboard Input:  Worked okay until you try to disabled the
 keyboard

---
 apps/nshlib/nsh.h | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'apps/nshlib')

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 */
 
-- 
cgit v1.2.3