cc3200: Remove double administration of callback objects.

2 files changed, 12 insertions, 19 deletions

diff --git a/cc3200/misc/mpcallback.c b/cc3200/misc/mpcallback.c
index edf3673b5..fa1d55f4c 100644
--- a/cc3200/misc/mpcallback.c
+++ b/cc3200/misc/mpcallback.c
@@ -38,11 +38,6 @@
 
 
 /******************************************************************************
- DECLARE PRIVATE FUNCTIONS
- ******************************************************************************/
-STATIC mpcallback_obj_t *mpcallback_find (mp_obj_t parent);
-
-/******************************************************************************
  DEFINE PUBLIC DATA
  ******************************************************************************/
 const mp_arg_t mpcallback_init_args[] = {
@@ -73,6 +68,17 @@ mp_obj_t mpcallback_new (mp_obj_t parent, mp_obj_t handler, const mp_cb_methods_
     return self;
 }
 
+mpcallback_obj_t *mpcallback_find (mp_obj_t parent) {
+    for (mp_uint_t i = 0; i < MP_STATE_PORT(mpcallback_obj_list).len; i++) {
+        // search for the object and then remove it
+        mpcallback_obj_t *callback_obj = ((mpcallback_obj_t *)(MP_STATE_PORT(mpcallback_obj_list).items[i]));
+        if (callback_obj->parent == parent) {
+            return callback_obj;
+        }
+    }
+    return NULL;
+}
+
 void mpcallback_remove (const mp_obj_t parent) {
     mpcallback_obj_t *callback_obj;
     if ((callback_obj = mpcallback_find(parent))) {
@@ -132,20 +138,6 @@ void mpcallback_handler (mp_obj_t self_in) {
     }
 }
 
-/******************************************************************************
- DEFINE PRIVATE FUNCTIONS
- ******************************************************************************/
-STATIC mpcallback_obj_t *mpcallback_find (mp_obj_t parent) {
-    for (mp_uint_t i = 0; i < MP_STATE_PORT(mpcallback_obj_list).len; i++) {
-        // search for the object and then remove it
-        mpcallback_obj_t *callback_obj = ((mpcallback_obj_t *)(MP_STATE_PORT(mpcallback_obj_list).items[i]));
-        if (callback_obj->parent == parent) {
-            return callback_obj;
-        }
-    }
-    return NULL;
-}
-
 /******************************************************************************/
 // Micro Python bindings
 
diff --git a/cc3200/misc/mpcallback.h b/cc3200/misc/mpcallback.h
index e0a9fc6a9..cadc73bad 100644
--- a/cc3200/misc/mpcallback.h
+++ b/cc3200/misc/mpcallback.h
@@ -62,6 +62,7 @@ extern const mp_obj_type_t pyb_callback_type;
  ******************************************************************************/
 void mpcallback_init0 (void);
 mp_obj_t mpcallback_new (mp_obj_t parent, mp_obj_t handler, const mp_cb_methods_t *methods);
+mpcallback_obj_t *mpcallback_find (mp_obj_t parent);
 void mpcallback_remove (const mp_obj_t parent);
 void mpcallback_handler (mp_obj_t self_in);
 uint mpcallback_translate_priority (uint priority);