950abbf8ee
Back in Linux < 3.6 days, the cdc-wdm ports exposed by the QMI driver were flagged as owned by the 'usb' subsystem. That changed in 3.6 when the subsystem was renamed to 'usbmisc': https://mail.gnome.org/archives/networkmanager-list/2012-June/msg00125.html This patch removes all monitoring of the 'usb' subsystem completely, which is anyway a valid subsystem but for which we shouldn't need any special handling. Right now, with newer kernels, we were using that monitoring exclusively to get notified of full USB device remove events, which is really not required as we already process the port removals one by one. We simplify the logic everywhere that attempted to match either the 'usb' or 'usbmisc' subsystems, and we no longer require the explicit checks for the port name being named 'cdc-wdm[0-9]*' in the code, as that is already taken care of by the ID_MM_CANDIDATE udev tag rule.
218 lines
7.5 KiB
C
218 lines
7.5 KiB
C
/* -*- 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) 2011 Ammonit Measurement GmbH
|
|
* Copyright (C) 2011 - 2012 Google Inc.
|
|
* Author: Aleksander Morgado <aleksander@lanedo.com>
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <gmodule.h>
|
|
|
|
#define _LIBMM_INSIDE_MM
|
|
#include <libmm-glib.h>
|
|
|
|
#include "mm-plugin-cinterion.h"
|
|
#include "mm-broadband-modem-cinterion.h"
|
|
#include "mm-log-object.h"
|
|
|
|
#if defined WITH_QMI
|
|
#include "mm-broadband-modem-qmi-cinterion.h"
|
|
#endif
|
|
|
|
#if defined WITH_MBIM
|
|
#include "mm-broadband-modem-mbim.h"
|
|
#endif
|
|
|
|
G_DEFINE_TYPE (MMPluginCinterion, mm_plugin_cinterion, MM_TYPE_PLUGIN)
|
|
|
|
MM_PLUGIN_DEFINE_MAJOR_VERSION
|
|
MM_PLUGIN_DEFINE_MINOR_VERSION
|
|
|
|
/*****************************************************************************/
|
|
/* Custom init */
|
|
|
|
#define TAG_CINTERION_APP_PORT "cinterion-app-port"
|
|
#define TAG_CINTERION_MODEM_PORT "cinterion-modem-port"
|
|
|
|
static gboolean
|
|
cinterion_custom_init_finish (MMPortProbe *probe,
|
|
GAsyncResult *result,
|
|
GError **error)
|
|
{
|
|
return g_task_propagate_boolean (G_TASK (result), error);
|
|
}
|
|
|
|
static void
|
|
sqport_ready (MMPortSerialAt *port,
|
|
GAsyncResult *res,
|
|
GTask *task)
|
|
{
|
|
MMPortProbe *probe;
|
|
const gchar *response;
|
|
|
|
probe = g_task_get_source_object (task);
|
|
|
|
/* Ignore errors, just avoid tagging */
|
|
response = mm_port_serial_at_command_finish (port, res, NULL);
|
|
if (response) {
|
|
/* A valid reply to AT^SQPORT tells us this is an AT port already */
|
|
mm_port_probe_set_result_at (probe, TRUE);
|
|
|
|
if (strstr (response, "Application"))
|
|
g_object_set_data (G_OBJECT (probe), TAG_CINTERION_APP_PORT, GUINT_TO_POINTER (TRUE));
|
|
else if (strstr (response, "Modem"))
|
|
g_object_set_data (G_OBJECT (probe), TAG_CINTERION_MODEM_PORT, GUINT_TO_POINTER (TRUE));
|
|
}
|
|
|
|
g_task_return_boolean (task, TRUE);
|
|
g_object_unref (task);
|
|
}
|
|
|
|
static void
|
|
cinterion_custom_init (MMPortProbe *probe,
|
|
MMPortSerialAt *port,
|
|
GCancellable *cancellable,
|
|
GAsyncReadyCallback callback,
|
|
gpointer user_data)
|
|
{
|
|
GTask *task;
|
|
|
|
task = g_task_new (probe, cancellable, callback, user_data);
|
|
|
|
mm_port_serial_at_command (
|
|
port,
|
|
"AT^SQPORT?",
|
|
3,
|
|
FALSE, /* raw */
|
|
FALSE, /* allow cached */
|
|
cancellable,
|
|
(GAsyncReadyCallback) sqport_ready,
|
|
task);
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
static MMBaseModem *
|
|
create_modem (MMPlugin *self,
|
|
const gchar *uid,
|
|
const gchar **drivers,
|
|
guint16 vendor,
|
|
guint16 product,
|
|
GList *probes,
|
|
GError **error)
|
|
{
|
|
#if defined WITH_QMI
|
|
if (mm_port_probe_list_has_qmi_port (probes)) {
|
|
mm_obj_dbg (self, "QMI-powered Cinterion modem found...");
|
|
return MM_BASE_MODEM (mm_broadband_modem_qmi_cinterion_new (uid,
|
|
drivers,
|
|
mm_plugin_get_name (self),
|
|
vendor,
|
|
product));
|
|
}
|
|
#endif
|
|
|
|
#if defined WITH_MBIM
|
|
if (mm_port_probe_list_has_mbim_port (probes)) {
|
|
mm_obj_dbg (self, "MBIM-powered Cinterion modem found...");
|
|
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
|
|
drivers,
|
|
mm_plugin_get_name (self),
|
|
vendor,
|
|
product));
|
|
}
|
|
#endif
|
|
|
|
return MM_BASE_MODEM (mm_broadband_modem_cinterion_new (uid,
|
|
drivers,
|
|
mm_plugin_get_name (self),
|
|
vendor,
|
|
product));
|
|
}
|
|
|
|
static gboolean
|
|
grab_port (MMPlugin *self,
|
|
MMBaseModem *modem,
|
|
MMPortProbe *probe,
|
|
GError **error)
|
|
{
|
|
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
|
|
MMPortType ptype;
|
|
|
|
ptype = mm_port_probe_get_port_type (probe);
|
|
|
|
if (g_object_get_data (G_OBJECT (probe), TAG_CINTERION_APP_PORT)) {
|
|
mm_obj_dbg (self, "port '%s/%s' flagged as primary",
|
|
mm_port_probe_get_port_subsys (probe),
|
|
mm_port_probe_get_port_name (probe));
|
|
pflags = MM_PORT_SERIAL_AT_FLAG_PRIMARY;
|
|
} else if (g_object_get_data (G_OBJECT (probe), TAG_CINTERION_MODEM_PORT)) {
|
|
mm_obj_dbg (self, "port '%s/%s' flagged as PPP",
|
|
mm_port_probe_get_port_subsys (probe),
|
|
mm_port_probe_get_port_name (probe));
|
|
pflags = MM_PORT_SERIAL_AT_FLAG_PPP;
|
|
}
|
|
|
|
return mm_base_modem_grab_port (modem,
|
|
mm_port_probe_peek_port (probe),
|
|
ptype,
|
|
pflags,
|
|
error);
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
G_MODULE_EXPORT MMPlugin *
|
|
mm_plugin_create (void)
|
|
{
|
|
static const gchar *subsystems[] = { "tty", "net", "usbmisc", NULL };
|
|
static const gchar *vendor_strings[] = { "cinterion", "siemens", NULL };
|
|
static const guint16 vendor_ids[] = { 0x1e2d, 0x0681, 0 };
|
|
static const MMAsyncMethod custom_init = {
|
|
.async = G_CALLBACK (cinterion_custom_init),
|
|
.finish = G_CALLBACK (cinterion_custom_init_finish),
|
|
};
|
|
|
|
return MM_PLUGIN (
|
|
g_object_new (MM_TYPE_PLUGIN_CINTERION,
|
|
MM_PLUGIN_NAME, MM_MODULE_NAME,
|
|
MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems,
|
|
MM_PLUGIN_ALLOWED_VENDOR_STRINGS, vendor_strings,
|
|
MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids,
|
|
MM_PLUGIN_ALLOWED_AT, TRUE,
|
|
MM_PLUGIN_ALLOWED_QMI, TRUE,
|
|
MM_PLUGIN_ALLOWED_MBIM, TRUE,
|
|
MM_PLUGIN_CUSTOM_INIT, &custom_init,
|
|
NULL));
|
|
}
|
|
|
|
static void
|
|
mm_plugin_cinterion_init (MMPluginCinterion *self)
|
|
{
|
|
}
|
|
|
|
static void
|
|
mm_plugin_cinterion_class_init (MMPluginCinterionClass *klass)
|
|
{
|
|
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
|
|
|
|
plugin_class->create_modem = create_modem;
|
|
plugin_class->grab_port = grab_port;
|
|
}
|