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

gosuncn: new plugin

Browse Source 
For now, just with port type hints for the GM800 in MBIM mode.
This commit is contained in:
Aleksander Morgado
2020-09-18 10:52:06 +02:00
parent 8e8c794815
commit 9397ed420d
8 changed files with 212 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -105,7 +105,7 @@ build-single-plugins:
- popd
- NOCONFIGURE=1 ./autogen.sh
- for plugin in generic altair-lte anydata broadmobi cinterion
dell dlink fibocom foxconn haier huawei iridium
dell dlink fibocom foxconn gosuncn haier huawei iridium
linktop longcheer mbm motorola mtk nokia nokia-icera
novatel novatel-lte option option-hso pantech
quectel samsung sierra-legacy sierra simtech

2
configure.ac
View File

@@ -467,6 +467,7 @@ MM_ENABLE_PLUGIN([fibocom],
[with_shared_xmm])
MM_ENABLE_PLUGIN([foxconn],
[with_shared_foxconn])
MM_ENABLE_PLUGIN([gosuncn])
MM_ENABLE_PLUGIN([haier])
MM_ENABLE_PLUGIN([huawei])
MM_ENABLE_PLUGIN([iridium])
@@ -606,6 +607,7 @@ echo "
dlink: ${enable_plugin_dlink}
fibocom: ${enable_plugin_fibocom}
foxconn: ${enable_plugin_foxconn}
gosuncn: ${enable_plugin_gosuncn}
haier: ${enable_plugin_haier}
huawei: ${enable_plugin_huawei}
iridium: ${enable_plugin_iridium}

23
plugins/Makefile.am
View File

@@ -724,6 +724,29 @@ AM_CFLAGS += \
endif
################################################################################
# plugin: gosuncn
################################################################################
if ENABLE_PLUGIN_GOSUNCN
pkglib_LTLIBRARIES += libmm-plugin-gosuncn.la
libmm_plugin_gosuncn_la_SOURCES = \
gosuncn/mm-plugin-gosuncn.c \
gosuncn/mm-plugin-gosuncn.h \
$(NULL)
libmm_plugin_gosuncn_la_CPPFLAGS = \
$(PLUGIN_COMMON_COMPILER_FLAGS) \
-DMM_MODULE_NAME=\"gosuncn\" \
$(NULL)
libmm_plugin_gosuncn_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
dist_udevrules_DATA += gosuncn/77-mm-gosuncn-port-types.rules
AM_CFLAGS += -DTESTUDEVRULESDIR_GOSUNCN=\"${srcdir}/gosuncn\"
endif
################################################################################
# plugin: haier
################################################################################

5
plugins/README.txt
View File

@@ -46,6 +46,11 @@ objects created by the plugin is given.
** MMBroadbandModemMbim (generic)
** MMBroadbandModem (generic)
* Gosuncn:
** MMBroadbandModemQmi (generic)
** MMBroadbandModemMbim (generic)
** MMBroadbandModem (generic)
* Haier:
** MMBroadbandModem (generic)

17
plugins/gosuncn/77-mm-gosuncn-port-types.rules Normal file
View File

@@ -0,0 +1,17 @@
# do not edit this file, it will be overwritten on update
ACTION!="add|change|move|bind", GOTO="mm_gosuncn_port_types_end"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="305a", GOTO="mm_gosuncn_port_types"
GOTO="mm_gosuncn_port_types_end"
LABEL="mm_gosuncn_port_types"
SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="?*", ENV{.MM_USBIFNUM}="$attr{bInterfaceNumber}"
# Gosuncn GM800
# Interfaces #3 and #4 are MBIM
ATTRS{idVendor}=="305a", ATTRS{idProduct}=="1405", ENV{.MM_USBIFNUM}=="00", ENV{ID_MM_PORT_IGNORE}="1"
ATTRS{idVendor}=="305a", ATTRS{idProduct}=="1405", ENV{.MM_USBIFNUM}=="01", ENV{ID_MM_PORT_TYPE_AT_PRIMARY}="1"
ATTRS{idVendor}=="305a", ATTRS{idProduct}=="1405", ENV{.MM_USBIFNUM}=="02", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1"
ATTRS{idVendor}=="305a", ATTRS{idProduct}=="1405", ENV{.MM_USBIFNUM}=="05", ENV{ID_MM_PORT_IGNORE}="1"
LABEL="mm_gosuncn_port_types_end"

113
plugins/gosuncn/mm-plugin-gosuncn.c Normal file
View File

@@ -0,0 +1,113 @@
/* -*- 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>
*/
#include <stdlib.h>
#include <gmodule.h>
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log-object.h"
#include "mm-plugin-gosuncn.h"
#include "mm-broadband-modem.h"
#if defined WITH_QMI
# include "mm-broadband-modem-qmi.h"
#endif
#if defined WITH_MBIM
# include "mm-broadband-modem-mbim.h"
#endif
G_DEFINE_TYPE (MMPluginGosuncn, mm_plugin_gosuncn, MM_TYPE_PLUGIN)
MM_PLUGIN_DEFINE_MAJOR_VERSION
MM_PLUGIN_DEFINE_MINOR_VERSION
/*****************************************************************************/
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 Gosuncn modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_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 Gosuncn modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
drivers,
mm_plugin_get_name (self),
vendor,
product));
}
#endif
/* Fallback to default modem in the worst case */
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
drivers,
mm_plugin_get_name (self),
vendor,
product));
}
/*****************************************************************************/
G_MODULE_EXPORT MMPlugin *
mm_plugin_create (void)
{
static const gchar *subsystems[] = { "tty", "net", "usb", NULL };
static const guint16 vendor_ids[] = { 0x305a, 0 };
static const gchar *drivers[] = { "qmi_wwan", "cdc_mbim", NULL };
return MM_PLUGIN (
g_object_new (MM_TYPE_PLUGIN_GOSUNCN,
MM_PLUGIN_NAME, MM_MODULE_NAME,
MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems,
MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids,
MM_PLUGIN_ALLOWED_DRIVERS, drivers,
MM_PLUGIN_ALLOWED_AT, TRUE,
MM_PLUGIN_ALLOWED_QCDM, TRUE,
MM_PLUGIN_ALLOWED_QMI, TRUE,
MM_PLUGIN_ALLOWED_MBIM, TRUE,
NULL));
}
static void
mm_plugin_gosuncn_init (MMPluginGosuncn *self)
{
}
static void
mm_plugin_gosuncn_class_init (MMPluginGosuncnClass *klass)
{
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem;
}

40
plugins/gosuncn/mm-plugin-gosuncn.h Normal file
View File

@@ -0,0 +1,40 @@
/* -*- 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>
*/
#ifndef MM_PLUGIN_GOSUNCN_H
#define MM_PLUGIN_GOSUNCN_H
#include "mm-plugin.h"
#define MM_TYPE_PLUGIN_GOSUNCN (mm_plugin_gosuncn_get_type ())
#define MM_PLUGIN_GOSUNCN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_GOSUNCN, MMPluginGosuncn))
#define MM_PLUGIN_GOSUNCN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_PLUGIN_GOSUNCN, MMPluginGosuncnClass))
#define MM_IS_PLUGIN_GOSUNCN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_GOSUNCN))
#define MM_IS_PLUGIN_GOSUNCN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_PLUGIN_GOSUNCN))
#define MM_PLUGIN_GOSUNCN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PLUGIN_GOSUNCN, MMPluginGosuncnClass))
typedef struct {
MMPlugin parent;
} MMPluginGosuncn;
typedef struct {
MMPluginClass parent;
} MMPluginGosuncnClass;
GType mm_plugin_gosuncn_get_type (void);
G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
#endif /* MM_PLUGIN_GOSUNCN_H */

11
plugins/tests/test-udev-rules.c
View File

@@ -168,6 +168,14 @@ test_quectel (void)
}
#endif
#if defined ENABLE_PLUGIN_GOSUNCN
static void
test_gosuncn (void)
{
common_test (TESTUDEVRULESDIR_GOSUNCN);
}
#endif
/************************************************************/
int main (int argc, char **argv)
@@ -219,6 +227,9 @@ int main (int argc, char **argv)
#if defined ENABLE_PLUGIN_QUECTEL
g_test_add_func ("/MM/test-udev-rules/quectel", test_quectel);
#endif
#if defined ENABLE_PLUGIN_GOSUNCN
g_test_add_func ("/MM/test-udev-rules/gosuncn", test_gosuncn);
#endif
return g_test_run ();
}