From a6051b5d332687876175e0a55dcd32c9022e6288 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 4 Apr 2014 08:56:10 -0600 Subject: Fix a build error when only USB device tracing is enabled (from David Sidrane). Also an update to the USB tracing document --- nuttx/ChangeLog | 8 +++ nuttx/Documentation/UsbTrace.html | 120 +++++++++++++++++++++++++++++++++++++ nuttx/arch/arm/src/sama5/Make.defs | 4 +- 3 files changed, 131 insertions(+), 1 deletion(-) diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index cf1dd50aa..7d192fb53 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -7135,3 +7135,11 @@ crashes. This was fixed by David Sidrane by implementing RAM functions. The killer code is copied and executed from ISRAM and the crash is avoided (2014-4-3). + * configs/sama5d3-xplained/Kconfig and include/board*.h; + configs/sama5d3x-ek/Kconfig and include/board*.h: Add support for + 528MHz CPU clock (2014-4-3). + * arch/arm/src/sama5/Make.defs: Fix a build error that occurs when + only USB device tracing is enabled (2014-4-4). + * Documentation/UsbTrace.html: Add some discussion of the USB monitor + (2014-4-4). + diff --git a/nuttx/Documentation/UsbTrace.html b/nuttx/Documentation/UsbTrace.html index e85377756..767b58736 100644 --- a/nuttx/Documentation/UsbTrace.html +++ b/nuttx/Documentation/UsbTrace.html @@ -328,5 +328,125 @@ static int pl2303_setup(FAR struct uart_dev_s *dev) And the interrupt returns +

USB Monitor. + The USB monitor is an application in the apps/system/usbmonitor that provides a convenient way to get debug trace output. + If tracing is enabled, the USB device will save encoded trace output in in-memory buffer; + if the USB monitor is also enabled, that trace buffer will be periodically emptied and dumped to the + system logging device (the serial console in most configurations). + The following are some of the relevant configuration options: +

+ +

+ NOTE: If USB debug output is also enabled, both outputs will appear on the serial console. + However, the debug output will be asynchronous with the trace output and, hence, difficult to interpret. +

diff --git a/nuttx/arch/arm/src/sama5/Make.defs b/nuttx/arch/arm/src/sama5/Make.defs index fd657060b..181abe1ed 100644 --- a/nuttx/arch/arm/src/sama5/Make.defs +++ b/nuttx/arch/arm/src/sama5/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # arch/arm/sama5/Make.defs # -# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -162,6 +162,7 @@ ifeq ($(CONFIG_SAMA5_UDPHS),y) CHIP_CSRCS += sam_udphs.c endif +ifeq ($(CONFIG_USBHOST),y) ifeq ($(CONFIG_USBHOST_TRACE),y) CHIP_CSRCS += sam_usbhost.c else @@ -169,6 +170,7 @@ ifeq ($(CONFIG_DEBUG_USB),y) CHIP_CSRCS += sam_usbhost.c endif endif +endif ifeq ($(CONFIG_SAMA5_HSMCI0),y) CHIP_CSRCS += sam_hsmci.c sam_hsmci_clkdiv.c -- cgit v1.2.3