diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-01-29 13:30:10 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-01-29 13:30:10 +0000 |
| commit | c54de384c21ce75736f48d6986117d6a560c0dcf (patch) | |
| tree | dae0ab1a333a6c5a5beec4ae170141804fb57c22 /apps | |
| parent | ae5e2d8004affd8a0519de97a3c1ad700fa2b720 (diff) | |
| download | px4-nuttx-c54de384c21ce75736f48d6986117d6a560c0dcf.tar.gz px4-nuttx-c54de384c21ce75736f48d6986117d6a560c0dcf.tar.bz2 px4-nuttx-c54de384c21ce75736f48d6986117d6a560c0dcf.zip | |
USB monitor daemon updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5579 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/system/usbmonitor/Makefile | 11 | ||||
| -rw-r--r-- | apps/system/usbmonitor/usbmonitor.c | 10 |
2 files changed, 13 insertions, 8 deletions
diff --git a/apps/system/usbmonitor/Makefile b/apps/system/usbmonitor/Makefile index b4c323eb7..56b6ccee1 100644 --- a/apps/system/usbmonitor/Makefile +++ b/apps/system/usbmonitor/Makefile @@ -41,8 +41,7 @@ ifeq ($(WINTOOL),y) INCDIROPT = -w endif -# Hello Application -# TODO: appname can be automatically extracted from the directory name +# USB Monitor Application PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 768 @@ -88,11 +87,13 @@ $(COBJS): %$(OBJEXT): %.c # Register application ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) -$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile +$(BUILTIN_REGISTRY)$(DELIM)usbmonitor_start.bdat: $(DEPCONFIG) Makefile $(call REGISTER,"usbmon_start",$(PRIORITY),$(STACKSIZE),usbmonitor_start) - $(call REGISTER,"usbmon_stop",$(PRIORITY),$(STACKSIZE),usbmonintor_stop) -context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +$(BUILTIN_REGISTRY)$(DELIM)usbmonitor_stop.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,"usbmon_stop",$(PRIORITY),$(STACKSIZE),usbmonitor_stop) + +context: $(BUILTIN_REGISTRY)$(DELIM)usbmonitor_start.bdat $(BUILTIN_REGISTRY)$(DELIM)usbmonitor_stop.bdat else context: endif diff --git a/apps/system/usbmonitor/usbmonitor.c b/apps/system/usbmonitor/usbmonitor.c index b615b99f9..b386c3c2e 100644 --- a/apps/system/usbmonitor/usbmonitor.c +++ b/apps/system/usbmonitor/usbmonitor.c @@ -42,9 +42,12 @@ #include <sys/types.h> #include <stdbool.h> -#include <debug.h> +#include <unistd.h> +#include <sched.h> +#include <syslog.h> +#include <errno.h> -#include <nuttx/usb/usbdev_trace.h" +#include <nuttx/usb/usbdev_trace.h> #ifdef CONFIG_SYSTEM_USBMONITOR @@ -89,7 +92,8 @@ static int usbmonitor_daemon(int argc, char **argv) while (!g_usbmonitor.stop) { - (void)usbmonitor_enumerate(nsh_tracecallback, NULL); + sleep(2); + (void)usbtrace_enumerate(usbmonitor_tracecallback, NULL); } /* Stopped */ |