Fixes issue #161

[fw/stlink] / flash / main.c

diff --git a/flash/main.c b/flash/main.c
index 4716b66e154813fd236add16036cceea07fb457d..8f3a149ba2dc20531c96c43c526fd06425cc3cf9 100644 (file)
--- a/flash/main.c
+++ b/flash/main.c
@@ -106,13 +106,13 @@ int main(int ac, char** av)
 
   if (o.devname != NULL) /* stlinkv1 */
   {
-    sl = stlink_v1_open(50);
+    sl = stlink_v1_open(50, 1);
     if (sl == NULL) goto on_error;
     sl->verbose = 50;
   }
   else /* stlinkv2 */
   {
-    sl = stlink_open_usb(50);
+    sl = stlink_open_usb(50, 1);
     if (sl == NULL) goto on_error;
     sl->verbose = 50;
   }
@@ -123,6 +123,17 @@ int main(int ac, char** av)
   if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
     stlink_enter_swd_mode(sl);
 
+// Disable DMA - Set All DMA CCR Registers to zero. - AKS 1/7/2013
+  if (sl->chip_id == STM32_CHIPID_F4)
+  {
+    memset(sl->q_buf,0,4);
+       for (int i=0;i<8;i++) {
+           stlink_write_mem32(sl,0x40026000+0x10+0x18*i,4);
+           stlink_write_mem32(sl,0x40026400+0x10+0x18*i,4);
+           stlink_write_mem32(sl,0x40026000+0x24+0x18*i,4);
+           stlink_write_mem32(sl,0x40026400+0x24+0x18*i,4);
+       }
+  }
   if (o.cmd == DO_WRITE) /* write */
   {
     if ((o.addr >= sl->flash_base) &&
@@ -135,7 +146,7 @@ int main(int ac, char** av)
        }
     }
    else if ((o.addr >= sl->sram_base) &&
-            (o.addr < sl->sram_base + sl->sram_size))
+            (o.addr < sl->sram_base + sl->sram_size)) {
        err = stlink_fwrite_sram(sl, o.filename, o.addr);
        if (err == -1)
        {
@@ -143,7 +154,7 @@ int main(int ac, char** av)
            goto on_error;
        }
    }
-  else if (o.cmd == DO_ERASE) 
+  } else if (o.cmd == DO_ERASE) 
   {
      err = stlink_erase_flash_mass(sl);
     if (err == -1)