<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9862">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">DFU: switch green LED on to indicate DFU mode, and red LED to indicate flashing activity<br><br>Change-Id: I8e34fd869ed94ad122d6a17f5a432f5a09b820bb<br>---<br>M firmware/apps/dfu/main.c<br>1 file changed, 39 insertions(+), 23 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 3d55fdc..26cbb8c 100644</span><br><span>--- a/firmware/apps/dfu/main.c</span><br><span>+++ b/firmware/apps/dfu/main.c</span><br><span>@@ -13,6 +13,12 @@</span><br><span> /* remember if the watchdog has been configured in the main loop so we can kick it in the ISR */</span><br><span> static bool watchdog_configured = false;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* There is not enough space in the 16 KiB DFU bootloader to include led.h functions */</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef PINS_LEDS</span><br><span style="color: hsl(120, 100%, 40%);">+/** LED pin configurations */</span><br><span style="color: hsl(120, 100%, 40%);">+static const Pin pinsLeds[] = { PINS_LEDS } ;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*----------------------------------------------------------------------------</span><br><span> * Callbacks</span><br><span> *----------------------------------------------------------------------------*/</span><br><span>@@ -42,53 +48,62 @@</span><br><span> </span><br><span> printf("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef PINS_LEDS</span><br><span style="color: hsl(120, 100%, 40%);">+ PIO_Clear(&pinsLeds[LED_NUM_RED]);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (altif) {</span><br><span> case ALTIF_RAM:</span><br><span> addr = RAM_ADDR(offset);</span><br><span> if (addr < IRAM_ADDR || addr + len >= IRAM_ADDR + IRAM_SIZE || addr + len >= stack_addr) {</span><br><span> g_dfu->state = DFU_STATE_dfuERROR;</span><br><span> g_dfu->status = DFU_STATUS_errADDRESS;</span><br><span style="color: hsl(0, 100%, 40%);">- return DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> memcpy((void *)addr, data, len);</span><br><span style="color: hsl(0, 100%, 40%);">- return DFU_RET_ZLP;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = DFU_RET_ZLP;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case ALTIF_FLASH:</span><br><span> addr = FLASH_ADDR(offset);</span><br><span> if (addr < IFLASH_ADDR || addr + len >= IFLASH_ADDR + IFLASH_SIZE) {</span><br><span> g_dfu->state = DFU_STATE_dfuERROR;</span><br><span> g_dfu->status = DFU_STATUS_errADDRESS;</span><br><span style="color: hsl(0, 100%, 40%);">- return DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> rc = FLASHD_Unlock(addr, addr + len, 0, 0);</span><br><span> if (rc != 0) {</span><br><span> TRACE_ERROR("DFU download flash unlock failed\n\r");</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: set error codes */</span><br><span style="color: hsl(0, 100%, 40%);">- return DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> rc = FLASHD_Write(addr, data, len);</span><br><span> if (rc != 0) {</span><br><span> TRACE_ERROR("DFU download flash erase failed\n\r");</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: set error codes */</span><br><span style="color: hsl(0, 100%, 40%);">- return DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> for (i = 0; i < len; i++) {</span><br><span> if (((uint8_t*)addr)[i]!=data[i]) {</span><br><span> TRACE_ERROR("DFU download flash data written not correct\n\r");</span><br><span style="color: hsl(0, 100%, 40%);">- return DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rc = FLASHD_Lock(addr, addr + len, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_ERROR("DFU download flash lock failed\n\r");</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: set error codes */</span><br><span style="color: hsl(0, 100%, 40%);">- return DFU_RET_STALL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return DFU_RET_ZLP;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = DFU_RET_ZLP;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: set error codes */</span><br><span> TRACE_ERROR("DFU download for unknown AltIf %d\n\r", altif);</span><br><span style="color: hsl(0, 100%, 40%);">- return DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = DFU_RET_STALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef PINS_LEDS</span><br><span style="color: hsl(120, 100%, 40%);">+ PIO_Set(&pinsLeds[LED_NUM_RED]);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> }</span><br><span> </span><br><span> /* incoming call-back: Host has requested to read back 'req_len' bytes</span><br><span>@@ -187,17 +202,18 @@</span><br><span> unsigned int i = 0;</span><br><span> uint32_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if 0</span><br><span style="color: hsl(0, 100%, 40%);">- led_init();</span><br><span style="color: hsl(0, 100%, 40%);">- led_blink(LED_GREEN, BLINK_3O_30F);</span><br><span style="color: hsl(0, 100%, 40%);">- led_blink(LED_RED, BLINK_3O_30F);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Enable watchdog for 2000ms, with no window */</span><br><span> WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |</span><br><span> (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));</span><br><span> watchdog_configured = true;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef PINS_LEDS</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Configure LED */</span><br><span style="color: hsl(120, 100%, 40%);">+ PIO_Configure(pinsLeds, sizeof(pinsLeds));</span><br><span style="color: hsl(120, 100%, 40%);">+ PIO_Set(&pinsLeds[LED_NUM_RED]);</span><br><span style="color: hsl(120, 100%, 40%);">+ PIO_Clear(&pinsLeds[LED_NUM_GREEN]);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> PIO_InitializeInterrupts(0);</span><br><span> </span><br><span> EEFC_ReadUniqueID(g_unique_id);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9862">change 9862</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/9862"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8e34fd869ed94ad122d6a17f5a432f5a09b820bb </div>
<div style="display:none"> Gerrit-Change-Number: 9862 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Kévin Redon <kredon@sysmocom.de> </div>