This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new c872943ef tinyusb/msc_fat_view: Add single slot support
c872943ef is described below

commit c872943efe2e4f2ccc7f6d15c68bc3197893444f
Author: Jerzy Kasenberg <[email protected]>
AuthorDate: Tue Apr 9 12:45:59 2024 +0200

    tinyusb/msc_fat_view: Add single slot support
    
    This add support for single slot build.
    BSP can have just one flash area slot
    in this case only bootlaoder can have support
    for updating application.
    
    Signed-off-by: Jerzy Kasenberg <[email protected]>
---
 hw/usb/tinyusb/msc_fat_view/src/msc_fat_view.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/usb/tinyusb/msc_fat_view/src/msc_fat_view.c 
b/hw/usb/tinyusb/msc_fat_view/src/msc_fat_view.c
index 708b16ade..31a519a2f 100644
--- a/hw/usb/tinyusb/msc_fat_view/src/msc_fat_view.c
+++ b/hw/usb/tinyusb/msc_fat_view/src/msc_fat_view.c
@@ -38,8 +38,13 @@
 
 #if MYNEWT_VAL(BOOT_LOADER)
 #define BOOT_LOADER     1
+#define FLASH_AREA_IMAGE FLASH_AREA_IMAGE_0
 #else
 #define BOOT_LOADER     0
+#define FLASH_AREA_IMAGE FLASH_AREA_IMAGE_1
+#ifndef FLASH_AREA_IMAGE_1
+#error No FLASH_AREA_IMAGE_1 in bsp.yml
+#endif
 #endif
 
 #define FAT_TYPE_FAT12              12
@@ -1488,7 +1493,7 @@ msc_fat_view_write_unallocated_sector(uint32_t sector, 
const uint8_t *buffer)
     if (unallocated_write.write_status < 0) {
         return 512;
     }
-    flash_area_open(BOOT_LOADER ? FLASH_AREA_IMAGE_0 : FLASH_AREA_IMAGE_1, 
&fa);
+    flash_area_open(FLASH_AREA_IMAGE, &fa);
     if (unallocated_write.write_status == NOT_TOUCHED_YET) {
         if (BOOT_LOADER) {
             if (((struct image_header *)buffer)->ih_magic == IMAGE_MAGIC) {

Reply via email to