sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The USB monitor now works with configs/stm32f4discovery/usbnsh

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5581 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2013-01-29 18:32:04 +00:00
parent bf21cdcb7a
commit 2a9cdbc492
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
nshlib/nsh.h
View File

@ -120,53 +120,53 @@
/* USB trace settings */ /* USB trace settings */
#ifndef CONFIG_USBDEV_TRACE # ifndef CONFIG_USBDEV_TRACE
# undef CONFIG_NSH_USBDEV_TRACE # undef CONFIG_NSH_USBDEV_TRACE
#endif
#ifdef CONFIG_NSH_USBDEV_TRACE
# ifdef CONFIG_NSH_USBDEV_TRACEINIT
# define TRACE_INIT_BITS (TRACE_INIT_BIT)
# else
# define TRACE_INIT_BITS (0)
# endif # endif
# define TRACE_ERROR_BITS (TRACE_DEVERROR_BIT|TRACE_CLSERROR_BIT) # ifdef CONFIG_NSH_USBDEV_TRACE
# ifdef CONFIG_NSH_USBDEV_TRACEINIT
# define TRACE_INIT_BITS (TRACE_INIT_BIT)
# else
# define TRACE_INIT_BITS (0)
# endif
# ifdef CONFIG_NSH_USBDEV_TRACECLASS # define TRACE_ERROR_BITS (TRACE_DEVERROR_BIT|TRACE_CLSERROR_BIT)
# define TRACE_CLASS_BITS (TRACE_CLASS_BIT|TRACE_CLASSAPI_BIT|\
TRACE_CLASSSTATE_BIT)
# else
# define TRACE_CLASS_BITS (0)
# endif
# ifdef CONFIG_NSH_USBDEV_TRACETRANSFERS # ifdef CONFIG_NSH_USBDEV_TRACECLASS
# define TRACE_TRANSFER_BITS (TRACE_OUTREQQUEUED_BIT|TRACE_INREQQUEUED_BIT|\ # define TRACE_CLASS_BITS (TRACE_CLASS_BIT|TRACE_CLASSAPI_BIT|\
TRACE_READ_BIT|TRACE_WRITE_BIT|\ TRACE_CLASSSTATE_BIT)
TRACE_COMPLETE_BIT) # else
# else # define TRACE_CLASS_BITS (0)
# define TRACE_TRANSFER_BITS (0) # endif
# endif
# ifdef CONFIG_NSH_USBDEV_TRACECONTROLLER # ifdef CONFIG_NSH_USBDEV_TRACETRANSFERS
# define TRACE_CONTROLLER_BITS (TRACE_EP_BIT|TRACE_DEV_BIT) # define TRACE_TRANSFER_BITS (TRACE_OUTREQQUEUED_BIT|TRACE_INREQQUEUED_BIT|\
# else TRACE_READ_BIT|TRACE_WRITE_BIT|\
# define TRACE_CONTROLLER_BITS (0) TRACE_COMPLETE_BIT)
# endif # else
# define TRACE_TRANSFER_BITS (0)
# endif
# ifdef CONFIG_NSH_USBDEV_TRACEINTERRUPTS # ifdef CONFIG_NSH_USBDEV_TRACECONTROLLER
# define TRACE_INTERRUPT_BITS (TRACE_INTENTRY_BIT|TRACE_INTDECODE_BIT|\ # define TRACE_CONTROLLER_BITS (TRACE_EP_BIT|TRACE_DEV_BIT)
TRACE_INTEXIT_BIT) # else
# else # define TRACE_CONTROLLER_BITS (0)
# define TRACE_INTERRUPT_BITS (0) # endif
# endif
# define TRACE_BITSET (TRACE_INIT_BITS|TRACE_ERROR_BITS|\ # ifdef CONFIG_NSH_USBDEV_TRACEINTERRUPTS
TRACE_CLASS_BITS|TRACE_TRANSFER_BITS|\ # define TRACE_INTERRUPT_BITS (TRACE_INTENTRY_BIT|TRACE_INTDECODE_BIT|\
TRACE_CONTROLLER_BITS|TRACE_INTERRUPT_BITS) TRACE_INTEXIT_BIT)
# else
# define TRACE_INTERRUPT_BITS (0)
# endif
# endif # define TRACE_BITSET (TRACE_INIT_BITS|TRACE_ERROR_BITS|\
#endif TRACE_CLASS_BITS|TRACE_TRANSFER_BITS|\
TRACE_CONTROLLER_BITS|TRACE_INTERRUPT_BITS)
# endif /* CONFIG_NSH_USBDEV_TRACE */
#endif /* HAVE_USB_CONSOLE */
/* If Telnet is selected for the NSH console, then we must configure /* If Telnet is selected for the NSH console, then we must configure
* the resources used by the Telnet daemon and by the Telnet clients. * the resources used by the Telnet daemon and by the Telnet clients.