From dfeb5b973bb61e67d17b2681e6ca07dccbf28012 Mon Sep 17 00:00:00 2001
From: Pol Henarejos <pol.henarejos@cttc.es>
Date: Tue, 21 Apr 2026 12:03:01 +0200
Subject: [PATCH] Include bsp headers for timers.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
---
 src/button.c       | 2 +-
 src/compat/board.h | 1 +
 src/led/led.c      | 6 ++----
 src/pico_time.h    | 6 +++++-
 src/rng/hwrng.c    | 6 +-----
 src/usb/hid/hid.c  | 5 ++---
 src/usb/usb.c      | 2 +-
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/button.c b/src/button.c
index 26d59f0..5ed0199 100644
--- a/src/button.c
+++ b/src/button.c
@@ -18,8 +18,8 @@
 #include "picokeys.h"
 #include "button.h"
 #include "led/led.h"
+#include "pico_time.h"
 #if defined(PICO_PLATFORM)
-#include "bsp/board.h"
 #include "hardware/sync.h"
 #include "hardware/structs/ioqspi.h"
 #include "hardware/gpio.h"
diff --git a/src/compat/board.h b/src/compat/board.h
index f53837e..26df007 100644
--- a/src/compat/board.h
+++ b/src/compat/board.h
@@ -18,6 +18,7 @@
 #ifndef _BOARD_H_
 #define _BOARD_H_
 
+#include <stdint.h>
 #ifdef _MSC_VER
 #include <windows.h>
 struct timezone;
diff --git a/src/led/led.c b/src/led/led.c
index 0b2c744..7509f72 100644
--- a/src/led/led.c
+++ b/src/led/led.c
@@ -17,11 +17,9 @@
 
 #include "picokeys.h"
 #include "led/led.h"
-#ifdef PICO_PLATFORM
-#include "bsp/board.h"
-#elif defined(ESP_PLATFORM)
+#include "pico_time.h"
+#if defined(ESP_PLATFORM)
 #include "driver/gpio.h"
-#include "compat/esp_compat.h"
 #elif defined(ENABLE_EMULATION)
 #include "emulation.h"
 #endif
diff --git a/src/pico_time.h b/src/pico_time.h
index 4ffe8dd..1683bb9 100644
--- a/src/pico_time.h
+++ b/src/pico_time.h
@@ -18,11 +18,15 @@
 #ifndef TIME_H
 #define TIME_H
 
-#ifdef PICO_PLATFORM
+#if defined(PICO_PLATFORM)
 #include "pico/aon_timer.h"
+#include "bsp/board.h"
+#elif defined(ESP_PLATFORM)
+#include "compat/esp_compat.h"
 #else
 #include <sys/time.h>
 #include <time.h>
+#include "compat/board.h"
 #endif
 
 extern bool has_set_rtc(void);
diff --git a/src/rng/hwrng.c b/src/rng/hwrng.c
index 5d58b89..1fb9550 100644
--- a/src/rng/hwrng.c
+++ b/src/rng/hwrng.c
@@ -17,17 +17,13 @@
 
 #include "picokeys.h"
 #include "hwrng.h"
+#include "pico_time.h"
 
 #if defined(PICO_PLATFORM)
-#include "bsp/board.h"
 #include "pico/rand.h"
 #elif defined(ESP_PLATFORM)
 #include "bootloader_random.h"
 #include "esp_random.h"
-#include "compat/esp_compat.h"
-#else
-#include <time.h>
-#include "compat/board.h"
 #endif
 
 static void hwrng_start(void) {
diff --git a/src/usb/hid/hid.c b/src/usb/hid/hid.c
index fac7a54..155c743 100644
--- a/src/usb/hid/hid.c
+++ b/src/usb/hid/hid.c
@@ -17,11 +17,10 @@
 
 #include "picokeys.h"
 #include "serial.h"
+#include "pico_time.h"
 #ifndef ENABLE_EMULATION
 #include "tusb.h"
-#if defined(PICO_PLATFORM)
-#include "bsp/board.h"
-#elif defined(ESP_PLATFORM)
+#if defined(ESP_PLATFORM)
 static portMUX_TYPE mutex = portMUX_INITIALIZER_UNLOCKED;
 #endif
 #else
diff --git a/src/usb/usb.c b/src/usb/usb.c
index 9568b88..7dab2b2 100644
--- a/src/usb/usb.c
+++ b/src/usb/usb.c
@@ -19,11 +19,11 @@
 #include "usb.h"
 #include "led/led.h"
 #include "button.h"
+#include "pico_time.h"
 #if defined(PICO_PLATFORM)
 #include "pico/bootrom.h"
 #include "pico/multicore.h"
 #include "hardware/sync.h"
-#include "bsp/board.h"
 #define multicore_launch_func_core1(a) multicore_launch_core1((void (*) (void))a)
 #endif
 #include "apdu.h"