stm32h7x: Fix reset with non-HLA interfaces on macOS

[fw/openocd] / tcl / target / stm32h7x.cfg

diff --git a/tcl/target/stm32h7x.cfg b/tcl/target/stm32h7x.cfg
index 4a04929aa580830d200169ff0e081e85038ef0d9..763a7857a08cb6cffc104658d93805a66b7dc9f7 100644 (file)
--- a/tcl/target/stm32h7x.cfg
+++ b/tcl/target/stm32h7x.cfg
@@ -175,10 +175,19 @@ $_CHIPNAME.cpu0 configure -event reset-init {
        adapter speed 4000
 }
 
+# get _CHIPNAME from current target
+proc stm32h7x_get_chipname {} {
+       set t [target current]
+       set sep [string last "." $t]
+       if {$sep == -1} {
+               return $t
+       }
+       return [string range $t 0 [expr $sep - 1]]
+}
+
 if {[set $_CHIPNAME.DUAL_CORE]} {
        $_CHIPNAME.cpu1 configure -event examine-end {
-               # get _CHIPNAME from the current target
-               set _CHIPNAME [regsub ".cpu\\d$" [target current] ""]
+               set _CHIPNAME [stm32h7x_get_chipname]
                global $_CHIPNAME.USE_CTI
 
                # Stop watchdog counters during halt
@@ -214,8 +223,7 @@ proc stm32h7x_mmw {used_target reg setbits clearbits} {
 proc stm32h7x_dbgmcu_mmw {reg_offset setbits clearbits} {
        # use $_CHIPNAME.ap2 if possible, and use the proper dbgmcu base address
        if {![using_hla]} {
-               # get _CHIPNAME from the current target
-               set _CHIPNAME [regsub ".(cpu|ap)\\d*$" [target current] ""]
+               set _CHIPNAME [stm32h7x_get_chipname]
                set used_target $_CHIPNAME.ap2
                set reg_addr [expr 0xE00E1000 + $reg_offset]
        } {
@@ -238,8 +246,7 @@ if {[set $_CHIPNAME.USE_CTI]} {
        $_CHIPNAME.cpu1 configure -event debug-halted { stm32h7x_cti_prepare_restart_all }
 
        proc stm32h7x_cti_start {} {
-               # get _CHIPNAME from the current target
-               set _CHIPNAME [regsub ".cpu\\d$" [target current] ""]
+               set _CHIPNAME [stm32h7x_get_chipname]
 
                # Configure Cores' CTIs to halt each other
                # TRIGIN0 (DBGTRIGGER) and TRIGOUT0 (EDBGRQ) at CTM_CHANNEL_0
@@ -254,8 +261,7 @@ if {[set $_CHIPNAME.USE_CTI]} {
        }
 
        proc stm32h7x_cti_stop {} {
-               # get _CHIPNAME from the current target
-               set _CHIPNAME [regsub ".cpu\\d$" [target current] ""]
+               set _CHIPNAME [stm32h7x_get_chipname]
 
                $_CHIPNAME.cti0 enable off
                $_CHIPNAME.cti1 enable off
@@ -267,8 +273,7 @@ if {[set $_CHIPNAME.USE_CTI]} {
        }
 
        proc stm32h7x_cti_prepare_restart {cti} {
-               # get _CHIPNAME from the current target
-               set _CHIPNAME [regsub ".cpu\\d$" [target current] ""]
+               set _CHIPNAME [stm32h7x_get_chipname]
 
                # Acknowlodge EDBGRQ at TRIGOUT0
                $_CHIPNAME.$cti write INACK 0x01