The AT commands listed with AT+CLAC matches with MBM supported devices.
However, the mbm plugin doesn't work for this devices and the specification is
also quite different.
Fixes MeeGo bug #14784
---
plugins/linktop.c | 268 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 177 insertions(+), 91 deletions(-)
diff --git a/plugins/linktop.c b/plugins/linktop.c
index 953f634..2f603a9 100644
--- a/plugins/linktop.c
+++ b/plugins/linktop.c
@@ -26,6 +26,7 @@
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
+#include <string.h>
#include <glib.h>
#include <gatchat.h>
@@ -42,6 +43,7 @@
#include <ofono/message-waiting.h>
#include <ofono/netreg.h>
#include <ofono/sim.h>
+#include <ofono/stk.h>
#include <ofono/cbs.h>
#include <ofono/sms.h>
#include <ofono/ussd.h>
@@ -53,16 +55,21 @@
#include <ofono/radio-settings.h>
#include <ofono/log.h>
-#include <drivers/atmodem/vendor.h>
#include <drivers/atmodem/atutil.h>
+#include <drivers/atmodem/vendor.h>
+static const char *cpin_prefix[] = { "+CPIN:", NULL };
static const char *none_prefix[] = { NULL };
struct linktop_data {
- GAtChat *modem;
- GAtChat *control;
+ GAtChat *modem_port;
+ GAtChat *data_port;
+ guint cpin_poll_source;
+ guint cpin_poll_count;
+ gboolean have_sim;
struct ofono_gprs *gprs;
struct ofono_gprs_context *gc;
+ guint reopen_source;
};
static int linktop_probe(struct ofono_modem *modem)
@@ -86,35 +93,86 @@ static void linktop_remove(struct ofono_modem *modem)
DBG("%p", modem);
+ if (data->reopen_source > 0) {
+ g_source_remove(data->reopen_source);
+ data->reopen_source = 0;
+ }
+
ofono_modem_set_data(modem, NULL);
- g_at_chat_unref(data->modem);
- g_at_chat_unref(data->control);
+ g_at_chat_unref(data->data_port);
+ g_at_chat_unref(data->modem_port);
+
+ if (data->cpin_poll_source > 0)
+ g_source_remove(data->cpin_poll_source);
g_free(data);
}
static void linktop_debug(const char *str, void *user_data)
{
- const char *prefix = user_data;
+ const char *prefix = user_data;
+
+ ofono_info("%s%s", prefix, str);
+}
+
+static gboolean init_simpin_check(gpointer user_data);
+
+static void simpin_check(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct linktop_data *data = ofono_modem_get_data(modem);
+
+ DBG("");
+
+ /* Modem returns an error if SIM is not ready. */
+ if (!ok && data->cpin_poll_count++ < 5) {
+ data->cpin_poll_source =
+ g_timeout_add_seconds(1, init_simpin_check, modem);
+ return;
+ }
+
+ data->cpin_poll_count = 0;
+
+ /* There is probably no SIM if SIM is not ready after 5 seconds. */
+ data->have_sim = ok;
+
+ ofono_modem_set_powered(modem, TRUE);
+}
+
+static gboolean init_simpin_check(gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct linktop_data *data = ofono_modem_get_data(modem);
+
+ data->cpin_poll_source = 0;
+
+ g_at_chat_send(data->modem_port, "AT+CPIN?", cpin_prefix,
+ simpin_check, modem, NULL);
+
+ return FALSE;
+}
+
+static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+
+ DBG("");
- ofono_info("%s%s", prefix, str);
+ if (!ok) {
+ ofono_modem_set_powered(modem, FALSE);
+ return;
+ }
+
+ init_simpin_check(modem);
}
-static GAtChat *open_device(struct ofono_modem *modem,
- const char *key, char *debug)
+static GAtChat *create_port(const char *device)
{
- const char *device;
GAtSyntax *syntax;
GIOChannel *channel;
GAtChat *chat;
- device = ofono_modem_get_string(modem, key);
- if (device == NULL)
- return NULL;
-
- DBG("%s %s", key, device);
-
channel = g_at_tty_open(device, NULL);
if (channel == NULL)
return NULL;
@@ -127,81 +185,106 @@ static GAtChat *open_device(struct ofono_modem *modem,
if (chat == NULL)
return NULL;
- if (getenv("OFONO_AT_DEBUG"))
- g_at_chat_set_debug(chat, linktop_debug, debug);
-
return chat;
}
-static void linktop_disconnect(gpointer user_data)
+static void linktop_disconnect(gpointer user_data);
+
+static gboolean reopen_callback(gpointer user_data)
{
struct ofono_modem *modem = user_data;
struct linktop_data *data = ofono_modem_get_data(modem);
+ const char *data_dev;
- DBG("");
+ data->reopen_source = 0;
- if (data->gc)
- ofono_gprs_context_remove(data->gc);
+ data_dev = ofono_modem_get_string(modem, "DataDevice");
- g_at_chat_unref(data->modem);
- data->modem = NULL;
+ data->data_port = create_port(data_dev);
+ if (data->data_port == NULL)
+ return FALSE;
- data->modem = open_device(modem, "Modem", "Modem: ");
- if (data->modem == NULL)
- return;
+ if (getenv("OFONO_AT_DEBUG"))
+ g_at_chat_set_debug(data->data_port, linktop_debug, "Data: ");
- g_at_chat_set_disconnect_function(data->modem,
+ g_at_chat_set_disconnect_function(data->data_port,
linktop_disconnect, modem);
ofono_info("Reopened GPRS context channel");
- data->gc = ofono_gprs_context_create(modem, 0, "atmodem", data->modem);
-
- if (data->gprs && data->gc)
+ data->gc = ofono_gprs_context_create(modem, 0,
+ "atmodem", data->data_port);
+ if (data->gprs && data->gc) {
ofono_gprs_add_context(data->gprs, data->gc);
+ }
+
+ return FALSE;
}
-static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
+static void linktop_disconnect(gpointer user_data)
{
struct ofono_modem *modem = user_data;
+ struct linktop_data *data = ofono_modem_get_data(modem);
DBG("");
- ofono_modem_set_powered(modem, ok);
+ if (data->gc)
+ ofono_gprs_context_remove(data->gc);
+
+ g_at_chat_unref(data->data_port);
+ data->data_port = NULL;
+
+ /* Waiting for the +CGEV: ME DEACT might also work */
+ if (data->reopen_source > 0)
+ g_source_remove(data->reopen_source);
+
+ data->reopen_source = g_timeout_add_seconds(1, reopen_callback, modem);
}
static int linktop_enable(struct ofono_modem *modem)
{
struct linktop_data *data = ofono_modem_get_data(modem);
+ const char *modem_dev;
+ const char *data_dev;
DBG("%p", modem);
- data->modem = open_device(modem, "Modem", "Modem: ");
- if (data->modem == NULL)
- return -EINVAL;
+ modem_dev = ofono_modem_get_string(modem, "ModemDevice");
+ data_dev = ofono_modem_get_string(modem, "DataDevice");
- g_at_chat_set_disconnect_function(data->modem,
- linktop_disconnect, modem);
+ DBG("%s, %s", modem_dev, data_dev);
+
+ if (modem_dev == NULL || data_dev == NULL)
+ return -EINVAL;
- data->control = open_device(modem, "Control", "Control: ");
- if (data->control == NULL) {
- g_at_chat_unref(data->modem);
- data->modem = NULL;
+ data->modem_port = create_port(modem_dev);
+ if (data->modem_port == NULL)
return -EIO;
- }
- g_at_chat_send(data->control, "ATE0 +CMEE=1", none_prefix,
- NULL, NULL, NULL);
+ if (getenv("OFONO_AT_DEBUG"))
+ g_at_chat_set_debug(data->modem_port, linktop_debug, "Modem: ");
- g_at_chat_send(data->modem, "AT", none_prefix,
- NULL, NULL, NULL);
+ data->data_port = create_port(data_dev);
+ if (data->data_port == NULL) {
+ g_at_chat_unref(data->modem_port);
+ data->modem_port = NULL;
- g_at_chat_send(data->modem, "AT &F", none_prefix,
- NULL, NULL, NULL);
+ return -EIO;
+ }
- g_at_chat_send(data->control, "AT+CFUN=4", none_prefix,
- cfun_enable, modem, NULL);
+ if (getenv("OFONO_AT_DEBUG"))
+ g_at_chat_set_debug(data->data_port, linktop_debug, "Data: ");
+
+ g_at_chat_set_disconnect_function(data->data_port,
+ linktop_disconnect, modem);
+ g_at_chat_send(data->modem_port, "AT&F E0 V1 X4 &C1 +CMEE=1",
NULL,
+ NULL, NULL, NULL);
+ g_at_chat_send(data->data_port, "AT&F E0 V1 X4 &C1 +CMEE=1", NULL,
+ NULL, NULL, NULL);
+ g_at_chat_send(data->modem_port, "AT+CFUN=4", none_prefix,
+ cfun_enable, modem, NULL);
+
return -EINPROGRESS;
}
@@ -212,8 +295,11 @@ static void cfun_disable(gboolean ok, GAtResult *result, gpointer
user_data)
DBG("");
- g_at_chat_unref(data->control);
- data->control = NULL;
+ g_at_chat_unref(data->modem_port);
+ data->modem_port = NULL;
+
+ g_at_chat_unref(data->data_port);
+ data->data_port = NULL;
if (ok)
ofono_modem_set_powered(modem, FALSE);
@@ -225,19 +311,17 @@ static int linktop_disable(struct ofono_modem *modem)
DBG("%p", modem);
- if (data->modem) {
- g_at_chat_cancel_all(data->modem);
- g_at_chat_unregister_all(data->modem);
- g_at_chat_unref(data->modem);
- data->modem = NULL;
+ if (data->reopen_source > 0) {
+ g_source_remove(data->reopen_source);
+ data->reopen_source = 0;
}
- if (data->control == NULL)
+ if (data->modem_port == NULL)
return 0;
- g_at_chat_cancel_all(data->control);
- g_at_chat_unregister_all(data->control);
- g_at_chat_send(data->control, "AT+CFUN=4", none_prefix,
+ g_at_chat_cancel_all(data->modem_port);
+ g_at_chat_unregister_all(data->modem_port);
+ g_at_chat_send(data->modem_port, "AT+CFUN=4", NULL,
cfun_disable, modem, NULL);
return -EINPROGRESS;
@@ -247,17 +331,18 @@ 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;
- struct ofono_error error;
- decode_at_error(&error, g_at_result_final_response(result));
- cb(&error, cbd->data);
+ if (ok)
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+ else
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
}
static void linktop_set_online(struct ofono_modem *modem, ofono_bool_t online,
ofono_modem_online_cb_t cb, void *user_data)
{
struct linktop_data *data = ofono_modem_get_data(modem);
- GAtChat *chat = data->control;
+ GAtChat *chat = data->modem_port;
struct cb_data *cbd = cb_data_new(cb, user_data);
char const *command = online ? "AT+CFUN=1" : "AT+CFUN=4";
@@ -278,11 +363,11 @@ static void linktop_pre_sim(struct ofono_modem *modem)
DBG("%p", modem);
- ofono_devinfo_create(modem, 0, "atmodem", data->control);
- sim = ofono_sim_create(modem, 0, "atmodem", data->control);
- ofono_voicecall_create(modem, 0, "stemodem", data->control);
+ ofono_devinfo_create(modem, 0, "atmodem", data->modem_port);
+ sim = ofono_sim_create(modem, 0, "atmodem", data->modem_port);
+ ofono_voicecall_create(modem, 0, "stemodem", data->modem_port);
- if (sim)
+ if (data->have_sim && sim)
ofono_sim_inserted_notify(sim, TRUE);
}
@@ -292,35 +377,36 @@ static void linktop_post_sim(struct ofono_modem *modem)
DBG("%p", modem);
- ofono_radio_settings_create(modem, 0, "stemodem", data->control);
- ofono_phonebook_create(modem, 0, "atmodem", data->control);
- ofono_sms_create(modem, 0, "atmodem", data->control);
+ ofono_stk_create(modem, 0, "mbmmodem", data->modem_port);
+ ofono_radio_settings_create(modem, 0, "stemodem", data->modem_port);
+ ofono_phonebook_create(modem, 0, "atmodem", data->modem_port);
+ ofono_sms_create(modem, 0, "atmodem", data->modem_port);
}
static void linktop_post_online(struct ofono_modem *modem)
{
struct linktop_data *data = ofono_modem_get_data(modem);
struct ofono_message_waiting *mw;
- struct ofono_gprs *gprs;
- struct ofono_gprs_context *gc;
DBG("%p", modem);
- ofono_ussd_create(modem, 0, "atmodem", data->control);
- ofono_call_forwarding_create(modem, 0, "atmodem", data->control);
- ofono_call_settings_create(modem, 0, "atmodem", data->control);
- ofono_netreg_create(modem, OFONO_VENDOR_MBM, "atmodem", data->control);
- ofono_call_meter_create(modem, 0, "atmodem", data->control);
- ofono_call_barring_create(modem, 0, "atmodem", data->control);
- ofono_call_volume_create(modem, 0, "atmodem", data->control);
- ofono_cbs_create(modem, 0, "atmodem", data->control);
-
- gprs = ofono_gprs_create(modem, OFONO_VENDOR_MBM,
- "atmodem", data->control);
- gc = ofono_gprs_context_create(modem, 0, "atmodem", data->modem);
-
- if (gprs && gc)
- ofono_gprs_add_context(gprs, gc);
+ ofono_netreg_create(modem, 0, "atmodem", data->modem_port);
+ ofono_cbs_create(modem, 0, "atmodem", data->modem_port);
+ ofono_ussd_create(modem, 0, "atmodem", data->modem_port);
+ ofono_call_forwarding_create(modem, 0, "atmodem", data->modem_port);
+ ofono_call_settings_create(modem, 0, "atmodem", data->modem_port);
+ ofono_call_meter_create(modem, 0, "atmodem", data->modem_port);
+ ofono_call_barring_create(modem, 0, "atmodem", data->modem_port);
+ ofono_call_volume_create(modem, 0, "atmodem", data->modem_port);
+
+ data->gprs = ofono_gprs_create(modem, 0,
+ "atmodem", data->modem_port);
+ data->gc = ofono_gprs_context_create(modem, 0,
+ "atmodem", data->data_port);
+
+ if (data->gprs && data->gc) {
+ ofono_gprs_add_context(data->gprs, data->gc);
+ }
mw = ofono_message_waiting_create(modem);
--
1.7.1