qmimodem: Add support for GPRS data connection handling

This commit is contained in:
Marcel Holtmann 2012-06-21 20:46:04 -07:00
parent b36bb2ee50
commit b12dad8883
6 changed files with 625 additions and 2 deletions

View File

@ -155,7 +155,8 @@ if QMIMODEM
qmi_sources = drivers/qmimodem/qmi.h drivers/qmimodem/qmi.c \
drivers/qmimodem/ctl.h \
drivers/qmimodem/dms.h \
drivers/qmimodem/nas.h
drivers/qmimodem/nas.h \
drivers/qmimodem/wds.h
builtin_modules += qmimodem
builtin_sources += $(qmi_sources) \
@ -164,7 +165,9 @@ builtin_sources += $(qmi_sources) \
drivers/qmimodem/qmimodem.c \
drivers/qmimodem/devinfo.c \
drivers/qmimodem/network-registration.c \
drivers/qmimodem/sim-legacy.c
drivers/qmimodem/sim-legacy.c \
drivers/qmimodem/gprs.c \
drivers/qmimodem/gprs-context.c
builtin_modules += gobi
builtin_sources += plugins/gobi.c

View File

@ -0,0 +1,314 @@
/*
*
* oFono - Open Source Telephony
*
* Copyright (C) 2011-2012 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 <string.h>
#include <ofono/log.h>
#include <ofono/modem.h>
#include <ofono/gprs-context.h>
#include "qmi.h"
#include "wds.h"
#include "qmimodem.h"
struct gprs_context_data {
struct qmi_service *wds;
unsigned int active_context;
uint32_t pkt_handle;
};
static void pkt_status_notify(struct qmi_result *result, void *user_data)
{
struct ofono_gprs_context *gc = user_data;
struct gprs_context_data *data = ofono_gprs_context_get_data(gc);
const struct qmi_wds_notify_conn_status *status;
uint16_t len;
uint8_t ip_family;
DBG("");
status = qmi_result_get(result, QMI_WDS_NOTIFY_CONN_STATUS, &len);
if (!status)
return;
DBG("conn status %d", status->status);
if (qmi_result_get_uint8(result, QMI_WDS_NOTIFY_IP_FAMILY, &ip_family))
DBG("ip family %d", ip_family);
switch (status->status) {
case QMI_WDS_CONN_STATUS_DISCONNECTED:
ofono_gprs_context_deactivated(gc, data->active_context);
data->active_context = 0;
break;
}
}
static void get_settings_cb(struct qmi_result *result, void *user_data)
{
struct cb_data *cbd = user_data;
ofono_gprs_context_cb_t cb = cbd->cb;
struct ofono_gprs_context *gc = cbd->user;
struct ofono_modem *modem;
const char *interface;
uint8_t pdp_type, ip_family;
DBG("");
if (qmi_result_set_error(result, NULL))
goto done;
if (qmi_result_get_uint8(result, QMI_WDS_RESULT_PDP_TYPE, &pdp_type))
DBG("PDP type %d", pdp_type);
if (qmi_result_get_uint8(result, QMI_WDS_RESULT_IP_FAMILY, &ip_family))
DBG("IP family %d", ip_family);
done:
modem = ofono_gprs_context_get_modem(gc);
interface = ofono_modem_get_string(modem, "NetworkInterface");
ofono_gprs_context_set_interface(gc, interface);
CALLBACK_WITH_SUCCESS(cb, cbd->data);
g_free(cbd);
}
static void start_net_cb(struct qmi_result *result, void *user_data)
{
struct cb_data *cbd = user_data;
ofono_gprs_context_cb_t cb = cbd->cb;
struct ofono_gprs_context *gc = cbd->user;
struct gprs_context_data *data = ofono_gprs_context_get_data(gc);
struct ofono_modem *modem;
const char *interface;
uint32_t handle;
DBG("");
if (qmi_result_set_error(result, NULL))
goto error;
if (!qmi_result_get_uint32(result, QMI_WDS_RESULT_PKT_HANDLE, &handle))
goto error;
DBG("packet handle %d", handle);
data->pkt_handle = handle;
if (qmi_service_send(data->wds, QMI_WDS_GET_SETTINGS, NULL,
get_settings_cb, cbd, NULL) > 0)
return;
modem = ofono_gprs_context_get_modem(gc);
interface = ofono_modem_get_string(modem, "NetworkInterface");
ofono_gprs_context_set_interface(gc, interface);
CALLBACK_WITH_SUCCESS(cb, cbd->data);
g_free(cbd);
return;
error:
data->active_context = 0;
CALLBACK_WITH_FAILURE(cb, cbd->data);
g_free(cbd);
}
static void qmi_activate_primary(struct ofono_gprs_context *gc,
const struct ofono_gprs_primary_context *ctx,
ofono_gprs_context_cb_t cb, void *user_data)
{
struct gprs_context_data *data = ofono_gprs_context_get_data(gc);
struct cb_data *cbd = cb_data_new(cb, user_data);
struct qmi_param *param;
uint8_t ip_family;
DBG("cid %u", ctx->cid);
cbd->user = gc;
data->active_context = ctx->cid;
switch (ctx->proto) {
case OFONO_GPRS_PROTO_IP:
ip_family = 4;
break;
case OFONO_GPRS_PROTO_IPV6:
ip_family = 6;
break;
default:
goto error;
}
param = qmi_param_new();
if (!param)
goto error;
qmi_param_append(param, QMI_WDS_PARAM_APN,
strlen(ctx->apn), ctx->apn);
qmi_param_append_uint8(param, QMI_WDS_PARAM_IP_FAMILY, ip_family);
if (qmi_service_send(data->wds, QMI_WDS_START_NET, param,
start_net_cb, cbd, NULL) > 0)
return;
qmi_param_free(param);
error:
data->active_context = 0;
CALLBACK_WITH_FAILURE(cb, cbd->data);
g_free(cbd);
}
static void stop_net_cb(struct qmi_result *result, void *user_data)
{
struct cb_data *cbd = user_data;
ofono_gprs_context_cb_t cb = cbd->cb;
struct ofono_gprs_context *gc = cbd->user;
struct gprs_context_data *data = ofono_gprs_context_get_data(gc);
DBG("");
if (qmi_result_set_error(result, NULL)) {
CALLBACK_WITH_FAILURE(cb, cbd->data);
return;
}
data->active_context = 0;
data->pkt_handle = 0;
CALLBACK_WITH_SUCCESS(cb, cbd->data);
g_free(cbd);
}
static void qmi_deactivate_primary(struct ofono_gprs_context *gc,
unsigned int cid,
ofono_gprs_context_cb_t cb, void *user_data)
{
struct gprs_context_data *data = ofono_gprs_context_get_data(gc);
struct cb_data *cbd = cb_data_new(cb, user_data);
struct qmi_param *param;
DBG("cid %u", cid);
cbd->user = gc;
param = qmi_param_new_uint32(QMI_WDS_PARAM_PKT_HANDLE,
data->pkt_handle);
if (!param)
goto error;
if (qmi_service_send(data->wds, QMI_WDS_STOP_NET, param,
stop_net_cb, cbd, NULL) > 0)
return;
qmi_param_free(param);
error:
CALLBACK_WITH_FAILURE(cb, cbd->data);
g_free(cbd);
}
static void create_wds_cb(struct qmi_service *service, void *user_data)
{
struct ofono_gprs_context *gc = user_data;
struct gprs_context_data *data = ofono_gprs_context_get_data(gc);
DBG("");
if (!service) {
ofono_error("Failed to request WDS service");
ofono_gprs_context_remove(gc);
return;
}
data->wds = qmi_service_ref(service);
qmi_service_register(data->wds, QMI_WDS_PKT_STATUS_IND,
pkt_status_notify, gc, NULL);
}
static int qmi_gprs_context_probe(struct ofono_gprs_context *gc,
unsigned int vendor, void *user_data)
{
struct qmi_device *device = user_data;
struct gprs_context_data *data;
DBG("");
data = g_new0(struct gprs_context_data, 1);
ofono_gprs_context_set_data(gc, data);
qmi_service_create(device, QMI_SERVICE_WDS, create_wds_cb, gc, NULL);
return 0;
}
static void qmi_gprs_context_remove(struct ofono_gprs_context *gc)
{
struct gprs_context_data *data = ofono_gprs_context_get_data(gc);
DBG("");
ofono_gprs_context_set_data(gc, NULL);
qmi_service_unregister_all(data->wds);
qmi_service_unref(data->wds);
g_free(data);
}
static struct ofono_gprs_context_driver driver = {
.name = "qmimodem",
.probe = qmi_gprs_context_probe,
.remove = qmi_gprs_context_remove,
.activate_primary = qmi_activate_primary,
.deactivate_primary = qmi_deactivate_primary,
};
void qmi_gprs_context_init(void)
{
ofono_gprs_context_driver_register(&driver);
}
void qmi_gprs_context_exit(void)
{
ofono_gprs_context_driver_unregister(&driver);
}

233
drivers/qmimodem/gprs.c Normal file
View File

@ -0,0 +1,233 @@
/*
*
* oFono - Open Source Telephony
*
* Copyright (C) 2011-2012 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 <ofono/log.h>
#include <ofono/modem.h>
#include <ofono/gprs.h>
#include "qmi.h"
#include "nas.h"
#include "qmimodem.h"
struct gprs_data {
struct qmi_service *nas;
};
static bool extract_ss_info(struct qmi_result *result, int *status)
{
const struct qmi_nas_serving_system *ss;
uint16_t len;
DBG("");
ss = qmi_result_get(result, QMI_NAS_RESULT_SERVING_SYSTEM, &len);
if (!ss)
return false;
if (ss->ps_state == QMI_NAS_ATTACH_STATUS_ATTACHED)
*status = 0x01;
else
*status = 0x00;
return true;
}
static void ss_info_notify(struct qmi_result *result, void *user_data)
{
struct ofono_gprs *gprs = user_data;
int status;
DBG("");
if (!extract_ss_info(result, &status))
return;
ofono_gprs_status_notify(gprs, status);
}
static void attach_detach_cb(struct qmi_result *result, void *user_data)
{
struct cb_data *cbd = user_data;
ofono_gprs_cb_t cb = cbd->cb;
uint16_t error;
DBG("");
if (qmi_result_set_error(result, &error)) {
if (error == 26) {
/* no effect */
goto done;
}
CALLBACK_WITH_FAILURE(cb, cbd->data);
return;
}
done:
CALLBACK_WITH_SUCCESS(cb, cbd->data);
}
static void qmi_set_attached(struct ofono_gprs *gprs, int attached,
ofono_gprs_cb_t cb, void *user_data)
{
struct gprs_data *data = ofono_gprs_get_data(gprs);
struct cb_data *cbd = cb_data_new(cb, user_data);
struct qmi_param *param;
uint8_t action;
DBG("attached %d", attached);
if (attached)
action = QMI_NAS_ATTACH_ACTION_ATTACH;
else
action = QMI_NAS_ATTACH_ACTION_DETACH;
param = qmi_param_new_uint8(QMI_NAS_PARAM_ATTACH_ACTION, action);
if (!param)
goto error;
if (qmi_service_send(data->nas, QMI_NAS_ATTACH_DETACH, param,
attach_detach_cb, cbd, g_free) > 0)
return;
qmi_param_free(param);
error:
CALLBACK_WITH_FAILURE(cb, cbd->data);
g_free(cbd);
}
static void get_ss_info_cb(struct qmi_result *result, void *user_data)
{
struct cb_data *cbd = user_data;
ofono_gprs_status_cb_t cb = cbd->cb;
int status;
DBG("");
if (qmi_result_set_error(result, NULL)) {
CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
return;
}
if (!extract_ss_info(result, &status)) {
CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
return;
}
CALLBACK_WITH_SUCCESS(cb, status, cbd->data);
}
static void qmi_attached_status(struct ofono_gprs *gprs,
ofono_gprs_status_cb_t cb, void *user_data)
{
struct gprs_data *data = ofono_gprs_get_data(gprs);
struct cb_data *cbd = cb_data_new(cb, user_data);
DBG("");
if (qmi_service_send(data->nas, QMI_NAS_GET_SS_INFO, NULL,
get_ss_info_cb, cbd, g_free) > 0)
return;
CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
g_free(cbd);
}
static void create_nas_cb(struct qmi_service *service, void *user_data)
{
struct ofono_gprs *gprs = user_data;
struct gprs_data *data = ofono_gprs_get_data(gprs);
DBG("");
if (!service) {
ofono_error("Failed to request NAS service");
ofono_gprs_remove(gprs);
return;
}
data->nas = qmi_service_ref(service);
qmi_service_register(data->nas, QMI_NAS_SS_INFO_IND,
ss_info_notify, gprs, NULL);
ofono_gprs_set_cid_range(gprs, 1, 1);
ofono_gprs_register(gprs);
}
static int qmi_gprs_probe(struct ofono_gprs *gprs,
unsigned int vendor, void *user_data)
{
struct qmi_device *device = user_data;
struct gprs_data *data;
DBG("");
data = g_new0(struct gprs_data, 1);
ofono_gprs_set_data(gprs, data);
qmi_service_create(device, QMI_SERVICE_NAS, create_nas_cb, gprs, NULL);
return 0;
}
static void qmi_gprs_remove(struct ofono_gprs *gprs)
{
struct gprs_data *data = ofono_gprs_get_data(gprs);
DBG("");
ofono_gprs_set_data(gprs, NULL);
qmi_service_unregister_all(data->nas);
qmi_service_unref(data->nas);
g_free(data);
}
static struct ofono_gprs_driver driver = {
.name = "qmimodem",
.probe = qmi_gprs_probe,
.remove = qmi_gprs_remove,
.set_attached = qmi_set_attached,
.attached_status = qmi_attached_status,
};
void qmi_gprs_init(void)
{
ofono_gprs_driver_register(&driver);
}
void qmi_gprs_exit(void)
{
ofono_gprs_driver_unregister(&driver);
}

View File

@ -33,12 +33,16 @@ static int qmimodem_init(void)
qmi_devinfo_init();
qmi_netreg_init();
qmi_sim_legacy_init();
qmi_gprs_init();
qmi_gprs_context_init();
return 0;
}
static void qmimodem_exit(void)
{
qmi_gprs_context_exit();
qmi_gprs_exit();
qmi_sim_legacy_exit();
qmi_netreg_exit();
qmi_devinfo_exit();

View File

@ -29,3 +29,9 @@ extern void qmi_netreg_exit(void);
extern void qmi_sim_legacy_init(void);
extern void qmi_sim_legacy_exit(void);
extern void qmi_gprs_init(void);
extern void qmi_gprs_exit(void);
extern void qmi_gprs_context_init(void);
extern void qmi_gprs_context_exit(void);

63
drivers/qmimodem/wds.h Normal file
View File

@ -0,0 +1,63 @@
/*
*
* oFono - Open Source Telephony
*
* Copyright (C) 2011-2012 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
*
*/
#define QMI_WDS_START_NET 32 /* Start WDS network interface */
#define QMI_WDS_STOP_NET 33 /* Stop WDS network interface */
#define QMI_WDS_GET_PKT_STATUS 34 /* Get packet data connection status */
#define QMI_WDS_PKT_STATUS_IND 34 /* Packet data connection status indication */
#define QMI_WDS_GET_SETTINGS 45 /* Get the runtime data session settings */
/* Start WDS network interface */
#define QMI_WDS_PARAM_APN 0x14 /* string */
#define QMI_WDS_PARAM_IP_FAMILY 0x19 /* uint8 */
#define QMI_WDS_RESULT_PKT_HANDLE 0x01 /* uint32 */
/* Stop WDS network interface */
#define QMI_WDS_PARAM_PKT_HANDLE 0x01 /* uint32 */
/* Packet data connection status indication */
#define QMI_WDS_NOTIFY_CONN_STATUS 0x01
struct qmi_wds_notify_conn_status {
uint8_t status;
uint8_t reconf;
} __attribute__((__packed__));
#define QMI_WDS_NOTIFY_IP_FAMILY 0x12 /* uint8 */
#define QMI_WDS_CONN_STATUS_DISCONNECTED 0x01
#define QMI_WDS_CONN_STATUS_CONNECTED 0x02
#define QMI_WDS_CONN_STATUS_SUSPENDED 0x03
#define QMI_WDS_CONN_STATUS_AUTHENTICATING 0x04
/* Get the runtime data session settings */
#define QMI_WDS_RESULT_PDP_TYPE 0x11 /* uint8 */
#define QMI_WDS_RESULT_PRIMARY_DNS 0x15 /* uint32 IPv4 */
#define QMI_WDS_RESULT_SECONDARY_DNS 0x16 /* uint32 IPv4 */
#define QMI_WDS_RESULT_IP_ADDRESS 0x1e /* uint32 IPv4 */
#define QMI_WDS_RESULT_GATEWAY 0x20 /* uint32 IPv4 */
#define QMI_WDS_RESULT_IP_FAMILY 0x2b /* uint8 */
#define QMI_WDS_PDP_TYPE_IPV4 0x00
#define QMI_WDS_PDP_TYPE_PPP 0x01
#define QMI_WDS_PDP_TYPE_IPV6 0x02
#define QMI_WDS_PDP_TYPE_IPV4V6 0x03