deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

work in progress

Browse source
This commit is contained in:
Marcus Priesch 2017-08-19 22:11:13 +02:00
parent ed638a5f5a
commit 140f43f4c1
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
examples/osd/ota-update/res_upload_image.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Marcus Priesch, Ralf Schlatterbeck * Copyright (C) 2017, Marcus Priesch, Ralf Schlatterbeck
* with code from the res-plugtest-large-update.c by * with code from the res-plugtest-large-update.c by
* Copyright (c) 2013, Institute for Pervasive Computing, ETH Zurich * Copyright (c) 2013, Institute for Pervasive Computing, ETH Zurich
* All rights reserved. * All rights reserved.
@ -149,16 +149,31 @@ res_put_handler(void *request, void *response, uint8_t *buffer, uint16_t preferr
} }
memcpy (current_page + current_offset % PAGESIZE, in_data, len); memcpy (current_page + current_offset % PAGESIZE, in_data, len);
if (current_offset % PAGESIZE == 0 || !packet->block1_more) { current_offset += len;
// WRITE Flash here
PRINTF (("Flashing: %lu\n", (uint32_t)len)); if (current_offset % PAGESIZE == 0) {
uint32_t dst_address = partition_start + current_offset - PAGESIZE;
PRINTF (("Flashing: %lu to %lu\n", (uint32_t)PAGESIZE, dst_address));
sreg = SREG; sreg = SREG;
cli (); cli ();
bootloader_write_page_to_flash bootloader_write_page_to_flash (dst_address, PAGESIZE, current_page);
(partition_start + current_offset, len, current_page); SREG = sreg;
} else if (!packet->block1_more) {
uint32_t dst_address =
partition_start + (current_offset / PAGESIZE) * PAGESIZE;
PRINTF (("Flashing: last page %lu to %lu\n", (uint32_t)PAGESIZE, dst_address));
sreg = SREG;
cli ();
bootloader_write_page_to_flash (dst_address, PAGESIZE, current_page);
SREG = sreg; SREG = sreg;
} }
current_offset += len;
if (!packet->block1_more) {
// we are finished
bootloader_backup_irq_table (1); // FIXME: 1 is hardcoded
bootloader_set_boot_next (1);
}
REST.set_response_status(response, REST.status.CHANGED); REST.set_response_status(response, REST.status.CHANGED);
coap_set_header_block1(response, packet->block1_num, 0, packet->block1_size); coap_set_header_block1(response, packet->block1_num, 0, packet->block1_size);