[PATCH v2 11/11] gprs: Add API to set a 'detach'notification callback

[Philippe Nunes]

---
 src/gprs.c  |   28 ++++++++++++++++++++++++++++
 src/ofono.h |    5 +++++
 2 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/src/gprs.c b/src/gprs.c
index f6090ba..a8b8e7d 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -155,6 +155,7 @@ struct gprs_private_context {
        union {
                __ofono_gprs_private_context_activate_cb_t act;
                __ofono_gprs_private_context_deactivate_cb_t deact;
+               __ofono_gprs_private_context_detached_cb_t detach;
        };
        void *cb_data;
 };
@@ -1502,6 +1503,10 @@ static void gprs_attached_update(struct ofono_gprs *gprs)
 
                if (stk_context) {
                        gprs_private_context_release(stk_context);
+
+                       if (stk_context->detach)
+                               stk_context->detach(stk_context->cb_data);
+
                        g_free(stk_context);
                        stk_context = NULL;
                }
@@ -2210,6 +2215,10 @@ static void gprs_context_unregister(struct ofono_atom 
*atom)
 
        if (stk_context && stk_context->context_driver == gc) {
                gprs_private_context_release(stk_context);
+
+               if (stk_context->detach)
+                       stk_context->detach(stk_context->cb_data);
+
                g_free(stk_context);
                stk_context = NULL;
        }
@@ -2287,6 +2296,10 @@ void ofono_gprs_context_deactivated(struct 
ofono_gprs_context *gc,
 
        if (stk_context && stk_context->context_driver == gc) {
                gprs_private_context_release(stk_context);
+
+               if (stk_context->detach)
+                       stk_context->detach(stk_context->cb_data);
+
                g_free(stk_context);
                stk_context = NULL;
        }
@@ -3240,3 +3253,18 @@ int __ofono_gprs_private_context_deactivate(struct 
ofono_gprs *gprs,
                                deactivate_request_callback, stk_context);
        return 0;
 }
+
+int __ofono_gprs_private_context_set_detached_notify(struct ofono_gprs *gprs,
+                               __ofono_gprs_private_context_detached_cb_t cb,
+                               void *data)
+{
+       if (stk_context == NULL)
+               return -ENOENT;
+
+       if (stk_context->context_driver->gprs != gprs)
+               return -EINVAL;
+
+       stk_context->detach = cb;
+       stk_context->cb_data = data;
+       return 0;
+}
diff --git a/src/ofono.h b/src/ofono.h
index 274912d..9ea16c5 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -248,6 +248,7 @@ typedef void 
(*__ofono_gprs_private_context_activate_cb_t)(int error,
                                                const char *interface,
                                                const char *ip,
                                                void *data);
+typedef void (*__ofono_gprs_private_context_detached_cb_t)(void *data);
 
 int __ofono_gprs_private_context_deactivate(struct ofono_gprs *gprs,
                                __ofono_gprs_private_context_deactivate_cb_t cb,
@@ -258,6 +259,10 @@ int __ofono_gprs_private_context_activate(struct 
ofono_gprs *gprs,
                                __ofono_gprs_private_context_activate_cb_t cb,
                                void *data);
 
+int __ofono_gprs_private_context_set_detached_notify(struct ofono_gprs *gprs,
+                               __ofono_gprs_private_context_detached_cb_t cb,
+                               void *data);
+
 #include <ofono/radio-settings.h>
 #include <ofono/audio-settings.h>
 #include <ofono/ctm.h>
-- 
1.7.1

_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono