remove local tracking of never_reset in all common-hal/busio/SPI.c

dhalbert · dhalbert · commit 280077793316 · 2025-10-31T14:50:34.000-04:00
diff --git a/ports/analog/common-hal/busio/SPI.c b/ports/analog/common-hal/busio/SPI.c
@@ -42,7 +42,6 @@
 typedef enum {
     SPI_FREE = 0,
     SPI_BUSY,
-    SPI_NEVER_RESET,
 } spi_status_t;
 
 // Set each bit to indicate an active SPI
@@ -121,8 +120,6 @@ void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
     common_hal_never_reset_pin(self->miso);
     common_hal_never_reset_pin(self->sck);
     common_hal_never_reset_pin(self->nss);
-
-    spi_status[self->spi_id] = SPI_NEVER_RESET;
 }
 
 // Check SPI status, deinited or not
diff --git a/ports/broadcom/common-hal/busio/SPI.c b/ports/broadcom/common-hal/busio/SPI.c
@@ -30,7 +30,6 @@ static SPI0_Type *spi[NUM_SPI] = {SPI0, NULL, NULL};
 static SPI1_Type *aux_spi[NUM_SPI] = {NULL, SPI1, SPI2};
 #endif
 
-static bool never_reset_spi[NUM_SPI];
 static bool spi_in_use[NUM_SPI];
 
 void common_hal_busio_spi_construct(busio_spi_obj_t *self,
@@ -99,8 +98,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
 }
 
 void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
-    never_reset_spi[self->index] = true;
-
     common_hal_never_reset_pin(self->clock);
     common_hal_never_reset_pin(self->MOSI);
     common_hal_never_reset_pin(self->MISO);
@@ -118,7 +115,6 @@ void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
     if (common_hal_busio_spi_deinited(self)) {
         return;
     }
-    never_reset_spi[self->index] = false;
 
     common_hal_reset_pin(self->clock);
     common_hal_reset_pin(self->MOSI);
diff --git a/ports/espressif/common-hal/busio/SPI.c b/ports/espressif/common-hal/busio/SPI.c
@@ -16,7 +16,6 @@
 #define SPI_MAX_DMA_BITS (SPI_MAX_DMA_LEN * 8)
 #define MAX_SPI_TRANSACTIONS 10
 
-static bool spi_never_reset[SOC_SPI_PERIPH_NUM];
 static spi_device_handle_t spi_handle[SOC_SPI_PERIPH_NUM];
 
 static bool spi_bus_is_free(spi_host_device_t host_id) {
@@ -107,7 +106,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
 }
 
 void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
-    spi_never_reset[self->host_id] = true;
     common_hal_never_reset_pin(self->clock);
     if (self->MOSI != NULL) {
         common_hal_never_reset_pin(self->MOSI);
@@ -139,7 +137,6 @@ void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
     common_hal_reset_pin(self->clock);
     common_hal_busio_spi_mark_deinit(self);
 
-    spi_never_reset[self->host_id] = false;
     spi_bus_remove_device(spi_handle[self->host_id]);
     spi_bus_free(self->host_id);
 
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
@@ -414,7 +414,7 @@ void reset_to_bootloader(void) {
 }
 
 void reset_cpu(void) {
-    #if CIRCUITPY_DEBUG || 1
+    #if CIRCUITPY_DEBUG
     esp_backtrace_print(100);
     #endif
     esp_restart();
diff --git a/ports/mimxrt10xx/common-hal/busio/SPI.c b/ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -26,7 +26,6 @@
 
 // arrays use 0 based numbering: SPI1 is stored at index 0
 static bool reserved_spi[MP_ARRAY_SIZE(mcu_spi_banks)];
-static bool never_reset_spi[MP_ARRAY_SIZE(mcu_spi_banks)];
 
 #if IMXRT11XX
 static const clock_ip_name_t s_lpspiClocks[] = LPSPI_CLOCKS;
@@ -187,7 +186,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
 }
 
 void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
-    never_reset_spi[self->clock->bank_idx - 1] = true;
     common_hal_never_reset_pin(self->clock->pin);
     if (self->mosi != NULL) {
         common_hal_never_reset_pin(self->mosi->pin);
@@ -211,7 +209,6 @@ void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
     }
     LPSPI_Deinit(self->spi);
     reserved_spi[self->clock->bank_idx - 1] = false;
-    never_reset_spi[self->clock->bank_idx - 1] = false;
 
     common_hal_reset_pin(self->clock->pin);
     common_hal_reset_pin(self->mosi->pin);
diff --git a/ports/nordic/common-hal/busio/SPI.c b/ports/nordic/common-hal/busio/SPI.c
@@ -59,17 +59,13 @@ static const spim_peripheral_t spim_peripherals[] = {
     #endif
 };
 
-static bool never_reset[MP_ARRAY_SIZE(spim_peripherals)];
-
 // Separate RAM area for SPIM3 transmit buffer to avoid SPIM3 hardware errata.
 // https://infocenter.nordicsemi.com/index.jsp?topic=%2Ferrata_nRF52840_Rev2%2FERR%2FnRF52840%2FRev2%2Flatest%2Fanomaly_840_198.html
 static uint8_t *spim3_transmit_buffer = (uint8_t *)SPIM3_BUFFER_RAM_START_ADDR;
 
 void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
     for (size_t i = 0; i < MP_ARRAY_SIZE(spim_peripherals); i++) {
         if (self->spim_peripheral == &spim_peripherals[i]) {
-            never_reset[i] = true;
-
             never_reset_pin_number(self->clock_pin_number);
             never_reset_pin_number(self->MOSI_pin_number);
             never_reset_pin_number(self->MISO_pin_number);
diff --git a/ports/raspberrypi/common-hal/busio/SPI.c b/ports/raspberrypi/common-hal/busio/SPI.c
@@ -19,8 +19,6 @@
 
 #define NO_INSTANCE 0xff
 
-static bool never_reset_spi[2];
-
 void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     const mcu_pin_obj_t *clock, const mcu_pin_obj_t *mosi,
     const mcu_pin_obj_t *miso, bool half_duplex) {
@@ -88,8 +86,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
 }
 
 void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
-    never_reset_spi[spi_get_index(self->peripheral)] = true;
-
     common_hal_never_reset_pin(self->clock);
     common_hal_never_reset_pin(self->MOSI);
     common_hal_never_reset_pin(self->MISO);
@@ -107,7 +103,6 @@ void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
     if (common_hal_busio_spi_deinited(self)) {
         return;
     }
-    never_reset_spi[spi_get_index(self->peripheral)] = false;
     spi_deinit(self->peripheral);
 
     common_hal_reset_pin(self->clock);
diff --git a/ports/silabs/common-hal/busio/SPI.c b/ports/silabs/common-hal/busio/SPI.c
@@ -37,7 +37,6 @@
 static SPIDRV_HandleData_t spidrv_eusart_handle;
 static SPIDRV_Init_t spidrv_eusart_init = SPIDRV_MASTER_EUSART1;
 static bool in_used = false;
-static bool never_reset = false;
 
 // Construct SPI protocol, this function init SPI peripheral
 void common_hal_busio_spi_construct(busio_spi_obj_t *self,
@@ -102,7 +101,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
 
 // Never reset SPI when reload
 void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
-    never_reset = true;
     common_hal_never_reset_pin(self->mosi);
     common_hal_never_reset_pin(self->miso);
     common_hal_never_reset_pin(self->sck);
diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c
@@ -19,7 +19,6 @@
 #define MAX_SPI 6
 
 static bool reserved_spi[MAX_SPI];
-static bool never_reset_spi[MAX_SPI];
 
 #define ALL_CLOCKS 0xFF
 static void spi_clock_enable(uint8_t mask);
@@ -215,7 +214,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
 
 void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
 
-    never_reset_spi[self->sck->periph_index - 1] = true;
     never_reset_pin_number(self->sck->pin->port, self->sck->pin->number);
     if (self->mosi != NULL) {
         never_reset_pin_number(self->mosi->pin->port, self->mosi->pin->number);
@@ -239,7 +237,6 @@ void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
     }
     spi_clock_disable(1 << (self->sck->periph_index - 1));
     reserved_spi[self->sck->periph_index - 1] = false;
-    never_reset_spi[self->sck->periph_index - 1] = false;
 
     reset_pin_number(self->sck->pin->port, self->sck->pin->number);
     if (self->mosi != NULL) {

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ void reset_to_bootloader(void) {`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`void reset_cpu(void) {`
`417`		`- #if CIRCUITPY_DEBUG \|\| 1`
	`417`	`+ #if CIRCUITPY_DEBUG`
`418`	`418`	`esp_backtrace_print(100);`
`419`	`419`	`#endif`
`420`	`420`	`esp_restart();`