X-Git-Url: https://git.gag.com/?p=fw%2Fstlink;a=blobdiff_plain;f=src%2Fstlink-common.c;fp=src%2Fstlink-common.c;h=a73801b169a036f428bee9792d4e94a6c4e24010;hp=26b36cd24121cf8c8b77ecff059a3893f75c52f7;hb=ddebad96deee5960b35630aa4db1500003abe619;hpb=1ffd636c6a2e3a3913394693862c92814e355567

diff --git a/src/stlink-common.c b/src/stlink-common.c
index 26b36cd..a73801b 100644
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -841,13 +841,15 @@ on_error:
     return error;
 }
 
+#define IS_STM32L(sl)	((sl)->chip_id == STM32_CHIPID_L1_MEDIUM || (sl)->chip_id == STM32_CHIPID_L1_HIGH)
+
 int stlink_fread(stlink_t* sl, const char* path, stm32_addr_t addr, size_t size) {
     /* read size bytes from addr to file */
 
     int error = -1;
     size_t off;
     int num_empty = 0;
-    unsigned char erased_pattern =(sl->chip_id == STM32_CHIPID_L1_MEDIUM)?0:0xff;
+    unsigned char erased_pattern =(IS_STM32L(sl))?0:0xff;
 
     const int fd = open(path, O_RDWR | O_TRUNC | O_CREAT, 00700);
     if (fd == -1) {
@@ -972,7 +974,7 @@ int stlink_erase_flash_page(stlink_t *sl, stm32_addr_t flashaddr)
 	fprintf(stdout, "Erase Final CR:0x%x\n", read_flash_cr(sl));
 #endif
   }
-  else if (sl->chip_id == STM32_CHIPID_L1_MEDIUM)
+  else if (IS_STM32L(sl))
   {
 
     uint32_t val;
@@ -1084,7 +1086,7 @@ int stlink_erase_flash_page(stlink_t *sl, stm32_addr_t flashaddr)
 }
 
 int stlink_erase_flash_mass(stlink_t *sl) {
-     if (sl->chip_id == STM32_CHIPID_L1_MEDIUM) {
+     if (IS_STM32L(sl)) {
 	 /* erase each page */
 	 int i = 0, num_pages = sl->flash_size/sl->flash_pgsz;
 	 for (i = 0; i < num_pages; i++) {
@@ -1185,7 +1187,7 @@ int write_loader_to_sram(stlink_t *sl, stm32_addr_t* addr, size_t* size) {
     const uint8_t* loader_code;
     size_t loader_size;
 
-    if (sl->chip_id == STM32_CHIPID_L1_MEDIUM) /* stm32l */
+    if (IS_STM32L(sl)) /* stm32l */
     {
       loader_code = loader_code_stm32l;
       loader_size = sizeof(loader_code_stm32l);
@@ -1400,7 +1402,7 @@ int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, unsigned
 
     }	//STM32F4END
 
-    else if (sl->chip_id == STM32_CHIPID_L1_MEDIUM)    {
+    else if (IS_STM32L(sl)) {
     	/* use fast word write. todo: half page. */
     	uint32_t val;
 
@@ -1557,7 +1559,7 @@ 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;
+    unsigned char erased_pattern = (IS_STM32L(sl))?0:0xff;
     mapped_file_t mf = MAPPED_FILE_INITIALIZER;
     if (map_file(&mf, path) == -1) {
         WLOG("map_file() == -1\n");
@@ -1595,7 +1597,7 @@ int run_flash_loader(stlink_t *sl, flash_loader_t* fl, stm32_addr_t target, cons
         return -1;
     }
 
-    if (sl->chip_id == STM32_CHIPID_L1_MEDIUM) {
+    if (IS_STM32L(sl)) {
 
       size_t count = size / sizeof(uint32_t);
       if (size % sizeof(uint32_t)) ++count;
@@ -1638,7 +1640,7 @@ int run_flash_loader(stlink_t *sl, flash_loader_t* fl, stm32_addr_t target, cons
     }
         
     /* check written byte count */
-    if (sl->chip_id == STM32_CHIPID_L1_MEDIUM) {
+    if (IS_STM32L(sl)) {
 
       size_t count = size / sizeof(uint32_t);
       if (size % sizeof(uint32_t)) ++count;