Repository: incubator-mynewt-core Updated Branches: refs/heads/develop dbb78037e -> f855c453f
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/boot/bootutil/test/src/testcases/boot_test_nv_ns_01.c ---------------------------------------------------------------------- diff --git a/boot/bootutil/test/src/testcases/boot_test_nv_ns_01.c b/boot/bootutil/test/src/testcases/boot_test_nv_ns_01.c index b4cb4ea..10bb38f 100644 --- a/boot/bootutil/test/src/testcases/boot_test_nv_ns_01.c +++ b/boot/bootutil/test/src/testcases/boot_test_nv_ns_01.c @@ -29,19 +29,11 @@ TEST_CASE(boot_test_nv_ns_01) .ih_ver = { 1, 2, 3, 432 }, }; - struct boot_req req = { - .br_area_descs = boot_test_area_descs, - .br_slot_areas = boot_test_slot_areas, - .br_num_image_areas = BOOT_TEST_AREA_IDX_SCRATCH + 1, - .br_scratch_area_idx = BOOT_TEST_AREA_IDX_SCRATCH, - .br_img_sz = (384 * 1024), - }; - boot_test_util_init_flash(); boot_test_util_write_image(&hdr, 1); boot_test_util_write_hash(&hdr, 1); boot_set_pending(); - boot_test_util_verify_all(&req, BOOT_SWAP_TYPE_REVERT, NULL, &hdr); + boot_test_util_verify_all(BOOT_SWAP_TYPE_REVERT, NULL, &hdr); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/boot/bootutil/test/src/testcases/boot_test_nv_ns_10.c ---------------------------------------------------------------------- diff --git a/boot/bootutil/test/src/testcases/boot_test_nv_ns_10.c b/boot/bootutil/test/src/testcases/boot_test_nv_ns_10.c index a6bbff2..05095f0 100644 --- a/boot/bootutil/test/src/testcases/boot_test_nv_ns_10.c +++ b/boot/bootutil/test/src/testcases/boot_test_nv_ns_10.c @@ -29,17 +29,9 @@ TEST_CASE(boot_test_nv_ns_10) .ih_ver = { 0, 2, 3, 4 }, }; - struct boot_req req = { - .br_area_descs = boot_test_area_descs, - .br_slot_areas = boot_test_slot_areas, - .br_num_image_areas = BOOT_TEST_AREA_IDX_SCRATCH + 1, - .br_scratch_area_idx = BOOT_TEST_AREA_IDX_SCRATCH, - .br_img_sz = (384 * 1024), - }; - boot_test_util_init_flash(); boot_test_util_write_image(&hdr, 0); boot_test_util_write_hash(&hdr, 0); - boot_test_util_verify_all(&req, BOOT_SWAP_TYPE_NONE, &hdr, NULL); + boot_test_util_verify_all(BOOT_SWAP_TYPE_NONE, &hdr, NULL); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/boot/bootutil/test/src/testcases/boot_test_nv_ns_11.c ---------------------------------------------------------------------- diff --git a/boot/bootutil/test/src/testcases/boot_test_nv_ns_11.c b/boot/bootutil/test/src/testcases/boot_test_nv_ns_11.c index 4a43ef2..2191aaa 100644 --- a/boot/bootutil/test/src/testcases/boot_test_nv_ns_11.c +++ b/boot/bootutil/test/src/testcases/boot_test_nv_ns_11.c @@ -38,19 +38,11 @@ TEST_CASE(boot_test_nv_ns_11) .ih_ver = { 1, 2, 3, 432 }, }; - struct boot_req req = { - .br_area_descs = boot_test_area_descs, - .br_slot_areas = boot_test_slot_areas, - .br_num_image_areas = BOOT_TEST_AREA_IDX_SCRATCH + 1, - .br_scratch_area_idx = BOOT_TEST_AREA_IDX_SCRATCH, - .br_img_sz = (384 * 1024), - }; - boot_test_util_init_flash(); boot_test_util_write_image(&hdr0, 0); boot_test_util_write_hash(&hdr0, 0); boot_test_util_write_image(&hdr1, 1); boot_test_util_write_hash(&hdr1, 1); - boot_test_util_verify_all(&req, BOOT_SWAP_TYPE_NONE, &hdr0, &hdr1); + boot_test_util_verify_all(BOOT_SWAP_TYPE_NONE, &hdr0, &hdr1); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/boot/bootutil/test/src/testcases/boot_test_revert.c ---------------------------------------------------------------------- diff --git a/boot/bootutil/test/src/testcases/boot_test_revert.c b/boot/bootutil/test/src/testcases/boot_test_revert.c index f564f7c..4339afb 100644 --- a/boot/bootutil/test/src/testcases/boot_test_revert.c +++ b/boot/bootutil/test/src/testcases/boot_test_revert.c @@ -37,14 +37,6 @@ TEST_CASE(boot_test_revert) .ih_ver = { 1, 2, 3, 432 }, }; - struct boot_req req = { - .br_area_descs = boot_test_area_descs, - .br_slot_areas = boot_test_slot_areas, - .br_num_image_areas = BOOT_TEST_AREA_IDX_SCRATCH + 1, - .br_scratch_area_idx = BOOT_TEST_AREA_IDX_SCRATCH, - .br_img_sz = (384 * 1024), - }; - boot_test_util_init_flash(); boot_test_util_write_image(&hdr0, 0); boot_test_util_write_hash(&hdr0, 0); @@ -54,5 +46,5 @@ TEST_CASE(boot_test_revert) /* Indicate that the image in slot 0 is being tested. */ boot_test_util_mark_revert(); - boot_test_util_verify_all(&req, BOOT_SWAP_TYPE_REVERT, &hdr0, &hdr1); + boot_test_util_verify_all(BOOT_SWAP_TYPE_REVERT, &hdr0, &hdr1); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/boot/bootutil/test/src/testcases/boot_test_revert_continue.c ---------------------------------------------------------------------- diff --git a/boot/bootutil/test/src/testcases/boot_test_revert_continue.c b/boot/bootutil/test/src/testcases/boot_test_revert_continue.c index 4abd87f..1edc898 100644 --- a/boot/bootutil/test/src/testcases/boot_test_revert_continue.c +++ b/boot/bootutil/test/src/testcases/boot_test_revert_continue.c @@ -41,14 +41,6 @@ TEST_CASE(boot_test_revert_continue) .ih_ver = { 1, 2, 3, 432 }, }; - struct boot_req req = { - .br_area_descs = boot_test_area_descs, - .br_slot_areas = boot_test_slot_areas, - .br_num_image_areas = BOOT_TEST_AREA_IDX_SCRATCH + 1, - .br_scratch_area_idx = BOOT_TEST_AREA_IDX_SCRATCH, - .br_img_sz = (384 * 1024), - }; - boot_test_util_init_flash(); boot_test_util_write_image(&hdr0, 0); boot_test_util_write_hash(&hdr0, 0); @@ -61,11 +53,10 @@ TEST_CASE(boot_test_revert_continue) boot_test_util_swap_areas(2, 5); status.idx = 1; - status.elem_sz = 1; status.state = 0; rc = boot_write_status(&status); TEST_ASSERT_FATAL(rc == 0); - boot_test_util_verify_all(&req, BOOT_SWAP_TYPE_REVERT, &hdr0, &hdr1); + boot_test_util_verify_all(BOOT_SWAP_TYPE_REVERT, &hdr0, &hdr1); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/boot/bootutil/test/src/testcases/boot_test_vb_ns_11.c ---------------------------------------------------------------------- diff --git a/boot/bootutil/test/src/testcases/boot_test_vb_ns_11.c b/boot/bootutil/test/src/testcases/boot_test_vb_ns_11.c index 3596e22..7ed538c 100644 --- a/boot/bootutil/test/src/testcases/boot_test_vb_ns_11.c +++ b/boot/bootutil/test/src/testcases/boot_test_vb_ns_11.c @@ -40,14 +40,6 @@ TEST_CASE(boot_test_vb_ns_11) .ih_ver = { 1, 2, 3, 432 }, }; - struct boot_req req = { - .br_area_descs = boot_test_area_descs, - .br_slot_areas = boot_test_slot_areas, - .br_num_image_areas = BOOT_TEST_AREA_IDX_SCRATCH + 1, - .br_scratch_area_idx = BOOT_TEST_AREA_IDX_SCRATCH, - .br_img_sz = (384 * 1024), - }; - boot_test_util_init_flash(); boot_test_util_write_image(&hdr0, 0); boot_test_util_write_hash(&hdr0, 0); @@ -57,5 +49,5 @@ TEST_CASE(boot_test_vb_ns_11) rc = boot_set_pending(); TEST_ASSERT(rc == 0); - boot_test_util_verify_all(&req, BOOT_SWAP_TYPE_TEST, &hdr0, &hdr1); + boot_test_util_verify_all(BOOT_SWAP_TYPE_TEST, &hdr0, &hdr1); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/boot/bootutil/test/src/testcases/boot_test_vm_ns_01.c ---------------------------------------------------------------------- diff --git a/boot/bootutil/test/src/testcases/boot_test_vm_ns_01.c b/boot/bootutil/test/src/testcases/boot_test_vm_ns_01.c index 807f548..b1618c3 100644 --- a/boot/bootutil/test/src/testcases/boot_test_vm_ns_01.c +++ b/boot/bootutil/test/src/testcases/boot_test_vm_ns_01.c @@ -31,14 +31,6 @@ TEST_CASE(boot_test_vm_ns_01) .ih_ver = { 1, 2, 3, 432 }, }; - struct boot_req req = { - .br_area_descs = boot_test_area_descs, - .br_slot_areas = boot_test_slot_areas, - .br_num_image_areas = BOOT_TEST_AREA_IDX_SCRATCH + 1, - .br_scratch_area_idx = BOOT_TEST_AREA_IDX_SCRATCH, - .br_img_sz = (384 * 1024), - }; - boot_test_util_init_flash(); boot_test_util_write_image(&hdr, 1); boot_test_util_write_hash(&hdr, 1); @@ -46,5 +38,5 @@ TEST_CASE(boot_test_vm_ns_01) rc = boot_set_pending(); TEST_ASSERT(rc == 0); - boot_test_util_verify_all(&req, BOOT_SWAP_TYPE_REVERT, NULL, &hdr); + boot_test_util_verify_all(BOOT_SWAP_TYPE_REVERT, NULL, &hdr); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/boot/bootutil/test/src/testcases/boot_test_vm_ns_10.c ---------------------------------------------------------------------- diff --git a/boot/bootutil/test/src/testcases/boot_test_vm_ns_10.c b/boot/bootutil/test/src/testcases/boot_test_vm_ns_10.c index 24c7361..48a51d1 100644 --- a/boot/bootutil/test/src/testcases/boot_test_vm_ns_10.c +++ b/boot/bootutil/test/src/testcases/boot_test_vm_ns_10.c @@ -29,17 +29,9 @@ TEST_CASE(boot_test_vm_ns_10) .ih_ver = { 0, 2, 3, 4 }, }; - struct boot_req req = { - .br_area_descs = boot_test_area_descs, - .br_slot_areas = boot_test_slot_areas, - .br_num_image_areas = BOOT_TEST_AREA_IDX_SCRATCH + 1, - .br_scratch_area_idx = BOOT_TEST_AREA_IDX_SCRATCH, - .br_img_sz = (384 * 1024), - }; - boot_test_util_init_flash(); boot_test_util_write_image(&hdr, 0); boot_test_util_write_hash(&hdr, 0); - boot_test_util_verify_all(&req, BOOT_SWAP_TYPE_NONE, &hdr, NULL); + boot_test_util_verify_all(BOOT_SWAP_TYPE_NONE, &hdr, NULL); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_2areas.c ---------------------------------------------------------------------- diff --git a/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_2areas.c b/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_2areas.c index 19cc2b3..80a8ef3 100644 --- a/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_2areas.c +++ b/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_2areas.c @@ -40,14 +40,6 @@ TEST_CASE(boot_test_vm_ns_11_2areas) .ih_ver = { 1, 2, 3, 432 }, }; - struct boot_req req = { - .br_area_descs = boot_test_area_descs, - .br_slot_areas = boot_test_slot_areas, - .br_num_image_areas = BOOT_TEST_AREA_IDX_SCRATCH + 1, - .br_scratch_area_idx = BOOT_TEST_AREA_IDX_SCRATCH, - .br_img_sz = (384 * 1024), - }; - boot_test_util_init_flash(); boot_test_util_write_image(&hdr0, 0); boot_test_util_write_hash(&hdr0, 0); @@ -57,5 +49,5 @@ TEST_CASE(boot_test_vm_ns_11_2areas) rc = boot_set_pending(); TEST_ASSERT(rc == 0); - boot_test_util_verify_all(&req, BOOT_SWAP_TYPE_TEST, &hdr0, &hdr1); + boot_test_util_verify_all(BOOT_SWAP_TYPE_TEST, &hdr0, &hdr1); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_a.c ---------------------------------------------------------------------- diff --git a/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_a.c b/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_a.c index 7ef5196..cdbc87e 100644 --- a/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_a.c +++ b/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_a.c @@ -38,19 +38,11 @@ TEST_CASE(boot_test_vm_ns_11_a) .ih_ver = { 1, 2, 3, 432 }, }; - struct boot_req req = { - .br_area_descs = boot_test_area_descs, - .br_slot_areas = boot_test_slot_areas, - .br_num_image_areas = BOOT_TEST_AREA_IDX_SCRATCH + 1, - .br_scratch_area_idx = BOOT_TEST_AREA_IDX_SCRATCH, - .br_img_sz = (384 * 1024), - }; - boot_test_util_init_flash(); boot_test_util_write_image(&hdr0, 0); boot_test_util_write_hash(&hdr0, 0); boot_test_util_write_image(&hdr1, 1); boot_test_util_write_hash(&hdr1, 1); - boot_test_util_verify_all(&req, BOOT_SWAP_TYPE_NONE, &hdr0, &hdr1); + boot_test_util_verify_all(BOOT_SWAP_TYPE_NONE, &hdr0, &hdr1); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_b.c ---------------------------------------------------------------------- diff --git a/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_b.c b/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_b.c index 5c79981..d42d0fb 100644 --- a/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_b.c +++ b/boot/bootutil/test/src/testcases/boot_test_vm_ns_11_b.c @@ -40,14 +40,6 @@ TEST_CASE(boot_test_vm_ns_11_b) .ih_ver = { 1, 2, 3, 432 }, }; - struct boot_req req = { - .br_area_descs = boot_test_area_descs, - .br_slot_areas = boot_test_slot_areas, - .br_num_image_areas = BOOT_TEST_AREA_IDX_SCRATCH + 1, - .br_scratch_area_idx = BOOT_TEST_AREA_IDX_SCRATCH, - .br_img_sz = (384 * 1024), - }; - boot_test_util_init_flash(); boot_test_util_write_image(&hdr0, 0); boot_test_util_write_hash(&hdr0, 0); @@ -57,5 +49,5 @@ TEST_CASE(boot_test_vm_ns_11_b) rc = boot_set_pending(); TEST_ASSERT(rc == 0); - boot_test_util_verify_all(&req, BOOT_SWAP_TYPE_TEST, &hdr0, &hdr1); + boot_test_util_verify_all(BOOT_SWAP_TYPE_TEST, &hdr0, &hdr1); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/sys/flash_map/include/flash_map/flash_map.h ---------------------------------------------------------------------- diff --git a/sys/flash_map/include/flash_map/flash_map.h b/sys/flash_map/include/flash_map/flash_map.h index b7f1136..ae8d528 100644 --- a/sys/flash_map/include/flash_map/flash_map.h +++ b/sys/flash_map/include/flash_map/flash_map.h @@ -72,7 +72,7 @@ void flash_area_close(const struct flash_area *); */ int flash_area_read(const struct flash_area *, uint32_t off, void *dst, uint32_t len); -int flash_area_write(const struct flash_area *, uint32_t off, void *src, +int flash_area_write(const struct flash_area *, uint32_t off, const void *src, uint32_t len); int flash_area_erase(const struct flash_area *, uint32_t off, uint32_t len); http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f855c453/sys/flash_map/src/flash_map.c ---------------------------------------------------------------------- diff --git a/sys/flash_map/src/flash_map.c b/sys/flash_map/src/flash_map.c index 124cfeb..6cbfad6 100644 --- a/sys/flash_map/src/flash_map.c +++ b/sys/flash_map/src/flash_map.c @@ -105,13 +105,14 @@ flash_area_read(const struct flash_area *fa, uint32_t off, void *dst, } int -flash_area_write(const struct flash_area *fa, uint32_t off, void *src, +flash_area_write(const struct flash_area *fa, uint32_t off, const void *src, uint32_t len) { if (off > fa->fa_size || off + len > fa->fa_size) { return -1; } - return hal_flash_write(fa->fa_device_id, fa->fa_off + off, src, len); + return hal_flash_write(fa->fa_device_id, fa->fa_off + off, + (void *)src, len); } int
