abawo/pico-sdk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update generated struct headers to fix collision (#641)

Browse Source 
* update generated struct headers to fix collision and include all headers in kitchen_sink test
This commit is contained in:
Graham Sanderson
2021-11-01 08:06:34 -05:00
committed by GitHub
parent ccccff8450
commit d7358e4ed8
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rp2040/hardware_structs/include/hardware/structs/iobank0.h
View File

@ -41,7 +41,7 @@ typedef struct {
// 0x00000300 [9:8] : OUTOVER (0) // 0x00000300 [9:8] : OUTOVER (0)
// 0x0000001f [4:0] : FUNCSEL (0x1f): 0-31 -> selects pin function according to the gpio table // 0x0000001f [4:0] : FUNCSEL (0x1f): 0-31 -> selects pin function according to the gpio table
io_rw_32 ctrl; io_rw_32 ctrl;
} io_status_ctrl_hw_t; } iobank0_status_ctrl_hw_t;
typedef struct { typedef struct {
_REG_(IO_BANK0_PROC0_INTE0_OFFSET) // IO_BANK0_PROC0_INTE0 _REG_(IO_BANK0_PROC0_INTE0_OFFSET) // IO_BANK0_PROC0_INTE0
@ -161,7 +161,7 @@ typedef struct {
/// \tag::iobank0_hw[] /// \tag::iobank0_hw[]
typedef struct { typedef struct {
io_status_ctrl_hw_t io[NUM_BANK0_GPIOS]; // 30 iobank0_status_ctrl_hw_t io[NUM_BANK0_GPIOS]; // 30
_REG_(IO_BANK0_INTR0_OFFSET) // IO_BANK0_INTR0 _REG_(IO_BANK0_INTR0_OFFSET) // IO_BANK0_INTR0
// (Description copied from array index 0 register IO_BANK0_INTR0 applies similarly to other array indexes) // (Description copied from array index 0 register IO_BANK0_INTR0 applies similarly to other array indexes)

4
src/rp2040/hardware_structs/include/hardware/structs/ioqspi.h
View File

@ -41,7 +41,7 @@ typedef struct {
// 0x00000300 [9:8] : OUTOVER (0) // 0x00000300 [9:8] : OUTOVER (0)
// 0x0000001f [4:0] : FUNCSEL (0x1f): 0-31 -> selects pin function according to the gpio table // 0x0000001f [4:0] : FUNCSEL (0x1f): 0-31 -> selects pin function according to the gpio table
io_rw_32 ctrl; io_rw_32 ctrl;
} io_status_ctrl_hw_t; } ioqspi_status_ctrl_hw_t;
typedef struct { typedef struct {
_REG_(IO_QSPI_PROC0_INTE_OFFSET) // IO_QSPI_PROC0_INTE _REG_(IO_QSPI_PROC0_INTE_OFFSET) // IO_QSPI_PROC0_INTE
@ -130,7 +130,7 @@ typedef struct {
} io_qspi_ctrl_hw_t; } io_qspi_ctrl_hw_t;
typedef struct { typedef struct {
io_status_ctrl_hw_t io[NUM_QSPI_GPIOS]; // 6 ioqspi_status_ctrl_hw_t io[NUM_QSPI_GPIOS]; // 6
_REG_(IO_QSPI_INTR_OFFSET) // IO_QSPI_INTR _REG_(IO_QSPI_INTR_OFFSET) // IO_QSPI_INTR
// Raw Interrupts // Raw Interrupts

35
test/kitchen_sink/kitchen_sink.c
View File

@ -18,6 +18,7 @@
#include "hardware/interp.h" #include "hardware/interp.h"
#include "hardware/irq.h" #include "hardware/irq.h"
#include "hardware/pio.h" #include "hardware/pio.h"
#include "hardware/pio_instructions.h"
#include "hardware/pll.h" #include "hardware/pll.h"
#include "hardware/pwm.h" #include "hardware/pwm.h"
#include "hardware/resets.h" #include "hardware/resets.h"
@ -40,11 +41,45 @@
#include "pico/malloc.h" #include "pico/malloc.h"
#include "pico/multicore.h" #include "pico/multicore.h"
#include "pico/printf.h" #include "pico/printf.h"
#include "pico/runtime.h"
#include "pico/stdio.h"
#include "pico/stdlib.h" #include "pico/stdlib.h"
#include "pico/sync.h" #include "pico/sync.h"
#include "pico/time.h" #include "pico/time.h"
#include "pico/unique_id.h" #include "pico/unique_id.h"
#include "hardware/structs/adc.h"
#include "hardware/structs/bus_ctrl.h"
#include "hardware/structs/clocks.h"
#include "hardware/structs/dma.h"
#include "hardware/structs/i2c.h"
#include "hardware/structs/interp.h"
#include "hardware/structs/iobank0.h"
#include "hardware/structs/ioqspi.h"
#include "hardware/structs/mpu.h"
#include "hardware/structs/padsbank0.h"
#include "hardware/structs/pads_qspi.h"
#include "hardware/structs/pio.h"
#include "hardware/structs/pll.h"
#include "hardware/structs/psm.h"
#include "hardware/structs/pwm.h"
#include "hardware/structs/resets.h"
#include "hardware/structs/rosc.h"
#include "hardware/structs/rtc.h"
#include "hardware/structs/scb.h"
#include "hardware/structs/sio.h"
#include "hardware/structs/spi.h"
#include "hardware/structs/ssi.h"
#include "hardware/structs/syscfg.h"
#include "hardware/structs/systick.h"
#include "hardware/structs/timer.h"
#include "hardware/structs/uart.h"
#include "hardware/structs/usb.h"
#include "hardware/structs/vreg_and_chip_reset.h"
#include "hardware/structs/watchdog.h"
#include "hardware/structs/xip_ctrl.h"
#include "hardware/structs/xosc.h"
bi_decl(bi_block_device( bi_decl(bi_block_device(
BINARY_INFO_MAKE_TAG('K', 'S'), BINARY_INFO_MAKE_TAG('K', 'S'),
"foo", "foo",