Merge pull request #690 from flit/cleanup/board_and_family

flit · web-flow · commit 6fbcdb5e3562 · 2020-01-11T13:09:47.000-06:00
Cleanup target headers
diff --git a/source/board/blueninja.c b/source/board/blueninja.c
@@ -24,7 +24,7 @@
 #include "target_family.h"
 #include "target_board.h"
 
-static uint8_t target_set_state_by_board(TARGET_RESET_STATE state)
+static uint8_t target_set_state_by_board(target_state_t state)
 {
     
     if (RESET_PROGRAM == state) {
diff --git a/source/board/wizwiki_w7500.c b/source/board/wizwiki_w7500.c
@@ -24,7 +24,7 @@
 #include "target_board.h"
 #include "swd_host.h"
 
-static uint8_t target_set_state_by_board(TARGET_RESET_STATE state)
+static uint8_t target_set_state_by_board(target_state_t state)
 {
     if( state == RESET_PROGRAM )
     {
diff --git a/source/board/wizwiki_w7500_eco.c b/source/board/wizwiki_w7500_eco.c
@@ -24,7 +24,7 @@
 #include "target_board.h"
 #include "swd_host.h"
 
-static uint8_t target_set_state_by_board(TARGET_RESET_STATE state)
+static uint8_t target_set_state_by_board(target_state_t state)
 {
     if( state == RESET_PROGRAM )
     {
diff --git a/source/board/wizwiki_w7500p.c b/source/board/wizwiki_w7500p.c
@@ -24,7 +24,7 @@
 #include "target_board.h"
 #include "swd_host.h"
 
-static uint8_t target_set_state_by_board(TARGET_RESET_STATE state)
+static uint8_t target_set_state_by_board(target_state_t state)
 {
     if( state == RESET_PROGRAM )
     {
diff --git a/source/daplink/cmsis-dap/DAP_vendor.c b/source/daplink/cmsis-dap/DAP_vendor.c
@@ -32,7 +32,6 @@
 #include "main.h"
 #include "uart.h"
 #include "settings.h"
-#include "target_reset.h"
 #include "target_family.h"
 #include <string.h>
 
diff --git a/source/daplink/drag-n-drop/vfs_manager.c b/source/daplink/drag-n-drop/vfs_manager.c
@@ -34,7 +34,6 @@
 #include "util.h"
 #include "version_git.h"
 #include "IO_Config.h"
-#include "target_reset.h"
 #include "file_stream.h"
 #include "error.h"
 
diff --git a/source/daplink/drag-n-drop/vfs_user.c b/source/daplink/drag-n-drop/vfs_user.c
@@ -28,7 +28,6 @@
 #include "error.h"
 #include "util.h"
 #include "settings.h"
-#include "target_reset.h"
 #include "daplink.h"
 #include "version_git.h"
 #include "info.h"
diff --git a/source/daplink/interface/main.c b/source/daplink/interface/main.c
@@ -29,7 +29,6 @@
 #include "gpio.h"
 #include "uart.h"
 #include "tasks.h"
-#include "target_reset.h"
 #include "swd_host.h"
 #include "info.h"
 #include "settings.h"
diff --git a/source/daplink/interface/swd_host.c b/source/daplink/interface/swd_host.c
@@ -21,7 +21,6 @@
 
 #ifndef TARGET_MCU_CORTEX_A
 #include "cmsis_os2.h"
-#include "target_reset.h"
 #include "target_config.h"
 #include "swd_host.h"
 #include "debug_cm.h"
@@ -882,7 +881,7 @@ uint8_t swd_init_debug(void)
     return 0;
 }
 
-uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state)
+uint8_t swd_set_target_state_hw(target_state_t state)
 {
     uint32_t val;
     int8_t ap_retries = 2;
@@ -1023,7 +1022,7 @@ uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state)
     return 1;
 }
 
-uint8_t swd_set_target_state_sw(TARGET_RESET_STATE state)
+uint8_t swd_set_target_state_sw(target_state_t state)
 {
     uint32_t val;
     int8_t ap_retries = 2;
diff --git a/source/daplink/interface/swd_host.h b/source/daplink/interface/swd_host.h
@@ -23,7 +23,7 @@
 #define SWDHOST_CM_H
 
 #include "flash_blob.h"
-#include "target_reset.h"
+#include "target_family.h"
 #ifdef TARGET_MCU_CORTEX_A
 #include "debug_ca.h"
 #else
@@ -56,8 +56,8 @@ uint8_t swd_write_memory(uint32_t address, uint8_t *data, uint32_t size);
 uint8_t swd_read_core_register(uint32_t n, uint32_t *val);
 uint8_t swd_write_core_register(uint32_t n, uint32_t val);
 uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t entry, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4);
-uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state);
-uint8_t swd_set_target_state_sw(TARGET_RESET_STATE state);
+uint8_t swd_set_target_state_hw(target_state_t state);
+uint8_t swd_set_target_state_sw(target_state_t state);
 uint8_t swd_transfer_retry(uint32_t req, uint32_t *data);
 void int2array(uint8_t *res, uint32_t data, uint8_t len);
 void swd_set_reset_connect(SWD_CONNECT_TYPE type);
diff --git a/source/daplink/interface/swd_host_ca.c b/source/daplink/interface/swd_host_ca.c
@@ -22,7 +22,6 @@
 #ifdef TARGET_MCU_CORTEX_A
 
 #include "cmsis_os2.h"
-#include "target_reset.h"
 #include "target_config.h"
 #include "swd_host.h"
 #include "debug_ca.h"
@@ -788,7 +787,7 @@ uint8_t swd_uninit_debug(void)
     return 1;
 }
 
-uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state)
+uint8_t swd_set_target_state_hw(target_state_t state)
 {
     uint32_t val;
     swd_init();
@@ -871,7 +870,7 @@ uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state)
     return 1;
 }
 
-uint8_t swd_set_target_state_sw(TARGET_RESET_STATE state)
+uint8_t swd_set_target_state_sw(target_state_t state)
 {
     uint32_t val;
     swd_init();
diff --git a/source/daplink/interface/target_flash.c b/source/daplink/interface/target_flash.c
@@ -22,7 +22,6 @@
 #include "string.h"
 
 #include "target_config.h"
-#include "target_reset.h"
 #include "gpio.h"
 #include "target_config.h"
 #include "intelhex.h"
diff --git a/source/daplink/usb2uart/usbd_user_cdc_acm.c b/source/daplink/usb2uart/usbd_user_cdc_acm.c
@@ -22,7 +22,6 @@
 #include "cmsis_os2.h"
 #include "rl_usb.h"
 #include "main.h"
-#include "target_reset.h"
 #include "uart.h"
 #ifdef DRAG_N_DROP_SUPPORT
 #include "flash_intf.h"
diff --git a/source/family/arm/musca_a/target_reset.c b/source/family/arm/musca_a/target_reset.c
@@ -20,10 +20,8 @@
  */
 
 #include "target_family.h"
-#include "target_reset.h"
 #include "target_config.h"  // for target_device
 #include "swd_host.h"
-
 #include "gpio.h"
 #include "debug_cm.h"
 #include "utils.h"
@@ -103,7 +101,7 @@ static void musca_a_target_before_init_debug(void)
     return;
 }
 
-static uint8_t musca_a_target_set_state(TARGET_RESET_STATE state)
+static uint8_t musca_a_target_set_state(target_state_t state)
 {
     if(state == RESET_RUN)
     {
diff --git a/source/family/arm/musca_b/target_reset.c b/source/family/arm/musca_b/target_reset.c
@@ -20,10 +20,8 @@
  */
 
 #include "target_family.h"
-#include "target_reset.h"
 #include "target_config.h"  // for target_device
 #include "swd_host.h"
-
 #include "gpio.h"
 #include "i2c_gpio.h"
 #include "debug_cm.h"
@@ -108,7 +106,7 @@ static void musca_b_target_before_init_debug(void)
     return;
 }
 
-static uint8_t musca_b_target_set_state(TARGET_RESET_STATE state)
+static uint8_t musca_b_target_set_state(target_state_t state)
 {
     if(state == RESET_RUN)
     {
diff --git a/source/family/freescale/target_reset_Kseries.c b/source/family/freescale/target_reset_Kseries.c
@@ -19,7 +19,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "info.h"
 #include "target_family.h"
diff --git a/source/family/freescale/target_reset_Lseries.c b/source/family/freescale/target_reset_Lseries.c
@@ -19,7 +19,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "info.h"
 #include "target_family.h"
diff --git a/source/family/freescale/target_reset_k32w_series.c b/source/family/freescale/target_reset_k32w_series.c
@@ -19,7 +19,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "info.h"
 #include "target_family.h"
diff --git a/source/family/freescale/target_reset_mimxrt.c b/source/family/freescale/target_reset_mimxrt.c
@@ -19,7 +19,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "info.h"
 #include "target_family.h"
diff --git a/source/family/freescale/target_reset_rapid_iot.c b/source/family/freescale/target_reset_rapid_iot.c
@@ -18,7 +18,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "info.h"
 #include "target_config.h"
diff --git a/source/family/maxim/max32620/target_reset.c b/source/family/maxim/max32620/target_reset.c
@@ -19,7 +19,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 
 void target_before_init_debug(void)
@@ -36,7 +35,7 @@ uint8_t target_unlock_sequence(void)
     return 1;
 }
 
-uint8_t target_set_state(TARGET_RESET_STATE state)
+uint8_t target_set_state(target_state_t state)
 {
     // invoke reset by sw (VECT_REQ or SYS_REQ) or hw (hardware IO toggle)
     // return swd_set_target_state_sw(state);
diff --git a/source/family/maxim/max32625/target_reset.c b/source/family/maxim/max32625/target_reset.c
@@ -19,7 +19,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 
 void target_before_init_debug(void)
@@ -36,7 +35,7 @@ uint8_t target_unlock_sequence(void)
     return 1;
 }
 
-uint8_t target_set_state(TARGET_RESET_STATE state)
+uint8_t target_set_state(target_state_t state)
 {
     // invoke reset by sw (VECT_REQ or SYS_REQ) or hw (hardware IO toggle)
     // return swd_set_target_state_sw(state);
diff --git a/source/family/nordic/target_reset_nrf51.c b/source/family/nordic/target_reset_nrf51.c
@@ -19,7 +19,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "DAP_config.h"
 #include "target_family.h"
diff --git a/source/family/nordic/target_reset_nrf52.c b/source/family/nordic/target_reset_nrf52.c
@@ -19,7 +19,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "DAP_config.h"
 #include "target_family.h"
diff --git a/source/family/nxp/lpc55S6X/target_reset.c b/source/family/nxp/lpc55S6X/target_reset.c
@@ -19,7 +19,6 @@
  * limitations under the License.
  */
 #include "target_family.h"
-#include "target_reset.h"
 #include "swd_host.h"
 #include "cmsis_os2.h"
 
@@ -36,7 +35,7 @@
 #define DEBUGMB_RET  0x02000008
 #define DEBUGMB_ID   0x020000FC
 
-static uint8_t lpc55s6x_target_set_state(TARGET_RESET_STATE state)
+static uint8_t lpc55s6x_target_set_state(target_state_t state)
 {
     uint32_t val;
     int8_t ap_retries = 2;
diff --git a/source/family/nxp/target_reset_lpc4088.c b/source/family/nxp/target_reset_lpc4088.c
@@ -19,7 +19,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "gpio.h"
 #include "target_family.h"
@@ -51,7 +50,7 @@ static void prerun_target_config(void)
 }
 
 
-static uint8_t lpc4088_target_set_state(TARGET_RESET_STATE state)
+static uint8_t lpc4088_target_set_state(target_state_t state)
 {
     //return swd_set_target_state_hw(state);
     uint8_t res;
diff --git a/source/family/realtek/target_reset_realtek_rtl8195am.c b/source/family/realtek/target_reset_realtek_rtl8195am.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include <string.h>
-#include "target_reset.h"
 #include "swd_host.h"
 #include "DAP_config.h"
 #include "target_family.h"
diff --git a/source/family/renesas/target_reset_rza.c b/source/family/renesas/target_reset_rza.c
@@ -19,11 +19,10 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "target_family.h"
 
-static uint8_t target_set_state_rza(TARGET_RESET_STATE state)
+static uint8_t target_set_state_rza(target_state_t state)
 {
     return swd_set_target_state_hw(state);
 }
diff --git a/source/family/ti/target_reset_ti.c b/source/family/ti/target_reset_ti.c
@@ -19,15 +19,14 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "target_family.h"
 
 #define GPRCM_0_APPS_SOFT_RESET_ADDR   0x4402D000
 #define GPRCM_0_RESET_MCU_VALUE        0x1
 #define GPRCM_0_RESET_MCU_PERIPH_VALUE 0x2
 
-static uint8_t target_set_state_ti(TARGET_RESET_STATE state)
+static uint8_t target_set_state_ti(target_state_t state)
 {
     swd_set_soft_reset(VECTRESET);
     if (state == POST_FLASH_RESET)
diff --git a/source/family/toshiba/target_reset_tz.c b/source/family/toshiba/target_reset_tz.c
@@ -20,7 +20,6 @@
  */
 
 #include "cmsis_os2.h"
-#include "target_reset.h"
 #include "swd_host.h"
 #include "target_family.h"
 
diff --git a/source/family/wiznet/target_reset_wiznet.c b/source/family/wiznet/target_reset_wiznet.c
@@ -20,12 +20,11 @@
  */
 
 #include "cmsis_os2.h"
-#include "target_reset.h"
 #include "swd_host.h"
 #include "target_family.h"
 #include "target_board.h"
 
-static uint8_t target_set_state_wiznet(TARGET_RESET_STATE state) {
+static uint8_t target_set_state_wiznet(target_state_t state) {
     uint8_t status;
 
     if( state == RESET_RUN )
diff --git a/source/hic_hal/freescale/k20dx/gpio.c b/source/hic_hal/freescale/k20dx/gpio.c
@@ -22,7 +22,6 @@
 #include "MK20D5.h"
 #include "DAP_config.h"
 #include "gpio.h"
-#include "target_reset.h"
 #include "daplink.h"
 
 static void busy_wait(uint32_t cycles)
diff --git a/source/hic_hal/freescale/k26f/gpio.c b/source/hic_hal/freescale/k26f/gpio.c
@@ -23,7 +23,6 @@
 #include "fsl_device_registers.h"
 #include "DAP_config.h"
 #include "gpio.h"
-#include "target_reset.h"
 #include "daplink.h"
 #include "hic_init.h"
 #include "fsl_clock.h"
diff --git a/source/hic_hal/nuvoton/m48ssidae/sdk.c b/source/hic_hal/nuvoton/m48ssidae/sdk.c
diff --git a/source/hic_hal/nxp/lpc11u35/gpio.c b/source/hic_hal/nxp/lpc11u35/gpio.c
diff --git a/source/hic_hal/stm32/stm32f103xb/gpio.c b/source/hic_hal/stm32/stm32f103xb/gpio.c
diff --git a/source/hic_hal/stm32/stm32f103xb/sdk.c b/source/hic_hal/stm32/stm32f103xb/sdk.c
diff --git a/source/target/target_board.c b/source/target/target_board.c
diff --git a/source/target/target_board.h b/source/target/target_board.h
diff --git a/source/target/target_config.h b/source/target/target_config.h
diff --git a/source/target/target_family.c b/source/target/target_family.c
diff --git a/source/target/target_family.h b/source/target/target_family.h
diff --git a/source/target/target_reset.h b/source/target/target_reset.h
diff --git a/source/usb/usb_lib.c b/source/usb/usb_lib.c

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#include "target_family.h"`
`25`	`25`	`#include "target_board.h"`
`26`	`26`
`27`		`-static uint8_t target_set_state_by_board(TARGET_RESET_STATE state)`
	`27`	`+static uint8_t target_set_state_by_board(target_state_t state)`
`28`	`28`	`{`
`29`	`29`
`30`	`30`	`if (RESET_PROGRAM == state) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`
`22`	`22`	`#ifndef TARGET_MCU_CORTEX_A`
`23`	`23`	`#include "cmsis_os2.h"`
`24`		`-#include "target_reset.h"`
`25`	`24`	`#include "target_config.h"`
`26`	`25`	`#include "swd_host.h"`
`27`	`26`	`#include "debug_cm.h"`
`@@ -882,7 +881,7 @@ uint8_t swd_init_debug(void)`
`882`	`881`	`return 0;`
`883`	`882`	`}`
`884`	`883`
`885`		`-uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state)`
	`884`	`+uint8_t swd_set_target_state_hw(target_state_t state)`
`886`	`885`	`{`
`887`	`886`	`uint32_t val;`
`888`	`887`	`int8_t ap_retries = 2;`
`@@ -1023,7 +1022,7 @@ uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state)`
`1023`	`1022`	`return 1;`
`1024`	`1023`	`}`
`1025`	`1024`
`1026`		`-uint8_t swd_set_target_state_sw(TARGET_RESET_STATE state)`
	`1025`	`+uint8_t swd_set_target_state_sw(target_state_t state)`
`1027`	`1026`	`{`
`1028`	`1027`	`uint32_t val;`
`1029`	`1028`	`int8_t ap_retries = 2;`