tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-03 10:37:46 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

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

Browse Source 
Signed-off-by: Ron Evans <ron@hybridgroup.com>
This commit is contained in:
Ron Evans
2019-05-27 15:36:54 +02:00
committed by Ayke
parent 90cd3f8ea5
commit 31189deb3b
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/machine_atmega.go
+6 -6
View File
@@ -165,7 +165,7 @@ func (i2c I2C) start(address uint8, write bool) {
avr.TWCR.Set((avr.TWCR_TWINT | avr.TWCR_TWSTA | avr.TWCR_TWEN))
// Wait till start condition is transmitted.
for (avr.TWCR.Get() & avr.TWCR_TWINT) == 0 {
for !avr.TWCR.HasBits(avr.TWCR_TWINT) {
}
// Write 7-bit shifted peripheral address.
@@ -182,7 +182,7 @@ func (i2c I2C) stop() {
avr.TWCR.Set(avr.TWCR_TWEN | avr.TWCR_TWINT | avr.TWCR_TWSTO)
// Wait for stop condition to be executed on bus.
for (avr.TWCR.Get() & avr.TWCR_TWSTO) == 0 {
for !avr.TWCR.HasBits(avr.TWCR_TWSTO) {
}
}
@@ -195,7 +195,7 @@ func (i2c I2C) writeByte(data byte) {
avr.TWCR.Set(avr.TWCR_TWEN | avr.TWCR_TWINT)
// Wait till data is transmitted.
for (avr.TWCR.Get() & avr.TWCR_TWINT) == 0 {
for !avr.TWCR.HasBits(avr.TWCR_TWINT) {
}
}
@@ -205,7 +205,7 @@ func (i2c I2C) readByte() byte {
avr.TWCR.Set(avr.TWCR_TWEN | avr.TWCR_TWINT | avr.TWCR_TWEA)
// Wait till read request is transmitted.
for (avr.TWCR.Get() & avr.TWCR_TWINT) == 0 {
for !avr.TWCR.HasBits(avr.TWCR_TWINT) {
}
return byte(avr.TWDR.Get())
@@ -239,7 +239,7 @@ func (uart UART) Configure(config UARTConfig) {
// WriteByte writes a byte of data to the UART.
func (uart UART) WriteByte(c byte) error {
// Wait until UART buffer is not busy.
for (avr.UCSR0A.Get() & avr.UCSR0A_UDRE0) == 0 {
for !avr.UCSR0A.HasBits(avr.UCSR0A_UDRE0) {
}
avr.UDR0.Set(c) // send char
return nil
@@ -251,7 +251,7 @@ func handleUSART_RX() {
data := avr.UDR0.Get()
// Ensure no error.
if (avr.UCSR0A.Get() & (avr.UCSR0A_FE0 | avr.UCSR0A_DOR0 | avr.UCSR0A_UPE0)) == 0 {
if !avr.UCSR0A.HasBits(avr.UCSR0A_FE0 | avr.UCSR0A_DOR0 | avr.UCSR0A_UPE0) {
// Put data from UDR register into buffer.
UART0.Receive(byte(data))
}
src/machine/machine_avr.go
+1 -1
View File
@@ -74,7 +74,7 @@ func (a ADC) Get() uint16 {
avr.ADCSRA.SetBits(avr.ADCSRA_ADSC)
// ADSC is cleared when the conversion finishes
for ok := true; ok; ok = (avr.ADCSRA.Get() & avr.ADCSRA_ADSC) > 0 {
for ok := true; ok; ok = avr.ADCSRA.HasBits(avr.ADCSRA_ADSC) {
}
return uint16(avr.ADCL.Get()) | uint16(avr.ADCH.Get())<<8