From ff7c71c99c68bcfd394b4c3d28ff872aa865420c Mon Sep 17 00:00:00 2001 From: sago35 Date: Tue, 5 Jul 2022 21:53:44 +0900 Subject: [PATCH] serial: use common initialization for serial --- src/machine/serial-none.go | 4 ++++ src/machine/serial-uart.go | 4 ++++ src/machine/serial-usb.go | 4 ++++ src/runtime/runtime_atmega.go | 2 +- src/runtime/runtime_atsamd21.go | 2 +- src/runtime/runtime_atsamd51.go | 2 +- src/runtime/runtime_esp32.go | 2 +- src/runtime/runtime_esp8266.go | 2 +- src/runtime/runtime_fe310.go | 2 +- src/runtime/runtime_k210.go | 2 +- src/runtime/runtime_mimxrt1062.go | 2 +- src/runtime/runtime_nrf.go | 2 +- src/runtime/runtime_rp2040.go | 2 +- src/runtime/runtime_stm32f103.go | 2 +- src/runtime/runtime_stm32f4.go | 2 +- src/runtime/runtime_stm32f405.go | 2 +- src/runtime/runtime_stm32f7x2.go | 2 +- src/runtime/runtime_stm32l0x1.go | 2 +- src/runtime/runtime_stm32l0x2.go | 2 +- src/runtime/runtime_stm32l4.go | 2 +- src/runtime/runtime_stm32l5x2.go | 2 +- src/runtime/runtime_stm32wlx.go | 2 +- 22 files changed, 31 insertions(+), 19 deletions(-) diff --git a/src/machine/serial-none.go b/src/machine/serial-none.go index 3596769f..6cfce217 100644 --- a/src/machine/serial-none.go +++ b/src/machine/serial-none.go @@ -5,3 +5,7 @@ package machine // Serial is a null device: writes to it are ignored. var Serial = NullSerial{} + +func InitSerial() { + Serial.Configure(UARTConfig{}) +} diff --git a/src/machine/serial-uart.go b/src/machine/serial-uart.go index 30575502..e0525d98 100644 --- a/src/machine/serial-uart.go +++ b/src/machine/serial-uart.go @@ -5,3 +5,7 @@ package machine // Serial is implemented via the default (usually the first) UART on the chip. var Serial = DefaultUART + +func InitSerial() { + Serial.Configure(UARTConfig{}) +} diff --git a/src/machine/serial-usb.go b/src/machine/serial-usb.go index ac484f87..eb4f83e8 100644 --- a/src/machine/serial-usb.go +++ b/src/machine/serial-usb.go @@ -5,3 +5,7 @@ package machine // Serial is implemented via USB (USB-CDC). var Serial = USB + +func InitSerial() { + Serial.Configure(UARTConfig{}) +} diff --git a/src/runtime/runtime_atmega.go b/src/runtime/runtime_atmega.go index f4391ead..17c0eabe 100644 --- a/src/runtime/runtime_atmega.go +++ b/src/runtime/runtime_atmega.go @@ -9,7 +9,7 @@ import ( ) func initUART() { - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() } func putchar(c byte) { diff --git a/src/runtime/runtime_atsamd21.go b/src/runtime/runtime_atsamd21.go index 69468655..9b3d8439 100644 --- a/src/runtime/runtime_atsamd21.go +++ b/src/runtime/runtime_atsamd21.go @@ -29,7 +29,7 @@ func init() { initADCClock() // connect to USB CDC interface - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() if !machine.USB.Configured() { machine.USB.Configure(machine.UARTConfig{}) } diff --git a/src/runtime/runtime_atsamd51.go b/src/runtime/runtime_atsamd51.go index 8c7282fa..d4502624 100644 --- a/src/runtime/runtime_atsamd51.go +++ b/src/runtime/runtime_atsamd51.go @@ -29,7 +29,7 @@ func init() { initADCClock() // connect to USB CDC interface - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() if !machine.USB.Configured() { machine.USB.Configure(machine.UARTConfig{}) } diff --git a/src/runtime/runtime_esp32.go b/src/runtime/runtime_esp32.go index 96d86af6..3075744c 100644 --- a/src/runtime/runtime_esp32.go +++ b/src/runtime/runtime_esp32.go @@ -43,7 +43,7 @@ func main() { clearbss() // Initialize UART. - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() // Initialize main system timer used for time.Now. initTimer() diff --git a/src/runtime/runtime_esp8266.go b/src/runtime/runtime_esp8266.go index 57a76bd5..cc047e06 100644 --- a/src/runtime/runtime_esp8266.go +++ b/src/runtime/runtime_esp8266.go @@ -48,7 +48,7 @@ func main() { rom_i2c_writeReg(103, 4, 2, 145) // Initialize UART. - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() // Initialize timer. Bits: // ENABLE: timer enable diff --git a/src/runtime/runtime_fe310.go b/src/runtime/runtime_fe310.go index 15dfe093..8bb696ba 100644 --- a/src/runtime/runtime_fe310.go +++ b/src/runtime/runtime_fe310.go @@ -92,7 +92,7 @@ func initPeripherals() { sifive.RTC.RTCCFG.Set(sifive.RTC_RTCCFG_ENALWAYS) // Configure the UART. - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() } func putchar(c byte) { diff --git a/src/runtime/runtime_k210.go b/src/runtime/runtime_k210.go index a49867bb..ffc348db 100644 --- a/src/runtime/runtime_k210.go +++ b/src/runtime/runtime_k210.go @@ -104,7 +104,7 @@ func initPeripherals() { // Enable FPIOA peripheral. kendryte.SYSCTL.CLK_EN_PERI.SetBits(kendryte.SYSCTL_CLK_EN_PERI_FPIOA_CLK_EN) - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() } func putchar(c byte) { diff --git a/src/runtime/runtime_mimxrt1062.go b/src/runtime/runtime_mimxrt1062.go index d777a65c..770a928d 100644 --- a/src/runtime/runtime_mimxrt1062.go +++ b/src/runtime/runtime_mimxrt1062.go @@ -119,7 +119,7 @@ func initPins() { } func initUART() { - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() } func putchar(c byte) { diff --git a/src/runtime/runtime_nrf.go b/src/runtime/runtime_nrf.go index 7ee34f8b..4e8c0288 100644 --- a/src/runtime/runtime_nrf.go +++ b/src/runtime/runtime_nrf.go @@ -28,7 +28,7 @@ func main() { } func init() { - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() initLFCLK() initRTC() } diff --git a/src/runtime/runtime_rp2040.go b/src/runtime/runtime_rp2040.go index c6bc0d79..ad1e67fb 100644 --- a/src/runtime/runtime_rp2040.go +++ b/src/runtime/runtime_rp2040.go @@ -76,7 +76,7 @@ func machineInit() func init() { machineInit() - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() } //export Reset_Handler diff --git a/src/runtime/runtime_stm32f103.go b/src/runtime/runtime_stm32f103.go index 89eb3ad6..afc7cfa1 100644 --- a/src/runtime/runtime_stm32f103.go +++ b/src/runtime/runtime_stm32f103.go @@ -11,7 +11,7 @@ import ( func init() { initCLK() - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() initTickTimer(&machine.TIM4) } diff --git a/src/runtime/runtime_stm32f4.go b/src/runtime/runtime_stm32f4.go index 9b26ce97..1512269f 100644 --- a/src/runtime/runtime_stm32f4.go +++ b/src/runtime/runtime_stm32f4.go @@ -12,7 +12,7 @@ import ( func init() { initCLK() - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() initTickTimer(&machine.TIM2) } diff --git a/src/runtime/runtime_stm32f405.go b/src/runtime/runtime_stm32f405.go index c42ee48a..59db1e76 100644 --- a/src/runtime/runtime_stm32f405.go +++ b/src/runtime/runtime_stm32f405.go @@ -156,7 +156,7 @@ func initCLK() { func initCOM() { if machine.NUM_UART_INTERFACES > 0 { - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() } } diff --git a/src/runtime/runtime_stm32f7x2.go b/src/runtime/runtime_stm32f7x2.go index 7158d14f..5eddd1c7 100644 --- a/src/runtime/runtime_stm32f7x2.go +++ b/src/runtime/runtime_stm32f7x2.go @@ -29,7 +29,7 @@ const ( func init() { initCLK() - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() initTickTimer(&machine.TIM3) } diff --git a/src/runtime/runtime_stm32l0x1.go b/src/runtime/runtime_stm32l0x1.go index dfc30f4c..d06e2d8f 100644 --- a/src/runtime/runtime_stm32l0x1.go +++ b/src/runtime/runtime_stm32l0x1.go @@ -15,7 +15,7 @@ const ( func init() { initCLK() - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() initTickTimer(&machine.TIM21) } diff --git a/src/runtime/runtime_stm32l0x2.go b/src/runtime/runtime_stm32l0x2.go index 4021e495..ead55a55 100644 --- a/src/runtime/runtime_stm32l0x2.go +++ b/src/runtime/runtime_stm32l0x2.go @@ -15,7 +15,7 @@ const ( func init() { initCLK() - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() initTickTimer(&machine.TIM3) } diff --git a/src/runtime/runtime_stm32l4.go b/src/runtime/runtime_stm32l4.go index aeb82bd1..8522da89 100644 --- a/src/runtime/runtime_stm32l4.go +++ b/src/runtime/runtime_stm32l4.go @@ -38,7 +38,7 @@ type arrtype = uint32 func init() { initCLK() - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() initTickTimer(&machine.TIM15) } diff --git a/src/runtime/runtime_stm32l5x2.go b/src/runtime/runtime_stm32l5x2.go index 65870594..89fba6c8 100644 --- a/src/runtime/runtime_stm32l5x2.go +++ b/src/runtime/runtime_stm32l5x2.go @@ -30,7 +30,7 @@ const ( func init() { initCLK() - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() initTickTimer(&machine.TIM16) } diff --git a/src/runtime/runtime_stm32wlx.go b/src/runtime/runtime_stm32wlx.go index 485d24b6..fec77108 100644 --- a/src/runtime/runtime_stm32wlx.go +++ b/src/runtime/runtime_stm32wlx.go @@ -23,7 +23,7 @@ func init() { initCLK() // UART init - machine.Serial.Configure(machine.UARTConfig{}) + machine.InitSerial() // Timers init initTickTimer(&machine.TIM1)