Merge pull request #10188 from jepler/rp2350-headers

Depend on header inclusion via -isystem

Author: dhalbert

ports/raspberrypi/Makefile

@@ -12,6 +12,7 @@ HAL_DIR=hal/$(MCU_SERIES)
 
 ifeq ($(CIRCUITPY_CYW43),1)
 INC_CYW43 := \
+	-isystem lib/cyw43-driver \
 	-isystem lib/cyw43-driver/firmware \
 	-isystem lib/cyw43-driver/src \
 	-isystem lib/lwip/src/include \
@@ -92,8 +93,6 @@ INC += \
 	-I../shared/timeutils \
 	-Iboards/$(BOARD) \
 	-Iboards/ \
-	-isystem ./../../lib/cmsis/inc \
-	-isystem sdk/ \
 	-isystem sdk/src/common/boot_picobin_headers/include/ \
 	-isystem sdk/src/common/boot_picoboot_headers/include/ \
 	-isystem sdk/src/common/hardware_claim/include/ \
@@ -107,6 +106,8 @@ INC += \
 	-isystem sdk/src/$(CHIP_VARIANT_LOWER)/hardware_structs/include/ \
 	-isystem sdk/src/$(CHIP_VARIANT_LOWER)/pico_platform/include/ \
 	-isystem sdk/src/rp2_common/boot_bootrom_headers/include/ \
+	-isystem sdk/src/rp2_common/cmsis/stub/CMSIS/Core/Include/ \
+	-isystem sdk/src/rp2_common/cmsis/stub/CMSIS/Device/${CHIP_VARIANT}/Include \
 	-isystem sdk/src/rp2_common/cmsis/ \
 	-isystem sdk/src/rp2_common/hardware_adc/include/ \
 	-isystem sdk/src/rp2_common/hardware_base/include/ \
@@ -153,7 +154,7 @@ INC += \
 	-isystem sdk/src/rp2_common/pico_platform_panic/include/ \
 	-isystem sdk/src/rp2_common/pico_time_adapter/include/ \
 	-isystem sdk/src/rp2_common/pico_unique_id/include/ \
-$(INC_CYW43) \
+	$(INC_CYW43) \
 	-Isdk_config \
 	-I../../lib/tinyusb/src \
 	-I../../supervisor/shared/usb \

ports/raspberrypi/audio_dma.c

@@ -15,7 +15,7 @@
 #include "py/mpstate.h"
 #include "py/runtime.h"
 
-#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
+#include "hardware/irq.h"
 #include "hardware/regs/intctrl.h" // For isr_ macro.
 
 

ports/raspberrypi/audio_dma.h

@@ -9,7 +9,7 @@
 #include "py/obj.h"
 #include "supervisor/background_callback.h"
 
-#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
+#include "hardware/dma.h"
 
 typedef enum {
     AUDIO_DMA_OK,

ports/raspberrypi/bindings/cyw43/__init__.c

@@ -12,7 +12,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "bindings/cyw43/__init__.h"
 
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
 #include "lib/cyw43-driver/src/cyw43.h"
 

ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c

@@ -10,7 +10,7 @@
 #include "shared-module/displayio/mipi_constants.h"
 #include "shared-bindings/busio/SPI.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/board.h"
 #include "supervisor/shared/board.h"
 

ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c

@@ -7,6 +7,6 @@
 #include "supervisor/board.h"
 
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

ports/raspberrypi/boards/boardsource_blok/board.c

@@ -6,7 +6,7 @@
 
 #include "supervisor/board.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
 void board_init(void) {

ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c

@@ -26,9 +26,9 @@
 #include "shared-module/displayio/__init__.h"
 #include "supervisor/shared/board.h"
 
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
-#include "src/rp2_common/hardware_adc/include/hardware/adc.h"
+#include "hardware/adc.h"
 #define ADC_FIRST_PIN_NUMBER 26
 #define ADC_PIN_COUNT 4
 extern void common_hal_mcu_delay_us(uint32_t);

ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c

@@ -6,7 +6,7 @@
 
 #include "shared-bindings/board/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/shared/board.h"
 #include "supervisor/board.h"
 

ports/raspberrypi/boards/jpconstantineau_pykey18/board.c

@@ -6,7 +6,7 @@
 
 #include "supervisor/board.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
 void reset_board(void) {