From 27448f5a6f8ed867e8ddab77f5b9663e9dadc20f Mon Sep 17 00:00:00 2001
From: Fabien Le Mentec <texane@gmail.com>
Date: Sat, 22 Oct 2011 16:07:13 -0500
Subject: [PATCH] [fix] stm32l flash write

---
 example/blink_flash/Makefile |  2 +-
 example/blink_flash/main.c   |  4 ---
 src/stlink-common.c          | 10 +++++---
 src/stlink-common.h          |  1 +
 src/stlink-usb.c             | 48 ++++++++++++++++++++++++++----------
 5 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/example/blink_flash/Makefile b/example/blink_flash/Makefile
index 7776471..2c74c32 100644
--- a/example/blink_flash/Makefile
+++ b/example/blink_flash/Makefile
@@ -8,7 +8,7 @@ CFLAGS=-O2 -mlittle-endian -mthumb
 
 CFLAGS=-g -O2 -mlittle-endian -mthumb
 ifeq ($(CONFIG_STM32L_DISCOVERY), 1)
-	CFLAGS+=-mcpu=cortex-m3 -DCONFIG_STM32L_DISCOVERY
+	CFLAGS+=-mcpu=cortex-m3 -DCONFIG_STM32L_DISCOVERY=1
 else ifeq ($(CONFIG_STM32VL_DISCOVERY), 1)
 	CFLAGS+=-mcpu=cortex-m3 -DCONFIG_STM32VL_DISCOVERY=1
 else ifeq ($(CONFIG_STM32F4_DISCOVERY), 1)
diff --git a/example/blink_flash/main.c b/example/blink_flash/main.c
index e93fd72..6a89356 100644
--- a/example/blink_flash/main.c
+++ b/example/blink_flash/main.c
@@ -5,10 +5,6 @@ typedef unsigned int uint32_t;
 
 /* hardware configuration */
 
-#define CONFIG_STM32L_DISCOVERY 1
-#define CONFIG_STM32VL_DISCOVERY 0
-
-
 #if CONFIG_STM32VL_DISCOVERY
 
 # define GPIOC 0x40011000 /* port C */
diff --git a/src/stlink-common.c b/src/stlink-common.c
index 354bab1..960375b 100644
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -670,14 +670,16 @@ int stlink_fread(stlink_t* sl, const char* path, stm32_addr_t addr, size_t size)
     /* do the copy by 1k blocks */
     for (off = 0; off < size; off += 1024) {
         size_t read_size = 1024;
+	size_t rounded_size;
         if ((off + read_size) > size)
-            read_size = off + read_size;
+	  read_size = size - off;
 
         /* round size if needed */
-        if (read_size & 3)
-            read_size = (read_size + 4) & ~(3);
+	rounded_size = read_size;
+        if (rounded_size & 3)
+	  rounded_size = (rounded_size + 4) & ~(3);
 
-        stlink_read_mem32(sl, addr + off, read_size);
+        stlink_read_mem32(sl, addr + off, rounded_size);
 
         if (write(fd, sl->q_buf, read_size) != (ssize_t) read_size) {
             fprintf(stderr, "write() != read_size\n");
diff --git a/src/stlink-common.h b/src/stlink-common.h
index 9481609..080a8d6 100644
--- a/src/stlink-common.h
+++ b/src/stlink-common.h
@@ -162,6 +162,7 @@ extern "C" {
 #define STM32_FLASH_BASE 0x08000000
 #define STM32_FLASH_SIZE (128 * 1024)
 #define STM32_FLASH_PGSZ 1024
+#define STM32L_FLASH_PGSZ 256
         stm32_addr_t flash_base;
         size_t flash_size;
         size_t flash_pgsz;
diff --git a/src/stlink-usb.c b/src/stlink-usb.c
index ff9ef71..e7a9ba6 100644
--- a/src/stlink-usb.c
+++ b/src/stlink-usb.c
@@ -586,19 +586,6 @@ stlink_t* stlink_open_usb(const int verbose) {
     
     sl->core_stat = STLINK_CORE_STAT_UNKNOWN;
 
-    /* flash memory settings */
-    sl->flash_base = STM32_FLASH_BASE;
-    sl->flash_size = STM32_FLASH_SIZE;
-    sl->flash_pgsz = STM32_FLASH_PGSZ;
-
-    /* system memory */
-    sl->sys_base = STM32_SYSTEM_BASE;
-    sl->sys_size = STM32_SYSTEM_SIZE;
-
-    /* sram memory settings */
-    sl->sram_base = STM32_SRAM_BASE;
-    sl->sram_size = STM32L_SRAM_SIZE;
-
     if (libusb_init(&(slu->libusb_ctx))) {
 	fprintf(stderr, "failed to init libusb context, wrong version of libraries?\n");
 	goto on_error;
@@ -698,6 +685,41 @@ stlink_t* stlink_open_usb(const int verbose) {
       stlink_exit_dfu_mode(sl);
     }
     stlink_version(sl);
+
+    /* per device family initialization */
+    stlink_core_id(sl);
+    if (sl->core_id == 0x2ba01477) /* stm32l */ {
+
+      /* flash memory settings */
+      sl->flash_base = STM32_FLASH_BASE;
+      sl->flash_size = STM32_FLASH_SIZE;
+      sl->flash_pgsz = STM32L_FLASH_PGSZ;
+
+      /* system memory */
+      sl->sys_base = STM32_SYSTEM_BASE;
+      sl->sys_size = STM32_SYSTEM_SIZE;
+
+      /* sram memory settings */
+      sl->sram_base = STM32_SRAM_BASE;
+      sl->sram_size = STM32L_SRAM_SIZE;
+
+    } else /* stm32vl */ {
+
+      /* flash memory settings */
+      sl->flash_base = STM32_FLASH_BASE;
+      sl->flash_size = STM32_FLASH_SIZE;
+      sl->flash_pgsz = STM32_FLASH_PGSZ;
+
+      /* system memory */
+      sl->sys_base = STM32_SYSTEM_BASE;
+      sl->sys_size = STM32_SYSTEM_SIZE;
+
+      /* sram memory settings */
+      sl->sram_base = STM32_SRAM_BASE;
+      sl->sram_size = STM32_SRAM_SIZE;
+
+    }
+
     error = 0;
 
 on_libusb_error:
-- 
2.30.2