Merge branch 'fix_16190' into sfe_rp2350_beta_05

sfe-SparkFro · sfe-SparkFro · commit 913b02771877 · 2024-12-03T14:37:42.000-07:00
diff --git a/ports/rp2/machine_bitstream.c b/ports/rp2/machine_bitstream.c
@@ -32,7 +32,11 @@
 
 #if MICROPY_PY_MACHINE_BITSTREAM
 
+#if PICO_RP2350
+#define MP_HAL_BITSTREAM_NS_OVERHEAD  (5)
+#else
 #define MP_HAL_BITSTREAM_NS_OVERHEAD  (9)
+#endif
 
 #if PICO_RISCV
 
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
@@ -182,11 +182,11 @@ static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) {
 }
 
 static inline void mp_hal_pin_low(mp_hal_pin_obj_t pin) {
-    gpio_clr_mask(1 << pin);
+    gpio_clr_mask64((uint64_t) 1 << pin);
 }
 
 static inline void mp_hal_pin_high(mp_hal_pin_obj_t pin) {
-    gpio_set_mask(1 << pin);
+    gpio_set_mask64((uint64_t) 1 << pin);
 }
 
 enum mp_hal_pin_interrupt_trigger {

Original file line number	Diff line number	Diff line change
`@@ -182,11 +182,11 @@ static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`static inline void mp_hal_pin_low(mp_hal_pin_obj_t pin) {`
`185`		`- gpio_clr_mask(1 << pin);`
	`185`	`+ gpio_clr_mask64((uint64_t) 1 << pin);`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`static inline void mp_hal_pin_high(mp_hal_pin_obj_t pin) {`
`189`		`- gpio_set_mask(1 << pin);`
	`189`	`+ gpio_set_mask64((uint64_t) 1 << pin);`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`enum mp_hal_pin_interrupt_trigger {`