From 76ccdee893af8b90639e083598a7c147aad3ee80 Mon Sep 17 00:00:00 2001 From: Marco Bertolazzi Date: Sun, 27 Jul 2025 09:16:39 +0200 Subject: [PATCH] Enable hardware_irq library also in host and not only in rp2_common --- src/host.cmake | 2 ++ src/host/hardware_irq/include/hardware/irq.h | 3 ++- src/host/pico_platform/include/hardware/platform_defs.h | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/host.cmake b/src/host.cmake index 3399866f7..8834815b2 100644 --- a/src/host.cmake +++ b/src/host.cmake @@ -9,6 +9,7 @@ include (${CMAKE_DIR}/no_hardware.cmake) pico_add_subdirectory(${COMMON_DIR}/boot_picobin_headers) pico_add_subdirectory(${COMMON_DIR}/boot_picoboot_headers) pico_add_subdirectory(${COMMON_DIR}/boot_uf2_headers) + pico_add_subdirectory(${COMMON_DIR}/hardware_claim) pico_add_subdirectory(${COMMON_DIR}/pico_base_headers) pico_add_subdirectory(${COMMON_DIR}/pico_usb_reset_interface_headers) pico_add_subdirectory(${COMMON_DIR}/pico_bit_ops_headers) @@ -22,6 +23,7 @@ include (${CMAKE_DIR}/no_hardware.cmake) # host-specific pico_add_subdirectory(${HOST_DIR}/hardware_divider) pico_add_subdirectory(${HOST_DIR}/hardware_gpio) + pico_add_subdirectory(${HOST_DIR}/hardware_irq) pico_add_subdirectory(${HOST_DIR}/hardware_sync) pico_add_subdirectory(${HOST_DIR}/hardware_timer) pico_add_subdirectory(${HOST_DIR}/hardware_uart) diff --git a/src/host/hardware_irq/include/hardware/irq.h b/src/host/hardware_irq/include/hardware/irq.h index ef90ee703..04f7335b2 100644 --- a/src/host/hardware_irq/include/hardware/irq.h +++ b/src/host/hardware_irq/include/hardware/irq.h @@ -24,7 +24,8 @@ #endif #include "pico.h" -#include "hardware/regs/intctrl.h" +// TODO: No hardware/regs/intctrl.h for host yet. +// #include "hardware/regs/intctrl.h" /** \file irq.h * \defgroup hardware_irq hardware_irq diff --git a/src/host/pico_platform/include/hardware/platform_defs.h b/src/host/pico_platform/include/hardware/platform_defs.h index 924336a92..c1a6f5f44 100644 --- a/src/host/pico_platform/include/hardware/platform_defs.h +++ b/src/host/pico_platform/include/hardware/platform_defs.h @@ -15,6 +15,9 @@ #define NUM_ALARMS 4u #define NUM_IRQS 32u +#define NUM_USER_IRQS 6u +#define FIRST_USER_IRQ (NUM_IRQS - NUM_USER_IRQS) +#define VTABLE_FIRST_IRQ 16 #define NUM_SPIN_LOCKS 32u