stm32: use stm32-rs SVDs which are of much higher quality

This commit changes the number of wait states for the stm32f103 chip to
2 instead of 4. This gets it back in line with the datasheet, but it
also has the side effect of breaking I2C. Therefore, another (seemingly
unrelated) change is needed: the i2cTimeout constant must be increased
to a higher value to adjust to the lower flash wait states - presumably
because the lower number of wait states allows the chip to run code
faster.

Author: aykevl

.gitmodules

@@ -20,3 +20,6 @@
 [submodule "lib/picolibc"]
 	path = lib/picolibc
 	url = https://github.com/keith-packard/picolibc.git
+[submodule "lib/stm32-svd"]
+	path = lib/stm32-svd
+	url = https://github.com/tinygo-org/stm32-svd

Makefile

@@ -130,7 +130,7 @@ gen-device-kendryte: build/gen-device-svd
 	GO111MODULE=off $(GO) fmt ./src/device/kendryte
 
 gen-device-stm32: build/gen-device-svd
-	./build/gen-device-svd -source=https://github.com/posborne/cmsis-svd/tree/master/data/STMicro lib/cmsis-svd/data/STMicro/ src/device/stm32/
+	./build/gen-device-svd -source=https://github.com/tinygo-org/stm32-svd lib/stm32-svd/svd src/device/stm32/
 	GO111MODULE=off $(GO) fmt ./src/device/stm32
 
 

lib/stm32-svd

@@ -122,17 +122,17 @@ var (
 	UART1 = UART{
 		Buffer:          NewRingBuffer(),
 		Bus:             stm32.USART3,
-		AltFuncSelector: stm32.AF7_USART1_2_3,
+		AltFuncSelector: AF7_USART1_2_3,
 	}
 	UART2 = UART{
 		Buffer:          NewRingBuffer(),
 		Bus:             stm32.USART6,
-		AltFuncSelector: stm32.AF8_USART4_5_6,
+		AltFuncSelector: AF8_USART4_5_6,
 	}
 	UART3 = UART{
 		Buffer:          NewRingBuffer(),
 		Bus:             stm32.USART1,
-		AltFuncSelector: stm32.AF7_USART1_2_3,
+		AltFuncSelector: AF7_USART1_2_3,
 	}
 	UART0 = UART1
 )
@@ -181,15 +181,15 @@ const (
 var (
 	SPI1 = SPI{
 		Bus:             stm32.SPI2,
-		AltFuncSelector: stm32.AF5_SPI1_SPI2,
+		AltFuncSelector: AF5_SPI1_SPI2,
 	}
 	SPI2 = SPI{
 		Bus:             stm32.SPI3,
-		AltFuncSelector: stm32.AF6_SPI3,
+		AltFuncSelector: AF6_SPI3,
 	}
 	SPI3 = SPI{
 		Bus:             stm32.SPI1,
-		AltFuncSelector: stm32.AF5_SPI1_SPI2,
+		AltFuncSelector: AF5_SPI1_SPI2,
 	}
 	SPI0 = SPI1
 )
@@ -229,15 +229,15 @@ const (
 var (
 	I2C1 = I2C{
 		Bus:             stm32.I2C1,
-		AltFuncSelector: stm32.AF4_I2C1_2_3,
+		AltFuncSelector: AF4_I2C1_2_3,
 	}
 	I2C2 = I2C{
 		Bus:             stm32.I2C2,
-		AltFuncSelector: stm32.AF4_I2C1_2_3,
+		AltFuncSelector: AF4_I2C1_2_3,
 	}
 	I2C3 = I2C{
 		Bus:             stm32.I2C1,
-		AltFuncSelector: stm32.AF4_I2C1_2_3,
+		AltFuncSelector: AF4_I2C1_2_3,
 	}
 	I2C0 = I2C1
 )

src/device/stm32/stm32-moder-bitfields.go

@@ -55,7 +55,7 @@ var (
 	// Console UART (LPUSART1)
 	UART0 = UART{
 		Buffer:          NewRingBuffer(),
-		Bus:             stm32.LPUSART1,
+		Bus:             stm32.LPUART1,
 		AltFuncSelector: 6,
 	}
 

src/device/stm32/stm32f103xx-bitfields.go

@@ -30,7 +30,7 @@ var (
 	UART0 = UART{
 		Buffer:          NewRingBuffer(),
 		Bus:             stm32.USART2,
-		AltFuncSelector: stm32.AF7_USART1_2_3,
+		AltFuncSelector: AF7_USART1_2_3,
 	}
 	UART1 = &UART0
 )
@@ -62,7 +62,7 @@ const (
 var (
 	SPI0 = SPI{
 		Bus:             stm32.SPI1,
-		AltFuncSelector: stm32.AF5_SPI1_SPI2,
+		AltFuncSelector: AF5_SPI1_SPI2,
 	}
 	SPI1 = &SPI0
 )

src/device/stm32/stm32f4-altfunc-bitfields.go

@@ -1,4 +1,4 @@
-// +build stm32,!stm32f103xx,!stm32f407,!stm32f7x2,!stm32l0
+// +build stm32,!stm32f103,!stm32f407,!stm32f7x2,!stm32l0
 
 package machine
 
@@ -110,10 +110,10 @@ type (
 )
 
 func (sa address7Bit) toRead() uint32 {
-	return uint32(((uint8(sa) << 1) | uint8(stm32.I2C_OAR1_ADD0)) & 0xFF)
+	return uint32(((uint8(sa) << 1) | 1) & 0xFF)
 }
 func (sa address7Bit) toWrite() uint32 {
-	return uint32(((uint8(sa) << 1) & ^(uint8(stm32.I2C_OAR1_ADD0))) & 0xFF)
+	return uint32((uint8(sa) << 1) & 0xFF)
 }
 func (sa address7Bit) bitSize() uint8 { return 7 } // 7-bit addresses