tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-12 06:53:40 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

machine/rp: use the blockReset() and unresetBlockWait() helper functions for all peripheral reset/unreset operations

Browse Source 
Signed-off-by: deadprogram <ron@hybridgroup.com>
This commit is contained in:
deadprogram
2026-01-13 01:22:20 +01:00
committed by Ron Evans
parent ff58c50118
commit 8bd2233b57
4 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/machine_rp2_adc.go
+2 -4
View File
@@ -19,10 +19,8 @@ var adcAref uint32
// InitADC resets the ADC peripheral. // InitADC resets the ADC peripheral.
func InitADC() { func InitADC() {
rp.RESETS.RESET.SetBits(rp.RESETS_RESET_ADC) resetBlock(rp.RESETS_RESET_ADC)
rp.RESETS.RESET.ClearBits(rp.RESETS_RESET_ADC) unresetBlockWait(rp.RESETS_RESET_ADC)
for !rp.RESETS.RESET_DONE.HasBits(rp.RESETS_RESET_ADC) {
}
// enable ADC // enable ADC
rp.ADC.CS.Set(rp.ADC_CS_EN) rp.ADC.CS.Set(rp.ADC_CS_EN)
adcAref = 3300 adcAref = 3300
src/machine/machine_rp2_i2c.go
+2 -5
View File
@@ -259,10 +259,7 @@ func (i2c *I2C) init(config I2CConfig) error {
//go:inline //go:inline
func (i2c *I2C) reset() { func (i2c *I2C) reset() {
resetVal := i2c.deinit() resetVal := i2c.deinit()
rp.RESETS.RESET.ClearBits(resetVal) unresetBlockWait(resetVal)
// Wait until reset is done.
for !rp.RESETS.RESET_DONE.HasBits(resetVal) {
}
} }
// deinit sets reset bit for I2C. Must call reset to reenable I2C after deinit. // deinit sets reset bit for I2C. Must call reset to reenable I2C after deinit.
@@ -276,7 +273,7 @@ func (i2c *I2C) deinit() (resetVal uint32) {
resetVal = rp.RESETS_RESET_I2C1 resetVal = rp.RESETS_RESET_I2C1
} }
// Perform I2C reset. // Perform I2C reset.
rp.RESETS.RESET.SetBits(resetVal) resetBlock(resetVal)
return resetVal return resetVal
} }
src/machine/machine_rp2_spi.go
+2 -5
View File
@@ -212,10 +212,7 @@ func (spi *SPI) setFormat(mode uint8) {
//go:inline //go:inline
func (spi *SPI) reset() { func (spi *SPI) reset() {
resetVal := spi.deinit() resetVal := spi.deinit()
rp.RESETS.RESET.ClearBits(resetVal) unresetBlockWait(resetVal)
// Wait until reset is done.
for !rp.RESETS.RESET_DONE.HasBits(resetVal) {
}
} }
//go:inline //go:inline
@@ -227,7 +224,7 @@ func (spi *SPI) deinit() (resetVal uint32) {
resetVal = rp.RESETS_RESET_SPI1 resetVal = rp.RESETS_RESET_SPI1
} }
// Perform SPI reset. // Perform SPI reset.
rp.RESETS.RESET.SetBits(resetVal) resetBlock(resetVal)
return resetVal return resetVal
} }
src/machine/machine_rp2_uart.go
+2 -4
View File
@@ -148,10 +148,8 @@ func initUART(uart *UART) {
} }
// reset UART // reset UART
rp.RESETS.RESET.SetBits(resetVal) resetBlock(resetVal)
rp.RESETS.RESET.ClearBits(resetVal) unresetBlockWait(resetVal)
for !rp.RESETS.RESET_DONE.HasBits(resetVal) {
}
} }
// handleInterrupt should be called from the appropriate interrupt handler for // handleInterrupt should be called from the appropriate interrupt handler for