diff options
author | sago35 <[email protected]> | 2022-02-25 19:11:49 +0900 |
---|---|---|
committer | Ron Evans <[email protected]> | 2022-02-28 10:19:26 +0100 |
commit | d65e3deccf3ab35fe377806cf775bc6b1017328e (patch) | |
tree | 260265a4d96fa1141d7031e7fe4fa638e6967eba /src/machine | |
parent | cbfa85be6ad018b447f2c47401f4ebf8193b0887 (diff) | |
download | tinygo-d65e3deccf3ab35fe377806cf775bc6b1017328e.tar.gz tinygo-d65e3deccf3ab35fe377806cf775bc6b1017328e.zip |
Revert "all: move stm32 files to separate repository"
This reverts commit 644356c220ed88f110d01300f671a170cd36eb04.
Diffstat (limited to 'src/machine')
42 files changed, 42 insertions, 42 deletions
diff --git a/src/machine/board_bluepill.go b/src/machine/board_bluepill.go index a39ca27f8..9f7dca8a4 100644 --- a/src/machine/board_bluepill.go +++ b/src/machine/board_bluepill.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_feather-stm32f405.go b/src/machine/board_feather-stm32f405.go index 9ef49be5d..1e695a43a 100644 --- a/src/machine/board_feather-stm32f405.go +++ b/src/machine/board_feather-stm32f405.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_gnse.go b/src/machine/board_gnse.go index 2968671bf..073c0c045 100644 --- a/src/machine/board_gnse.go +++ b/src/machine/board_gnse.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_lgt92.go b/src/machine/board_lgt92.go index 72042adbd..7a4da00bb 100644 --- a/src/machine/board_lgt92.go +++ b/src/machine/board_lgt92.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_lorae5.go b/src/machine/board_lorae5.go index 66fd3246c..422eca20b 100644 --- a/src/machine/board_lorae5.go +++ b/src/machine/board_lorae5.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleof103rb.go b/src/machine/board_nucleof103rb.go index 84bc654de..3027c5ad5 100644 --- a/src/machine/board_nucleof103rb.go +++ b/src/machine/board_nucleof103rb.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleof722ze.go b/src/machine/board_nucleof722ze.go index 4bb6abe70..4206e39d4 100644 --- a/src/machine/board_nucleof722ze.go +++ b/src/machine/board_nucleof722ze.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleol031k6.go b/src/machine/board_nucleol031k6.go index 1093985cc..cc0fbe15b 100644 --- a/src/machine/board_nucleol031k6.go +++ b/src/machine/board_nucleol031k6.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleol432kc.go b/src/machine/board_nucleol432kc.go index f06ea5f9a..d8c91d06d 100644 --- a/src/machine/board_nucleol432kc.go +++ b/src/machine/board_nucleol432kc.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleol552ze.go b/src/machine/board_nucleol552ze.go index 9dd87ac3c..d34f40d64 100644 --- a/src/machine/board_nucleol552ze.go +++ b/src/machine/board_nucleol552ze.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleowl55jc.go b/src/machine/board_nucleowl55jc.go index 3dfd3470e..761d4b841 100644 --- a/src/machine/board_nucleowl55jc.go +++ b/src/machine/board_nucleowl55jc.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_stm32f469disco.go b/src/machine/board_stm32f469disco.go index 7e16f66c4..07a51c0bb 100644 --- a/src/machine/board_stm32f469disco.go +++ b/src/machine/board_stm32f469disco.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_stm32f4disco.go b/src/machine/board_stm32f4disco.go index 2dc5a969e..f396e4ca2 100644 --- a/src/machine/board_stm32f4disco.go +++ b/src/machine/board_stm32f4disco.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_swan.go b/src/machine/board_swan.go index a49d44d0d..8c50fff49 100644 --- a/src/machine/board_swan.go +++ b/src/machine/board_swan.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/machine_stm32.go b/src/machine/machine_stm32.go index 8a6936567..a5d4b3827 100644 --- a/src/machine/machine_stm32.go +++ b/src/machine/machine_stm32.go @@ -3,7 +3,7 @@ package machine -import "tinygo.org/x/device/stm32" +import "device/stm32" const deviceName = stm32.Device diff --git a/src/machine/machine_stm32_adc_f1.go b/src/machine/machine_stm32_adc_f1.go index 3e73b6453..fb0cee669 100644 --- a/src/machine/machine_stm32_adc_f1.go +++ b/src/machine/machine_stm32_adc_f1.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32_adc_f4.go b/src/machine/machine_stm32_adc_f4.go index 3ad93257d..4f0b8d11b 100644 --- a/src/machine/machine_stm32_adc_f4.go +++ b/src/machine/machine_stm32_adc_f4.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32_exti_afio.go b/src/machine/machine_stm32_exti_afio.go index c093b391e..0cf34003b 100644 --- a/src/machine/machine_stm32_exti_afio.go +++ b/src/machine/machine_stm32_exti_afio.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/volatile" - "tinygo.org/x/device/stm32" ) func getEXTIConfigRegister(pin uint8) *volatile.Register32 { diff --git a/src/machine/machine_stm32_exti_exti.go b/src/machine/machine_stm32_exti_exti.go index f6145f9f4..e21cfae56 100644 --- a/src/machine/machine_stm32_exti_exti.go +++ b/src/machine/machine_stm32_exti_exti.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/volatile" - "tinygo.org/x/device/stm32" ) func getEXTIConfigRegister(pin uint8) *volatile.Register32 { diff --git a/src/machine/machine_stm32_exti_syscfg.go b/src/machine/machine_stm32_exti_syscfg.go index dc3e571bf..7e4666cf4 100644 --- a/src/machine/machine_stm32_exti_syscfg.go +++ b/src/machine/machine_stm32_exti_syscfg.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/volatile" - "tinygo.org/x/device/stm32" ) func getEXTIConfigRegister(pin uint8) *volatile.Register32 { diff --git a/src/machine/machine_stm32_exti_syscfg_noenable.go b/src/machine/machine_stm32_exti_syscfg_noenable.go index 0845e8dd9..d6fa06e27 100644 --- a/src/machine/machine_stm32_exti_syscfg_noenable.go +++ b/src/machine/machine_stm32_exti_syscfg_noenable.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/volatile" - "tinygo.org/x/device/stm32" ) func getEXTIConfigRegister(pin uint8) *volatile.Register32 { diff --git a/src/machine/machine_stm32_gpio_reva.go b/src/machine/machine_stm32_gpio_reva.go index bcbbf1add..1712986aa 100644 --- a/src/machine/machine_stm32_gpio_reva.go +++ b/src/machine/machine_stm32_gpio_reva.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) // This variant of the GPIO input interrupt logic is for diff --git a/src/machine/machine_stm32_gpio_revb.go b/src/machine/machine_stm32_gpio_revb.go index 3d97ee1c8..7329f47ee 100644 --- a/src/machine/machine_stm32_gpio_revb.go +++ b/src/machine/machine_stm32_gpio_revb.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) // This variant of the GPIO input interrupt logic is for diff --git a/src/machine/machine_stm32_gpio_revb_mp.go b/src/machine/machine_stm32_gpio_revb_mp.go index ba24b7494..0eb91989a 100644 --- a/src/machine/machine_stm32_gpio_revb_mp.go +++ b/src/machine/machine_stm32_gpio_revb_mp.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) // diff --git a/src/machine/machine_stm32_i2c_reva.go b/src/machine/machine_stm32_i2c_reva.go index f03a46932..eee4e155d 100644 --- a/src/machine/machine_stm32_i2c_reva.go +++ b/src/machine/machine_stm32_i2c_reva.go @@ -7,7 +7,7 @@ package machine // of MCUs. import ( - "tinygo.org/x/device/stm32" + "device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32_i2c_revb.go b/src/machine/machine_stm32_i2c_revb.go index 662429b66..449c28099 100644 --- a/src/machine/machine_stm32_i2c_revb.go +++ b/src/machine/machine_stm32_i2c_revb.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32_moder_gpio.go b/src/machine/machine_stm32_moder_gpio.go index 71c85aa2f..b24ac48c3 100644 --- a/src/machine/machine_stm32_moder_gpio.go +++ b/src/machine/machine_stm32_moder_gpio.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) // GPIO for the stm32 families except the stm32f1xx which uses a simpler but diff --git a/src/machine/machine_stm32_rng.go b/src/machine/machine_stm32_rng.go index 6cfc2d826..8160ab87f 100644 --- a/src/machine/machine_stm32_rng.go +++ b/src/machine/machine_stm32_rng.go @@ -3,7 +3,7 @@ package machine -import "tinygo.org/x/device/stm32" +import "device/stm32" var rngInitDone = false diff --git a/src/machine/machine_stm32_spi.go b/src/machine/machine_stm32_spi.go index 9537e5252..481df8cd1 100644 --- a/src/machine/machine_stm32_spi.go +++ b/src/machine/machine_stm32_spi.go @@ -6,8 +6,8 @@ package machine // Peripheral abstraction layer for SPI on the stm32 family import ( + "device/stm32" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32_tim.go b/src/machine/machine_stm32_tim.go index f1f9a8dbf..02c6c7a16 100644 --- a/src/machine/machine_stm32_tim.go +++ b/src/machine/machine_stm32_tim.go @@ -7,9 +7,9 @@ package machine // depending on the size of that register in the MCU's TIM_Type structure. import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" ) const PWM_MODE1 = 0x6 diff --git a/src/machine/machine_stm32_uart.go b/src/machine/machine_stm32_uart.go index 1ebbad6bc..9fdd17cb0 100644 --- a/src/machine/machine_stm32_uart.go +++ b/src/machine/machine_stm32_uart.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for UARTs on the stm32 family. import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32f103.go b/src/machine/machine_stm32f103.go index 9a7955056..4c6778023 100644 --- a/src/machine/machine_stm32f103.go +++ b/src/machine/machine_stm32f103.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for the stm32. import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32f4.go b/src/machine/machine_stm32f4.go index fdf6b82fa..dd8a0ad7c 100644 --- a/src/machine/machine_stm32f4.go +++ b/src/machine/machine_stm32f4.go @@ -6,10 +6,10 @@ package machine // Peripheral abstraction layer for the stm32f4 import ( + "device/stm32" "math/bits" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32f7.go b/src/machine/machine_stm32f7.go index bc53dcb62..838250b5a 100644 --- a/src/machine/machine_stm32f7.go +++ b/src/machine/machine_stm32f7.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for the stm32f4 import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32f7x2.go b/src/machine/machine_stm32f7x2.go index 2142f3fe0..bdfa27bc1 100644 --- a/src/machine/machine_stm32f7x2.go +++ b/src/machine/machine_stm32f7x2.go @@ -6,7 +6,7 @@ package machine // Peripheral abstraction layer for the stm32f407 import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) func CPUFrequency() uint32 { diff --git a/src/machine/machine_stm32l0.go b/src/machine/machine_stm32l0.go index c090d0c0e..70b7ce583 100644 --- a/src/machine/machine_stm32l0.go +++ b/src/machine/machine_stm32l0.go @@ -6,8 +6,8 @@ package machine // Peripheral abstraction layer for the stm32l0 import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) func CPUFrequency() uint32 { diff --git a/src/machine/machine_stm32l0x1.go b/src/machine/machine_stm32l0x1.go index 2cd0db332..254fb36cc 100644 --- a/src/machine/machine_stm32l0x1.go +++ b/src/machine/machine_stm32l0x1.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for the stm32l0 import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32l0x2.go b/src/machine/machine_stm32l0x2.go index bc92c38f0..3ac632548 100644 --- a/src/machine/machine_stm32l0x2.go +++ b/src/machine/machine_stm32l0x2.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for the stm32l0 import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32l4.go b/src/machine/machine_stm32l4.go index a28d19920..9063b802b 100644 --- a/src/machine/machine_stm32l4.go +++ b/src/machine/machine_stm32l4.go @@ -4,9 +4,9 @@ package machine import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32l5.go b/src/machine/machine_stm32l5.go index c077b960d..5eb951d83 100644 --- a/src/machine/machine_stm32l5.go +++ b/src/machine/machine_stm32l5.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for the stm32l5 import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32l5x2.go b/src/machine/machine_stm32l5x2.go index acf03bd95..966c0cebc 100644 --- a/src/machine/machine_stm32l5x2.go +++ b/src/machine/machine_stm32l5x2.go @@ -6,7 +6,7 @@ package machine // Peripheral abstraction layer for the stm32f407 import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) func CPUFrequency() uint32 { diff --git a/src/machine/machine_stm32wlx.go b/src/machine/machine_stm32wlx.go index ff5d09006..377781e8b 100644 --- a/src/machine/machine_stm32wlx.go +++ b/src/machine/machine_stm32wlx.go @@ -6,10 +6,10 @@ package machine // Peripheral abstraction layer for the stm32wle5 import ( + "device/stm32" "math/bits" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) |