Skip to content

Commit edf1efd

Browse files
committed
Add CYW43 guards to more things
1 parent e100981 commit edf1efd

File tree

2 files changed

+13
-11
lines changed
  • ports/raspberrypi/common-hal/microcontroller

2 files changed

+13
-11
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,23 @@
2828

2929
#include "common-hal/microcontroller/__init__.h"
3030
#include "shared-bindings/microcontroller/Pin.h"
31-
#include "bindings/cyw43/__init__.h"
3231

3332
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
3433

3534
#if CIRCUITPY_CYW43
35+
#include "bindings/cyw43/__init__.h"
3636
#include "pico/cyw43_arch.h"
37-
#endif
38-
39-
STATIC uint32_t never_reset_pins;
4037

4138
bool cyw_ever_init;
4239
static uint32_t cyw_pin_claimed;
4340

41+
void reset_pin_number_cyw(uint8_t pin_no) {
42+
cyw_pin_claimed &= ~(1 << pin_no);
43+
}
44+
#endif
45+
46+
STATIC uint32_t never_reset_pins;
47+
4448
void reset_all_pins(void) {
4549
for (size_t i = 0; i < TOTAL_GPIO_COUNT; i++) {
4650
if ((never_reset_pins & (1 << i)) != 0) {
@@ -82,10 +86,6 @@ void reset_pin_number(uint8_t pin_number) {
8286
hw_set_bits(&padsbank0_hw->io[pin_number], PADS_BANK0_GPIO0_OD_BITS);
8387
}
8488

85-
void reset_pin_number_cyw(uint8_t pin_no) {
86-
cyw_pin_claimed &= ~(1 << pin_no);
87-
}
88-
8989
void common_hal_never_reset_pin(const mcu_pin_obj_t *pin) {
9090
never_reset_pin_number(pin->number);
9191
}

ports/raspberrypi/common-hal/microcontroller/Pin.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,17 @@
3434

3535
#include "peripherals/pins.h"
3636

37-
extern bool cyw_ever_init;
38-
3937
void reset_all_pins(void);
4038
// reset_pin_number takes the pin number instead of the pointer so that objects don't
4139
// need to store a full pointer.
4240
void reset_pin_number(uint8_t pin_number);
43-
void reset_pin_number_cyw(uint8_t pin_number);
4441
void never_reset_pin_number(uint8_t pin_number);
4542
void claim_pin(const mcu_pin_obj_t *pin);
4643
bool pin_number_is_free(uint8_t pin_number);
4744

45+
#if CIRCUITPY_CYW43
46+
extern bool cyw_ever_init;
47+
void reset_pin_number_cyw(uint8_t pin_number);
48+
#endif
49+
4850
#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_MICROCONTROLLER_PIN_H

0 commit comments

Comments
 (0)