[PATCH] Infineon: Add support for Infineon / Intel modems
Paul Bartell
paul.bartell at gmail.com
Sun May 28 19:37:07 UTC 2017
Sure thing.
I squashed the commits and attached the output from git format-patch.
On Sat, May 27, 2017 at 10:21 AM Aleksander Morgado <
aleksander at aleksander.es> wrote:
> Hey Paul!
>
> On 26/05/17 04:39, Paul Bartell wrote:
> > The primary reason for this patch is that the current HL7588 MBIM
> firmware
> > implementation is quite broken and not supported by the manufacturer.
> This
> > requires the use of the somewhat less broken AT / NCM interface.
> >
> > This implementation has been tested with a Sierra Wireless HL7588 (XMM
> > 7160) with firmware versions A2.10 and V3.6. It is based on an abandoned
> > branch from the ModemManager git repository.
> >
>
> The branch wasn't abandoned!! it was waiting for someone to keep working
> on it, so thanks :)
>
> > There is a somewhat nasty hack in here to support the use of the A2.10
> > firmware on AT&T (see DIAL_3GPP_CONTEXT_STEP_DETACH and
> > set_reg_msg_handlers). If anyone has ideas on a better way to bypass the
> > automatic activation of PDP contexts when attaching to the network, I
> would
> > be happy to replace that part of this implementation. The HL75xx V3.6
> > firmware does not appear to have this limitation.
> >
> > Further testing on other Intel/Infineon XMM based modems with AT/NCM USB
> > configurations would be a good idea (Telit LN93x and Sierra MC7345 come
> to
> > mind).
> >
>
> Looks like your email application line wrapped the patch. Could you resend
> the patch in a way we can apply it with "git am"? i.e. either directly with
> "git send-email" or otherwise attached as a separate file obtained with
> "git format-patch".
>
>
> > diff --git a/plugins/Makefile.am b/plugins/Makefile.am
> > old mode 100644
> > new mode 100755
> > index 2a4ff2b..eef0490
> > --- a/plugins/Makefile.am
> > +++ b/plugins/Makefile.am
> > @@ -815,6 +815,21 @@ libmm_plugin_via_la_CPPFLAGS =
> > $(PLUGIN_COMMON_COMPILER_FLAGS)
> > libmm_plugin_via_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
> >
> >
> ################################################################################
> > +# plugin: Infineon
> >
> +################################################################################
> > +pkglib_LTLIBRARIES += libmm-plugin-infineon.la
> > +libmm_plugin_infineon_la_SOURCES = \
> > + infineon/mm-plugin-infineon.c \
> > + infineon/mm-plugin-infineon.h \
> > + infineon/mm-broadband-modem-infineon.c \
> > + infineon/mm-broadband-modem-infineon.h \
> > + infineon/mm-broadband-bearer-infineon.c \
> > + infineon/mm-broadband-bearer-infineon.h \
> > + $(NULL)
> > +libmm_plugin_infineon_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
> > +libmm_plugin_infineon_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
> > +
> >
> +################################################################################
> > # plugin: telit
> >
> ################################################################################
> >
> > diff --git a/plugins/infineon/mm-broadband-bearer-infineon.c
> > b/plugins/infineon/mm-broadband-bearer-infineon.c
> > new file mode 100755
> > index 0000000..9bc57bc
> > --- /dev/null
> > +++ b/plugins/infineon/mm-broadband-bearer-infineon.c
> > @@ -0,0 +1,1051 @@
> > +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
> -*-
> > */
> > +/*
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation; either version 2 of the License, or
> > + * (at your option) any later version.
> > + *
> > + * 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:
> > + *
> > + * Copyright (C) 2013 Aleksander Morgado <aleksander at gnu.org>
> > + * Copyright (C) 2017 Tempered Networks Inc.
> > + */
> > +
> > +#include <config.h>
> > +
> > +#include <stdio.h>
> > +#include <stdlib.h>
> > +#include <unistd.h>
> > +#include <string.h>
> > +#include <ctype.h>
> > +#include <arpa/inet.h>
> > +
> > +#include <ModemManager.h>
> > +#define _LIBMM_INSIDE_MM
> > +#include <libmm-glib.h>
> > +
> > +#include "mm-base-modem-at.h"
> > +#include "mm-broadband-bearer-infineon.h"
> > +#include "mm-log.h"
> > +#include "mm-modem-helpers.h"
> > +
> > +G_DEFINE_TYPE (MMBroadbandBearerInfineon, mm_broadband_bearer_infineon,
> > MM_TYPE_BROADBAND_BEARER)
> > +
> >
> +/*****************************************************************************/
> > +/* WWAN interface mapping */
> > +
> > +/* Map CDC-NCM port index to USB interface number */
> > +static const guint usb_ncm_configs[] = { 0x06, 0x08, 0x0a, 0x0c };
> > +
> > +/* Map CDC-ACM port index to USB interface number */
> > +static const guint usb_acm_configs[] = { 0x00, 0xFF, 0x04 };
> > +
> > +static gint
> > +get_usb_ncm_config_index (MMPort *data,
> > + GError **error)
> > +{
> > + guint usb_iface_num;
> > + guint i;
> > +
> > + usb_iface_num = mm_kernel_device_get_property_as_int_hex
> > (mm_port_peek_kernel_device (data), "ID_USB_INTERFACE_NUM");
> > +
> > + for (i = 0; i < G_N_ELEMENTS (usb_ncm_configs); i++) {
> > + if (usb_ncm_configs[i] == usb_iface_num)
> > + return (gint) i;
> > + }
> > +
> > + g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
> > + "Unsupported WWAN interface: unexpected interface
> number:
> > 0x%02x", usb_iface_num);
> > + return -1;
> > +}
> > +
> > +static gint
> > +get_usb_acm_config_index (MMPortSerialAt *port,
> > + GError **error)
> > +{
> > + guint usb_iface_num;
> > + guint i;
> > +
> > + usb_iface_num = mm_kernel_device_get_property_as_int_hex
> > (mm_port_peek_kernel_device (&port->parent.parent),
> "ID_USB_INTERFACE_NUM");
> > + for (i = 0; i < G_N_ELEMENTS (usb_acm_configs); i++) {
> > + if (usb_acm_configs[i] == usb_iface_num)
> > + return (gint) i;
> > + }
> > +
> > + g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
> > + "Unsupported ACM interface: unexpected interface
> number:
> > 0x%02x", usb_iface_num);
> > + return -1;
> > +}
> > +
> >
> +/*****************************************************************************/
> > +/* 3GPP Dialing (sub-step of the 3GPP Connection sequence) */
> > +
> > +typedef enum {
> > + DIAL_3GPP_CONTEXT_STEP_CHECK_CGACT = 0,
> > + DIAL_3GPP_CONTEXT_STEP_DETACH,
> > + DIAL_3GPP_CONTEXT_STEP_SET_XGAUTH,
> > + DIAL_3GPP_CONTEXT_STEP_SET_XDNS,
> > + DIAL_3GPP_CONTEXT_STEP_SET_CGACT,
> > + DIAL_3GPP_CONTEXT_STEP_SET_DATA_CHAN,
> > + DIAL_3GPP_CONTEXT_STEP_START_DATA_CHAN,
> > + DIAL_3GPP_CONTEXT_STEP_LAST
> > +} Dial3gppContextStep;
> > +
> > +typedef struct {
> > + MMBroadbandBearerInfineon *self;
> > + MMBaseModem *modem;
> > + MMPortSerialAt *primary;
> > + MMPortSerialAt *secondary;
> > + guint cid;
> > + MMBearerIpFamily ip_family;
> > + MMPort *data;
> > + gint usb_interface_config_index;
> > + gint usb_acm_config_index;
> > + GPtrArray * creg_regexes;
> > + Dial3gppContextStep step;
> > +} Dial3gppContext;
> > +
> > +
> > +
> > +static void
> > +dial_3gpp_context_free (Dial3gppContext *ctx)
> > +{
> > + g_object_unref (ctx->self);
> > + g_object_unref (ctx->modem);
> > + g_object_unref (ctx->primary);
> > + g_object_unref (ctx->secondary);
> > + g_object_unref (ctx->data);
> > + g_slice_free (Dial3gppContext, ctx);
> > +}
> > +
> > +/* Forward Function declarations */
> > +static void dial_3gpp_context_step (GTask *task);
> > +
> > +static MMPort *
> > +dial_3gpp_finish (MMBroadbandBearer *self,
> > + GAsyncResult *res,
> > + GError **error)
> > +{
> > + return MM_PORT (g_task_propagate_pointer (G_TASK (res), error));
> > +}
> > +
> > +static void
> > +dial_3gpp_cgact_check_ready (MMBaseModem *modem,
> > + GAsyncResult *res,
> > + GTask *task)
> > +{
> > + const gchar *response;
> > + Dial3gppContext *ctx;
> > + GError *error = NULL;
> > + GList *cgact_list = NULL;
> > + GList *l = NULL;
> > + MM3gppPdpContextActive *pdp_ctx_active = NULL;
> > +
> > + ctx = (Dial3gppContext *) g_task_get_task_data (task);
> > +
> > + response = mm_base_modem_at_command_finish (modem, res, &error);
> > + if (!response) {
> > + g_task_return_error (task, error);
> > + g_object_unref (task);
> > + return;
> > + }
> > +
> > + /* Parse response */
> > + cgact_list = mm_3gpp_parse_cgact_read_response (response, &error);
> > + g_assert(cgact_list != NULL);
> > +
> > + if (!cgact_list) {
> > + g_task_return_error (task, error);
> > + g_object_unref (task);
> > + return;
> > + }
> > +
> > + /* Iterate over list and check for active context with same CID */
> > + for (l = cgact_list; l != NULL; l = l ->next) {
> > + pdp_ctx_active = l->data;
> > + if (pdp_ctx_active->cid == ctx->cid) {
> > + break;
> > + }
> > + else
> > + pdp_ctx_active = NULL;
> > + }
> > + g_assert(pdp_ctx_active != NULL);
> > + /* If context is already active. Detach from network before
> attempting
> > to connect
> > + in order to work around a Sierra HL7588 firmware bug */
> > + if (pdp_ctx_active != NULL && pdp_ctx_active->active){
> > + mm_dbg("Selected CID is currently active.");
> > + ctx->step++;
> > + }
> > + /* Otherwise, skip to auth step */
> > + else
> > + ctx->step = DIAL_3GPP_CONTEXT_STEP_SET_XGAUTH;
> > +
> > + mm_3gpp_pdp_context_active_list_free (cgact_list);
> > + dial_3gpp_context_step (task);
> > +}
> > +
> > +typedef enum {
> > + BEARER_INFINEON_AUTH_NONE = 0,
> > + BEARER_INFINEON_AUTH_PAP = 1,
> > + BEARER_INFINEON_AUTH_CHAP = 2
> > +} BearerInfineonAuthType;
> > +
> > +/* Generate XGAUTH string */
> > +static gchar *
> > +build_auth_string (Dial3gppContext *ctx)
> > +{
> > + gchar *command;
> > + const gchar *user;
> > + const gchar *password;
> > + MMBearerAllowedAuth auth_type;
> > +
> > + user = mm_bearer_properties_get_user (mm_base_bearer_peek_config
> > (MM_BASE_BEARER (ctx->self)));
> > + password = mm_bearer_properties_get_password
> > (mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self)));
> > + auth_type = mm_bearer_properties_get_allowed_auth
> > (mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self)));
> > +
> > + /* Both user and password are required; otherwise firmware returns
> an
> > error */
> > + if (user || password) {
> > + gchar *encoded_user;
> > + gchar *encoded_password;
> > + BearerInfineonAuthType auth_type_inf =
> BEARER_INFINEON_AUTH_NONE;
> > +
> > + /* Prefer CHAP over PAP */
> > + if (auth_type & MM_BEARER_ALLOWED_AUTH_CHAP)
> > + auth_type_inf = BEARER_INFINEON_AUTH_CHAP;
> > + else if (auth_type & MM_BEARER_ALLOWED_AUTH_PAP)
> > + auth_type_inf = BEARER_INFINEON_AUTH_PAP;
> > + else if (auth_type == MM_BEARER_ALLOWED_AUTH_UNKNOWN)
> > + auth_type_inf = BEARER_INFINEON_AUTH_CHAP;
> > + else if (auth_type == MM_BEARER_ALLOWED_AUTH_NONE)
> > + auth_type_inf = BEARER_INFINEON_AUTH_NONE;
> > +
> > + encoded_user =
> > mm_broadband_modem_take_and_convert_to_current_charset
> (MM_BROADBAND_MODEM
> > (ctx->modem),
> > +
> > g_strdup (user));
> > + encoded_password =
> > mm_broadband_modem_take_and_convert_to_current_charset
> (MM_BROADBAND_MODEM
> > (ctx->modem),
> > +
> > g_strdup (password));
> > +
> > + command = g_strdup_printf ("+XGAUTH=%u,%u,\"%s\",\"%s\"",
> > + ctx->cid,
> > + auth_type_inf,
> > + encoded_user ? encoded_user : "",
> > + encoded_password ? encoded_password :
> > "");
> > + g_free (encoded_user);
> > + g_free (encoded_password);
> > + } else {
> > + command = g_strdup_printf ("+XGAUTH=%u,0,\"\",\"\"", ctx->cid);
> > + }
> > + return command;
> > +}
> > +
> > +/* Generic AT command result ready callback */
> > +static void
> > +dial_3gpp_res_ready (MMBaseModem *modem,
> > + GAsyncResult *res,
> > + GTask *task)
> > +{
> > + Dial3gppContext *ctx;
> > + GError *error = NULL;
> > +
> > + ctx = (Dial3gppContext *) g_task_get_task_data (task);
> > +
> > + if (!mm_base_modem_at_command_finish (modem, res, &error)) {
> > +
> > + /* Disregard NO CARRIER message from modem when detaching from
> > network */
> > + if(ctx->step == DIAL_3GPP_CONTEXT_STEP_DETACH &&
> > + g_error_matches (error,
> > + MM_CONNECTION_ERROR,
> > + MM_CONNECTION_ERROR_NO_CARRIER))
> > + {
> > + g_error_free (error);
> > + } else {
> > + g_task_return_error (task, error);
> > + g_object_unref (task);
> > + return;
> > + }
> > + }
> > +
> > + /* Go to next step */
> > + ctx->step++;
> > + dial_3gpp_context_step (task);
> > +}
> > +
> > +static void set_reg_msg_handlers (Dial3gppContext *ctx, gboolean enable)
> > +{
> > + guint i;
> > +
> > + if (!ctx->creg_regexes)
> > + {
> > + ctx->creg_regexes = mm_3gpp_creg_regex_get(FALSE);
> > + }
> > + for (i = 0; i < ctx->creg_regexes->len; i++)
> > + {
> > + mm_port_serial_at_enable_unsolicited_msg_handler (ctx->primary,
> > (GRegex *)ctx->creg_regexes->pdata[i], enable);
> > + mm_port_serial_at_enable_unsolicited_msg_handler
> (ctx->secondary,
> > (GRegex *)ctx->creg_regexes->pdata[i], enable);
> > + }
> > + if (enable)
> > + mm_dbg("Enabling unsolicited registration message handlers.");
> > + else
> > + mm_dbg("Disabling unsolicited registration message handlers.");
> > +}
> > +
> > +static void
> > +dial_3gpp_context_step (GTask *task)
> > +{
> > + Dial3gppContext *ctx;
> > +
> > + ctx = (Dial3gppContext *) g_task_get_task_data (task);
> > +
> > + mm_dbg("Dial3goo Step : %d", ctx->step);
> > +
> > + /* Check for cancellation */
> > + if (g_task_return_error_if_cancelled (task)) {
> > + set_reg_msg_handlers(ctx, TRUE);
> > + g_object_unref (task);
> > + return;
> > + }
> > +
> > + switch (ctx->step) {
> > + case DIAL_3GPP_CONTEXT_STEP_CHECK_CGACT: {
> > + mm_base_modem_at_command (ctx->modem,
> > + "+CGACT?",
> > + 3,
> > + FALSE,
> > +
> > (GAsyncReadyCallback)dial_3gpp_cgact_check_ready,
> > + task);
> > + return;
> > + }
> > +
> > + case DIAL_3GPP_CONTEXT_STEP_DETACH: {
> > + /* Detach from network if context is already activated to
> bypass a
> > firmware bug in sierra HL75xx modules */
> > +
> > + /* Disable registration message handlers so our connect attempt
> > doesn't get cancelled */
> > + set_reg_msg_handlers(ctx, FALSE);
> > +
> > + mm_base_modem_at_command (ctx->modem,
> > + "+CGATT=0",
> > + 30,
> > + FALSE,
> > + (GAsyncReadyCallback)
> > dial_3gpp_res_ready,
> > + task);
> > + return;
> > + }
> > + case DIAL_3GPP_CONTEXT_STEP_SET_XGAUTH: {
> > + gchar *command = build_auth_string (ctx);
> > + mm_base_modem_at_command (ctx->modem,
> > + command,
> > + 3,
> > + FALSE,
> > +
> (GAsyncReadyCallback)dial_3gpp_res_ready,
> > + task);
> > + g_free (command);
> > + return;
> > + }
> > + case DIAL_3GPP_CONTEXT_STEP_SET_XDNS: {
> > + gchar *command = NULL;
> > +
> > + /* Select IP family with XDNS command */
> > + switch (mm_bearer_properties_get_ip_type
> > (mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self)))) {
> > + case MM_BEARER_IP_FAMILY_IPV4:
> > + command = g_strdup_printf ("+XDNS=%u,1", ctx->cid);
> > + break;
> > + case MM_BEARER_IP_FAMILY_IPV6:
> > + command = g_strdup_printf ("+XDNS=%u,2", ctx->cid);
> > + break;
> > + case MM_BEARER_IP_FAMILY_IPV4V6: /* Default to IPV4V6 dynamic
> DNS
> > request */
> > + default:
> > + command = g_strdup_printf ("+XDNS=%u,3", ctx->cid);
> > + break;
> > + }
> > + mm_base_modem_at_command (ctx->modem,
> > + command,
> > + 3,
> > + FALSE,
> > +
> (GAsyncReadyCallback)dial_3gpp_res_ready,
> > + task);
> > + g_free (command);
> > + return;
> > +
> > + }
> > + case DIAL_3GPP_CONTEXT_STEP_SET_CGACT: {
> > + gchar *command;
> > + command = g_strdup_printf ("+CGACT=1,%u", ctx->cid);
> > + mm_base_modem_at_command (ctx->modem,
> > + command,
> > + 30,
> > + FALSE,
> > +
> (GAsyncReadyCallback)dial_3gpp_res_ready,
> > + task);
> > + g_free (command);
> > + return;
> > +
> > + }
> > + case DIAL_3GPP_CONTEXT_STEP_SET_DATA_CHAN: {
> > + gchar *command;
> > + /* Setup data channel mapping */
> > + /* See Intel XMM7160 AT Functional Spec for more info on this
> > command */
> > + command = g_strdup_printf
> > ("+XDATACHANNEL=1,1,\"/USBCDC/%u\",\"/USBHS/NCM/%u\",2,%u",
> > + ctx->usb_acm_config_index,
> > ctx->usb_interface_config_index, ctx->cid);
> > + mm_base_modem_at_command (ctx->modem,
> > + command,
> > + 3,
> > + FALSE,
> > +
> (GAsyncReadyCallback)dial_3gpp_res_ready,
> > + task);
> > + g_free (command);
> > + return;
> > + }
> > + case DIAL_3GPP_CONTEXT_STEP_START_DATA_CHAN: {
> > + gchar *command;
> > + command = g_strdup_printf ("+CGDATA=\"M-RAW_IP\",%u", ctx->cid);
> > + mm_base_modem_at_command (ctx->modem,
> > + command,
> > + 10,
> > + FALSE,
> > +
> (GAsyncReadyCallback)dial_3gpp_res_ready,
> > + task);
> > + g_free (command);
> > + return;
> > + }
> > + case DIAL_3GPP_CONTEXT_STEP_LAST: {
> > + /* Restore message handlers */
> > + set_reg_msg_handlers(ctx, TRUE);
> > +
> > + g_task_return_pointer (task, g_object_ref (ctx->data),
> > g_object_unref);
> > + g_object_unref (task);
> > + return;
> > + }
> > + }
> > +
> > +}
> > +
> > +static void
> > +dial_3gpp (MMBroadbandBearer *self,
> > + MMBaseModem *modem,
> > + MMPortSerialAt *primary,
> > + guint cid,
> > + GCancellable *cancellable,
> > + GAsyncReadyCallback callback,
> > + gpointer user_data)
> > +{
> > + GTask *task;
> > + Dial3gppContext *ctx;
> > + GError *error = NULL;
> > +
> > + g_assert (primary != NULL);
> > +
> > + /* Setup task */
> > + task = g_task_new (self, cancellable, callback, user_data);
> > + ctx = g_slice_new0 (Dial3gppContext);
> > + g_task_set_task_data (task, ctx, (GDestroyNotify)
> > dial_3gpp_context_free);
> > +
> > + /* Setup Context */
> > + ctx->self = g_object_ref (self);
> > + ctx->modem = g_object_ref (modem);
> > + ctx->primary = g_object_ref (primary);
> > + ctx->cid = cid;
> > + ctx->step = DIAL_3GPP_CONTEXT_STEP_CHECK_CGACT;
> > + ctx->creg_regexes = NULL;
> > +
> > + /* Get a net port for the connection */
> > + ctx->data = mm_base_modem_peek_best_data_port (MM_BASE_MODEM
> (modem),
> > MM_PORT_TYPE_NET);
> > + if (!ctx->data) {
> > + g_task_return_new_error (task, MM_CORE_ERROR,
> > MM_CORE_ERROR_NOT_FOUND,
> > + "No valid data port found to
> > launch connection");
> > + g_object_unref (task);
> > + return;
> > + }
> > + g_object_ref (ctx->data);
> > +
> > + ctx->secondary = mm_base_modem_get_port_secondary (MM_BASE_MODEM
> > (modem));
> > +
> > + /* Validate the USB configuration */
> > + ctx->usb_interface_config_index =
> get_usb_ncm_config_index(ctx->data,
> > &error);
> > + ctx->usb_acm_config_index = get_usb_acm_config_index(ctx->primary,
> > &error);
> > + if (ctx->usb_interface_config_index < 0 ||
> ctx->usb_acm_config_index <
> > 0)
> > + {
> > + g_task_return_error (task, error);
> > + g_object_unref (task);
> > + return;
> > + }
> > +
> > + /* Run! */
> > + dial_3gpp_context_step (task);
> > +}
> > +
> >
> +/*****************************************************************************/
> > +/* 3GPP IP config retrieval (sub-step of the 3GPP Connection sequence)
> */
> > +
> > +typedef enum {
> > + GET_IP_CONFIG_3GPP_CONTEXT_STEP_CGPADDR,
> > + GET_IP_CONFIG_3GPP_CONTEXT_STEP_XDNS,
> > + GET_IP_CONFIG_3GPP_CONTEXT_STEP_LAST
> > +} GetIPConfig3gppContextStep;
> > +
> > +typedef struct {
> > + MMBroadbandBearerInfineon *self;
> > + MMBaseModem *modem;
> > + MMPortSerialAt *primary;
> > + guint cid;
> > + MMBearerIpFamily ip_family;
> > + MMPort *data;
> > + GetIPConfig3gppContextStep step;
> > + MMBearerIpConfig *ipv4_config;
> > + MMBearerIpConfig *ipv6_config;
> > +} GetIPConfig3gppContext;
> > +
> > +static void
> > +get_ip_config_3gpp_context_free (GetIPConfig3gppContext *ctx)
> > +{
> > + g_object_unref (ctx->modem);
> > + g_object_unref (ctx->primary);
> > + g_object_unref (ctx->data);
> > + if (ctx->ipv4_config)
> > + g_object_unref (ctx->ipv4_config);
> > + if (ctx->ipv6_config)
> > + g_object_unref (ctx->ipv6_config);
> > +}
> > +
> > +/* forward declaration */
> > +static void get_ip_config_3gpp_context_step (GTask *task);
> > +
> > +static gboolean
> > +get_ip_config_3gpp_finish (MMBroadbandBearer *self,
> > + GAsyncResult *res,
> > + MMBearerIpConfig **ipv4_config,
> > + MMBearerIpConfig **ipv6_config,
> > + GError **error)
> > +{
> > + MMBearerConnectResult *configs;
> > + MMBearerIpConfig *ipv4;
> > + MMBearerIpConfig *ipv6;
> > +
> > + configs = g_task_propagate_pointer (G_TASK (res), error);
> > + if (!configs)
> > + return FALSE;
> > +
> > + g_assert(configs != NULL);
> > +
> > + /* IPv4 config */
> > + ipv4 = mm_bearer_connect_result_peek_ipv4_config (configs);
> > + if (ipv4)
> > + *ipv4_config = g_object_ref (ipv4);
> > +
> > + /* IPv6 config */
> > + ipv6 = mm_bearer_connect_result_peek_ipv6_config (configs);
> > +
> > + if (ipv6)
> > + *ipv6_config = g_object_ref (ipv6);
> > +
> > + mm_bearer_connect_result_unref (configs);
> > + return TRUE;
> > +}
> > +
> > +static void
> > +ip_info_ready (MMBaseModem *modem,
> > + GAsyncResult *res,
> > + GTask *task)
> > +{
> > + const gchar *response;
> > + GError *error = NULL;
> > + guint cid;
> > + gchar *ipv4addr = NULL;
> > + gchar *ipv6addr = NULL;
> > + GetIPConfig3gppContext *ctx;
> > +
> > + ctx = (GetIPConfig3gppContext *) g_task_get_task_data (task);
> > +
> > + response = mm_base_modem_at_command_finish (modem, res, &error);
> > + if (!response) {
> > + g_task_return_error (task, error);
> > + g_object_unref (task);
> > + return;
> > + }
> > +
> > + /* Parse response */
> > + if (!mm_3gpp_parse_cgpaddr_write_response (response, &cid,
> &ipv4addr,
> > &ipv6addr)) {
> > + g_task_return_new_error (task,
> > + MM_CORE_ERROR,
> > + MM_CORE_ERROR_FAILED,
> > + "Error parsing +CGPADDR response:
> '%s'",
> > + response);
> > + g_object_unref (task);
> > + return;
> > + }
> > +
> > + g_warn_if_fail (cid == ctx->cid);
> > + /* Create IPv4 config */
> > + if (ipv4addr)
> > + {
> > + ctx->ipv4_config = mm_bearer_ip_config_new ();
> > + mm_bearer_ip_config_set_method (ctx->ipv4_config,
> > MM_BEARER_IP_METHOD_STATIC);
> > + mm_bearer_ip_config_set_address (ctx->ipv4_config, ipv4addr);
> > + mm_bearer_ip_config_set_prefix (ctx->ipv4_config, 0);
> > + g_free (ipv4addr);
> > + }
> > + /* IPv6 config */
> > + if (ipv6addr)
> > + {
> > + ctx->ipv6_config = mm_bearer_ip_config_new ();
> > + mm_bearer_ip_config_set_method (ctx->ipv6_config,
> > MM_BEARER_IP_METHOD_STATIC);
> > + mm_bearer_ip_config_set_address (ctx->ipv6_config, ipv6addr);
> > + mm_bearer_ip_config_set_prefix (ctx->ipv6_config, 0);
> > + g_free (ipv6addr);
> > + }
> > +
> > + ctx->step++;
> > + get_ip_config_3gpp_context_step (task);
> > +}
> > +
> > +static GList
> > +*deduplicate_string_list (GList *list)
> > +{
> > + GList *a, *b, *dup, *ret_list;
> > + ret_list = list;
> > + a = list;
> > + for (a = ret_list; a != NULL; a = a->next) {
> > + b = a->next;
> > + while (NULL != b) {
> > +
> > + if(0 == g_strcmp0 (a->data, b->data)) {
> > + dup = b;
> > + b = b->next;
> > + g_free (dup->data);
> > + ret_list = g_list_remove (ret_list, dup->data);
> > + } else {
> > + b = b->next;
> > + }
> > + }
> > + }
> > + return ret_list;
> > +}
> > +
> > +static gboolean
> > +parse_xdns_query_response (const gchar *reply,
> > + guint cid,
> > + guint max_dns_servers,
> > + gchar **dns_v4,
> > + gchar **dns_v6)
> > +{
> > + GRegex *r;
> > + GMatchInfo *match_info;
> > + guint this_cid = 0;
> > + guint num_v4 = 0;
> > + guint num_v6 = 0;
> > + GList *dns_list, *a;
> > + gchar *dns1, *dns2;
> > +
> > + dns1 = NULL;
> > + dns2 = NULL;
> > + dns_list = NULL;
> > + a = NULL;
> > +
> > + r = g_regex_new
> > ("\\+XDNS:\\s*(\\d+)\\s*,\\s*\"(.*)\"\\s*,\\s*\"(.*)\"",
> > + G_REGEX_OPTIMIZE | G_REGEX_RAW | G_REGEX_MULTILINE
> |
> > G_REGEX_MATCH_NEWLINE_ANY,
> > + 0, NULL);
> > + g_assert (r != NULL);
> > +
> > + g_regex_match (r, reply, 0, &match_info);
> > + while (g_match_info_matches (match_info)) {
> > + if (mm_get_uint_from_match_info (match_info, 1, &this_cid) &&
> > + (this_cid == cid) &&
> > + (dns1 = mm_get_string_unquoted_from_match_info (match_info,
> > 2)) != NULL &&
> > + (dns2 = mm_get_string_unquoted_from_match_info (match_info,
> > 3)) != NULL)
> > + {
> > + dns_list = g_list_prepend(dns_list, dns1);
> > + dns_list = g_list_prepend(dns_list, dns2);
> > + }
> > + g_match_info_next (match_info, NULL);
> > + }
> > + g_match_info_free (match_info);
> > + g_regex_unref (r);
> > +
> > + dns_list = deduplicate_string_list(dns_list);
> > +
> > + for (a = dns_list; a != NULL; a = a->next) {
> > + /* Check if IPv6 address */
> > + if (g_strrstr (a->data, ":")) {
> > + if (num_v6 < max_dns_servers) {
> > + dns_v6[num_v6] = a->data;
> > + num_v6++;
> > + }
> > + else {
> > + g_free (a->data);
> > + }
> > + /* Process "empty" IPv4 address */
> > + } else if (0 == g_strcmp0("0.0.0.0", a->data)) {
> > + g_free (a->data);
> > + }
> > + /* Process IPv4 address */
> > + else if (num_v4 < max_dns_servers) {
> > + dns_v4[num_v4] = a->data;
> > + num_v4++;
> > + }
> > + else {
> > + g_free (a->data);
> > + }
> > + }
> > +
> > + g_list_free(dns_list);
> > + return num_v4 > 0 || num_v6 > 0;
> > +}
> > +
> > +static void
> > +dns_info_ready (MMBaseModem *modem,
> > + GAsyncResult *res,
> > + GTask *task)
> > +{
> > + static const gint MAX_DNS_SERVERS = 2;
> > + const gchar *response;
> > + GError *error = NULL;
> > + gchar *dns_v4[MAX_DNS_SERVERS + 1];
> > + gchar *dns_v6[MAX_DNS_SERVERS + 1];
> > + GetIPConfig3gppContext *ctx;
> > +
> > + memset(dns_v4, 0, sizeof( gchar *) * MAX_DNS_SERVERS + 1);
> > + memset(dns_v6, 0, sizeof( gchar *) * MAX_DNS_SERVERS + 1);
> > +
> > + ctx = (GetIPConfig3gppContext *) g_task_get_task_data (task);
> > +
> > + response = mm_base_modem_at_command_finish (modem, res, &error);
> > + if (!response) {
> > + g_task_return_error (task, error);
> > + g_object_unref (task);
> > + return;
> > + }
> > +
> > + /* Parse XDNS results and return two vectors containing IPV4 and
> IPV6
> > addresses */
> > + if (!parse_xdns_query_response (response, ctx->cid, MAX_DNS_SERVERS,
> > dns_v4, dns_v6)) {
> > + g_task_return_new_error (task, MM_CORE_ERROR,
> MM_CORE_ERROR_FAILED,
> > + "Error parsing +XDNS response:
> '%s'",
> > + response);
> > + g_object_unref (task);
> > + return;
> > + }
> > + if (ctx->ipv4_config)
> > + mm_bearer_ip_config_set_dns (ctx->ipv4_config, (const gchar
> > **)dns_v4);
> > +
> > + if (ctx->ipv6_config)
> > + mm_bearer_ip_config_set_dns (ctx->ipv6_config, (const gchar
> > **)dns_v6);
> > +
> > + ctx->step++;
> > + get_ip_config_3gpp_context_step (task);
> > +}
> > +
> > +static void
> > +get_ip_config_3gpp_context_step (GTask *task)
> > +{
> > + GetIPConfig3gppContext *ctx;
> > +
> > + ctx = (GetIPConfig3gppContext *) g_task_get_task_data (task);
> > +
> > + mm_dbg("GetIPConfig Step : %d", ctx->step);
> > +
> > + switch (ctx->step) {
> > + case GET_IP_CONFIG_3GPP_CONTEXT_STEP_CGPADDR: {
> > + gchar *command = g_strdup_printf ("+CGPADDR=%u", ctx->cid);
> > + mm_base_modem_at_command (ctx->modem,
> > + command,
> > + 3,
> > + FALSE,
> > + (GAsyncReadyCallback)ip_info_ready,
> > + task);
> > + g_free (command);
> > + return;
> > + }
> > + case GET_IP_CONFIG_3GPP_CONTEXT_STEP_XDNS: {
> > + /* query DNS addresses */
> > + mm_base_modem_at_command (ctx->modem,
> > + "+XDNS?",
> > + 3,
> > + FALSE,
> > + (GAsyncReadyCallback)dns_info_ready,
> > + task);
> > + return;
> > + }
> > + case GET_IP_CONFIG_3GPP_CONTEXT_STEP_LAST: {
> > +
> > + g_task_return_pointer (task,
> > + mm_bearer_connect_result_new (ctx->data,
> > ctx->ipv4_config, ctx->ipv6_config),
> > + (GDestroyNotify)
> > mm_bearer_connect_result_unref);
> > +
> > + g_object_unref (task);
> > + return;
> > + }
> > + }
> > +}
> > +
> > +static void
> > +get_ip_config_3gpp (MMBroadbandBearer *self,
> > + MMBroadbandModem *modem,
> > + MMPortSerialAt *primary,
> > + MMPortSerialAt *secondary,
> > + MMPort *data,
> > + guint cid,
> > + MMBearerIpFamily ip_family,
> > + GAsyncReadyCallback callback,
> > + gpointer user_data)
> > +{
> > + GTask *task;
> > + GetIPConfig3gppContext *ctx;
> > +
> > + g_assert (primary != NULL);
> > + g_assert (data != NULL);
> > + g_assert (modem != NULL);
> > +
> > + /* Setup task and create disconnect context */
> > + task = g_task_new (self, NULL, callback, user_data);
> > + ctx = g_slice_new0 (GetIPConfig3gppContext);
> > + g_task_set_task_data (task, ctx, (GDestroyNotify)
> > get_ip_config_3gpp_context_free);
> > +
> > + /* Setup context */
> > + ctx->self = g_object_ref (self);
> > + ctx->modem = g_object_ref (modem);
> > + ctx->primary = g_object_ref (primary);
> > + ctx->cid = cid;
> > + ctx->ip_family = ip_family;
> > + ctx->data = g_object_ref (data);
> > + ctx->step = GET_IP_CONFIG_3GPP_CONTEXT_STEP_CGPADDR;
> > + ctx->ipv4_config = NULL;
> > + ctx->ipv6_config = NULL;
> > +
> > + /* Start */
> > + get_ip_config_3gpp_context_step (task);
> > +}
> > +
> > +
> >
> +/*****************************************************************************/
> > +/* Disconnect 3GPP */
> > +
> > +typedef enum {
> > + DISCONNECT_3GPP_CONTEXT_STEP_CGACT,
> > + DISCONNECT_3GPP_CONTEXT_STEP_DYN_DNS,
> > + DISCONNECT_3GPP_CONTEXT_STEP_LAST
> > +} Disconnect3gppContextStep;
> > +
> > +typedef struct {
> > + MMBroadbandBearerInfineon *self;
> > + MMBaseModem *modem;
> > + MMPortSerialAt *primary;
> > + MMPort *data;
> > + guint cid;
> > + Disconnect3gppContextStep step;
> > +} Disconnect3gppContext;
> > +
> > +static void
> > +disconnect_3gpp_context_free (Disconnect3gppContext *ctx)
> > +{
> > + g_object_unref (ctx->self);
> > + g_object_unref (ctx->modem);
> > + g_object_unref (ctx->primary);
> > + g_object_unref (ctx->data);
> > + g_slice_free (Disconnect3gppContext, ctx);
> > +}
> > +
> > +static gboolean
> > +disconnect_3gpp_finish (MMBroadbandBearer *self,
> > + GAsyncResult *res,
> > + GError **error)
> > +{
> > + return g_task_propagate_boolean (G_TASK (res), error);
> > +}
> > +
> > +/* forward declaration */
> > +static void
> > +disconnect_3gpp_context_step (GTask *task);
> > +
> > +static void
> > +cgact_disconnect_ready (MMBaseModem *modem,
> > + GAsyncResult *res,
> > + GTask *task)
> > +{
> > + Disconnect3gppContext *ctx;
> > + GError *error = NULL;
> > +
> > + mm_base_modem_at_command_finish (modem, res, &error);
> > +
> > + if (error) {
> > + if(!g_error_matches (error,
> > + MM_CONNECTION_ERROR,
> > + MM_CONNECTION_ERROR_NO_CARRIER))
> > + {
> > + mm_dbg ("PDP context deactivation failed (not fatal): %s",
> > error->message);
> > + }
> > + g_error_free (error);
> > + }
> > +
> > + ctx = (Disconnect3gppContext *) g_task_get_task_data (task);
> > +
> > + /* Go on to next step */
> > + ctx->step++;
> > + disconnect_3gpp_context_step (task);
> > +}
> > +
> > +static void
> > +xdns_disconnect_ready (MMBaseModem *modem,
> > + GAsyncResult *res,
> > + GTask *task)
> > +{
> > + Disconnect3gppContext *ctx;
> > + GError *error = NULL;
> > +
> > + mm_base_modem_at_command_finish (modem, res, &error);
> > +
> > + if (error) {
> > + mm_dbg ("Dynamic DNS disable request failed: %s",
> error->message);
> > + g_error_free (error);
> > + }
> > +
> > + ctx = (Disconnect3gppContext *) g_task_get_task_data (task);
> > +
> > + /* Go on to next step */
> > + ctx->step++;
> > + disconnect_3gpp_context_step (task);
> > +}
> > +
> > +static void
> > +disconnect_3gpp_context_step (GTask *task)
> > +{
> > + Disconnect3gppContext *ctx;
> > +
> > + ctx = (Disconnect3gppContext *) g_task_get_task_data (task);
> > +
> > + mm_dbg("Disconnect3gpp Step : %d", ctx->step);
> > +
> > + switch (ctx->step) {
> > + case DISCONNECT_3GPP_CONTEXT_STEP_CGACT: {
> > + gchar *command;
> > +
> > + command = g_strdup_printf ("+CGACT=0,%u",
> > + ctx->cid );
> > + mm_base_modem_at_command (ctx->modem,
> > + command,
> > + 30,
> > + FALSE,
> > + (GAsyncReadyCallback)
> > cgact_disconnect_ready,
> > + task);
> > + g_free (command);
> > + return;
> > + }
> > +
> > + case DISCONNECT_3GPP_CONTEXT_STEP_DYN_DNS: {
> > + gchar *command;
> > +
> > + command = g_strdup_printf ("+XDNS=%u,0",
> > + ctx->cid);
> > + mm_base_modem_at_command (ctx->modem,
> > + command,
> > + 10,
> > + FALSE,
> > + (GAsyncReadyCallback)
> > xdns_disconnect_ready,
> > + task);
> > + g_free (command);
> > + return;
> > + }
> > +
> > + case DISCONNECT_3GPP_CONTEXT_STEP_LAST:{
> > + g_task_return_boolean (task, TRUE);
> > + g_object_unref (task);
> > + return;
> > + }
> > + }
> > +}
> > +
> > +static void
> > +disconnect_3gpp (MMBroadbandBearer *self,
> > + MMBroadbandModem *modem,
> > + MMPortSerialAt *primary,
> > + MMPortSerialAt *secondary,
> > + MMPort *data,
> > + guint cid,
> > + GAsyncReadyCallback callback,
> > + gpointer user_data)
> > +{
> > + GTask *task;
> > + Disconnect3gppContext *ctx;
> > +
> > + g_assert (primary != NULL);
> > + g_assert (data != NULL);
> > + g_assert (modem != NULL);
> > +
> > + /* Setup task and create disconnect context */
> > + task = g_task_new (self, NULL, callback, user_data);
> > + ctx = g_slice_new0 (Disconnect3gppContext);
> > + g_task_set_task_data (task, ctx, (GDestroyNotify)
> > disconnect_3gpp_context_free);
> > +
> > + /* Setup context */
> > + ctx->self = g_object_ref (self);
> > + ctx->modem = g_object_ref (modem);
> > + ctx->primary = g_object_ref (primary);
> > + ctx->data = g_object_ref (data);
> > + ctx->cid = cid;
> > + ctx->step = DISCONNECT_3GPP_CONTEXT_STEP_CGACT;
> > +
> > + /* Start */
> > + disconnect_3gpp_context_step (task);
> > +}
> > +
> >
> +/*****************************************************************************/
> > +
> > +MMBaseBearer *
> > +mm_broadband_bearer_infineon_new_finish (GAsyncResult *res,
> > + GError **error)
> > +{
> > + GObject *bearer;
> > + GObject *source;
> > +
> > + source = g_async_result_get_source_object (res);
> > + bearer = g_async_initable_new_finish (G_ASYNC_INITABLE (source),
> res,
> > error);
> > + g_object_unref (source);
> > +
> > + if (!bearer)
> > + return NULL;
> > +
> > + /* Only export valid bearers */
> > + mm_base_bearer_export (MM_BASE_BEARER (bearer));
> > +
> > + return MM_BASE_BEARER (bearer);
> > +}
> > +
> > +void
> > +mm_broadband_bearer_infineon_new (MMBroadbandModemInfineon *modem,
> > + MMBearerProperties *config,
> > + GCancellable *cancellable,
> > + GAsyncReadyCallback callback,
> > + gpointer user_data)
> > +{
> > + g_async_initable_new_async (
> > + MM_TYPE_BROADBAND_BEARER_INFINEON,
> > + G_PRIORITY_DEFAULT,
> > + cancellable,
> > + callback,
> > + user_data,
> > + MM_BASE_BEARER_MODEM, modem,
> > + MM_BASE_BEARER_CONFIG, config,
> > + NULL);
> > +}
> > +
> > +static void
> > +mm_broadband_bearer_infineon_init (MMBroadbandBearerInfineon *self)
> > +{
> > +
> > + return;
> > +}
> > +
> > +static void
> > +mm_broadband_bearer_infineon_class_init (MMBroadbandBearerInfineonClass
> > *klass)
> > +{
> > + MMBroadbandBearerClass *broadband_bearer_class =
> > MM_BROADBAND_BEARER_CLASS (klass);
> > +
> > + broadband_bearer_class->dial_3gpp = dial_3gpp;
> > + broadband_bearer_class->dial_3gpp_finish = dial_3gpp_finish;
> > +
> > + broadband_bearer_class->get_ip_config_3gpp = get_ip_config_3gpp;
> > + broadband_bearer_class->get_ip_config_3gpp_finish =
> > get_ip_config_3gpp_finish;
> > +
> > +
> > + broadband_bearer_class->disconnect_3gpp = disconnect_3gpp;
> > + broadband_bearer_class->disconnect_3gpp_finish =
> > disconnect_3gpp_finish;
> > +}
> > diff --git a/plugins/infineon/mm-broadband-bearer-infineon.h
> > b/plugins/infineon/mm-broadband-bearer-infineon.h
> > new file mode 100644
> > index 0000000..cfc6910
> > --- /dev/null
> > +++ b/plugins/infineon/mm-broadband-bearer-infineon.h
> > @@ -0,0 +1,59 @@
> > +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
> -*-
> > */
> > +/*
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation; either version 2 of the License, or
> > + * (at your option) any later version.
> > + *
> > + * 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:
> > + *
> > + * Copyright (C) 2013 Aleksander Morgado <aleksander at gnu.org>
> > + */
> > +
> > +#ifndef MM_BROADBAND_BEARER_INFINEON_H
> > +#define MM_BROADBAND_BEARER_INFINEON_H
> > +
> > +#include <glib.h>
> > +#include <glib-object.h>
> > +
> > +#define _LIBMM_INSIDE_MM
> > +#include <libmm-glib.h>
> > +
> > +#include "mm-broadband-bearer.h"
> > +#include "mm-broadband-modem-infineon.h"
> > +
> > +#define MM_TYPE_BROADBAND_BEARER_INFINEON
> > (mm_broadband_bearer_infineon_get_type ())
> > +#define MM_BROADBAND_BEARER_INFINEON(obj)
> > (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_BEARER_INFINEON,
> > MMBroadbandBearerInfineon))
> > +#define MM_BROADBAND_BEARER_INFINEON_CLASS(klass)
> > (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_BEARER_INFINEON,
> > MMBroadbandBearerInfineonClass))
> > +#define MM_IS_BROADBAND_BEARER_INFINEON(obj)
> > (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_BEARER_INFINEON))
> > +#define MM_IS_BROADBAND_BEARER_INFINEON_CLASS(klass)
> > (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_BEARER_INFINEON))
> > +#define MM_BROADBAND_BEARER_INFINEON_GET_CLASS(obj)
> > (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_BEARER_INFINEON,
> > MMBroadbandBearerInfineonClass))
> > +
> > +typedef struct _MMBroadbandBearerInfineon MMBroadbandBearerInfineon;
> > +typedef struct _MMBroadbandBearerInfineonClass
> > MMBroadbandBearerInfineonClass;
> > +typedef struct _MMBroadbandBearerInfineonPrivate
> > MMBroadbandBearerInfineonPrivate;
> > +
> > +struct _MMBroadbandBearerInfineon {
> > + MMBroadbandBearer parent;
> > + MMBroadbandBearerInfineonPrivate *priv;
> > +};
> > +
> > +struct _MMBroadbandBearerInfineonClass {
> > + MMBroadbandBearerClass parent;
> > +};
> > +
> > +GType mm_broadband_bearer_infineon_get_type (void);
> > +
> > +/* Default 3GPP bearer creation implementation */
> > +void mm_broadband_bearer_infineon_new (MMBroadbandModemInfineon *modem,
> > + MMBearerProperties *config,
> > + GCancellable *cancellable,
> > + GAsyncReadyCallback callback,
> > + gpointer user_data);
> > +MMBaseBearer *mm_broadband_bearer_infineon_new_finish (GAsyncResult
> *res,
> > + GError **error);
> > +
> > +#endif /* MM_BROADBAND_BEARER_INFINEON_H */
> > diff --git a/plugins/infineon/mm-broadband-modem-infineon.c
> > b/plugins/infineon/mm-broadband-modem-infineon.c
> > new file mode 100755
> > index 0000000..f20804f
> > --- /dev/null
> > +++ b/plugins/infineon/mm-broadband-modem-infineon.c
> > @@ -0,0 +1,216 @@
> > +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
> -*-
> > */
> > +/*
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation; either version 2 of the License, or
> > + * (at your option) any later version.
> > + *
> > + * 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:
> > + *
> > + * Copyright (C) 2013 Aleksander Morgado <aleksander at gnu.org>
> > + * Copyright (C) 2017 Tempered Networks Inc.
> > + */
> > +
> > +#include <config.h>
> > +
> > +#include <stdlib.h>
> > +#include <stdio.h>
> > +#include <string.h>
> > +#include <unistd.h>
> > +#include <ctype.h>
> > +
> > +#include "ModemManager.h"
> > +#include "mm-base-modem-at.h"
> > +#include "mm-serial-parsers.h"
> > +#include "mm-log.h"
> > +#include "mm-errors-types.h"
> > +#include "mm-iface-modem.h"
> > +#include "mm-iface-modem-3gpp.h"
> > +#include "mm-broadband-bearer-infineon.h"
> > +#include "mm-broadband-modem-infineon.h"
> > +
> > +static void iface_modem_init (MMIfaceModem *iface);
> > +
> > +
> > +G_DEFINE_TYPE_EXTENDED (MMBroadbandModemInfineon,
> > mm_broadband_modem_infineon, MM_TYPE_BROADBAND_MODEM, 0,
> > + G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM,
> > iface_modem_init))
> > +
> >
> +/*****************************************************************************/
> > +/* Create Bearer (Modem interface) */
> > +
> > +static MMBaseBearer *
> > +modem_create_bearer_finish (MMIfaceModem *self,
> > + GAsyncResult *res,
> > + GError **error)
> > +{
> > + MMBaseBearer *bearer;
> > +
> > + bearer = g_simple_async_result_get_op_res_gpointer
> > (G_SIMPLE_ASYNC_RESULT (res));
> > + mm_dbg ("New Infineon bearer created at DBus path '%s'",
> > mm_base_bearer_get_path (bearer));
> > +
> > + return g_object_ref (bearer);
> > +}
> > +
> > +static void
> > +broadband_bearer_infineon_new_ready (GObject *source,
> > + GAsyncResult *res,
> > + GSimpleAsyncResult *simple)
> > +{
> > + MMBaseBearer *bearer = NULL;
> > + GError *error = NULL;
> > +
> > + bearer = mm_broadband_bearer_infineon_new_finish (res, &error);
> > + if (!bearer)
> > + g_simple_async_result_take_error (simple, error);
> > + else
> > + g_simple_async_result_set_op_res_gpointer (simple,
> > + bearer,
> > +
> > (GDestroyNotify)g_object_unref);
> > + g_simple_async_result_complete (simple);
> > + g_object_unref (simple);
> > +}
> > +
> > +static void
> > +modem_create_bearer (MMIfaceModem *self,
> > + MMBearerProperties *properties,
> > + GAsyncReadyCallback callback,
> > + gpointer user_data)
> > +{
> > + GSimpleAsyncResult *result;
> > +
> > + result = g_simple_async_result_new (G_OBJECT (self),
> > + callback,
> > + user_data,
> > + modem_create_bearer);
> > +
> > + mm_broadband_bearer_infineon_new (MM_BROADBAND_MODEM_INFINEON
> (self),
> > + properties,
> > + NULL, /* cancellable */
> > +
> > (GAsyncReadyCallback)broadband_bearer_infineon_new_ready,
> > + result);
> > +}
> > +
> >
> +/*****************************************************************************/
> > +/* Reset (Modem interface) */
> > +
> > +static gboolean
> > +modem_reset_finish (MMIfaceModem *self,
> > + GAsyncResult *res,
> > + GError **error)
> > +{
> > + return !!mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res,
> > error);
> > +}
> > +
> > +static void
> > +modem_reset (MMIfaceModem *self,
> > + GAsyncReadyCallback callback,
> > + gpointer user_data)
> > +{
> > + mm_base_modem_at_command (MM_BASE_MODEM (self),
> > + "AT+CFUN=1,1",
> > + 3,
> > + FALSE,
> > + callback,
> > + user_data);
> > +}
> > +
> >
> +/*****************************************************************************/
> > +/* MODEM POWER DOWN */
> > +
> > +static gboolean
> > +modem_power_down_finish (MMIfaceModem *self,
> > + GAsyncResult *res,
> > + GError **error)
> > +{
> > + return !!mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res,
> > error);
> > +}
> > +
> > +static void
> > +modem_power_down (MMIfaceModem *self,
> > + GAsyncReadyCallback callback,
> > + gpointer user_data)
> > +{
> > + /* Use AT+CFUN=4 for power down. It will stop the RF (IMSI detach),
> and
> > + * keeps access to the SIM */
> > + mm_base_modem_at_command (MM_BASE_MODEM (self),
> > + "+CFUN=4",
> > + /* The modem usually completes +CFUN=4
> > within 1-2 seconds,
> > + * but sometimes takes a ridiculously long
> > time (~30-35 seconds).
> > + * It's better to have a long timeout here
> > than to have the
> > + * modem not responding to subsequent AT
> > commands until +CFUN=4
> > + * completes. */
> > + 40,
> > + FALSE,
> > + callback,
> > + user_data);
> > +}
> > +
> > +
> >
> +/*****************************************************************************/
> > +/* Modem power up (Modem interface) */
> > +
> > +static gboolean
> > +modem_power_up_finish (MMIfaceModem *self,
> > + GAsyncResult *res,
> > + GError **error)
> > +{
> > + return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT
> > (res), error);
> > +}
> > +
> > +static void
> > +modem_power_up (MMIfaceModem *self,
> > + GAsyncReadyCallback callback,
> > + gpointer user_data)
> > +{
> > + mm_base_modem_at_command (MM_BASE_MODEM (self),
> > + "+CFUN=1",
> > + 10,
> > + FALSE,
> > + callback,
> > + user_data);
> > +}
> > +
> >
> +/*****************************************************************************/
> > +
> > +MMBroadbandModemInfineon *
> > +mm_broadband_modem_infineon_new (const gchar *device,
> > + const gchar **drivers,
> > + const gchar *plugin,
> > + guint16 vendor_id,
> > + guint16 product_id)
> > +{
> > + return g_object_new (MM_TYPE_BROADBAND_MODEM_INFINEON,
> > + MM_BASE_MODEM_DEVICE, device,
> > + MM_BASE_MODEM_DRIVERS, drivers,
> > + MM_BASE_MODEM_PLUGIN, plugin,
> > + MM_BASE_MODEM_VENDOR_ID, vendor_id,
> > + MM_BASE_MODEM_PRODUCT_ID, product_id,
> > + NULL);
> > +}
> > +
> > +static void
> > +mm_broadband_modem_infineon_init (MMBroadbandModemInfineon *self)
> > +{
> > +}
> > +
> > +static void
> > +iface_modem_init (MMIfaceModem *iface)
> > +{
> > + iface->create_bearer = modem_create_bearer;
> > + iface->create_bearer_finish = modem_create_bearer_finish;
> > + iface->reset = modem_reset;
> > + iface->reset_finish = modem_reset_finish;
> > + iface->modem_power_down = modem_power_down;
> > + iface->modem_power_down_finish = modem_power_down_finish;
> > + iface->modem_power_up = modem_power_up;
> > + iface->modem_power_up_finish = modem_power_up_finish;
> > +
> > +}
> > +
> > +static void
> > +mm_broadband_modem_infineon_class_init (MMBroadbandModemInfineonClass
> > *klass)
> > +{
> > +}
> > diff --git a/plugins/infineon/mm-broadband-modem-infineon.h
> > b/plugins/infineon/mm-broadband-modem-infineon.h
> > new file mode 100644
> > index 0000000..1b4ee5a
> > --- /dev/null
> > +++ b/plugins/infineon/mm-broadband-modem-infineon.h
> > @@ -0,0 +1,47 @@
> > +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
> -*-
> > */
> > +/*
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation; either version 2 of the License, or
> > + * (at your option) any later version.
> > + *
> > + * 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:
> > + *
> > + * Copyright (C) 2013 Aleksander Morgado <aleksander at gnu.org>
> > + */
> > +
> > +#ifndef MM_BROADBAND_MODEM_INFINEON_H
> > +#define MM_BROADBAND_MODEM_INFINEON_H
> > +
> > +#include "mm-broadband-modem.h"
> > +
> > +#define MM_TYPE_BROADBAND_MODEM_INFINEON
> > (mm_broadband_modem_infineon_get_type ())
> > +#define MM_BROADBAND_MODEM_INFINEON(obj)
> > (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_INFINEON,
> > MMBroadbandModemInfineon))
> > +#define MM_BROADBAND_MODEM_INFINEON_CLASS(klass)
> > (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_MODEM_INFINEON,
> > MMBroadbandModemInfineonClass))
> > +#define MM_IS_BROADBAND_MODEM_INFINEON(obj)
> > (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_INFINEON))
> > +#define MM_IS_BROADBAND_MODEM_INFINEON_CLASS(klass)
> > (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM_INFINEON))
> > +#define MM_BROADBAND_MODEM_INFINEON_GET_CLASS(obj)
> > (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_MODEM_INFINEON,
> > MMBroadbandModemInfineonClass))
> > +
> > +typedef struct _MMBroadbandModemInfineon MMBroadbandModemInfineon;
> > +typedef struct _MMBroadbandModemInfineonClass
> > MMBroadbandModemInfineonClass;
> > +
> > +struct _MMBroadbandModemInfineon {
> > + MMBroadbandModem parent;
> > +};
> > +
> > +struct _MMBroadbandModemInfineonClass{
> > + MMBroadbandModemClass parent;
> > +};
> > +
> > +GType mm_broadband_modem_infineon_get_type (void);
> > +
> > +MMBroadbandModemInfineon *mm_broadband_modem_infineon_new (const gchar
> > *device,
> > + const gchar
> > **drivers,
> > + const gchar
> > *plugin,
> > + guint16
> > vendor_id,
> > + guint16
> > product_id);
> > +
> > +#endif /* MM_BROADBAND_MODEM_INFINEON_H */
> > diff --git a/plugins/infineon/mm-plugin-infineon.c
> > b/plugins/infineon/mm-plugin-infineon.c
> > new file mode 100755
> > index 0000000..11ab596
> > --- /dev/null
> > +++ b/plugins/infineon/mm-plugin-infineon.c
> > @@ -0,0 +1,88 @@
> > +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
> -*-
> > */
> > +
> > +/*
> > + * This program is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU General Public License as
> > + * published by the Free Software Foundation; either version 2 of the
> > + * License, or (at your option) any later version.
> > + *
> > + * 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., 59 Temple Place - Suite 330,
> > + * Boston, MA 02111-1307, USA.
> > + *
> > + * Copyright (C) 2013 Aleksander Morgado <aleksander at gnu.org>
> > + * Copyright (C) 2017 Tempered Networks Inc.
> > + */
> > +
> > +#include <string.h>
> > +#include <gmodule.h>
> > +
> > +#define _LIBMM_INSIDE_MM
> > +#include <libmm-glib.h>
> > +
> > +#include "mm-broadband-modem-infineon.h"
> > +#include "mm-plugin-infineon.h"
> > +#include "mm-log.h"
> > +
> > +G_DEFINE_TYPE (MMPluginInfineon, mm_plugin_infineon, MM_TYPE_PLUGIN)
> > +
> > +int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> > +int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> > +
> > +static MMBaseModem *
> > +create_modem (MMPlugin *self,
> > + const gchar *sysfs_path,
> > + const gchar **drivers,
> > + guint16 vendor,
> > + guint16 product,
> > + GList *probes,
> > + GError **error)
> > +{
> > + return MM_BASE_MODEM (mm_broadband_modem_infineon_new (sysfs_path,
> > + drivers,
> > +
> > mm_plugin_get_name (self),
> > + vendor,
> > + product));
> > +}
> > +
> >
> +/*****************************************************************************/
> > +
> > +G_MODULE_EXPORT MMPlugin *
> > +mm_plugin_create (void)
> > +{
> > + static const gchar *subsystems[] = { "tty", "net", "usb", NULL };
> > + static const guint16 vendor_ids[] = { 0x1519, 0 };
> > + // We only want to support the NCM based USB composition.
> > + static const guint16 product_ids_allow[] = { 0x0443, 0};
> > + // Otherwise fall back on the Generic plugin.
> > + static const guint16 product_ids_forbid[] = { 0x0020, 0};
> > +
> > + return MM_PLUGIN (
> > + g_object_new (MM_TYPE_PLUGIN_INFINEON,
> > + MM_PLUGIN_NAME, "Infineon",
> > + MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems,
> > + MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids,
> > + MM_PLUGIN_ALLOWED_PRODUCT_IDS, product_ids_allow,
> > + MM_PLUGIN_FORBIDDEN_PRODUCT_IDS,
> product_ids_forbid,
> > + MM_PLUGIN_ALLOWED_AT, TRUE,
> > + NULL));
> > +}
> > +
> > +static void
> > +mm_plugin_infineon_init (MMPluginInfineon *self)
> > +{
> > +}
> > +
> > +static void
> > +mm_plugin_infineon_class_init (MMPluginInfineonClass *klass)
> > +{
> > + MMPluginClass *plugi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/modemmanager-devel/attachments/20170528/95708078/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Add-Infineon-Modem-and-bearer-plugin.patch
Type: application/octet-stream
Size: 59282 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/modemmanager-devel/attachments/20170528/95708078/attachment-0001.obj>
More information about the ModemManager-devel
mailing list