RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

riotboot/flashwrite: Remove last dependencies on flashpage size

Browse Source
This commit is contained in:
Koen Zandberg 2021-02-01 12:55:26 +01:00
parent c93c3e46d6
commit 5b0eaf7cd8
No known key found for this signature in database
GPG Key ID: 0895A893E6D2985B
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/riotboot/flashwrite.c
View File

@ -49,9 +49,15 @@ size_t riotboot_flashwrite_slotsize(
int riotboot_flashwrite_init_raw(riotboot_flashwrite_t *state, int target_slot, int riotboot_flashwrite_init_raw(riotboot_flashwrite_t *state, int target_slot,
size_t offset) size_t offset)
{ {
#ifdef FLASHPAGE_SIZE
assert(offset <= FLASHPAGE_SIZE); assert(offset <= FLASHPAGE_SIZE);
/* the flashpage size must be a multiple of the riotboot flashpage buffer */ /* the flashpage size must be a multiple of the riotboot flashpage buffer */
static_assert(!(FLASHPAGE_SIZE % RIOTBOOT_FLASHPAGE_BUFFER_SIZE)); static_assert(!(FLASHPAGE_SIZE % RIOTBOOT_FLASHPAGE_BUFFER_SIZE));
#else
/* The flashpage buffer must be a multiple of the write block size */
static_assert(!(RIOTBOOT_FLASHPAGE_BUFFER_SIZE % FLASHPAGE_WRITE_BLOCK_SIZE));
#endif
LOG_INFO(LOG_PREFIX "initializing update to target slot %i\n", LOG_INFO(LOG_PREFIX "initializing update to target slot %i\n",
target_slot); target_slot);
@ -103,15 +109,20 @@ int riotboot_flashwrite_putbytes(riotboot_flashwrite_t *state,
LOG_DEBUG(LOG_PREFIX "processing bytes %u-%u\n", state->offset, state->offset + len - 1); LOG_DEBUG(LOG_PREFIX "processing bytes %u-%u\n", state->offset, state->offset + len - 1);
while (len) { while (len) {
size_t flashpage_pos = state->offset % FLASHPAGE_SIZE; /* Position within the page, calculated from state->offset by
* subtracting the start offset of the current page */
size_t flashpage_pos = state->offset -
(flashpage_addr(state->flashpage) - (void*)riotboot_slot_get_hdr(state->target_slot));
size_t flashwrite_buffer_pos = state->offset % RIOTBOOT_FLASHPAGE_BUFFER_SIZE; size_t flashwrite_buffer_pos = state->offset % RIOTBOOT_FLASHPAGE_BUFFER_SIZE;
size_t flashpage_avail = RIOTBOOT_FLASHPAGE_BUFFER_SIZE - flashwrite_buffer_pos; size_t flashpage_avail = RIOTBOOT_FLASHPAGE_BUFFER_SIZE - flashwrite_buffer_pos;
size_t to_copy = min(flashpage_avail, len); size_t to_copy = min(flashpage_avail, len);
if (CONFIG_RIOTBOOT_FLASHWRITE_RAW && flashpage_pos == 0) { if (CONFIG_RIOTBOOT_FLASHWRITE_RAW &&
flashpage_pos == flashpage_size(state->flashpage)) {
/* Erase the next page */ /* Erase the next page */
state->flashpage++; state->flashpage++;
flashpage_pos = 0;
flashpage_erase(state->flashpage); flashpage_erase(state->flashpage);
} }
if (CONFIG_RIOTBOOT_FLASHWRITE_RAW && if (CONFIG_RIOTBOOT_FLASHWRITE_RAW &&