--- 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..2fde572 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 *qcdm; }; struct terminator_info { @@ -1354,6 +1356,30 @@ GAtChat *g_at_chat_get_slave(GAtChat *chat) return chat->slave; } +GAtHDLC *g_at_chat_set_slave_qcdm(GAtChat *chat, GAtHDLC *diag) +{ + if (chat == NULL) + return NULL; + + if (chat->qcdm != NULL) + g_at_hdlc_unref(chat->qcdm); + + if (diag != NULL) + chat->qcdm = g_at_hdlc_ref(diag); + else + chat->qcdm = NULL; + + return chat->qcdm; +} + +GAtHDLC *g_at_chat_get_slave_qcdm(GAtChat *chat) +{ + if (chat == NULL) + return NULL; + + return chat->qcdm; +} + 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..496b3dc 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_set_slave_qcdm(GAtChat *chat, GAtHDLC *diag); +GAtHDLC *g_at_chat_get_slave_qcdm(GAtChat *chat); + void g_at_chat_suspend(GAtChat *chat); void g_at_chat_resume(GAtChat *chat); -- 1.7.1

--- Makefile.am | 1 + gatchat/gatqcdm.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++ gatchat/gatqcdm.h | 57 ++++++++++++++++++++++++++++++++++++ 3 files changed, 142 insertions(+), 0 deletions(-) create mode 100644 gatchat/gatqcdm.c create mode 100644 gatchat/gatqcdm.h diff --git a/Makefile.am b/Makefile.am index 0472dfa..fc8bc42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,6 +72,7 @@ gatchat_sources = gatchat/gatchat.h gatchat/gatchat.c \ gatchat/gatserver.h gatchat/gatserver.c \ gatchat/gatrawip.h gatchat/gatrawip.c \ gatchat/gathdlc.c gatchat/gathdlc.h \ + gatchat/gatqcdm.c gatchat/gatqcdm.h \ gatchat/gatppp.c gatchat/gatppp.h \ gatchat/ppp.h gatchat/ppp_cp.h \ gatchat/ppp_cp.c gatchat/ppp_lcp.c \ diff --git a/gatchat/gatqcdm.c b/gatchat/gatqcdm.c new file mode 100644 index 0000000..3941a8e --- /dev/null +++ b/gatchat/gatqcdm.c @@ -0,0 +1,84 @@ +/* + * + * AT chat library with GLib integration + * + * 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 <string.h> +#include "gatqcdm.h" + +#define QCDM_RESULT_VERSION_LENGTH 55 +#define QCDM_RESULT_STATUS_LENGTH 48 + +#define QCDM_RESULT_STATUS_CDMA_RX_STATE_OFFSET 23 +#define QCDM_RESULT_STATUS_SID_OFFSET 39 + +gboolean g_at_qcdm_send(GAtHDLC *hdlc, guint8 cmd, GAtReceiveFunc func, + gpointer user_data) +{ + unsigned char cmdbuf[1]; + + cmdbuf[0] = cmd; + + g_at_hdlc_set_receive(hdlc, func, user_data); + return g_at_hdlc_send(hdlc, cmdbuf, sizeof(cmdbuf)); +} + + +gboolean g_at_qcdm_result_get_version_info(const unsigned char *buf, gsize len, + struct version_info *verinfo) +{ + if (len < 1 || len > QCDM_RESULT_VERSION_LENGTH || + buf[0] != G_AT_QCDM_CMD_VERSION_INFO) + return FALSE; + + memcpy(verinfo->comp_date, buf+1, 11); + verinfo->comp_date[11] = '\0'; + memcpy(verinfo->comp_time, buf+12, 8); + verinfo->comp_time[8] = '\0'; + memcpy(verinfo->rel_date, buf+20, 11); + verinfo->rel_date[11] = '\0'; + memcpy(verinfo->rel_time, buf+31, 8); + verinfo->rel_time[8] = '\0'; + memcpy(verinfo->model, buf+39, 8); + verinfo->model[8] = '\0'; + verinfo->msm_ver = buf[53]; + + return TRUE; +} + +gboolean g_at_qcdm_result_parse_status(const unsigned char *buf, gsize len, + guint16 *sid) +{ + if (len < 1 || len > QCDM_RESULT_STATUS_LENGTH || + buf[0] != G_AT_QCDM_CMD_STATUS) + return FALSE; + + /* check if network is registered */ + if (buf[QCDM_RESULT_STATUS_CDMA_RX_STATE_OFFSET] == 0) + return FALSE; + + *sid = buf[QCDM_RESULT_STATUS_SID_OFFSET+1] << 8 | + buf[QCDM_RESULT_STATUS_SID_OFFSET]; + + return TRUE; +} diff --git a/gatchat/gatqcdm.h b/gatchat/gatqcdm.h new file mode 100644 index 0000000..2e6cf46 --- /dev/null +++ b/gatchat/gatqcdm.h @@ -0,0 +1,57 @@ +/* + * + * AT chat library with GLib integration + * + * 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 + * + */ + +#ifndef __G_AT_QCDM_H +#define __G_AT_QCDM_H + +#include <glib.h> +#include "gathdlc.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define G_AT_QCDM_CMD_VERSION_INFO 0 /* Version info */ +#define G_AT_QCDM_CMD_STATUS 12 /* Station status */ + +struct version_info { + char comp_date[12]; + char comp_time[9]; + char rel_date[12]; + char rel_time[9]; + char model[9]; + guint8 msm_ver; +}; + +gboolean g_at_qcdm_send(GAtHDLC *hdlc, guint8 cmd, GAtReceiveFunc func, + gpointer user_data); + +gboolean g_at_qcdm_result_get_version_info(const unsigned char *buf, gsize len, + struct version_info *verinfo); + +gboolean g_at_qcdm_result_parse_status(const unsigned char *buf, gsize len, + guint16 *sid); + +#ifdef __cplusplus +} +#endif + +#endif /* __G_AT_QCDM_H */ -- 1.7.1

--- drivers/huaweimodem/cdma-netreg.c | 108 +++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/drivers/huaweimodem/cdma-netreg.c b/drivers/huaweimodem/cdma-netreg.c index bf48b53..e9dd3e2 100644 --- a/drivers/huaweimodem/cdma-netreg.c +++ b/drivers/huaweimodem/cdma-netreg.c @@ -117,6 +117,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 version_info_cb(const unsigned char *buf, gsize len, gpointer user_data) { @@ -139,6 +199,32 @@ static void version_info_cb(const unsigned char *buf, gsize len, DBG("Model: %s\n", verinfo.model); DBG("MSM version: %d\n", verinfo.msm_ver); } + +static void status_cb(const unsigned char *buf, gsize len, gpointer user_data) +{ + struct ofono_cdma_netreg *netreg = user_data; + struct netreg_data *nd = ofono_cdma_netreg_get_data(netreg); + ofono_cdma_netreg_serving_system_cb_t cb = nd->cb; + char str[6]; + guint16 sid; + + if (!g_at_qcdm_result_parse_status(buf, len, &sid)) { + /* 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; + } + + snprintf(str, 6, "%d", sid); + DBG("Status command response\n"); + DBG("Serving Identification number: SID %s", str); + + CALLBACK_WITH_SUCCESS(cb, str, nd->cb_data); +} + static void mode_notify(GAtResult *result, gpointer user_data) { struct ofono_cdma_netreg *netreg = user_data; @@ -254,10 +340,32 @@ static void huawei_cdma_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 */ + if (g_at_qcdm_send(nd->diag, G_AT_QCDM_CMD_STATUS, + status_cb, netreg) > 0) + 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 = "huaweimodem", .probe = huawei_cdma_netreg_probe, .remove = huawei_cdma_netreg_remove, + .serving_system = huaweicdma_netreg_serving_system, }; void huawei_cdma_netreg_init(void) -- 1.7.1