repair constructors referencing old API

Randall-Scharpf · Randall-Scharpf · commit ea344c3a9c77 · 2024-11-05T21:40:46.000-08:00
diff --git a/ports/atmel-samd/boards/hallowing_m4_express/board.c b/ports/atmel-samd/boards/hallowing_m4_express/board.c
@@ -50,7 +50,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_PA01, &pin_PA00, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_PA01, &pin_PA00, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/atmel-samd/boards/monster_m4sk/board.c b/ports/atmel-samd/boards/monster_m4sk/board.c
@@ -50,7 +50,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA12, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA12, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/atmel-samd/boards/openbook_m4/board.c b/ports/atmel-samd/boards/openbook_m4/board.c
@@ -59,7 +59,7 @@ uint8_t refresh_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/atmel-samd/boards/pewpew_lcd/board.c b/ports/atmel-samd/boards/pewpew_lcd/board.c
@@ -70,7 +70,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_PA23, &pin_PA22, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_PA23, &pin_PA22, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/atmel-samd/boards/pewpew_m4/board.c b/ports/atmel-samd/boards/pewpew_m4/board.c
@@ -99,7 +99,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA15, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA15, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/atmel-samd/boards/pybadge/board.c b/ports/atmel-samd/boards/pybadge/board.c
@@ -70,7 +70,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/atmel-samd/boards/pygamer/board.c b/ports/atmel-samd/boards/pygamer/board.c
@@ -72,7 +72,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c b/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
@@ -67,7 +67,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_PB20, &pin_PB19, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_PB20, &pin_PB19, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/broadcom/common-hal/busio/SPI.c b/ports/broadcom/common-hal/busio/SPI.c
@@ -76,8 +76,7 @@ void reset_spi(void) {
 }
 
 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, const mcu_pin_obj_t *ss, bool half_duplex, bool slave_mode) {
+    const mcu_pin_obj_t *clock, const mcu_pin_obj_t *mosi, const mcu_pin_obj_t *miso, bool half_duplex) {
     size_t instance_index = NUM_SPI;
     BP_Function_Enum clock_alt = 0;
     BP_Function_Enum mosi_alt = 0;
@@ -86,9 +85,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     if (half_duplex) {
         mp_raise_NotImplementedError(MP_ERROR_TEXT("Half duplex SPI is not implemented"));
     }
-    if (slave_mode) {
-        mp_raise_NotImplementedError(MP_ERROR_TEXT("Slave mode SPI is not implemented"));
-    }
 
     // BCM_VERSION != 2711 have 3 SPI but as listed in peripherals/gen/pins.c two are on
     // index 0, once one index 0 SPI is found the other will throw an invalid_pins error.
diff --git a/ports/cxd56/common-hal/busio/SPI.c b/ports/cxd56/common-hal/busio/SPI.c
@@ -36,15 +36,12 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 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, const mcu_pin_obj_t *ss, bool half_duplex, bool slave_mode) {
+    const mcu_pin_obj_t *mosi, const mcu_pin_obj_t *miso, bool half_duplex) {
     int port = -1;
 
     if (half_duplex) {
         mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_half_duplex);
     }
-    if (slave_mode) {
-        mp_raise_NotImplementedError(MP_ERROR_TEXT("Slave mode SPI is not implemented"));
-    }
 
     if (clock->number == PIN_SPI4_SCK &&
         (mosi == NULL || mosi->number == PIN_SPI4_MOSI) &&
diff --git a/ports/espressif/boards/adafruit_funhouse/board.c b/ports/espressif/boards/adafruit_funhouse/board.c
@@ -52,7 +52,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
@@ -116,7 +116,7 @@ const uint8_t refresh_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/espressif/boards/espressif_esp32s3_box/board.c b/ports/espressif/boards/espressif_esp32s3_box/board.c
@@ -45,7 +45,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO7, &pin_GPIO6, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO7, &pin_GPIO6, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/board.c b/ports/espressif/boards/espressif_esp32s3_box_lite/board.c
@@ -46,7 +46,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO7, &pin_GPIO6, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO7, &pin_GPIO6, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/board.c
@@ -73,7 +73,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO6, &pin_GPIO7, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO6, &pin_GPIO7, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/espressif/boards/hardkernel_odroid_go/board.c b/ports/espressif/boards/hardkernel_odroid_go/board.c
@@ -65,7 +65,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO23, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO23, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/espressif/boards/hiibot_iots2/board.c b/ports/espressif/boards/hiibot_iots2/board.c
@@ -73,9 +73,7 @@ static void display_init(void) {
         &pin_GPIO34,    // CLK
         &pin_GPIO33,    // MOSI
         NULL,           // MISO not connected
-        NULL,           // SS not connected
-        false,          // Not half-duplex
-        false           // operate SPI bus as master
+        false           // Not half-duplex
         );
 
     common_hal_busio_spi_never_reset(spi);
diff --git a/ports/espressif/boards/lilygo_tembed_esp32s3/board.c b/ports/espressif/boards/lilygo_tembed_esp32s3/board.c
@@ -45,7 +45,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO12, &pin_GPIO11, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO12, &pin_GPIO11, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
@@ -73,9 +73,7 @@ static void display_init(void) {
         &pin_GPIO36,    // CLK
         &pin_GPIO35,    // MOSI
         NULL,           // MISO not connected
-        NULL,           // SS not connected
-        false,          // Not half-duplex
-        false           // operate SPI bus as master
+        false           // Not half-duplex
         );
 
     common_hal_busio_spi_never_reset(spi);
diff --git a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/board.c b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/board.c
@@ -53,9 +53,7 @@ static void display_init(void) {
         &pin_GPIO18,    // CLK
         &pin_GPIO19,    // MOSI
         NULL,           // MISO not connected
-        NULL,           // SS not connected
-        false,          // Not half-duplex
-        false           // operate SPI bus as master
+        false           // Not half-duplex
         );
 
     common_hal_busio_spi_never_reset(spi);
diff --git a/ports/espressif/boards/lilygo_twatch_2020_v3/board.c b/ports/espressif/boards/lilygo_twatch_2020_v3/board.c
@@ -56,9 +56,7 @@ static void display_init(void) {
         &pin_GPIO18,    // CLK
         &pin_GPIO19,    // MOSI
         NULL,           // MISO not connected
-        NULL,           // SS not connected
-        false,          // Not half-duplex
-        false           // operate SPI bus as master
+        false           // Not half-duplex
         );
 
     common_hal_busio_spi_never_reset(spi);
diff --git a/ports/espressif/boards/m5stack_atoms3/board.c b/ports/espressif/boards/m5stack_atoms3/board.c
@@ -53,7 +53,7 @@ void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     // busio_spi_obj_t *spi = common_hal_board_create_spi(0);
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO17, &pin_GPIO21, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO17, &pin_GPIO21, NULL, false);
     common_hal_busio_spi_never_reset(spi);
     bus->base.type = &fourwire_fourwire_type;
 
diff --git a/ports/espressif/boards/m5stack_stick_c/board.c b/ports/espressif/boards/m5stack_stick_c/board.c
@@ -167,7 +167,7 @@ static bool pmic_init(busio_i2c_obj_t *i2c) {
 static bool display_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO13, &pin_GPIO15, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO13, &pin_GPIO15, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/espressif/boards/m5stack_stick_c_plus/board.c b/ports/espressif/boards/m5stack_stick_c_plus/board.c
@@ -167,7 +167,7 @@ static bool pmic_init(busio_i2c_obj_t *i2c) {
 static bool display_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO13, &pin_GPIO15, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO13, &pin_GPIO15, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/espressif/boards/morpheans_morphesp-240/board.c b/ports/espressif/boards/morpheans_morphesp-240/board.c
@@ -149,9 +149,7 @@ void board_init(void) {
         &pin_GPIO12,    // CLK
         &pin_GPIO11,    // MOSI
         NULL,           // MISO not connected
-        NULL,           // SS not connected
-        false,          // Not half-duplex
-        false           // operate SPI bus as master
+        false           // Not half-duplex
         );
 
     common_hal_busio_spi_never_reset(spi);
diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/board.c
@@ -72,9 +72,7 @@ static void display_init(void) {
         &pin_GPIO10,    // CLK
         &pin_GPIO11,    // MOSI
         NULL,           // MISO not connected
-        NULL,           // SS not connected
-        false,          // Not half-duplex
-        false           // operate SPI bus as master
+        false           // Not half-duplex
         );
 
     common_hal_busio_spi_never_reset(spi);
diff --git a/ports/espressif/common-hal/busio/SPI.c b/ports/espressif/common-hal/busio/SPI.c
@@ -76,8 +76,7 @@ static void set_spi_config(busio_spi_obj_t *self,
 }
 
 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, const mcu_pin_obj_t *ss, bool half_duplex, bool slave_mode) {
+    const mcu_pin_obj_t *clock, const mcu_pin_obj_t *mosi, const mcu_pin_obj_t *miso, bool half_duplex) {
 
     const spi_bus_config_t bus_config = {
         .mosi_io_num = mosi != NULL ? mosi->number : -1,
@@ -90,9 +89,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     if (half_duplex) {
         mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_half_duplex);
     }
-    if (slave_mode) {
-        mp_raise_NotImplementedError(MP_ERROR_TEXT("Slave mode SPI is not implemented"));
-    }
 
     for (spi_host_device_t host_id = SPI2_HOST; host_id < SOC_SPI_PERIPH_NUM; host_id++) {
         if (spi_bus_is_free(host_id)) {
diff --git a/ports/mimxrt10xx/common-hal/busio/SPI.c b/ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -90,8 +90,7 @@ void spi_reset(void) {
 }
 
 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, const mcu_pin_obj_t *ss, bool half_duplex, bool slave_mode) {
+    const mcu_pin_obj_t *clock, const mcu_pin_obj_t *mosi, const mcu_pin_obj_t *miso, bool half_duplex) {
 
     const uint32_t sck_count = MP_ARRAY_SIZE(mcu_spi_sck_list);
     const uint32_t miso_count = MP_ARRAY_SIZE(mcu_spi_sdi_list);
@@ -101,9 +100,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     if (half_duplex) {
         mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_half_duplex);
     }
-    if (slave_mode) {
-        mp_raise_NotImplementedError(MP_ERROR_TEXT("Slave mode SPI is not implemented"));
-    }
 
     for (uint i = 0; i < sck_count; i++) {
         if (mcu_spi_sck_list[i].pin != clock) {
diff --git a/ports/nrf/boards/clue_nrf52840_express/board.c b/ports/nrf/boards/clue_nrf52840_express/board.c
@@ -49,7 +49,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_P0_14, &pin_P0_15, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_P0_14, &pin_P0_15, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/nrf/boards/espruino_banglejs2/board.c b/ports/nrf/boards/espruino_banglejs2/board.c
@@ -52,7 +52,7 @@ void board_init(void) {
     fb->base.type = &sharpdisplay_framebuffer_type;
 
     busio_spi_obj_t *spi = &fb->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_P0_26, &pin_P0_27, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_P0_26, &pin_P0_27, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     common_hal_sharpdisplay_framebuffer_construct(fb, spi, &pin_P0_05, 500000, 176, 176, true);
diff --git a/ports/nrf/boards/hiibot_bluefi/board.c b/ports/nrf/boards/hiibot_bluefi/board.c
@@ -49,7 +49,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_P0_07, &pin_P1_08, NULL, NULL, false, false); // SCK, MOSI, MISO, not half-duplex
+    common_hal_busio_spi_construct(spi, &pin_P0_07, &pin_P1_08, NULL, false); // SCK, MOSI, MISO, not half-duplex
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c b/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
@@ -50,7 +50,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_P0_11, &pin_P0_12, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_P0_11, &pin_P0_12, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/nrf/boards/ohs2020_badge/board.c b/ports/nrf/boards/ohs2020_badge/board.c
@@ -49,7 +49,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_P0_11, &pin_P0_12, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_P0_11, &pin_P0_12, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/nrf/common-hal/busio/SPI.c b/ports/nrf/common-hal/busio/SPI.c
@@ -143,14 +143,11 @@ static nrf_spim_frequency_t baudrate_to_spim_frequency(const uint32_t baudrate)
     return 0;
 }
 
-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, const mcu_pin_obj_t *ss, bool half_duplex, bool slave_mode) {
+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) {
 
     if (half_duplex) {
         mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_half_duplex);
     }
-    if (slave_mode) {
-        mp_raise_NotImplementedError(MP_ERROR_TEXT("Slave mode SPI is not implemented"));
-    }
 
     // Find a free instance, with most desirable (highest freq and not shared) allocated first.
     self->spim_peripheral = NULL;
diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
@@ -61,7 +61,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO26, &pin_GPIO27, NULL, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO26, &pin_GPIO27, NULL, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/raspberrypi/boards/hack_club_sprig/board.c b/ports/raspberrypi/boards/hack_club_sprig/board.c
@@ -80,7 +80,7 @@ uint8_t display_init_sequence[] = {
 void board_init(void) {
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
     busio_spi_obj_t *spi = &bus->inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO19, &pin_GPIO16, NULL, false, false);
+    common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO19, &pin_GPIO16, false);
     common_hal_busio_spi_never_reset(spi);
 
     bus->base.type = &fourwire_fourwire_type;
diff --git a/ports/raspberrypi/boards/lilygo_t_display_rp2040/board.c b/ports/raspberrypi/boards/lilygo_t_display_rp2040/board.c
@@ -74,9 +74,7 @@ static void display_init(void) {
         &pin_GPIO2,     // CLK
         &pin_GPIO3,     // MOSI
         NULL,           // MISO not connected
-        NULL,           // SS not connected
-        false,          // Not half-duplex
-        false           // operate SPI bus as master
+        false           // Not half-duplex
         );
 
     common_hal_busio_spi_never_reset(spi);
diff --git a/ports/raspberrypi/boards/pajenicko_picopad/board.c b/ports/raspberrypi/boards/pajenicko_picopad/board.c
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/board.c b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
diff --git a/ports/raspberrypi/boards/pimoroni_picosystem/board.c b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
diff --git a/ports/raspberrypi/boards/ugame22/board.c b/ports/raspberrypi/boards/ugame22/board.c
diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/board.c b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/board.c
diff --git a/ports/raspberrypi/common-hal/busio/SPI.c b/ports/raspberrypi/common-hal/busio/SPI.c
diff --git a/ports/silabs/common-hal/busio/SPI.c b/ports/silabs/common-hal/busio/SPI.c
diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c
diff --git a/shared-bindings/busio/SPI.h b/shared-bindings/busio/SPI.h
diff --git a/shared-module/board/__init__.c b/shared-module/board/__init__.c
diff --git a/supervisor/shared/external_flash/spi_flash.c b/supervisor/shared/external_flash/spi_flash.c
diff --git a/supervisor/shared/status_leds.c b/supervisor/shared/status_leds.c
