Fix digitalio allocation location

Author: tannewt

shared-module/bitbangio/I2C.c

@@ -167,11 +167,14 @@ void shared_module_bitbangio_i2c_construct(bitbangio_i2c_obj_t *self,
         self->us_delay = 1;
     }
 
+    // Allocate the pins in the same place as self.
+    bool use_port_allocation = !gc_alloc_possible() || !gc_ptr_on_heap(self);
+
     // Convert scl from Pin to DigitalInOutProtocol
-    self->scl = digitalinout_protocol_from_pin(scl, MP_QSTR_scl, false, false, &self->own_scl);
+    self->scl = digitalinout_protocol_from_pin(scl, MP_QSTR_scl, false, use_port_allocation, &self->own_scl);
 
     // Convert sda from Pin to DigitalInOutProtocol
-    self->sda = digitalinout_protocol_from_pin(sda, MP_QSTR_sda, false, false, &self->own_sda);
+    self->sda = digitalinout_protocol_from_pin(sda, MP_QSTR_sda, false, use_port_allocation, &self->own_sda);
 
     digitalinout_protocol_switch_to_output(self->scl, true, DRIVE_MODE_OPEN_DRAIN);
     digitalinout_protocol_switch_to_output(self->sda, true, DRIVE_MODE_OPEN_DRAIN);

shared-module/bitbangio/SPI.c

@@ -23,19 +23,22 @@
 void shared_module_bitbangio_spi_construct(bitbangio_spi_obj_t *self,
     mp_obj_t clock, mp_obj_t mosi, mp_obj_t miso) {
 
+    // Allocate the pins in the same place as self.
+    bool use_port_allocation = !gc_alloc_possible() || !gc_ptr_on_heap(self);
+
     // Convert clock from Pin to DigitalInOutProtocol
-    self->clock = digitalinout_protocol_from_pin(clock, MP_QSTR_clock, false, false, &self->own_clock);
+    self->clock = digitalinout_protocol_from_pin(clock, MP_QSTR_clock, false, use_port_allocation, &self->own_clock);
     digitalinout_protocol_switch_to_output(self->clock, self->polarity == 1, DRIVE_MODE_PUSH_PULL);
 
     // Convert mosi from Pin to DigitalInOutProtocol (optional)
-    self->mosi = digitalinout_protocol_from_pin(mosi, MP_QSTR_mosi, true, false, &self->own_mosi);
+    self->mosi = digitalinout_protocol_from_pin(mosi, MP_QSTR_mosi, true, use_port_allocation, &self->own_mosi);
     self->has_mosi = (self->mosi != mp_const_none);
     if (self->has_mosi) {
         digitalinout_protocol_switch_to_output(self->mosi, false, DRIVE_MODE_PUSH_PULL);
     }
 
     // Convert miso from Pin to DigitalInOutProtocol (optional)
-    self->miso = digitalinout_protocol_from_pin(miso, MP_QSTR_miso, true, false, &self->own_miso);
+    self->miso = digitalinout_protocol_from_pin(miso, MP_QSTR_miso, true, use_port_allocation, &self->own_miso);
     self->has_miso = (self->miso != mp_const_none);
     // MISO starts out as input by default, no need to change
 

shared-module/fourwire/FourWire.c

@@ -29,20 +29,23 @@ void common_hal_fourwire_fourwire_construct(fourwire_fourwire_obj_t *self,
     self->polarity = polarity;
     self->phase = phase;
 
-    self->command = digitalinout_protocol_from_pin(command, MP_QSTR_command, true, false, &self->own_command);
+    // Allocate the pins in the same place as self.
+    bool use_port_allocation = !gc_alloc_possible() || !gc_ptr_on_heap(self);
+
+    self->command = digitalinout_protocol_from_pin(command, MP_QSTR_command, true, use_port_allocation, &self->own_command);
     if (self->command != mp_const_none) {
         digitalinout_protocol_switch_to_output(self->command, true, DRIVE_MODE_PUSH_PULL);
         common_hal_never_reset_pin(command);
     }
 
-    self->reset = digitalinout_protocol_from_pin(reset, MP_QSTR_reset, true, false, &self->own_reset);
+    self->reset = digitalinout_protocol_from_pin(reset, MP_QSTR_reset, true, use_port_allocation, &self->own_reset);
     if (self->reset != mp_const_none) {
         digitalinout_protocol_switch_to_output(self->reset, true, DRIVE_MODE_PUSH_PULL);
         common_hal_never_reset_pin(reset);
         common_hal_fourwire_fourwire_reset(self);
     }
 
-    self->chip_select = digitalinout_protocol_from_pin(chip_select, MP_QSTR_chip_select, true, false, &self->own_chip_select);
+    self->chip_select = digitalinout_protocol_from_pin(chip_select, MP_QSTR_chip_select, true, use_port_allocation, &self->own_chip_select);
     if (self->chip_select != mp_const_none) {
         digitalinout_protocol_switch_to_output(self->chip_select, true, DRIVE_MODE_PUSH_PULL);
         common_hal_never_reset_pin(chip_select);