Hi Guillaume, I really don't wanna random intermix of determining modem type and dealing with CDMA extensions. This should be nicely split into logical patches. So just calling this gsm is a bit to short. Same goes for voice. That was a mistake and I fixed that upstream now to rename it to have_voice. This should be a separate patch as well. I think the important part is to first enhance the plugin to detect GSM. And then on-top of that handle the difference between GSM and CDMA. This parsing is more complex than it needs to be. It also parses the string too many times. Especially since GAtChat does that all for you already anyway. Instead of posting an example here, I just pushed a patch so you can see how easily this can be done. I don't like this. We should use have_gsm and have_cdma and not randomly fallback to one of them. If for some reason ATI does not show any of them, we should also not do anything either. More important I do wanna get bug reports if ATI does not carry +GCAP or has some weird capabilities inside. Leave this sim_state assignment at this location. No point in moving this higher up. This should be a separate patch together with the state addition. Please don't do that. I prefer not assigning variables with NULL here. It is better to change the logic around. I am really not sure that it is a good idea to just use the GSM SIM atom here. The EF structure will be different and we might cause more harm than doing any good in assuming that we get any proper EF fields. This is clearly the part where we need detailed information from Huawei on how this is suppose to work. And how this is suppose to be done for CDMA in the first place anyway. Lets do if (data->have_gsm ... and if (data->have_cdma ...) separate here. I rather no degrade GSM to second class citizen. Regards Marcel

Hi Marcel, On 01/09/2012 02:47 PM, Deng, Ying An wrote: As previously indicated by Denis, the goal (if possible) is to use a unified SIM atom for GSM and CDMA. So far, this should be possible as the R-UIM can be considered as an extension of SIM (R-UIM 3GPP2 specification C.S0023). In practice, it is a matter of reading different EFs, while CHV/PIN handling, BDN, FDN, etc are the same. Actually, with the R-UIM capable CDMA dongles we have, the PIN management appears to be exposed by standard AT commands (+CPIN, +CLCK). However, this needs to be confirmed an documented by the manufacturers. Regarding FS reading/writing, this seems to be rather closed (at least through AT commands). My suggestion is to skip for now all EFs reading in case of R-UIM, and support only the pin handling. We can also think to retrieve the IMSI even if this Id is actually not mandatory for ConnMan (as the serial number is also considered). Are you OK with this first approach? Regards, Philippe.

--- Makefile.am | 3 - plugins/huaweicdma.c | 247 -------------------------------------------------- 2 files changed, 0 insertions(+), 250 deletions(-) delete mode 100644 plugins/huaweicdma.c diff --git a/Makefile.am b/Makefile.am index 9831924..ab99283 100644 --- a/Makefile.am +++ b/Makefile.am @@ -306,9 +306,6 @@ builtin_sources += plugins/zte.c builtin_modules += huawei builtin_sources += plugins/huawei.c -builtin_modules += huaweicdma -builtin_sources += plugins/huaweicdma.c - builtin_modules += sierra builtin_sources += plugins/sierra.c diff --git a/plugins/huaweicdma.c b/plugins/huaweicdma.c deleted file mode 100644 index 6fba0c1..0000000 --- a/plugins/huaweicdma.c +++ /dev/null @@ -1,247 +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 - -#include <errno.h> -#include <stdlib.h> - -#include <glib.h> -#include <gatchat.h> -#include <gattty.h> - -#define OFONO_API_SUBJECT_TO_CHANGE -#include <ofono/plugin.h> -#include <ofono/modem.h> -#include <ofono/devinfo.h> -#include <ofono/cdma-netreg.h> -#include <ofono/cdma-connman.h> -#include <ofono/log.h> - -#include "drivers/atmodem/vendor.h" - -struct huaweicdma_data { - GAtChat *modem; - GAtChat *pcui; -}; - -static void huaweicdma_debug(const char *str, void *data) -{ - const char *prefix = data; - - ofono_info("%s%s", prefix, str); -} - -static int huaweicdma_probe(struct ofono_modem *modem) -{ - struct huaweicdma_data *data; - - DBG("%p", modem); - - data = g_try_new0(struct huaweicdma_data, 1); - if (data == NULL) - return -ENOMEM; - - ofono_modem_set_data(modem, data); - - return 0; -} - -static void huaweicdma_remove(struct ofono_modem *modem) -{ - struct huaweicdma_data *data = ofono_modem_get_data(modem); - - DBG("%p", modem); - - ofono_modem_set_data(modem, NULL); - - /* Cleanup after hot-unplug */ - g_at_chat_unref(data->pcui); - - g_free(data); -} - -static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data) -{ - struct ofono_modem *modem = user_data; - struct huaweicdma_data *data = ofono_modem_get_data(modem); - - DBG(""); - - if (!ok) { - g_at_chat_unref(data->modem); - data->modem = NULL; - - g_at_chat_unref(data->pcui); - data->pcui = NULL; - } - - ofono_modem_set_powered(modem, ok); -} - -static GAtChat *open_device(struct ofono_modem *modem, - const char *key, char *debug) -{ - const char *device; - GIOChannel *channel; - GAtSyntax *syntax; - 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; - - syntax = g_at_syntax_new_gsm_permissive(); - chat = g_at_chat_new(channel, syntax); - g_at_syntax_unref(syntax); - - g_io_channel_unref(channel); - - if (chat == NULL) - return NULL; - - if (getenv("OFONO_AT_DEBUG")) - g_at_chat_set_debug(chat, huaweicdma_debug, debug); - - return chat; -} - -static int huaweicdma_enable(struct ofono_modem *modem) -{ - struct huaweicdma_data *data = ofono_modem_get_data(modem); - - DBG(""); - - data->modem = open_device(modem, "Modem", "Modem: "); - if (data->modem == NULL) - return -EINVAL; - - data->pcui = open_device(modem, "Pcui", "PCUI: "); - if (data->pcui == NULL) { - g_at_chat_unref(data->modem); - data->modem = NULL; - return -EIO; - } - - g_at_chat_set_slave(data->modem, data->pcui); - - 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); - - g_at_chat_send(data->pcui, "AT+CFUN=1", NULL, - cfun_enable, modem, NULL); - - return -EINPROGRESS; -} - -static void cfun_disable(gboolean ok, GAtResult *result, gpointer user_data) -{ - struct ofono_modem *modem = user_data; - struct huaweicdma_data *data = ofono_modem_get_data(modem); - - DBG(""); - - g_at_chat_unref(data->pcui); - data->pcui = NULL; - - if (ok) - ofono_modem_set_powered(modem, FALSE); -} - -static int huaweicdma_disable(struct ofono_modem *modem) -{ - struct huaweicdma_data *data = ofono_modem_get_data(modem); - - DBG("%p", modem); - - g_at_chat_cancel_all(data->modem); - g_at_chat_unregister_all(data->modem); - - g_at_chat_unref(data->modem); - data->modem = NULL; - - g_at_chat_cancel_all(data->pcui); - g_at_chat_unregister_all(data->pcui); - - g_at_chat_send(data->pcui, "AT+CFUN=0", NULL, - cfun_disable, modem, NULL); - - return -EINPROGRESS; -} - -static void huaweicdma_pre_sim(struct ofono_modem *modem) -{ - struct huaweicdma_data *data = ofono_modem_get_data(modem); - - DBG("%p", modem); - - ofono_devinfo_create(modem, 0, "cdmamodem", data->pcui); -} - -static void huaweicdma_post_sim(struct ofono_modem *modem) -{ - DBG("%p", modem); -} - -static void huaweicdma_post_online(struct ofono_modem *modem) -{ - struct huaweicdma_data *data = ofono_modem_get_data(modem); - - DBG("%p", modem); - - ofono_cdma_netreg_create(modem, 0, "huaweicdmamodem", data->pcui); - - ofono_cdma_connman_create(modem, OFONO_VENDOR_HUAWEI, "cdmamodem", - data->modem); -} - -static struct ofono_modem_driver huaweicdma_driver = { - .name = "huaweicdma", - .probe = huaweicdma_probe, - .remove = huaweicdma_remove, - .enable = huaweicdma_enable, - .disable = huaweicdma_disable, - .pre_sim = huaweicdma_pre_sim, - .post_sim = huaweicdma_post_sim, - .post_online = huaweicdma_post_online, -}; - -static int huaweicdma_init(void) -{ - return ofono_modem_driver_register(&huaweicdma_driver); -} - -static void huaweicdma_exit(void) -{ - ofono_modem_driver_unregister(&huaweicdma_driver); -} - -OFONO_PLUGIN_DEFINE(huaweicdma, "Huawei CDMA modem driver", VERSION, - OFONO_PLUGIN_PRIORITY_DEFAULT, - huaweicdma_init, huaweicdma_exit) -- 1.7.1