Hi Philippe, On 12/08/2011 08:49 AM, Philippe Nunes wrote: Please rename this to ofono_cdma_provision_driver. We can later expand this to provision username and password settings. Regards

Hi Philippe, On 12/08/2011 08:49 AM, Philippe Nunes wrote: Similarly, please name this cdma_provision_get_name.. Regards, -Denis

--- plugins/providers.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) create mode 100644 plugins/providers.c diff --git a/plugins/providers.c b/plugins/providers.c new file mode 100644 index 0000000..f267db9 --- /dev/null +++ b/plugins/providers.c @@ -0,0 +1,79 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2011 Intel Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <errno.h> +#include <string.h> + +#include <glib.h> + +#define OFONO_API_SUBJECT_TO_CHANGE +#include <ofono/types.h> +#include <ofono/log.h> +#include <ofono/plugin.h> +#include <ofono/modem.h> +#include <ofono/gprs-provision.h> +#include <ofono/cdma-providers.h> + +#include "mbpi.h" + +static int providers_get_name(const char *sid, char **name) +{ + GError *error = NULL; + + DBG("Search provider name for SID %s", sid); + + *name = mbpi_lookup_cdma_provider_name(sid, &error); + if (*name == NULL) { + if (error != NULL) { + ofono_error("%s", error->message); + g_error_free(error); + } + + return -ENOENT; + } + + DBG("Found provider name: %s", *name); + + return 0; +} + +static struct ofono_cdma_providers_driver providers_driver = { + .name = "Mobile providers", + .get_provider_name = providers_get_name +}; + +static int providers_init(void) +{ + return ofono_cdma_providers_driver_register(&providers_driver); +} + +static void providers_exit(void) +{ + ofono_cdma_providers_driver_unregister(&providers_driver); +} + +OFONO_PLUGIN_DEFINE(providers, "Mobile providers Plugin", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, + providers_init, providers_exit) -- 1.7.1

--- gatchat/gatchat.c | 26 ++++++++++++++++++++++++++ gatchat/gatchat.h | 4 ++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/gatchat/gatchat.c b/gatchat/gatchat.c index 7a0ef35..00e5fa8 100644 --- a/gatchat/gatchat.c +++ b/gatchat/gatchat.c @@ -35,6 +35,7 @@ #include "ringbuffer.h" #include "gatchat.h" #include "gatio.h" +#include "gathdlc.h" /* #define WRITE_SCHEDULER_DEBUG 1 */ @@ -110,6 +111,7 @@ struct _GAtChat { struct at_chat *parent; guint group; GAtChat *slave; + GAtHDLC *diag_monitor; }; struct terminator_info { @@ -1354,6 +1356,30 @@ GAtChat *g_at_chat_get_slave(GAtChat *chat) return chat->slave; } +GAtHDLC *g_at_chat_associate_diag_monitor(GAtChat *chat, GAtHDLC *diag) +{ + if (chat == NULL) + return NULL; + + if (chat->diag_monitor != NULL) + g_at_hdlc_unref(chat->diag_monitor); + + if (diag != NULL) + chat->diag_monitor = g_at_hdlc_ref(diag); + else + chat->diag_monitor = NULL; + + return chat->diag_monitor; +} + +GAtHDLC *g_at_chat_get_diag_monitor(GAtChat *chat) +{ + if (chat == NULL) + return NULL; + + return chat->diag_monitor; +} + GIOChannel *g_at_chat_get_channel(GAtChat *chat) { if (chat == NULL || chat->parent->io == NULL) diff --git a/gatchat/gatchat.h b/gatchat/gatchat.h index 367581e..d8863b8 100644 --- a/gatchat/gatchat.h +++ b/gatchat/gatchat.h @@ -30,6 +30,7 @@ extern "C" { #include "gatsyntax.h" #include "gatutil.h" #include "gatio.h" +#include "gathdlc.h" struct _GAtChat; @@ -68,6 +69,9 @@ GAtChat *g_at_chat_clone(GAtChat *chat); GAtChat *g_at_chat_set_slave(GAtChat *chat, GAtChat *slave); GAtChat *g_at_chat_get_slave(GAtChat *chat); +GAtHDLC *g_at_chat_associate_diag_monitor(GAtChat *chat, GAtHDLC *diag); +GAtHDLC *g_at_chat_get_diag_monitor(GAtChat *chat); + void g_at_chat_suspend(GAtChat *chat); void g_at_chat_resume(GAtChat *chat); -- 1.7.1

Hi Marcel, On 12/08/2011 03:13 PM, Marcel Holtmann wrote: Here, the idea is to link one AT capable port to one Diagnostic port. Commonly, we are specifying only one AT capable channel (GAtChat) when creating an atom. For cdma_netreg, I need both (AT and QCDM). Indeed, with some EV-DO capable hardware, the result of some AT commands (like AT+CSS?) may be wrong. That's why, I introduced the QCDM support. To retrieve the GAtHDLC from the driver implementation, I chose to use a solution similar to 'g_at_chat_get_slave'. Regards, Philippe.

Hi Marcel, On 12/08/2011 04:17 PM, Marcel Holtmann wrote: Yes, I presume we could manage by using only QCDM but according to me, it would be more complex. Without unsolicited result codes, we are obliged to perform a network status pooling and to cover all the features (1x/HDR signal quality, dormancy state) we need to extend greatly our QCDM handler. Now, I feel too bad to not use an available AT capable port. Regards, Philippe.

--- plugins/huaweicdma.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/huaweicdma.c b/plugins/huaweicdma.c index 4c83114..9151ba8 100644 --- a/plugins/huaweicdma.c +++ b/plugins/huaweicdma.c @@ -211,7 +211,7 @@ static void huaweicdma_post_online(struct ofono_modem *modem) DBG("%p", modem); - ofono_cdma_netreg_create(modem, 0, "huaweicdmamodem", data->modem); + ofono_cdma_netreg_create(modem, 0, "huaweicdmamodem", data->pcui); ofono_cdma_connman_create(modem, 0, "cdmamodem", data->modem); } -- 1.7.1

--- plugins/huaweicdma.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/plugins/huaweicdma.c b/plugins/huaweicdma.c index 9151ba8..0036b20 100644 --- a/plugins/huaweicdma.c +++ b/plugins/huaweicdma.c @@ -41,6 +41,7 @@ struct huaweicdma_data { GAtChat *modem; GAtChat *pcui; + GAtHDLC *hdlc; }; static void huaweicdma_debug(const char *str, void *data) @@ -75,6 +76,7 @@ static void huaweicdma_remove(struct ofono_modem *modem) /* Cleanup after hot-unplug */ g_at_chat_unref(data->pcui); + g_at_hdlc_unref(data->hdlc); g_free(data); } @@ -92,6 +94,9 @@ static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data) g_at_chat_unref(data->pcui); data->pcui = NULL; + + g_at_hdlc_unref(data->hdlc); + data->hdlc = NULL; } ofono_modem_set_powered(modem, ok); @@ -130,6 +135,38 @@ static GAtChat *open_device(struct ofono_modem *modem, return chat; } +static GAtHDLC *open_qcdm(struct ofono_modem *modem) +{ + const char *device; + GIOChannel *channel; + GAtHDLC *hdlc; + + device = ofono_modem_get_string(modem, "Diag"); + if (device == NULL) + return NULL; + + DBG("Diagnostic Monitor %s", device); + + channel = g_at_tty_open_qcdm(device); + if (channel == NULL) + return NULL; + + hdlc = g_at_hdlc_new(channel); + + g_io_channel_unref(channel); + + if (hdlc == NULL) + return NULL; + + if (getenv("OFONO_AT_DEBUG")) + g_at_hdlc_set_debug(hdlc, huaweicdma_debug, "HDLC: "); + + g_at_hdlc_set_xmit_accm(hdlc, 0); + g_at_hdlc_set_recv_accm(hdlc, 0); + + return hdlc; +} + static int huaweicdma_enable(struct ofono_modem *modem) { struct huaweicdma_data *data = ofono_modem_get_data(modem); @@ -147,6 +184,10 @@ static int huaweicdma_enable(struct ofono_modem *modem) return -EIO; } + data->hdlc = open_qcdm(modem); + if (data->hdlc != NULL) + g_at_chat_associate_diag_monitor(data->pcui, data->hdlc); + g_at_chat_send(data->modem, "ATE0 &C0 +CMEE=1", NULL, NULL, NULL, NULL); g_at_chat_send(data->pcui, "ATE0 &C0 +CMEE=1", NULL, NULL, NULL, NULL); @@ -182,6 +223,9 @@ static int huaweicdma_disable(struct ofono_modem *modem) g_at_chat_unref(data->modem); data->modem = NULL; + g_at_hdlc_unref(data->hdlc); + data->hdlc = NULL; + g_at_chat_cancel_all(data->pcui); g_at_chat_unregister_all(data->pcui); -- 1.7.1

--- drivers/huaweicdmamodem/network-registration.c | 141 ++++++++++++++++++++++++ 1 files changed, 141 insertions(+), 0 deletions(-) diff --git a/drivers/huaweicdmamodem/network-registration.c b/drivers/huaweicdmamodem/network-registration.c index 2432bf1..8b6378c 100644 --- a/drivers/huaweicdmamodem/network-registration.c +++ b/drivers/huaweicdmamodem/network-registration.c @@ -36,8 +36,10 @@ #include "gatchat.h" #include "huaweicdmamodem.h" +#include <drivers/atmodem/atutil.h> #define DIAG_CMD_VERSION_INFO 0 /* Version info */ +#define DIAG_CMD_STATUS 12 /* Station status */ static const char *sysinfo_prefix[] = { "^SYSINFO:", NULL }; @@ -45,6 +47,8 @@ struct netreg_data { GAtChat *chat; GAtHDLC *diag; guint8 cmd; + void *cb; + void *cb_data; }; struct version_info { @@ -63,6 +67,32 @@ struct version_info { guint8 unknown; } __attribute__ ((packed)); +struct cdma_status { + guint8 code; + guint8 _unknown[3]; + guint8 esn[4]; + guint16 rf_mode; + guint8 min1_analog[4]; + guint8 min1_cdma[4]; + guint8 min2_analog[2]; + guint8 min2_cdma[2]; + guint8 _unknown1; + guint16 cdma_rx_state; + guint8 good_frames; + guint16 analog_corrected_frames; + guint16 analog_bad_frames; + guint16 analog_word_syncs; + guint16 entry_reason; + guint16 curr_chan; + guint8 cdma_code_chan; + guint16 pilot_base; + guint16 sid; + guint16 nid; + guint16 analog_locaid; + guint16 analog_rssi; + guint8 analog_power; +} __attribute__ ((packed)); + static gboolean parse_sysinfo(GAtResult *result, gint *status) { GAtResultIter iter; @@ -133,6 +163,66 @@ static void sysinfo_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_cdma_netreg_status_notify(netreg, status); } +static gboolean parse_css(GAtResult *result, const char **sid) +{ + GAtResultIter iter; + /* + * According TIA/EIA/IS-707, CSS query returns <AB>,<SID> but + * according TIA/EIA/IS-707-A , it returns <Band_Class>,<Band>,<SID>. + * PREV field which has been added afterward is ignored + */ + + g_at_result_iter_init(&iter, result); + + g_at_result_iter_next(&iter, NULL); + + /* Skip first field since we are not interested in this */ + if (!g_at_result_iter_skip_next(&iter)) + return FALSE; + + if (!g_at_result_iter_next_unquoted_string(&iter, sid)) + return FALSE; + /* + * As CSS answer may differ according which revision of TIA/EIA/IS-707 + * the modem is compliant, we need to check if this field is Band or SID + */ + if ((*sid[0] >= 'A' && *sid[0] <= 'F') || (*sid[0] == 'Z')) + /* This is the band field, the next field is the SID*/ + if (!g_at_result_iter_next_unquoted_string(&iter, sid)) + return FALSE; + + if (!strcmp(*sid, "99999")) + /* The mobile station is not registered.*/ + return FALSE; + + return TRUE; +} + +static void serving_system_cb(gboolean ok, GAtResult *result, + gpointer user_data) +{ + struct cb_data *cbd = user_data; + ofono_cdma_netreg_serving_system_cb_t cb = cbd->cb; + struct ofono_error error; + const char *sid; + + decode_at_error(&error, g_at_result_final_response(result)); + + if (!ok) { + cb(&error, NULL, cbd->data); + return; + } + + if (parse_css(result, &sid) == FALSE) { + CALLBACK_WITH_FAILURE(cb, NULL, cbd->data); + return; + } + + DBG("serving system: SID %s", sid); + + cb(&error, sid, cbd->data); +} + static void send_command(GAtHDLC *hdlc, guint8 cmd) { unsigned char cmdbuf[1]; @@ -172,6 +262,35 @@ static void hdlc_receive(const unsigned char *buf, gsize len, void *user_data) snprintf(str, 9, "%s", verinfo->model); DBG("Model: %s\n", str); DBG("MSM version: %d\n", verinfo->msm_ver); + } else if (nd->cmd == DIAG_CMD_STATUS) { + ofono_cdma_netreg_serving_system_cb_t cb = nd->cb; + struct cdma_status *status; + char str[6]; + + if (len < 1 || len > sizeof(struct cdma_status) || + nd->cmd != buf[0]) { + /* fall back to use +CSS */ + if (g_at_chat_send(nd->chat, "AT+CSS=?", NULL, + serving_system_cb, netreg, NULL) > 0) + return; + + CALLBACK_WITH_FAILURE(cb, NULL, nd->cb_data); + return; + } + + DBG("Status command response\n"); + status = (struct cdma_status *) (buf); + DBG("Serving Identification number: SID %d", status->sid); + DBG("Network Identification number NID: %d", status->nid); + + /* check if network is registered */ + if (status->cdma_rx_state == 0) { + CALLBACK_WITH_FAILURE(cb, NULL, nd->cb_data); + return; + } + + snprintf(str, 6, "%d", status->sid); + CALLBACK_WITH_SUCCESS(cb, str, nd->cb_data); } return; @@ -294,10 +413,32 @@ static void huaweicdma_netreg_remove(struct ofono_cdma_netreg *netreg) g_free(nd); } +static void huaweicdma_netreg_serving_system(struct ofono_cdma_netreg *netreg, + ofono_cdma_netreg_serving_system_cb_t cb, void *data) +{ + struct netreg_data *nd = ofono_cdma_netreg_get_data(netreg); + + nd->cb = cb; + nd->cb_data = data; + + /* First use QCDM port if any */ + if (nd->diag) { + /* Request Station status */ + nd->cmd = 0x0c; + send_command(nd->diag, nd->cmd); + return; + } else if (g_at_chat_send(nd->chat, "AT+CSS=?", NULL, + serving_system_cb, netreg, NULL) > 0) + return; + + CALLBACK_WITH_FAILURE(cb, NULL, data); +} + static struct ofono_cdma_netreg_driver driver = { .name = "huaweicdmamodem", .probe = huaweicdma_netreg_probe, .remove = huaweicdma_netreg_remove, + .serving_system = huaweicdma_netreg_serving_system, }; void huaweicdma_netreg_init(void) -- 1.7.1

In practice, the service domain is set to 255 (cdma not supported) with an EV-DO capable hardware. --- drivers/huaweicdmamodem/network-registration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/huaweicdmamodem/network-registration.c b/drivers/huaweicdmamodem/network-registration.c index 8b6378c..ca746f8 100644 --- a/drivers/huaweicdmamodem/network-registration.c +++ b/drivers/huaweicdmamodem/network-registration.c @@ -134,13 +134,13 @@ static gboolean parse_sysinfo(GAtResult *result, gint *status) switch (srv_domain) { case 0: /* No service */ - case 255: /* CDMA not supported */ *status = CDMA_NETWORK_REGISTRATION_STATUS_NOT_REGISTERED; break; case 1: /* Only CS */ case 2: /* Only PS */ case 3: /* CS PS */ case 4: /* CS registered, PS in searching state */ + case 255: /* CDMA not supported */ break; } -- 1.7.1