diff --git a/AT32F425/DAPLink.uvoptx b/AT32F425/DAPLink.uvoptx
index abecdf8..ac5c652 100644
--- a/AT32F425/DAPLink.uvoptx
+++ b/AT32F425/DAPLink.uvoptx
@@ -140,7 +140,7 @@
0
JL2CM3
- -U59607536 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0AT32F425_64.FLM -FS08000000 -FL010000 -FP0($$Device:-AT32F425F8P7$Flash\AT32F425_64.FLM)
+ -U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0AT32F425_64.FLM -FS08000000 -FL010000 -FP0($$Device:-AT32F425F8P7$Flash\AT32F425_64.FLM)
0
@@ -232,7 +232,7 @@
APP
- 0
+ 1
0
0
0
@@ -288,7 +288,7 @@
DAP
- 0
+ 1
0
0
0
@@ -299,7 +299,7 @@
0
0
0
- ..\core\DAP\Source\DAP.c
+ ..\DAP\Source\DAP.c
DAP.c
0
0
@@ -311,7 +311,7 @@
0
0
0
- ..\core\DAP\Source\SW_DP.c
+ ..\DAP\Source\SW_DP.c
SW_DP.c
0
0
@@ -323,7 +323,7 @@
0
0
0
- ..\core\DAP\Source\JTAG_DP.c
+ ..\DAP\Source\JTAG_DP.c
JTAG_DP.c
0
0
@@ -331,7 +331,7 @@
- SWD_host
+ CSL/USBD
0
0
0
@@ -343,34 +343,14 @@
0
0
0
- ..\core\SWD_host\SWD_host.c
- SWD_host.c
- 0
- 0
-
-
-
-
- CSL/USBD
- 0
- 0
- 0
- 0
-
- 4
- 9
- 1
- 0
- 0
- 0
.\src\CSL\AT32F425_USB_Lib\usb_core.c
usb_core.c
0
0
- 4
- 10
+ 3
+ 9
1
0
0
@@ -381,8 +361,8 @@
0
- 4
- 11
+ 3
+ 10
1
0
0
@@ -393,8 +373,8 @@
0
- 4
- 12
+ 3
+ 11
1
0
0
@@ -413,8 +393,8 @@
0
0
- 5
- 13
+ 4
+ 12
1
0
0
@@ -425,8 +405,8 @@
0
- 5
- 14
+ 4
+ 13
1
0
0
@@ -437,8 +417,8 @@
0
- 5
- 15
+ 4
+ 14
1
0
0
@@ -449,8 +429,8 @@
0
- 5
- 16
+ 4
+ 15
1
0
0
@@ -461,8 +441,8 @@
0
- 5
- 17
+ 4
+ 16
1
0
0
@@ -473,8 +453,8 @@
0
- 5
- 18
+ 4
+ 17
1
0
0
@@ -485,8 +465,8 @@
0
- 5
- 19
+ 4
+ 18
1
0
0
@@ -505,8 +485,8 @@
0
0
- 6
- 20
+ 5
+ 19
1
0
0
@@ -517,8 +497,8 @@
0
- 6
- 21
+ 5
+ 20
2
0
0
diff --git a/AT32F425/DAPLink.uvprojx b/AT32F425/DAPLink.uvprojx
index 5a3e7d7..598850f 100644
--- a/AT32F425/DAPLink.uvprojx
+++ b/AT32F425/DAPLink.uvprojx
@@ -338,7 +338,7 @@
AT32F425F8P7,USE_STDPERIPH_DRIVER, DAP_FW_V1
- .\src;.\src\CSL\CMSIS\core_support;.\src\CSL\CMSIS\device_support;.\src\CSL\AT32F425_StdPeriph_Driver;.\src\CSL\AT32F425_USB_Lib;..\core\DAP\Include;..\core\SWD_host
+ .\src;.\src\CSL\CMSIS\core_support;.\src\CSL\CMSIS\device_support;.\src\CSL\AT32F425_StdPeriph_Driver;.\src\CSL\AT32F425_USB_Lib;..\DAP\Include
@@ -410,27 +410,17 @@
DAP.c
1
- ..\core\DAP\Source\DAP.c
+ ..\DAP\Source\DAP.c
SW_DP.c
1
- ..\core\DAP\Source\SW_DP.c
+ ..\DAP\Source\SW_DP.c
JTAG_DP.c
1
- ..\core\DAP\Source\JTAG_DP.c
-
-
-
-
- SWD_host
-
-
- SWD_host.c
- 1
- ..\core\SWD_host\SWD_host.c
+ ..\DAP\Source\JTAG_DP.c
diff --git a/AT32F425/src/DAP_config.h b/AT32F425/src/DAP_config.h
index 55bf810..9427c0a 100644
--- a/AT32F425/src/DAP_config.h
+++ b/AT32F425/src/DAP_config.h
@@ -544,15 +544,9 @@ __STATIC_FORCEINLINE uint32_t PIN_nRESET_IN (void) {
- 0: issue a device hardware reset.
- 1: release device hardware reset.
*/
-extern uint8_t swd_write_word(uint32_t addr, uint32_t val);
__STATIC_FORCEINLINE void PIN_nRESET_OUT (uint32_t bit) {
if(bit & 1) nRESET_PORT->scr = nRESET_PIN;
else nRESET_PORT->clr = nRESET_PIN;
-
- if((bit & 1) == 0)
- {
- swd_write_word((uint32_t)&SCB->AIRCR, ((0x5FA << SCB_AIRCR_VECTKEY_Pos) | SCB_AIRCR_SYSRESETREQ_Msk));
- }
}
///@}
@@ -661,9 +655,7 @@ when a device needs a time-critical unlock sequence that enables the debug port.
1 = a device specific reset sequence is implemented.
*/
__STATIC_INLINE uint8_t RESET_TARGET (void) {
- swd_write_word((uint32_t)&SCB->AIRCR, ((0x5FA << SCB_AIRCR_VECTKEY_Pos) | SCB_AIRCR_SYSRESETREQ_Msk));
-
- return 1; // change to '1' when a device reset sequence is implemented
+ return (0U); // change to '1' when a device reset sequence is implemented
}
///@}
diff --git a/CH32V203/.cproject b/CH32V203/.cproject
index 8ade1a8..7776c8b 100644
--- a/CH32V203/.cproject
+++ b/CH32V203/.cproject
@@ -62,8 +62,7 @@
-
-
+