4:46 a.m.
From: Pekka Pessi <Pekka.Pessi(a)nokia.com>
---
plugins/palmpre.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/plugins/palmpre.c b/plugins/palmpre.c
index 7d2aeb4..081b151 100644
--- a/plugins/palmpre.c
+++ b/plugins/palmpre.c
@@ -44,6 +44,7 @@
#include <ofono/gprs-context.h>
#include <ofono/sms.h>
+#include <drivers/atmodem/atutil.h>
#include <drivers/atmodem/vendor.h>
struct palmpre_data {
@@ -132,7 +133,7 @@ static int palmpre_enable(struct ofono_modem *modem)
g_at_chat_send(data->chat, "ATZ E0 +CMEE=1", NULL, NULL, NULL, NULL);
/* Power modem up */
- g_at_chat_send(data->chat, "AT+CFUN=1", NULL,
+ g_at_chat_send(data->chat, "AT+CFUN=4", NULL,
cfun_set_on_cb, modem, NULL);
return 0;
@@ -167,6 +168,39 @@ static int palmpre_disable(struct ofono_modem *modem)
return -EINPROGRESS;
}
+static void set_online_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_modem_online_cb_t cb = cbd->cb;
+
+ if (ok)
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+ else
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+}
+
+static void palmpre_set_online(struct ofono_modem *modem, ofono_bool_t online,
+ ofono_modem_online_cb_t cb, void *user_data)
+{
+ struct palmpre_data *data = ofono_modem_get_data(modem);
+ GAtChat *chat = data->chat;
+ struct cb_data *cbd = cb_data_new(cb, user_data);
+ char const *command = online ? "AT+CFUN=1" : "AT+CFUN=4";
+
+ DBG("modem %p %s", modem, online ? "online" : "offline");
+
+ if (!cbd)
+ goto error;
+
+ if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free))
+ return;
+
+error:
+ g_free(cbd);
+
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+}
+
static void palmpre_pre_sim(struct ofono_modem *modem)
{
struct palmpre_data *data = ofono_modem_get_data(modem);
@@ -186,6 +220,14 @@ static void palmpre_pre_sim(struct ofono_modem *modem)
static void palmpre_post_sim(struct ofono_modem *modem)
{
struct palmpre_data *data = ofono_modem_get_data(modem);
+ DBG("%p", modem);
+
+ ofono_phonebook_create(modem, 0, "atmodem", data->chat);
+}
+
+static void palmpre_post_online(struct ofono_modem *modem)
+{
+ struct palmpre_data *data = ofono_modem_get_data(modem);
struct ofono_message_waiting *mw;
struct ofono_gprs *gprs;
struct ofono_gprs_context *gc;
@@ -195,7 +237,6 @@ static void palmpre_post_sim(struct ofono_modem *modem)
ofono_netreg_create(modem, 0, "atmodem", data->chat);
ofono_sms_create(modem, OFONO_VENDOR_QUALCOMM_MSM, "atmodem",
data->chat);
- ofono_phonebook_create(modem, 0, "atmodem", data->chat);
gprs = ofono_gprs_create(modem, 0, "atmodem", data->chat);
gc = ofono_gprs_context_create(modem, 0, "atmodem", data->chat);
@@ -214,8 +255,10 @@ static struct ofono_modem_driver palmpre_driver = {
.remove = palmpre_remove,
.enable = palmpre_enable,
.disable = palmpre_disable,
+ .set_online = palmpre_set_online,
.pre_sim = palmpre_pre_sim,
- .post_sim = palmpre_post_sim
+ .post_sim = palmpre_post_sim,
+ .post_online = palmpre_post_online,
};
static int palmpre_init(void)
--
1.7.0.4