wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-09 16:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

ota_rw612: ensure source buffer is aligned

Browse Source
This commit is contained in:
robert committed 2026-09-24 15:26:18 +03:00
1 parent 1be11a66e3
commit 4d6fa4b91c
2 files changed
+10 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+5 -7
View File
@@ -12777,24 +12777,22 @@ MG_IRAM static bool mg_frdm_write(void *addr, const void *buf, size_t len) {
} }
uint32_t status; uint32_t status;
uint32_t dst_ofs = (uint32_t) dst - (uint32_t) s_mg_flash_frdm.start; uint32_t dst_ofs = (uint32_t) dst - (uint32_t) s_mg_flash_frdm.start;
size_t tmp_buf_size = s_mg_flash_frdm.align / sizeof(uint32_t);
uint32_t tmp[tmp_buf_size];
if ((char *) buf >= (char *) s_mg_flash_frdm.start && if ((char *) buf >= (char *) s_mg_flash_frdm.start &&
(char *) buf < (char *) buf <
(char *) (s_mg_flash_frdm.start + s_mg_flash_frdm.size)) { (char *) (s_mg_flash_frdm.start + s_mg_flash_frdm.size)) {
// If we copy from FLASH to FLASH, then we first need to copy the source // If we copy from FLASH to FLASH, then we first need to copy the source
// to RAM // to RAM
size_t tmp_buf_size = s_mg_flash_frdm.align / sizeof(uint32_t);
uint32_t tmp[tmp_buf_size];
for (size_t i = 0; i < tmp_buf_size; i++) { for (size_t i = 0; i < tmp_buf_size; i++) {
flash_wait(); flash_wait();
tmp[i] = src[i]; tmp[i] = src[i];
} }
status = flexspi_nor->page_program(MG_FLEXSPI_NOR_INSTANCE, &config,
(uint32_t) dst_ofs, tmp, false);
} else { } else {
status = flexspi_nor->page_program(MG_FLEXSPI_NOR_INSTANCE, &config, memcpy(tmp, src, sizeof(tmp));
(uint32_t) dst_ofs, src, false);
} }
status = flexspi_nor->page_program(MG_FLEXSPI_NOR_INSTANCE, &config,
(uint32_t) dst_ofs, tmp, false);
src = (uint32_t *) ((char *) src + s_mg_flash_frdm.align); src = (uint32_t *) ((char *) src + s_mg_flash_frdm.align);
dst = (uint32_t *) ((char *) dst + s_mg_flash_frdm.align); dst = (uint32_t *) ((char *) dst + s_mg_flash_frdm.align);
if (status != 0) { if (status != 0) {
src/ota_rw612.c
+5 -7
View File
@@ -291,24 +291,22 @@ MG_IRAM static bool mg_frdm_write(void *addr, const void *buf, size_t len) {
} }
uint32_t status; uint32_t status;
uint32_t dst_ofs = (uint32_t) dst - (uint32_t) s_mg_flash_frdm.start; uint32_t dst_ofs = (uint32_t) dst - (uint32_t) s_mg_flash_frdm.start;
size_t tmp_buf_size = s_mg_flash_frdm.align / sizeof(uint32_t);
uint32_t tmp[tmp_buf_size];
if ((char *) buf >= (char *) s_mg_flash_frdm.start && if ((char *) buf >= (char *) s_mg_flash_frdm.start &&
(char *) buf < (char *) buf <
(char *) (s_mg_flash_frdm.start + s_mg_flash_frdm.size)) { (char *) (s_mg_flash_frdm.start + s_mg_flash_frdm.size)) {
// If we copy from FLASH to FLASH, then we first need to copy the source // If we copy from FLASH to FLASH, then we first need to copy the source
// to RAM // to RAM
size_t tmp_buf_size = s_mg_flash_frdm.align / sizeof(uint32_t);
uint32_t tmp[tmp_buf_size];
for (size_t i = 0; i < tmp_buf_size; i++) { for (size_t i = 0; i < tmp_buf_size; i++) {
flash_wait(); flash_wait();
tmp[i] = src[i]; tmp[i] = src[i];
} }
status = flexspi_nor->page_program(MG_FLEXSPI_NOR_INSTANCE, &config,
(uint32_t) dst_ofs, tmp, false);
} else { } else {
status = flexspi_nor->page_program(MG_FLEXSPI_NOR_INSTANCE, &config, memcpy(tmp, src, sizeof(tmp));
(uint32_t) dst_ofs, src, false);
} }
status = flexspi_nor->page_program(MG_FLEXSPI_NOR_INSTANCE, &config,
(uint32_t) dst_ofs, tmp, false);
src = (uint32_t *) ((char *) src + s_mg_flash_frdm.align); src = (uint32_t *) ((char *) src + s_mg_flash_frdm.align);
dst = (uint32_t *) ((char *) dst + s_mg_flash_frdm.align); dst = (uint32_t *) ((char *) dst + s_mg_flash_frdm.align);
if (status != 0) { if (status != 0) {