X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=tcl%2Ftarget%2Fpsoc4.cfg;h=b56828207984037576c628afc5bc1be010f8ec97;hb=38ac08c1c25adf42cf20e48e10e6ddeab6a12d71;hp=eb51847ce3a4334ad9cc6c66dac12bc5b7b1068b;hpb=2231da8ec4e7d7ae9b652f3dd1a7104f5a110f3f;p=openocd.git

diff --git a/tcl/target/psoc4.cfg b/tcl/target/psoc4.cfg
index eb51847ce3..b568282079 100644
--- a/tcl/target/psoc4.cfg
+++ b/tcl/target/psoc4.cfg
@@ -36,7 +36,7 @@ $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE
 set _FLASHNAME $_CHIPNAME.flash
 flash bank $_FLASHNAME psoc4 0 0 0 0 $_TARGETNAME
 
-adapter_khz 1500
+adapter speed 1500
 
 # Reset, bloody PSoC 4 reset
 #
@@ -118,7 +118,7 @@ proc ocd_process_reset_inner { MODE } {
 	}
 
 	if { ! [info exists PSOC4_USE_ACQUIRE] } {
-		if { 0 == [string compare [adapter_name] kitprog ] } {
+		if { 0 == [string compare [adapter name] kitprog ] } {
 			set PSOC4_USE_ACQUIRE 1
 		} else {
 			set PSOC4_USE_ACQUIRE 0
@@ -138,7 +138,7 @@ proc ocd_process_reset_inner { MODE } {
 	$t invoke-event reset-assert-pre
 
 	if { $halt && $PSOC4_USE_ACQUIRE } {
-		catch { [adapter_name] acquire_psoc }
+		catch { [adapter name] acquire_psoc }
 		$t arp_examine
 	} else {
 		if { $PSOC4_TEST_MODE_WORKAROUND } {
@@ -179,7 +179,7 @@ proc ocd_process_reset_inner { MODE } {
 		}
 
 		# Check if PSoC CPU is stopped in system ROM
-		set pc [ocd_reg pc]
+		set pc [reg pc]
 		regsub {pc[^:]*: } $pc "" pc
 		if { $pc < 0x10000000 || $pc > 0x1000ffff } {
 			set hint ""