Merge lp:~alfonsosanchezbeato/ubuntu/utopic/powerd/modem-power-mode into lp:powerd

[Alfonso Sanchez-Beato]

Set modem low power mode when display state is off

Set modem low power mode when display state is off

[Ricardo Salveti (rsalveti)]

Looks good, thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-29 06:18:12 +0000
+++ debian/changelog	2014-07-02 16:44:08 +0000
@@ -1,3 +1,9 @@
+powerd (0.16+14.10.20140702-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Set modem low power mode when display state is off 
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Wed, 02 Jul 2014 17:19:54 +0100
+
 powerd (0.16+14.10.20140620-0ubuntu2) utopic; urgency=medium
 
   * Should still parse config-default if the device specific one is not

=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2014-06-18 18:06:10 +0000
+++ src/powerd-internal.h	2014-07-02 16:44:08 +0000
@@ -141,6 +141,8 @@
     gchar *signal_name, GVariant *parameters, gpointer user_data);
 void on_ofono_ussd_signal(GDBusProxy *proxy, gchar *sender_name,
     gchar *signal_name, GVariant *parameters, gpointer user_data);
+void on_unity_signal(GDBusProxy *proxy, gchar *sender_name,
+    gchar *signal_name, GVariant *parameters, gpointer user_data);
 
 /* dbus proxy async setup */
 void ofono_manager_proxy_connect_cb(GObject *source_object, GAsyncResult *res,
@@ -149,6 +151,8 @@
     gpointer user_data);
 void ofono_proxy_connect_cb(GObject *source_object, GAsyncResult *res,
     gpointer user_data);
+void unity_proxy_connect_cb(GObject *source_object, GAsyncResult *res,
+    gpointer user_data);
 
 /* Sensor functions */
 void powerd_sensors_proximity_enable(void);

=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2014-05-21 03:17:03 +0000
+++ src/powerd-object.c	2014-07-02 16:44:08 +0000
@@ -230,6 +230,7 @@
 {
     GError *error = NULL;
     GDBusProxy *ofono_proxy;
+    GDBusProxy **proxy = user_data;
 
     ofono_proxy = g_dbus_proxy_new_finish(res, &error);
     if (error) {
@@ -246,6 +247,8 @@
     g_dbus_proxy_call(ofono_proxy, "GetModems", NULL,
                         G_DBUS_CALL_FLAGS_NONE, -1, NULL,
                         ofono_get_modems_cb, NULL);
+
+    *proxy = ofono_proxy;
 }
 
 void
@@ -285,6 +288,7 @@
     GError *error = NULL;
     GDBusProxy *ofono_proxy = NULL;
     const char *interface_name = "";
+    GDBusProxy **proxy = user_data;
 
     ofono_proxy = g_dbus_proxy_new_finish (res, &error);
     if (error) {
@@ -306,11 +310,34 @@
             g_signal_connect(ofono_proxy, "g-signal",
                 G_CALLBACK (on_ofono_ussd_signal), NULL);
         }
-        else {
-            powerd_warn("unknown interface name for this proxy, ignoring");
-        }
         powerd_debug("ofono_proxy_connect_cb succeeded");
-    }
+
+        *proxy = ofono_proxy;
+    }
+
+}
+
+void unity_proxy_connect_cb(GObject *source_object, GAsyncResult *res,
+                            gpointer user_data)
+{
+    GError *error = NULL;
+    GDBusProxy *unity_proxy;
+    GDBusProxy **proxy = user_data;
+
+    powerd_debug("unity_proxy_connect_cb");
+
+    unity_proxy = g_dbus_proxy_new_finish(res, &error);
+    if (error) {
+        powerd_warn("%s failed: %s", __func__, error->message);
+        g_error_free(error);
+        return;
+    }
+
+    /* Register for display power changes */
+    g_signal_connect(unity_proxy, "g-signal",
+                        G_CALLBACK(on_unity_signal), NULL);
+
+    *proxy = unity_proxy;
 }
 
 void

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2014-06-18 18:06:10 +0000
+++ src/powerd.cpp	2014-07-02 16:44:08 +0000
@@ -58,6 +58,37 @@
 
 static int g_exit_code = 0;
 
+/* Used to track modem interfaces */
+struct modem_data {
+    char *obj_name;
+    GDBusProxy *message_proxy;
+    GDBusProxy *voice_proxy;
+    GDBusProxy *ussd_proxy;
+    GDBusProxy *radiosettings_proxy;
+};
+
+static void free_modem_data(void *data)
+{
+    struct modem_data *modem = (struct modem_data *) data;
+    g_free(modem->obj_name);
+    if (modem->message_proxy)
+        g_object_unref(modem->message_proxy);
+    if (modem->voice_proxy)
+        g_object_unref(modem->voice_proxy);
+    if (modem->ussd_proxy)
+        g_object_unref(modem->ussd_proxy);
+    if (modem->radiosettings_proxy)
+        g_object_unref(modem->radiosettings_proxy);
+}
+
+static gint modem_data_cmp(gconstpointer a, gconstpointer b)
+{
+    const struct modem_data *modem = (const struct modem_data *) a;
+    const char *modem_name = (const char *) b;
+
+    return strcmp(modem->obj_name, modem_name);
+}
+
 /* List with detected modems */
 static GSList *g_modems = NULL;
 
@@ -77,6 +108,9 @@
     return strcmp(call->obj_name, call_name);
 }
 
+static GDBusProxy *g_ofono_proxy;
+static GDBusProxy *g_unity_proxy;
+
 /* List with existing calls */
 static GSList *g_calls = NULL;
 
@@ -110,40 +144,51 @@
 {
 }
 
-static void watch_modem(const char *modem)
+static void watch_modem(struct modem_data *modem)
 {
     /* for incoming SMS signals */
     g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
         G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
         NULL,
         "org.ofono",
-        modem,
+        modem->obj_name,
         "org.ofono.MessageManager",
         NULL,
         (GAsyncReadyCallback)ofono_proxy_connect_cb,
-        NULL);
+        &modem->message_proxy);
 
     /* for incoming calls Added/Removed signals */
     g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
         G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
         NULL,
         "org.ofono",
-        modem,
+        modem->obj_name,
         "org.ofono.VoiceCallManager",
         NULL,
         (GAsyncReadyCallback)ofono_proxy_connect_cb,
-        NULL);
+        &modem->voice_proxy);
 
     /* for USSD notifications/network requests */
     g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
         G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
         NULL,
         "org.ofono",
-        modem,
+        modem->obj_name,
         "org.ofono.SupplementaryServices",
         NULL,
         (GAsyncReadyCallback)ofono_proxy_connect_cb,
-        NULL);
+        &modem->ussd_proxy);
+
+    /* To set/unset low power mode */
+    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
+        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+        NULL,
+        "org.ofono",
+        modem->obj_name,
+        "org.ofono.RadioSettings",
+        NULL,
+        (GAsyncReadyCallback)ofono_proxy_connect_cb,
+        &modem->radiosettings_proxy);
 }
 
 void
@@ -169,11 +214,15 @@
 
         g_variant_get_child(item, 0, "&o", &obj_path);
 
-        if (g_slist_find_custom(g_modems, obj_path, (GCompareFunc) strcmp)
+        if (g_slist_find_custom(g_modems, obj_path, modem_data_cmp)
                 == NULL) {
+            struct modem_data *modem;
+
             powerd_debug("active ofono modem %s", obj_path);
-            g_modems = g_slist_prepend(g_modems, g_strdup(obj_path));
-            watch_modem(obj_path);
+            modem = (struct modem_data *) calloc(1, sizeof(*modem));
+            modem->obj_name = g_strdup(obj_path);
+            g_modems = g_slist_prepend(g_modems, modem);
+            watch_modem(modem);
         }
 
         g_variant_unref(item);
@@ -268,19 +317,21 @@
 {
     const gchar *object_path;
     GVariant *tmp;
-    char *modem;
     GSList *node;
 
     tmp = g_variant_get_child_value(parameters, 0);
 
     object_path = g_variant_get_string(tmp, NULL);
-    node = g_slist_find_custom(g_modems, object_path, (GCompareFunc) strcmp);
+    node = g_slist_find_custom(g_modems, object_path, modem_data_cmp);
 
     if (strcmp("ModemAdded", signal_name) == 0) {
         /* Add if not already in list */
         if (node == NULL) {
+            struct modem_data *modem;
+
             powerd_debug("watching ofono modem %s", object_path);
-            modem = g_strdup(object_path);
+            modem = (struct modem_data *) calloc(1, sizeof(*modem));
+            modem->obj_name = g_strdup(object_path);
             g_modems = g_slist_prepend(g_modems, modem);
             watch_modem(modem);
         }
@@ -288,7 +339,7 @@
         /* Remove if found in list */
         if (node != NULL) {
             powerd_debug("stop watch on ofono modem %s", object_path);
-            g_free(g_modems->data);
+            free_modem_data(g_modems->data);
             g_modems = g_slist_delete_link(g_modems, node);
         }
     }
@@ -406,6 +457,35 @@
     }
 }
 
+void on_unity_signal(GDBusProxy *proxy, gchar *sender_name,
+    gchar *signal_name, GVariant *parameters, gpointer user_data)
+{
+    powerd_debug("we get signal from %s: %s", sender_name, signal_name);
+
+    /* From com.canonical.Unity.Screen */
+    if (strcmp(signal_name, "DisplayPowerStateChange") == 0) {
+        int state, reason;
+        GSList *it;
+
+        g_variant_get(parameters, "(ii)", &state, &reason);
+        powerd_debug("Received %s: state=%d flags=%d\n",
+		     signal_name, state, reason);
+
+        /* Set modem low power mode when reason is not proximity sensor */
+        if (reason == UNITY_SCREEN_REASON_PROXIMITY)
+            return;
+
+        for (it = g_modems; it; it = it->next) {
+            struct modem_data *modem = (struct modem_data *) it->data;
+            GVariant *mode = g_variant_new_boolean(state ? FALSE : TRUE);
+
+            g_dbus_proxy_call(modem->radiosettings_proxy, "SetProperty",
+                              g_variant_new("(sv)", "FastDormancy", mode),
+                              G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
+        }
+    }
+}
+
 /* Must be first to run on main loop */
 static gboolean main_init(gpointer unused)
 {
@@ -464,14 +544,25 @@
 
     /* Listen to modem creation */
     g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
-        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-        NULL,
-        "org.ofono",
-        "/",
-        "org.ofono.Manager",
-        NULL,
-        (GAsyncReadyCallback) ofono_manager_proxy_connect_cb,
-        NULL);
+                G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+                NULL,
+                "org.ofono",
+                "/",
+                "org.ofono.Manager",
+                NULL,
+                (GAsyncReadyCallback) ofono_manager_proxy_connect_cb,
+                &g_ofono_proxy);
+
+    /* Listen to unity signals */
+    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
+                G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+                NULL,
+                "com.canonical.Unity.Screen",
+                "/com/canonical/Unity/Screen",
+                "com.canonical.Unity.Screen",
+                NULL,
+                (GAsyncReadyCallback) unity_proxy_connect_cb,
+                &g_unity_proxy);
 
     /* Init this first, data is used by other inits */
     device_config_init();
@@ -513,8 +604,12 @@
     power_request_deinit();
     powerd_client_deinit();
     powerd_stats_deinit();
-    g_slist_free_full(g_modems, g_free);
+    g_slist_free_full(g_modems, free_modem_data);
     g_slist_free_full(g_calls, free_call_data);
+    if (g_ofono_proxy)
+        g_object_unref(g_ofono_proxy);
+    if (g_unity_proxy)
+        g_object_unref(g_unity_proxy);
 
     return g_exit_code;
 }