--- plugins/speedupcdma.c | 99 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 73 insertions(+), 26 deletions(-) diff --git a/plugins/speedupcdma.c b/plugins/speedupcdma.c index d11afb7..8cb4dae 100644 --- a/plugins/speedupcdma.c +++ b/plugins/speedupcdma.c @@ -40,7 +40,8 @@ static const char *none_prefix[] = { NULL }; struct speedupcdma_data { - GAtChat *chat; + GAtChat *modem; + GAtChat *aux; }; static void speedupcdma_debug(const char *str, void *data) @@ -84,8 +85,11 @@ static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data) DBG(""); if (!ok) { - g_at_chat_unref(data->chat); - data->chat = NULL; + g_at_chat_unref(data->modem); + data->modem = NULL; + + g_at_chat_unref(data->aux); + data->aux = NULL; ofono_modem_set_powered(modem, FALSE); return; @@ -94,39 +98,70 @@ static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data) ofono_modem_set_powered(modem, TRUE); } -static int speedupcdma_enable(struct ofono_modem *modem) +static GAtChat *create_port(const char *device) { - struct speedupcdma_data *data = ofono_modem_get_data(modem); GAtSyntax *syntax; GIOChannel *channel; - const char *modem_path; - - modem_path = ofono_modem_get_string(modem, "Modem"); - if (modem_path == NULL) - return -EINVAL; - - DBG("path is: %s", modem_path); + GAtChat *chat; - channel = g_at_tty_open(modem_path, NULL); + channel = g_at_tty_open(device, NULL); if (channel == NULL) - return -EIO; + return NULL; syntax = g_at_syntax_new_gsm_permissive(); - data->chat = g_at_chat_new(channel, syntax); + chat = g_at_chat_new(channel, syntax); g_at_syntax_unref(syntax); - g_io_channel_unref(channel); - if (data->chat == NULL) - return -ENOMEM; + if (chat == NULL) + return NULL; + + return chat; +} + +static GAtChat *open_device(struct ofono_modem *modem, + const char *key, char *debug) +{ + const char *device; + GAtChat *chat; + + device = ofono_modem_get_string(modem, key); + if (device == NULL) + return NULL; + + DBG("%s %s", key, device); + + chat = create_port(device); + if (chat == NULL) + return NULL; if (getenv("OFONO_AT_DEBUG")) - g_at_chat_set_debug(data->chat, speedupcdma_debug, "Modem: "); + g_at_chat_set_debug(chat, speedupcdma_debug, debug); + + return chat; +} + +static int speedupcdma_enable(struct ofono_modem *modem) +{ + struct speedupcdma_data *data = ofono_modem_get_data(modem); + + DBG(""); - g_at_chat_send(data->chat, "ATE0 +CMEE=1", none_prefix, + data->modem = open_device(modem, "Modem", "Modem: "); + if (data->modem == NULL) + return -EINVAL; + + data->aux = open_device(modem, "Aux", "Aux: "); + if (data->aux == NULL) { + g_at_chat_unref(data->modem); + data->modem = NULL; + return -EIO; + } + + g_at_chat_send(data->aux, "ATE0 +CMEE=1", none_prefix, NULL, NULL, NULL); - g_at_chat_send(data->chat, "AT+CFUN=1", none_prefix, + g_at_chat_send(data->aux, "AT+CFUN=1", none_prefix, cfun_enable, modem, NULL); return -EINPROGRESS; @@ -139,8 +174,8 @@ static void cfun_disable(gboolean ok, GAtResult *result, gpointer user_data) DBG(""); - g_at_chat_unref(data->chat); - data->chat = NULL; + g_at_chat_unref(data->aux); + data->aux = NULL; if (ok) ofono_modem_set_powered(modem, FALSE); @@ -152,7 +187,19 @@ static int speedupcdma_disable(struct ofono_modem *modem) DBG("%p", modem); - g_at_chat_send(data->chat, "AT+CFUN=0", none_prefix, + if (data->modem) { + g_at_chat_cancel_all(data->modem); + g_at_chat_unregister_all(data->modem); + g_at_chat_unref(data->modem); + data->modem = NULL; + } + + if (data->aux == NULL) + return 0; + + g_at_chat_cancel_all(data->aux); + g_at_chat_unregister_all(data->aux); + g_at_chat_send(data->aux, "AT+CFUN=0", none_prefix, cfun_disable, modem, NULL); return -EINPROGRESS; @@ -164,7 +211,7 @@ static void speedupcdma_pre_sim(struct ofono_modem *modem) DBG("%p", modem); - ofono_devinfo_create(modem, 0, "cdmamodem", data->chat); + ofono_devinfo_create(modem, 0, "cdmamodem", data->aux); } static void speedupcdma_post_sim(struct ofono_modem *modem) @@ -178,7 +225,7 @@ static void speedupcdma_post_online(struct ofono_modem *modem) DBG("%p", modem); - ofono_cdma_connman_create(modem, 0, "cdmamodem", data->chat); + ofono_cdma_connman_create(modem, 1, "cdmamodem", data->modem); } static struct ofono_modem_driver speedupcdma_driver = { -- 1.7.4.1 --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.