--- drivers/huaweicdmamodem/huaweicdmamodem.c | 45 ------ drivers/huaweicdmamodem/huaweicdmamodem.h | 23 --- drivers/huaweicdmamodem/network-registration.c | 199 ------------------------ 3 files changed, 0 insertions(+), 267 deletions(-) delete mode 100644 drivers/huaweicdmamodem/huaweicdmamodem.c delete mode 100644 drivers/huaweicdmamodem/huaweicdmamodem.h delete mode 100644 drivers/huaweicdmamodem/network-registration.c diff --git a/drivers/huaweicdmamodem/huaweicdmamodem.c b/drivers/huaweicdmamodem/huaweicdmamodem.c deleted file mode 100644 index 4e9c400..0000000 --- a/drivers/huaweicdmamodem/huaweicdmamodem.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * - * 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 - -#define OFONO_API_SUBJECT_TO_CHANGE -#include <ofono/plugin.h> - -#include "huaweicdmamodem.h" - -static int huaweicdmamodem_init(void) -{ - huaweicdma_netreg_init(); - - return 0; -} - -static void huaweicdmamodem_exit(void) -{ - huaweicdma_netreg_exit(); -} - -OFONO_PLUGIN_DEFINE(huaweicdmamodem, "Huawei CDMA modem driver", VERSION, - OFONO_PLUGIN_PRIORITY_DEFAULT, - huaweicdmamodem_init, huaweicdmamodem_exit) diff --git a/drivers/huaweicdmamodem/huaweicdmamodem.h b/drivers/huaweicdmamodem/huaweicdmamodem.h deleted file mode 100644 index 799d3a8..0000000 --- a/drivers/huaweicdmamodem/huaweicdmamodem.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * - * 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 - * - */ - -extern void huaweicdma_netreg_init(void); -extern void huaweicdma_netreg_exit(void); diff --git a/drivers/huaweicdmamodem/network-registration.c b/drivers/huaweicdmamodem/network-registration.c deleted file mode 100644 index 25c6291..0000000 --- a/drivers/huaweicdmamodem/network-registration.c +++ /dev/null @@ -1,199 +0,0 @@ -/* - * - * 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 - -#define _GNU_SOURCE -#include <glib.h> -#include <errno.h> - -#include <ofono/log.h> -#include <ofono/modem.h> -#include <ofono/cdma-netreg.h> - -#include "gatchat.h" - -#include "huaweicdmamodem.h" - -static const char *sysinfo_prefix[] = { "^SYSINFO:", NULL }; - -static gboolean parse_sysinfo(GAtResult *result, gint *status) -{ - GAtResultIter iter; - gint srv_status; - gint srv_domain; - gint roaming_status; - - g_at_result_iter_init(&iter, result); - - if (!g_at_result_iter_next(&iter, "^SYSINFO:")) - return FALSE; - - if (!g_at_result_iter_next_number(&iter, &srv_status)) - return FALSE; - - if (!g_at_result_iter_next_number(&iter, &srv_domain)) - return FALSE; - - if (!g_at_result_iter_next_number(&iter, &roaming_status)) - return FALSE; - - DBG("%d, %d, %d", srv_status, srv_domain, roaming_status); - - switch (srv_status) { - case 1: /* Restricted service */ - case 2: /* Service valid */ - case 3: /* Restricted region service */ - if (roaming_status) - *status = CDMA_NETWORK_REGISTRATION_STATUS_ROAMING; - else - *status = CDMA_NETWORK_REGISTRATION_STATUS_REGISTERED; - break; - case 0: /* No service */ - case 4: /* Not registered */ - default: - *status = CDMA_NETWORK_REGISTRATION_STATUS_NOT_REGISTERED; - break; - } - - 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 */ - break; - } - - return TRUE; -} - -static void sysinfo_cb(gboolean ok, GAtResult *result, gpointer user_data) -{ - struct ofono_cdma_netreg *netreg = user_data; - int status; - - if (!ok) - return; - - if (parse_sysinfo(result, &status) == FALSE) { - ofono_error("Invalid SYSINFO values"); - return; - } - - ofono_cdma_netreg_status_notify(netreg, status); -} - -static void mode_notify(GAtResult *result, gpointer user_data) -{ - struct ofono_cdma_netreg *netreg = user_data; - GAtChat *chat = ofono_cdma_netreg_get_data(netreg); - - g_at_chat_send(chat, "AT^SYSINFO", sysinfo_prefix, - sysinfo_cb, netreg, NULL); -} - -static void rssilvl_notify(GAtResult *result, gpointer user_data) -{ - struct ofono_cdma_netreg *netreg = user_data; - int strength; - GAtResultIter iter; - - g_at_result_iter_init(&iter, result); - - if (!g_at_result_iter_next(&iter, "^RSSILVL:")) - goto error; - - if (!g_at_result_iter_next_number(&iter, &strength)) - goto error; - - if (strength == 99) - strength = 100; - - ofono_cdma_netreg_strength_notify(netreg, strength); - - return; - -error: - ofono_error("Invalid RSSILVL value"); -} - -static void probe_cb(gboolean ok, GAtResult *result, gpointer user_data) -{ - struct ofono_cdma_netreg *netreg = user_data; - GAtChat *chat = ofono_cdma_netreg_get_data(netreg); - - if (!ok) { - ofono_cdma_netreg_remove(netreg); - return; - } - - g_at_chat_register(chat, "^MODE:", - mode_notify, FALSE, netreg, NULL); - - g_at_chat_register(chat, "^RSSILVL:", - rssilvl_notify, FALSE, netreg, NULL); - - ofono_cdma_netreg_register(netreg); -} - -static int huaweicdma_netreg_probe(struct ofono_cdma_netreg *netreg, - unsigned int vendor, void *data) -{ - GAtChat *chat = g_at_chat_clone(data); - - ofono_cdma_netreg_set_data(netreg, chat); - - g_at_chat_send(chat, "AT^SYSINFO", sysinfo_prefix, - probe_cb, netreg, NULL); - - return 0; -} - -static void huaweicdma_netreg_remove(struct ofono_cdma_netreg *netreg) -{ - GAtChat *chat = ofono_cdma_netreg_get_data(netreg); - - ofono_cdma_netreg_set_data(netreg, NULL); - - g_at_chat_unref(chat); -} - -static struct ofono_cdma_netreg_driver driver = { - .name = "huaweicdmamodem", - .probe = huaweicdma_netreg_probe, - .remove = huaweicdma_netreg_remove, -}; - -void huaweicdma_netreg_init(void) -{ - ofono_cdma_netreg_driver_register(&driver); -} - -void huaweicdma_netreg_exit(void) -{ - ofono_cdma_netreg_driver_unregister(&driver); -} -- 1.7.1

--- include/cdma-netreg.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/cdma-netreg.h b/include/cdma-netreg.h index 31ed289..529dab5 100644 --- a/include/cdma-netreg.h +++ b/include/cdma-netreg.h @@ -36,12 +36,19 @@ enum cdma_netreg_status { struct ofono_cdma_netreg; +typedef void (*ofono_cdma_netreg_serving_system_cb_t)( + const struct ofono_error *error, + const char *sid, + void *data); + struct ofono_cdma_netreg_driver { const char *name; int (*probe)(struct ofono_cdma_netreg *cdma_netreg, unsigned int vendor, void *data); void (*remove)(struct ofono_cdma_netreg *cdma_netreg); + void (*serving_system)(struct ofono_cdma_netreg *cdma_netreg, + ofono_cdma_netreg_serving_system_cb_t cb, void *data); }; void ofono_cdma_netreg_status_notify(struct ofono_cdma_netreg *netreg, -- 1.7.1

--- drivers/cdmamodem/network-registration.c | 77 ++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/drivers/cdmamodem/network-registration.c b/drivers/cdmamodem/network-registration.c index a34db91..b72295c 100644 --- a/drivers/cdmamodem/network-registration.c +++ b/drivers/cdmamodem/network-registration.c @@ -24,6 +24,7 @@ #endif #define _GNU_SOURCE +#include <string.h> #include <glib.h> #include <errno.h> @@ -108,6 +109,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 mode_notify(GAtResult *result, gpointer user_data) { struct ofono_cdma_netreg *netreg = user_data; @@ -184,10 +245,26 @@ static void cdma_netreg_remove(struct ofono_cdma_netreg *netreg) g_at_chat_unref(chat); } +static void cdma_netreg_serving_system(struct ofono_cdma_netreg *netreg, + ofono_cdma_netreg_serving_system_cb_t cb, void *data) +{ + GAtChat *chat = ofono_cdma_netreg_get_data(netreg); + struct cb_data *cbd = cb_data_new(cb, data); + + if (g_at_chat_send(chat, "AT+CSS=?", NULL, serving_system_cb, cbd, + g_free) > 0) + return; + + g_free(cbd); + + CALLBACK_WITH_FAILURE(cb, NULL, data); +} + static struct ofono_cdma_netreg_driver driver = { .name = "cdmamodem", .probe = cdma_netreg_probe, .remove = cdma_netreg_remove, + .serving_system = cdma_netreg_serving_system, }; void cdma_netreg_init(void) -- 1.7.1

Hi Philippe, On 11/24/2011 11:46 AM, Philippe Nunes wrote: Don't do this, see below You might also want to export the SystemIdentifier property here Please don't do it this way, this part should be abstracted behind a provider name lookup plugin, similar to how context provisioning for GSM is done. Mobile Broadband Provider Info database might not be the only source of this information, in fact manufacturers might have their own (better) databases. Are you sure you want to perform the lookup every time? Why don't you cache the last result and not perform the query if the SID is the same as the last one obtained. We're highly unlikely to get a different SID under normal circumstances (e.g. signal loss, etc) so re-querying seems wasteful. See comment above Regards, -Denis