rename routines to be clearer; fix wiznet arg types

2 files changed, 11 insertions, 11 deletions

diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c
index ef8008827..67aecaf66 100644
--- a/shared-bindings/microcontroller/Pin.c
+++ b/shared-bindings/microcontroller/Pin.c
@@ -84,7 +84,7 @@ const mp_obj_type_t mcu_pin_type = {
     .print = mcu_pin_print
 };
 
-mcu_pin_obj_t *validate_is_pin(mp_obj_t obj) {
+mcu_pin_obj_t *validate_obj_is_pin(mp_obj_t obj) {
     if (!MP_OBJ_IS_TYPE(obj, &mcu_pin_type)) {
         mp_raise_TypeError_varg(translate("Expected a %q"), mcu_pin_type.name);
     }
@@ -92,25 +92,25 @@ mcu_pin_obj_t *validate_is_pin(mp_obj_t obj) {
 }
 
 // Validate that the obj is a pin or None. Return an mcu_pin_obj_t* or NULL, correspondingly.
-mcu_pin_obj_t *validate_is_pin_or_none(mp_obj_t obj) {
+mcu_pin_obj_t *validate_obj_is_pin_or_none(mp_obj_t obj) {
     if (obj == mp_const_none) {
         return NULL;
     }
-    return validate_is_pin(obj);
+    return validate_obj_is_pin(obj);
 }
 
-mcu_pin_obj_t *validate_is_free_pin(mp_obj_t obj) {
-    mcu_pin_obj_t *pin = validate_is_pin(obj);
+mcu_pin_obj_t *validate_obj_is_free_pin(mp_obj_t obj) {
+    mcu_pin_obj_t *pin = validate_obj_is_pin(obj);
     assert_pin_free(pin);
     return pin;
 }
 
 // Validate that the obj is a free pin or None. Return an mcu_pin_obj_t* or NULL, correspondingly.
-mcu_pin_obj_t *validate_is_free_pin_or_none(mp_obj_t obj) {
+mcu_pin_obj_t *validate_obj_is_free_pin_or_none(mp_obj_t obj) {
     if (obj == mp_const_none) {
         return NULL;
     }
-    mcu_pin_obj_t *pin = validate_is_pin(obj);
+    mcu_pin_obj_t *pin = validate_obj_is_pin(obj);
     assert_pin_free(pin);
     return pin;
 }
diff --git a/shared-bindings/microcontroller/Pin.h b/shared-bindings/microcontroller/Pin.h
index 2b4083827..4f29322a0 100644
--- a/shared-bindings/microcontroller/Pin.h
+++ b/shared-bindings/microcontroller/Pin.h
@@ -33,10 +33,10 @@
 // Type object used in Python. Should be shared between ports.
 extern const mp_obj_type_t mcu_pin_type;
 
-mcu_pin_obj_t *validate_is_pin(mp_obj_t obj);
-mcu_pin_obj_t *validate_is_pin_or_none(mp_obj_t obj);
-mcu_pin_obj_t *validate_is_free_pin(mp_obj_t obj);
-mcu_pin_obj_t *validate_is_free_pin_or_none(mp_obj_t obj);
+mcu_pin_obj_t *validate_obj_is_pin(mp_obj_t obj);
+mcu_pin_obj_t *validate_obj_is_pin_or_none(mp_obj_t obj);
+mcu_pin_obj_t *validate_obj_is_free_pin(mp_obj_t obj);
+mcu_pin_obj_t *validate_obj_is_free_pin_or_none(mp_obj_t obj);
 
 void assert_pin_free(const mcu_pin_obj_t* pin);