From 6ebd56f299b9f855b5bfdca3b48163f335ce44e8 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Tue, 29 Jan 2013 18:32:04 +0000
Subject: The USB monitor now works with configs/stm32f4discovery/usbnsh

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5581 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/nshlib/nsh.h | 78 +++++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

(limited to 'apps/nshlib')

diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h
index 705375e7e..168503580 100644
--- a/apps/nshlib/nsh.h
+++ b/apps/nshlib/nsh.h
@@ -120,53 +120,53 @@
 
 /* USB trace settings */
 
-#ifndef CONFIG_USBDEV_TRACE
-#  undef CONFIG_NSH_USBDEV_TRACE
-#endif 
+#  ifndef CONFIG_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
+#  ifdef CONFIG_NSH_USBDEV_TRACE
+#    ifdef CONFIG_NSH_USBDEV_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)
+#    define TRACE_ERROR_BITS        (TRACE_DEVERROR_BIT|TRACE_CLSERROR_BIT)
 
-#  ifdef CONFIG_NSH_USBDEV_TRACECLASS
-#    define TRACE_CLASS_BITS      (TRACE_CLASS_BIT|TRACE_CLASSAPI_BIT|\
-                                   TRACE_CLASSSTATE_BIT)
-#  else
-#    define TRACE_CLASS_BITS      (0)
-#  endif
+#    ifdef CONFIG_NSH_USBDEV_TRACECLASS
+#      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
-#    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_NSH_USBDEV_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_NSH_USBDEV_TRACECONTROLLER
-#    define TRACE_CONTROLLER_BITS (TRACE_EP_BIT|TRACE_DEV_BIT)
-#  else
-#    define TRACE_CONTROLLER_BITS (0)
-#  endif
+#    ifdef CONFIG_NSH_USBDEV_TRACECONTROLLER
+#      define TRACE_CONTROLLER_BITS (TRACE_EP_BIT|TRACE_DEV_BIT)
+#    else
+#      define TRACE_CONTROLLER_BITS (0)
+#    endif
 
-#  ifdef CONFIG_NSH_USBDEV_TRACEINTERRUPTS
-#    define TRACE_INTERRUPT_BITS  (TRACE_INTENTRY_BIT|TRACE_INTDECODE_BIT|\
-                                   TRACE_INTEXIT_BIT)
-#  else
-#    define TRACE_INTERRUPT_BITS  (0)
-#  endif
+#    ifdef CONFIG_NSH_USBDEV_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)
+#    define TRACE_BITSET            (TRACE_INIT_BITS|TRACE_ERROR_BITS|\
+                                     TRACE_CLASS_BITS|TRACE_TRANSFER_BITS|\
+                                     TRACE_CONTROLLER_BITS|TRACE_INTERRUPT_BITS)
 
-#  endif
-#endif
+#  endif /* CONFIG_NSH_USBDEV_TRACE */
+#endif /* HAVE_USB_CONSOLE */
 
 /* If Telnet is selected for the NSH console, then we must configure
  * the resources used by the Telnet daemon and by the Telnet clients.
-- 
cgit v1.2.3