align api for PortMaskSet, PortMaskClear

oflebbe · deadprogram · commit 3dd502a92883 · 2022-05-26T21:37:03.000+02:00
diff --git a/src/machine/machine_rp2040_gpio.go b/src/machine/machine_rp2040_gpio.go
@@ -88,8 +88,8 @@ const (
 	PinSPI
 )
 
-func (p Pin) PortMaskSet() (*volatile.Register32, uint32) {
-	return &rp.SIO.GPIO_OUT_SET, 1 << p
+func (p Pin) PortMaskSet() (*uint32, uint32) {
+	return (*uint32)(unsafe.Pointer(&rp.SIO.GPIO_OUT_SET)), 1 << p
 }
 
 // set drives the pin high
@@ -98,8 +98,8 @@ func (p Pin) set() {
 	rp.SIO.GPIO_OUT_SET.Set(mask)
 }
 
-func (p Pin) PortMaskClear() (*volatile.Register32, uint32) {
-	return &rp.SIO.GPIO_OUT_CLR, 1 << p
+func (p Pin) PortMaskClear() (*uint32, uint32) {
+	return (*uint32)(unsafe.Pointer(&rp.SIO.GPIO_OUT_CLR)), 1 << p
 }
 
 // clr drives the pin low

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ const (`
`88`	`88`	`PinSPI`
`89`	`89`	`)`
`90`	`90`
`91`		`-func (p Pin) PortMaskSet() (*volatile.Register32, uint32) {`
`92`		`- return &rp.SIO.GPIO_OUT_SET, 1 << p`
	`91`	`+func (p Pin) PortMaskSet() (*uint32, uint32) {`
	`92`	`+ return (*uint32)(unsafe.Pointer(&rp.SIO.GPIO_OUT_SET)), 1 << p`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`// set drives the pin high`
`@@ -98,8 +98,8 @@ func (p Pin) set() {`
`98`	`98`	`rp.SIO.GPIO_OUT_SET.Set(mask)`
`99`	`99`	`}`
`100`	`100`
`101`		`-func (p Pin) PortMaskClear() (*volatile.Register32, uint32) {`
`102`		`- return &rp.SIO.GPIO_OUT_CLR, 1 << p`
	`101`	`+func (p Pin) PortMaskClear() (*uint32, uint32) {`
	`102`	`+ return (*uint32)(unsafe.Pointer(&rp.SIO.GPIO_OUT_CLR)), 1 << p`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`// clr drives the pin low`