Call swd_init_debug() after reset + fix ACK checks

ARMmbed · Oct 15, 2021 · ad474ac · ad474ac
1 parent 38dbf7f
commit ad474ac
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/source/daplink/interface/swd_host.c b/source/daplink/interface/swd_host.c
@@ -4,7 +4,7 @@
  *
  * DAPLink Interface Firmware
  * Copyright (c) 2009-2019, ARM Limited, All Rights Reserved
- * Copyright 2019, Cypress Semiconductor Corporation 
+ * Copyright 2019, Cypress Semiconductor Corporation
  * or a subsidiary of Cypress Semiconductor Corporation.
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -1052,35 +1052,37 @@ uint8_t swd_set_target_state_sw(target_state_t state)
             swd_set_target_reset(0);
             osDelay(2);
 
-#ifndef INTERFACE_KL26Z
+            if (!swd_init_debug()) {
+                return 0;
+            }
+
             // Power down
             // Per ADIv6 spec. Clear first CSYSPWRUPREQ followed by CDBGPWRUPREQ
             if (!swd_read_dp(DP_CTRL_STAT, &val)) {
                 return 0;
             }
-            
+
             if (!swd_write_dp(DP_CTRL_STAT, val & ~CSYSPWRUPREQ)) {
                 return 0;
             }
-            
+
             // Wait until ACK is deasserted
             do {
                 if (!swd_read_dp(DP_CTRL_STAT, &val)) {
                     return 0;
                 }
-            } while ((val & (CSYSPWRUPACK)) == 1);
-            
+            } while ((val & (CSYSPWRUPACK)) != 0);
+
             if (!swd_write_dp(DP_CTRL_STAT, val & ~CDBGPWRUPREQ)) {
                 return 0;
             }
-            
+
             // Wait until ACK is deasserted
             do {
                 if (!swd_read_dp(DP_CTRL_STAT, &val)) {
                     return 0;
                 }
-            } while ((val & (CDBGPWRUPACK)) == 1);
-#endif
+            } while ((val & (CDBGPWRUPACK)) != 0);
 
             swd_off();
             break;