DP: convert reconnect actions.

Update those targets that require reconnection to replace calls to
DebugPort.init() followed by .power_up_debug() to a single call to
.connect().

Author: flit

pyocd/commands/commands.py

@@ -1253,8 +1253,7 @@ class InitDpCommand(CommandBase):
             }
 
     def execute(self):
-        self.context.target.dp.init()
-        self.context.target.dp.power_up_debug()
+        self.context.target.dp.connect()
 
 class MakeApCommand(CommandBase):
     INFO = {

pyocd/target/builtin/target_CC3220SF.py

@@ -99,8 +99,7 @@ def init(self):
         time.sleep(1.3)
 
         # reconnect to the board
-        self.target.dp.init()
-        self.target.dp.power_up_debug()
+        self.target.dp.connect()
 
         self.target.halt()
         self.target.reset_and_halt()

pyocd/target/builtin/target_s5js100.py

@@ -232,8 +232,7 @@ def reset(self, reset_type=None):
                     sleep(0.1)
                 except exceptions.TransferError:
                     self.flush()
-                    self._ap.dp.init()
-                    self._ap.dp.power_up_debug()
+                    self._ap.dp.connect()
                     sleep(0.01)
             else:
                 raise exceptions.TimeoutError("Timeout waiting for reset")
@@ -271,8 +270,7 @@ def get_state(self):
             # LOG.info("s5js100.get_state dhcsr 0x%x", dhcsr)
         except exceptions.TransferError:
             # LOG.info("s5js100.get_state read fail dhcsr..try more")
-            self._ap.dp.init()
-            self._ap.dp.power_up_debug()
+            self._ap.dp.connect()
             dhcsr = self.read_memory(CortexM.DHCSR)
             # LOG.info("fail s5js100.get_state dhcsr 0x%x", dhcsr)
 

pyocd/target/family/target_psoc6.py

@@ -39,8 +39,7 @@ def reset(self, reset_type=None):
         if reset_type is Target.ResetType.HW:
             self._ap.dp.reset()
             sleep(0.5)
-            self._ap.dp.init()
-            self._ap.dp.power_up_debug()
+            self._ap.dp.connect()
             self.fpb.enable()
         else:
             if reset_type is Target.ResetType.SW_VECTRESET:
@@ -63,8 +62,7 @@ def reset(self, reset_type=None):
                 except exceptions.TransferError:
                     self.flush()
                     try:
-                        self._ap.dp.init()
-                        self._ap.dp.power_up_debug()
+                        self._ap.dp.connect()
                     except exceptions.TransferError:
                         self.flush()
 
@@ -213,8 +211,7 @@ def reset(self, reset_type=None):
         with Timeout(5.0) as t_o:
             while t_o.check():
                 try:
-                    self._ap.dp.init()
-                    self._ap.dp.power_up_debug()
+                    self._ap.dp.connect()
                     dhcsr_reg = self.read32(CortexM.DHCSR)
                     if (dhcsr_reg & CortexM.S_RESET_ST) == 0:
                         break
@@ -241,8 +238,7 @@ def reinit_dap(self):
         with Timeout(2.0) as t_o:
             while t_o.check():
                 try:
-                    self._ap.dp.init()
-                    self._ap.dp.power_up_debug()
+                    self._ap.dp.connect()
                     self.flush()
                     break
                 except exceptions.TransferError:
@@ -255,8 +251,7 @@ def acquire(self):
         with Timeout(self.acquire_timeout) as t_o:
             while t_o.check():
                 try:
-                    self._ap.dp.init()
-                    self._ap.dp.power_up_debug()
+                    self._ap.dp.connect()
                     # self.write32(self.IPC2_DATA_ADDR, 0)
                     self.write32(self.TEST_MODE_ADDR, self.TEST_MODE_VALUE)
                     self.flush()
@@ -315,8 +310,7 @@ def reset_and_halt(self, reset_type=None):
         with Timeout(self.acquire_timeout) as t_o:
             while t_o.check():
                 try:
-                    self._ap.dp.init()
-                    self._ap.dp.power_up_debug()
+                    self._ap.dp.connect()
                     self.halt()
                     self.wait_halted()
                     self.write_core_register('xpsr', CortexM.XPSR_THUMB)
@@ -384,8 +378,7 @@ def reset(self, reset_type=None):
         with Timeout(self._acquire_timeout) as t_o:
             while t_o.check():
                 try:
-                    self._ap.dp.init()
-                    self._ap.dp.power_up_debug()
+                    self._ap.dp.connect()
                     break
                 except exceptions.TransferError:
                     pass