change: reordering target uart code

antmak · antmak · commit 6e50000685e3 · 2025-05-22T18:23:49.000+07:00
diff --git a/include/common/target_uart.h b/include/common/target_uart.h
diff --git a/src/esp32/CMakeLists.txt b/src/esp32/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(srcs
-    src/uart.c
+    src/target_uart.c
     src/target_flash.c
 )
 
diff --git a/src/esp32/src/target_uart.c b/src/esp32/src/target_uart.c
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <common/uart.h>
+#include <common/target_uart.h>
 #include "soc/reg_base.h"
 
 // These functions are defined in the ROM
diff --git a/src/esp32c2/CMakeLists.txt b/src/esp32c2/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(srcs
-    src/uart.c
+    src/target_uart.c
 )
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
diff --git a/src/esp32c2/src/target_uart.c b/src/esp32c2/src/target_uart.c
@@ -7,7 +7,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <common/uart.h>
+#include <common/target_uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);
diff --git a/src/esp32c3/CMakeLists.txt b/src/esp32c3/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(srcs
-    src/uart.c
+    src/target_uart.c
 )
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
diff --git a/src/esp32c3/src/target_uart.c b/src/esp32c3/src/target_uart.c
@@ -7,7 +7,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <common/uart.h>
+#include <common/target_uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);
diff --git a/src/esp32c5/CMakeLists.txt b/src/esp32c5/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(srcs
-    src/uart.c
+    src/target_uart.c
 )
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
diff --git a/src/esp32c5/src/target_uart.c b/src/esp32c5/src/target_uart.c
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <common/uart.h>
+#include <common/target_uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);
diff --git a/src/esp32c6/CMakeLists.txt b/src/esp32c6/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(srcs
-    src/uart.c
+    src/target_uart.c
 )
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
diff --git a/src/esp32c6/src/target_uart.c b/src/esp32c6/src/target_uart.c
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <common/uart.h>
+#include <common/target_uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);
diff --git a/src/esp32c61/CMakeLists.txt b/src/esp32c61/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(srcs
-    src/uart.c
+    src/target_uart.c
 )
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
diff --git a/src/esp32c61/src/target_uart.c b/src/esp32c61/src/target_uart.c
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <common/uart.h>
+#include <common/target_uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);
diff --git a/src/esp32h2/CMakeLists.txt b/src/esp32h2/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(srcs
-    src/uart.c
+    src/target_uart.c
 )
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
diff --git a/src/esp32h2/src/target_uart.c b/src/esp32h2/src/target_uart.c
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <common/uart.h>
+#include <common/target_uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);
diff --git a/src/esp32p4/CMakeLists.txt b/src/esp32p4/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(srcs
-    src/uart.c
+    src/target_uart.c
 )
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
diff --git a/src/esp32p4/src/target_uart.c b/src/esp32p4/src/target_uart.c
@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ */
+
+#include <stdint.h>
+#include <stddef.h>
+#include <common/target_uart.h>
+
+// These functions are defined in the ROM
+extern void uartAttach(void *rxBuffer);
+extern void Uart_Init(uint8_t uart_no);
+extern uint32_t ets_clk_get_cpu_freq(void);
+extern void ets_update_cpu_frequency(uint32_t ticks_per_us);
+extern void uart_tx_switch(uint8_t uart_no);
+
+void stub_target_uart_init(uint8_t uart_num, uint32_t baudrate)
+{
+    (void)baudrate;
+    ets_update_cpu_frequency(ets_clk_get_cpu_freq() / 1000000);
+    uartAttach(NULL);
+    Uart_Init(uart_num);
+    uart_tx_switch(uart_num);
+}
diff --git a/src/esp32p4/src/uart.c b/src/esp32p4/src/uart.c
diff --git a/src/esp32s2/CMakeLists.txt b/src/esp32s2/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(srcs
-    src/uart.c
+    src/target_uart.c
 )
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
diff --git a/src/esp32s2/src/target_uart.c b/src/esp32s2/src/target_uart.c
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <common/uart.h>
+#include <common/target_uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);
diff --git a/src/esp32s3/CMakeLists.txt b/src/esp32s3/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(srcs
-    src/uart.c
+    src/target_uart.c
 )
 
 add_library(${ESP_TARGET_LIB} STATIC ${srcs})
diff --git a/src/esp32s3/src/target_uart.c b/src/esp32s3/src/target_uart.c
@@ -7,7 +7,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <common/uart.h>
+#include <common/target_uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);
diff --git a/src/esp8266/CMakeLists.txt b/src/esp8266/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(srcs
-    src/uart.c
+    src/target_uart.c
     src/target_flash.c
     src/rom-patched.c
 )
diff --git a/src/esp8266/src/target_uart.c b/src/esp8266/src/target_uart.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#include <common/uart.h>
+#include <common/target_uart.h>
 
 void stub_target_uart_init(uint8_t uart_num, uint32_t baudrate)
 {
diff --git a/src/log_uart.c b/src/log_uart.c
@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <common/uart.h>
+#include <common/target_uart.h>
 
 extern void ets_install_putc1(void (*p)(char c));
 extern void ets_install_putc2(void (*p)(char c));

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`set(srcs`
`2`		`- src/uart.c`
	`2`	`+ src/target_uart.c`
`3`	`3`	`src/target_flash.c`
`4`	`4`	`)`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`#include <stdint.h>`
`8`		`-#include <common/uart.h>`
	`8`	`+#include <common/target_uart.h>`
`9`	`9`
`10`	`10`	`void stub_target_uart_init(uint8_t uart_num, uint32_t baudrate)`
`11`	`11`	`{`