Add a TODO to check for Supply Voltage before setting F4 paralleisme to 32 bits

[fw/stlink] / src / stlink-common.c

diff --git a/src/stlink-common.c b/src/stlink-common.c
index 632c222ef5205f91fbe6353c83381ab00b921448..5a51314240eceab6d68bf2d4144f4fd1c6b7aecf 100644 (file)
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -803,6 +803,8 @@ int stlink_fread(stlink_t* sl, const char* path, stm32_addr_t addr, size_t size)
 
     int error = -1;
     size_t off;
+    int num_empty = 0;
+    unsigned char erased_pattern =(sl->chip_id == STM32_CHIPID_L1_MEDIUM)?0:0xff;
 
     const int fd = open(path, O_RDWR | O_TRUNC | O_CREAT, 00700);
     if (fd == -1) {
@@ -810,10 +812,17 @@ int stlink_fread(stlink_t* sl, const char* path, stm32_addr_t addr, size_t size)
         return -1;
     }
 
+    if (size <1)
+       size = sl->flash_size;
+
+    if (size > sl->flash_size)
+       size = sl->flash_size;
+
     /* do the copy by 1k blocks */
     for (off = 0; off < size; off += 1024) {
         size_t read_size = 1024;
        size_t rounded_size;
+       size_t index;
         if ((off + read_size) > size)
          read_size = size - off;
 
@@ -824,12 +833,21 @@ int stlink_fread(stlink_t* sl, const char* path, stm32_addr_t addr, size_t size)
 
         stlink_read_mem32(sl, addr + off, rounded_size);
 
+       for(index = 0; index < read_size; index ++) {
+           if (sl->q_buf[index] == erased_pattern)
+               num_empty ++;
+           else
+               num_empty = 0;
+       }
         if (write(fd, sl->q_buf, read_size) != (ssize_t) read_size) {
             fprintf(stderr, "write() != read_size\n");
             goto on_error;
         }
     }
 
+    /* Ignore NULL Bytes at end of file */
+    ftruncate(fd, size - num_empty);
+
     /* success */
     error = 0;
 
@@ -1227,6 +1245,7 @@ int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, unsigned
        /* First unlock the cr */
        unlock_flash_if(sl);
 
+       /* TODO: Check that Voltage range is 2.7 - 3.6 V */
        /* set parallelisim to 32 bit*/
        write_flash_cr_psiz(sl, 2);
 
@@ -1409,11 +1428,23 @@ int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, unsigned
 int stlink_fwrite_flash(stlink_t *sl, const char* path, stm32_addr_t addr) {
     /* write the file in flash at addr */
     int err;
+    unsigned int num_empty = 0, index;
+    unsigned char erased_pattern =(sl->chip_id == STM32_CHIPID_L1_MEDIUM)?0:0xff;
     mapped_file_t mf = MAPPED_FILE_INITIALIZER;
     if (map_file(&mf, path) == -1) {
         WLOG("map_file() == -1\n");
         return -1;
     }
+    for(index = 0; index < mf.len; index ++) {
+       if (mf.base[index] == erased_pattern)
+           num_empty ++;
+       else
+           num_empty = 0;
+    }
+    if(num_empty != 0) {
+       ILOG("Ignoring %d bytes of Zeros at end of file\n",num_empty);
+       mf.len -= num_empty;
+    }
     err = stlink_write_flash(sl, addr, mf.base, mf.len);
     unmap_file(&mf);
     return err;