Content-Length: 1524644 | pFad | http://github.com/adafruit/circuitpython/commit/420491f376d6ed233530ecb7f6537ecbad178e7f

95 Depend on header inclusion via -isystem · adafruit/circuitpython@420491f · GitHub
Skip to content

Commit 420491f

Browse files
jeplerjepler
committed
Depend on header inclusion via -isystem
This lets each MCU type get the correct definitions. It also simplifies paths at include sites. Closes: #10181
1 parent 27f2b1c commit 420491f

File tree

57 files changed

+125
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+125
-136
lines changed

‎ports/raspberrypi/Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ HAL_DIR=hal/$(MCU_SERIES)
1212

1313
ifeq ($(CIRCUITPY_CYW43),1)
1414
INC_CYW43 := \
15+
-isystem lib/cyw43-driver \
1516
-isystem lib/cyw43-driver/firmware \
1617
-isystem lib/cyw43-driver/src \
1718
-isystem lib/lwip/src/include \
@@ -92,8 +93,6 @@ INC += \
9293
-I../shared/timeutils \
9394
-Iboards/$(BOARD) \
9495
-Iboards/ \
95-
-isystem ./../../lib/cmsis/inc \
96-
-isystem sdk/ \
9796
-isystem sdk/src/common/boot_picobin_headers/include/ \
9897
-isystem sdk/src/common/boot_picoboot_headers/include/ \
9998
-isystem sdk/src/common/hardware_claim/include/ \
@@ -107,6 +106,8 @@ INC += \
107106
-isystem sdk/src/$(CHIP_VARIANT_LOWER)/hardware_structs/include/ \
108107
-isystem sdk/src/$(CHIP_VARIANT_LOWER)/pico_platform/include/ \
109108
-isystem sdk/src/rp2_common/boot_bootrom_headers/include/ \
109+
-isystem sdk/src/rp2_common/cmsis/stub/CMSIS/Core/Include/ \
110+
-isystem sdk/src/rp2_common/cmsis/stub/CMSIS/Device/${CHIP_VARIANT}/Include \
110111
-isystem sdk/src/rp2_common/cmsis/ \
111112
-isystem sdk/src/rp2_common/hardware_adc/include/ \
112113
-isystem sdk/src/rp2_common/hardware_base/include/ \
@@ -153,7 +154,7 @@ INC += \
153154
-isystem sdk/src/rp2_common/pico_platform_panic/include/ \
154155
-isystem sdk/src/rp2_common/pico_time_adapter/include/ \
155156
-isystem sdk/src/rp2_common/pico_unique_id/include/ \
156-
$(INC_CYW43) \
157+
$(INC_CYW43) \
157158
-Isdk_config \
158159
-I../../lib/tinyusb/src \
159160
-I../../supervisor/shared/usb \

‎ports/raspberrypi/audio_dma.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "py/mpstate.h"
1616
#include "py/runtime.h"
1717

18-
#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
18+
#include "hardware/irq.h"
1919
#include "hardware/regs/intctrl.h" // For isr_ macro.
2020

2121

‎ports/raspberrypi/audio_dma.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "py/obj.h"
1010
#include "supervisor/background_callback.h"
1111

12-
#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
12+
#include "hardware/dma.h"
1313

1414
typedef enum {
1515
AUDIO_DMA_OK,

‎ports/raspberrypi/bindings/cyw43/__init__.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "shared-bindings/microcontroller/Pin.h"
1313
#include "bindings/cyw43/__init__.h"
1414

15-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
15+
#include "hardware/gpio.h"
1616

1717
#include "lib/cyw43-driver/src/cyw43.h"
1818

‎ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "shared-module/displayio/mipi_constants.h"
1111
#include "shared-bindings/busio/SPI.h"
1212
#include "shared-bindings/microcontroller/Pin.h"
13-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
13+
#include "hardware/gpio.h"
1414
#include "supervisor/board.h"
1515
#include "supervisor/shared/board.h"
1616

‎ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#include "supervisor/board.h"
88

99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
10+
#include "hardware/gpio.h"
1111

1212
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/raspberrypi/boards/boardsource_blok/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "supervisor/board.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
9+
#include "hardware/gpio.h"
1010
#include "supervisor/shared/board.h"
1111

1212
void board_init(void) {

‎ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#include "shared-module/displayio/__init__.h"
2727
#include "supervisor/shared/board.h"
2828

29-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
29+
#include "hardware/gpio.h"
3030

31-
#include "src/rp2_common/hardware_adc/include/hardware/adc.h"
31+
#include "hardware/adc.h"
3232
#define ADC_FIRST_PIN_NUMBER 26
3333
#define ADC_PIN_COUNT 4
3434
extern void common_hal_mcu_delay_us(uint32_t);

‎ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "shared-bindings/board/__init__.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
9+
#include "hardware/gpio.h"
1010
#include "supervisor/shared/board.h"
1111
#include "supervisor/board.h"
1212

‎ports/raspberrypi/boards/jpconstantineau_pykey18/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "supervisor/board.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
9+
#include "hardware/gpio.h"
1010
#include "supervisor/shared/board.h"
1111

1212
void reset_board(void) {

‎ports/raspberrypi/boards/jpconstantineau_pykey44/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "supervisor/board.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
9+
#include "hardware/gpio.h"
1010
#include "supervisor/shared/board.h"
1111

1212
void reset_board(void) {

‎ports/raspberrypi/boards/jpconstantineau_pykey60/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "supervisor/board.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
9+
#include "hardware/gpio.h"
1010
#include "supervisor/shared/board.h"
1111

1212
void reset_board(void) {

‎ports/raspberrypi/boards/jpconstantineau_pykey87/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "supervisor/board.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
9+
#include "hardware/gpio.h"
1010
#include "supervisor/shared/board.h"
1111

1212
void reset_board(void) {

‎ports/raspberrypi/boards/ugame22/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "supervisor/board.h"
88

99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
10+
#include "hardware/gpio.h"
1111

1212
#include "shared-bindings/busio/SPI.h"
1313
#include "shared-bindings/fourwire/FourWire.h"

‎ports/raspberrypi/boards/wk-50/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "supervisor/board.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
9+
#include "hardware/gpio.h"
1010
#include "supervisor/shared/board.h"
1111

1212
void reset_board(void) {

‎ports/raspberrypi/boards/zrichard_rp2.65-f/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "supervisor/board.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
9+
#include "hardware/gpio.h"
1010
#include "supervisor/shared/board.h"
1111

1212
void reset_board(void) {

‎ports/raspberrypi/boot_stage2/RP2040.c.jinja

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#include "sdk/src/rp2040/hardware_structs/include/hardware/structs/ssi.h"
2-
#include "sdk/src/rp2040/hardware_structs/include/hardware/structs/pads_qspi.h"
3-
#include "sdk/src/rp2040/hardware_regs/include/hardware/regs/addressmap.h"
4-
#include "sdk/src/rp2040/hardware_regs/include/hardware/regs/m0plus.h"
1+
#include "hardware/structs/ssi.h"
2+
#include "hardware/structs/pads_qspi.h"
3+
#include "hardware/regs/addressmap.h"
4+
#include "hardware/regs/m0plus.h"
55

66
// "Mode bits" are 8 special bits sent immediately after
77
// the address bits in a "Read Data Fast Quad I/O" command sequence.

‎ports/raspberrypi/common-hal/analogbufio/BufferedIn.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#include "shared-bindings/microcontroller/Pin.h"
1212
#include "shared/runtime/interrupt_char.h"
1313
#include "py/runtime.h"
14-
#include "src/rp2_common/hardware_adc/include/hardware/adc.h"
15-
#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
16-
#include "src/common/pico_stdlib_headers/include/pico/stdlib.h"
14+
#include "hardware/adc.h"
15+
#include "hardware/dma.h"
16+
#include "pico/stdlib.h"
1717

1818
#define ADC_FIRST_PIN_NUMBER 26
1919
#define ADC_PIN_COUNT 4

‎ports/raspberrypi/common-hal/analogbufio/BufferedIn.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#pragma once
99

1010
#include "common-hal/microcontroller/Pin.h"
11-
#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
11+
#include "hardware/dma.h"
1212

1313
#include "py/obj.h"
1414

‎ports/raspberrypi/common-hal/analogio/AnalogIn.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "shared-bindings/microcontroller/Pin.h"
1111
#include "py/runtime.h"
1212

13-
#include "src/rp2_common/hardware_adc/include/hardware/adc.h"
13+
#include "hardware/adc.h"
1414

1515
#define ADC_PIN_COUNT (NUM_ADC_CHANNELS - 1)
1616

‎ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "shared-bindings/microcontroller/Pin.h"
2121
#include "shared-bindings/microcontroller/Processor.h"
2222

23-
#include "src/rp2040/hardware_structs/include/hardware/structs/dma.h"
24-
#include "src/rp2_common/hardware_pwm/include/hardware/pwm.h"
23+
#include "hardware/structs/dma.h"
24+
#include "hardware/pwm.h"
2525

2626
// The PWM clock frequency is base_clock_rate / PWM_TOP, typically 125_000_000 / PWM_TOP.
2727
// We pick BITS_PER_SAMPLE so we get a clock frequency that is above what would cause aliasing.

‎ports/raspberrypi/common-hal/busio/I2C.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "shared-bindings/microcontroller/Pin.h"
1414
#include "shared-bindings/bitbangio/I2C.h"
1515

16-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
16+
#include "hardware/gpio.h"
1717

1818
// Synopsys DW_apb_i2c (v2.01) IP
1919

‎ports/raspberrypi/common-hal/busio/I2C.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "py/obj.h"
1313

14-
#include "src/rp2_common/hardware_i2c/include/hardware/i2c.h"
14+
#include "hardware/i2c.h"
1515

1616
typedef struct {
1717
mp_obj_base_t base;

‎ports/raspberrypi/common-hal/busio/SPI.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "common-hal/microcontroller/Pin.h"
1515
#include "shared-bindings/microcontroller/Pin.h"
1616

17-
#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
18-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
17+
#include "hardware/dma.h"
18+
#include "hardware/gpio.h"
1919

2020
#define NO_INSTANCE 0xff
2121

‎ports/raspberrypi/common-hal/busio/SPI.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include "py/obj.h"
1212

13-
#include "src/rp2_common/hardware_spi/include/hardware/spi.h"
13+
#include "hardware/spi.h"
1414

1515
typedef struct {
1616
mp_obj_base_t base;

‎ports/raspberrypi/common-hal/busio/UART.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "common-hal/microcontroller/Pin.h"
1515
#include "shared-bindings/microcontroller/Pin.h"
1616

17-
#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
18-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
17+
#include "hardware/irq.h"
18+
#include "hardware/gpio.h"
1919

2020
#define NO_PIN 0xff
2121

‎ports/raspberrypi/common-hal/busio/UART.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "py/obj.h"
1010
#include "py/ringbuf.h"
1111

12-
#include "src/rp2_common/hardware_uart/include/hardware/uart.h"
12+
#include "hardware/uart.h"
1313

1414
typedef struct {
1515
mp_obj_base_t base;

‎ports/raspberrypi/common-hal/countio/Counter.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include "shared-bindings/digitalio/Pull.h"
1414
#include "common-hal/pwmio/PWMOut.h"
1515

16-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
17-
#include "src/rp2_common/hardware_pwm/include/hardware/pwm.h"
18-
#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
16+
#include "hardware/gpio.h"
17+
#include "hardware/pwm.h"
18+
#include "hardware/irq.h"
1919

2020

2121
void common_hal_countio_counter_construct(countio_counter_obj_t *self,

‎ports/raspberrypi/common-hal/digitalio/DigitalInOut.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "shared-bindings/microcontroller/Pin.h"
1515
#include "shared-bindings/digitalio/DigitalInOut.h"
1616

17-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
17+
#include "hardware/gpio.h"
1818

1919
#if CIRCUITPY_CYW43
2020
#include "pico/cyw43_arch.h"

‎ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "shared-bindings/microcontroller/Pin.h"
1515
#include "py/runtime.h"
1616

17-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
17+
#include "hardware/gpio.h"
1818

1919
static i2c_inst_t *i2c[2] = {i2c0, i2c1};
2020

‎ports/raspberrypi/common-hal/i2ctarget/I2CTarget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "py/obj.h"
1010
#include "common-hal/microcontroller/Pin.h"
11-
#include "src/rp2_common/hardware_i2c/include/hardware/i2c.h"
11+
#include "hardware/i2c.h"
1212

1313
typedef struct {
1414
mp_obj_base_t base;

‎ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include "shared-bindings/microcontroller/Processor.h"
1919
#include "shared-bindings/microcontroller/__init__.h"
2020

21-
#include "src/rp2_common/hardware_pio/include/hardware/pio.h"
22-
#include "src/rp2_common/hardware_pio/include/hardware/pio_instructions.h"
21+
#include "hardware/pio.h"
22+
#include "hardware/pio_instructions.h"
2323

2424
// Define this to (1), and you can scope the instruction-pointer of the state machine on D26..28 (note the weird encoding though!)
2525
#define DEBUG_STATE_MACHINE (0)

‎ports/raspberrypi/common-hal/max3421e/Max3421E.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "shared-bindings/busio/SPI.h"
1111
#include "supervisor/usb.h"
1212

13-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
13+
#include "hardware/gpio.h"
1414

1515
static max3421e_max3421e_obj_t *active_max = NULL;
1616

‎ports/raspberrypi/common-hal/microcontroller/Pin.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "common-hal/microcontroller/__init__.h"
1010
#include "shared-bindings/microcontroller/Pin.h"
1111

12-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
12+
#include "hardware/gpio.h"
1313

1414
static uint64_t gpio_bank0_pin_claimed;
1515

‎ports/raspberrypi/common-hal/microcontroller/Processor.c

+10-15
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,21 @@
1515
#include "shared-bindings/time/__init__.h"
1616

1717
#include "pico/stdlib.h"
18-
#include "src/rp2_common/hardware_adc/include/hardware/adc.h"
19-
#include "src/rp2_common/hardware_clocks/include/hardware/clocks.h"
20-
#include "src/rp2_common/hardware_vreg/include/hardware/vreg.h"
21-
#include "src/rp2_common/hardware_watchdog/include/hardware/watchdog.h"
18+
#include "hardware/adc.h"
19+
#include "hardware/clocks.h"
20+
#include "hardware/vreg.h"
21+
#include "hardware/watchdog.h"
2222

2323
#ifdef PICO_RP2040
24-
#include "src/rp2040/hardware_regs/include/hardware/regs/vreg_and_chip_reset.h"
24+
#include "hardware/regs/vreg_and_chip_reset.h"
25+
#include "hardware/structs/vreg_and_chip_reset.h"
2526
#endif
2627
#ifdef PICO_RP2350
27-
#include "src/rp2350/hardware_regs/include/hardware/regs/powman.h"
28+
#include "hardware/regs/powman.h"
29+
#include "hardware/structs/powman.h"
2830
#endif
29-
#include "src/rp2040/hardware_regs/include/hardware/regs/watchdog.h"
30-
31-
#ifdef PICO_RP2040
32-
#include "src/rp2040/hardware_structs/include/hardware/structs/vreg_and_chip_reset.h"
33-
#endif
34-
#ifdef PICO_RP2350
35-
#include "src/rp2350/hardware_structs/include/hardware/structs/powman.h"
36-
#endif
37-
#include "src/rp2040/hardware_structs/include/hardware/structs/watchdog.h"
31+
#include "hardware/regs/watchdog.h"
32+
#include "hardware/structs/watchdog.h"
3833

3934
float common_hal_mcu_processor_get_temperature(void) {
4035
adc_init();

‎ports/raspberrypi/common-hal/microcontroller/Processor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#pragma once
88

9-
#include "src/rp2_common/pico_unique_id/include/pico/unique_id.h"
9+
#include "pico/unique_id.h"
1010

1111
#define COMMON_HAL_MCU_PROCESSOR_UID_LENGTH PICO_UNIQUE_BOARD_ID_SIZE_BYTES
1212

0 commit comments

Comments
 (0)








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/adafruit/circuitpython/commit/420491f376d6ed233530ecb7f6537ecbad178e7f

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy