Update at modem call-barring driver to the new API

diff --git a/drivers/atmodem/at.h b/drivers/atmodem/at.h
index caa25b2..356264c 100644 (file)
--- a/drivers/atmodem/at.h
+++ b/drivers/atmodem/at.h
@@ -83,8 +83,8 @@ extern void at_voicecall_exit(struct ofono_modem *modem);
 extern void at_call_meter_init(struct ofono_modem *modem);
 extern void at_call_meter_exit(struct ofono_modem *modem);
 
-extern void at_call_barring_init(struct ofono_modem *modem);
-extern void at_call_barring_exit(struct ofono_modem *modem);
+extern void at_call_barring_init();
+extern void at_call_barring_exit();
 
 extern void at_sim_init(struct ofono_modem *modem);
 extern void at_sim_exit(struct ofono_modem *modem);

diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c
index 727d642..2807e3e 100644 (file)
--- a/drivers/atmodem/atmodem.c
+++ b/drivers/atmodem/atmodem.c
@@ -106,7 +106,6 @@ static void interface_exit(struct at_data *at)
        at_network_registration_exit(at->modem);
        at_voicecall_exit(at->modem);
        at_call_meter_exit(at->modem);
-       at_call_barring_exit(at->modem);
        at_ussd_exit(at->modem);
        at_sim_exit(at->modem);
 }
@@ -371,7 +370,7 @@ static void create_cb(GIOChannel *io, gboolean success, gpointer user)
        at_network_registration_init(at->modem);
        at_voicecall_init(at->modem);
        at_call_meter_init(at->modem);
-       at_call_barring_init(at->modem);
+       ofono_call_barring_create(at->modem, "generic_at", at->parser);
        at_sms_init(at->modem);
        at_phonebook_init(at->modem);
 
@@ -530,6 +529,8 @@ static int atmodem_init(void)
 {
        DBusConnection *conn = ofono_dbus_get_connection();
 
+       at_call_barring_init();
+
        manager_init(conn);
 
        return 0;
@@ -540,6 +541,8 @@ static void atmodem_exit(void)
        DBusConnection *conn = ofono_dbus_get_connection();
 
        manager_exit(conn);
+
+       at_call_barring_exit();
 }
 
 OFONO_PLUGIN_DEFINE(atmodem, "AT modem driver", VERSION,

diff --git a/drivers/atmodem/call-barring.c b/drivers/atmodem/call-barring.c
index 3af2f8a..fe3f48a 100644 (file)
--- a/drivers/atmodem/call-barring.c
+++ b/drivers/atmodem/call-barring.c
@@ -32,7 +32,7 @@
 
 #include <ofono/log.h>
 #include <ofono/modem.h>
-#include "driver.h"
+#include <ofono/call-barring.h>
 
 #include "gatchat.h"
 #include "gatresult.h"
@@ -45,7 +45,7 @@ static const char *none_prefix[] = { NULL };
 static void clck_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
        struct cb_data *cbd = user_data;
-       ofono_call_barring_cb_t cb = cbd->cb;
+       ofono_call_barring_query_cb_t callback = cbd->cb;
        struct ofono_error error;
        GAtResultIter iter;
        int status_mask, status, class, line;
@@ -75,15 +75,16 @@ static void clck_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
                        status_mask &= ~class;
        }
 
-       cb(&error, status_mask, cbd->data);
+       callback(&error, status_mask, cbd->data);
 }
 
-static void at_call_barring_query(struct ofono_modem *modem, const char *lock,
-                                       int cls, ofono_call_barring_cb_t cb,
+static void at_call_barring_query(struct ofono_call_barring *cb,
+                                       const char *lock, int cls,
+                                       ofono_call_barring_query_cb_t callback,
                                        void *data)
 {
-       struct at_data *at = ofono_modem_get_userdata(modem);
-       struct cb_data *cbd = cb_data_new(modem, cb, data);
+       GAtChat *chat = ofono_call_barring_get_data(cb);
+       struct cb_data *cbd = cb_data_new(NULL, callback, data);
        char buf[64];
        int len;
 
@@ -92,7 +93,7 @@ static void at_call_barring_query(struct ofono_modem *modem, const char *lock,
 
        len = sprintf(buf, "AT+CLCK=\"%s\",2", lock);
 
-       if (g_at_chat_send(at->parser, buf, clck_prefix,
+       if (g_at_chat_send(chat, buf, clck_prefix,
                                clck_query_cb, cbd, g_free) > 0)
                return;
 
@@ -102,27 +103,28 @@ error:
 
        {
                DECLARE_FAILURE(error);
-               cb(&error, 0, data);
+               callback(&error, 0, data);
        }
 }
 
 static void clck_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
        struct cb_data *cbd = user_data;
-       ofono_generic_cb_t cb = cbd->cb;
+       ofono_call_barring_set_cb_t callback = cbd->cb;
        struct ofono_error error;
 
        dump_response("clck_set_cb", ok, result);
        decode_at_error(&error, g_at_result_final_response(result));
-       cb(&error, cbd->data);
+       callback(&error, cbd->data);
 }
 
-static void at_call_barring_set(struct ofono_modem *modem, const char *lock,
+static void at_call_barring_set(struct ofono_call_barring *cb, const char *lock,
                                int enable, const char *passwd, int cls,
-                               ofono_generic_cb_t cb, void *data)
+                               ofono_call_barring_set_cb_t callback,
+                               void *data)
 {
-       struct at_data *at = ofono_modem_get_userdata(modem);
-       struct cb_data *cbd = cb_data_new(modem, cb, data);
+       GAtChat *chat = ofono_call_barring_get_data(cb);
+       struct cb_data *cbd = cb_data_new(NULL, callback, data);
        char buf[64];
        int len;
 
@@ -139,7 +141,7 @@ static void at_call_barring_set(struct ofono_modem *modem, const char *lock,
                                        ",%i", cls);
        }
 
-       if (g_at_chat_send(at->parser, buf, none_prefix,
+       if (g_at_chat_send(chat, buf, none_prefix,
                                clck_set_cb, cbd, g_free) > 0)
                return;
 
@@ -149,28 +151,30 @@ error:
 
        {
                DECLARE_FAILURE(error);
-               cb(&error, data);
+               callback(&error, data);
        }
 }
 
 static void cpwd_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
        struct cb_data *cbd = user_data;
-       ofono_generic_cb_t cb = cbd->cb;
+       ofono_call_barring_set_cb_t callback = cbd->cb;
        struct ofono_error error;
 
        dump_response("cpwd_set_cb", ok, result);
        decode_at_error(&error, g_at_result_final_response(result));
-       cb(&error, cbd->data);
+       callback(&error, cbd->data);
 }
 
-static void at_call_barring_set_passwd(struct ofono_modem *modem,
-                               const char *lock,
-                               const char *old_passwd, const char *new_passwd,
-                               ofono_generic_cb_t cb, void *data)
+static void at_call_barring_set_passwd(struct ofono_call_barring *cb,
+                                       const char *lock,
+                                       const char *old_passwd,
+                                       const char *new_passwd,
+                                       ofono_call_barring_set_cb_t callback,
+                                       void *data)
 {
-       struct at_data *at = ofono_modem_get_userdata(modem);
-       struct cb_data *cbd = cb_data_new(modem, cb, data);
+       GAtChat *chat = ofono_call_barring_get_data(cb);
+       struct cb_data *cbd = cb_data_new(NULL, callback, data);
        char buf[64];
 
        if (!cbd || strlen(lock) != 2)
@@ -179,7 +183,7 @@ static void at_call_barring_set_passwd(struct ofono_modem *modem,
        snprintf(buf, sizeof(buf), "AT+CPWD=\"%s\",\"%s\",\"%s\"",
                        lock, old_passwd, new_passwd);
 
-       if (g_at_chat_send(at->parser, buf, none_prefix,
+       if (g_at_chat_send(chat, buf, none_prefix,
                                cpwd_set_cb, cbd, g_free) > 0)
                return;
 
@@ -189,22 +193,46 @@ error:
 
        {
                DECLARE_FAILURE(error);
-               cb(&error, data);
+               callback(&error, data);
        }
 }
 
-static struct ofono_call_barring_ops ops = {
+static gboolean at_call_barring_register(gpointer user)
+{
+       struct ofono_call_barring *cb = user;
+
+       ofono_call_barring_register(cb);
+
+       return FALSE;
+}
+
+static int at_call_barring_probe(struct ofono_call_barring *cb)
+{
+       g_idle_add(at_call_barring_register, cb);
+
+       return 0;
+}
+
+static int at_call_barring_remove(struct ofono_call_barring *cb)
+{
+       return 0;
+}
+
+static struct ofono_call_barring_driver driver = {
+       .name           = "generic_at",
+       .probe          = at_call_barring_probe,
+       .remove         = at_call_barring_remove,
        .set            = at_call_barring_set,
        .query          = at_call_barring_query,
        .set_passwd     = at_call_barring_set_passwd,
 };
 
-void at_call_barring_init(struct ofono_modem *modem)
+void at_call_barring_init()
 {
-       ofono_call_barring_register(modem, &ops);
+       ofono_call_barring_driver_register(&driver);
 }
 
-void at_call_barring_exit(struct ofono_modem *modem)
+void at_call_barring_exit()
 {
-       ofono_call_barring_unregister(modem);
+       ofono_call_barring_driver_unregister(&driver);
 }