firmware: rename uart_init to uart_initialize

rename uart_init to prevent collision with pico sdk
greatscottgadgets · Mar 2, 2024 · d504f7a · d504f7a
1 parent fc331ab
commit d504f7a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/firmware/src/boards/cynthion_d11/uart.c b/firmware/src/boards/cynthion_d11/uart.c
@@ -68,7 +68,7 @@ void uart_release_pinmux(void)
  * Configures the UART we'll use for our system console.
  * TODO: support more configuration (parity, stop, etc.)
  */
-void uart_init(bool configure_pinmux, unsigned long baudrate)
+void uart_initialize(bool configure_pinmux, unsigned long baudrate)
 {
 	// Disable the SERCOM before configuring it, to 1) ensure we're not transacting
 	// during configuration; and 2) as many of the registers are R/O when the SERCOM is enabled.

diff --git a/firmware/src/boards/cynthion_d21/uart.c b/firmware/src/boards/cynthion_d21/uart.c
@@ -68,7 +68,7 @@ void uart_release_pinmux(void)
  * Configures the UART we'll use for our system console.
  * TODO: support more configuration (parity, stop, etc.)
  */
-void uart_init(bool configure_pinmux, unsigned long baudrate)
+void uart_initialize(bool configure_pinmux, unsigned long baudrate)
 {
 	// Disable the SERCOM before configuring it, to 1) ensure we're not transacting
 	// during configuration; and 2) as many of the registers are R/O when the SERCOM is enabled.

diff --git a/firmware/src/boards/daisho/uart.c b/firmware/src/boards/daisho/uart.c
@@ -18,7 +18,7 @@
  * @param configure_pinmux If true, the pinmux will be configured for UART use during init.
  * @param baudrate The baud rate to apply, in symbols/second.
  */
-void uart_init(bool configure_pinmux, unsigned long baudrate)
+void uart_initialize(bool configure_pinmux, unsigned long baudrate)
 {
 }
 

diff --git a/firmware/src/boards/qtpy/uart.c b/firmware/src/boards/qtpy/uart.c
@@ -68,7 +68,7 @@ void uart_release_pinmux(void)
  * Configures the UART we'll use for our system console.
  * TODO: support more configuration (parity, stop, etc.)
  */
-void uart_init(bool configure_pinmux, unsigned long baudrate)
+void uart_initialize(bool configure_pinmux, unsigned long baudrate)
 {
 	// Disable the SERCOM before configuring it, to 1) ensure we're not transacting
 	// during configuration; and 2) as many of the registers are R/O when the SERCOM is enabled.

diff --git a/firmware/src/boards/samd11_xplained/uart.c b/firmware/src/boards/samd11_xplained/uart.c
@@ -68,7 +68,7 @@ void uart_release_pinmux(void)
  * Configures the UART we'll use for our system console.
  * TODO: support more configuration (parity, stop, etc.)
  */
-void uart_init(bool configure_pinmux, unsigned long baudrate)
+void uart_initialize(bool configure_pinmux, unsigned long baudrate)
 {
 	// Disable the SERCOM before configuring it, to 1) ensure we're not transacting
 	// during configuration; and 2) as many of the registers are R/O when the SERCOM is enabled.

diff --git a/firmware/src/console.c b/firmware/src/console.c
@@ -61,7 +61,7 @@ void console_task(void)
  */
 void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* coding)
 {
-	uart_init(true, coding->bit_rate);
+	uart_initialize(true, coding->bit_rate);
 }
 
 
@@ -72,13 +72,13 @@ void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* coding)
 void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char)
 {
 	if (!uart_active) {
-		uart_init(true, 115200);
+		uart_initialize(true, 115200);
 	}
 }
 
 void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts)
 {
 	if (!uart_active) {
-		uart_init(true, 115200);
+		uart_initialize(true, 115200);
 	}
 }
diff --git a/firmware/src/uart.h b/firmware/src/uart.h
@@ -17,7 +17,7 @@
  * @param configure_pinmux If true, the pinmux will be configured for UART use during init.
  * @param baudrate The baud rate to apply, in symbols/second.
  */
-void uart_init(bool configure_pinmux, unsigned long baudrate);
+void uart_initialize(bool configure_pinmux, unsigned long baudrate);
 
 /**
  * Configures the relevant UART's target's pins to be used for UART.