catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-17 05:38:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix g_dfu access from both DFU and runtime access

Browse Source 
We need to refer to g_dfu as a pointer from all code.  In DFU mode, it
gets assigned to the address of _g_dfu, which is placed by the linker
script at the start of RAM.  In runtime mode, the pointer is statically
defined to point at the start of RAM.  The linker script for the runtime
(dfu environment) is adjusted to save the first 32 bytes for the _g_dfu
structure.
This commit is contained in:
Harald Welte
2017-02-28 01:02:24 +01:00
parent 65cca7cccc
commit adba0ce80b
6 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/apps/dfu/main.c
View File

@@ -35,8 +35,8 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
case ALTIF_RAM:
addr = RAM_ADDR(offset);
if (addr > IRAM_ADDR + IRAM_SIZE) {
g_dfu.state = DFU_STATE_dfuERROR;
g_dfu.status = DFU_STATUS_errADDRESS;
g_dfu->state = DFU_STATE_dfuERROR;
g_dfu->status = DFU_STATUS_errADDRESS;
return DFU_RET_STALL;
}
memcpy((void *)addr, data, len);
@@ -44,8 +44,8 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
case ALTIF_FLASH:
addr = FLASH_ADDR(offset);
if (addr > IFLASH_ADDR + IFLASH_SIZE) {
g_dfu.state = DFU_STATE_dfuERROR;
g_dfu.status = DFU_STATUS_errADDRESS;
g_dfu->state = DFU_STATE_dfuERROR;
g_dfu->status = DFU_STATUS_errADDRESS;
return DFU_RET_STALL;
}
rc = FLASHD_Write(addr, data, len);
@@ -75,8 +75,8 @@ int USBDFU_handle_upload(uint8_t altif, unsigned int offset,
case ALTIF_RAM:
addr = RAM_ADDR(offset);
if (addr > IRAM_ADDR + IRAM_SIZE) {
g_dfu.state = DFU_STATE_dfuERROR;
g_dfu.status = DFU_STATUS_errADDRESS;
g_dfu->state = DFU_STATE_dfuERROR;
g_dfu->status = DFU_STATUS_errADDRESS;
return -1;
}
if ((uint8_t *)addr + req_len > IRAM_END)
@@ -86,8 +86,8 @@ int USBDFU_handle_upload(uint8_t altif, unsigned int offset,
case ALTIF_FLASH:
addr = FLASH_ADDR(offset);
if (addr > IFLASH_ADDR + IFLASH_SIZE) {
g_dfu.state = DFU_STATE_dfuERROR;
g_dfu.status = DFU_STATUS_errADDRESS;
g_dfu->state = DFU_STATE_dfuERROR;
g_dfu->status = DFU_STATUS_errADDRESS;
return -1;
}
if ((uint8_t *)addr + req_len > IFLASH_END)