Merged target_reset.h into target_family.h.

flit · flit · commit d5a68a0348f2 · 2020-01-10T16:01:50.000-06:00
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"
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
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"
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"
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"
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)
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)
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"
 
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"
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,7 +19,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "target_family.h"
 
diff --git a/source/family/ti/target_reset_ti.c b/source/family/ti/target_reset_ti.c
@@ -19,7 +19,6 @@
  * limitations under the License.
  */
 
-#include "target_reset.h"
 #include "swd_host.h"
 #include "target_family.h"
 
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,7 +20,6 @@
  */
 
 #include "cmsis_os2.h"
-#include "target_reset.h"
 #include "swd_host.h"
 #include "target_family.h"
 #include "target_board.h"
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
@@ -22,7 +22,6 @@
 #include "NuMicro.h"
 #include "DAP_config.h"
 #include "gpio.h"
-#include "target_reset.h"
 #include "daplink.h"
 #include "util.h"
 #include "cortex_m.h"
diff --git a/source/hic_hal/nxp/lpc11u35/gpio.c b/source/hic_hal/nxp/lpc11u35/gpio.c
@@ -22,7 +22,6 @@
 #include "LPC11Uxx.h"
 #include "gpio.h"
 #include "compiler.h"
-#include "target_reset.h"
 #include "IO_Config.h"
 #include "settings.h"
 #include "iap.h"
diff --git a/source/hic_hal/stm32/stm32f103xb/gpio.c b/source/hic_hal/stm32/stm32f103xb/gpio.c
@@ -22,7 +22,6 @@
 #include "stm32f1xx.h"
 #include "DAP_config.h"
 #include "gpio.h"
-#include "target_reset.h"
 #include "daplink.h"
 #include "util.h"
 
diff --git a/source/hic_hal/stm32/stm32f103xb/sdk.c b/source/hic_hal/stm32/stm32f103xb/sdk.c
@@ -22,7 +22,6 @@
 #include "stm32f1xx.h"
 #include "DAP_config.h"
 #include "gpio.h"
-#include "target_reset.h"
 #include "daplink.h"
 #include "util.h"
 #include "cortex_m.h"
diff --git a/source/target/target_board.h b/source/target/target_board.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 #include "target_config.h"
-#include "target_reset.h"
+#include "target_family.h"
 #include "virtual_fs.h"
 
 //! @brief Current board info version.
@@ -72,8 +72,8 @@ typedef struct __attribute__((__packed__)) board_info {
     //! @name Board initialization customization
     //@{
     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 precedence over target family */
-    uint8_t (*target_set_state)(TARGET_RESET_STATE state);  /*!< Boards can customize target debug states in target_reset.h precedence over target family */
+    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 */
     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.h b/source/target/target_family.h
@@ -24,11 +24,27 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "target_reset.h"
 
 //! @brief Creates a family ID from a vendor ID and family index within that vendor.
 #define VENDOR_TO_FAMILY(vendor, family) ((vendor) << 8 | (family))
 
+//! @brief States into which the target can be placed.
+//!
+//! These enums are passed to target_set_state() and indicate the desired state into which
+//! the target should be reset.
+typedef enum {
+    RESET_HOLD,              //!< Hold target in reset
+    RESET_PROGRAM,           //!< Reset target and setup for flash programming
+    RESET_RUN,               //!< Reset target and run normally
+    NO_DEBUG,                //!< Disable debug on running target
+    DEBUG,                   //!< Enable debug on running target
+    HALT,                    //!< Halt the target without resetting it
+    RUN,                     //!< Resume the target without resetting it
+    POST_FLASH_RESET,        //!< Reset target after flash programming
+    POWER_ON,                //!< Poweron the target
+    SHUTDOWN,                //!< Poweroff the target
+} TARGET_RESET_STATE;
+
 //! @brief Options for reset.
 typedef enum _reset_type {
     kHardwareReset = 1,
diff --git a/source/target/target_reset.h b/source/target/target_reset.h
