<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16557">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">minor: improve trace output<br><br>the USB trace now respects the global setting.<br>the verbosity is also decreased, not showing USB activity unless<br>debugging.<br>this also saves some space.<br><br>the reset cause is now printed.<br>the strings increase the bootloader size, but it already exceeded<br>the 16 kB limit when trace level is set to info.<br><br>Change-Id: I9ba08d4bb4f188f6e7a202ea86acb7a42a2054f3<br>---<br>M firmware/apps/dfu/main.c<br>M firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c<br>M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c<br>3 files changed, 23 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c</span><br><span>index 3d0cc1e..5aafc7c 100644</span><br><span>--- a/firmware/apps/dfu/main.c</span><br><span>+++ b/firmware/apps/dfu/main.c</span><br><span>@@ -257,11 +257,24 @@</span><br><span> "=============================================================================\n\r",</span><br><span> manifest_revision, manifest_board);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);</span><br><span style="color: hsl(120, 100%, 40%);">+#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);</span><br><span> TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",</span><br><span> g_unique_id[0], g_unique_id[1],</span><br><span> g_unique_id[2], g_unique_id[3]);</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Reset Cause: 0x%lx\n\r", reset_cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ static const char* reset_causes[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "general reset (first power-up reset)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "backup reset (return from backup mode)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "watchdog reset (watchdog fault occurred)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "software reset (processor reset required by the software)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "user reset (NRST pin detected low)",</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (reset_cause < ARRAY_SIZE(reset_causes)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> #if (TRACE_LEVEL >= TRACE_LEVEL_INFO)</span><br><span> /* Find out why we are in the DFU bootloader, and not the main application */</span><br><span>diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c</span><br><span>index 2f56602..3fe3270 100644</span><br><span>--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c</span><br><span>+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c</span><br><span>@@ -45,11 +45,6 @@</span><br><span> * Headers</span><br><span> *---------------------------------------------------------------------------*/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef TRACE_LEVEL</span><br><span style="color: hsl(0, 100%, 40%);">-#undef TRACE_LEVEL</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-#define TRACE_LEVEL TRACE_LEVEL_WARNING</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include "chip.h"</span><br><span> #include "USBD_HAL.h"</span><br><span> #include <usb/device/dfu/dfu.h></span><br><span>@@ -1138,7 +1133,7 @@</span><br><span> /* Resume (Wakeup) */</span><br><span> if ((status & (UDP_ISR_WAKEUP | UDP_ISR_RXRSM)) != 0) {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("Res ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("Res ");</span><br><span> /* Clear and disable resume interrupts */</span><br><span> UDP->UDP_ICR = UDP_ICR_WAKEUP | UDP_ICR_RXRSM | UDP_ICR_RXSUSP;</span><br><span> UDP->UDP_IDR = UDP_IDR_WAKEUP | UDP_IDR_RXRSM;</span><br><span>@@ -1150,7 +1145,7 @@</span><br><span> This interrupt is always treated last (hence the '==') */</span><br><span> if (status == UDP_ISR_RXSUSP) {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("Susp ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("Susp ");</span><br><span> /* Enable wakeup */</span><br><span> UDP->UDP_IER = UDP_IER_WAKEUP | UDP_IER_RXRSM;</span><br><span> /* Acknowledge interrupt */</span><br><span>@@ -1161,7 +1156,7 @@</span><br><span> /* End of bus reset */</span><br><span> else if ((status & UDP_ISR_ENDBUSRES) != 0) {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("EoBRes ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("EoBRes ");</span><br><span> </span><br><span> #if defined(BOARD_USB_DFU)</span><br><span> #if defined(APPLICATION_dfu)</span><br><span>@@ -1202,7 +1197,7 @@</span><br><span> </span><br><span> if (status != 0) {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("\n\r - ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("\n\r - ");</span><br><span> }</span><br><span> }</span><br><span> eptnum++;</span><br><span>@@ -1211,7 +1206,7 @@</span><br><span> </span><br><span> /* Toggle LED back to its previous state */</span><br><span> TRACE_DEBUG_WP("!");</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("\n\r");</span><br><span> if (USBD_GetState() >= USBD_STATE_POWERED) {</span><br><span> </span><br><span> //LED_Clear(USBD_LEDUSB);</span><br><span>@@ -1361,7 +1356,7 @@</span><br><span> UDP->UDP_IER = (1 << bEndpoint);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("CfgEp%d ", bEndpoint);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("CfgEp%d ", bEndpoint);</span><br><span> return bEndpoint;</span><br><span> }</span><br><span> </span><br><span>@@ -1529,7 +1524,7 @@</span><br><span> UDP_EnableUsbClock();</span><br><span> UDP_EnableTransceiver();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("RWUp ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("RWUp ");</span><br><span> </span><br><span> // Activates a remote wakeup (edge on ESR), then clear ESR</span><br><span> UDP->UDP_GLB_STAT |= UDP_GLB_STAT_ESR;</span><br><span>diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c</span><br><span>index e95c67b..1cca7ab 100644</span><br><span>--- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c</span><br><span>+++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c</span><br><span>@@ -85,7 +85,7 @@</span><br><span> {</span><br><span> uint8_t u8 = g_dfu->state;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("handle_getstate(%ld)\n\r", g_dfu->state);</span><br><span> </span><br><span> USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16557">change 16557</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/simtrace2/+/16557"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9ba08d4bb4f188f6e7a202ea86acb7a42a2054f3 </div>
<div style="display:none"> Gerrit-Change-Number: 16557 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: tsaitgaist <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>