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

mtk: rename for old mtk plugin

Browse Source 
Use mtk-legacy to instead mtk plugin.
This commit is contained in:
ming-pei.hsu
2023-10-11 13:27:31 +00:00
committed by Aleksander Morgado
parent 16c3e33812
commit 4fdda13c4e
8 changed files with 100 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson.build
+1 -1
View File
@@ -335,7 +335,7 @@ plugins_options_reqs = {
'longcheer': {'available': true, 'shared': []},
'mbm': {'available': true, 'shared': []},
'motorola': {'available': true, 'shared': []},
'mtk': {'available': true, 'shared': []},
'mtk-legacy': {'available': true, 'shared': []},
'nokia': {'available': true, 'shared': []},
'nokia-icera': {'available': true, 'shared': ['icera']},
'novatel': {'available': true, 'shared': ['novatel']},
meson_options.txt
+2 -1
View File
@@ -51,7 +51,8 @@ option('plugin_linktop', type: 'feature', value: 'auto', description: 'enable li
option('plugin_longcheer', type: 'feature', value: 'auto', description: 'enable longcheer plugin support')
option('plugin_mbm', type: 'feature', value: 'auto', description: 'enable mbm plugin support')
option('plugin_motorola', type: 'feature', value: 'auto', description: 'enable motorola plugin support')
option('plugin_mtk', type: 'feature', value: 'auto', description: 'enable mtk plugin support')
option('plugin_mtk_legacy', type: 'feature', value: 'auto', description: 'enable mtk
legacy plugin support')
option('plugin_nokia', type: 'feature', value: 'auto', description: 'enable nokia plugin support')
# shared_icera
src/plugins/meson.build
+6 -6
View File
@@ -621,19 +621,19 @@ if plugins_options['motorola']
}}
endif
# plugin: mtk
if plugins_options['mtk']
# plugin: mtk-legacy
if plugins_options['mtk-legacy']
test_udev_rules_dir_c_args = ['-DTESTUDEVRULESDIR_MTK="@0@"'.format(plugins_dir / 'mtk')]
plugins_test_udev_rules_dir_c_args += test_udev_rules_dir_c_args
sources = files(
'mtk/mm-broadband-modem-mtk.c',
'mtk/mm-plugin-mtk.c',
'mtk/mm-broadband-modem-mtk-legacy.c',
'mtk/mm-plugin-mtk-legacy.c',
)
plugins += {'plugin-mtk': {
plugins += {'plugin-mtk-legacy': {
'plugin': true,
'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="motorola"']},
'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': test_udev_rules_dir_c_args + ['-DMM_MODULE_NAME="mtk-legacy"']},
}}
plugins_udev_rules += files('mtk/77-mm-mtk-port-types.rules')
src/plugins/mtk/mm-broadband-modem-mtk.c → src/plugins/mtk/mm-broadband-modem-mtk-legacy.c
+23 -25
View File
@@ -30,7 +30,7 @@
#include "mm-base-modem-at.h"
#include "mm-iface-modem.h"
#include "mm-iface-modem-3gpp.h"
#include "mm-broadband-modem-mtk.h"
#include "mm-broadband-modem-mtk-legacy.h"
static void iface_modem_init (MMIfaceModem *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface);
@@ -38,11 +38,11 @@ static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface);
static MMIfaceModem *iface_modem_parent;
static MMIfaceModem3gpp *iface_modem_3gpp_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMtk, mm_broadband_modem_mtk, MM_TYPE_BROADBAND_MODEM, 0,
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMtkLegacy, mm_broadband_modem_mtk_legacy, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init));
struct _MMBroadbandModemMtkPrivate {
struct _MMBroadbandModemMtkLegacyPrivate {
/* Signal quality regex */
GRegex *ecsqg_regex;
GRegex *ecsqu_regex;
@@ -405,7 +405,7 @@ set_current_modes_finish (MMIfaceModem *self,
}
static void
allowed_mode_update_ready (MMBroadbandModemMtk *self,
allowed_mode_update_ready (MMBroadbandModemMtkLegacy *self,
GAsyncResult *res,
GTask *task)
{
@@ -502,7 +502,7 @@ set_current_modes (MMIfaceModem *self,
static void
mtk_80_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemMtk *self)
MMBroadbandModemMtkLegacy *self)
{
guint quality = 0;
@@ -521,7 +521,7 @@ mtk_80_signal_changed (MMPortSerialAt *port,
static void
mtk_90_2g_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemMtk *self)
MMBroadbandModemMtkLegacy *self)
{
guint quality = 0;
@@ -540,7 +540,7 @@ mtk_90_2g_signal_changed (MMPortSerialAt *port,
static void
mtk_90_3g_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemMtk *self)
MMBroadbandModemMtkLegacy *self)
{
guint quality = 0;
@@ -556,7 +556,7 @@ mtk_90_3g_signal_changed (MMPortSerialAt *port,
static void
mtk_90_4g_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemMtk *self)
MMBroadbandModemMtkLegacy *self)
{
guint quality = 0;
@@ -570,7 +570,7 @@ mtk_90_4g_signal_changed (MMPortSerialAt *port,
}
static void
set_unsolicited_events_handlers (MMBroadbandModemMtk *self,
set_unsolicited_events_handlers (MMBroadbandModemMtkLegacy *self,
gboolean enable)
{
MMPortSerialAt *ports[2];
@@ -640,7 +640,7 @@ parent_setup_unsolicited_events_ready (MMIfaceModem3gpp *self,
g_task_return_error (task, error);
else {
/* Our own setup now */
set_unsolicited_events_handlers (MM_BROADBAND_MODEM_MTK (self),
set_unsolicited_events_handlers (MM_BROADBAND_MODEM_MTK_LEGACY (self),
TRUE);
g_task_return_boolean (task, TRUE);
}
@@ -680,7 +680,7 @@ modem_3gpp_cleanup_unsolicited_events (MMIfaceModem3gpp *self,
gpointer user_data)
{
/* Our own cleanup first */
set_unsolicited_events_handlers (MM_BROADBAND_MODEM_MTK (self), FALSE);
set_unsolicited_events_handlers (MM_BROADBAND_MODEM_MTK_LEGACY (self), FALSE);
/* And now chain up parent's cleanup */
iface_modem_3gpp_parent->cleanup_unsolicited_events (
@@ -825,24 +825,22 @@ static void
setup_ports (MMBroadbandModem *self)
{
/* Call parent's setup ports first always */
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_mtk_parent_class)->setup_ports (self);
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_mtk_legacy_parent_class)->setup_ports (self);
/* Now reset the unsolicited messages we'll handle when enabled */
set_unsolicited_events_handlers (MM_BROADBAND_MODEM_MTK (self), FALSE);
set_unsolicited_events_handlers (MM_BROADBAND_MODEM_MTK_LEGACY (self), FALSE);
}
/*****************************************************************************/
MMBroadbandModemMtk *
mm_broadband_modem_mtk_new (const gchar *device,
const gchar *physdev,
MMBroadbandModemMtkLegacy *
mm_broadband_modem_mtk_legacy_new (const gchar *device,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
guint16 product_id)
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MTK,
return g_object_new (MM_TYPE_BROADBAND_MODEM_MTK_LEGACY,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
@@ -854,12 +852,12 @@ mm_broadband_modem_mtk_new (const gchar *device,
}
static void
mm_broadband_modem_mtk_init (MMBroadbandModemMtk *self)
mm_broadband_modem_mtk_legacy_init (MMBroadbandModemMtkLegacy *self)
{
/* Initialize private data */
self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self),
MM_TYPE_BROADBAND_MODEM_MTK,
MMBroadbandModemMtkPrivate);
MM_TYPE_BROADBAND_MODEM_MTK_LEGACY,
MMBroadbandModemMtkLegacyPrivate);
self->priv->ecsqg_regex = g_regex_new (
"\\r\\n\\+ECSQ:\\s*([0-9]*),\\s*[0-9]*,\\s*-[0-9]*\\r\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
@@ -880,7 +878,7 @@ mm_broadband_modem_mtk_init (MMBroadbandModemMtk *self)
static void
finalize (GObject *object)
{
MMBroadbandModemMtk *self = MM_BROADBAND_MODEM_MTK (object);
MMBroadbandModemMtkLegacy *self = MM_BROADBAND_MODEM_MTK_LEGACY (object);
g_regex_unref (self->priv->ecsqg_regex);
g_regex_unref (self->priv->ecsqu_regex);
@@ -888,7 +886,7 @@ finalize (GObject *object)
g_regex_unref (self->priv->ecsqeu_regex);
g_regex_unref (self->priv->ecsqel_regex);
G_OBJECT_CLASS (mm_broadband_modem_mtk_parent_class)->finalize (object);
G_OBJECT_CLASS (mm_broadband_modem_mtk_legacy_parent_class)->finalize (object);
}
static void
@@ -924,12 +922,12 @@ iface_modem_3gpp_init (MMIfaceModem3gpp *iface)
}
static void
mm_broadband_modem_mtk_class_init (MMBroadbandModemMtkClass *klass)
mm_broadband_modem_mtk_legacy_class_init (MMBroadbandModemMtkLegacyClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
MMBroadbandModemClass *broadband_modem_class = MM_BROADBAND_MODEM_CLASS (klass);
g_type_class_add_private (object_class, sizeof (MMBroadbandModemMtkPrivate));
g_type_class_add_private (object_class, sizeof (MMBroadbandModemMtkLegacyPrivate));
object_class->finalize = finalize;
broadband_modem_class->setup_ports = setup_ports;
src/plugins/mtk/mm-broadband-modem-mtk-legacy.h
+51
View File
@@ -0,0 +1,51 @@
/* -*- 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) 2008 - 2009 Novell, Inc.
* Copyright (C) 2009 - 2011 Red Hat, Inc.
* Copyright (C) 2011 Google Inc.
*/
#ifndef MM_BROADBAND_MODEM_MTK_LEGACY_H
#define MM_BROADBAND_MODEM_MTK_LEGACY_H
#include "mm-broadband-modem.h"
#define MM_TYPE_BROADBAND_MODEM_MTK_LEGACY (mm_broadband_modem_mtk_legacy_get_type ())
#define MM_BROADBAND_MODEM_MTK_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_MTK_LEGACY, MMBroadbandModemMtkLegacy))
#define MM_BROADBAND_MODEM_MTK_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_MODEM_MTK_LEGACY, MMBroadbandModemMtkLegacyClass))
#define MM_IS_BROADBAND_MODEM_MTK_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_MTK_LEGACY))
#define MM_IS_BROADBAND_MODEM_MTK_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM_MTK_LEGACY))
#define MM_BROADBAND_MODEM_MTK_LEGACY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_MODEM_MTK_LEGACY, MMBroadbandModemMtkLegacyClass))
typedef struct _MMBroadbandModemMtkLegacy MMBroadbandModemMtkLegacy;
typedef struct _MMBroadbandModemMtkLegacyClass MMBroadbandModemMtkLegacyClass;
typedef struct _MMBroadbandModemMtkLegacyPrivate MMBroadbandModemMtkLegacyPrivate;
struct _MMBroadbandModemMtkLegacy {
MMBroadbandModem parent;
MMBroadbandModemMtkLegacyPrivate *priv;
};
struct _MMBroadbandModemMtkLegacyClass {
MMBroadbandModemClass parent;
};
GType mm_broadband_modem_mtk_legacy_get_type (void);
MMBroadbandModemMtkLegacy *mm_broadband_modem_mtk_legacy_new (const gchar *device,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
guint16 product_id);
#endif /* MM_BROADBAND_MODEM_MTK_LEGACY_H */
src/plugins/mtk/mm-broadband-modem-mtk.h
-52
View File
@@ -1,52 +0,0 @@
/* -*- 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) 2008 - 2009 Novell, Inc.
* Copyright (C) 2009 - 2011 Red Hat, Inc.
* Copyright (C) 2011 Google Inc.
*/
#ifndef MM_BROADBAND_MODEM_MTK_H
#define MM_BROADBAND_MODEM_MTK_H
#include "mm-broadband-modem.h"
#define MM_TYPE_BROADBAND_MODEM_MTK (mm_broadband_modem_mtk_get_type ())
#define MM_BROADBAND_MODEM_MTK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_MTK, MMBroadbandModemMtk))
#define MM_BROADBAND_MODEM_MTK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_MODEM_MTK, MMBroadbandModemMtkClass))
#define MM_IS_BROADBAND_MODEM_MTK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_MTK))
#define MM_IS_BROADBAND_MODEM_MTK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM_MTK))
#define MM_BROADBAND_MODEM_MTK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_MODEM_MTK, MMBroadbandModemMtkClass))
typedef struct _MMBroadbandModemMtk MMBroadbandModemMtk;
typedef struct _MMBroadbandModemMtkClass MMBroadbandModemMtkClass;
typedef struct _MMBroadbandModemMtkPrivate MMBroadbandModemMtkPrivate;
struct _MMBroadbandModemMtk {
MMBroadbandModem parent;
MMBroadbandModemMtkPrivate *priv;
};
struct _MMBroadbandModemMtkClass {
MMBroadbandModemClass parent;
};
GType mm_broadband_modem_mtk_get_type (void);
MMBroadbandModemMtk *mm_broadband_modem_mtk_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
guint16 product_id);
#endif /* MM_BROADBAND_MODEM_MTK_H */
src/plugins/mtk/mm-plugin-mtk.c → src/plugins/mtk/mm-plugin-mtk-legacy.c
+12 -13
View File
@@ -22,10 +22,10 @@
#include <libmm-glib.h>
#include "mm-plugin-common.h"
#include "mm-broadband-modem-mtk.h"
#include "mm-broadband-modem-mtk-legacy.h"
#define MM_TYPE_PLUGIN_MTK mm_plugin_mtk_get_type ()
MM_DEFINE_PLUGIN (MTK, mtk, Mtk)
#define MM_TYPE_PLUGIN_MTK_LEGACY mm_plugin_mtk_legacy_get_type ()
MM_DEFINE_PLUGIN (MTK_LEGACY, mtk_legacy, MtkLegacy)
/*****************************************************************************/
@@ -41,18 +41,17 @@ create_modem (MMPlugin *self,
GList *probes,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_mtk_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
product));
return MM_BASE_MODEM (mm_broadband_modem_mtk_legacy_new (uid,
drivers,
mm_plugin_get_name (self),
vendor,
product));
}
/*****************************************************************************/
MM_PLUGIN_NAMED_CREATOR_SCOPE MMPlugin *
mm_plugin_create_mtk (void)
mm_plugin_create_mtk_legacy (void)
{
static const gchar *subsystems[] = { "tty", NULL };
static const gchar *udev_tags[]={
@@ -60,7 +59,7 @@ mm_plugin_create_mtk (void)
NULL};
return MM_PLUGIN (
g_object_new (MM_TYPE_PLUGIN_MTK,
g_object_new (MM_TYPE_PLUGIN_MTK_LEGACY,
MM_PLUGIN_NAME, MM_MODULE_NAME,
MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems,
MM_PLUGIN_ALLOWED_UDEV_TAGS, udev_tags,
@@ -69,12 +68,12 @@ mm_plugin_create_mtk (void)
}
static void
mm_plugin_mtk_init (MMPluginMtk *self)
mm_plugin_mtk_legacy_init (MMPluginMtkLegacy *self)
{
}
static void
mm_plugin_mtk_class_init (MMPluginMtkClass *klass)
mm_plugin_mtk_legacy_class_init (MMPluginMtkLegacyClass *klass)
{
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
src/plugins/tests/test-udev-rules.c
+5 -4
View File
@@ -136,9 +136,9 @@ test_telit (void)
}
#endif
#if defined ENABLE_PLUGIN_MTK
#if defined ENABLE_PLUGIN_MTK_LEGACY
static void
test_mtk (void)
test_mtk_legacy (void)
{
common_test (TESTUDEVRULESDIR_MTK);
}
@@ -231,9 +231,10 @@ int main (int argc, char **argv)
#if defined ENABLE_PLUGIN_TELIT
g_test_add_func ("/MM/test-udev-rules/telit", test_telit);
#endif
#if defined ENABLE_PLUGIN_MTK
g_test_add_func ("/MM/test-udev-rules/mtk", test_mtk);
#if defined ENABLE_PLUGIN_MTK_LEGACY
g_test_add_func ("/MM/test-udev-rules/mtk", test_mtk_legacy);
#endif
#if defined ENABLE_PLUGIN_HAIER
g_test_add_func ("/MM/test-udev-rules/haier", test_haier);
#endif