January 2017 - ofono - Ml01.01.Org

by David Ashley

Hello, I'm at my wits' end trying to get ofono working with the sim5320 module. I'm using the plugins/sim900.c module as a starting point. I think the issue has something to do with the difference between the MUX functionality between the 900 and the 5320. The sim900 supports the elaborate parameters sent on the AT+CMUX=0,x,x,x,x, etc. but the SIM5320 only supports AT+CMUX=0 There's that... but also the way the sim900 plugin creates a SETUP_DLC, initiates muxing, then deletes the setup DLC and creates 4 new DLC's... it didn't work for the sim5320 until I remapped the DLC's somewhat like this: #define NUM_DLC 4 #define VOICE_DLC 2 #define NETREG_DLC 1 //#define SMS_DLC 2 #define GPRS_DLC 3 #define SETUP_DLC 0 static char *dlc_prefixes[NUM_DLC] = { [VOICE_DLC]="Voice: ", [NETREG_DLC]="Net: ", // [SMS_DLC]= "SMS: ", [GPRS_DLC]= "GPRS: " , [SETUP_DLC]= "Setup: ", }; Note I have to eliminate the SMS_DLC usage later in sim5320_post_sim: // ofono_sms_create(modem, OFONO_VENDOR_SIMCOM, "atmodem", // data->dlcs[SMS_DLC]); OK everything is *ALMOST* working. ofonod interacts fine with connmand, connmand tells ofonod to activate the sim5320, which actually establishes a ppp connection and sets up a ppp device: ppp0 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-0 inet addr:30.97.132.47 P-t-P:30.97.132.47 Mask:255.255.255.255 UP POINTOPOINT RUNNING NOARP MULTICAST MTU:1500 Metric:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:2 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:500 RX bytes:0 (0.0 B) TX bytes:124 (124.0 B) Here's the rub: No matter what I do, I never get any RX packets from that ppp device, and even when it appears to TX packets (I'm trying to ping out) the machine on the internet isn't actually receiving them. I'm running on a beaglebone with a custom board with a sim5320 module on it. I have no idea what to try... Any advice would be appreciated... Thanks very much!!!! -Dave

3 years, 3 months

1
2
0 / 0

[PATCH 0/2] qmimodem: set data format when needed (and possible)

by Christophe Ronco

MC7430 is a raw-ip only modem. If accessed through 802.3 network interface, no packets can be received (IP layer headers missing). To be able to start a data connection with this modem, we must tell driver (qmi_wwan.c) to mount a raw-ip network interface instead of a 802.3 interface. This has been implemented in libqmi package. The idea is: - ask modem what data format it wants (raw-ip or 802.3) - ask driver what data format it expects (raw-ip or 802.3) - change driver data format if values do not match Patch has been split in two. In first part, we just add the code needed to get/set driver expected data format but nobody ever call these functions. In second part, logic explained above is implemented. If anything fail (can't get expected data format, can't get modem data format, ...), we just don't set anything and continue. To be able to use this, a kernel 4.5 or more recent is needed. Christophe Ronco (2): qmimodem: get/set kernel device driver data format qmimodem: change kernel driver data format if needed drivers/qmimodem/gprs-context.c | 79 +++++++++++++++- drivers/qmimodem/qmi.c | 200 ++++++++++++++++++++++++++++++++++++++++ drivers/qmimodem/qmi.h | 11 +++ drivers/qmimodem/wda.h | 25 +++++ 4 files changed, 312 insertions(+), 3 deletions(-) create mode 100644 drivers/qmimodem/wda.h -- 2.11.0

4 years, 2 months

2
8
0 / 0

Telit modem plugins.

by Piotr Haber

Hi. Seems my rename of he910 plugin to xe910 was a little bit optimistic. Looks like not only xE910 family modems use 1bc7:0021 USB IDs. I got my hands on UE866 and it has the same default composition. So this is another family, designed for embedded M2M/IoT applications with different module form-factor, but having similar members (GE866 2G, UE866 3.5G, LE866 4G) And according to documentation UL865 should share the same USB IDs. And as UL865 is an UMTS enabled, pin-compatible upgrade to GL865-DUAl V3 I would expect the latter will also have the same composition. I could not find a definitive source of information on this. So it seems the plugin needs a different name, again. There is already "telit" plugin but this one supports modems based on "option" serial ports and USB PIDs starting from 0x1003, this includes CE/DE/LE910 (LE910 V1 that is, using QMI, which is end-of-life), HE/LE920 and LE922/LE940A6. Do you have any suggestions on the new name for this plugin? I would go for something like "telit-acm" (cause it uses CDC-ACM serial ports). Best Piotr

4 years, 2 months

2
1
0 / 0

[PATCH 0/3] support Telit LE910 V2 modem

by Piotr Haber

Introduce CDC-NCM driver for Telit modems. Handle initialization of LE910V2 via udev. Add model/variant recognition and setup. Piotr Haber (3): telitmodem: support for CDC-NCM network adapter udevng: setup of Telit LE910V2 xe910: support for Telit LE910V2 modem Makefile.am | 3 +- drivers/telitmodem/gprs-context-ncm.c | 485 ++++++++++++++++++++++++++++++++++ drivers/telitmodem/telitmodem.c | 2 + drivers/telitmodem/telitmodem.h | 2 + plugins/udevng.c | 14 +- plugins/xe910.c | 16 +- 6 files changed, 516 insertions(+), 6 deletions(-) create mode 100644 drivers/telitmodem/gprs-context-ncm.c -- 2.11.0

4 years, 2 months

2
6
0 / 0

[PATCH 0/2] More generic support of Telit xE910 family

by Piotr Haber

Telit xE910 is a family of modems from 2g (GE910) through 3.5g (HE910, UE910, DE910) to 4g (LE910). They share a common programming interface. So move he910 plugin to more generic xe910 and add support for UE910 (i was able to test on it). Also differentiate between variants in terms of voice calling and built-in GPS. Piotr Haber (2): plugins: rename he910 to xe910 plugins: Handle HE910 and UE910 variants Makefile.am | 4 +- plugins/udevng.c | 6 +- plugins/{he910.c => xe910.c} | 237 ++++++++++++++++++++++++++++++++----------- 3 files changed, 183 insertions(+), 64 deletions(-) rename plugins/{he910.c => xe910.c} (59%) -- 2.11.0

4 years, 2 months

2
4
0 / 0

[PATCH] qmimodem: send authentication credentials

by Piotr Haber

Pass authentication method, user and password to QMI WDS service. --- drivers/qmimodem/gprs-context.c | 24 ++++++++++++++++++++++++ drivers/qmimodem/wds.h | 7 +++++++ 2 files changed, 31 insertions(+) diff --git a/drivers/qmimodem/gprs-context.c b/drivers/qmimodem/gprs-context.c index a39db5e8..2250eef9 100644 --- a/drivers/qmimodem/gprs-context.c +++ b/drivers/qmimodem/gprs-context.c @@ -151,6 +151,7 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc, struct cb_data *cbd = cb_data_new(cb, user_data); struct qmi_param *param; uint8_t ip_family; + uint8_t auth; DBG("cid %u", ctx->cid); @@ -178,6 +179,29 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc, qmi_param_append_uint8(param, QMI_WDS_PARAM_IP_FAMILY, ip_family); + switch (ctx->auth_method) { + case OFONO_GPRS_AUTH_METHOD_CHAP: + auth = QMI_WDS_AUTHENTICATION_CHAP; + break; + case OFONO_GPRS_AUTH_METHOD_PAP: + auth = QMI_WDS_AUTHENTICATION_PAP; + break; + default: + auth = QMI_WDS_AUTHENTICATION_NONE; + break; + } + qmi_param_append_uint8(param, QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE, + auth); + + if (ctx->username && strlen(ctx->username)) { + qmi_param_append(param, QMI_WDS_PARAM_USERNAME, + strlen(ctx->username), ctx->username); + } + + if (ctx->password && strlen(ctx->password)) + qmi_param_append(param, QMI_WDS_PARAM_PASSWORD, + strlen(ctx->password), ctx->password); + if (qmi_service_send(data->wds, QMI_WDS_START_NET, param, start_net_cb, cbd, NULL) > 0) return; diff --git a/drivers/qmimodem/wds.h b/drivers/qmimodem/wds.h index 0da34ab9..4843f925 100644 --- a/drivers/qmimodem/wds.h +++ b/drivers/qmimodem/wds.h @@ -30,6 +30,13 @@ /* Start WDS network interface */ #define QMI_WDS_PARAM_APN 0x14 /* string */ #define QMI_WDS_PARAM_IP_FAMILY 0x19 /* uint8 */ +#define QMI_WDS_PARAM_USERNAME 0x17 /* string */ +#define QMI_WDS_PARAM_PASSWORD 0x18 /* string */ +#define QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE 0x16 /* uint8 */ + +#define QMI_WDS_AUTHENTICATION_NONE 0x0 +#define QMI_WDS_AUTHENTICATION_PAP 0x1 +#define QMI_WDS_AUTHENTICATION_CHAP 0x2 #define QMI_WDS_RESULT_PKT_HANDLE 0x01 /* uint32 */ -- 2.11.0

4 years, 2 months

2
4
0 / 0

[PATCH v2] drivers: add support for Telit LE910 V2 modem

by Piotr Haber

LE910 V2 is next generation Telit LTE modem. It supports 3GPP Rel. 9 LTE Cat. 4 over multiple bands. Default USB composition uses PID 0x36 and consists of 6 CDC-ACM serial ports and 1 CDC-NCM network adapter. For network interface configuration after context setup see doc/telit-modem.txt --- Changes in v2: - Fix copyright - De-attach before configuring context Makefile.am | 6 +- doc/telit-modem.txt | 28 ++ drivers/telitmodem/gprs-context-ncm.c | 497 ++++++++++++++++++++++++++++++++++ drivers/telitmodem/telitmodem.c | 2 + drivers/telitmodem/telitmodem.h | 2 + plugins/le910v2.c | 400 +++++++++++++++++++++++++++ plugins/udevng.c | 38 +++ 7 files changed, 972 insertions(+), 1 deletion(-) create mode 100644 drivers/telitmodem/gprs-context-ncm.c create mode 100644 plugins/le910v2.c diff --git a/Makefile.am b/Makefile.am index f76971ec..72c4fcfc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -321,7 +321,8 @@ builtin_modules += telitmodem builtin_sources += drivers/atmodem/atutil.h \ drivers/telitmodem/telitmodem.h \ drivers/telitmodem/telitmodem.c \ - drivers/telitmodem/location-reporting.c + drivers/telitmodem/location-reporting.c \ + drivers/telitmodem/gprs-context-ncm.c builtin_modules += hsomodem builtin_sources += drivers/atmodem/atutil.h \ @@ -500,6 +501,9 @@ builtin_sources += plugins/quectel.c builtin_modules += ublox builtin_sources += plugins/ublox.c +builtin_modules += le910v2 +builtin_sources += plugins/le910v2.c + if BLUETOOTH if BLUEZ4 builtin_modules += telit diff --git a/doc/telit-modem.txt b/doc/telit-modem.txt index 1627fb4c..b1b968b7 100644 --- a/doc/telit-modem.txt +++ b/doc/telit-modem.txt @@ -17,3 +17,31 @@ GPS: After setting the configuration, a power cycle is required. Port Configiuration #8 is available since firmware 12.00.004. Firmware version can be checked using 'AT+CGMR'. + +LE910 V2 +======== + +Default USB composition of LE910V2 uses PID 0x36 (AT#PORTCFG=0) +and consists of 6 serial ports (CDC-ACM standard, /dev/ttyACMx) +and 1 network adapter using CDC-NCM standard (wwanx or usbx). + +NCM interface configuration follows Telit documentation +(both documents available on Telit Download Zone - registration required) +"GE/HE/UE910, UL865, LE910 V2 Linux USB Driver - User Guide r0" +(document 1VV0301255 Rev.0 - 2016-01-22) +and "Telit LE910-V2 NCM SETUP r3" +(document 1VV0301246 Rev.3 - 2016-11-29). + +After context is setup, NCM mode activated and PDP context activated +connection configuration can be read using +AT+CGPADDR=context_id and AT+CGCONTRDP=context_id commands. +This is done automatically and results available via +org.ofono.ConnectionContext.GetProperties DBus method. + +Then Linux network interface needs to be configured: + ifconfig <Interface> <Address> netmask <Netmask> up + route add default gw <Gateway> + arp -s <Gateway> 11:22:33:44:55:66 + +Only after these steps network interface is usable. + diff --git a/drivers/telitmodem/gprs-context-ncm.c b/drivers/telitmodem/gprs-context-ncm.c new file mode 100644 index 00000000..25f93632 --- /dev/null +++ b/drivers/telitmodem/gprs-context-ncm.c @@ -0,0 +1,497 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2017 Piotr Haber. 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 <string.h> +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> +#include <sys/stat.h> + +#include <glib.h> + +#include <ofono/log.h> +#include <ofono/modem.h> +#include <ofono/gprs-context.h> + +#include "gatchat.h" +#include "gatresult.h" +#include "gatrawip.h" + +#include "telitmodem.h" + +static const char *none_prefix[] = { NULL }; +static const char *cgpaddr_prefix[] = { "+CGPADDR:", NULL }; +static const char *cgcontrdp_prefix[] = { "+CGCONTRDP:", NULL }; + +enum state { + STATE_IDLE, + STATE_ENABLING, + STATE_DISABLING, + STATE_ACTIVE, +}; + +enum auth_method { + AUTH_METHOD_NONE, + AUTH_METHOD_PAP, + AUTH_METHOD_CHAP, +}; + +struct gprs_context_data { + GAtChat *chat; + unsigned int active_context; + char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1]; + char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1]; + enum auth_method auth_method; + enum state state; + enum ofono_gprs_proto proto; + char address[64]; + char netmask[64]; + char gateway[64]; + char dns1[64]; + char dns2[64]; + ofono_gprs_context_cb_t cb; + void *cb_data; /* Callback data */ +}; + +static void failed_setup(struct ofono_gprs_context *gc, + GAtResult *result, gboolean deactivate) +{ + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + struct ofono_error error; + char buf[64]; + + DBG("deactivate %d", deactivate); + + if (deactivate == TRUE) { + sprintf(buf, "AT+CGACT=0,%u", gcd->active_context); + g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL); + } + + gcd->active_context = 0; + gcd->state = STATE_IDLE; + + if (result == NULL) { + CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data); + return; + } + + decode_at_error(&error, g_at_result_final_response(result)); + gcd->cb(&error, gcd->cb_data); +} + +static void session_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + struct ofono_modem *modem; + const char *interface; + const char *dns[3]; + + DBG("ok %d", ok); + + if (!ok) { + ofono_error("Failed to establish session"); + failed_setup(gc, result, TRUE); + return; + } + + gcd->state = STATE_ACTIVE; + + dns[0] = gcd->dns1; + dns[1] = gcd->dns2; + dns[2] = 0; + + modem = ofono_gprs_context_get_modem(gc); + interface = ofono_modem_get_string(modem, "NetworkInterface"); + + ofono_gprs_context_set_interface(gc, interface); + ofono_gprs_context_set_ipv4_address(gc, gcd->address, TRUE); + ofono_gprs_context_set_ipv4_netmask(gc, gcd->netmask); + ofono_gprs_context_set_ipv4_gateway(gc, gcd->gateway); + ofono_gprs_context_set_ipv4_dns_servers(gc, dns); + + CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data); + gcd->cb = NULL; + gcd->cb_data = NULL; +} + +static void contrdp_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + char buf[64]; + int cid, bearer_id; + const char *apn, *ip_mask, *gw; + const char *dns1, *dns2; + GAtResultIter iter; + gboolean found = FALSE; + + DBG("ok %d", ok); + + if (!ok) { + ofono_error("Unable to get context dynamic paramerers"); + failed_setup(gc, result, TRUE); + return; + } + + g_at_result_iter_init(&iter, result); + + while (g_at_result_iter_next(&iter, "+CGCONTRDP:")) { + if (!g_at_result_iter_next_number(&iter, &cid)) + goto error; + if (!g_at_result_iter_next_number(&iter, &bearer_id)) + goto error; + if (!g_at_result_iter_next_string(&iter, &apn)) + goto error; + if (!g_at_result_iter_next_string(&iter, &ip_mask)) + goto error; + if (!g_at_result_iter_next_string(&iter, &gw)) + goto error; + if (!g_at_result_iter_next_string(&iter, &dns1)) + goto error; + if (!g_at_result_iter_next_string(&iter, &dns2)) + goto error; + + if ((unsigned int) cid == gcd->active_context) { + found = TRUE; + if (gcd->address && strcmp(gcd->address, "") != 0) { + strncpy(gcd->netmask, + &ip_mask[strlen(gcd->address)+1], + sizeof(gcd->netmask)); + } + strncpy(gcd->gateway, gw, sizeof(gcd->gateway)); + strncpy(gcd->dns1, dns1, sizeof(gcd->dns1)); + strncpy(gcd->dns2, dns2, sizeof(gcd->dns2)); + } + } + + if (found == FALSE) + goto error; + + ofono_info("IP: %s", gcd->address); + ofono_info("MASK: %s", gcd->netmask); + ofono_info("GW: %s", gcd->gateway); + ofono_info("DNS: %s, %s", gcd->dns1, gcd->dns2); + + sprintf(buf, "AT+CGDATA=\"M-RAW_IP\",%d", gcd->active_context); + if (g_at_chat_send(gcd->chat, buf, none_prefix, + session_cb, gc, NULL) > 0) + return; + +error: + failed_setup(gc, NULL, TRUE); +} + +static void address_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + int cid; + const char *address; + char buf[64]; + GAtResultIter iter; + + DBG("ok %d", ok); + + if (!ok) { + ofono_error("Unable to get context address"); + failed_setup(gc, result, TRUE); + return; + } + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "+CGPADDR:")) + goto error; + + if (!g_at_result_iter_next_number(&iter, &cid)) + goto error; + + if ((unsigned int) cid != gcd->active_context) + goto error; + + if (!g_at_result_iter_next_string(&iter, &address)) + goto error; + + strncpy(gcd->address, address, sizeof(gcd->address)); + + sprintf(buf, "AT+CGCONTRDP=%d", gcd->active_context); + if (g_at_chat_send(gcd->chat, buf, cgcontrdp_prefix, + contrdp_cb, gc, NULL) > 0) + return; + +error: + failed_setup(gc, NULL, TRUE); +} + +static void activate_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + char buf[64]; + + DBG("ok %d", ok); + + if (!ok) { + ofono_error("Unable to activate context"); + failed_setup(gc, result, FALSE); + return; + } + + sprintf(buf, "AT+CGPADDR=%u", gcd->active_context); + if (g_at_chat_send(gcd->chat, buf, cgpaddr_prefix, + address_cb, gc, NULL) > 0) + return; + + failed_setup(gc, NULL, TRUE); +} + +static void setup_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + char buf[128]; + + DBG("ok %d", ok); + + if (!ok) { + ofono_error("Failed to setup context"); + failed_setup(gc, result, FALSE); + return; + } + + if (gcd->username[0] && gcd->password[0]) + sprintf(buf, "AT#PDPAUTH=%u,%u,\"%s\",\"%s\"", + gcd->active_context, gcd->auth_method, + gcd->username, gcd->password); + else + sprintf(buf, "AT#PDPAUTH=%u,0", gcd->active_context); + + if (g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL) == 0) + goto error; + + sprintf(buf, "AT#NCM=1,%u", gcd->active_context); + + if (g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL) == 0) + goto error; + + sprintf(buf, "AT+CGACT=1,%u", gcd->active_context); + + if (g_at_chat_send(gcd->chat, buf, none_prefix, + activate_cb, gc, NULL) > 0) + return; + +error: + failed_setup(gc, NULL, FALSE); +} + +static void telitncm_gprs_activate_primary(struct ofono_gprs_context *gc, + const struct ofono_gprs_primary_context *ctx, + ofono_gprs_context_cb_t cb, void *data) +{ + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + char buf[OFONO_GPRS_MAX_APN_LENGTH + 128]; + int len = 0; + + DBG("cid %u", ctx->cid); + + gcd->active_context = ctx->cid; + gcd->cb = cb; + gcd->cb_data = data; + memcpy(gcd->username, ctx->username, sizeof(ctx->username)); + memcpy(gcd->password, ctx->password, sizeof(ctx->password)); + gcd->state = STATE_ENABLING; + gcd->proto = ctx->proto; + + /* We only support CHAP and PAP */ + switch (ctx->auth_method) { + case OFONO_GPRS_AUTH_METHOD_CHAP: + gcd->auth_method = AUTH_METHOD_CHAP; + break; + case OFONO_GPRS_AUTH_METHOD_PAP: + gcd->auth_method = AUTH_METHOD_PAP; + break; + default: + gcd->auth_method = AUTH_METHOD_NONE; + break; + } + + g_at_chat_send(gcd->chat, "AT+CGATT=0", none_prefix, NULL, NULL, NULL); + + switch (ctx->proto) { + case OFONO_GPRS_PROTO_IP: + len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"", + ctx->cid); + break; + case OFONO_GPRS_PROTO_IPV6: + len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IPV6\"", + ctx->cid); + break; + case OFONO_GPRS_PROTO_IPV4V6: + len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IPV4V6\"", + ctx->cid); + break; + } + + if (ctx->apn) + snprintf(buf + len, sizeof(buf) - len - 3, + ",\"%s\"", ctx->apn); + + if (g_at_chat_send(gcd->chat, buf, none_prefix, + setup_cb, gc, NULL) > 0) + return; + + CALLBACK_WITH_FAILURE(cb, data); +} + +static void deactivate_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + + DBG("ok %d", ok); + + gcd->active_context = 0; + gcd->state = STATE_IDLE; + + CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data); + gcd->cb = NULL; + gcd->cb_data = NULL; +} + +static void telitncm_gprs_deactivate_primary(struct ofono_gprs_context *gc, + unsigned int cid, + ofono_gprs_context_cb_t cb, void *data) +{ + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + char buf[64]; + + DBG("cid %u", cid); + + gcd->state = STATE_DISABLING; + gcd->cb = cb; + gcd->cb_data = data; + + sprintf(buf, "AT+CGACT=0,%u", gcd->active_context); + if (g_at_chat_send(gcd->chat, buf, none_prefix, + deactivate_cb, gc, NULL) > 0) + return; + + CALLBACK_WITH_SUCCESS(cb, data); + gcd->cb = NULL; + gcd->cb_data = NULL; +} + +static void cgev_notify(GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + const char *event; + int cid; + GAtResultIter iter; + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "+CGEV:")) + return; + + if (!g_at_result_iter_next_unquoted_string(&iter, &event)) + return; + + if (g_str_has_prefix(event, "NW DEACT") == FALSE) + return; + + if (!g_at_result_iter_skip_next(&iter)) + return; + + if (!g_at_result_iter_next_number(&iter, &cid)) + return; + + DBG("cid %d", cid); + + if ((unsigned int) cid != gcd->active_context) + return; + + + ofono_gprs_context_deactivated(gc, gcd->active_context); + + gcd->active_context = 0; + gcd->state = STATE_IDLE; + +} + +static int telitncm_gprs_context_probe(struct ofono_gprs_context *gc, + unsigned int vendor, void *data) +{ + GAtChat *chat = data; + struct gprs_context_data *gcd; + + DBG(""); + + gcd = g_try_new0(struct gprs_context_data, 1); + if (gcd == NULL) + return -ENOMEM; + + gcd->chat = g_at_chat_clone(chat); + + ofono_gprs_context_set_data(gc, gcd); + + chat = g_at_chat_get_slave(gcd->chat); + + g_at_chat_register(chat, "+CGEV:", cgev_notify, FALSE, gc, NULL); + + return 0; +} + +static void telitncm_gprs_context_remove(struct ofono_gprs_context *gc) +{ + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + + DBG(""); + + ofono_gprs_context_set_data(gc, NULL); + + g_at_chat_unref(gcd->chat); + g_free(gcd); +} + +static struct ofono_gprs_context_driver driver = { + .name = "telitncmmodem", + .probe = telitncm_gprs_context_probe, + .remove = telitncm_gprs_context_remove, + .activate_primary = telitncm_gprs_activate_primary, + .deactivate_primary = telitncm_gprs_deactivate_primary, +}; + +void telitncm_gprs_context_init(void) +{ + ofono_gprs_context_driver_register(&driver); +} + +void telitncm_gprs_context_exit(void) +{ + ofono_gprs_context_driver_unregister(&driver); +} diff --git a/drivers/telitmodem/telitmodem.c b/drivers/telitmodem/telitmodem.c index ecb84efb..4aa2c444 100644 --- a/drivers/telitmodem/telitmodem.c +++ b/drivers/telitmodem/telitmodem.c @@ -35,6 +35,7 @@ static int telitmodem_init(void) { telit_location_reporting_init(); + telitncm_gprs_context_init(); return 0; } @@ -42,6 +43,7 @@ static int telitmodem_init(void) static void telitmodem_exit(void) { telit_location_reporting_exit(); + telitncm_gprs_context_exit(); } OFONO_PLUGIN_DEFINE(telitmodem, "Telit modem driver", VERSION, diff --git a/drivers/telitmodem/telitmodem.h b/drivers/telitmodem/telitmodem.h index 2db41787..8a14595a 100644 --- a/drivers/telitmodem/telitmodem.h +++ b/drivers/telitmodem/telitmodem.h @@ -23,3 +23,5 @@ extern void telit_location_reporting_init(); extern void telit_location_reporting_exit(); +extern void telitncm_gprs_context_init(); +extern void telitncm_gprs_context_exit(); diff --git a/plugins/le910v2.c b/plugins/le910v2.c new file mode 100644 index 00000000..e758971d --- /dev/null +++ b/plugins/le910v2.c @@ -0,0 +1,400 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2017 Piotr Haber. 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 <stdio.h> +#include <unistd.h> +#include <fcntl.h> +#include <termios.h> +#include <string.h> +#include <sys/socket.h> + +#include <glib.h> +#include <gatchat.h> +#include <gattty.h> + +#define OFONO_API_SUBJECT_TO_CHANGE +#include <ofono/plugin.h> +#include <ofono/log.h> +#include <ofono/modem.h> +#include <ofono/call-barring.h> +#include <ofono/call-forwarding.h> +#include <ofono/call-meter.h> +#include <ofono/call-settings.h> +#include <ofono/devinfo.h> +#include <ofono/message-waiting.h> +#include <ofono/location-reporting.h> +#include <ofono/netreg.h> +#include <ofono/phonebook.h> +#include <ofono/sim.h> +#include <ofono/gprs.h> +#include <ofono/gprs-context.h> +#include <ofono/sms.h> +#include <ofono/ussd.h> +#include <ofono/voicecall.h> + +#include <drivers/atmodem/atutil.h> +#include <drivers/atmodem/vendor.h> + +static const char *none_prefix[] = { NULL }; +static const char *qss_prefix[] = { "#QSS:", NULL }; + +struct le910v2_data { + GAtChat *chat; /* AT chat */ + GAtChat *modem; /* Data port */ + struct ofono_sim *sim; + ofono_bool_t have_sim; + ofono_bool_t sms_phonebook_added; +}; + +static void le910v2_debug(const char *str, void *user_data) +{ + const char *prefix = user_data; + + ofono_info("%s%s", prefix, str); +} + +static GAtChat *open_device(struct ofono_modem *modem, + const char *key, char *debug) +{ + const char *device; + GAtSyntax *syntax; + GIOChannel *channel; + GAtChat *chat; + GHashTable *options; + + device = ofono_modem_get_string(modem, key); + if (device == NULL) + return NULL; + + DBG("%s %s", key, device); + + options = g_hash_table_new(g_str_hash, g_str_equal); + if (options == NULL) + return NULL; + + g_hash_table_insert(options, "Baud", "115200"); + channel = g_at_tty_open(device, options); + g_hash_table_destroy(options); + + 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, le910v2_debug, debug); + + return chat; +} + +static void switch_sim_state_status(struct ofono_modem *modem, int status) +{ + struct le910v2_data *data = ofono_modem_get_data(modem); + + DBG("%p, SIM status: %d", modem, status); + + switch (status) { + case 0: /* SIM not inserted */ + if (data->have_sim == TRUE) { + ofono_sim_inserted_notify(data->sim, FALSE); + data->have_sim = FALSE; + data->sms_phonebook_added = FALSE; + } + break; + case 1: /* SIM inserted */ + case 2: /* SIM inserted and PIN unlocked */ + if (data->have_sim == FALSE) { + ofono_sim_inserted_notify(data->sim, TRUE); + data->have_sim = TRUE; + } + break; + case 3: /* SIM inserted, SMS and phonebook ready */ + if (data->have_sim == FALSE) { + ofono_sim_inserted_notify(data->sim, TRUE); + data->have_sim = TRUE; + } + if (data->sms_phonebook_added == FALSE) { + ofono_phonebook_create(modem, 0, "atmodem", data->chat); + ofono_sms_create(modem, 0, "atmodem", data->chat); + data->sms_phonebook_added = TRUE; + } + break; + default: + ofono_warn("Unknown SIM state %d received", status); + break; + } +} + +static void le910v2_qss_notify(GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + int status; + GAtResultIter iter; + + DBG("%p", modem); + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "#QSS:")) + return; + + g_at_result_iter_next_number(&iter, &status); + + switch_sim_state_status(modem, status); +} + +static void qss_query_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + int status, mode; + GAtResultIter iter; + + DBG("%p", modem); + + if (!ok) + return; + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "#QSS:")) + return; + + if (!g_at_result_iter_next_number(&iter, &mode)) + return; + + if (!g_at_result_iter_next_number(&iter, &status)) + return; + + switch_sim_state_status(modem, status); +} + +static void cfun_enable_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + struct le910v2_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + if (!ok) { + g_at_chat_unref(data->chat); + data->chat = NULL; + + g_at_chat_unref(data->modem); + data->modem = NULL; + + ofono_modem_set_powered(modem, FALSE); + return; + } + + /* + * Switch data carrier detect signal off. + * When the DCD is disabled the modem does not hangup anymore + * after the data connection. + */ + g_at_chat_send(data->chat, "AT&C0", NULL, NULL, NULL, NULL); + + data->have_sim = FALSE; + data->sms_phonebook_added = FALSE; + + ofono_modem_set_powered(modem, TRUE); + + /* + * Tell the modem not to automatically initiate auto-attach + * proceedures on its own. + */ + g_at_chat_send(data->chat, "AT#AUTOATT=0", none_prefix, + NULL, NULL, NULL); + + /* Follow sim state */ + g_at_chat_register(data->chat, "#QSS:", le910v2_qss_notify, + FALSE, modem, NULL); + + /* Enable sim state notification */ + g_at_chat_send(data->chat, "AT#QSS=2", none_prefix, NULL, NULL, NULL); + + g_at_chat_send(data->chat, "AT#QSS?", qss_prefix, + qss_query_cb, modem, NULL); +} + +static int le910v2_enable(struct ofono_modem *modem) +{ + struct le910v2_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + data->modem = open_device(modem, "Modem", "Modem: "); + if (data->modem == NULL) + return -EINVAL; + + data->chat = open_device(modem, "Aux", "Aux: "); + if (data->chat == NULL) { + g_at_chat_unref(data->modem); + data->modem = NULL; + return -EIO; + } + + /* + * Disable command echo and + * enable the Extended Error Result Codes + */ + g_at_chat_send(data->chat, "ATE0 +CMEE=1", none_prefix, + NULL, NULL, NULL); + + g_at_chat_send(data->modem, "ATE0", none_prefix, + NULL, NULL, NULL); + + /* Set phone functionality */ + g_at_chat_send(data->chat, "AT+CFUN=1", none_prefix, + cfun_enable_cb, modem, NULL); + + return -EINPROGRESS; +} + +static void cfun_disable_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + struct le910v2_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + g_at_chat_unref(data->chat); + data->chat = NULL; + + if (ok) + ofono_modem_set_powered(modem, FALSE); +} + +static int le910v2_disable(struct ofono_modem *modem) +{ + struct le910v2_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->chat); + g_at_chat_unregister_all(data->chat); + + /* Power down modem */ + g_at_chat_send(data->chat, "AT+CFUN=4", none_prefix, + cfun_disable_cb, modem, NULL); + + return -EINPROGRESS; +} + +static void le910v2_pre_sim(struct ofono_modem *modem) +{ + struct le910v2_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + ofono_devinfo_create(modem, 0, "atmodem", data->chat); + data->sim = ofono_sim_create(modem, OFONO_VENDOR_TELIT, "atmodem", + data->chat); +} + +static void le910v2_post_online(struct ofono_modem *modem) +{ + struct le910v2_data *data = ofono_modem_get_data(modem); + struct ofono_gprs *gprs; + struct ofono_gprs_context *gc; + + DBG("%p", modem); + + ofono_netreg_create(modem, OFONO_VENDOR_TELIT, "atmodem", data->chat); + gprs = ofono_gprs_create(modem, OFONO_VENDOR_TELIT, "atmodem", + data->chat); + gc = ofono_gprs_context_create(modem, OFONO_VENDOR_TELIT, "telitncmmodem", + data->modem); + + if (gprs && gc) + ofono_gprs_add_context(gprs, gc); +} + +static int le910v2_probe(struct ofono_modem *modem) +{ + struct le910v2_data *data; + + DBG("%p", modem); + + data = g_try_new0(struct le910v2_data, 1); + if (data == NULL) + return -ENOMEM; + + ofono_modem_set_data(modem, data); + + return 0; +} + +static void le910v2_remove(struct ofono_modem *modem) +{ + struct le910v2_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->chat); + g_at_chat_unref(data->modem); + + g_free(data); +} + +static struct ofono_modem_driver le910v2_driver = { + .name = "le910v2", + .probe = le910v2_probe, + .remove = le910v2_remove, + .enable = le910v2_enable, + .disable = le910v2_disable, + .pre_sim = le910v2_pre_sim, + .post_online = le910v2_post_online, +}; + +static int le910v2_init(void) +{ + DBG(""); + + return ofono_modem_driver_register(&le910v2_driver); +} + +static void le910v2_exit(void) +{ + ofono_modem_driver_unregister(&le910v2_driver); +} + +OFONO_PLUGIN_DEFINE(le910v2, "Telit LE910 V2 driver", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, le910v2_init, le910v2_exit) diff --git a/plugins/udevng.c b/plugins/udevng.c index 50089129..90ddeeab 100644 --- a/plugins/udevng.c +++ b/plugins/udevng.c @@ -957,6 +957,41 @@ static gboolean setup_gemalto(struct modem_info* modem) return TRUE; } +static gboolean setup_le910v2(struct modem_info *modem) +{ + const char *aux = NULL, *mdm = NULL, *network = NULL; + GSList *list; + + DBG("%s", modem->syspath); + + for (list = modem->devices; list; list = list->next) { + struct device_info *info = list->data; + + DBG("%s %s %s %s %s", info->devnode, info->interface, + info->number, info->label, info->sysattr); + + if (g_strcmp0(info->interface, "2/2/1") == 0) { + if (g_strcmp0(info->number, "00") == 0) + aux = info->devnode; + else if (g_strcmp0(info->number, "06") == 0) + mdm = info->devnode; + } else if (info->sysattr && (g_str_has_suffix(info->sysattr, + "CDC NCM") == TRUE)) { + network = info->devnode; + } + } + DBG("aux=%s modem=%s network=%s", aux, mdm, network); + + if (aux == NULL || mdm == NULL || network == NULL) + return FALSE; + + ofono_modem_set_string(modem->modem, "Aux", aux); + ofono_modem_set_string(modem->modem, "Modem", mdm); + ofono_modem_set_string(modem->modem, "NetworkInterface", network); + + return TRUE; +} + static struct { const char *name; gboolean (*setup)(struct modem_info *modem); @@ -984,6 +1019,7 @@ static struct { { "quectel", setup_quectel }, { "ublox", setup_ublox }, { "gemalto", setup_gemalto }, + { "le910v2", setup_le910v2, "device/interface" }, { } }; @@ -1226,6 +1262,8 @@ static struct { { "gemalto", "option", "1e2d", "0053" }, { "gemalto", "cdc_wdm", "1e2d", "0053" }, { "gemalto", "qmi_wwan", "1e2d", "0053" }, + { "le910v2", "cdc_ncm", "1bc7", "0036" }, + { "le910v2", "cdc_acm", "1bc7", "0036" }, { } }; -- 2.11.0

4 years, 2 months

4
13
0 / 0

[PATCH] atmodem: add LTE to Telit #PSNT parser

by Piotr Haber

Network type of 4 in Telit #PSNT command response denotes LTE network. --- drivers/atmodem/gprs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/atmodem/gprs.c b/drivers/atmodem/gprs.c index 5724f861..7ea9f005 100644 --- a/drivers/atmodem/gprs.c +++ b/drivers/atmodem/gprs.c @@ -323,6 +323,9 @@ static void telit_mode_notify(GAtResult *result, gpointer user_data) case 3: bearer = 5; /* HSDPA */ break; + case 4: + bearer = 7; /* LTE */ + break; default: bearer = 0; break; -- 2.11.0

4 years, 2 months

2
3
0 / 0

[PATCH] drivers: add support for Telit LE910 V2 modem

by gluedig＠gmail.com

LE910 V2 is next generation Telit LTE modem. It supports 3GPP Rel. 9 LTE Cat. 4 over multiple bands. Default USB composition uses PID 0x36 and consists 6 CDC-ACM serial ports and 1 CDC-NCM network adapter. For network interface configuration after context setup see doc/telit-modem.txt --- Makefile.am | 6 +- doc/telit-modem.txt | 28 ++ drivers/telitmodem/gprs-context-ncm.c | 495 ++++++++++++++++++++++++++++++++++ drivers/telitmodem/telitmodem.c | 2 + drivers/telitmodem/telitmodem.h | 2 + plugins/le910v2.c | 400 +++++++++++++++++++++++++++ plugins/udevng.c | 38 +++ 7 files changed, 970 insertions(+), 1 deletion(-) create mode 100644 drivers/telitmodem/gprs-context-ncm.c create mode 100644 plugins/le910v2.c diff --git a/Makefile.am b/Makefile.am index f76971ec..72c4fcfc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -321,7 +321,8 @@ builtin_modules += telitmodem builtin_sources += drivers/atmodem/atutil.h \ drivers/telitmodem/telitmodem.h \ drivers/telitmodem/telitmodem.c \ - drivers/telitmodem/location-reporting.c + drivers/telitmodem/location-reporting.c \ + drivers/telitmodem/gprs-context-ncm.c builtin_modules += hsomodem builtin_sources += drivers/atmodem/atutil.h \ @@ -500,6 +501,9 @@ builtin_sources += plugins/quectel.c builtin_modules += ublox builtin_sources += plugins/ublox.c +builtin_modules += le910v2 +builtin_sources += plugins/le910v2.c + if BLUETOOTH if BLUEZ4 builtin_modules += telit diff --git a/doc/telit-modem.txt b/doc/telit-modem.txt index 1627fb4c..b1b968b7 100644 --- a/doc/telit-modem.txt +++ b/doc/telit-modem.txt @@ -17,3 +17,31 @@ GPS: After setting the configuration, a power cycle is required. Port Configiuration #8 is available since firmware 12.00.004. Firmware version can be checked using 'AT+CGMR'. + +LE910 V2 +======== + +Default USB composition of LE910V2 uses PID 0x36 (AT#PORTCFG=0) +and consists of 6 serial ports (CDC-ACM standard, /dev/ttyACMx) +and 1 network adapter using CDC-NCM standard (wwanx or usbx). + +NCM interface configuration follows Telit documentation +(both documents available on Telit Download Zone - registration required) +"GE/HE/UE910, UL865, LE910 V2 Linux USB Driver - User Guide r0" +(document 1VV0301255 Rev.0 - 2016-01-22) +and "Telit LE910-V2 NCM SETUP r3" +(document 1VV0301246 Rev.3 - 2016-11-29). + +After context is setup, NCM mode activated and PDP context activated +connection configuration can be read using +AT+CGPADDR=context_id and AT+CGCONTRDP=context_id commands. +This is done automatically and results available via +org.ofono.ConnectionContext.GetProperties DBus method. + +Then Linux network interface needs to be configured: + ifconfig <Interface> <Address> netmask <Netmask> up + route add default gw <Gateway> + arp -s <Gateway> 11:22:33:44:55:66 + +Only after these steps network interface is usable. + diff --git a/drivers/telitmodem/gprs-context-ncm.c b/drivers/telitmodem/gprs-context-ncm.c new file mode 100644 index 00000000..4e47bcc2 --- /dev/null +++ b/drivers/telitmodem/gprs-context-ncm.c @@ -0,0 +1,495 @@ +/* + * + * 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 <string.h> +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> +#include <sys/stat.h> + +#include <glib.h> + +#include <ofono/log.h> +#include <ofono/modem.h> +#include <ofono/gprs-context.h> + +#include "gatchat.h" +#include "gatresult.h" +#include "gatrawip.h" + +#include "telitmodem.h" + +static const char *none_prefix[] = { NULL }; +static const char *cgpaddr_prefix[] = { "+CGPADDR:", NULL }; +static const char *cgcontrdp_prefix[] = { "+CGCONTRDP:", NULL }; + +enum state { + STATE_IDLE, + STATE_ENABLING, + STATE_DISABLING, + STATE_ACTIVE, +}; + +enum auth_method { + AUTH_METHOD_NONE, + AUTH_METHOD_PAP, + AUTH_METHOD_CHAP, +}; + +struct gprs_context_data { + GAtChat *chat; + unsigned int active_context; + char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1]; + char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1]; + enum auth_method auth_method; + enum state state; + enum ofono_gprs_proto proto; + char address[64]; + char netmask[64]; + char gateway[64]; + char dns1[64]; + char dns2[64]; + ofono_gprs_context_cb_t cb; + void *cb_data; /* Callback data */ +}; + +static void failed_setup(struct ofono_gprs_context *gc, + GAtResult *result, gboolean deactivate) +{ + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + struct ofono_error error; + char buf[64]; + + DBG("deactivate %d", deactivate); + + if (deactivate == TRUE) { + sprintf(buf, "AT+CGACT=0,%u", gcd->active_context); + g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL); + } + + gcd->active_context = 0; + gcd->state = STATE_IDLE; + + if (result == NULL) { + CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data); + return; + } + + decode_at_error(&error, g_at_result_final_response(result)); + gcd->cb(&error, gcd->cb_data); +} + +static void session_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + struct ofono_modem *modem; + const char *interface; + const char *dns[3]; + + DBG("ok %d", ok); + + if (!ok) { + ofono_error("Failed to establish session"); + failed_setup(gc, result, TRUE); + return; + } + + gcd->state = STATE_ACTIVE; + + dns[0] = gcd->dns1; + dns[1] = gcd->dns2; + dns[2] = 0; + + modem = ofono_gprs_context_get_modem(gc); + interface = ofono_modem_get_string(modem, "NetworkInterface"); + + ofono_gprs_context_set_interface(gc, interface); + ofono_gprs_context_set_ipv4_address(gc, gcd->address, TRUE); + ofono_gprs_context_set_ipv4_netmask(gc, gcd->netmask); + ofono_gprs_context_set_ipv4_gateway(gc, gcd->gateway); + ofono_gprs_context_set_ipv4_dns_servers(gc, dns); + + CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data); + gcd->cb = NULL; + gcd->cb_data = NULL; +} + +static void contrdp_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + char buf[64]; + int cid, bearer_id; + const char *apn, *ip_mask, *gw; + const char *dns1, *dns2; + GAtResultIter iter; + gboolean found = FALSE; + + DBG("ok %d", ok); + + if (!ok) { + ofono_error("Unable to get context dynamic paramerers"); + failed_setup(gc, result, TRUE); + return; + } + + g_at_result_iter_init(&iter, result); + + while (g_at_result_iter_next(&iter, "+CGCONTRDP:")) { + if (!g_at_result_iter_next_number(&iter, &cid)) + goto error; + if (!g_at_result_iter_next_number(&iter, &bearer_id)) + goto error; + if (!g_at_result_iter_next_string(&iter, &apn)) + goto error; + if (!g_at_result_iter_next_string(&iter, &ip_mask)) + goto error; + if (!g_at_result_iter_next_string(&iter, &gw)) + goto error; + if (!g_at_result_iter_next_string(&iter, &dns1)) + goto error; + if (!g_at_result_iter_next_string(&iter, &dns2)) + goto error; + + if ((unsigned int) cid == gcd->active_context) { + found = TRUE; + if (gcd->address && strcmp(gcd->address, "") != 0) { + strncpy(gcd->netmask, + &ip_mask[strlen(gcd->address)+1], + sizeof(gcd->netmask)); + } + strncpy(gcd->gateway, gw, sizeof(gcd->gateway)); + strncpy(gcd->dns1, dns1, sizeof(gcd->dns1)); + strncpy(gcd->dns2, dns2, sizeof(gcd->dns2)); + } + } + + if (found == FALSE) + goto error; + + ofono_info("IP: %s", gcd->address); + ofono_info("MASK: %s", gcd->netmask); + ofono_info("GW: %s", gcd->gateway); + ofono_info("DNS: %s, %s", gcd->dns1, gcd->dns2); + + sprintf(buf, "AT+CGDATA=\"M-RAW_IP\",%d", gcd->active_context); + if (g_at_chat_send(gcd->chat, buf, none_prefix, + session_cb, gc, NULL) > 0) + return; + +error: + failed_setup(gc, NULL, TRUE); +} + +static void address_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + int cid; + const char *address; + char buf[64]; + GAtResultIter iter; + + DBG("ok %d", ok); + + if (!ok) { + ofono_error("Unable to get context address"); + failed_setup(gc, result, TRUE); + return; + } + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "+CGPADDR:")) + goto error; + + if (!g_at_result_iter_next_number(&iter, &cid)) + goto error; + + if ((unsigned int) cid != gcd->active_context) + goto error; + + if (!g_at_result_iter_next_string(&iter, &address)) + goto error; + + strncpy(gcd->address, address, sizeof(gcd->address)); + + sprintf(buf, "AT+CGCONTRDP=%d", gcd->active_context); + if (g_at_chat_send(gcd->chat, buf, cgcontrdp_prefix, + contrdp_cb, gc, NULL) > 0) + return; + +error: + failed_setup(gc, NULL, TRUE); +} + +static void activate_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + char buf[64]; + + DBG("ok %d", ok); + + if (!ok) { + ofono_error("Unable to activate context"); + failed_setup(gc, result, FALSE); + return; + } + + sprintf(buf, "AT+CGPADDR=%u", gcd->active_context); + if (g_at_chat_send(gcd->chat, buf, cgpaddr_prefix, + address_cb, gc, NULL) > 0) + return; + + failed_setup(gc, NULL, TRUE); +} + +static void setup_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + char buf[128]; + + DBG("ok %d", ok); + + if (!ok) { + ofono_error("Failed to setup context"); + failed_setup(gc, result, FALSE); + return; + } + + if (gcd->username[0] && gcd->password[0]) + sprintf(buf, "AT#PDPAUTH=%u,%u,\"%s\",\"%s\"", + gcd->active_context, gcd->auth_method, + gcd->username, gcd->password); + else + sprintf(buf, "AT#PDPAUTH=%u,0", gcd->active_context); + + if (g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL) == 0) + goto error; + + sprintf(buf, "AT#NCM=1,%u", gcd->active_context); + + if (g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL) == 0) + goto error; + + sprintf(buf, "AT+CGACT=1,%u", gcd->active_context); + + if (g_at_chat_send(gcd->chat, buf, none_prefix, + activate_cb, gc, NULL) > 0) + return; + +error: + failed_setup(gc, NULL, FALSE); +} + +static void telitncm_gprs_activate_primary(struct ofono_gprs_context *gc, + const struct ofono_gprs_primary_context *ctx, + ofono_gprs_context_cb_t cb, void *data) +{ + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + char buf[OFONO_GPRS_MAX_APN_LENGTH + 128]; + int len = 0; + + DBG("cid %u", ctx->cid); + + gcd->active_context = ctx->cid; + gcd->cb = cb; + gcd->cb_data = data; + memcpy(gcd->username, ctx->username, sizeof(ctx->username)); + memcpy(gcd->password, ctx->password, sizeof(ctx->password)); + gcd->state = STATE_ENABLING; + gcd->proto = ctx->proto; + + /* We only support CHAP and PAP */ + switch (ctx->auth_method) { + case OFONO_GPRS_AUTH_METHOD_CHAP: + gcd->auth_method = AUTH_METHOD_CHAP; + break; + case OFONO_GPRS_AUTH_METHOD_PAP: + gcd->auth_method = AUTH_METHOD_PAP; + break; + default: + gcd->auth_method = AUTH_METHOD_NONE; + break; + } + + switch (ctx->proto) { + case OFONO_GPRS_PROTO_IP: + len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"", + ctx->cid); + break; + case OFONO_GPRS_PROTO_IPV6: + len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IPV6\"", + ctx->cid); + break; + case OFONO_GPRS_PROTO_IPV4V6: + len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IPV4V6\"", + ctx->cid); + break; + } + + if (ctx->apn) + snprintf(buf + len, sizeof(buf) - len - 3, + ",\"%s\"", ctx->apn); + + if (g_at_chat_send(gcd->chat, buf, none_prefix, + setup_cb, gc, NULL) > 0) + return; + + CALLBACK_WITH_FAILURE(cb, data); +} + +static void deactivate_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + + DBG("ok %d", ok); + + gcd->active_context = 0; + gcd->state = STATE_IDLE; + + CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data); + gcd->cb = NULL; + gcd->cb_data = NULL; +} + +static void telitncm_gprs_deactivate_primary(struct ofono_gprs_context *gc, + unsigned int cid, + ofono_gprs_context_cb_t cb, void *data) +{ + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + char buf[64]; + + DBG("cid %u", cid); + + gcd->state = STATE_DISABLING; + gcd->cb = cb; + gcd->cb_data = data; + + sprintf(buf, "AT+CGACT=0,%u", gcd->active_context); + if (g_at_chat_send(gcd->chat, buf, none_prefix, + deactivate_cb, gc, NULL) > 0) + return; + + CALLBACK_WITH_SUCCESS(cb, data); + gcd->cb = NULL; + gcd->cb_data = NULL; +} + +static void cgev_notify(GAtResult *result, gpointer user_data) +{ + struct ofono_gprs_context *gc = user_data; + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + const char *event; + int cid; + GAtResultIter iter; + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "+CGEV:")) + return; + + if (!g_at_result_iter_next_unquoted_string(&iter, &event)) + return; + + if (g_str_has_prefix(event, "NW DEACT") == FALSE) + return; + + if (!g_at_result_iter_skip_next(&iter)) + return; + + if (!g_at_result_iter_next_number(&iter, &cid)) + return; + + DBG("cid %d", cid); + + if ((unsigned int) cid != gcd->active_context) + return; + + + ofono_gprs_context_deactivated(gc, gcd->active_context); + + gcd->active_context = 0; + gcd->state = STATE_IDLE; + +} + +static int telitncm_gprs_context_probe(struct ofono_gprs_context *gc, + unsigned int vendor, void *data) +{ + GAtChat *chat = data; + struct gprs_context_data *gcd; + + DBG(""); + + gcd = g_try_new0(struct gprs_context_data, 1); + if (gcd == NULL) + return -ENOMEM; + + gcd->chat = g_at_chat_clone(chat); + + ofono_gprs_context_set_data(gc, gcd); + + chat = g_at_chat_get_slave(gcd->chat); + + g_at_chat_register(chat, "+CGEV:", cgev_notify, FALSE, gc, NULL); + + return 0; +} + +static void telitncm_gprs_context_remove(struct ofono_gprs_context *gc) +{ + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + + DBG(""); + + ofono_gprs_context_set_data(gc, NULL); + + g_at_chat_unref(gcd->chat); + g_free(gcd); +} + +static struct ofono_gprs_context_driver driver = { + .name = "telitncmmodem", + .probe = telitncm_gprs_context_probe, + .remove = telitncm_gprs_context_remove, + .activate_primary = telitncm_gprs_activate_primary, + .deactivate_primary = telitncm_gprs_deactivate_primary, +}; + +void telitncm_gprs_context_init(void) +{ + ofono_gprs_context_driver_register(&driver); +} + +void telitncm_gprs_context_exit(void) +{ + ofono_gprs_context_driver_unregister(&driver); +} diff --git a/drivers/telitmodem/telitmodem.c b/drivers/telitmodem/telitmodem.c index ecb84efb..4aa2c444 100644 --- a/drivers/telitmodem/telitmodem.c +++ b/drivers/telitmodem/telitmodem.c @@ -35,6 +35,7 @@ static int telitmodem_init(void) { telit_location_reporting_init(); + telitncm_gprs_context_init(); return 0; } @@ -42,6 +43,7 @@ static int telitmodem_init(void) static void telitmodem_exit(void) { telit_location_reporting_exit(); + telitncm_gprs_context_exit(); } OFONO_PLUGIN_DEFINE(telitmodem, "Telit modem driver", VERSION, diff --git a/drivers/telitmodem/telitmodem.h b/drivers/telitmodem/telitmodem.h index 2db41787..8a14595a 100644 --- a/drivers/telitmodem/telitmodem.h +++ b/drivers/telitmodem/telitmodem.h @@ -23,3 +23,5 @@ extern void telit_location_reporting_init(); extern void telit_location_reporting_exit(); +extern void telitncm_gprs_context_init(); +extern void telitncm_gprs_context_exit(); diff --git a/plugins/le910v2.c b/plugins/le910v2.c new file mode 100644 index 00000000..a056eeb5 --- /dev/null +++ b/plugins/le910v2.c @@ -0,0 +1,400 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2014 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 <stdio.h> +#include <unistd.h> +#include <fcntl.h> +#include <termios.h> +#include <string.h> +#include <sys/socket.h> + +#include <glib.h> +#include <gatchat.h> +#include <gattty.h> + +#define OFONO_API_SUBJECT_TO_CHANGE +#include <ofono/plugin.h> +#include <ofono/log.h> +#include <ofono/modem.h> +#include <ofono/call-barring.h> +#include <ofono/call-forwarding.h> +#include <ofono/call-meter.h> +#include <ofono/call-settings.h> +#include <ofono/devinfo.h> +#include <ofono/message-waiting.h> +#include <ofono/location-reporting.h> +#include <ofono/netreg.h> +#include <ofono/phonebook.h> +#include <ofono/sim.h> +#include <ofono/gprs.h> +#include <ofono/gprs-context.h> +#include <ofono/sms.h> +#include <ofono/ussd.h> +#include <ofono/voicecall.h> + +#include <drivers/atmodem/atutil.h> +#include <drivers/atmodem/vendor.h> + +static const char *none_prefix[] = { NULL }; +static const char *qss_prefix[] = { "#QSS:", NULL }; + +struct le910v2_data { + GAtChat *chat; /* AT chat */ + GAtChat *modem; /* Data port */ + struct ofono_sim *sim; + ofono_bool_t have_sim; + ofono_bool_t sms_phonebook_added; +}; + +static void le910v2_debug(const char *str, void *user_data) +{ + const char *prefix = user_data; + + ofono_info("%s%s", prefix, str); +} + +static GAtChat *open_device(struct ofono_modem *modem, + const char *key, char *debug) +{ + const char *device; + GAtSyntax *syntax; + GIOChannel *channel; + GAtChat *chat; + GHashTable *options; + + device = ofono_modem_get_string(modem, key); + if (device == NULL) + return NULL; + + DBG("%s %s", key, device); + + options = g_hash_table_new(g_str_hash, g_str_equal); + if (options == NULL) + return NULL; + + g_hash_table_insert(options, "Baud", "115200"); + channel = g_at_tty_open(device, options); + g_hash_table_destroy(options); + + 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, le910v2_debug, debug); + + return chat; +} + +static void switch_sim_state_status(struct ofono_modem *modem, int status) +{ + struct le910v2_data *data = ofono_modem_get_data(modem); + + DBG("%p, SIM status: %d", modem, status); + + switch (status) { + case 0: /* SIM not inserted */ + if (data->have_sim == TRUE) { + ofono_sim_inserted_notify(data->sim, FALSE); + data->have_sim = FALSE; + data->sms_phonebook_added = FALSE; + } + break; + case 1: /* SIM inserted */ + case 2: /* SIM inserted and PIN unlocked */ + if (data->have_sim == FALSE) { + ofono_sim_inserted_notify(data->sim, TRUE); + data->have_sim = TRUE; + } + break; + case 3: /* SIM inserted, SMS and phonebook ready */ + if (data->have_sim == FALSE) { + ofono_sim_inserted_notify(data->sim, TRUE); + data->have_sim = TRUE; + } + if (data->sms_phonebook_added == FALSE) { + ofono_phonebook_create(modem, 0, "atmodem", data->chat); + ofono_sms_create(modem, 0, "atmodem", data->chat); + data->sms_phonebook_added = TRUE; + } + break; + default: + ofono_warn("Unknown SIM state %d received", status); + break; + } +} + +static void le910v2_qss_notify(GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + int status; + GAtResultIter iter; + + DBG("%p", modem); + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "#QSS:")) + return; + + g_at_result_iter_next_number(&iter, &status); + + switch_sim_state_status(modem, status); +} + +static void qss_query_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + int status, mode; + GAtResultIter iter; + + DBG("%p", modem); + + if (!ok) + return; + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "#QSS:")) + return; + + if (!g_at_result_iter_next_number(&iter, &mode)) + return; + + if (!g_at_result_iter_next_number(&iter, &status)) + return; + + switch_sim_state_status(modem, status); +} + +static void cfun_enable_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + struct le910v2_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + if (!ok) { + g_at_chat_unref(data->chat); + data->chat = NULL; + + g_at_chat_unref(data->modem); + data->modem = NULL; + + ofono_modem_set_powered(modem, FALSE); + return; + } + + /* + * Switch data carrier detect signal off. + * When the DCD is disabled the modem does not hangup anymore + * after the data connection. + */ + g_at_chat_send(data->chat, "AT&C0", NULL, NULL, NULL, NULL); + + data->have_sim = FALSE; + data->sms_phonebook_added = FALSE; + + ofono_modem_set_powered(modem, TRUE); + + /* + * Tell the modem not to automatically initiate auto-attach + * proceedures on its own. + */ + g_at_chat_send(data->chat, "AT#AUTOATT=0", none_prefix, + NULL, NULL, NULL); + + /* Follow sim state */ + g_at_chat_register(data->chat, "#QSS:", le910v2_qss_notify, + FALSE, modem, NULL); + + /* Enable sim state notification */ + g_at_chat_send(data->chat, "AT#QSS=2", none_prefix, NULL, NULL, NULL); + + g_at_chat_send(data->chat, "AT#QSS?", qss_prefix, + qss_query_cb, modem, NULL); +} + +static int le910v2_enable(struct ofono_modem *modem) +{ + struct le910v2_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + data->modem = open_device(modem, "Modem", "Modem: "); + if (data->modem == NULL) + return -EINVAL; + + data->chat = open_device(modem, "Aux", "Aux: "); + if (data->chat == NULL) { + g_at_chat_unref(data->modem); + data->modem = NULL; + return -EIO; + } + + /* + * Disable command echo and + * enable the Extended Error Result Codes + */ + g_at_chat_send(data->chat, "ATE0 +CMEE=1", none_prefix, + NULL, NULL, NULL); + + g_at_chat_send(data->modem, "ATE0", none_prefix, + NULL, NULL, NULL); + + /* Set phone functionality */ + g_at_chat_send(data->chat, "AT+CFUN=1", none_prefix, + cfun_enable_cb, modem, NULL); + + return -EINPROGRESS; +} + +static void cfun_disable_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + struct le910v2_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + g_at_chat_unref(data->chat); + data->chat = NULL; + + if (ok) + ofono_modem_set_powered(modem, FALSE); +} + +static int le910v2_disable(struct ofono_modem *modem) +{ + struct le910v2_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->chat); + g_at_chat_unregister_all(data->chat); + + /* Power down modem */ + g_at_chat_send(data->chat, "AT+CFUN=4", none_prefix, + cfun_disable_cb, modem, NULL); + + return -EINPROGRESS; +} + +static void le910v2_pre_sim(struct ofono_modem *modem) +{ + struct le910v2_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + ofono_devinfo_create(modem, 0, "atmodem", data->chat); + data->sim = ofono_sim_create(modem, OFONO_VENDOR_TELIT, "atmodem", + data->chat); +} + +static void le910v2_post_online(struct ofono_modem *modem) +{ + struct le910v2_data *data = ofono_modem_get_data(modem); + struct ofono_gprs *gprs; + struct ofono_gprs_context *gc; + + DBG("%p", modem); + + ofono_netreg_create(modem, OFONO_VENDOR_TELIT, "atmodem", data->chat); + gprs = ofono_gprs_create(modem, OFONO_VENDOR_TELIT, "atmodem", + data->chat); + gc = ofono_gprs_context_create(modem, OFONO_VENDOR_TELIT, "telitncmmodem", + data->modem); + + if (gprs && gc) + ofono_gprs_add_context(gprs, gc); +} + +static int le910v2_probe(struct ofono_modem *modem) +{ + struct le910v2_data *data; + + DBG("%p", modem); + + data = g_try_new0(struct le910v2_data, 1); + if (data == NULL) + return -ENOMEM; + + ofono_modem_set_data(modem, data); + + return 0; +} + +static void le910v2_remove(struct ofono_modem *modem) +{ + struct le910v2_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->chat); + g_at_chat_unref(data->modem); + + g_free(data); +} + +static struct ofono_modem_driver le910v2_driver = { + .name = "le910v2", + .probe = le910v2_probe, + .remove = le910v2_remove, + .enable = le910v2_enable, + .disable = le910v2_disable, + .pre_sim = le910v2_pre_sim, + .post_online = le910v2_post_online, +}; + +static int le910v2_init(void) +{ + DBG(""); + + return ofono_modem_driver_register(&le910v2_driver); +} + +static void le910v2_exit(void) +{ + ofono_modem_driver_unregister(&le910v2_driver); +} + +OFONO_PLUGIN_DEFINE(le910v2, "Telit LE910 V2 driver", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, le910v2_init, le910v2_exit) diff --git a/plugins/udevng.c b/plugins/udevng.c index 50089129..90ddeeab 100644 --- a/plugins/udevng.c +++ b/plugins/udevng.c @@ -957,6 +957,41 @@ static gboolean setup_gemalto(struct modem_info* modem) return TRUE; } +static gboolean setup_le910v2(struct modem_info *modem) +{ + const char *aux = NULL, *mdm = NULL, *network = NULL; + GSList *list; + + DBG("%s", modem->syspath); + + for (list = modem->devices; list; list = list->next) { + struct device_info *info = list->data; + + DBG("%s %s %s %s %s", info->devnode, info->interface, + info->number, info->label, info->sysattr); + + if (g_strcmp0(info->interface, "2/2/1") == 0) { + if (g_strcmp0(info->number, "00") == 0) + aux = info->devnode; + else if (g_strcmp0(info->number, "06") == 0) + mdm = info->devnode; + } else if (info->sysattr && (g_str_has_suffix(info->sysattr, + "CDC NCM") == TRUE)) { + network = info->devnode; + } + } + DBG("aux=%s modem=%s network=%s", aux, mdm, network); + + if (aux == NULL || mdm == NULL || network == NULL) + return FALSE; + + ofono_modem_set_string(modem->modem, "Aux", aux); + ofono_modem_set_string(modem->modem, "Modem", mdm); + ofono_modem_set_string(modem->modem, "NetworkInterface", network); + + return TRUE; +} + static struct { const char *name; gboolean (*setup)(struct modem_info *modem); @@ -984,6 +1019,7 @@ static struct { { "quectel", setup_quectel }, { "ublox", setup_ublox }, { "gemalto", setup_gemalto }, + { "le910v2", setup_le910v2, "device/interface" }, { } }; @@ -1226,6 +1262,8 @@ static struct { { "gemalto", "option", "1e2d", "0053" }, { "gemalto", "cdc_wdm", "1e2d", "0053" }, { "gemalto", "qmi_wwan", "1e2d", "0053" }, + { "le910v2", "cdc_ncm", "1bc7", "0036" }, + { "le910v2", "cdc_acm", "1bc7", "0036" }, { } }; -- 2.11.0

4 years, 2 months

1
0
0 / 0

[PATCH] drivers: Add gemaltomodem driver to handle GNSS

by Vincent Cesson

Add a new location-reporting driver for Gemalto Cinterion modems based on telit implementation + use it in gemalto plugin. It supports activation of GNSS engine (Request) with command AT^SGPSC. This driver is tested on PHS8. NMEA frames are accessible on /dev/ttyUSB1. --- Makefile.am | 6 + drivers/gemaltomodem/gemaltomodem.c | 49 ++++++ drivers/gemaltomodem/gemaltomodem.h | 25 ++++ drivers/gemaltomodem/location-reporting.c | 237 ++++++++++++++++++++++++++++++ plugins/gemalto.c | 7 +- 5 files changed, 321 insertions(+), 3 deletions(-) create mode 100644 drivers/gemaltomodem/gemaltomodem.c create mode 100644 drivers/gemaltomodem/gemaltomodem.h create mode 100644 drivers/gemaltomodem/location-reporting.c diff --git a/Makefile.am b/Makefile.am index a87c892..f76971e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -388,6 +388,12 @@ builtin_sources += drivers/atmodem/atutil.h \ drivers/ubloxmodem/lte.c +builtin_modules += gemaltomodem +builtin_sources += drivers/atmodem/atutil.h \ + drivers/gemaltomodem/gemaltomodem.h \ + drivers/gemaltomodem/gemaltomodem.c \ + drivers/gemaltomodem/location-reporting.c + if PHONESIM builtin_modules += phonesim diff --git a/drivers/gemaltomodem/gemaltomodem.c b/drivers/gemaltomodem/gemaltomodem.c new file mode 100644 index 0000000..91cf238 --- /dev/null +++ b/drivers/gemaltomodem/gemaltomodem.c @@ -0,0 +1,49 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2017 Vincent Cesson. 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 <glib.h> +#include <gatchat.h> + +#define OFONO_API_SUBJECT_TO_CHANGE +#include <ofono/plugin.h> +#include <ofono/types.h> + +#include "gemaltomodem.h" + +static int gemaltomodem_init(void) +{ + gemalto_location_reporting_init(); + + return 0; +} + +static void gemaltomodem_exit(void) +{ + gemalto_location_reporting_exit(); +} + +OFONO_PLUGIN_DEFINE(gemaltomodem, "Gemalto modem driver", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, + gemaltomodem_init, gemaltomodem_exit) diff --git a/drivers/gemaltomodem/gemaltomodem.h b/drivers/gemaltomodem/gemaltomodem.h new file mode 100644 index 0000000..7ea1e8f --- /dev/null +++ b/drivers/gemaltomodem/gemaltomodem.h @@ -0,0 +1,25 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2017 Vincent Cesson. 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 + * + */ + +#include <drivers/atmodem/atutil.h> + +extern void gemalto_location_reporting_init(); +extern void gemalto_location_reporting_exit(); diff --git a/drivers/gemaltomodem/location-reporting.c b/drivers/gemaltomodem/location-reporting.c new file mode 100644 index 0000000..bcfe00e --- /dev/null +++ b/drivers/gemaltomodem/location-reporting.c @@ -0,0 +1,237 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2017 Vincent Cesson. 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 <string.h> +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> +#include <unistd.h> + +#include <glib.h> + +#include <ofono/log.h> +#include <ofono/modem.h> +#include <ofono/location-reporting.h> + +#include "gatchat.h" +#include "gatresult.h" +#include "gattty.h" + +#include "gemaltomodem.h" + +static const char *sgpsc_prefix[] = { "^SGPSC:", NULL }; + +struct gps_data { + GAtChat *chat; +}; + +static void gemalto_gps_disable_cb(gboolean ok, GAtResult *result, + gpointer user_data) +{ + struct cb_data *cbd = user_data; + struct ofono_location_reporting *lr = cbd->user; + ofono_location_reporting_disable_cb_t cb = cbd->cb; + + DBG("lr=%p, ok=%d", lr, ok); + + if (!ok) { + struct ofono_error error; + + decode_at_error(&error, g_at_result_final_response(result)); + cb(&error, cbd->data); + + return; + } + + CALLBACK_WITH_SUCCESS(cb, cbd->data); +} + +static void gemalto_location_reporting_disable( + struct ofono_location_reporting *lr, + ofono_location_reporting_disable_cb_t cb, + void *data) +{ + struct gps_data *gd = ofono_location_reporting_get_data(lr); + struct cb_data *cbd = cb_data_new(cb, data); + + DBG("lr=%p", lr); + + cbd->user = lr; + + if (g_at_chat_send(gd->chat, "AT^SGPSC=\"Engine\",0", sgpsc_prefix, + gemalto_gps_disable_cb, cbd, g_free) > 0) + return; + + CALLBACK_WITH_FAILURE(cb, data); + + g_free(cbd); +} + +static int enable_data_stream(struct ofono_location_reporting *lr) +{ + struct ofono_modem *modem; + const char *gps_dev; + GHashTable *options; + GIOChannel *channel; + int fd; + + modem = ofono_location_reporting_get_modem(lr); + gps_dev = ofono_modem_get_string(modem, "GPS"); + + options = g_hash_table_new(g_str_hash, g_str_equal); + if (options == NULL) + return -1; + + g_hash_table_insert(options, "Baud", "115200"); + + channel = g_at_tty_open(gps_dev, options); + + g_hash_table_destroy(options); + + if (channel == NULL) + return -1; + + fd = g_io_channel_unix_get_fd(channel); + + g_io_channel_set_close_on_unref(channel, FALSE); + g_io_channel_unref(channel); + + return fd; +} + +static void gemalto_sgpsc_cb(gboolean ok, GAtResult *result, + gpointer user_data) +{ + struct cb_data *cbd = user_data; + ofono_location_reporting_enable_cb_t cb = cbd->cb; + struct ofono_location_reporting *lr = cbd->user; + struct ofono_error error; + int fd; + + DBG("lr=%p ok=%d", lr, ok); + + decode_at_error(&error, g_at_result_final_response(result)); + + if (!ok) { + cb(&error, -1, cbd->data); + + return; + } + + fd = enable_data_stream(lr); + + if (fd < 0) { + CALLBACK_WITH_FAILURE(cb, -1, cbd->data); + + return; + } + + cb(&error, fd, cbd->data); + close(fd); +} + +static void gemalto_location_reporting_enable(struct ofono_location_reporting *lr, + ofono_location_reporting_enable_cb_t cb, + void *data) +{ + struct gps_data *gd = ofono_location_reporting_get_data(lr); + struct cb_data *cbd = cb_data_new(cb, data); + + DBG("lr=%p", lr); + + cbd->user = lr; + + if (g_at_chat_send(gd->chat, "AT^SGPSC=\"Engine\",2", sgpsc_prefix, + gemalto_sgpsc_cb, cbd, NULL) > 0) + return; + + CALLBACK_WITH_FAILURE(cb, -1, cbd->data); + g_free(cbd); +} + +static void gemalto_location_reporting_support_cb(gboolean ok, GAtResult *result, + gpointer user_data) +{ + struct ofono_location_reporting *lr = user_data; + + if (!ok) { + ofono_location_reporting_remove(lr); + + return; + } + + ofono_location_reporting_register(lr); +} + +static int gemalto_location_reporting_probe(struct ofono_location_reporting *lr, + unsigned int vendor, void *data) +{ + GAtChat *chat = data; + struct gps_data *gd; + + gd = g_try_new0(struct gps_data, 1); + if (gd == NULL) + return -ENOMEM; + + gd->chat = g_at_chat_clone(chat); + + ofono_location_reporting_set_data(lr, gd); + + g_at_chat_send(gd->chat, "AT^SGPSC=?", sgpsc_prefix, + gemalto_location_reporting_support_cb, + lr, NULL); + + return 0; +} + +static void gemalto_location_reporting_remove(struct ofono_location_reporting *lr) +{ + struct gps_data *gd = ofono_location_reporting_get_data(lr); + + ofono_location_reporting_set_data(lr, NULL); + + g_at_chat_unref(gd->chat); + g_free(gd); +} + +static struct ofono_location_reporting_driver driver = { + .name = "gemaltomodem", + .type = OFONO_LOCATION_REPORTING_TYPE_NMEA, + .probe = gemalto_location_reporting_probe, + .remove = gemalto_location_reporting_remove, + .enable = gemalto_location_reporting_enable, + .disable = gemalto_location_reporting_disable, +}; + +void gemalto_location_reporting_init() +{ + ofono_location_reporting_driver_register(&driver); +} + +void gemalto_location_reporting_exit() +{ + ofono_location_reporting_driver_unregister(&driver); +} diff --git a/plugins/gemalto.c b/plugins/gemalto.c index bebb068..ffe6814 100644 --- a/plugins/gemalto.c +++ b/plugins/gemalto.c @@ -46,14 +46,14 @@ #include <ofono/sms.h> #include <ofono/ussd.h> #include <ofono/voicecall.h> - -#include <drivers/atmodem/atutil.h> - #include <ofono/gprs.h> #include <ofono/gprs-context.h> +#include <ofono/location-reporting.h> +#include <drivers/atmodem/atutil.h> #include <drivers/atmodem/vendor.h> + struct gemalto_data { GAtChat *app; GAtChat *mdm; @@ -194,6 +194,7 @@ static void gemalto_pre_sim(struct ofono_modem *modem) ofono_devinfo_create(modem, 0, "atmodem", data->app); sim = ofono_sim_create(modem, 0, "atmodem", data->app); ofono_voicecall_create(modem, 0, "atmodem", data->app); + ofono_location_reporting_create(modem, 0, "gemaltomodem", data->app); if (sim) ofono_sim_inserted_notify(sim, TRUE); -- 1.9.1

4 years, 2 months

2
1
0 / 0

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

ofono January 2017