Skip to content

Commit 3a09e31

Browse files
author
modm update bot
committed
Update pico-sdk to v1.3.1
1 parent 36cdca5 commit 3a09e31

32 files changed

+61
-73
lines changed

include/hardware/regs/dma.h

Lines changed: 23 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
2+
* Copyright (c) 2022 Raspberry Pi (Trading) Ltd.
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
@@ -183,7 +183,6 @@
183183
// Description : When this channel completes, it will trigger the channel
184184
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
185185
// channel)_.
186-
// Reset value is equal to channel number (0).
187186
#define DMA_CH0_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
188187
#define DMA_CH0_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
189188
#define DMA_CH0_CTRL_TRIG_CHAIN_TO_MSB _u(14)
@@ -457,7 +456,7 @@
457456
// Description : DMA Channel 1 Control and Status
458457
#define DMA_CH1_CTRL_TRIG_OFFSET _u(0x0000004c)
459458
#define DMA_CH1_CTRL_TRIG_BITS _u(0xe1ffffff)
460-
#define DMA_CH1_CTRL_TRIG_RESET _u(0x00000800)
459+
#define DMA_CH1_CTRL_TRIG_RESET _u(0x00000000)
461460
// -----------------------------------------------------------------------------
462461
// Field : DMA_CH1_CTRL_TRIG_AHB_ERROR
463462
// Description : Logical OR of the READ_ERROR and WRITE_ERROR flags. The channel
@@ -572,8 +571,7 @@
572571
// Description : When this channel completes, it will trigger the channel
573572
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
574573
// channel)_.
575-
// Reset value is equal to channel number (1).
576-
#define DMA_CH1_CTRL_TRIG_CHAIN_TO_RESET _u(0x1)
574+
#define DMA_CH1_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
577575
#define DMA_CH1_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
578576
#define DMA_CH1_CTRL_TRIG_CHAIN_TO_MSB _u(14)
579577
#define DMA_CH1_CTRL_TRIG_CHAIN_TO_LSB _u(11)
@@ -846,7 +844,7 @@
846844
// Description : DMA Channel 2 Control and Status
847845
#define DMA_CH2_CTRL_TRIG_OFFSET _u(0x0000008c)
848846
#define DMA_CH2_CTRL_TRIG_BITS _u(0xe1ffffff)
849-
#define DMA_CH2_CTRL_TRIG_RESET _u(0x00001000)
847+
#define DMA_CH2_CTRL_TRIG_RESET _u(0x00000000)
850848
// -----------------------------------------------------------------------------
851849
// Field : DMA_CH2_CTRL_TRIG_AHB_ERROR
852850
// Description : Logical OR of the READ_ERROR and WRITE_ERROR flags. The channel
@@ -961,8 +959,7 @@
961959
// Description : When this channel completes, it will trigger the channel
962960
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
963961
// channel)_.
964-
// Reset value is equal to channel number (2).
965-
#define DMA_CH2_CTRL_TRIG_CHAIN_TO_RESET _u(0x2)
962+
#define DMA_CH2_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
966963
#define DMA_CH2_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
967964
#define DMA_CH2_CTRL_TRIG_CHAIN_TO_MSB _u(14)
968965
#define DMA_CH2_CTRL_TRIG_CHAIN_TO_LSB _u(11)
@@ -1235,7 +1232,7 @@
12351232
// Description : DMA Channel 3 Control and Status
12361233
#define DMA_CH3_CTRL_TRIG_OFFSET _u(0x000000cc)
12371234
#define DMA_CH3_CTRL_TRIG_BITS _u(0xe1ffffff)
1238-
#define DMA_CH3_CTRL_TRIG_RESET _u(0x00001800)
1235+
#define DMA_CH3_CTRL_TRIG_RESET _u(0x00000000)
12391236
// -----------------------------------------------------------------------------
12401237
// Field : DMA_CH3_CTRL_TRIG_AHB_ERROR
12411238
// Description : Logical OR of the READ_ERROR and WRITE_ERROR flags. The channel
@@ -1350,8 +1347,7 @@
13501347
// Description : When this channel completes, it will trigger the channel
13511348
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
13521349
// channel)_.
1353-
// Reset value is equal to channel number (3).
1354-
#define DMA_CH3_CTRL_TRIG_CHAIN_TO_RESET _u(0x3)
1350+
#define DMA_CH3_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
13551351
#define DMA_CH3_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
13561352
#define DMA_CH3_CTRL_TRIG_CHAIN_TO_MSB _u(14)
13571353
#define DMA_CH3_CTRL_TRIG_CHAIN_TO_LSB _u(11)
@@ -1624,7 +1620,7 @@
16241620
// Description : DMA Channel 4 Control and Status
16251621
#define DMA_CH4_CTRL_TRIG_OFFSET _u(0x0000010c)
16261622
#define DMA_CH4_CTRL_TRIG_BITS _u(0xe1ffffff)
1627-
#define DMA_CH4_CTRL_TRIG_RESET _u(0x00002000)
1623+
#define DMA_CH4_CTRL_TRIG_RESET _u(0x00000000)
16281624
// -----------------------------------------------------------------------------
16291625
// Field : DMA_CH4_CTRL_TRIG_AHB_ERROR
16301626
// Description : Logical OR of the READ_ERROR and WRITE_ERROR flags. The channel
@@ -1739,8 +1735,7 @@
17391735
// Description : When this channel completes, it will trigger the channel
17401736
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
17411737
// channel)_.
1742-
// Reset value is equal to channel number (4).
1743-
#define DMA_CH4_CTRL_TRIG_CHAIN_TO_RESET _u(0x4)
1738+
#define DMA_CH4_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
17441739
#define DMA_CH4_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
17451740
#define DMA_CH4_CTRL_TRIG_CHAIN_TO_MSB _u(14)
17461741
#define DMA_CH4_CTRL_TRIG_CHAIN_TO_LSB _u(11)
@@ -2013,7 +2008,7 @@
20132008
// Description : DMA Channel 5 Control and Status
20142009
#define DMA_CH5_CTRL_TRIG_OFFSET _u(0x0000014c)
20152010
#define DMA_CH5_CTRL_TRIG_BITS _u(0xe1ffffff)
2016-
#define DMA_CH5_CTRL_TRIG_RESET _u(0x00002800)
2011+
#define DMA_CH5_CTRL_TRIG_RESET _u(0x00000000)
20172012
// -----------------------------------------------------------------------------
20182013
// Field : DMA_CH5_CTRL_TRIG_AHB_ERROR
20192014
// Description : Logical OR of the READ_ERROR and WRITE_ERROR flags. The channel
@@ -2128,8 +2123,7 @@
21282123
// Description : When this channel completes, it will trigger the channel
21292124
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
21302125
// channel)_.
2131-
// Reset value is equal to channel number (5).
2132-
#define DMA_CH5_CTRL_TRIG_CHAIN_TO_RESET _u(0x5)
2126+
#define DMA_CH5_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
21332127
#define DMA_CH5_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
21342128
#define DMA_CH5_CTRL_TRIG_CHAIN_TO_MSB _u(14)
21352129
#define DMA_CH5_CTRL_TRIG_CHAIN_TO_LSB _u(11)
@@ -2402,7 +2396,7 @@
24022396
// Description : DMA Channel 6 Control and Status
24032397
#define DMA_CH6_CTRL_TRIG_OFFSET _u(0x0000018c)
24042398
#define DMA_CH6_CTRL_TRIG_BITS _u(0xe1ffffff)
2405-
#define DMA_CH6_CTRL_TRIG_RESET _u(0x00003000)
2399+
#define DMA_CH6_CTRL_TRIG_RESET _u(0x00000000)
24062400
// -----------------------------------------------------------------------------
24072401
// Field : DMA_CH6_CTRL_TRIG_AHB_ERROR
24082402
// Description : Logical OR of the READ_ERROR and WRITE_ERROR flags. The channel
@@ -2517,8 +2511,7 @@
25172511
// Description : When this channel completes, it will trigger the channel
25182512
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
25192513
// channel)_.
2520-
// Reset value is equal to channel number (6).
2521-
#define DMA_CH6_CTRL_TRIG_CHAIN_TO_RESET _u(0x6)
2514+
#define DMA_CH6_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
25222515
#define DMA_CH6_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
25232516
#define DMA_CH6_CTRL_TRIG_CHAIN_TO_MSB _u(14)
25242517
#define DMA_CH6_CTRL_TRIG_CHAIN_TO_LSB _u(11)
@@ -2791,7 +2784,7 @@
27912784
// Description : DMA Channel 7 Control and Status
27922785
#define DMA_CH7_CTRL_TRIG_OFFSET _u(0x000001cc)
27932786
#define DMA_CH7_CTRL_TRIG_BITS _u(0xe1ffffff)
2794-
#define DMA_CH7_CTRL_TRIG_RESET _u(0x00003800)
2787+
#define DMA_CH7_CTRL_TRIG_RESET _u(0x00000000)
27952788
// -----------------------------------------------------------------------------
27962789
// Field : DMA_CH7_CTRL_TRIG_AHB_ERROR
27972790
// Description : Logical OR of the READ_ERROR and WRITE_ERROR flags. The channel
@@ -2906,8 +2899,7 @@
29062899
// Description : When this channel completes, it will trigger the channel
29072900
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
29082901
// channel)_.
2909-
// Reset value is equal to channel number (7).
2910-
#define DMA_CH7_CTRL_TRIG_CHAIN_TO_RESET _u(0x7)
2902+
#define DMA_CH7_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
29112903
#define DMA_CH7_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
29122904
#define DMA_CH7_CTRL_TRIG_CHAIN_TO_MSB _u(14)
29132905
#define DMA_CH7_CTRL_TRIG_CHAIN_TO_LSB _u(11)
@@ -3180,7 +3172,7 @@
31803172
// Description : DMA Channel 8 Control and Status
31813173
#define DMA_CH8_CTRL_TRIG_OFFSET _u(0x0000020c)
31823174
#define DMA_CH8_CTRL_TRIG_BITS _u(0xe1ffffff)
3183-
#define DMA_CH8_CTRL_TRIG_RESET _u(0x00004000)
3175+
#define DMA_CH8_CTRL_TRIG_RESET _u(0x00000000)
31843176
// -----------------------------------------------------------------------------
31853177
// Field : DMA_CH8_CTRL_TRIG_AHB_ERROR
31863178
// Description : Logical OR of the READ_ERROR and WRITE_ERROR flags. The channel
@@ -3295,8 +3287,7 @@
32953287
// Description : When this channel completes, it will trigger the channel
32963288
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
32973289
// channel)_.
3298-
// Reset value is equal to channel number (8).
3299-
#define DMA_CH8_CTRL_TRIG_CHAIN_TO_RESET _u(0x8)
3290+
#define DMA_CH8_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
33003291
#define DMA_CH8_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
33013292
#define DMA_CH8_CTRL_TRIG_CHAIN_TO_MSB _u(14)
33023293
#define DMA_CH8_CTRL_TRIG_CHAIN_TO_LSB _u(11)
@@ -3569,7 +3560,7 @@
35693560
// Description : DMA Channel 9 Control and Status
35703561
#define DMA_CH9_CTRL_TRIG_OFFSET _u(0x0000024c)
35713562
#define DMA_CH9_CTRL_TRIG_BITS _u(0xe1ffffff)
3572-
#define DMA_CH9_CTRL_TRIG_RESET _u(0x00004800)
3563+
#define DMA_CH9_CTRL_TRIG_RESET _u(0x00000000)
35733564
// -----------------------------------------------------------------------------
35743565
// Field : DMA_CH9_CTRL_TRIG_AHB_ERROR
35753566
// Description : Logical OR of the READ_ERROR and WRITE_ERROR flags. The channel
@@ -3684,8 +3675,7 @@
36843675
// Description : When this channel completes, it will trigger the channel
36853676
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
36863677
// channel)_.
3687-
// Reset value is equal to channel number (9).
3688-
#define DMA_CH9_CTRL_TRIG_CHAIN_TO_RESET _u(0x9)
3678+
#define DMA_CH9_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
36893679
#define DMA_CH9_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
36903680
#define DMA_CH9_CTRL_TRIG_CHAIN_TO_MSB _u(14)
36913681
#define DMA_CH9_CTRL_TRIG_CHAIN_TO_LSB _u(11)
@@ -3958,7 +3948,7 @@
39583948
// Description : DMA Channel 10 Control and Status
39593949
#define DMA_CH10_CTRL_TRIG_OFFSET _u(0x0000028c)
39603950
#define DMA_CH10_CTRL_TRIG_BITS _u(0xe1ffffff)
3961-
#define DMA_CH10_CTRL_TRIG_RESET _u(0x00005000)
3951+
#define DMA_CH10_CTRL_TRIG_RESET _u(0x00000000)
39623952
// -----------------------------------------------------------------------------
39633953
// Field : DMA_CH10_CTRL_TRIG_AHB_ERROR
39643954
// Description : Logical OR of the READ_ERROR and WRITE_ERROR flags. The channel
@@ -4073,8 +4063,7 @@
40734063
// Description : When this channel completes, it will trigger the channel
40744064
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
40754065
// channel)_.
4076-
// Reset value is equal to channel number (10).
4077-
#define DMA_CH10_CTRL_TRIG_CHAIN_TO_RESET _u(0xa)
4066+
#define DMA_CH10_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
40784067
#define DMA_CH10_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
40794068
#define DMA_CH10_CTRL_TRIG_CHAIN_TO_MSB _u(14)
40804069
#define DMA_CH10_CTRL_TRIG_CHAIN_TO_LSB _u(11)
@@ -4347,7 +4336,7 @@
43474336
// Description : DMA Channel 11 Control and Status
43484337
#define DMA_CH11_CTRL_TRIG_OFFSET _u(0x000002cc)
43494338
#define DMA_CH11_CTRL_TRIG_BITS _u(0xe1ffffff)
4350-
#define DMA_CH11_CTRL_TRIG_RESET _u(0x00005800)
4339+
#define DMA_CH11_CTRL_TRIG_RESET _u(0x00000000)
43514340
// -----------------------------------------------------------------------------
43524341
// Field : DMA_CH11_CTRL_TRIG_AHB_ERROR
43534342
// Description : Logical OR of the READ_ERROR and WRITE_ERROR flags. The channel
@@ -4462,8 +4451,7 @@
44624451
// Description : When this channel completes, it will trigger the channel
44634452
// indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this
44644453
// channel)_.
4465-
// Reset value is equal to channel number (11).
4466-
#define DMA_CH11_CTRL_TRIG_CHAIN_TO_RESET _u(0xb)
4454+
#define DMA_CH11_CTRL_TRIG_CHAIN_TO_RESET _u(0x0)
44674455
#define DMA_CH11_CTRL_TRIG_CHAIN_TO_BITS _u(0x00007800)
44684456
#define DMA_CH11_CTRL_TRIG_CHAIN_TO_MSB _u(14)
44694457
#define DMA_CH11_CTRL_TRIG_CHAIN_TO_LSB _u(11)

include/hardware/regs/sio.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
2+
* Copyright (c) 2022 Raspberry Pi (Trading) Ltd.
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
@@ -344,7 +344,7 @@
344344
// q`.
345345
// Any operand write starts a new calculation. The results appear
346346
// in QUOTIENT, REMAINDER.
347-
// UDIVIDEND/SDIVIDEND are aliases of the same internal register.
347+
// UDIVISOR/SDIVISOR are aliases of the same internal register.
348348
// The U alias starts an
349349
// unsigned calculation, and the S alias starts a signed
350350
// calculation.

include/hardware/structs/adc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@ typedef struct {
8686
io_ro_32 ints;
8787
} adc_hw_t;
8888

89-
#define adc_hw ((adc_hw_t*)ADC_BASE)
89+
#define adc_hw ((adc_hw_t *)ADC_BASE)
9090

9191
#endif

include/hardware/structs/bus_ctrl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ typedef struct {
7272
bus_ctrl_perf_hw_t counter[4];
7373
} bus_ctrl_hw_t;
7474

75-
#define bus_ctrl_hw ((bus_ctrl_hw_t*)BUSCTRL_BASE)
75+
#define bus_ctrl_hw ((bus_ctrl_hw_t *)BUSCTRL_BASE)
7676

7777
#endif

include/hardware/structs/clocks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ typedef struct {
319319
io_ro_32 ints;
320320
} clocks_hw_t;
321321

322-
#define clocks_hw ((clocks_hw_t*)CLOCKS_BASE)
322+
#define clocks_hw ((clocks_hw_t *)CLOCKS_BASE)
323323

324324
static_assert( CLK_COUNT == 10, "");
325325

include/hardware/structs/dma.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ typedef struct {
194194
} ch[NUM_DMA_CHANNELS];
195195
} dma_debug_hw_t;
196196

197-
#define dma_hw ((dma_hw_t*)DMA_BASE)
198-
#define dma_debug_hw ((dma_debug_hw_t *const)(DMA_BASE + DMA_CH0_DBG_CTDREQ_OFFSET))
197+
#define dma_hw ((dma_hw_t *)DMA_BASE)
198+
#define dma_debug_hw ((dma_debug_hw_t *)(DMA_BASE + DMA_CH0_DBG_CTDREQ_OFFSET))
199199

200200
static_assert( NUM_DMA_TIMERS == 4, "");
201201
static_assert( NUM_DMA_CHANNELS == 12, "");

include/hardware/structs/i2c.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ typedef struct {
327327
io_ro_32 comp_type;
328328
} i2c_hw_t;
329329

330-
#define i2c0_hw ((i2c_hw_t*)I2C0_BASE)
331-
#define i2c1_hw ((i2c_hw_t*)I2C1_BASE)
330+
#define i2c0_hw ((i2c_hw_t *)I2C0_BASE)
331+
#define i2c1_hw ((i2c_hw_t *)I2C1_BASE)
332332

333333
#endif

include/hardware/structs/iobank0.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ typedef struct {
208208
io_irq_ctrl_hw_t dormant_wake_irq_ctrl;
209209
} iobank0_hw_t;
210210

211-
#define iobank0_hw ((iobank0_hw_t*)IO_BANK0_BASE)
211+
#define iobank0_hw ((iobank0_hw_t *)IO_BANK0_BASE)
212212
/// \end::iobank0_hw[]
213213

214214
static_assert( NUM_BANK0_GPIOS == 30, "");

include/hardware/structs/ioqspi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ typedef struct {
167167
io_qspi_ctrl_hw_t dormant_wake_qspi_ctrl;
168168
} ioqspi_hw_t;
169169

170-
#define ioqspi_hw ((ioqspi_hw_t*)IO_QSPI_BASE)
170+
#define ioqspi_hw ((ioqspi_hw_t *)IO_QSPI_BASE)
171171

172172
static_assert( NUM_QSPI_GPIOS == 6, "");
173173

include/hardware/structs/mpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ typedef struct {
5656
io_rw_32 rasr;
5757
} mpu_hw_t;
5858

59-
#define mpu_hw ((mpu_hw_t *const)(PPB_BASE + M0PLUS_MPU_TYPE_OFFSET))
59+
#define mpu_hw ((mpu_hw_t *)(PPB_BASE + M0PLUS_MPU_TYPE_OFFSET))
6060

6161
#endif

0 commit comments

Comments
 (0)