Add logic to serialize and marshal out-of-band keyboard commands

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5460 42af7a65-404d-4744-a932-0658087f49c3

apps/Make.defs

@@ -37,9 +37,9 @@
 BUILTIN_REGISTRY = $(APPDIR)$(DELIM)builtin$(DELIM)registry
 
 ifeq ($(CONFIG_NUTTX_NEWCONFIG),y)
-DEPCONFIG = $(TOPDIR)/.config
+DEPCONFIG = $(TOPDIR)$(DELIM).config
 else
-DEPCONFIG = $(TOPDIR)/.config $(APPDIR)/.config
+DEPCONFIG = $(TOPDIR)$(DELIM).config $(APPDIR)$(DELIM).config
 endif
 
 define REGISTER

apps/builtin/Makefile

@@ -75,10 +75,10 @@ $(AOBJS): %$(OBJEXT): %.S
 $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)
 
-registry/.updated:
+registry$(DELIM).updated:
 	$(V) $(MAKE) -C registry .updated TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
 
-builtin_list.h: registry/.updated
+builtin_list.h: registry$(DELIM).updated
 	$(call DELFILE, builtin_list.h)
 	$(Q) touch builtin_list.h
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
@@ -92,7 +92,7 @@ else
 	)
 endif
 
-builtin_proto.h: registry/.updated
+builtin_proto.h: registry$(DELIM).updated
 	$(call DELFILE, builtin_proto.h)
 	$(Q) touch builtin_proto.h
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)

nuttx/ChangeLog

@@ -3818,4 +3818,6 @@
 	* arch/arm/src/up_head.S:  Fix backward conditional compilation.  NOTE
 	  there is a issue of ARM9 systems with low vectors and large memories
 	  that will have to be addressed in the future.
-
+	* libc/misc/lib_kbdencode.c and lib_kbddecode.c:  Add logic to marshal
+	  and serialized "out-of-band" keyboard commands intermixed with normal
+	  ASCII data (not yet hooked into anything).

nuttx/include/nuttx/usb/hid.h

@@ -619,7 +619,7 @@
 #define USBHID_KBDUSE_RCTRL               0xe4 /* Keyboard RightControl */
 #define USBHID_KBDUSE_RSHIFT              0xe5 /* Keyboard RightShift */
 #define USBHID_KBDUSE_RALT                0xe6 /* Keyboard RightAlt */
-#define USBHID_KBDUSE_RGUI                0xe7 /* Keyboard Right GUI*/
+#define USBHID_KBDUSE_RGUI                0xe7 /* Keyboard Right GUI */
 
 #define USBHID_KBDUSE_MAX                 0xe7
 

nuttx/libc/misc/Make.defs

@@ -35,7 +35,7 @@
 
 # Add the internal C files to the build
 
-CSRCS += lib_init.c lib_filesem.c
+CSRCS += lib_init.c lib_filesem.c lib_kbdencode.c lib_kbddecode.c
 
 # Add C files that depend on file OR socket descriptors
 

nuttx/libc/misc/lib_kbdencode.c

@@ -0,0 +1,81 @@
+/********************************************************************************************
+ * libc/msic/lib_kbdencode.c
+ * Encoding side of the Keyboard CODEC
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Included Files
+ ********************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <assert.h>
+
+#include <nuttx/streams.h>
+#include <nuttx/ascii.h>
+#include <nuttx/input/kbd_codec.h>
+
+/********************************************************************************************
+ * Pre-Processor Definitions
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Functions
+ ********************************************************************************************/
+
+/****************************************************************************
+ * Name: kbd_putspecial
+ *
+ * Description:
+ *   Put one special, "out-of-band" command into the output stream.
+ *
+ * Input Parameters:
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+void kbd_putspecial(enum kbd_keycode_e keycode,
+                    FAR struct lib_outstream_s *stream)
+{
+  DEBUGASSERT(stream && keycode >= KEYCODE_FWDDEL && keycode <= LAST_KEYCODE);
+
+  stream->put(stream, ASCII_ESC);
+  stream->put(stream, '[');
+  stream->put(stream, (int)keycode);
+  stream->put(stream, ';');
+}
+