softonik/tinygo
1
0
Ответвление 0
Код Задачи Слияния Проекты Выпуски Пакеты Вики Активность Действия

machine/stm32: use HasBits() method to simplify bit comparisons

Просмотр исходного кода 
Signed-off-by: Ron Evans <ron@hybridgroup.com>
Этот коммит содержится в:
Ron Evans 2019-05-27 15:37:57 +02:00 • коммит произвёл Ayke
родитель 31189deb3b
коммит be491abc46
4 изменённых файлов: 35 добавлений и 35 удалений
Показать статистику Скачать .patch Скачать .diff Показать все файлы Свернуть все файлы

44
src/machine/machine_stm32f103xx.go
Просмотреть файл

@ -157,7 +157,7 @@ func (uart UART) SetBaudRate(br uint32) {
func (uart UART) WriteByte(c byte) error {
stm32.USART1.DR.Set(uint32(c))
for (stm32.USART1.SR.Get() & stm32.USART_SR_TXE) == 0 {
for !stm32.USART1.SR.HasBits(stm32.USART_SR_TXE) {
}
return nil
}
@ -265,15 +265,15 @@ func (spi SPI) Transfer(w byte) (byte, error) {
spi.Bus.DR.Set(uint32(w))
// Wait until transmit complete
for (spi.Bus.SR.Get() & stm32.SPI_SR_TXE) == 0 {
for !spi.Bus.SR.HasBits(stm32.SPI_SR_TXE) {
}
// Wait until receive complete
for (spi.Bus.SR.Get() & stm32.SPI_SR_RXNE) == 0 {
for !spi.Bus.SR.HasBits(stm32.SPI_SR_RXNE) {
}
// Wait until SPI is not busy
for (spi.Bus.SR.Get() & stm32.SPI_SR_BSY) > 0 {
for spi.Bus.SR.HasBits(stm32.SPI_SR_BSY) {
}
// Return received data from SPI data register
@ -439,7 +439,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
// clear timeout here
timeout := i2cTimeout
for i2c.Bus.SR2.Get()&(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) == 0 {
for !i2c.Bus.SR2.HasBits(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on read clear address")
@ -450,7 +450,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
i2c.Bus.CR1.SetBits(stm32.I2C_CR1_STOP)
timeout = i2cTimeout
for (i2c.Bus.SR1.Get() & stm32.I2C_SR1_RxNE) == 0 {
for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_RxNE) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on read 1 byte")
@ -478,7 +478,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
// clear address here
timeout := i2cTimeout
for i2c.Bus.SR2.Get()&(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) == 0 {
for !i2c.Bus.SR2.HasBits(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on read clear address")
@ -490,7 +490,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
// wait for btf. we need a longer timeout here than normal.
timeout = 1000
for (i2c.Bus.SR1.Get() & stm32.I2C_SR1_BTF) == 0 {
for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_BTF) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on read 2 bytes")
@ -524,7 +524,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
// clear address here
timeout := i2cTimeout
for i2c.Bus.SR2.Get()&(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) == 0 {
for !i2c.Bus.SR2.HasBits(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on read clear address")
@ -536,7 +536,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
// wait for btf. we need a longer timeout here than normal.
timeout = 1000
for (i2c.Bus.SR1.Get() & stm32.I2C_SR1_BTF) == 0 {
for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_BTF) {
timeout--
if timeout == 0 {
println("I2C timeout on read 3 bytes")
@ -551,7 +551,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
r[0] = byte(i2c.Bus.DR.Get())
timeout = 1000
for (i2c.Bus.SR1.Get() & stm32.I2C_SR1_BTF) == 0 {
for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_BTF) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on read 3 bytes")
@ -579,7 +579,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
// clear address here
timeout := i2cTimeout
for i2c.Bus.SR2.Get()&(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) == 0 {
for !i2c.Bus.SR2.HasBits(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on read clear address")
@ -592,7 +592,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
// wait for btf. we need a longer timeout here than normal.
timeout = 1000
for (i2c.Bus.SR1.Get() & stm32.I2C_SR1_BTF) == 0 {
for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_BTF) {
timeout--
if timeout == 0 {
println("I2C timeout on read 3 bytes")
@ -606,7 +606,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
// wait for btf. we need a longer timeout here than normal.
timeout = 1000
for (i2c.Bus.SR1.Get() & stm32.I2C_SR1_BTF) == 0 {
for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_BTF) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on read more than 3 bytes")
@ -626,7 +626,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
r[len(r)-2] = byte(i2c.Bus.DR.Get())
timeout = i2cTimeout
for (i2c.Bus.SR1.Get() & stm32.I2C_SR1_RxNE) == 0 {
for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_RxNE) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on read last byte of more than 3")
@ -650,7 +650,7 @@ const i2cTimeout = 500
func (i2c I2C) signalStart() error {
// Wait until I2C is not busy
timeout := i2cTimeout
for (i2c.Bus.SR2.Get() & stm32.I2C_SR2_BUSY) > 0 {
for i2c.Bus.SR2.HasBits(stm32.I2C_SR2_BUSY) {
timeout--
if timeout == 0 {
return errors.New("I2C busy on start")
@ -665,7 +665,7 @@ func (i2c I2C) signalStart() error {
// Wait for I2C EV5 aka SB flag.
timeout = i2cTimeout
for (i2c.Bus.SR1.Get() & stm32.I2C_SR1_SB) == 0 {
for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_SB) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on start")
@ -688,7 +688,7 @@ func (i2c I2C) signalStop() error {
func (i2c I2C) waitForStop() error {
// Wait until I2C is stopped
timeout := i2cTimeout
for (i2c.Bus.SR1.Get() & stm32.I2C_SR1_STOPF) > 0 {
for i2c.Bus.SR1.HasBits(stm32.I2C_SR1_STOPF) {
timeout--
if timeout == 0 {
println("I2C timeout on wait for stop signal")
@ -713,7 +713,7 @@ func (i2c I2C) sendAddress(address uint8, write bool) error {
timeout := i2cTimeout
if write {
// EV6 which is ADDR flag.
for i2c.Bus.SR1.Get()&stm32.I2C_SR1_ADDR == 0 {
for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_ADDR) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on send write address")
@ -721,7 +721,7 @@ func (i2c I2C) sendAddress(address uint8, write bool) error {
}
timeout = i2cTimeout
for i2c.Bus.SR2.Get()&(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY|stm32.I2C_SR2_TRA) == 0 {
for !i2c.Bus.SR2.HasBits(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY|stm32.I2C_SR2_TRA) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on send write address")
@ -729,7 +729,7 @@ func (i2c I2C) sendAddress(address uint8, write bool) error {
}
} else {
// I2C_EVENT_MASTER_RECEIVER_MODE_SELECTED which is ADDR flag.
for (i2c.Bus.SR1.Get() & stm32.I2C_SR1_ADDR) == 0 {
for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_ADDR) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on send read address")
@ -749,7 +749,7 @@ func (i2c I2C) WriteByte(data byte) error {
// output on the bus.
// I2C_EVENT_MASTER_BYTE_TRANSMITTED is TXE flag.
timeout := i2cTimeout
for i2c.Bus.SR1.Get()&stm32.I2C_SR1_TxE == 0 {
for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_TxE) {
timeout--
if timeout == 0 {
return errors.New("I2C timeout on write")

2
src/machine/machine_stm32f407.go
Просмотреть файл

@ -209,7 +209,7 @@ func (uart UART) Configure(config UARTConfig) {
func (uart UART) WriteByte(c byte) error {
stm32.USART2.DR.Set(uint32(c))
for (stm32.USART2.SR.Get() & stm32.USART_SR_TXE) == 0 {
for !stm32.USART2.SR.HasBits(stm32.USART_SR_TXE) {
}
return nil
}

14
src/runtime/runtime_stm32f103xx.go
Просмотреть файл

@ -27,13 +27,13 @@ func initCLK() {
stm32.RCC.CR.SetBits(stm32.RCC_CR_HSEON) // enable HSE clock
// wait for the HSEREADY flag
for (stm32.RCC.CR.Get() & stm32.RCC_CR_HSERDY) == 0 {
for !stm32.RCC.CR.HasBits(stm32.RCC_CR_HSERDY) {
}
stm32.RCC.CR.SetBits(stm32.RCC_CR_HSION) // enable HSI clock
// wait for the HSIREADY flag
for (stm32.RCC.CR.Get() & stm32.RCC_CR_HSIRDY) == 0 {
for !stm32.RCC.CR.HasBits(stm32.RCC_CR_HSIRDY) {
}
stm32.RCC.CFGR.SetBits(stm32.RCC_CFGR_PLLSRC) // set PLL source to HSE
@ -41,13 +41,13 @@ func initCLK() {
stm32.RCC.CR.SetBits(stm32.RCC_CR_PLLON) // enable the PLL
// wait for the PLLRDY flag
for (stm32.RCC.CR.Get() & stm32.RCC_CR_PLLRDY) == 0 {
for !stm32.RCC.CR.HasBits(stm32.RCC_CR_PLLRDY) {
}
stm32.RCC.CFGR.SetBits(stm32.RCC_CFGR_SW_PLL) // set clock source to pll
// wait for PLL to be CLK
for (stm32.RCC.CFGR.Get() & stm32.RCC_CFGR_SWS_PLL) == 0 {
for !stm32.RCC.CFGR.HasBits(stm32.RCC_CFGR_SWS_PLL) {
}
}
@ -74,7 +74,7 @@ func initRTC() {
stm32.RCC.BDCR.SetBits(stm32.RCC_BDCR_LSEON)
// wait until LSE is ready
for stm32.RCC.BDCR.Get()&stm32.RCC_BDCR_LSERDY == 0 {
for !stm32.RCC.BDCR.HasBits(stm32.RCC_BDCR_LSERDY) {
}
// Select LSE
@ -95,7 +95,7 @@ func initRTC() {
stm32.RTC.CRL.ClearBits(stm32.RTC_CRL_RSF)
// Wait till flag is set
for stm32.RTC.CRL.Get()&stm32.RTC_CRL_RSF == 0 {
for !stm32.RTC.CRL.HasBits(stm32.RTC_CRL_RSF) {
}
}
@ -184,7 +184,7 @@ func timerSleep(ticks uint32) {
//go:export TIM3_IRQHandler
func handleTIM3() {
if (stm32.TIM3.SR.Get() & stm32.TIM_SR_UIF) > 0 {
if stm32.TIM3.SR.HasBits(stm32.TIM_SR_UIF) {
// Disable the timer.
stm32.TIM3.CR1.ClearBits(stm32.TIM_CR1_CEN)

10
src/runtime/runtime_stm32f407.go
Просмотреть файл

@ -43,7 +43,7 @@ func initCLK() {
// Reset clock registers
// Set HSION
stm32.RCC.CR.SetBits(stm32.RCC_CR_HSION)
for (stm32.RCC.CR.Get() & stm32.RCC_CR_HSIRDY) == 0 {
for !stm32.RCC.CR.HasBits(stm32.RCC_CR_HSIRDY) {
}
// Reset CFGR
@ -66,11 +66,11 @@ func initCLK() {
// Wait till HSE is ready and if timeout is reached exit
for {
startupCounter++
if (stm32.RCC.CR.Get()&stm32.RCC_CR_HSERDY != 0) || (startupCounter == HSE_STARTUP_TIMEOUT) {
if stm32.RCC.CR.HasBits(stm32.RCC_CR_HSERDY) || (startupCounter == HSE_STARTUP_TIMEOUT) {
break
}
}
if (stm32.RCC.CR.Get() & stm32.RCC_CR_HSERDY) != 0 {
if stm32.RCC.CR.HasBits(stm32.RCC_CR_HSERDY) {
// Enable high performance mode, System frequency up to 168MHz
stm32.RCC.APB1ENR.SetBits(stm32.RCC_APB1ENR_PWREN)
stm32.PWR.CR.SetBits(0x4000) // PWR_CR_VOS
@ -187,7 +187,7 @@ func timerSleep(ticks uint32) {
//go:export TIM3_IRQHandler
func handleTIM3() {
if (stm32.TIM3.SR.Get() & stm32.TIM_SR_UIF) > 0 {
if stm32.TIM3.SR.HasBits(stm32.TIM_SR_UIF) {
// Disable the timer.
stm32.TIM3.CR1.ClearBits(stm32.TIM_CR1_CEN)
@ -201,7 +201,7 @@ func handleTIM3() {
//go:export TIM7_IRQHandler
func handleTIM7() {
if (stm32.TIM7.SR.Get() & stm32.TIM_SR_UIF) > 0 {
if stm32.TIM7.SR.HasBits(stm32.TIM_SR_UIF) {
// clear the update flag
stm32.TIM7.SR.ClearBits(stm32.TIM_SR_UIF)
tickCount++