This plugin is now merged with huaweicdma one.
Atoms will now be created with GSM or CDMA drivers
depending on the result of ATI command.
No SIM atom is created for embedded sim from CDMA
modems.
---
plugins/huawei.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/plugins/huawei.c b/plugins/huawei.c
index ae15bf9..a3768c8 100644
--- a/plugins/huawei.c
+++ b/plugins/huawei.c
@@ -51,6 +51,9 @@
#include <ofono/message-waiting.h>
#include <ofono/log.h>
+#include <ofono/cdma-netreg.h>
+#include <ofono/cdma-connman.h>
+
#include <drivers/atmodem/atutil.h>
#include <drivers/atmodem/vendor.h>
@@ -66,6 +69,7 @@ enum {
SIM_STATE_INVALID_CS = 2,
SIM_STATE_INVALID_PS = 3,
SIM_STATE_INVALID_PS_AND_CS = 4,
+ SIM_STATE_ROMSIM = 240,
SIM_STATE_NOT_EXISTENT = 255,
};
@@ -79,6 +83,7 @@ struct huawei_data {
struct cb_data *online_cbd;
const char *offline_command;
gboolean voice;
+ gboolean gsm;
};
static int huawei_probe(struct ofono_modem *modem)
@@ -405,7 +410,7 @@ static void rfswitch_support(gboolean ok, GAtResult
*result, gpointer user_data)
struct ofono_modem *modem = user_data;
struct huawei_data *data = ofono_modem_get_data(modem);
- if (!ok)
+ if (!ok || !data->gsm)
data->offline_command = "AT+CFUN=5";
else
data->offline_command = "AT+CFUN=7";
@@ -414,6 +419,44 @@ static void rfswitch_support(gboolean ok, GAtResult
*result, gpointer user_data)
cfun_enable, modem, NULL);
}
+static gboolean parse_ati_result(GAtResult *result)
+{
+ GAtResultIter iter;
+ const char *line;
+ int num = g_at_result_num_response_lines(result);
+ int i;
+
+ g_at_result_iter_init(&iter, result);
+
+ for (i = 0; i < num; i++) {
+ g_at_result_iter_next(&iter, NULL);
+ line = g_at_result_iter_raw_line(&iter);
+ if (g_str_has_prefix(line, "+GCAP"))
+ return (g_strrstr(line, "+CGSM") != NULL);
+ }
+
+ /* By default we consider modem is GSM type */
+ return TRUE;
+}
+
+static void ati_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct huawei_data *data = ofono_modem_get_data(modem);
+
+ /* By default we consider modem is GSM type */
+ if (!ok)
+ data->gsm = TRUE;
+ else
+ data->gsm = parse_ati_result(result);
+
+ data->sim_state = SIM_STATE_NOT_EXISTENT;
+
+ g_at_chat_send(data->pcui, "AT^RFSWITCH=?", rfswitch_prefix,
+ rfswitch_support, modem, NULL);
+}
+
+
static GAtChat *open_device(struct ofono_modem *modem,
const char *key, char *debug)
{
@@ -472,10 +515,7 @@ static int huawei_enable(struct ofono_modem *modem)
g_at_chat_send(data->modem, "ATE0 +CMEE=1", NULL, NULL, NULL, NULL);
g_at_chat_send(data->pcui, "ATE0 +CMEE=1", NULL, NULL, NULL, NULL);
- data->sim_state = SIM_STATE_NOT_EXISTENT;
-
- g_at_chat_send(data->pcui, "AT^RFSWITCH=?", rfswitch_prefix,
- rfswitch_support, modem, NULL);
+ g_at_chat_send(data->pcui, "ATI", NULL, ati_cb, modem, NULL);
return -EINPROGRESS;
}
@@ -555,6 +595,7 @@ static void sysinfo_online_cb(gboolean ok, GAtResult
*result,
case SIM_STATE_INVALID_CS:
case SIM_STATE_INVALID_PS:
case SIM_STATE_INVALID_PS_AND_CS:
+ case SIM_STATE_ROMSIM:
CALLBACK_WITH_SUCCESS(cb, data->online_cbd->data);
goto done;
}
@@ -650,13 +691,21 @@ static void huawei_set_online(struct ofono_modem *modem,
ofono_bool_t online,
static void huawei_pre_sim(struct ofono_modem *modem)
{
struct huawei_data *data = ofono_modem_get_data(modem);
- struct ofono_sim *sim;
+ struct ofono_sim *sim = NULL;
DBG("%p", modem);
- ofono_devinfo_create(modem, 0, "atmodem", data->pcui);
- sim = ofono_sim_create(modem, OFONO_VENDOR_HUAWEI,
+ if (data->gsm == TRUE) {
+ ofono_devinfo_create(modem, 0, "atmodem", data->pcui);
+ sim = ofono_sim_create(modem, OFONO_VENDOR_HUAWEI,
"atmodem", data->pcui);
+ } else {
+ ofono_devinfo_create(modem, 0, "cdmamodem", data->pcui);
+ /* Create sim atom only if sim is not embedded */
+ if (data->sim_state != SIM_STATE_ROMSIM)
+ sim = ofono_sim_create(modem, OFONO_VENDOR_HUAWEI,
+ "atmodem", data->pcui);
+ }
if (sim && data->have_sim == TRUE)
ofono_sim_inserted_notify(sim, TRUE);
@@ -670,6 +719,9 @@ static void huawei_post_sim(struct ofono_modem *modem)
DBG("%p", modem);
+ if (data->gsm == FALSE)
+ return;
+
if (data->voice == TRUE) {
ofono_voicecall_create(modem, 0, "huaweimodem", data->pcui);
ofono_audio_settings_create(modem, 0,
@@ -695,6 +747,15 @@ static void huawei_post_online(struct ofono_modem *modem)
DBG("%p", modem);
+ if (data->gsm == FALSE) {
+ ofono_cdma_netreg_create(modem, 0, "huaweicdmamodem",
+ data->pcui);
+
+ ofono_cdma_connman_create(modem, OFONO_VENDOR_HUAWEI,
+ "cdmamodem", data->modem);
+ return;
+ }
+
ofono_netreg_create(modem, OFONO_VENDOR_HUAWEI, "atmodem", data->pcui);
ofono_cbs_create(modem, OFONO_VENDOR_QUALCOMM_MSM,
--
1.7.1
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
