summaryrefslogtreecommitdiff
path: root/plugins/x22x/mm-plugin-x22x.c
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/x22x/mm-plugin-x22x.c')
-rw-r--r--plugins/x22x/mm-plugin-x22x.c167
1 files changed, 58 insertions, 109 deletions
diff --git a/plugins/x22x/mm-plugin-x22x.c b/plugins/x22x/mm-plugin-x22x.c
index db5f25b7..9bfc62d2 100644
--- a/plugins/x22x/mm-plugin-x22x.c
+++ b/plugins/x22x/mm-plugin-x22x.c
@@ -21,7 +21,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
-#include "mm-log.h"
+#include "mm-log-object.h"
#include "mm-modem-helpers.h"
#include "mm-plugin-x22x.h"
#include "mm-broadband-modem-x22x.h"
@@ -32,57 +32,52 @@
G_DEFINE_TYPE (MMPluginX22x, mm_plugin_x22x, MM_TYPE_PLUGIN)
-int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
-int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
+MM_PLUGIN_DEFINE_MAJOR_VERSION
+MM_PLUGIN_DEFINE_MINOR_VERSION
/*****************************************************************************/
/* Custom init */
typedef struct {
- MMPortProbe *probe;
MMPortSerialAt *port;
- GCancellable *cancellable;
- GSimpleAsyncResult *result;
guint retries;
} X22xCustomInitContext;
static void
-x22x_custom_init_context_complete_and_free (X22xCustomInitContext *ctx)
+x22x_custom_init_context_free (X22xCustomInitContext *ctx)
{
- g_simple_async_result_complete_in_idle (ctx->result);
-
- if (ctx->cancellable)
- g_object_unref (ctx->cancellable);
g_object_unref (ctx->port);
- g_object_unref (ctx->probe);
- g_object_unref (ctx->result);
g_slice_free (X22xCustomInitContext, ctx);
}
static gboolean
x22x_custom_init_finish (MMPortProbe *probe,
- GAsyncResult *result,
- GError **error)
+ GAsyncResult *result,
+ GError **error)
{
- return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
+ return g_task_propagate_boolean (G_TASK (result), error);
}
-static void x22x_custom_init_step (X22xCustomInitContext *ctx);
+static void x22x_custom_init_step (GTask *task);
static void
gmr_ready (MMPortSerialAt *port,
- GAsyncResult *res,
- X22xCustomInitContext *ctx)
+ GAsyncResult *res,
+ GTask *task)
{
+ MMPortProbe *probe;
const gchar *p;
const gchar *response;
- GError *error = NULL;
+ GError *error = NULL;
+
+ probe = g_task_get_source_object (task);
response = mm_port_serial_at_command_finish (port, res, &error);
if (error) {
+ g_error_free (error);
/* Just retry... */
- x22x_custom_init_step (ctx);
- goto out;
+ x22x_custom_init_step (task);
+ return;
}
/* Note the lack of a ':' on the GMR; the X200 doesn't send one */
@@ -93,42 +88,44 @@ gmr_ready (MMPortSerialAt *port,
* So use that to determine if the device is an X200, which this plugin
* does supports.
*/
- g_simple_async_result_set_error (ctx->result,
- MM_CORE_ERROR,
- MM_CORE_ERROR_UNSUPPORTED,
- "Not supported with the X22X plugin");
+ g_task_return_new_error (task,
+ MM_CORE_ERROR,
+ MM_CORE_ERROR_UNSUPPORTED,
+ "Not supported with the X22X plugin");
} else {
- mm_dbg ("(X22X) device is supported by this plugin");
- g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
+ mm_obj_dbg (probe, "(X22X) device is supported by this plugin");
+ g_task_return_boolean (task, TRUE);
}
-
- x22x_custom_init_context_complete_and_free (ctx);
-
-out:
- if (error)
- g_error_free (error);
+ g_object_unref (task);
}
static void
-x22x_custom_init_step (X22xCustomInitContext *ctx)
+x22x_custom_init_step (GTask *task)
{
+ MMPortProbe *probe;
+ X22xCustomInitContext *ctx;
+ GCancellable *cancellable;
+
+ probe = g_task_get_source_object (task);
+ ctx = g_task_get_task_data (task);
+ cancellable = g_task_get_cancellable (task);
+
/* If cancelled, end */
- if (g_cancellable_is_cancelled (ctx->cancellable)) {
- mm_dbg ("(X22X) no need to keep on running custom init in (%s)",
- mm_port_get_device (MM_PORT (ctx->port)));
- g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
- x22x_custom_init_context_complete_and_free (ctx);
+ if (g_cancellable_is_cancelled (cancellable)) {
+ mm_obj_dbg (probe, "(X22X) no need to keep on running custom init");
+ g_task_return_boolean (task, TRUE);
+ g_object_unref (task);
return;
}
if (ctx->retries == 0) {
/* In this case, we need the AT command result to decide whether we can
* support this modem or not, so really fail if we didn't get it. */
- g_simple_async_result_set_error (ctx->result,
- MM_CORE_ERROR,
- MM_CORE_ERROR_FAILED,
- "Couldn't get device revision information");
- x22x_custom_init_context_complete_and_free (ctx);
+ g_task_return_new_error (task,
+ MM_CORE_ERROR,
+ MM_CORE_ERROR_FAILED,
+ "Couldn't get device revision information");
+ g_object_unref (task);
return;
}
@@ -139,9 +136,9 @@ x22x_custom_init_step (X22xCustomInitContext *ctx)
3,
FALSE, /* raw */
FALSE, /* allow_cached */
- ctx->cancellable,
+ cancellable,
(GAsyncReadyCallback)gmr_ready,
- ctx);
+ task);
}
static void
@@ -153,17 +150,16 @@ x22x_custom_init (MMPortProbe *probe,
{
MMDevice *device;
X22xCustomInitContext *ctx;
+ GTask *task;
ctx = g_slice_new (X22xCustomInitContext);
- ctx->result = g_simple_async_result_new (G_OBJECT (probe),
- callback,
- user_data,
- x22x_custom_init);
- ctx->probe = g_object_ref (probe);
ctx->port = g_object_ref (port);
- ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
ctx->retries = 3;
+ task = g_task_new (probe, cancellable, callback, user_data);
+ g_task_set_check_cancellable (task, FALSE);
+ g_task_set_task_data (task, ctx, (GDestroyNotify)x22x_custom_init_context_free);
+
/* TCT/Alcatel in their infinite wisdom assigned the same USB VID/PID to
* the x060s (Longcheer firmware) and the x200 (X22X, this plugin) and thus
* we can't tell them apart via udev rules. Worse, they both report the
@@ -177,19 +173,19 @@ x22x_custom_init (MMPortProbe *probe,
if (mm_device_get_vendor (device) != 0x1bbb ||
mm_device_get_product (device) != 0x0000) {
/* If not exactly this vendor/product, just skip */
- g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
- x22x_custom_init_context_complete_and_free (ctx);
+ g_task_return_boolean (task, TRUE);
+ g_object_unref (task);
return;
}
- x22x_custom_init_step (ctx);
+ x22x_custom_init_step (task);
}
/*****************************************************************************/
static MMBaseModem *
create_modem (MMPlugin *self,
- const gchar *sysfs_path,
+ const gchar *uid,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -198,8 +194,8 @@ create_modem (MMPlugin *self,
{
#if defined WITH_QMI
if (mm_port_probe_list_has_qmi_port (probes)) {
- mm_dbg ("QMI-powered X22X modem found...");
- return MM_BASE_MODEM (mm_broadband_modem_qmi_new (sysfs_path,
+ mm_obj_dbg (self, "QMI-powered X22X modem found...");
+ return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -207,65 +203,19 @@ create_modem (MMPlugin *self,
}
#endif
- return MM_BASE_MODEM (mm_broadband_modem_x22x_new (sysfs_path,
+ return MM_BASE_MODEM (mm_broadband_modem_x22x_new (uid,
drivers,
mm_plugin_get_name (self),
vendor,
product));
}
-static gboolean
-grab_port (MMPlugin *self,
- MMBaseModem *modem,
- MMPortProbe *probe,
- GError **error)
-{
- GUdevDevice *port;
- MMPortType ptype;
- MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
-
- port = mm_port_probe_peek_port (probe);
- ptype = mm_port_probe_get_port_type (probe);
-
- if (ptype == MM_PORT_TYPE_AT) {
- /* Look for port type hints; just probing can't distinguish which port should
- * be the data/primary port on these devices. We have to tag them based on
- * what the Windows .INF files say the port layout should be.
- */
- if (g_udev_device_get_property_as_boolean (port, "ID_MM_X22X_PORT_TYPE_MODEM")) {
- mm_dbg ("x22x: AT 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_udev_device_get_property_as_boolean (port, "ID_MM_X22X_PORT_TYPE_AUX")) {
- mm_dbg ("x22x: AT port '%s/%s' flagged as secondary",
- mm_port_probe_get_port_subsys (probe),
- mm_port_probe_get_port_name (probe));
- pflags = MM_PORT_SERIAL_AT_FLAG_SECONDARY;
- } else {
- /* If the port was tagged by the udev rules but isn't a primary or secondary,
- * then ignore it to guard against race conditions if a device just happens
- * to show up with more than two AT-capable ports.
- */
- ptype = MM_PORT_TYPE_IGNORED;
- }
- }
-
- return mm_base_modem_grab_port (modem,
- mm_port_probe_get_port_subsys (probe),
- mm_port_probe_get_port_name (probe),
- mm_port_probe_get_parent_path (probe),
- ptype,
- pflags,
- error);
-}
-
/*****************************************************************************/
G_MODULE_EXPORT MMPlugin *
mm_plugin_create (void)
{
- static const gchar *subsystems[] = { "tty", "net", "usb", NULL };
+ static const gchar *subsystems[] = { "tty", "net", "usbmisc", NULL };
/* Vendors: TAMobile and Olivetti */
static const guint16 vendor_ids[] = { 0x1bbb, 0x0b3c, 0 };
/* Only handle X22X tagged devices here. */
@@ -280,7 +230,7 @@ mm_plugin_create (void)
return MM_PLUGIN (
g_object_new (MM_TYPE_PLUGIN_X22X,
- MM_PLUGIN_NAME, "X22X",
+ MM_PLUGIN_NAME, MM_MODULE_NAME,
MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems,
MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids,
MM_PLUGIN_ALLOWED_AT, TRUE,
@@ -301,5 +251,4 @@ mm_plugin_x22x_class_init (MMPluginX22xClass *klass)
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem;
- plugin_class->grab_port = grab_port;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 05:54:54 +0000