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

telit: add Telit MBIM broadband modem

Browse Source 
Modes and band support are added through AT commands.
This commit is contained in:
Daniele Palmas
2019-02-25 14:55:13 +01:00
parent 3921c120b3
commit c7be4af542
4 changed files with 241 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/Makefile.am
View File

@@ -912,6 +912,13 @@ libmm_utils_telit_la_SOURCES = \
$(NULL)
libmm_utils_telit_la_CPPFLAGS = $(PLUGIN_TELIT_COMPILER_FLAGS)
if WITH_MBIM
libmm_utils_telit_la_SOURCES += \
telit/mm-broadband-modem-mbim-telit.h \
telit/mm-broadband-modem-mbim-telit.c \
$(NULL)
endif
TELIT_COMMON_COMPILER_FLAGS = $(PLUGIN_TELIT_COMPILER_FLAGS)
TELIT_COMMON_LIBADD_FLAGS = \
$(builddir)/libhelpers-telit.la \

181
plugins/telit/mm-broadband-modem-mbim-telit.c Normal file
View File

@@ -0,0 +1,181 @@
/* -*- 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) 2019 Daniele Palmas <dnlplm@gmail.com>
*/
#include <config.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <ctype.h>
#include "ModemManager.h"
#include "mm-log.h"
#include "mm-modem-helpers.h"
#include "mm-iface-modem.h"
#include "mm-base-modem-at.h"
#include "mm-broadband-modem-mbim-telit.h"
#include "mm-modem-helpers-telit.h"
#include "mm-shared-telit.h"
static void iface_modem_init (MMIfaceModem *iface);
static void shared_telit_init (MMSharedTelit *iface);
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimTelit, mm_broadband_modem_mbim_telit, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_TELIT, shared_telit_init))
/*****************************************************************************/
/* Load supported modes (Modem interface) */
static GArray *
load_supported_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
return (GArray *) g_task_propagate_pointer (G_TASK (res), error);
}
static void
load_supported_modes_ready (MMIfaceModem *self,
GAsyncResult *res,
GTask *task)
{
MMModemModeCombination modes_combination;
MMModemMode modes_mask = MM_MODEM_MODE_NONE;
const gchar *response;
GArray *modes;
GArray *all;
GArray *combinations;
GArray *filtered;
GError *error = NULL;
guint i;
response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (error) {
mm_dbg ("Generic query of supported 3GPP networks with WS46=? failed: '%s'", error->message);
g_task_return_error (task, error);
g_object_unref (task);
return;
}
modes = mm_3gpp_parse_ws46_test_response (response, &error);
if (!modes) {
mm_dbg ("Parsing WS46=? response failed: '%s'", error->message);
g_task_return_error (task, error);
g_object_unref (task);
return;
}
for (i = 0; i < modes->len; i++) {
MMModemMode mode;
gchar *str;
mode = g_array_index (modes, MMModemMode, i);
modes_mask |= mode;
str = mm_modem_mode_build_string_from_mask (mode);
mm_dbg ("Device allows (3GPP) mode combination: %s", str);
g_free (str);
}
g_array_unref (modes);
/* Build a mask with all supported modes */
all = g_array_sized_new (FALSE, FALSE, sizeof (MMModemModeCombination), 1);
modes_combination.allowed = modes_mask;
modes_combination.preferred = MM_MODEM_MODE_NONE;
g_array_append_val (all, modes_combination);
/* Filter out those unsupported modes */
combinations = mm_telit_build_modes_list();
filtered = mm_filter_supported_modes (all, combinations);
g_array_unref (all);
g_array_unref (combinations);
g_task_return_pointer (task, filtered, (GDestroyNotify) g_array_unref);
g_object_unref (task);
}
static void
load_supported_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
GTask *task;
mm_dbg ("loading Telit mbim supported modes...");
task = g_task_new (self, NULL, callback, user_data);
mm_base_modem_at_command (MM_BASE_MODEM (self),
"+WS46=?",
3,
TRUE, /* allow caching, it's a test command */
(GAsyncReadyCallback) load_supported_modes_ready,
task);
}
/*****************************************************************************/
MMBroadbandModemMbimTelit *
mm_broadband_modem_mbim_telit_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_TELIT,
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,
MM_IFACE_MODEM_SIM_HOT_SWAP_SUPPORTED, TRUE,
MM_IFACE_MODEM_SIM_HOT_SWAP_CONFIGURED, FALSE,
NULL);
}
static void
mm_broadband_modem_mbim_telit_init (MMBroadbandModemMbimTelit *self)
{
}
static void
iface_modem_init (MMIfaceModem *iface)
{
iface->set_current_bands = mm_shared_telit_modem_set_current_bands;
iface->set_current_bands_finish = mm_shared_telit_modem_set_current_bands_finish;
iface->load_current_bands = mm_shared_telit_modem_load_current_bands;
iface->load_current_bands_finish = mm_shared_telit_modem_load_bands_finish;
iface->load_supported_bands = mm_shared_telit_modem_load_supported_bands;
iface->load_supported_bands_finish = mm_shared_telit_modem_load_bands_finish;
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
iface->load_current_modes = mm_shared_telit_load_current_modes;
iface->load_current_modes_finish = mm_shared_telit_load_current_modes_finish;
iface->set_current_modes = mm_shared_telit_set_current_modes;
iface->set_current_modes_finish = mm_shared_telit_set_current_modes_finish;
}
static void
shared_telit_init (MMSharedTelit *iface)
{
}
static void
mm_broadband_modem_mbim_telit_class_init (MMBroadbandModemMbimTelitClass *klass)
{
}

47
plugins/telit/mm-broadband-modem-mbim-telit.h Normal file
View File

@@ -0,0 +1,47 @@
/* -*- 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) 2019 Daniele Palmas <dnlplm@gmail.com>
*/
#ifndef MM_BROADBAND_MODEM_MBIM_TELIT_H
#define MM_BROADBAND_MODEM_MBIM_TELIT_H
#include "mm-broadband-modem-mbim.h"
#define MM_TYPE_BROADBAND_MODEM_MBIM_TELIT (mm_broadband_modem_mbim_telit_get_type ())
#define MM_BROADBAND_MODEM_MBIM_TELIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_MBIM_TELIT, MMBroadbandModemMbimTelit))
#define MM_BROADBAND_MODEM_MBIM_TELIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_MODEM_MBIM_TELIT, MMBroadbandModemMbimTelitClass))
#define MM_IS_BROADBAND_MODEM_MBIM_TELIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_MBIM_TELIT))
#define MM_IS_BROADBAND_MODEM_MBIM_TELIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM_MBIM_TELIT))
#define MM_BROADBAND_MODEM_MBIM_TELIT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_MODEM_MBIM_TELIT, MMBroadbandModemMbimTelitClass))
typedef struct _MMBroadbandModemMbimTelit MMBroadbandModemMbimTelit;
typedef struct _MMBroadbandModemMbimTelitClass MMBroadbandModemMbimTelitClass;
struct _MMBroadbandModemMbimTelit {
MMBroadbandModemMbim parent;
};
struct _MMBroadbandModemMbimTelitClass{
MMBroadbandModemMbimClass parent;
};
GType mm_broadband_modem_mbim_telit_get_type (void);
MMBroadbandModemMbimTelit *mm_broadband_modem_mbim_telit_new (const gchar *device,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
guint16 product_id);
#endif /* MM_BROADBAND_MODEM_TELIT_H */

12
plugins/telit/mm-plugin-telit.c
View File

@@ -34,7 +34,7 @@
#endif
#if defined WITH_MBIM
# include "mm-broadband-modem-mbim.h"
# include "mm-broadband-modem-mbim-telit.h"
#endif
G_DEFINE_TYPE (MMPluginTelit, mm_plugin_telit, MM_TYPE_PLUGIN)
@@ -67,11 +67,11 @@ create_modem (MMPlugin *self,
#if defined WITH_MBIM
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_dbg ("MBIM-powered Telit modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
drivers,
mm_plugin_get_name (self),
vendor,
product));
return MM_BASE_MODEM (mm_broadband_modem_mbim_telit_new (uid,
drivers,
mm_plugin_get_name (self),
vendor,
product));
}
#endif