From e2738e8b6a564c21c078d36e120953c554f5803b Mon Sep 17 00:00:00 2001
From: Sergey Gavrilov <who.just.the.doctor@gmail.com>
Date: Tue, 21 Mar 2023 04:36:33 -0700
Subject: [PATCH] Update blackmagic version (#23)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Blackmagic: update blackmagic-fw submodule
* Blackmagic: blackmagic-fw submodule, use release version
* Blackmagic: esp platform, gnu11
* Blackmagic: fix WB55 errata in blackmagic-fw submodule
* Blackmagic: remove comments from CmakeLists.txt

Co-authored-by: あく <alleteam@gmail.com>
---
 components/blackmagic/CMakeLists.txt          | 84 ++++++++++---------
 components/blackmagic/blackmagic-fw           |  2 +-
 .../blackmagic/esp32-platform/platform.c      | 16 +++-
 .../blackmagic/esp32-platform/platform.h      |  2 +
 4 files changed, 62 insertions(+), 42 deletions(-)

diff --git a/components/blackmagic/CMakeLists.txt b/components/blackmagic/CMakeLists.txt
index 5206b98..8bf8743 100644
--- a/components/blackmagic/CMakeLists.txt
+++ b/components/blackmagic/CMakeLists.txt
@@ -1,65 +1,71 @@
 set(BM_DIR "blackmagic-fw")
 set(PLATFORM_DIR "esp32-platform")
 
-set(BM_SOURCES 
+set(BM_SOURCES
+
     # ${PLATFORM_DIR}/custom/swd-spi-tap.c
     ${BM_DIR}/src/platforms/common/swdptap.c
     ${BM_DIR}/src/platforms/common/jtagtap.c
-    ${BM_DIR}/src/gdb_main.c
-    ${BM_DIR}/src/command.c
-    ${BM_DIR}/src/crc32.c
-    ${BM_DIR}/src/exception.c
-    ${BM_DIR}/src/gdb_hostio.c
-    ${BM_DIR}/src/gdb_main.c
-    ${BM_DIR}/src/gdb_packet.c
-    ${BM_DIR}/src/remote.c
-    ${BM_DIR}/src/hex_utils.c
-    ${BM_DIR}/src/main.c
-    ${BM_DIR}/src/morse.c
-
-    #TODO move to project
     ${PLATFORM_DIR}/platform.c
     ${PLATFORM_DIR}/gdb-glue.c
 )
 
-set(BM_TARGETS 
+set(BM_TARGETS
     ${BM_DIR}/src/target/adiv5.c
-    ${BM_DIR}/src/target/cortexa.c
-    ${BM_DIR}/src/target/jtag_devs.c
-    ${BM_DIR}/src/target/kinetis.c
-    ${BM_DIR}/src/target/lpc15xx.c
-    ${BM_DIR}/src/target/lpc546xx.c
-    ${BM_DIR}/src/target/nrf51.c
-    ${BM_DIR}/src/target/sam3x.c
-    ${BM_DIR}/src/target/samx5x.c
-    ${BM_DIR}/src/target/stm32g0.c
-    ${BM_DIR}/src/target/stm32l4.c
     ${BM_DIR}/src/target/adiv5_jtagdp.c
+    ${BM_DIR}/src/target/adiv5_swdp.c
+    ${BM_DIR}/src/command.c
+    ${BM_DIR}/src/target/cortexa.c
     ${BM_DIR}/src/target/cortexm.c
+    ${BM_DIR}/src/crc32.c
+    ${BM_DIR}/src/target/efm32.c
+    ${BM_DIR}/src/exception.c
+
+    # ${BM_DIR}/src/target/gdb_if.c
+    ${BM_DIR}/src/gdb_hostio.c
+    ${BM_DIR}/src/gdb_main.c
+    ${BM_DIR}/src/gdb_packet.c
+    ${BM_DIR}/src/target/gdb_reg.c
+    ${BM_DIR}/src/hex_utils.c
+    ${BM_DIR}/src/target/jtag_devs.c
     ${BM_DIR}/src/target/jtag_scan.c
     ${BM_DIR}/src/target/lmi.c
-    ${BM_DIR}/src/target/lpc17xx.c
     ${BM_DIR}/src/target/lpc_common.c
-    ${BM_DIR}/src/target/nxpke04.c
-    ${BM_DIR}/src/target/sam4l.c
-    ${BM_DIR}/src/target/stm32f1.c
-    ${BM_DIR}/src/target/stm32h7.c
-    # ${BM_DIR}/src/target/swdptap_generic.c
-    ${BM_DIR}/src/target/adiv5_swdp.c
-    ${BM_DIR}/src/target/efm32.c
-    # ${BM_DIR}/src/target/jtagtap_generic.c
     ${BM_DIR}/src/target/lpc11xx.c
+    ${BM_DIR}/src/target/lpc17xx.c
+    ${BM_DIR}/src/target/lpc15xx.c
     ${BM_DIR}/src/target/lpc43xx.c
+    ${BM_DIR}/src/target/lpc546xx.c
+    ${BM_DIR}/src/target/kinetis.c
+    ${BM_DIR}/src/main.c
+    ${BM_DIR}/src/morse.c
     ${BM_DIR}/src/target/msp432.c
+    ${BM_DIR}/src/target/nrf51.c
+    ${BM_DIR}/src/target/nxpke04.c
+
+    # ${BM_DIR}/src/target/platform.c
+    ${BM_DIR}/src/remote.c
     ${BM_DIR}/src/target/rp.c
+    ${BM_DIR}/src/target/sam3x.c
+    ${BM_DIR}/src/target/sam4l.c
     ${BM_DIR}/src/target/samd.c
+    ${BM_DIR}/src/target/samx5x.c
+    ${BM_DIR}/src/target/sfdp.c
+    ${BM_DIR}/src/target/stm32f1.c
+    ${BM_DIR}/src/target/ch32f1.c
     ${BM_DIR}/src/target/stm32f4.c
+    ${BM_DIR}/src/target/stm32h7.c
     ${BM_DIR}/src/target/stm32l0.c
+    ${BM_DIR}/src/target/stm32l4.c
+    ${BM_DIR}/src/target/stm32g0.c
+    ${BM_DIR}/src/target/renesas.c
     ${BM_DIR}/src/target/target.c
+    ${BM_DIR}/src/target/target_flash.c
+    ${BM_DIR}/src/target/target_probe.c
 )
 
-set(BM_INCLUDE 
-    ${BM_DIR}/src/include 
+set(BM_INCLUDE
+    ${BM_DIR}/src/include
     ${BM_DIR}/src/platforms/common
     ${BM_DIR}/src/target
     ${BM_DIR}/libopencm3/include
@@ -75,7 +81,7 @@ execute_process(
 
 message(STATUS "BM version: ${BM_GIT_DESC}")
 
-idf_component_register(SRCS ${BM_SOURCES} ${BM_TARGETS}  
-                    INCLUDE_DIRS ${BM_INCLUDE})
+idf_component_register(SRCS ${BM_SOURCES} ${BM_TARGETS}
+    INCLUDE_DIRS ${BM_INCLUDE})
 
-target_compile_options(${COMPONENT_LIB} PRIVATE -DPC_HOSTED=0 -DFIRMWARE_VERSION="${BM_GIT_DESC}" -Wno-char-subscripts -Wno-attributes)
\ No newline at end of file
+target_compile_options(${COMPONENT_LIB} PRIVATE -DPC_HOSTED=0 -DFIRMWARE_VERSION="${BM_GIT_DESC}" -Wno-char-subscripts -Wno-attributes -std=gnu11)
\ No newline at end of file
diff --git a/components/blackmagic/blackmagic-fw b/components/blackmagic/blackmagic-fw
index 7307f08..1cdc914 160000
--- a/components/blackmagic/blackmagic-fw
+++ b/components/blackmagic/blackmagic-fw
@@ -1 +1 @@
-Subproject commit 7307f086c6425ee8a91fa2c3cd69c210a3cd165d
+Subproject commit 1cdc9147dfb614596a9a2f10801921d51583383c
diff --git a/components/blackmagic/esp32-platform/platform.c b/components/blackmagic/esp32-platform/platform.c
index fc12b4f..5ef43b8 100644
--- a/components/blackmagic/esp32-platform/platform.c
+++ b/components/blackmagic/esp32-platform/platform.c
@@ -103,12 +103,12 @@ int platform_hwversion(void) {
 }
 
 // set timeout
-void platform_timeout_set(platform_timeout* t, uint32_t ms) {
+void platform_timeout_set(platform_timeout_s* t, uint32_t ms) {
     t->time = platform_time_ms() + ms;
 }
 
 // check timeout
-bool platform_timeout_is_expired(platform_timeout* t) {
+bool platform_timeout_is_expired(const platform_timeout_s* t) {
     return platform_time_ms() > t->time;
 }
 
@@ -119,4 +119,16 @@ void platform_max_frequency_set(uint32_t freq) {
 // get interface freq
 uint32_t platform_max_frequency_get(void) {
     return 0;
+}
+
+void platform_nrst_set_val(bool assert) {
+    (void)assert;
+}
+
+bool platform_nrst_get_val() {
+    return false;
+}
+
+void platform_target_clk_output_enable(bool enable) {
+    (void)enable;
 }
\ No newline at end of file
diff --git a/components/blackmagic/esp32-platform/platform.h b/components/blackmagic/esp32-platform/platform.h
index abf3ebd..9af09da 100644
--- a/components/blackmagic/esp32-platform/platform.h
+++ b/components/blackmagic/esp32-platform/platform.h
@@ -21,6 +21,8 @@ void led_set_blue(uint8_t value);
 #define SET_RUN_STATE(state) \
     { led_set_green(255 * state); }
 #define SET_IDLE_STATE(state) \
+    { led_set_blue(255 * state); }
+#define SET_ERROR_STATE(state) \
     { led_set_red(255 * state); }
 
 #define TMS_SET_MODE() \