Remove apps/system/usbmonitor. It has been moved to nuttx/drivers/usbmonitor.
This commit is contained in:
Gregory Nutt
parent
c7c5039519
commit
8a03660c72
@ -1,96 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
* apps/include/usbmonitor.h
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifndef __APPS_INCLUDE_USBMONITOR_H
|
|
||||||
#define __APPS_INCLUDE_USBMONITOR_H
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Included Files
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include <nuttx/config.h>
|
|
||||||
|
|
||||||
#ifdef CONFIG_SYSTEM_USBMONITOR
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Pre-processor Definitions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Data
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
#define EXTERN extern "C"
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
#else
|
|
||||||
#define EXTERN extern
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Function Prototypes
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: usbmon_start and usbmon_stop
|
|
||||||
*
|
|
||||||
* Start and top the USB monitor daemon. These are normally controlled
|
|
||||||
* from the USB command line, but the ability to control these
|
|
||||||
* programmatically is also helpful (for example, so that the daemon is
|
|
||||||
* running before NSH starts).
|
|
||||||
*
|
|
||||||
* Input Parameters:
|
|
||||||
* Standard task parameters. These can be called or spawned. Since the
|
|
||||||
* return almost immediately, it is fine to just call the functions. The
|
|
||||||
* parameters are not used so you can pass 0 and NULL, respectivley; this
|
|
||||||
* is done this way so that these functions can be NSH builtin
|
|
||||||
* applications.
|
|
||||||
*
|
|
||||||
* Returned values:
|
|
||||||
* Standard task return values (zero meaning success).
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
int usbmonitor_start(int argc, char **argv);
|
|
||||||
int usbmonitor_stop(int argc, char **argv);
|
|
||||||
|
|
||||||
#undef EXTERN
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* CONFIG_SYSTEM_USBMONITOR */
|
|
||||||
#endif /* __APPS_INCLUDE_USBMONITOR_H */
|
|
||||||
@ -920,7 +920,7 @@ config NSH_USBDEV_TRACE
|
|||||||
data will go to the SYSLOG device.
|
data will go to the SYSLOG device.
|
||||||
|
|
||||||
If not enabled, the USB trace support can be provided by external
|
If not enabled, the USB trace support can be provided by external
|
||||||
logic such as apps/system/usbmonitor.
|
logic such as nuttx/drivers/usbmonitor.
|
||||||
|
|
||||||
if NSH_USBDEV_TRACE
|
if NSH_USBDEV_TRACE
|
||||||
|
|
||||||
|
|||||||
11
system/usbmonitor/.gitignore
vendored
11
system/usbmonitor/.gitignore
vendored
@ -1,11 +0,0 @@
|
|||||||
/Make.dep
|
|
||||||
/.depend
|
|
||||||
/.built
|
|
||||||
/*.asm
|
|
||||||
/*.rel
|
|
||||||
/*.lst
|
|
||||||
/*.sym
|
|
||||||
/*.adb
|
|
||||||
/*.lib
|
|
||||||
/*.src
|
|
||||||
/*.obj
|
|
||||||
@ -1,70 +0,0 @@
|
|||||||
#
|
|
||||||
# For a description of the syntax of this configuration file,
|
|
||||||
# see the file kconfig-language.txt in the NuttX tools repository.
|
|
||||||
#
|
|
||||||
|
|
||||||
menuconfig SYSTEM_USBMONITOR
|
|
||||||
bool "USB Monitor"
|
|
||||||
default n
|
|
||||||
depends on (USBDEV && USBDEV_TRACE) || (USBHOST && USBHOST_TRACE)
|
|
||||||
---help---
|
|
||||||
If USB device tracing (USBDEV_TRACE) AND/OR USB host tracing
|
|
||||||
(USBHOST_TRACE) are enabled 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 daemon stack size"
|
|
||||||
default 2048
|
|
||||||
---help---
|
|
||||||
The stack size to use the the USB monitor daemon. Default: 2048
|
|
||||||
|
|
||||||
config SYSTEM_USBMONITOR_PRIORITY
|
|
||||||
int "USB Monitor daemon priority"
|
|
||||||
default 50
|
|
||||||
---help---
|
|
||||||
The priority to use the the USB monitor daemon. Default: 50
|
|
||||||
|
|
||||||
config SYSTEM_USBMONITOR_INTERVAL
|
|
||||||
int "USB Monitor dump frequency"
|
|
||||||
default 2
|
|
||||||
---help---
|
|
||||||
The rate in seconds that the USB monitor will wait before dumping
|
|
||||||
the next set of buffered USB trace data. Default: 2 seconds.
|
|
||||||
|
|
||||||
if USBDEV && USBDEV_TRACE
|
|
||||||
config SYSTEM_USBMONITOR_TRACEINIT
|
|
||||||
bool "Show USB device initialization events"
|
|
||||||
default n
|
|
||||||
---help---
|
|
||||||
Show initialization events
|
|
||||||
|
|
||||||
config SYSTEM_USBMONITOR_TRACECLASS
|
|
||||||
bool "Show USB device class driver events"
|
|
||||||
default n
|
|
||||||
---help---
|
|
||||||
Show class driver events
|
|
||||||
|
|
||||||
config SYSTEM_USBMONITOR_TRACETRANSFERS
|
|
||||||
bool "Show USB device data transfer events"
|
|
||||||
default n
|
|
||||||
---help---
|
|
||||||
Show data transfer events
|
|
||||||
|
|
||||||
config SYSTEM_USBMONITOR_TRACECONTROLLER
|
|
||||||
bool "Show USB device controller events"
|
|
||||||
default n
|
|
||||||
---help---
|
|
||||||
Show controller events
|
|
||||||
|
|
||||||
config SYSTEM_USBMONITOR_TRACEINTERRUPTS
|
|
||||||
bool "Show USB device interrupt-related events"
|
|
||||||
default n
|
|
||||||
---help---
|
|
||||||
Show interrupt-related events
|
|
||||||
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
############################################################################
|
|
||||||
# apps/system/usbmonitor/Make.defs
|
|
||||||
# Adds selected applications to apps/ build
|
|
||||||
#
|
|
||||||
# Copyright (C) 2016 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.
|
|
||||||
#
|
|
||||||
############################################################################
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_SYSTEM_USBMONITOR),y)
|
|
||||||
CONFIGURED_APPS += system/usbmonitor
|
|
||||||
endif
|
|
||||||
|
|
||||||
@ -1,121 +0,0 @@
|
|||||||
############################################################################
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# USB Monitor Application
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
install:
|
|
||||||
|
|
||||||
# Register application
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
|
|
||||||
$(BUILTIN_REGISTRY)$(DELIM)usbmonitor_start.bdat: $(DEPCONFIG) Makefile
|
|
||||||
$(call REGISTER,"usbmon_start",$(PRIORITY),$(STACKSIZE),usbmonitor_start)
|
|
||||||
|
|
||||||
$(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
|
|
||||||
|
|
||||||
# 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
|
|
||||||
.PHONY: preconfig
|
|
||||||
preconfig:
|
|
||||||
@ -1,265 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
* apps/system/usbmonitor/usbmonitor.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 <sys/types.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <sched.h>
|
|
||||||
#include <syslog.h>
|
|
||||||
#include <errno.h>
|
|
||||||
|
|
||||||
#include <nuttx/usb/usbdev_trace.h>
|
|
||||||
#include <nuttx/usb/usbhost_trace.h>
|
|
||||||
|
|
||||||
#ifdef CONFIG_SYSTEM_USBMONITOR
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Pre-processor Definitions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#define USBMON_PREFIX "USB Monitor: "
|
|
||||||
|
|
||||||
/* Configuration ************************************************************/
|
|
||||||
|
|
||||||
#ifndef CONFIG_SYSTEM_USBMONITOR_STACKSIZE
|
|
||||||
# define CONFIG_SYSTEM_USBMONITOR_STACKSIZE 2048
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CONFIG_SYSTEM_USBMONITOR_PRIORITY
|
|
||||||
# define CONFIG_SYSTEM_USBMONITOR_PRIORITY 50
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CONFIG_SYSTEM_USBMONITOR_INTERVAL
|
|
||||||
# define CONFIG_SYSTEM_USBMONITOR_INTERVAL 2
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* USB device trace selection */
|
|
||||||
|
|
||||||
#ifdef CONFIG_USBDEV_TRACE
|
|
||||||
# ifdef CONFIG_SYSTEM_USBMONITOR_TRACEINIT
|
|
||||||
# define TRACE_INIT_BITS (TRACE_INIT_BIT)
|
|
||||||
# else
|
|
||||||
# define TRACE_INIT_BITS (0)
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# define TRACE_ERROR_BITS (TRACE_DEVERROR_BIT|TRACE_CLSERROR_BIT)
|
|
||||||
|
|
||||||
# ifdef CONFIG_SYSTEM_USBMONITOR_TRACECLASS
|
|
||||||
# define TRACE_CLASS_BITS (TRACE_CLASS_BIT|TRACE_CLASSAPI_BIT|\
|
|
||||||
TRACE_CLASSSTATE_BIT)
|
|
||||||
# else
|
|
||||||
# define TRACE_CLASS_BITS (0)
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# ifdef CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS
|
|
||||||
# define TRACE_TRANSFER_BITS (TRACE_OUTREQQUEUED_BIT|TRACE_INREQQUEUED_BIT|\
|
|
||||||
TRACE_READ_BIT|TRACE_WRITE_BIT|\
|
|
||||||
TRACE_COMPLETE_BIT)
|
|
||||||
# else
|
|
||||||
# define TRACE_TRANSFER_BITS (0)
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# ifdef CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER
|
|
||||||
# define TRACE_CONTROLLER_BITS (TRACE_EP_BIT|TRACE_DEV_BIT)
|
|
||||||
# else
|
|
||||||
# define TRACE_CONTROLLER_BITS (0)
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# ifdef CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS
|
|
||||||
# define TRACE_INTERRUPT_BITS (TRACE_INTENTRY_BIT|TRACE_INTDECODE_BIT|\
|
|
||||||
TRACE_INTEXIT_BIT)
|
|
||||||
# else
|
|
||||||
# define TRACE_INTERRUPT_BITS (0)
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# define TRACE_BITSET (TRACE_INIT_BITS|TRACE_ERROR_BITS|\
|
|
||||||
TRACE_CLASS_BITS|TRACE_TRANSFER_BITS|\
|
|
||||||
TRACE_CONTROLLER_BITS|TRACE_INTERRUPT_BITS)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Private Types
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
struct usbmon_state_s
|
|
||||||
{
|
|
||||||
volatile bool started;
|
|
||||||
volatile bool stop;
|
|
||||||
pid_t pid;
|
|
||||||
};
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Private Data
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
static struct usbmon_state_s g_usbmonitor;
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Private Functions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifdef CONFIG_USBDEV_TRACE
|
|
||||||
static int usbtrace_syslog(FAR const char *fmt, ...)
|
|
||||||
{
|
|
||||||
va_list ap;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
/* Let vsyslog do the real work */
|
|
||||||
|
|
||||||
va_start(ap, fmt);
|
|
||||||
ret = vsyslog(LOG_INFO, fmt, ap);
|
|
||||||
va_end(ap);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int usbmonitor_tracecallback(struct usbtrace_s *trace, void *arg)
|
|
||||||
{
|
|
||||||
usbtrace_trprintf(usbtrace_syslog, trace->event, trace->value);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int usbmonitor_daemon(int argc, char **argv)
|
|
||||||
{
|
|
||||||
syslog(LOG_INFO, USBMON_PREFIX "Running: %d\n", g_usbmonitor.pid);
|
|
||||||
|
|
||||||
/* Loop until we detect that there is a request to stop. */
|
|
||||||
|
|
||||||
while (!g_usbmonitor.stop)
|
|
||||||
{
|
|
||||||
sleep(CONFIG_SYSTEM_USBMONITOR_INTERVAL);
|
|
||||||
#ifdef CONFIG_USBDEV_TRACE
|
|
||||||
(void)usbtrace_enumerate(usbmonitor_tracecallback, NULL);
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_USBHOST_TRACE
|
|
||||||
(void)usbhost_trdump();
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Stopped */
|
|
||||||
|
|
||||||
g_usbmonitor.stop = false;
|
|
||||||
g_usbmonitor.started = false;
|
|
||||||
syslog(LOG_INFO, USBMON_PREFIX "Stopped: %d\n", g_usbmonitor.pid);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Functions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
int usbmonitor_start(int argc, char **argv)
|
|
||||||
{
|
|
||||||
/* Has the monitor already started? */
|
|
||||||
|
|
||||||
sched_lock();
|
|
||||||
if (!g_usbmonitor.started)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
/* No.. start it now */
|
|
||||||
|
|
||||||
#ifdef CONFIG_USBDEV_TRACE
|
|
||||||
/* First, initialize any USB tracing options that were requested */
|
|
||||||
|
|
||||||
usbtrace_enable(TRACE_BITSET);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Then start the USB monitoring daemon */
|
|
||||||
|
|
||||||
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, (FAR char * const *)NULL);
|
|
||||||
if (ret < 0)
|
|
||||||
{
|
|
||||||
int errcode = errno;
|
|
||||||
syslog(LOG_INFO, USBMON_PREFIX
|
|
||||||
"ERROR: Failed to start the USB monitor: %d\n",
|
|
||||||
errcode);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
g_usbmonitor.pid = ret;
|
|
||||||
syslog(LOG_INFO, USBMON_PREFIX "Started: %d\n",
|
|
||||||
g_usbmonitor.pid);
|
|
||||||
}
|
|
||||||
|
|
||||||
sched_unlock();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
sched_unlock();
|
|
||||||
syslog(LOG_INFO, USBMON_PREFIX "%s: %d\n",
|
|
||||||
g_usbmonitor.stop ? "Stopping" : "Running", g_usbmonitor.pid);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int usbmonitor_stop(int argc, char **argv)
|
|
||||||
{
|
|
||||||
/* Has the monitor already started? */
|
|
||||||
|
|
||||||
if (g_usbmonitor.started)
|
|
||||||
{
|
|
||||||
/* Stop the USB monitor. The next time the monitor wakes up,
|
|
||||||
* it will see the the stop indication and will exist.
|
|
||||||
*/
|
|
||||||
|
|
||||||
syslog(LOG_INFO, USBMON_PREFIX "Stopping: %d\n", g_usbmonitor.pid);
|
|
||||||
g_usbmonitor.stop = true;
|
|
||||||
|
|
||||||
#ifdef CONFIG_USBDEV_TRACE
|
|
||||||
/* We may as well disable tracing since there is no listener */
|
|
||||||
|
|
||||||
usbtrace_enable(0);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
syslog(LOG_INFO, USBMON_PREFIX "Stopped: %d\n", g_usbmonitor.pid);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* CONFIG_SYSTEM_USBMONITOR */
|
|
||||||
Loading…
x
Reference in New Issue
Block a user