Skip to content

Commit 2499769

Browse files
lurchlurch
committed
Move CYW43-related PICO_CONFIG lines to cyw43_driver.h
1 parent 5032223 commit 2499769

File tree

3 files changed

+29
-15
lines changed

3 files changed

+29
-15
lines changed

‎src/boards/include/boards/pico2_w.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,37 +113,37 @@
113113
#define PICO_RP2350_A2_SUPPORTED 1
114114
#endif
115115

116-
// PICO_CONFIG: CYW43_PIN_WL_DYNAMIC, flag to indicate if cyw43 SPI pins can be changed at runtime, type=bool, default=false, advanced=true, group=pico_cyw43_driver
116+
// cyw43 SPI pins can't be changed at runtime
117117
#ifndef CYW43_PIN_WL_DYNAMIC
118118
#define CYW43_PIN_WL_DYNAMIC 0
119119
#endif
120120

121-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_REG_ON, gpio pin to power up the cyw43 chip, type=int, default=23, advanced=true, group=pico_cyw43_driver
121+
// gpio pin to power up the cyw43 chip
122122
#ifndef CYW43_DEFAULT_PIN_WL_REG_ON
123123
#define CYW43_DEFAULT_PIN_WL_REG_ON 23u
124124
#endif
125125

126-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_DATA_OUT, gpio pin for spi data out to the cyw43 chip, type=int, default=24, advanced=true, group=pico_cyw43_driver
126+
// gpio pin for spi data out to the cyw43 chip
127127
#ifndef CYW43_DEFAULT_PIN_WL_DATA_OUT
128128
#define CYW43_DEFAULT_PIN_WL_DATA_OUT 24u
129129
#endif
130130

131-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_DATA_IN, gpio pin for spi data in from the cyw43 chip, type=int, default=24, advanced=true, group=pico_cyw43_driver
131+
// gpio pin for spi data in from the cyw43 chip
132132
#ifndef CYW43_DEFAULT_PIN_WL_DATA_IN
133133
#define CYW43_DEFAULT_PIN_WL_DATA_IN 24u
134134
#endif
135135

136-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_HOST_WAKE, gpio (irq) pin for the irq line from the cyw43 chip, type=int, default=24, advanced=true, group=pico_cyw43_driver
136+
// gpio (irq) pin for the irq line from the cyw43 chip
137137
#ifndef CYW43_DEFAULT_PIN_WL_HOST_WAKE
138138
#define CYW43_DEFAULT_PIN_WL_HOST_WAKE 24u
139139
#endif
140140

141-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_CLOCK, gpio pin for the spi clock line to the cyw43 chip, type=int, default=29, advanced=true, group=pico_cyw43_driver
141+
// gpio pin for the spi clock line to the cyw43 chip
142142
#ifndef CYW43_DEFAULT_PIN_WL_CLOCK
143143
#define CYW43_DEFAULT_PIN_WL_CLOCK 29u
144144
#endif
145145

146-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_CS, gpio pin for the spi chip select to the cyw43 chip, type=int, default=25, advanced=true, group=pico_cyw43_driver
146+
// gpio pin for the spi chip select to the cyw43 chip
147147
#ifndef CYW43_DEFAULT_PIN_WL_CS
148148
#define CYW43_DEFAULT_PIN_WL_CS 25u
149149
#endif

‎src/boards/include/boards/pico_w.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,37 +114,37 @@
114114
#define PICO_VSYS_PIN 29
115115
#endif
116116

117-
// PICO_CONFIG: CYW43_PIN_WL_DYNAMIC, flag to indicate if cyw43 SPI pins can be changed at runtime, type=bool, default=false, advanced=true, group=pico_cyw43_driver
117+
// cyw43 SPI pins can't be changed at runtime
118118
#ifndef CYW43_PIN_WL_DYNAMIC
119119
#define CYW43_PIN_WL_DYNAMIC 0
120120
#endif
121121

122-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_REG_ON, gpio pin to power up the cyw43 chip, type=int, default=23, advanced=true, group=pico_cyw43_driver
122+
// gpio pin to power up the cyw43 chip
123123
#ifndef CYW43_DEFAULT_PIN_WL_REG_ON
124124
#define CYW43_DEFAULT_PIN_WL_REG_ON 23u
125125
#endif
126126

127-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_DATA_OUT, gpio pin for spi data out to the cyw43 chip, type=int, default=24, advanced=true, group=pico_cyw43_driver
127+
// gpio pin for spi data out to the cyw43 chip
128128
#ifndef CYW43_DEFAULT_PIN_WL_DATA_OUT
129129
#define CYW43_DEFAULT_PIN_WL_DATA_OUT 24u
130130
#endif
131131

132-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_DATA_IN, gpio pin for spi data in from the cyw43 chip, type=int, default=24, advanced=true, group=pico_cyw43_driver
132+
// gpio pin for spi data in from the cyw43 chip
133133
#ifndef CYW43_DEFAULT_PIN_WL_DATA_IN
134134
#define CYW43_DEFAULT_PIN_WL_DATA_IN 24u
135135
#endif
136136

137-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_HOST_WAKE, gpio (irq) pin for the irq line from the cyw43 chip, type=int, default=24, advanced=true, group=pico_cyw43_driver
137+
// gpio (irq) pin for the irq line from the cyw43 chip
138138
#ifndef CYW43_DEFAULT_PIN_WL_HOST_WAKE
139139
#define CYW43_DEFAULT_PIN_WL_HOST_WAKE 24u
140140
#endif
141141

142-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_CLOCK, gpio pin for the spi clock line to the cyw43 chip, type=int, default=29, advanced=true, group=pico_cyw43_driver
142+
// gpio pin for the spi clock line to the cyw43 chip
143143
#ifndef CYW43_DEFAULT_PIN_WL_CLOCK
144144
#define CYW43_DEFAULT_PIN_WL_CLOCK 29u
145145
#endif
146146

147-
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_CS, gpio pin for the spi chip select to the cyw43 chip, type=int, default=25, advanced=true, group=pico_cyw43_driver
147+
// gpio pin for the spi chip select to the cyw43 chip
148148
#ifndef CYW43_DEFAULT_PIN_WL_CS
149149
#define CYW43_DEFAULT_PIN_WL_CS 25u
150150
#endif

‎src/rp2_common/pico_cyw43_driver/include/pico/cyw43_driver.h‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,20 @@ void cyw43_driver_deinit(struct async_context *context);
6363
#define CYW43_PIO_CLOCK_DIV_FRAC 0
6464
#endif
6565

66+
// PICO_CONFIG: CYW43_PIN_WL_DYNAMIC, flag to indicate if cyw43 SPI pins can be changed at runtime, type=bool, advanced=true, group=pico_cyw43_driver
67+
68+
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_REG_ON, gpio pin to power up the cyw43 chip, type=int, advanced=true, group=pico_cyw43_driver
69+
70+
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_DATA_OUT, gpio pin for spi data out to the cyw43 chip, type=int, advanced=true, group=pico_cyw43_driver
71+
72+
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_DATA_IN, gpio pin for spi data in from the cyw43 chip, type=int, advanced=true, group=pico_cyw43_driver
73+
74+
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_HOST_WAKE, gpio (irq) pin for the irq line from the cyw43 chip, type=int, advanced=true, group=pico_cyw43_driver
75+
76+
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_CLOCK, gpio pin for the spi clock line to the cyw43 chip, type=int, advanced=true, group=pico_cyw43_driver
77+
78+
// PICO_CONFIG: CYW43_DEFAULT_PIN_WL_CS, gpio pin for the spi chip select to the cyw43 chip, type=int, dvanced=true, group=pico_cyw43_driver
79+
6680
#if CYW43_PIO_CLOCK_DIV_DYNAMIC
6781
/*! \brief Set the clock divisor for the cyw43 pio clock
6882
* \ingroup pico_cyw43_driver
@@ -95,4 +109,4 @@ int cyw43_set_pins_wl(uint pins[CYW43_PIN_INDEX_WL_COUNT]);
95109
#ifdef __cplusplus
96110
}
97111
#endif
98-
#endif
112+
#endif

0 commit comments

Comments
 (0)