Clears DMA config registers for Discovery F4 board

[fw/stlink] / flash / main.c

diff --git a/flash/main.c b/flash/main.c
index 24287456b41e283abc6624711267532b4de83fd9..1d616ae956d7cc394b7303ea84aa5c08c40bc2ca 100644 (file)
--- a/flash/main.c
+++ b/flash/main.c
@@ -123,6 +123,14 @@ 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
+    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) &&
@@ -154,10 +162,10 @@ int main(int ac, char** av)
   }
   else /* read */
   {
-    if ((o.addr >= sl->flash_base) &&
+    if ((o.addr >= sl->flash_base) && (o.size == 0) &&
        (o.addr < sl->flash_base + sl->flash_size))
         o.size = sl->flash_size;
-    else if ((o.addr >= sl->sram_base) &&
+    else if ((o.addr >= sl->sram_base) && (o.size == 0) &&
             (o.addr < sl->sram_base + sl->sram_size))
         o.size = sl->sram_size;
     err = stlink_fread(sl, o.filename, o.addr, o.size);