Fix samd21 and rp2

Author: tannewt

ports/atmel-samd/common-hal/pulseio/PulseIn.c

@@ -43,6 +43,7 @@
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/pulseio/PulseIn.h"
+#include "supervisor/samd_prevent_sleep.h"
 #include "supervisor/shared/tick.h"
 #include "supervisor/port.h"
 
@@ -232,7 +233,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self,
     // Set config will enable the EIC.
     pulsein_set_config(self, true);
     #ifdef SAMD21
-    rtc_start_pulse();
+    samd_prevent_sleep();
     #endif
 }
 
@@ -245,7 +246,7 @@ void common_hal_pulseio_pulsein_deinit(pulseio_pulsein_obj_t *self) {
         return;
     }
     #ifdef SAMD21
-    rtc_end_pulse();
+    samd_allow_sleep();
     #endif
     set_eic_handler(self->channel, EIC_HANDLER_NO_INTERRUPT);
     turn_off_eic_channel(self->channel);
@@ -263,7 +264,7 @@ void common_hal_pulseio_pulsein_pause(pulseio_pulsein_obj_t *self) {
     uint32_t mask = 1 << self->channel;
     EIC->INTENCLR.reg = mask << EIC_INTENSET_EXTINT_Pos;
     #ifdef SAMD21
-    rtc_end_pulse();
+    samd_allow_sleep();
     #endif
 }
 
@@ -293,7 +294,7 @@ void common_hal_pulseio_pulsein_resume(pulseio_pulsein_obj_t *self,
     EIC->INTENSET.reg = mask << EIC_INTENSET_EXTINT_Pos;
 
     #ifdef SAMD21
-    rtc_start_pulse();
+    samd_prevent_sleep();
     #endif
     pulsein_set_config(self, true);
 }

ports/atmel-samd/common-hal/pulseio/PulseIn.h

@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEIN_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEIN_H
+#pragma once
 
 #include "common-hal/microcontroller/Pin.h"
 
@@ -48,10 +47,3 @@ typedef struct {
 
 void pulsein_interrupt_handler(uint8_t channel);
 void pulsein_timer_interrupt_handler(uint8_t index);
-#ifdef SAMD21
-void rtc_start_pulse(void);
-void rtc_end_pulse(void);
-#endif
-
-
-#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEIN_H

ports/atmel-samd/common-hal/pulseio/PulseOut.c

@@ -36,6 +36,7 @@
 #include "py/gc.h"
 #include "py/runtime.h"
 #include "shared-bindings/pulseio/PulseOut.h"
+#include "supervisor/samd_prevent_sleep.h"
 #include "timer_handler.h"
 
 // This timer is shared amongst all PulseOut objects under the assumption that
@@ -159,9 +160,8 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t *self,
     // Turn off the pinmux which should connect the port output.
     turn_off(self->pincfg);
     #ifdef SAMD21
-    rtc_start_pulse();
+    samd_prevent_sleep();
     #endif
-
 }
 
 bool common_hal_pulseio_pulseout_deinited(pulseio_pulseout_obj_t *self) {
@@ -185,7 +185,7 @@ void common_hal_pulseio_pulseout_deinit(pulseio_pulseout_obj_t *self) {
     self->pin = NO_PIN;
     common_hal_pwmio_pwmout_deinit(&self->pwmout);
     #ifdef SAMD21
-    rtc_end_pulse();
+    samd_allow_sleep();
     #endif
 }
 

ports/atmel-samd/common-hal/pulseio/PulseOut.h

@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEOUT_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEOUT_H
+#pragma once
 
 #include "common-hal/microcontroller/Pin.h"
 
@@ -41,9 +40,3 @@ typedef struct {
 
 void pulseout_reset(void);
 void pulseout_interrupt_handler(uint8_t index);
-#ifdef SAMD21
-void rtc_start_pulse(void);
-void rtc_end_pulse(void);
-#endif
-
-#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PULSEIO_PULSEOUT_H

ports/atmel-samd/supervisor/port.c

@@ -30,6 +30,8 @@
 #include "supervisor/board.h"
 #include "supervisor/port.h"
 
+#include "supervisor/samd_prevent_sleep.h"
+
 // ASF 4
 #include "atmel_start_pins.h"
 #include "peripheral_clk_config.h"
@@ -114,7 +116,7 @@
 #if CIRCUITPY_PEW
 #include "common-hal/_pew/PewPew.h"
 #endif
-static volatile bool sleep_ok = true;
+static volatile size_t sleep_disable_count = 0;
 
 #ifdef SAMD21
 static uint8_t _tick_event_channel = EVSYS_SYNCH_NUM;
@@ -126,12 +128,16 @@ static bool tick_enabled(void) {
 // Sleeping requires a register write that can stall interrupt handling. Turning
 // off sleeps allows for more accurate interrupt timing. (Python still thinks
 // it is sleeping though.)
-void rtc_start_pulse(void) {
-    sleep_ok = false;
+void samd_prevent_sleep(void) {
+    sleep_disable_count++;
 }
 
-void rtc_end_pulse(void) {
-    sleep_ok = true;
+void samd_allow_sleep(void) {
+    if (sleep_disable_count == 0) {
+        // We should never reach this!
+        return;
+    }
+    sleep_disable_count--;
 }
 #endif // SAMD21
 
@@ -651,7 +657,11 @@ void port_interrupt_after_ticks(uint32_t ticks) {
         return;
     }
     #ifdef SAMD21
-    if (!sleep_ok) {
+    if (sleep_disable_count > 0) {
+        // "wake" immediately even if sleep_disable_count is set to 0 between
+        // now and when port_idle_until_interrupt is called. Otherwise we may
+        // sleep too long.
+        _woken_up = true;
         return;
     }
     #endif
@@ -687,7 +697,7 @@ void port_idle_until_interrupt(void) {
     }
     #endif
     common_hal_mcu_disable_interrupts();
-    if (!background_callback_pending() && sleep_ok && !_woken_up) {
+    if (!background_callback_pending() && sleep_disable_count == 0 && !_woken_up) {
         __DSB();
         __WFI();
     }

ports/raspberrypi/common-hal/picodvi/Framebuffer.c

@@ -254,9 +254,6 @@ void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self,
     }
     self->pwm_slice = slice;
 
-    pwmout_never_reset(self->pwm_slice, 0);
-    pwmout_never_reset(self->pwm_slice, 1);
-
     for (size_t i = 0; i < 4; i++) {
         never_reset_pin_number(self->pin_pair[i]);
         never_reset_pin_number(self->pin_pair[i] + 1);