Merge pull request #102 from prattmic/master

Fix the stlink-sg backend to leave space for new functions

diff --git a/src/stlink-common.c b/src/stlink-common.c
index a86d9854926ecf6928264187538f9ef7b08e618e..e142233f79095a493bc74b18eb1d78cd1e88158a 100644 (file)
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -936,7 +936,9 @@ int stlink_fread(stlink_t* sl, const char* path, stm32_addr_t addr, size_t size)
     }
 
     /* Ignore NULL Bytes at end of file */
-    ftruncate(fd, size - num_empty);
+    if (!ftruncate(fd, size - num_empty)) {
+        error = -1;
+    }
 
     /* success */
     error = 0;
@@ -1452,7 +1454,7 @@ int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, unsigned
                for(off = 0; off < len;) {
                        size_t size = len - off > 0x8000 ? 0x8000 : len - off;
 
-                       printf("size: %u\n", size);
+                       printf("size: %zu\n", size);
 
                        if (run_flash_loader(sl, &fl, addr + off, base + off, size) == -1) {
                                WLOG("run_flash_loader(%#zx) failed! == -1\n", addr + off);

diff --git a/src/stlink-sg.c b/src/stlink-sg.c
index 4cae3ee119316a27bc61139df10179193ef0924d..ae610bac7d71ac9cf85ff9d5d4417bd73da63c8a 100644 (file)
--- a/src/stlink-sg.c
+++ b/src/stlink-sg.c
@@ -872,6 +872,9 @@ stlink_backend_t _stlink_sg_backend = {
     _stlink_sg_write_mem8,
     _stlink_sg_read_all_regs,
     _stlink_sg_read_reg,
+    NULL,                   /* read_all_unsupported_regs */
+    NULL,                   /* read_unsupported_regs */
+    NULL,                   /* write_unsupported_regs */
     _stlink_sg_write_reg,
     _stlink_sg_step,
     _stlink_sg_current_mode,