diff options
author | Aleksander Morgado <aleksander@lanedo.com> | 2011-11-23 10:35:12 +0100 |
---|---|---|
committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:14:24 +0100 |
commit | 63163835a3c12f64ce991961bb6b8a0409535918 (patch) | |
tree | cf119ee657ff8c274378b3517d1d860b3a17e153 | |
parent | 8303bed13347c2ad23ada45eed7db36e539c15fd (diff) |
broadband-modem: implement Manufacturer loading
-rw-r--r-- | src/mm-broadband-modem.c | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 99518fec..27de4172 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -52,6 +52,24 @@ struct _MMBroadbandModemPrivate { MMModemState modem_state; }; +static gboolean +common_parse_string_reply (MMBroadbandModem *self, + gpointer none, + const gchar *command, + const gchar *response, + const GError *error, + GVariant **result, + GError **result_error) +{ + if (error) { + *result_error = g_error_copy (error); + return FALSE; + } + + *result = g_variant_new_string (response); + return TRUE; +} + /*****************************************************************************/ /* CAPABILITIES */ @@ -238,6 +256,50 @@ load_modem_capabilities (MMIfaceModem *self, } /*****************************************************************************/ +/* MANUFACTURER */ + +static gchar * +load_manufacturer_finish (MMIfaceModem *self, + GAsyncResult *res, + GError **error) +{ + GVariant *result; + gchar *manufacturer; + + result = mm_at_sequence_finish (G_OBJECT (self), res, error); + if (!result) + return NULL; + + manufacturer = g_variant_dup_string (result, NULL); + mm_dbg ("loaded manufacturer: %s", manufacturer); + g_variant_unref (result); + return manufacturer; +} + +static const MMAtCommand manufacturers[] = { + { "+CGMI", 3, (MMAtResponseProcessor)common_parse_string_reply }, + { "+GMI", 3, (MMAtResponseProcessor)common_parse_string_reply }, + { NULL } +}; + +static void +load_manufacturer (MMIfaceModem *self, + GAsyncReadyCallback callback, + gpointer user_data) +{ + mm_dbg ("loading manufacturer..."); + mm_at_sequence (G_OBJECT (self), + mm_base_modem_get_port_primary (MM_BASE_MODEM (self)), + (MMAtCommand *)manufacturers, + NULL, /* response_processor_context */ + FALSE, + "s", + NULL, /* TODO: cancellable */ + callback, + user_data); +} + +/*****************************************************************************/ static void enable (MMBaseModem *self, @@ -453,6 +515,8 @@ iface_modem_init (MMIfaceModem *iface) { iface->load_modem_capabilities = load_modem_capabilities; iface->load_modem_capabilities_finish = load_modem_capabilities_finish; + iface->load_manufacturer = load_manufacturer; + iface->load_manufacturer_finish = load_manufacturer_finish; } static void |