SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quectel: add support for EM120/160 PCIe modules

Browse Source
This commit is contained in:
Ivan Mikhanchuk
2021-06-16 00:40:26 -07:00
parent 4165052e8f
commit 83ac824705
4 changed files with 207 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/Makefile.am
+6
View File
@@ -1276,6 +1276,12 @@ libmm_plugin_quectel_la_SOURCES += \
quectel/mm-broadband-modem-qmi-quectel.h \
$(NULL)
endif
if WITH_MBIM
libmm_plugin_quectel_la_SOURCES += \
quectel/mm-broadband-modem-mbim-quectel.c \
quectel/mm-broadband-modem-mbim-quectel.h \
$(NULL)
endif
libmm_plugin_quectel_la_CPPFLAGS = \
$(PLUGIN_COMMON_COMPILER_FLAGS) \
-DMM_MODULE_NAME=\"quectel\" \
plugins/quectel/mm-broadband-modem-mbim-quectel.c
+132
View File
@@ -0,0 +1,132 @@
/* -*- 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) 2020 Aleksander Morgado <aleksander@aleksander.es>
* Copyright (C) 2021 Ivan Mikhanchuk <ivan.mikhanchuk@quectel.com>
*/
#include <config.h>
#include "mm-base-modem-at.h"
#include "mm-log-object.h"
#include "mm-iface-modem.h"
#include "mm-iface-modem-firmware.h"
#include "mm-iface-modem-time.h"
#include "mm-shared-quectel.h"
#include "mm-modem-helpers-quectel.h"
#include "mm-broadband-modem-mbim-quectel.h"
static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimQuectel, mm_broadband_modem_mbim_quectel, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_FIRMWARE, iface_modem_firmware_init)
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_TIME, iface_modem_time_init)
G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_QUECTEL, shared_quectel_init))
/*****************************************************************************/
/* Firmware update settings */
static MMFirmwareUpdateSettings *
firmware_load_update_settings_finish (MMIfaceModemFirmware *self,
GAsyncResult *res,
GError **error)
{
return g_task_propagate_pointer (G_TASK (res), error);
}
static void
quectel_get_firmware_version_ready (MMBaseModem *modem,
GAsyncResult *res,
GTask *task)
{
MMFirmwareUpdateSettings *update_settings;
const gchar *version;
update_settings = mm_firmware_update_settings_new (MM_MODEM_FIRMWARE_UPDATE_METHOD_FIREHOSE);
version = mm_base_modem_at_command_finish (modem, res, NULL);
if (version)
mm_firmware_update_settings_set_version (update_settings, version);
g_task_return_pointer (task, update_settings, g_object_unref);
g_object_unref (task);
}
static void
firmware_load_update_settings (MMIfaceModemFirmware *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
GTask *task;
task = g_task_new (self, NULL, callback, user_data);
mm_base_modem_at_command (MM_BASE_MODEM (self),
"+QGMR?",
3,
FALSE,
(GAsyncReadyCallback) quectel_get_firmware_version_ready,
task);
}
/*****************************************************************************/
MMBroadbandModemMbimQuectel *
mm_broadband_modem_mbim_quectel_new (const gchar *device,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
guint16 product_id)
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_QUECTEL,
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,
/* include carrier information */
MM_IFACE_MODEM_FIRMWARE_IGNORE_CARRIER, FALSE,
/* MBIM bearer supports NET only */
MM_BASE_MODEM_DATA_NET_SUPPORTED, TRUE,
MM_BASE_MODEM_DATA_TTY_SUPPORTED, FALSE,
NULL);
}
static void
mm_broadband_modem_mbim_quectel_init (MMBroadbandModemMbimQuectel *self)
{
}
static void
iface_modem_firmware_init (MMIfaceModemFirmware *iface)
{
iface->load_update_settings = firmware_load_update_settings;
iface->load_update_settings_finish = firmware_load_update_settings_finish;
}
static void
iface_modem_time_init (MMIfaceModemTime *iface)
{
iface->check_support = mm_shared_quectel_time_check_support;
iface->check_support_finish = mm_shared_quectel_time_check_support_finish;
}
static void
shared_quectel_init (MMSharedQuectel *iface)
{
}
static void
mm_broadband_modem_mbim_quectel_class_init (MMBroadbandModemMbimQuectelClass *klass)
{
}
plugins/quectel/mm-broadband-modem-mbim-quectel.h
+48
View File
@@ -0,0 +1,48 @@
/* -*- 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) 2020 Aleksander Morgado <aleksander@aleksander.es>
* Copyright (C) 2021 Ivan Mikhanchuk <ivan.mikhanchuk@quectel.com>
*/
#ifndef MM_BROADBAND_MODEM_MBIM_QUECTEL_H
#define MM_BROADBAND_MODEM_MBIM_QUECTEL_H
#include "mm-broadband-modem-mbim.h"
#define MM_TYPE_BROADBAND_MODEM_MBIM_QUECTEL (mm_broadband_modem_mbim_quectel_get_type ())
#define MM_BROADBAND_MODEM_MBIM_QUECTEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_MBIM_QUECTEL, MMBroadbandModemMbimQuectel))
#define MM_BROADBAND_MODEM_MBIM_QUECTEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_MODEM_MBIM_QUECTEL, MMBroadbandModemMbimQuectelClass))
#define MM_IS_BROADBAND_MODEM_MBIM_QUECTEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_MBIM_QUECTEL))
#define MM_IS_BROADBAND_MODEM_MBIM_QUECTEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM_MBIM_QUECTEL))
#define MM_BROADBAND_MODEM_MBIM_QUECTEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_MODEM_MBIM_QUECTEL, MMBroadbandModemMbimQuectelClass))
typedef struct _MMBroadbandModemMbimQuectel MMBroadbandModemMbimQuectel;
typedef struct _MMBroadbandModemMbimQuectelClass MMBroadbandModemMbimQuectelClass;
struct _MMBroadbandModemMbimQuectel {
MMBroadbandModemMbim parent;
};
struct _MMBroadbandModemMbimQuectelClass{
MMBroadbandModemMbimClass parent;
};
GType mm_broadband_modem_mbim_quectel_get_type (void);
MMBroadbandModemMbimQuectel *mm_broadband_modem_mbim_quectel_new (const gchar *device,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
guint16 product_id);
#endif /* MM_BROADBAND_MODEM_MBIM_QUECTEL_H */
plugins/quectel/mm-plugin-quectel.c
+21 -8
View File
@@ -29,6 +29,7 @@
#if defined WITH_MBIM
#include "mm-broadband-modem-mbim.h"
#include "mm-broadband-modem-mbim-quectel.h"
#endif
G_DEFINE_TYPE (MMPluginQuectel, mm_plugin_quectel, MM_TYPE_PLUGIN)
@@ -60,12 +61,21 @@ create_modem (MMPlugin *self,
#if defined WITH_MBIM
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Quectel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
drivers,
mm_plugin_get_name (self),
vendor,
product));
if (vendor == 0x1eac) {
mm_obj_dbg (self, "MBIM-powered PCI Quectel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_quectel_new (uid,
drivers,
mm_plugin_get_name (self),
vendor,
product));
} else {
mm_obj_dbg (self, "MBIM-powered Quectel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
drivers,
mm_plugin_get_name (self),
vendor,
product));
}
}
#endif
@@ -81,9 +91,12 @@ create_modem (MMPlugin *self,
G_MODULE_EXPORT MMPlugin *
mm_plugin_create (void)
{
static const gchar *subsystems[] = { "tty", "net", "usbmisc", NULL };
static const gchar *subsystems[] = { "tty", "net", "usbmisc", "wwan", NULL };
static const gchar *vendor_strings[] = { "quectel", NULL };
static const guint16 vendor_ids[] = { 0x2c7c, 0 };
static const guint16 vendor_ids[] = {
0x2c7c, /* usb vid */
0x1eac, /* pci vid */
0 };
return MM_PLUGIN (
g_object_new (MM_TYPE_PLUGIN_QUECTEL,