Implement reading IMEI, IMSI, manufacturer, model, and version (revision).

1 files changed, 60 insertions, 31 deletions

diff --git a/src/mm-callback-info.c b/src/mm-callback-info.c
index d4fa55c5..d016aad4 100644
--- a/src/mm-callback-info.c
+++ b/src/mm-callback-info.c
@@ -6,36 +6,41 @@
 static void
 callback_info_done (gpointer user_data)
 {
-	MMCallbackInfo *info = (MMCallbackInfo *) user_data;
+    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
+    gpointer result;
 
-	info->pending_id = 0;
+    info->pending_id = 0;
 
-    if (info->callback)
-        info->callback (info->modem, info->error, info->user_data);
+    result = mm_callback_info_get_data (info, "callback-info-result");
+
+    if (info->async_callback)
+        info->async_callback (info->modem, info->error, info->user_data);
     else if (info->uint_callback)
-        info->uint_callback (info->modem, info->uint_result, info->error, info->user_data);
+        info->uint_callback (info->modem, GPOINTER_TO_UINT (result), info->error, info->user_data);
+    else if (info->str_callback)
+        info->str_callback (info->modem, (const char *) result, info->error, info->user_data);
 
-	if (info->error)
-		g_error_free (info->error);
+    if (info->error)
+        g_error_free (info->error);
 
-	g_object_unref (info->modem);
-	g_datalist_clear (&info->qdata);
+    g_object_unref (info->modem);
+    g_datalist_clear (&info->qdata);
 
-	g_slice_free (MMCallbackInfo, info);
+    g_slice_free (MMCallbackInfo, info);
 }
 
 static gboolean
 callback_info_do (gpointer user_data)
 {
-	/* Nothing here, everything is done in callback_info_done to make sure the info->callback
-	   always gets called, even if the pending call gets cancelled. */
-	return FALSE;
+    /* Nothing here, everything is done in callback_info_done to make sure the info->callback
+       always gets called, even if the pending call gets cancelled. */
+    return FALSE;
 }
 
 void
 mm_callback_info_schedule (MMCallbackInfo *info)
 {
-	info->pending_id = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, callback_info_do, info, callback_info_done);
+    info->pending_id = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, callback_info_do, info, callback_info_done);
 }
 
 void
@@ -50,15 +55,15 @@ mm_callback_info_cancel (MMCallbackInfo *info)
 MMCallbackInfo *
 mm_callback_info_new (MMModem *modem, MMModemFn callback, gpointer user_data)
 {
-	MMCallbackInfo *info;
+    MMCallbackInfo *info;
 
-	info = g_slice_new0 (MMCallbackInfo);
-	g_datalist_init (&info->qdata);
-	info->modem = g_object_ref (modem);
-	info->callback = callback;
-	info->user_data = user_data;
+    info = g_slice_new0 (MMCallbackInfo);
+    g_datalist_init (&info->qdata);
+    info->modem = g_object_ref (modem);
+    info->async_callback = callback;
+    info->user_data = user_data;
 
-	return info;
+    return info;
 }
 
 MMCallbackInfo *
@@ -68,13 +73,37 @@ mm_callback_info_uint_new (MMModem *modem,
 {
     MMCallbackInfo *info;
 
-	info = g_slice_new0 (MMCallbackInfo);
-	g_datalist_init (&info->qdata);
-	info->modem = g_object_ref (modem);
-	info->uint_callback = callback;
-	info->user_data = user_data;
+    info = g_slice_new0 (MMCallbackInfo);
+    g_datalist_init (&info->qdata);
+    info->modem = g_object_ref (modem);
+    info->uint_callback = callback;
+    info->user_data = user_data;
+
+    return info;
+}
 
-	return info;
+MMCallbackInfo *
+mm_callback_info_string_new (MMModem *modem,
+                             MMModemStringFn callback,
+                             gpointer user_data)
+{
+    MMCallbackInfo *info;
+
+    info = g_slice_new0 (MMCallbackInfo);
+    g_datalist_init (&info->qdata);
+    info->modem = g_object_ref (modem);
+    info->str_callback = callback;
+    info->user_data = user_data;
+
+    return info;
+}
+
+void
+mm_callback_info_set_result (MMCallbackInfo *info,
+                             gpointer data,
+                             GDestroyNotify destroy)
+{
+    mm_callback_info_set_data (info, "callback-info-result", data, destroy);
 }
 
 void
@@ -83,16 +112,16 @@ mm_callback_info_set_data (MMCallbackInfo *info,
                            gpointer data,
                            GDestroyNotify destroy)
 {
-	g_datalist_id_set_data_full (&info->qdata, g_quark_from_string (key), data,
+    g_datalist_id_set_data_full (&info->qdata, g_quark_from_string (key), data,
                                  data ? destroy : (GDestroyNotify) NULL);
 }
 
 gpointer
 mm_callback_info_get_data (MMCallbackInfo *info, const char *key)
 {
-	GQuark quark;
+    GQuark quark;
 
-	quark = g_quark_try_string (key);
+    quark = g_quark_try_string (key);
 
-	return quark ? g_datalist_id_get_data (&info->qdata, quark) : NULL;
+    return quark ? g_datalist_id_get_data (&info->qdata, quark) : NULL;
 }