diff options
Diffstat (limited to 'plugins/iridium')
-rw-r--r-- | plugins/iridium/mm-bearer-iridium.c | 266 | ||||
-rw-r--r-- | plugins/iridium/mm-bearer-iridium.h | 55 | ||||
-rw-r--r-- | plugins/iridium/mm-broadband-modem-iridium.c | 433 | ||||
-rw-r--r-- | plugins/iridium/mm-broadband-modem-iridium.h | 49 | ||||
-rw-r--r-- | plugins/iridium/mm-plugin-iridium.c | 89 | ||||
-rw-r--r-- | plugins/iridium/mm-plugin-iridium.h | 47 | ||||
-rw-r--r-- | plugins/iridium/mm-sim-iridium.c | 95 | ||||
-rw-r--r-- | plugins/iridium/mm-sim-iridium.h | 52 |
8 files changed, 0 insertions, 1086 deletions
diff --git a/plugins/iridium/mm-bearer-iridium.c b/plugins/iridium/mm-bearer-iridium.c deleted file mode 100644 index 52e8ada9..00000000 --- a/plugins/iridium/mm-bearer-iridium.c +++ /dev/null @@ -1,266 +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) 2012 Ammonit Measurement GmbH - */ - -#include <config.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <ctype.h> - -#include <ModemManager.h> -#define _LIBMM_INSIDE_MM -#include <libmm-glib.h> - -#include "mm-bearer-iridium.h" -#include "mm-base-modem-at.h" - -/* Allow up to 200s to get a proper IP connection */ -#define BEARER_IRIDIUM_IP_TIMEOUT_DEFAULT 200 - -G_DEFINE_TYPE (MMBearerIridium, mm_bearer_iridium, MM_TYPE_BASE_BEARER) - -/*****************************************************************************/ -/* Connect */ - -typedef struct { - MMPortSerialAt *primary; - GError *saved_error; -} ConnectContext; - -static void -connect_context_free (ConnectContext *ctx) -{ - if (ctx->saved_error) - g_error_free (ctx->saved_error); - if (ctx->primary) - g_object_unref (ctx->primary); - g_free (ctx); -} - -static MMBearerConnectResult * -connect_finish (MMBaseBearer *self, - GAsyncResult *res, - GError **error) -{ - return g_task_propagate_pointer (G_TASK (res), error); -} - -static void -connect_report_ready (MMBaseModem *modem, - GAsyncResult *res, - GTask *task) -{ - ConnectContext *ctx; - const gchar *result; - - /* If cancelled, complete */ - if (g_task_return_error_if_cancelled (task)) { - g_object_unref (task); - return; - } - - ctx = g_task_get_task_data (task); - - /* If we got a proper extended reply, build the new error to be set */ - result = mm_base_modem_at_command_full_finish (modem, res, NULL); - if (result && g_str_has_prefix (result, "+CEER: ") && strlen (result) > 7) { - g_task_return_new_error (task, - ctx->saved_error->domain, - ctx->saved_error->code, - "%s", &result[7]); - } else { - /* Otherwise, take the original error as it was */ - g_task_return_error (task, ctx->saved_error); - ctx->saved_error = NULL; - } - g_object_unref (task); -} - -static void -dial_ready (MMBaseModem *modem, - GAsyncResult *res, - GTask *task) -{ - ConnectContext *ctx; - MMBearerIpConfig *config; - - ctx = g_task_get_task_data (task); - - /* DO NOT check for cancellable here. If we got here without errors, the - * bearer is really connected and therefore we need to reflect that in - * the state machine. */ - mm_base_modem_at_command_full_finish (modem, res, &(ctx->saved_error)); - if (ctx->saved_error) { - /* Try to get more information why it failed */ - mm_base_modem_at_command_full ( - modem, - ctx->primary, - "+CEER", - 3, - FALSE, - FALSE, /* raw */ - NULL, /* cancellable */ - (GAsyncReadyCallback)connect_report_ready, - task); - return; - } - - /* Port is connected; update the state */ - mm_port_set_connected (MM_PORT (ctx->primary), TRUE); - - /* Build IP config; always PPP based */ - config = mm_bearer_ip_config_new (); - mm_bearer_ip_config_set_method (config, MM_BEARER_IP_METHOD_PPP); - - /* Return operation result */ - g_task_return_pointer ( - task, - mm_bearer_connect_result_new (MM_PORT (ctx->primary), config, NULL), - (GDestroyNotify)mm_bearer_connect_result_unref); - g_object_unref (task); - g_object_unref (config); -} - -static void -service_type_ready (MMBaseModem *modem, - GAsyncResult *res, - GTask *task) -{ - ConnectContext *ctx; - GError *error = NULL; - - /* If cancelled, complete */ - if (g_task_return_error_if_cancelled (task)) { - g_object_unref (task); - return; - } - - ctx = g_task_get_task_data (task); - - /* Errors setting the service type will be critical */ - mm_base_modem_at_command_full_finish (modem, res, &error); - if (error) { - g_task_return_error (task, error); - g_object_unref (task); - return; - } - - /* We just use the default number to dial in the Iridium network. Also note - * that we won't specify a specific port to use; Iridium modems only expose - * one. */ - mm_base_modem_at_command_full ( - modem, - ctx->primary, - "ATDT008816000025", - MM_BASE_BEARER_DEFAULT_CONNECTION_TIMEOUT, - FALSE, - FALSE, /* raw */ - NULL, /* cancellable */ - (GAsyncReadyCallback)dial_ready, - task); -} - -static void -connect (MMBaseBearer *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - ConnectContext *ctx; - GTask *task; - MMBaseModem *modem = NULL; - - task = g_task_new (self, cancellable, callback, user_data); - - if (mm_bearer_properties_get_multiplex (mm_base_bearer_peek_config (self)) == MM_BEARER_MULTIPLEX_SUPPORT_REQUIRED) { - g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED, - "Multiplex support not available"); - g_object_unref (task); - return; - } - - g_object_get (self, - MM_BASE_BEARER_MODEM, &modem, - NULL); - g_assert (modem); - - /* Don't bother to get primary and check if connected and all that; we - * already do this check when sending the ATDT call */ - - /* In this context, we only keep the stuff we'll need later */ - ctx = g_new0 (ConnectContext, 1); - ctx->primary = mm_base_modem_get_port_primary (modem); - g_task_set_task_data (task, ctx, (GDestroyNotify) connect_context_free); - - /* Bearer service type set to 9600bps (V.110), which behaves better than the - * default 9600bps (V.32). */ - mm_base_modem_at_command_full ( - modem, - ctx->primary, - "+CBST=71,0,1", - 3, - FALSE, - FALSE, /* raw */ - NULL, /* cancellable */ - (GAsyncReadyCallback)service_type_ready, - task); - - g_object_unref (modem); -} - -/*****************************************************************************/ - -MMBaseBearer * -mm_bearer_iridium_new (MMBroadbandModemIridium *modem, - MMBearerProperties *config) -{ - MMBaseBearer *bearer; - - /* The Iridium bearer inherits from MMBaseBearer (so it's not a MMBroadbandBearer) - * and that means that the object is not async-initable, so we just use - * g_object_get() here */ - bearer = g_object_new (MM_TYPE_BEARER_IRIDIUM, - MM_BASE_BEARER_MODEM, modem, - MM_BASE_BEARER_CONFIG, config, - "ip-timeout", BEARER_IRIDIUM_IP_TIMEOUT_DEFAULT, - NULL); - - /* Only export valid bearers */ - mm_base_bearer_export (bearer); - - return bearer; -} - -static void -mm_bearer_iridium_init (MMBearerIridium *self) -{ -} - -static void -mm_bearer_iridium_class_init (MMBearerIridiumClass *klass) -{ - MMBaseBearerClass *base_bearer_class = MM_BASE_BEARER_CLASS (klass); - - /* Virtual methods */ - base_bearer_class->connect = connect; - base_bearer_class->connect_finish = connect_finish; - base_bearer_class->load_connection_status = NULL; - base_bearer_class->load_connection_status_finish = NULL; -#if defined WITH_SUSPEND_RESUME - base_bearer_class->reload_connection_status = NULL; - base_bearer_class->reload_connection_status_finish = NULL; -#endif -} diff --git a/plugins/iridium/mm-bearer-iridium.h b/plugins/iridium/mm-bearer-iridium.h deleted file mode 100644 index eba6ac54..00000000 --- a/plugins/iridium/mm-bearer-iridium.h +++ /dev/null @@ -1,55 +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: - * - * Author: Aleksander Morgado <aleksander@lanedo.com> - * - * Copyright (C) 2012 Ammonit Measurement GmbH. - */ - -#ifndef MM_BEARER_IRIDIUM_H -#define MM_BEARER_IRIDIUM_H - -#include <glib.h> -#include <glib-object.h> - -#define _LIBMM_INSIDE_MM -#include <libmm-glib.h> - -#include "mm-base-bearer.h" -#include "mm-broadband-modem-iridium.h" - -#define MM_TYPE_BEARER_IRIDIUM (mm_bearer_iridium_get_type ()) -#define MM_BEARER_IRIDIUM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BEARER_IRIDIUM, MMBearerIridium)) -#define MM_BEARER_IRIDIUM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BEARER_IRIDIUM, MMBearerIridiumClass)) -#define MM_IS_BEARER_IRIDIUM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BEARER_IRIDIUM)) -#define MM_IS_BEARER_IRIDIUM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BEARER_IRIDIUM)) -#define MM_BEARER_IRIDIUM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BEARER_IRIDIUM, MMBearerIridiumClass)) - -typedef struct _MMBearerIridium MMBearerIridium; -typedef struct _MMBearerIridiumClass MMBearerIridiumClass; - -struct _MMBearerIridium { - MMBaseBearer parent; -}; - -struct _MMBearerIridiumClass { - MMBaseBearerClass parent; -}; - -GType mm_bearer_iridium_get_type (void); - -/* Iridium bearer creation implementation. - * NOTE it is *not* a broadband bearer, so not async-initable */ -MMBaseBearer *mm_bearer_iridium_new (MMBroadbandModemIridium *modem, - MMBearerProperties *config); - -#endif /* MM_BEARER_IRIDIUM_H */ diff --git a/plugins/iridium/mm-broadband-modem-iridium.c b/plugins/iridium/mm-broadband-modem-iridium.c deleted file mode 100644 index 681d9123..00000000 --- a/plugins/iridium/mm-broadband-modem-iridium.c +++ /dev/null @@ -1,433 +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) 2011 - 2012 Ammonit Measurement GmbH - * Author: Aleksander Morgado <aleksander@lanedo.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-object.h" -#include "mm-errors-types.h" -#include "mm-base-modem-at.h" -#include "mm-iface-modem.h" -#include "mm-iface-modem-3gpp.h" -#include "mm-iface-modem-messaging.h" -#include "mm-broadband-modem-iridium.h" -#include "mm-sim-iridium.h" -#include "mm-bearer-iridium.h" -#include "mm-modem-helpers.h" - -static void iface_modem_init (MMIfaceModem *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static void iface_modem_messaging_init (MMIfaceModemMessaging *iface); - -G_DEFINE_TYPE_EXTENDED (MMBroadbandModemIridium, mm_broadband_modem_iridium, 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) - G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_MESSAGING, iface_modem_messaging_init)) - -/*****************************************************************************/ -/* Operator Code loading (3GPP interface) */ - -static gchar * -load_operator_code_finish (MMIfaceModem3gpp *self, - GAsyncResult *res, - GError **error) -{ - return g_task_propagate_pointer (G_TASK (res), error); -} - -static void -load_operator_code (MMIfaceModem3gpp *self, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GTask *task; - - task = g_task_new (self, NULL, callback, user_data); - /* Only "90103" operator code is assumed */ - g_task_return_pointer (task, g_strdup ("90103"), g_free); - g_object_unref (task); -} - -/*****************************************************************************/ -/* Operator Name loading (3GPP interface) */ - -static gchar * -load_operator_name_finish (MMIfaceModem3gpp *self, - GAsyncResult *res, - GError **error) -{ - return g_task_propagate_pointer (G_TASK (res), error); -} - -static void -load_operator_name (MMIfaceModem3gpp *self, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GTask *task; - - task = g_task_new (self, NULL, callback, user_data); - /* Only "IRIDIUM" operator name is assumed */ - g_task_return_pointer (task, g_strdup ("IRIDIUM"), g_free); - g_object_unref (task); -} - -/*****************************************************************************/ -/* Enable unsolicited events (SMS indications) (Messaging interface) */ - -static gboolean -messaging_enable_unsolicited_events_finish (MMIfaceModemMessaging *self, - GAsyncResult *res, - GError **error) -{ - return !!mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, error); -} - -static void -messaging_enable_unsolicited_events (MMIfaceModemMessaging *self, - GAsyncReadyCallback callback, - gpointer user_data) -{ - /* AT+CNMI=<mode>,[<mt>[,<bm>[,<ds>[,<bfr>]]]] - * but <bm> can only be 0, - * and <ds> can only be either 0 or 1 - * - * Note: Modem may return +CMS ERROR:322, which indicates Memory Full, - * not a big deal - */ - mm_base_modem_at_command (MM_BASE_MODEM (self), - "+CNMI=2,1,0,0,1", - 3, - FALSE, - callback, - user_data); -} - -/*****************************************************************************/ -/* Signal quality (Modem interface) */ - -static guint -load_signal_quality_finish (MMIfaceModem *self, - GAsyncResult *res, - GError **error) -{ - gint quality = 0; - const gchar *result; - - result = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, error); - if (!result) - return 0; - - /* Skip possible whitespaces after '+CSQF:' and before the response */ - result = mm_strip_tag (result, "+CSQF:"); - while (*result == ' ') - result++; - - if (sscanf (result, "%d", &quality)) - /* Normalize the quality. <rssi> is NOT given in dBs, - * given as a relative value between 0 and 5 */ - quality = CLAMP (quality, 0, 5) * 100 / 5; - else - g_set_error (error, - MM_CORE_ERROR, - MM_CORE_ERROR_FAILED, - "Could not parse signal quality results"); - - return quality; -} - -static void -load_signal_quality (MMIfaceModem *self, - GAsyncReadyCallback callback, - gpointer user_data) -{ - /* The iridium modem may have a huge delay to get signal quality if we pass - * AT+CSQ, so we'll default to use AT+CSQF, which is a fast version that - * returns right away the last signal quality value retrieved */ - mm_base_modem_at_command (MM_BASE_MODEM (self), - "+CSQF", - 3, - FALSE, - callback, - user_data); -} - -/*****************************************************************************/ -/* Flow control (Modem interface) */ - -static gboolean -setup_flow_control_finish (MMIfaceModem *self, - GAsyncResult *res, - GError **error) -{ - return g_task_propagate_boolean (G_TASK (res), error); -} - -static void -setup_flow_control_ready (MMBroadbandModemIridium *self, - GAsyncResult *res, - GTask *task) -{ - GError *error = NULL; - - if (!mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error)) - /* Let the error be critical. We DO need RTS/CTS in order to have - * proper modem disabling. */ - g_task_return_error (task, error); - else - g_task_return_boolean (task, TRUE); - - g_object_unref (task); -} - -static void -setup_flow_control (MMIfaceModem *self, - GAsyncReadyCallback callback, - gpointer user_data) -{ - /* Enable RTS/CTS flow control. - * Other available values: - * AT&K0: Disable flow control - * AT&K3: RTS/CTS - * AT&K4: XOFF/XON - * AT&K6: Both RTS/CTS and XOFF/XON - */ - g_object_set (self, MM_BROADBAND_MODEM_FLOW_CONTROL, MM_FLOW_CONTROL_RTS_CTS, NULL); - mm_base_modem_at_command (MM_BASE_MODEM (self), - "&K3", - 3, - FALSE, - (GAsyncReadyCallback)setup_flow_control_ready, - g_task_new (self, NULL, callback, user_data)); -} - -/*****************************************************************************/ -/* Load supported modes (Modem inteface) */ - -static GArray * -load_supported_modes_finish (MMIfaceModem *self, - GAsyncResult *res, - GError **error) -{ - return g_task_propagate_pointer (G_TASK (res), error); -} - -static void -load_supported_modes (MMIfaceModem *self, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GArray *combinations; - MMModemModeCombination mode; - GTask *task; - - /* Build list of combinations */ - combinations = g_array_sized_new (FALSE, FALSE, sizeof (MMModemModeCombination), 1); - - /* Report CS only, Iridium connections are circuit-switched */ - mode.allowed = MM_MODEM_MODE_CS; - mode.preferred = MM_MODEM_MODE_NONE; - g_array_append_val (combinations, mode); - - task = g_task_new (self, NULL, callback, user_data); - g_task_return_pointer (task, combinations, (GDestroyNotify) g_array_unref); - g_object_unref (task); -} - -/*****************************************************************************/ -/* Create SIM (Modem inteface) */ - -static MMBaseSim * -create_sim_finish (MMIfaceModem *self, - GAsyncResult *res, - GError **error) -{ - return mm_sim_iridium_new_finish (res, error); -} - -static void -create_sim (MMIfaceModem *self, - GAsyncReadyCallback callback, - gpointer user_data) -{ - /* New Iridium SIM */ - mm_sim_iridium_new (MM_BASE_MODEM (self), - NULL, /* cancellable */ - callback, - user_data); -} - -/*****************************************************************************/ -/* Create Bearer (Modem interface) */ - -static MMBaseBearer * -create_bearer_finish (MMIfaceModem *self, - GAsyncResult *res, - GError **error) -{ - return g_task_propagate_pointer (G_TASK (res), error); -} - -static void -create_bearer (MMIfaceModem *self, - MMBearerProperties *properties, - GAsyncReadyCallback callback, - gpointer user_data) -{ - MMBaseBearer *bearer; - GTask *task; - - mm_obj_dbg (self, "creating Iridium bearer..."); - bearer = mm_bearer_iridium_new (MM_BROADBAND_MODEM_IRIDIUM (self), - properties); - task = g_task_new (self, NULL, callback, user_data); - g_task_return_pointer (task, bearer, g_object_unref); - g_object_unref (task); -} - -/*****************************************************************************/ - -static const gchar *primary_init_sequence[] = { - /* Disable echo */ - "E0", - /* Get word responses */ - "V1", - /* Extended numeric codes */ - "+CMEE=1", - NULL -}; - -static void -setup_ports (MMBroadbandModem *self) -{ - MMPortSerialAt *primary; - - /* Call parent's setup ports first always */ - MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_iridium_parent_class)->setup_ports (self); - - /* Set 9600 baudrate by default in the AT port */ - mm_obj_dbg (self, "baudrate will be set to 9600 bps..."); - primary = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)); - if (!primary) - return; - - g_object_set (G_OBJECT (primary), - MM_PORT_SERIAL_BAUD, 9600, - MM_PORT_SERIAL_AT_INIT_SEQUENCE, primary_init_sequence, - NULL); -} - -/*****************************************************************************/ - -MMBroadbandModemIridium * -mm_broadband_modem_iridium_new (const gchar *device, - const gchar **drivers, - const gchar *plugin, - guint16 vendor_id, - guint16 product_id) -{ - return g_object_new (MM_TYPE_BROADBAND_MODEM_IRIDIUM, - 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, - /* Iridium bearer supports TTY only */ - MM_BASE_MODEM_DATA_NET_SUPPORTED, FALSE, - MM_BASE_MODEM_DATA_TTY_SUPPORTED, TRUE, - /* Allow only up to 3 consecutive timeouts in the serial port */ - MM_BASE_MODEM_MAX_TIMEOUTS, 3, - /* Only CS network is supported by the Iridium modem */ - MM_IFACE_MODEM_3GPP_PS_NETWORK_SUPPORTED, FALSE, - NULL); -} - -static void -mm_broadband_modem_iridium_init (MMBroadbandModemIridium *self) -{ -} - -static void -iface_modem_init (MMIfaceModem *iface) -{ - /* Create Iridium-specific SIM and bearer*/ - iface->create_sim = create_sim; - iface->create_sim_finish = create_sim_finish; - iface->create_bearer = create_bearer; - iface->create_bearer_finish = create_bearer_finish; - - /* CSQF-based signal quality */ - iface->load_signal_quality = load_signal_quality; - iface->load_signal_quality_finish = load_signal_quality_finish; - - /* RTS/CTS flow control */ - iface->setup_flow_control = setup_flow_control; - iface->setup_flow_control_finish = setup_flow_control_finish; - - /* No need to power-up/power-down the modem */ - iface->load_power_state = NULL; - iface->load_power_state_finish = NULL; - iface->modem_power_up = NULL; - iface->modem_power_up_finish = NULL; - iface->modem_power_down = NULL; - iface->modem_power_down_finish = NULL; - - /* Supported modes cannot be queried */ - iface->load_supported_modes = load_supported_modes; - iface->load_supported_modes_finish = load_supported_modes_finish; -} - -static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) -{ - /* Fixed operator code and name to be reported */ - iface->load_operator_name = load_operator_name; - iface->load_operator_name_finish = load_operator_name_finish; - iface->load_operator_code = load_operator_code; - iface->load_operator_code_finish = load_operator_code_finish; - - /* Don't try to scan networks with AT+COPS=?. - * It does work, but it will only reply about the Iridium network - * being found (so not very helpful, as that is the only one expected), but - * also, it will use a non-standard reply format. Instead of supporting that - * specific format used, just fully skip it. - * For reference, the result is: - * +COPS:(002),"IRIDIUM","IRIDIUM","90103",,(000-001),(000-002) - */ - iface->scan_networks = NULL; - iface->scan_networks_finish = NULL; -} - -static void -iface_modem_messaging_init (MMIfaceModemMessaging *iface) -{ - iface->enable_unsolicited_events = messaging_enable_unsolicited_events; - iface->enable_unsolicited_events_finish = messaging_enable_unsolicited_events_finish; -} - -static void -mm_broadband_modem_iridium_class_init (MMBroadbandModemIridiumClass *klass) -{ - MMBroadbandModemClass *broadband_modem_class = MM_BROADBAND_MODEM_CLASS (klass); - - broadband_modem_class->setup_ports = setup_ports; -} diff --git a/plugins/iridium/mm-broadband-modem-iridium.h b/plugins/iridium/mm-broadband-modem-iridium.h deleted file mode 100644 index b9a1270b..00000000 --- a/plugins/iridium/mm-broadband-modem-iridium.h +++ /dev/null @@ -1,49 +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_IRIDIUM_H -#define MM_BROADBAND_MODEM_IRIDIUM_H - -#include "mm-broadband-modem.h" - -#define MM_TYPE_BROADBAND_MODEM_IRIDIUM (mm_broadband_modem_iridium_get_type ()) -#define MM_BROADBAND_MODEM_IRIDIUM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_IRIDIUM, MMBroadbandModemIridium)) -#define MM_BROADBAND_MODEM_IRIDIUM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_MODEM_IRIDIUM, MMBroadbandModemIridiumClass)) -#define MM_IS_BROADBAND_MODEM_IRIDIUM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_IRIDIUM)) -#define MM_IS_BROADBAND_MODEM_IRIDIUM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM_IRIDIUM)) -#define MM_BROADBAND_MODEM_IRIDIUM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_MODEM_IRIDIUM, MMBroadbandModemIridiumClass)) - -typedef struct _MMBroadbandModemIridium MMBroadbandModemIridium; -typedef struct _MMBroadbandModemIridiumClass MMBroadbandModemIridiumClass; - -struct _MMBroadbandModemIridium { - MMBroadbandModem parent; -}; - -struct _MMBroadbandModemIridiumClass{ - MMBroadbandModemClass parent; -}; - -GType mm_broadband_modem_iridium_get_type (void); - -MMBroadbandModemIridium *mm_broadband_modem_iridium_new (const gchar *device, - const gchar **drivers, - const gchar *plugin, - guint16 vendor_id, - guint16 product_id); - -#endif /* MM_BROADBAND_MODEM_IRIDIUM_H */ diff --git a/plugins/iridium/mm-plugin-iridium.c b/plugins/iridium/mm-plugin-iridium.c deleted file mode 100644 index 741847f8..00000000 --- a/plugins/iridium/mm-plugin-iridium.c +++ /dev/null @@ -1,89 +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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Copyright (C) 2011 - 2012 Ammonit Measurement GmbH - * Author: Aleksander Morgado <aleksander@lanedo.com> - */ - -#include <string.h> -#include <gmodule.h> - -#define _LIBMM_INSIDE_MM -#include <libmm-glib.h> - -#include "mm-plugin-iridium.h" -#include "mm-broadband-modem-iridium.h" -#include "mm-private-boxed-types.h" - -G_DEFINE_TYPE (MMPluginIridium, mm_plugin_iridium, 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, - guint16 subsystem_vendor, - GList *probes, - GError **error) -{ - return MM_BASE_MODEM (mm_broadband_modem_iridium_new (uid, - drivers, - mm_plugin_get_name (self), - vendor, - product)); -} - -/*****************************************************************************/ - -G_MODULE_EXPORT MMPlugin * -mm_plugin_create (void) -{ - static const gchar *subsystems[] = { "tty", NULL }; - static const guint16 vendor_ids[] = { 0x1edd, 0 }; - static const gchar *vendor_strings[] = { "iridium", NULL }; - /* Also support motorola-branded Iridium modems */ - static const mm_str_pair product_strings[] = {{(gchar *)"motorola", (gchar *)"satellite" }, - { NULL, NULL }}; - - return MM_PLUGIN ( - g_object_new (MM_TYPE_PLUGIN_IRIDIUM, - MM_PLUGIN_NAME, MM_MODULE_NAME, - MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems, - MM_PLUGIN_ALLOWED_VENDOR_STRINGS, vendor_strings, - MM_PLUGIN_ALLOWED_PRODUCT_STRINGS, product_strings, - MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids, - MM_PLUGIN_ALLOWED_AT, TRUE, - NULL)); -} - -static void -mm_plugin_iridium_init (MMPluginIridium *self) -{ -} - -static void -mm_plugin_iridium_class_init (MMPluginIridiumClass *klass) -{ - MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); - - plugin_class->create_modem = create_modem; -} diff --git a/plugins/iridium/mm-plugin-iridium.h b/plugins/iridium/mm-plugin-iridium.h deleted file mode 100644 index b729ce98..00000000 --- a/plugins/iridium/mm-plugin-iridium.h +++ /dev/null @@ -1,47 +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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Copyright (C) 2011 - 2012 Ammonit Measurement GmbH - * Author: Aleksander Morgado <aleksander@lanedo.com> - */ - -#ifndef MM_PLUGIN_IRIDIUM_H -#define MM_PLUGIN_IRIDIUM_H - -#include "mm-plugin.h" - -#define MM_TYPE_PLUGIN_IRIDIUM (mm_plugin_iridium_get_type ()) -#define MM_PLUGIN_IRIDIUM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_IRIDIUM, MMPluginIridium)) -#define MM_PLUGIN_IRIDIUM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_PLUGIN_IRIDIUM, MMPluginIridiumClass)) -#define MM_IS_PLUGIN_IRIDIUM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_IRIDIUM)) -#define MM_IS_PLUGIN_IRIDIUM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_PLUGIN_IRIDIUM)) -#define MM_PLUGIN_IRIDIUM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PLUGIN_IRIDIUM, MMPluginIridiumClass)) - -typedef struct { - MMPlugin parent; -} MMPluginIridium; - -typedef struct { - MMPluginClass parent; -} MMPluginIridiumClass; - -GType mm_plugin_iridium_get_type (void); - -G_MODULE_EXPORT MMPlugin *mm_plugin_create (void); - -#endif /* MM_PLUGIN_IRIDIUM_H */ diff --git a/plugins/iridium/mm-sim-iridium.c b/plugins/iridium/mm-sim-iridium.c deleted file mode 100644 index 3495039b..00000000 --- a/plugins/iridium/mm-sim-iridium.c +++ /dev/null @@ -1,95 +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) 2011 - 2012 Ammonit Measurement GmbH. - * Author: Aleksander Morgado <aleksander@lanedo.com> - */ - -#include <config.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <ctype.h> - -#include <ModemManager.h> -#define _LIBMM_INSIDE_MM -#include <libmm-glib.h> - -#include "mm-sim-iridium.h" - -G_DEFINE_TYPE (MMSimIridium, mm_sim_iridium, MM_TYPE_BASE_SIM) - -/*****************************************************************************/ - -MMBaseSim * -mm_sim_iridium_new_finish (GAsyncResult *res, - GError **error) -{ - GObject *source; - GObject *sim; - - source = g_async_result_get_source_object (res); - sim = g_async_initable_new_finish (G_ASYNC_INITABLE (source), res, error); - g_object_unref (source); - - if (!sim) - return NULL; - - /* Only export valid SIMs */ - mm_base_sim_export (MM_BASE_SIM (sim)); - - return MM_BASE_SIM (sim); -} - -void -mm_sim_iridium_new (MMBaseModem *modem, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_async_initable_new_async (MM_TYPE_SIM_IRIDIUM, - G_PRIORITY_DEFAULT, - cancellable, - callback, - user_data, - MM_BASE_SIM_MODEM, modem, - "active", TRUE, /* by default always active */ - NULL); -} - -static void -mm_sim_iridium_init (MMSimIridium *self) -{ -} - -static void -mm_sim_iridium_class_init (MMSimIridiumClass *klass) -{ - MMBaseSimClass *base_sim_class = MM_BASE_SIM_CLASS (klass); - - /* Skip querying the SIM card info, not supported by Iridium modems */ - base_sim_class->load_sim_identifier = NULL; - base_sim_class->load_sim_identifier_finish = NULL; - base_sim_class->load_imsi = NULL; - base_sim_class->load_imsi_finish = NULL; - base_sim_class->load_operator_identifier = NULL; - base_sim_class->load_operator_identifier_finish = NULL; - base_sim_class->load_operator_name = NULL; - base_sim_class->load_operator_name_finish = NULL; - - /* Skip managing preferred networks, not applicable to Iridium modems */ - base_sim_class->load_preferred_networks = NULL; - base_sim_class->load_preferred_networks_finish = NULL; - base_sim_class->set_preferred_networks = NULL; - base_sim_class->set_preferred_networks_finish = NULL; -} diff --git a/plugins/iridium/mm-sim-iridium.h b/plugins/iridium/mm-sim-iridium.h deleted file mode 100644 index 2f3e2916..00000000 --- a/plugins/iridium/mm-sim-iridium.h +++ /dev/null @@ -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) 2011 - 2012 Ammonit Measurement GmbH. - * Author: Aleksander Morgado <aleksander@lanedo.com> - */ - -#ifndef MM_SIM_IRIDIUM_H -#define MM_SIM_IRIDIUM_H - -#include <glib.h> -#include <glib-object.h> - -#include "mm-base-sim.h" - -#define MM_TYPE_SIM_IRIDIUM (mm_sim_iridium_get_type ()) -#define MM_SIM_IRIDIUM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SIM_IRIDIUM, MMSimIridium)) -#define MM_SIM_IRIDIUM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_SIM_IRIDIUM, MMSimIridiumClass)) -#define MM_IS_SIM_IRIDIUM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_SIM_IRIDIUM)) -#define MM_IS_SIM_IRIDIUM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_SIM_IRIDIUM)) -#define MM_SIM_IRIDIUM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_SIM_IRIDIUM, MMSimIridiumClass)) - -typedef struct _MMSimIridium MMSimIridium; -typedef struct _MMSimIridiumClass MMSimIridiumClass; - -struct _MMSimIridium { - MMBaseSim parent; -}; - -struct _MMSimIridiumClass { - MMBaseSimClass parent; -}; - -GType mm_sim_iridium_get_type (void); - -void mm_sim_iridium_new (MMBaseModem *modem, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -MMBaseSim *mm_sim_iridium_new_finish (GAsyncResult *res, - GError **error); - -#endif /* MM_SIM_IRIDIUM_H */ |