Beginning of apps/system/usbmonitor (incomplete); more LM4F changes from JP

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

ChangeLog.txt

@@ -495,3 +495,5 @@
 	* apps/examples/nettest and poll:  Complete Kconfig files.
 	* apps/examples/ostest/waitpid.c:  Need to use WEXITSTATUS()
 	  to decode the correct exit status.
+	* system/usbmonitor:  A daemon that can be used to monitor USB
+	  trace outpout.

system/Kconfig

@@ -34,3 +34,7 @@ endmenu
 menu "Sysinfo"
 source "$APPSDIR/system/sysinfo/Kconfig"
 endmenu
+
+menu "USB Monitor"
+source "$APPSDIR/system/usbmonitor/Kconfig"
+endmenu

system/Make.defs

@@ -66,3 +66,6 @@ ifeq ($(CONFIG_SYSTEM_SYSINFO),y)
 CONFIGURED_APPS += system/sysinfo
 endif
 
+ifeq ($(CONFIG_SYSTEM_USBMONITOR),y)
+CONFIGURED_APPS += system/usbmonitor
+endif

system/Makefile

@@ -37,7 +37,7 @@
 
 # Sub-directories containing system task
 
-SUBDIRS = free i2c install readline poweroff ramtron sdcard sysinfo
+SUBDIRS = free i2c install readline poweroff ramtron sdcard sysinfo usbmonitor
 
 # Create the list of installed runtime modules (INSTALLED_DIRS)
 

system/free/README.txt

@@ -1,6 +0,0 @@
-
-This application provides UNIX style memory free information.
-
-	Source: NuttX
-	Author: Gregory Nutt <gnutt@nuttx.org>
-	Date: 17. March 2011

system/poweroff/README.txt

@@ -1,5 +0,0 @@
-
-This application provides poweroff command
-
-	Source: NuttX
-	Date: 13. March 2011

system/ramtron/README.txt

@@ -1,7 +0,0 @@
-
-This application provides RAMTRON tool/lib to start, stop or to perform
-RAMTRON custom operations.
-
-	Source: NuttX
-	Author: Uros Platise
-	Date: 18. March 2011

system/sdcard/README.txt

@@ -1,7 +0,0 @@
-
-This application provides SDcard tool/lib to start, stop, eject or insert
-a memory card.
-
-	Source: NuttX
-	Author: Uros Platise
-	Date: 18. March 2011

system/sysinfo/README.txt

@@ -1,6 +0,0 @@
-
-This application provides access to System Information
-
-	Source: NuttX
-	Date: 15. April 2011
-    Author: Uros Platise <uros.platise@isotel.eu>

system/usbmonitor/Kconfig

@@ -0,0 +1,33 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+config SYSTEM_USBMONITOR
+	bool "USB Monitor"
+	default n
+	depends on USBDEV && USBDEV_TRACE && SYSLOG
+	---help---
+		If USB device tracing is enabled (USBDEV_TRACE), then this option
+		will select the USB monitor.  The USB monitor is a daemon that will
+		periodically collect the buffered USB trace data and dump it to the
+		SYSLOG device.
+
+if SYSTEM_USBMONITOR
+
+config SYSTEM_USBMONITOR_STACKSIZE
+	int "USB Monitor Stack Size"
+	default 2048
+	depends on NSH_BUILTIN_APPS
+	---help---
+		The stack size to use the the USB monitor daemon.  Default: 2048
+
+config SYSTEM_USBMONITOR_PRIORITY
+	int "USB Monitor Stack Size"
+	default 50
+	depends on NSH_BUILTIN_APPS
+	---help---
+		The priority to use the the USB monitor daemon.  Default: 50
+
+endif
+

system/usbmonitor/Makefile

@@ -0,0 +1,116 @@
+############################################################################
+# apps/system/usbmonitor/Makefile
+#
+#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Author: 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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+ifeq ($(WINTOOL),y)
+INCDIROPT	= -w
+endif
+
+# Hello Application
+# TODO: appname can be automatically extracted from the directory name
+
+APPNAME		= usbmon
+PRIORITY	= SCHED_PRIORITY_DEFAULT
+STACKSIZE	= 768
+
+ASRCS		=
+CSRCS		= usbmonitor.c
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  BIN		= ..\..\libapps$(LIBEXT)
+else
+ifeq ($(WINTOOL),y)
+  BIN		= ..\\..\\libapps$(LIBEXT)
+else
+  BIN		= ../../libapps$(LIBEXT)
+endif
+endif
+
+ROOTDEPPATH	= --dep-path .
+
+# Common build
+
+VPATH		= 
+
+all:	.built
+.PHONY: context depend clean distclean
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+.built: $(OBJS)
+	$(call ARCHIVE, $(BIN), $(OBJS))
+	$(Q) touch .built
+
+# Register application
+
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
+	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+
+context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
+else
+context:
+endif
+
+# Create dependencies
+
+.depend: Makefile $(SRCS)
+	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
+
+depend: .depend
+
+clean:
+	$(call DELFILE, .built)
+	$(call CLEAN)
+
+distclean: clean
+	$(call DELFILE, Make.dep)
+	$(call DELFILE, .depend)
+
+-include Make.dep

system/usbmonitor/usbmonitor.c

@@ -0,0 +1,162 @@
+/****************************************************************************
+ * apps/system/free/free.c
+ *
+ *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Author: 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 <nuttx/progmem.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/****************************************************************************
+ * Private Typs
+ ****************************************************************************/
+
+struct usbmon_state_s
+{
+#ifdef CONFIG_NSH_BUILTIN_APPS
+  volatile bool started;
+  volatile bool stop;
+  pid_t pid;
+#endif
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct usbmon_state_s g_usbmonitor;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int usbmonitor_daemon(int argc, char **argv)
+{
+#ifdef CONFIG_NSH_BUILTIN_APPS
+  print("USB Monitor running: %d\n", g_usbmonitor.pid);
+#endif
+
+#ifdef CONFIG_NSH_BUILTIN_APPS
+  /* If we are running as an NSH command, then loop until we detect that
+   * there is a request to stop.
+   */
+
+  while (!g_usbmonitor.stop)
+#else
+  /* If we are running as a standalone program, then loop forever */
+
+  for (;;)
+#endif
+    {
+#warning "Missing logic"
+    }
+
+  /* Stopped */
+
+#ifdef CONFIG_NSH_BUILTIN_APPS
+  g_usbmonitor.stop    = false;
+  g_usbmonitor.started = false;
+  print("USB Monitor stopped: %d\n", g_usbmonitor.pid);
+#endif
+  return 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int usbmonitor_main(int argc, char **argv)
+{
+#ifdef CONFIG_NSH_BUILTIN_APPS
+  /* Has the monitor already started? */
+
+  sched_lock();
+  if (!g_usbmonitor.started)
+    {
+      int ret;
+
+      /* No.. start it now */
+ 
+      g_usbmonitor.started = true;
+      g_usbmonitor.stop    = false;
+
+      ret = TASK_CREATE("USB Monitor", CONFIG_SYSTEM_USBMONITOR_PRIORITY,
+                        CONFIG_SYSTEM_USBMONITOR_STACKSIZE,
+                        (main_t)usbmonitor_daemon, (const char **)NULL);
+      if (ret < 0)
+        {
+          int errcode = errno;
+          fprintf(stderr, "ERROR: Failed to start the USB monitor: %d\n",
+                  errcode);
+        }
+      else
+        {
+          g_usbmonitor.pid = ret;
+          print("USB Monitor started: %d\n", g_usbmonitor.pid);
+        }
+
+      sched_unlock();
+      return 0;
+    }
+
+  sched_unlock();
+  print("USB Monitor running: %d\n", g_usbmonitor.pid);
+  return 0;
+#else
+  return usbmonitor_daemon(argc, argv);
+#endif
+}
+
+#ifdef CONFIG_NSH_BUILTIN_APPS
+int usbmonitor_stop(int argc, char **argv)
+{
+  /* Has the monitor already started? */
+
+  if (g_usbmonitor.started)
+    {
+      print("USB Monitor stopping: %d\n", g_usbmonitor.pid);
+      g_usbmonitor.stop = true;
+      return 0;
+    }
+
+  print("USB Monitor stopped: %d\n", g_usbmonitor.pid);
+  return 0;
+}
+#endif
+