Aleksander Morgado
8c4a836a2d
Instead of getting the port type hints while grabbing each probed port, we now run a custom init operation in the probing which already gives us the port type, and therefore allows us to completely skip port probings. Also now added hints for 'Diag' (QCDM) ports and AT/'Modem' ports (I guess it's the one for PPP if we don't have a net port, which is unlikely anyway in HSO). This makes the probing of an Option/HSO modem almost instant.
201 lines
7.5 KiB
C
201 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 hso) 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) 2008 - 2009 Novell, Inc.
|
|
* Copyright (C) 2009 - 2012 Red Hat, Inc.
|
|
* Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <gmodule.h>
|
|
|
|
#define _LIBMM_INSIDE_MM
|
|
#include <libmm-glib.h>
|
|
|
|
#include "mm-private-boxed-types.h"
|
|
#include "mm-plugin-hso.h"
|
|
#include "mm-broadband-modem-hso.h"
|
|
#include "mm-log.h"
|
|
|
|
G_DEFINE_TYPE (MMPluginHso, mm_plugin_hso, MM_TYPE_PLUGIN)
|
|
|
|
int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
|
|
int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
|
|
|
/*****************************************************************************/
|
|
/* Custom init */
|
|
|
|
#define TAG_HSO_AT_CONTROL "hso-at-control"
|
|
#define TAG_HSO_AT_APP "hso-at-app"
|
|
#define TAG_HSO_AT_MODEM "hso-at-modem"
|
|
#define TAG_HSO_AT_GPS_CONTROL "hso-at-gps-control"
|
|
#define TAG_HSO_GPS "hso-gps"
|
|
#define TAG_HSO_DIAG "hso-diag"
|
|
|
|
static gboolean
|
|
hso_custom_init_finish (MMPortProbe *probe,
|
|
GAsyncResult *result,
|
|
GError **error)
|
|
{
|
|
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
|
|
}
|
|
|
|
static void
|
|
hso_custom_init (MMPortProbe *probe,
|
|
MMAtSerialPort *port,
|
|
GCancellable *cancellable,
|
|
GAsyncReadyCallback callback,
|
|
gpointer user_data)
|
|
{
|
|
GUdevDevice *udev_port;
|
|
GSimpleAsyncResult *result;
|
|
const gchar *subsys, *sysfs_path;
|
|
|
|
subsys = mm_port_probe_get_port_subsys (probe);
|
|
udev_port = mm_port_probe_peek_port (probe);
|
|
sysfs_path = g_udev_device_get_sysfs_path (udev_port);
|
|
|
|
if (g_str_equal (subsys, "tty")) {
|
|
gchar *hsotype_path;
|
|
gchar *contents = NULL;
|
|
|
|
hsotype_path = g_build_filename (sysfs_path, "hsotype", NULL);
|
|
if (g_file_get_contents (hsotype_path, &contents, NULL, NULL)) {
|
|
if (g_str_has_prefix (contents, "Control")) {
|
|
g_object_set_data (G_OBJECT (probe), TAG_HSO_AT_CONTROL, GUINT_TO_POINTER (TRUE));
|
|
mm_port_probe_set_result_at (probe, TRUE);
|
|
} else if (g_str_has_prefix (contents, "Application")) {
|
|
g_object_set_data (G_OBJECT (probe), TAG_HSO_AT_APP, GUINT_TO_POINTER (TRUE));
|
|
mm_port_probe_set_result_at (probe, TRUE);
|
|
} else if (g_str_has_prefix (contents, "Modem")) {
|
|
g_object_set_data (G_OBJECT (probe), TAG_HSO_AT_MODEM, GUINT_TO_POINTER (TRUE));
|
|
mm_port_probe_set_result_at (probe, TRUE);
|
|
} else if (g_str_has_prefix (contents, "GPS Control")) {
|
|
g_object_set_data (G_OBJECT (probe), TAG_HSO_AT_GPS_CONTROL, GUINT_TO_POINTER (TRUE));
|
|
mm_port_probe_set_result_at (probe, TRUE);
|
|
} else if (g_str_has_prefix (contents, "GPS")) {
|
|
/* Not an AT port, but the port to grab GPS traces */
|
|
g_object_set_data (G_OBJECT (probe), TAG_HSO_GPS, GUINT_TO_POINTER (TRUE));
|
|
mm_port_probe_set_result_at (probe, FALSE);
|
|
mm_port_probe_set_result_qcdm (probe, FALSE);
|
|
} else if (g_str_has_prefix (contents, "Diag")) {
|
|
g_object_set_data (G_OBJECT (probe), TAG_HSO_DIAG, GUINT_TO_POINTER (TRUE));
|
|
mm_port_probe_set_result_qcdm (probe, TRUE);
|
|
}
|
|
g_free (contents);
|
|
}
|
|
g_free (hsotype_path);
|
|
}
|
|
|
|
result = g_simple_async_result_new (G_OBJECT (probe),
|
|
callback,
|
|
user_data,
|
|
hso_custom_init);
|
|
g_simple_async_result_set_op_res_gboolean (result, TRUE);
|
|
g_simple_async_result_complete_in_idle (result);
|
|
g_object_unref (result);
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
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_hso_new (sysfs_path,
|
|
drivers,
|
|
mm_plugin_get_name (self),
|
|
vendor,
|
|
product));
|
|
}
|
|
|
|
static gboolean
|
|
grab_port (MMPlugin *self,
|
|
MMBaseModem *modem,
|
|
MMPortProbe *probe,
|
|
GError **error)
|
|
{
|
|
const gchar *name, *subsys;
|
|
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
|
|
MMPortType port_type;
|
|
|
|
subsys = mm_port_probe_get_port_subsys (probe);
|
|
name = mm_port_probe_get_port_name (probe);
|
|
port_type = mm_port_probe_get_port_type (probe);
|
|
|
|
/* Detect AT port types */
|
|
if (g_str_equal (subsys, "tty")) {
|
|
if (g_object_get_data (G_OBJECT (probe), TAG_HSO_AT_CONTROL))
|
|
pflags = MM_AT_PORT_FLAG_PRIMARY;
|
|
else if (g_object_get_data (G_OBJECT (probe), TAG_HSO_AT_APP))
|
|
pflags = MM_AT_PORT_FLAG_SECONDARY;
|
|
else if (g_object_get_data (G_OBJECT (probe), TAG_HSO_AT_GPS_CONTROL))
|
|
pflags = MM_AT_PORT_FLAG_GPS_CONTROL;
|
|
else if (g_object_get_data (G_OBJECT (probe), TAG_HSO_AT_MODEM))
|
|
pflags = MM_AT_PORT_FLAG_PPP;
|
|
else if (g_object_get_data (G_OBJECT (probe), TAG_HSO_GPS)) {
|
|
/* Not an AT port, but the port to grab GPS traces */
|
|
g_assert (port_type == MM_PORT_TYPE_UNKNOWN);
|
|
port_type = MM_PORT_TYPE_GPS;
|
|
}
|
|
}
|
|
|
|
return mm_base_modem_grab_port (modem,
|
|
subsys,
|
|
name,
|
|
port_type,
|
|
pflags,
|
|
error);
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
G_MODULE_EXPORT MMPlugin *
|
|
mm_plugin_create (void)
|
|
{
|
|
static const gchar *subsystems[] = { "tty", "net", NULL };
|
|
static const gchar *drivers[] = { "hso", NULL };
|
|
static const MMAsyncMethod custom_init = {
|
|
.async = G_CALLBACK (hso_custom_init),
|
|
.finish = G_CALLBACK (hso_custom_init_finish),
|
|
};
|
|
|
|
return MM_PLUGIN (
|
|
g_object_new (MM_TYPE_PLUGIN_HSO,
|
|
MM_PLUGIN_NAME, "Option High-Speed",
|
|
MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems,
|
|
MM_PLUGIN_ALLOWED_DRIVERS, drivers,
|
|
MM_PLUGIN_ALLOWED_AT, TRUE,
|
|
MM_PLUGIN_ALLOWED_QCDM, TRUE,
|
|
MM_PLUGIN_CUSTOM_INIT, &custom_init,
|
|
NULL));
|
|
}
|
|
|
|
static void
|
|
mm_plugin_hso_init (MMPluginHso *self)
|
|
{
|
|
}
|
|
|
|
static void
|
|
mm_plugin_hso_class_init (MMPluginHsoClass *klass)
|
|
{
|
|
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
|
|
|
|
plugin_class->create_modem = create_modem;
|
|
plugin_class->grab_port = grab_port;
|
|
}
|