RP2040: make sure double tap utility gets called before any contructor

Author: facchinm

Diff for: variants/RASPBERRY_PI_PICO/double_tap_usb_boot.c renamed to variants/NANO_RP2040_CONNECT/double_tap_usb_boot.cpp

@@ -1,6 +1,8 @@
-#include "pico.h"
-#include "pico/time.h"
-#include "pico/bootrom.h"
+extern "C" {
+    #include "pico.h"
+    #include "pico/time.h"
+    #include "pico/bootrom.h"
+}
 
 // Allow user override of the LED mask
 #ifndef USB_BOOT_LED_ACTIVITY_MASK
@@ -17,14 +19,14 @@ static const uint32_t magic_token[] = {
 static uint32_t __uninitialized_ram(magic_location)[count_of(magic_token)];
 
 // run at initialization time
-static void __attribute__((constructor)) boot_double_tap_check() {
+static void boot_double_tap_check() {
     for (uint i = 0; i < count_of(magic_token); i++) {
         if (magic_location[i] != magic_token[i]) {
             // Arm for 100 ms then disarm and continue booting
             for (i = 0; i < count_of(magic_token); i++) {
                 magic_location[i] = magic_token[i];
             }
-            busy_wait_us(100000);
+            busy_wait_us(500000);
             magic_location[0] = 0;
             return;
         }
@@ -34,4 +36,13 @@ static void __attribute__((constructor)) boot_double_tap_check() {
     reset_usb_boot(USB_BOOT_LED_ACTIVITY_MASK, 0);
 }
 
+class DoubleTap {
+public:
+    DoubleTap() {
+        boot_double_tap_check();
+    }
+};
+
+DoubleTap dt __attribute__ ((init_priority (101)));
+
 #endif

Diff for: variants/NANO_RP2040_CONNECT/double_tap_usb_boot.c renamed to variants/RASPBERRY_PI_PICO/double_tap_usb_boot.cpp

@@ -1,6 +1,8 @@
-#include "pico.h"
-#include "pico/time.h"
-#include "pico/bootrom.h"
+extern "C" {
+    #include "pico.h"
+    #include "pico/time.h"
+    #include "pico/bootrom.h"
+}
 
 // Allow user override of the LED mask
 #ifndef USB_BOOT_LED_ACTIVITY_MASK
@@ -17,7 +19,7 @@ static const uint32_t magic_token[] = {
 static uint32_t __uninitialized_ram(magic_location)[count_of(magic_token)];
 
 // run at initialization time
-static void __attribute__((constructor)) boot_double_tap_check() {
+static void boot_double_tap_check() {
     for (uint i = 0; i < count_of(magic_token); i++) {
         if (magic_location[i] != magic_token[i]) {
             // Arm for 100 ms then disarm and continue booting
@@ -34,4 +36,13 @@ static void __attribute__((constructor)) boot_double_tap_check() {
     reset_usb_boot(USB_BOOT_LED_ACTIVITY_MASK, 0);
 }
 
+class DoubleTap {
+public:
+    DoubleTap() {
+        boot_double_tap_check();
+    }
+};
+
+DoubleTap dt __attribute__ ((init_priority (101)));
+
 #endif