Merge pull request #2666 from dhalbert/assert_pin-and-mp_const_none-cleanup

validate various displayio args; new pin validation routines; don't use mp_const_none if NULL will do

4 files changed, 9 insertions, 9 deletions

diff --git a/shared-module/bitbangio/SPI.c b/shared-module/bitbangio/SPI.c
index d02adf34f..e0ff1184f 100644
--- a/shared-module/bitbangio/SPI.c
+++ b/shared-module/bitbangio/SPI.c
@@ -45,7 +45,7 @@ void shared_module_bitbangio_spi_construct(bitbangio_spi_obj_t *self,
     }
     common_hal_digitalio_digitalinout_switch_to_output(&self->clock, self->polarity == 1, DRIVE_MODE_PUSH_PULL);
 
-    if (mosi != mp_const_none) {
+    if (mosi != NULL) {
         result = common_hal_digitalio_digitalinout_construct(&self->mosi, mosi);
         if (result != DIGITALINOUT_OK) {
             common_hal_digitalio_digitalinout_deinit(&self->clock);
@@ -55,12 +55,12 @@ void shared_module_bitbangio_spi_construct(bitbangio_spi_obj_t *self,
         common_hal_digitalio_digitalinout_switch_to_output(&self->mosi, false, DRIVE_MODE_PUSH_PULL);
     }
 
-    if (miso != mp_const_none) {
+    if (miso != NULL) {
         // Starts out as input by default, no need to change.
         result = common_hal_digitalio_digitalinout_construct(&self->miso, miso);
         if (result != DIGITALINOUT_OK) {
             common_hal_digitalio_digitalinout_deinit(&self->clock);
-            if (mosi != mp_const_none) {
+            if (mosi != NULL) {
                 common_hal_digitalio_digitalinout_deinit(&self->mosi);
             }
             mp_raise_ValueError(translate("MISO pin init failed."));
diff --git a/shared-module/board/__init__.c b/shared-module/board/__init__.c
index bbf177384..789318a05 100644
--- a/shared-module/board/__init__.c
+++ b/shared-module/board/__init__.c
@@ -103,12 +103,12 @@ mp_obj_t common_hal_board_create_uart(void) {
 #ifdef DEFAULT_UART_BUS_RTS
     const mcu_pin_obj_t* rts = MP_OBJ_TO_PTR(DEFAULT_UART_BUS_RTS);
 #else
-    const mcu_pin_obj_t* rts = mp_const_none;
+    const mcu_pin_obj_t* rts = NULL;
 #endif
 #ifdef DEFAULT_UART_BUS_CTS
     const mcu_pin_obj_t* cts = MP_OBJ_TO_PTR(DEFAULT_UART_BUS_CTS);
 #else
-    const mcu_pin_obj_t* cts = mp_const_none;
+    const mcu_pin_obj_t* cts = NULL;
 #endif
 #ifdef DEFAULT_UART_IS_RS485
     const mcu_pin_obj_t* rs485_dir = MP_OBJ_TO_PTR(DEFAULT_UART_BUS_RS485DIR);
@@ -118,7 +118,7 @@ mp_obj_t common_hal_board_create_uart(void) {
     const bool rs485_invert = false;
 #endif
 #else
-    const mcu_pin_obj_t* rs485_dir = mp_const_none;
+    const mcu_pin_obj_t* rs485_dir = NULL;
     const bool rs485_invert = false;
 #endif
 
diff --git a/shared-module/wiznet/wiznet5k.c b/shared-module/wiznet/wiznet5k.c
index 3c5c5f0c8..a603a5593 100644
--- a/shared-module/wiznet/wiznet5k.c
+++ b/shared-module/wiznet/wiznet5k.c
@@ -379,12 +379,12 @@ void wiznet5k_socket_deinit(mod_network_socket_obj_t *socket) {
 }
 
 /// Create and return a WIZNET5K object.
-mp_obj_t wiznet5k_create(mp_obj_t spi_in, mp_obj_t cs_in, mp_obj_t rst_in) {
+mp_obj_t wiznet5k_create(busio_spi_obj_t *spi_in, const mcu_pin_obj_t *cs_in, const mcu_pin_obj_t *rst_in) {
 
     // init the wiznet5k object
     wiznet5k_obj.base.type = (mp_obj_type_t*)&mod_network_nic_type_wiznet5k;
     wiznet5k_obj.cris_state = 0;
-    wiznet5k_obj.spi = MP_OBJ_TO_PTR(spi_in);
+    wiznet5k_obj.spi = spi_in;
     wiznet5k_obj.socket_used = 0;
     wiznet5k_obj.dhcp_socket = -1;
 
diff --git a/shared-module/wiznet/wiznet5k.h b/shared-module/wiznet/wiznet5k.h
index 0154831c7..19823ae55 100644
--- a/shared-module/wiznet/wiznet5k.h
+++ b/shared-module/wiznet/wiznet5k.h
@@ -59,7 +59,7 @@ int wiznet5k_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request, m
 void wiznet5k_socket_timer_tick(mod_network_socket_obj_t *socket);
 void wiznet5k_socket_deinit(mod_network_socket_obj_t *socket);
 mp_obj_t wiznet5k_socket_disconnect(mp_obj_t self_in);
-mp_obj_t wiznet5k_create(mp_obj_t spi_in, mp_obj_t cs_in, mp_obj_t rst_in);
+mp_obj_t wiznet5k_create(busio_spi_obj_t *spi_in, const mcu_pin_obj_t *cs_in, const mcu_pin_obj_t *rst_in);
 
 int wiznet5k_start_dhcp(void);
 int wiznet5k_stop_dhcp(void);