diff options
author | Dan Williams <dcbw@redhat.com> | 2013-09-09 14:57:46 -0500 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2013-09-09 14:57:46 -0500 |
commit | 067ebc3de7280f450a23596937fd10fbfe883a92 (patch) | |
tree | ee1357093fcc0bb6aff27b9f676ab152567d15bc | |
parent | 1110d205f27143bc8c16ae94360801d10031ae0f (diff) | |
download | ModemManager-dcbw/huawei-sim-iccid.tar.gz |
sim-huawei: add SIM class to handle ICCID requestdcbw/huawei-sim-iccid
Use AT^ICCID if possible to read the ICCID.
-rw-r--r-- | plugins/Makefile.am | 2 | ||||
-rw-r--r-- | plugins/huawei/mm-broadband-modem-huawei.c | 27 | ||||
-rw-r--r-- | plugins/huawei/mm-sim-huawei.c | 181 | ||||
-rw-r--r-- | plugins/huawei/mm-sim-huawei.h | 53 |
4 files changed, 263 insertions, 0 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 28c56d98b..9bfa11e7c 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -110,6 +110,8 @@ libmm_plugin_huawei_la_SOURCES = \ huawei/mm-plugin-huawei.h \ huawei/mm-modem-helpers-huawei.c \ huawei/mm-modem-helpers-huawei.h \ + huawei/mm-sim-huawei.c \ + huawei/mm-sim-huawei.h \ huawei/mm-broadband-modem-huawei.c \ huawei/mm-broadband-modem-huawei.h \ huawei/mm-broadband-bearer-huawei.c \ diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c index 7e67b981a..45bc806fa 100644 --- a/plugins/huawei/mm-broadband-modem-huawei.c +++ b/plugins/huawei/mm-broadband-modem-huawei.c @@ -43,6 +43,7 @@ #include "mm-broadband-modem-huawei.h" #include "mm-broadband-bearer-huawei.h" #include "mm-broadband-bearer.h" +#include "mm-sim-huawei.h" static void iface_modem_init (MMIfaceModem *iface); static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); @@ -2861,6 +2862,30 @@ huawei_modem_power_down (MMIfaceModem *self, } /*****************************************************************************/ +/* Create SIM (Modem interface) */ + +static MMSim * +huawei_modem_create_sim_finish (MMIfaceModem *self, + GAsyncResult *res, + GError **error) +{ + return mm_sim_huawei_new_finish (res, error); +} + +static void +huawei_modem_create_sim (MMIfaceModem *self, + GAsyncReadyCallback callback, + gpointer user_data) +{ + /* New Sierra SIM */ + mm_sim_huawei_new (MM_BASE_MODEM (self), + NULL, /* cancellable */ + callback, + user_data); +} + + +/*****************************************************************************/ /* Check support (Time interface) */ static gboolean @@ -3127,6 +3152,8 @@ iface_modem_init (MMIfaceModem *iface) iface->modem_power_up_finish = huawei_modem_power_up_finish; iface->modem_power_down = huawei_modem_power_down; iface->modem_power_down_finish = huawei_modem_power_down_finish; + iface->create_sim = huawei_modem_create_sim; + iface->create_sim_finish = huawei_modem_create_sim_finish; } static void diff --git a/plugins/huawei/mm-sim-huawei.c b/plugins/huawei/mm-sim-huawei.c new file mode 100644 index 000000000..e7f2f5862 --- /dev/null +++ b/plugins/huawei/mm-sim-huawei.c @@ -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) 2008 - 2009 Novell, Inc. + * Copyright (C) 2009 - 2012 Red Hat, Inc. + * Copyright (C) 2012 Lanedo 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-log.h" +#include "mm-modem-helpers.h" +#include "mm-base-modem-at.h" + +#include "mm-sim-huawei.h" + +G_DEFINE_TYPE (MMSimHuawei, mm_sim_huawei, MM_TYPE_SIM); + +/*****************************************************************************/ +/* SIM identifier loading */ + +static void +parent_load_sim_identifier_ready (MMSimHuawei *self, + GAsyncResult *res, + GSimpleAsyncResult *simple) +{ + GError *error = NULL; + gchar *simid; + + simid = MM_SIM_CLASS (mm_sim_huawei_parent_class)->load_sim_identifier_finish (MM_SIM (self), res, &error); + if (simid) + g_simple_async_result_set_op_res_gpointer (simple, simid, g_free); + else + g_simple_async_result_take_error (simple, error); + + g_simple_async_result_complete (simple); + g_object_unref (simple); +} + +static gchar * +load_sim_identifier_finish (MMSim *self, + GAsyncResult *res, + GError **error) +{ + gchar *iccid; + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) + return NULL; + + iccid = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)); + mm_dbg ("loaded SIM identifier: %s", iccid); + return g_strdup (iccid); +} + +static void +iccid_read_ready (MMBaseModem *modem, + GAsyncResult *res, + GSimpleAsyncResult *simple) +{ + MMSim *self; + const gchar *response; + const gchar *p; + char *parsed; + + response = mm_base_modem_at_command_finish (modem, res, NULL); + if (!response) + goto error; + + p = mm_strip_tag (response, "^ICCID:"); + if (!p) + goto error; + + /* Huawei ^ICCID response must be character swapped */ + parsed = mm_3gpp_parse_iccid (p, TRUE, NULL); + if (parsed) { + g_simple_async_result_set_op_res_gpointer (simple, parsed, g_free); + g_simple_async_result_complete (simple); + g_object_unref (simple); + return; + } + +error: + /* Chain up to parent method; older devices don't support ^ICCID */ + self = MM_SIM (g_async_result_get_source_object (G_ASYNC_RESULT (simple))); + MM_SIM_CLASS (mm_sim_huawei_parent_class)->load_sim_identifier (self, + (GAsyncReadyCallback) parent_load_sim_identifier_ready, + simple); +} + +static void +load_sim_identifier (MMSim *self, + GAsyncReadyCallback callback, + gpointer user_data) +{ + MMBaseModem *modem = NULL; + + g_object_get (self, + MM_SIM_MODEM, &modem, + NULL); + + mm_dbg ("loading (Huawei) SIM identifier..."); + mm_base_modem_at_command ( + MM_BASE_MODEM (modem), + "^ICCID?", + 5, + FALSE, + (GAsyncReadyCallback)iccid_read_ready, + g_simple_async_result_new (G_OBJECT (self), + callback, + user_data, + load_sim_identifier)); + g_object_unref (modem); +} + +/*****************************************************************************/ + +MMSim * +mm_sim_huawei_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_sim_export (MM_SIM (sim)); + + return MM_SIM (sim); +} + +void +mm_sim_huawei_new (MMBaseModem *modem, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_async_initable_new_async (MM_TYPE_SIM_HUAWEI, + G_PRIORITY_DEFAULT, + cancellable, + callback, + user_data, + MM_SIM_MODEM, modem, + NULL); +} + +static void +mm_sim_huawei_init (MMSimHuawei *self) +{ +} + +static void +mm_sim_huawei_class_init (MMSimHuaweiClass *klass) +{ + MMSimClass *sim_class = MM_SIM_CLASS (klass); + + sim_class->load_sim_identifier = load_sim_identifier; + sim_class->load_sim_identifier_finish = load_sim_identifier_finish; +} diff --git a/plugins/huawei/mm-sim-huawei.h b/plugins/huawei/mm-sim-huawei.h new file mode 100644 index 000000000..dfd0d2904 --- /dev/null +++ b/plugins/huawei/mm-sim-huawei.h @@ -0,0 +1,53 @@ +/* -*- 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 - 2012 Red Hat, Inc. + * Copyright (C) 2012 Lanedo GmbH + */ + +#ifndef MM_SIM_HUAWEI_H +#define MM_SIM_HUAWEI_H + +#include <glib.h> +#include <glib-object.h> + +#include "mm-sim.h" + +#define MM_TYPE_SIM_HUAWEI (mm_sim_huawei_get_type ()) +#define MM_SIM_HUAWEI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SIM_HUAWEI, MMSimHuawei)) +#define MM_SIM_HUAWEI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_SIM_HUAWEI, MMSimHuaweiClass)) +#define MM_IS_SIM_HUAWEI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_SIM_HUAWEI)) +#define MM_IS_SIM_HUAWEI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_SIM_HUAWEI)) +#define MM_SIM_HUAWEI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_SIM_HUAWEI, MMSimHuaweiClass)) + +typedef struct _MMSimHuawei MMSimHuawei; +typedef struct _MMSimHuaweiClass MMSimHuaweiClass; + +struct _MMSimHuawei { + MMSim parent; +}; + +struct _MMSimHuaweiClass { + MMSimClass parent; +}; + +GType mm_sim_huawei_get_type (void); + +void mm_sim_huawei_new (MMBaseModem *modem, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +MMSim *mm_sim_huawei_new_finish (GAsyncResult *res, + GError **error); + +#endif /* MM_SIM_HUAWEI_H */ |