Rename TARGET_RESET_STATE to target_state_t.

flit · flit · commit 7e4cefa3115a · 2020-01-10T16:01:50.000-06:00
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/interface/swd_host.c b/source/daplink/interface/swd_host.c
@@ -881,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;
@@ -1022,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
@@ -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
@@ -787,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();
@@ -870,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/family/arm/musca_a/target_reset.c b/source/family/arm/musca_a/target_reset.c
@@ -101,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
@@ -106,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/maxim/max32620/target_reset.c b/source/family/maxim/max32620/target_reset.c
@@ -35,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
@@ -35,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/nxp/lpc55S6X/target_reset.c b/source/family/nxp/lpc55S6X/target_reset.c
@@ -35,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
@@ -50,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/renesas/target_reset_rza.c b/source/family/renesas/target_reset_rza.c
@@ -22,7 +22,7 @@
 #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
@@ -26,7 +26,7 @@
 #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/wiznet/target_reset_wiznet.c b/source/family/wiznet/target_reset_wiznet.c
@@ -24,7 +24,7 @@
 #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/target/target_board.h b/source/target/target_board.h
@@ -73,7 +73,7 @@ typedef struct __attribute__((__packed__)) board_info {
     //@{
     void (*prerun_board_config)(void);                      /*!< Specific board debug/ID related initialization */
     void (*swd_set_target_reset)(uint8_t asserted);         /*!< Boards can customize how to send reset to the target with precedence over target family */
-    uint8_t (*target_set_state)(TARGET_RESET_STATE state);  /*!< Boards can customize target debug states with precedence over target family */
+    uint8_t (*target_set_state)(target_state_t state);  /*!< Boards can customize target debug states with precedence over target family */
     uint32_t soft_reset_type;                               /*!< Boards can override software reset type to VECTRESET or SYSRESETREQ */
     //@}
 } board_info_t;
diff --git a/source/target/target_family.c b/source/target/target_family.c
@@ -114,7 +114,7 @@ void init_family(void)
     }
 }
 
-uint8_t target_set_state(TARGET_RESET_STATE state)
+uint8_t target_set_state(target_state_t state)
 {
     if (g_board_info.target_set_state) { //target specific
         g_board_info.target_set_state(state);
diff --git a/source/target/target_family.h b/source/target/target_family.h
@@ -32,7 +32,7 @@
 //!
 //! These enums are passed to target_set_state() and indicate the desired state into which
 //! the target should be reset.
-typedef enum {
+typedef enum _target_state {
     RESET_HOLD,              //!< Hold target in reset
     RESET_PROGRAM,           //!< Reset target and setup for flash programming
     RESET_RUN,               //!< Reset target and run normally
@@ -43,7 +43,7 @@ typedef enum {
     POST_FLASH_RESET,        //!< Reset target after flash programming
     POWER_ON,                //!< Poweron the target
     SHUTDOWN,                //!< Poweroff the target
-} TARGET_RESET_STATE;
+} target_state_t;
 
 //! @brief Options for reset.
 typedef enum _reset_type {
@@ -113,7 +113,7 @@ typedef struct target_family_descriptor {
     void (*prerun_target_config)(void);         /*!< Target specific initialization */
     uint8_t (*target_unlock_sequence)(void);    /*!< Unlock targets that can enter lock state */
     uint8_t (*security_bits_set)(uint32_t addr, uint8_t *data, uint32_t size);  /*!< Check security bits in the programmable flash region */
-    uint8_t (*target_set_state)(TARGET_RESET_STATE state);  /*!< Families can customize target debug states */
+    uint8_t (*target_set_state)(target_state_t state);      /*!< Families can customize target debug states */
     void (*swd_set_target_reset)(uint8_t asserted);         /*!< Families can customize how to send reset to the target */
     uint8_t (*validate_bin_nvic)(const uint8_t *buf);       /*!< Validate a bin file to be flash by drag and drop */
     uint8_t (*validate_hexfile)(const uint8_t *buf);        /*!< Validate a hex file to be flash by drag and drop */
@@ -136,7 +136,7 @@ void init_family(void);
 //! @brief Reset the target into a new state.
 //!
 //! Used to prepare the target for some operation, or release it for user control.
-uint8_t target_set_state(TARGET_RESET_STATE state);
+uint8_t target_set_state(target_state_t state);
 
 //! @brief Controls reset of the target.
 void swd_set_target_reset(uint8_t asserted);

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
`@@ -881,7 +881,7 @@ uint8_t swd_init_debug(void)`
`881`	`881`	`return 0;`
`882`	`882`	`}`
`883`	`883`
`884`		`-uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state)`
	`884`	`+uint8_t swd_set_target_state_hw(target_state_t state)`
`885`	`885`	`{`
`886`	`886`	`uint32_t val;`
`887`	`887`	`int8_t ap_retries = 2;`
`@@ -1022,7 +1022,7 @@ uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state)`
`1022`	`1022`	`return 1;`
`1023`	`1023`	`}`
`1024`	`1024`
`1025`		`-uint8_t swd_set_target_state_sw(TARGET_RESET_STATE state)`
	`1025`	`+uint8_t swd_set_target_state_sw(target_state_t state)`
`1026`	`1026`	`{`
`1027`	`1027`	`uint32_t val;`
`1028`	`1028`	`int8_t ap_retries = 2;`
Original file line number	Diff line number	Diff line change
`@@ -787,7 +787,7 @@ uint8_t swd_uninit_debug(void)`
`787`	`787`	`return 1;`
`788`	`788`	`}`
`789`	`789`
`790`		`-uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state)`
	`790`	`+uint8_t swd_set_target_state_hw(target_state_t state)`
`791`	`791`	`{`
`792`	`792`	`uint32_t val;`
`793`	`793`	`swd_init();`
`@@ -870,7 +870,7 @@ uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state)`
`870`	`870`	`return 1;`
`871`	`871`	`}`
`872`	`872`
`873`		`-uint8_t swd_set_target_state_sw(TARGET_RESET_STATE state)`
	`873`	`+uint8_t swd_set_target_state_sw(target_state_t state)`
`874`	`874`	`{`
`875`	`875`	`uint32_t val;`
`876`	`876`	`swd_init();`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ static void musca_a_target_before_init_debug(void)`
`101`	`101`	`return;`
`102`	`102`	`}`
`103`	`103`
`104`		`-static uint8_t musca_a_target_set_state(TARGET_RESET_STATE state)`
	`104`	`+static uint8_t musca_a_target_set_state(target_state_t state)`
`105`	`105`	`{`
`106`	`106`	`if(state == RESET_RUN)`
`107`	`107`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ static void musca_b_target_before_init_debug(void)`
`106`	`106`	`return;`
`107`	`107`	`}`
`108`	`108`
`109`		`-static uint8_t musca_b_target_set_state(TARGET_RESET_STATE state)`
	`109`	`+static uint8_t musca_b_target_set_state(target_state_t state)`
`110`	`110`	`{`
`111`	`111`	`if(state == RESET_RUN)`
`112`	`112`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ uint8_t target_unlock_sequence(void)`
`35`	`35`	`return 1;`
`36`	`36`	`}`
`37`	`37`
`38`		`-uint8_t target_set_state(TARGET_RESET_STATE state)`
	`38`	`+uint8_t target_set_state(target_state_t state)`
`39`	`39`	`{`
`40`	`40`	`// invoke reset by sw (VECT_REQ or SYS_REQ) or hw (hardware IO toggle)`
`41`	`41`	`// return swd_set_target_state_sw(state);`