Skip to content

Commit 9c24c80

Browse files
dhalbertdhalbert
committed
Fix #ifdefs in port.c to call xxx_reset() rroutines properly. Remove most uses of EXPRESS_BOARD.
1 parent ef802c9 commit 9c24c80

13 files changed

Lines changed: 118 additions & 99 deletions

File tree

‎drivers/wiznet5k/internet/dhcp/dhcp.c‎

Lines changed: 69 additions & 73 deletions
Large diffs are not rendered by default.

‎ports/atmel-samd/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,17 @@ ifeq ($(DEBUG), 1)
102102
# Turn on Python modules useful for debugging (e.g. uheap, ustack).
103103
CFLAGS += -ggdb
104104
# You may want to disable -flto if it interferes with debugging.
105-
# CFLAGS += -flto
105+
CFLAGS += -flto
106106
# You may want to enable these flags to make setting breakpoints easier.
107-
CFLAGS += -fno-inline -fno-ipa-sra
107+
# CFLAGS += -fno-inline -fno-ipa-sra
108108
ifeq ($(CHIP_FAMILY), samd21)
109109
CFLAGS += -DENABLE_MICRO_TRACE_BUFFER
110110
endif
111111
else
112112
# -finline-limit can shrink the image size.
113113
# -finline-limit=80 or so is similar to not having it on.
114114
# There is no simple default value, though.
115-
ifdef INTERNAL_FLASH_FILESYSTEM
115+
ifeq ($(INTERNAL_FLASH_FILESYSTEM),1)
116116
CFLAGS += -finline-limit=50
117117
endif
118118
ifdef CFLAGS_INLINE_LIMIT

‎ports/atmel-samd/boards/sam32/mpconfigboard.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ USB_PID = 0xEDBE
44
USB_PRODUCT = "SAM32"
55
USB_MANUFACTURER = "maholli"
66

7-
QSPI_FLASH_FILESYSTEM = 0
87
INTERNAL_FLASH_FILESYSTEM = 1
98
LONGINT_IMPL = MPZ
109

‎ports/atmel-samd/common-hal/analogio/AnalogOut.c‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "py/runtime.h"
3232

3333
#include "shared-bindings/analogio/AnalogOut.h"
34+
#include "shared-bindings/audioio/AudioOut.h"
3435
#include "shared-bindings/microcontroller/Pin.h"
3536
#include "supervisor/shared/translate.h"
3637

@@ -138,5 +139,17 @@ void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,
138139
}
139140

140141
void analogout_reset(void) {
141-
// AudioOut resets the DAC in case its been used for audio which requires special handling.
142+
// audioout_reset also resets the DAC, and does a smooth ramp down to avoid clicks
143+
// if it was enabled, so do that instead if AudioOut is enabled.
144+
#if CIRCUITPY_AUDIOIO
145+
audioout_reset();
146+
#else
147+
#ifdef SAMD21
148+
while (DAC->STATUS.reg & DAC_STATUS_SYNCBUSY) {}
149+
#endif
150+
#ifdef SAMD51
151+
while (DAC->SYNCBUSY.reg & DAC_SYNCBUSY_SWRST) {}
152+
#endif
153+
DAC->CTRLA.reg |= DAC_CTRLA_SWRST;
154+
#endif
142155
}

‎ports/atmel-samd/supervisor/port.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,20 +194,23 @@ safe_mode_t port_init(void) {
194194
void reset_port(void) {
195195
reset_sercoms();
196196

197-
#if defined(EXPRESS_BOARD) && !defined(__SAMR21G18A__)
197+
#if CIRCUITPY_AUDIOIO
198198
audio_dma_reset();
199199
audioout_reset();
200-
#if !defined(__SAMD51G19A__) && !defined(__SAMD51G18A__)
200+
#endif
201+
#if CIRCUITPY_AUDIOBUSIO
201202
i2sout_reset();
202-
#endif
203203
//pdmin_reset();
204204
#endif
205-
#ifdef SAMD21
205+
206+
#if CIRCUITPY_TOUCHIO
206207
touchin_reset();
207208
#endif
208209
eic_reset();
210+
#if CIRCUITPY_PULSEIO
209211
pulseout_reset();
210212
pwmout_reset();
213+
#endif
211214

212215
#if CIRCUITPY_ANALOGIO
213216
analogin_reset();

‎ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
#define MICROPY_HW_LED_STATUS (&pin_P1_15)
3939

40-
#ifdef QSPI_FLASH_FILESYSTEM
40+
#if QSPI_FLASH_FILESYSTEM
4141
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 17)
4242
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 22)
4343
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 23)
@@ -46,7 +46,7 @@
4646
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 20)
4747
#endif
4848

49-
#ifdef SPI_FLASH_FILESYSTEM
49+
#if SPI_FLASH_FILESYSTEM
5050
#define SPI_FLASH_MOSI_PIN &pin_P0_17
5151
#define SPI_FLASH_MISO_PIN &pin_P0_22
5252
#define SPI_FLASH_SCK_PIN &pin_P0_19

‎ports/nrf/boards/particle_argon/mpconfigboard.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#define MICROPY_HW_RGB_LED_GREEN (&pin_P0_14)
4040
#define MICROPY_HW_RGB_LED_BLUE (&pin_P0_15)
4141

42-
#ifdef QSPI_FLASH_FILESYSTEM
42+
#if QSPI_FLASH_FILESYSTEM
4343
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 20)
4444
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 21)
4545
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 22)
@@ -48,7 +48,7 @@
4848
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 17)
4949
#endif
5050

51-
#ifdef SPI_FLASH_FILESYSTEM
51+
#if SPI_FLASH_FILESYSTEM
5252
#define SPI_FLASH_MOSI_PIN &pin_P0_20
5353
#define SPI_FLASH_MISO_PIN &pin_P0_21
5454
#define SPI_FLASH_SCK_PIN &pin_P0_19

‎ports/nrf/boards/particle_boron/mpconfigboard.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#define MICROPY_HW_RGB_LED_GREEN (&pin_P0_14)
4040
#define MICROPY_HW_RGB_LED_BLUE (&pin_P0_15)
4141

42-
#ifdef QSPI_FLASH_FILESYSTEM
42+
#if QSPI_FLASH_FILESYSTEM
4343
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 20)
4444
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 21)
4545
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 22)
@@ -48,7 +48,7 @@
4848
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 17)
4949
#endif
5050

51-
#ifdef SPI_FLASH_FILESYSTEM
51+
#if SPI_FLASH_FILESYSTEM
5252
#define SPI_FLASH_MOSI_PIN &pin_P0_20
5353
#define SPI_FLASH_MISO_PIN &pin_P0_21
5454
#define SPI_FLASH_SCK_PIN &pin_P0_19

‎ports/nrf/boards/particle_xenon/mpconfigboard.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#define MICROPY_HW_RGB_LED_GREEN (&pin_P0_14)
4040
#define MICROPY_HW_RGB_LED_BLUE (&pin_P0_15)
4141

42-
#ifdef QSPI_FLASH_FILESYSTEM
42+
#if QSPI_FLASH_FILESYSTEM
4343
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 20)
4444
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 21)
4545
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 22)
@@ -48,7 +48,7 @@
4848
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 17)
4949
#endif
5050

51-
#ifdef SPI_FLASH_FILESYSTEM
51+
#if SPI_FLASH_FILESYSTEM
5252
#define SPI_FLASH_MOSI_PIN &pin_P0_20
5353
#define SPI_FLASH_MISO_PIN &pin_P0_21
5454
#define SPI_FLASH_SCK_PIN &pin_P0_19

‎ports/nrf/boards/pca10056/mpconfigboard.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
// Quad mode: If all DATA0 --> DATA3 are valid
5050
// Dual mode: If DATA0 and DATA1 are valid while either DATA2 and/or DATA3 are invalid
5151
// Single mode: If only DATA0 is valid
52-
#ifdef QSPI_FLASH_FILESYSTEM
52+
#if QSPI_FLASH_FILESYSTEM
5353
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 20)
5454
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 21)
5555
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 22)
@@ -58,7 +58,7 @@
5858
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 17)
5959
#endif
6060

61-
#ifdef SPI_FLASH_FILESYSTEM
61+
#if SPI_FLASH_FILESYSTEM
6262
#define SPI_FLASH_MOSI_PIN &pin_P0_20
6363
#define SPI_FLASH_MISO_PIN &pin_P0_21
6464
#define SPI_FLASH_SCK_PIN &pin_P0_19

0 commit comments

Comments
 (0)