ipdbg: fix double free of virtual-ir data

[openocd.git] / tcl / target / bluenrg-x.cfg

diff --git a/tcl/target/bluenrg-x.cfg b/tcl/target/bluenrg-x.cfg
index a9d321ee6bc1e9ea7c3c9addc5d68eca004d15f2..afa1b513b26981434e6274e03a4623eda0c0926f 100644 (file)
--- a/tcl/target/bluenrg-x.cfg
+++ b/tcl/target/bluenrg-x.cfg
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
 #
 # bluenrg-1/2 and bluenrg-lp devices support only SWD transports.
 #
@@ -47,16 +49,19 @@ if {![using_hla]} {
    cortex_m reset_config sysresetreq
 }
 
+set JTAG_IDCODE_B2 0x0200A041
+set JTAG_IDCODE_B1 0x0
+
 $_TARGETNAME configure -event halted {
     global WDOG_VALUE
     global WDOG_VALUE_SET
     set _JTAG_IDCODE [mrw 0x40000004]
-    if {$_JTAG_IDCODE != 0x0201E041} {
+    if {$_JTAG_IDCODE == $JTAG_IDCODE_B2 || $_JTAG_IDCODE == $JTAG_IDCODE_B1} {
         # Stop watchdog during halt, if enabled. Only Bluenrg-1/2
         set WDOG_VALUE [mrw 0x40700008]
-        if [expr ($WDOG_VALUE & (1 << 1))] {
+        if [expr {$WDOG_VALUE & (1 << 1)}] {
             set WDOG_VALUE_SET 1
-            mww 0x40700008 [expr ($WDOG_VALUE & 0xFFFFFFFD)]
+            mww 0x40700008 [expr {$WDOG_VALUE & 0xFFFFFFFD}]
         }
     }
 }
@@ -64,8 +69,8 @@ $_TARGETNAME configure -event resumed {
     global WDOG_VALUE
     global WDOG_VALUE_SET
     set _JTAG_IDCODE [mrw 0x40000004]
-    if {$_JTAG_IDCODE != 0x0201E041} {
-        if [expr $WDOG_VALUE_SET] {
+    if {$_JTAG_IDCODE == $JTAG_IDCODE_B2 || $_JTAG_IDCODE == $JTAG_IDCODE_B1} {
+        if {$WDOG_VALUE_SET} {
             # Restore watchdog enable value after resume. Only Bluenrg-1/2
             mww 0x40700008 $WDOG_VALUE
             set WDOG_VALUE_SET 0