Do not allow a *io object to be used after deinit().

Fixes micropython#278, micropython#277, micropython#276, micropython#275.

Author: dhalbert

atmel-samd/Makefile

@@ -135,9 +135,13 @@ ifeq ($(DEBUG), 1)
 # -DMICROPY_DEBUG_MODULES may also be added to an -flto build, if you wish.
 CFLAGS += -Os -ggdb -DNDEBUG -DENABLE_MICRO_TRACE_BUFFER -DMICROPY_DEBUG_MODULES
 else
-# -finline-limit can shrink the image size. -finline-limit=80 or so is similar to not having it on.
+# GCC_INLINE_LIMIT specifies -finline-limit, which can shrink the image size.
+# -finline-limit=80 or so is similar to not having it on.
 # There is no simple default value, though.
-CFLAGS += -Os -DNDEBUG -flto -finline-limit=39
+ifeq ($(FLASH_IMPL),internal_flash.c)
+GCC_INLINE_LIMIT = -finline-limit=19
+endif
+CFLAGS += -Os -DNDEBUG -flto $(GCC_INLINE_LIMIT)
 endif
 
 ifneq ($(FROZEN_DIR),)
@@ -272,7 +276,8 @@ SRC_BINDINGS_ENUMS = \
 	digitalio/Direction.c \
 	digitalio/DriveMode.c \
 	digitalio/Pull.c \
-	help.c
+	help.c \
+	util.c
 
 SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
                           $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \

atmel-samd/boards/feather_m0_basic/mpconfigboard.mk

@@ -5,3 +5,4 @@ USB_PID = 0x8015
 FLASH_IMPL = internal_flash.c
 
 CHIP_VARIANT = SAMD21G18A
+

atmel-samd/common-hal/analogio/AnalogIn.c

@@ -77,7 +77,14 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t* self,
     active_channel_count++;
 }
 
+bool common_hal_analogio_analogin_deinited(analogio_analogin_obj_t *self) {
+    return self->pin == mp_const_none;
+}
+
 void common_hal_analogio_analogin_deinit(analogio_analogin_obj_t *self) {
+    if (common_hal_analogio_analogin_deinited(self)) {
+        return;
+    }
     active_channel_count--;
     if (active_channel_count == 0) {
         adc_reset(adc_instance);
@@ -89,6 +96,7 @@ void common_hal_analogio_analogin_deinit(analogio_analogin_obj_t *self) {
         config_adc = NULL;
     }
     reset_pin(self->pin->pin);
+    self->pin = mp_const_none;
 }
 
 void analogin_reset() {

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

@@ -59,10 +59,18 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
     dac_enable(&self->dac_instance);
 }
 
+bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
+    return self->deinited;
+}
+
 void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
+    if (common_hal_analogio_analogout_deinited(self)) {
+        return;
+    }
     dac_disable(&self->dac_instance);
     dac_chan_disable(&self->dac_instance, DAC_CHANNEL_0);
     reset_pin(PIN_PA02);
+    self->deinited = true;
 }
 
 void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,

atmel-samd/common-hal/analogio/AnalogOut.h

@@ -36,6 +36,7 @@
 typedef struct {
     mp_obj_base_t base;
     struct dac_module dac_instance;
+    bool deinited;
 } analogio_analogout_obj_t;
 
 #endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ANALOGIO_ANALOGOUT_H

atmel-samd/common-hal/audiobusio/PDMIn.c

@@ -145,11 +145,20 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t* self,
     self->bit_depth = bit_depth;
 }
 
+bool common_hal_audiobusio_pdmin_deinited(audiobusio_pdmin_obj_t* self) {
+    return self->clock_pin == mp_const_none;
+}
+
 void common_hal_audiobusio_pdmin_deinit(audiobusio_pdmin_obj_t* self) {
+    if (common_hal_audiobusio_pdmin_deinited(self)) {
+        return;
+    }
     i2s_disable(&self->i2s_instance);
     i2s_reset(&self->i2s_instance);
     reset_pin(self->clock_pin->pin);
     reset_pin(self->data_pin->pin);
+    self->clock_pin = mp_const_none;
+    self->data_pin = mp_const_none;
 }
 
 uint8_t common_hal_audiobusio_pdmin_get_bit_depth(audiobusio_pdmin_obj_t* self) {

atmel-samd/common-hal/audioio/AudioOut.c

@@ -381,7 +381,14 @@ void common_hal_audioio_audioout_construct_from_file(audioio_audioout_obj_t* sel
     }
 }
 
+bool common_hal_audioio_audioout_deinited(audioio_audioout_obj_t* self) {
+    return self->pin == mp_const_none;
+}
+
 void common_hal_audioio_audioout_deinit(audioio_audioout_obj_t* self) {
+    if (common_hal_audioio_audioout_deinited(self)) {
+        return;
+    }
     refcount--;
     if (refcount == 0) {
         if (MP_STATE_VM(audioout_sample_timer) != NULL) {
@@ -407,6 +414,8 @@ void common_hal_audioio_audioout_deinit(audioio_audioout_obj_t* self) {
         }
         reset_pin(self->pin->pin);
     }
+
+    self->pin = mp_const_none;
 }
 
 static void set_timer_frequency(uint32_t frequency) {

atmel-samd/common-hal/busio/I2C.c

@@ -95,10 +95,19 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     i2c_master_enable(&self->i2c_master_instance);
 }
 
+bool common_hal_busio_i2c_deinited(busio_i2c_obj_t *self) {
+    return self->sda_pin == NO_PIN;
+}
+
 void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
+    if (common_hal_busio_i2c_deinited(self)) {
+        return;
+    }
     i2c_master_reset(&self->i2c_master_instance);
     reset_pin(self->sda_pin);
     reset_pin(self->scl_pin);
+    self->sda_pin = NO_PIN;
+    self->scl_pin = NO_PIN;
 }
 
 bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {

atmel-samd/common-hal/busio/SPI.c

@@ -159,11 +159,19 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     spi_enable(&self->spi_master_instance);
 }
 
+bool common_hal_busio_spi_deinited(busio_spi_obj_t *self) {
+    return self->clock_pin == NO_PIN;
+}
+
 void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
+    if (common_hal_busio_spi_deinited(self)) {
+        return;
+    }
     spi_disable(&self->spi_master_instance);
     reset_pin(self->clock_pin);
     reset_pin(self->MOSI_pin);
     reset_pin(self->MISO_pin);
+    self->clock_pin = NO_PIN;
 }
 
 bool common_hal_busio_spi_configure(busio_spi_obj_t *self,

atmel-samd/common-hal/busio/UART.c

@@ -243,7 +243,14 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     self->uart_instance.hw->USART.INTENSET.bit.RXC = true;
 }
 
+bool common_hal_busio_uart_deinited(busio_uart_obj_t *self) {
+    return self->rx_pin == NO_PIN && self->tx_pin == NO_PIN;
+}
+
 void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
+    if (common_hal_busio_uart_deinited(self)) {
+        return;
+    }
     self->uart_instance.hw->USART.INTENCLR.bit.RXC = true;
 
     uint8_t instance_index = _sercom_get_sercom_inst_index(self->uart_instance.hw);
@@ -256,6 +263,8 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
     usart_disable(&self->uart_instance);
     reset_pin(self->rx_pin);
     reset_pin(self->tx_pin);
+    self->rx_pin = NO_PIN;
+    self->tx_pin = NO_PIN;
 }
 
 // Read characters.

atmel-samd/common-hal/digitalio/DigitalInOut.c

@@ -51,8 +51,16 @@ digitalinout_result_t common_hal_digitalio_digitalinout_construct(
     return DIGITALINOUT_OK;
 }
 
+bool common_hal_digitalio_digitalinout_deinited(digitalio_digitalinout_obj_t* self) {
+    return self->pin == mp_const_none;
+}
+
 void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t* self) {
+    if (common_hal_digitalio_digitalinout_deinited(self)) {
+        return;
+    }
     reset_pin(self->pin->pin);
+    self->pin = mp_const_none;
 }
 
 void common_hal_digitalio_digitalinout_switch_to_input(

atmel-samd/common-hal/pulseio/PWMOut.c

@@ -238,7 +238,14 @@ void common_hal_pulseio_pwmout_construct(pulseio_pwmout_obj_t* self,
     common_hal_pulseio_pwmout_set_duty_cycle(self, duty);
 }
 
-extern void common_hal_pulseio_pwmout_deinit(pulseio_pwmout_obj_t* self) {
+bool common_hal_pulseio_pwmout_deinited(pulseio_pwmout_obj_t* self) {
+    return self->pin == mp_const_none;
+}
+
+void common_hal_pulseio_pwmout_deinit(pulseio_pwmout_obj_t* self) {
+    if (common_hal_pulseio_pwmout_deinited(self)) {
+        return;
+    }
     const pin_timer_t* t = self->timer;
     uint8_t index = (((uint32_t) t->tcc) - ((uint32_t) TCC0)) / 0x400;
     timer_refcount[index]--;
@@ -260,6 +267,7 @@ extern void common_hal_pulseio_pwmout_deinit(pulseio_pwmout_obj_t* self) {
         }
     }
     reset_pin(self->pin->pin);
+    self->pin = mp_const_none;
 }
 
 extern void common_hal_pulseio_pwmout_set_duty_cycle(pulseio_pwmout_obj_t* self, uint16_t duty) {

atmel-samd/common-hal/pulseio/PulseIn.c

@@ -152,10 +152,18 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t* self,
     extint_chan_enable_callback(self->channel, EXTINT_CALLBACK_TYPE_DETECT);
 }
 
+bool common_hal_pulseio_pulsein_deinited(pulseio_pulsein_obj_t* self) {
+    return self->pin == NO_PIN;
+}
+
 void common_hal_pulseio_pulsein_deinit(pulseio_pulsein_obj_t* self) {
+    if (common_hal_pulseio_pulsein_deinited(self)) {
+        return;
+    }
     extint_chan_disable_callback(self->channel, EXTINT_CALLBACK_TYPE_DETECT);
     active_pulseins[self->channel] = NULL;
     reset_pin(self->pin);
+    self->pin = NO_PIN;
 }
 
 void common_hal_pulseio_pulsein_pause(pulseio_pulsein_obj_t* self) {

atmel-samd/common-hal/pulseio/PulseOut.c

@@ -34,6 +34,7 @@
 #include "mpconfigport.h"
 #include "py/gc.h"
 #include "py/runtime.h"
+#include "samd21_pins.h"
 #include "shared-bindings/pulseio/PulseOut.h"
 
 #undef ENABLE
@@ -128,7 +129,14 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
     turn_off(self->pincfg);
 }
 
+bool common_hal_pulseio_pulseout_deinited(pulseio_pulseout_obj_t* self) {
+    return self->pin == NO_PIN;
+}
+
 void common_hal_pulseio_pulseout_deinit(pulseio_pulseout_obj_t* self) {
+    if (common_hal_pulseio_pulseout_deinited(self)) {
+        return;
+    }
     PortGroup *const port_base = port_get_group_from_gpio_pin(self->pin);
     port_base->DIRCLR.reg = 1 << (self->pin % 32);
 
@@ -140,6 +148,7 @@ void common_hal_pulseio_pulseout_deinit(pulseio_pulseout_obj_t* self) {
         gc_free(MP_STATE_VM(pulseout_tc_instance));
         MP_STATE_VM(pulseout_tc_instance) = NULL;
     }
+    self->pin = NO_PIN;
 }
 
 void common_hal_pulseio_pulseout_send(pulseio_pulseout_obj_t* self, uint16_t* pulses, uint16_t length) {

atmel-samd/common-hal/touchio/TouchIn.c

@@ -33,6 +33,7 @@
 #include "py/mphal.h"
 #include "shared-bindings/touchio/TouchIn.h"
 
+#include "samd21_pins.h"
 #include "tick.h"
 
 #include "adafruit_ptc.h"
@@ -81,9 +82,17 @@ void common_hal_touchio_touchin_construct(touchio_touchin_obj_t* self,
     self->threshold = get_raw_reading(self) + 100;
 }
 
+bool common_hal_touchio_touchin_deinited(touchio_touchin_obj_t* self) {
+    return self->config.pin == NO_PIN;
+}
+
 void common_hal_touchio_touchin_deinit(touchio_touchin_obj_t* self) {
     // TODO(tannewt): Reset the PTC.
-    reset_pin(self->pin->pin);
+    if (common_hal_touchio_touchin_deinited(self)) {
+        return;
+    }
+    reset_pin(self->config.pin);
+    self->config.pin = NO_PIN;
 }
 
 void touchin_reset() {

atmel-samd/common-hal/touchio/TouchIn.h

@@ -36,7 +36,6 @@
 
 typedef struct {
     mp_obj_base_t base;
-    const mcu_pin_obj_t * pin;
     struct adafruit_ptc_config config;
     uint16_t threshold;
 } touchio_touchin_obj_t;

esp8266/Makefile

@@ -121,12 +121,14 @@ SRC_COMMON_HAL = \
 	time/__init__.c \
 	board/__init__.c
 
+
 # These don't have corresponding files in each port but are still located in
 # shared-bindings to make it clear what the contents of the modules are.
 SRC_BINDINGS_ENUMS = \
 	digitalio/Direction.c \
 	digitalio/DriveMode.c \
-	digitalio/Pull.c
+	digitalio/Pull.c \
+	util.c
 
 SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
                           $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
@@ -141,7 +143,7 @@ SRC_SHARED_MODULE = \
 	multiterminal/__init__.c \
 	os/__init__.c \
 	random/__init__.c \
-	storage/__init__.c \
+	storage/__init__.c
 
 SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
                              $(addprefix shared-module/, $(SRC_SHARED_MODULE))

esp8266/common-hal/analogio/AnalogIn.c

@@ -46,8 +46,16 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t* self,
     adc_in_use = true;
 }
 
+bool common_hal_analogio_analogin_deinited(analogio_analogin_obj_t* self) {
+    return self->deinited;
+}
+
 void common_hal_analogio_analogin_deinit(analogio_analogin_obj_t* self) {
+    if (common_hal_analogio_analogin_deinited(self)) {
+        return;
+    }
     adc_in_use = false;
+    self->deinited = true;
 }
 
 uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {

esp8266/common-hal/analogio/AnalogIn.h

@@ -33,7 +33,7 @@
 
 typedef struct {
     mp_obj_base_t base;
-    const mcu_pin_obj_t * pin;
+    bool deinited;
 } analogio_analogin_obj_t;
 
 #endif // MICROPY_INCLUDED_ESP8266_COMMON_HAL_ANALOGIO_ANALOGIN_H

esp8266/common-hal/analogio/AnalogOut.c

@@ -38,6 +38,10 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
         "No hardware support for analog out."));
 }
 
+bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
+    return true;
+}
+
 void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
 }