Fix interface name of modem states on maemo6 telephony driver
Luiz Augusto von Dentz
maintainerPATCH 1/3 Fix interface name of modem states on maemo6 telephony driver
From: Luiz Augusto von Dentz <[email protected]>
--- audio/telephony-maemo6.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
audio/telephony-maemo6.c +1 -1
@@ -1963,7 +1963,7 @@ int telephony_init(void)add_watch (NULL ,NULL ,CSD_CSNET_REGISTRATION ,NULL );add_watch (NULL ,NULL ,CSD_CSNET_OPERATOR ,NULL );add_watch (NULL ,NULL ,CSD_CSNET_SIGNAL ,NULL ); -add_watch (NULL ,NULL ,CSD_CSNET_SIGNAL ,"modem_state_changed_ind" ); +add_watch (NULL ,NULL ,SSC_DBUS_IFACE ,"modem_state_changed_ind" ); if (send_method_call(SSC_DBUS_NAME, SSC_DBUS_PATH, SSC_DBUS_IFACE, "get_modem_state", modem_state_reply,
Signature · 1 line
1.7.1
Luiz Augusto von Dentz
maintainerPATCH 2/3 Use specific members in D-Bus match rules on telephony maemo6 driver
From: Luiz Augusto von Dentz <[email protected]>
This reduces the amount of unnecessary wake-ups without breaking anything
--- audio/telephony-maemo6.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
audio/telephony-maemo6.c +3 -3
@@ -1960,9 +1960,9 @@ int telephony_init(void)add_watch (NULL ,NULL ,CSD_CALL_INTERFACE ,NULL );add_watch (NULL ,NULL ,CSD_CALL_INSTANCE ,NULL );add_watch (NULL ,NULL ,CSD_CALL_CONFERENCE ,NULL ); -add_watch (NULL ,NULL ,CSD_CSNET_REGISTRATION ,NULL ); -add_watch (NULL ,NULL ,CSD_CSNET_OPERATOR ,NULL ); -add_watch (NULL ,NULL ,CSD_CSNET_SIGNAL ,NULL ); +add_watch (NULL ,NULL ,CSD_CSNET_REGISTRATION ,"RegistrationChanged" ); +add_watch (NULL ,NULL ,CSD_CSNET_OPERATOR ,"OperatorNameChanged" ); +add_watch (NULL ,NULL ,CSD_CSNET_SIGNAL ,"SignalBarsChanged" );add_watch (NULL ,NULL ,SSC_DBUS_IFACE ,"modem_state_changed_ind" ); if (send_method_call(SSC_DBUS_NAME, SSC_DBUS_PATH, SSC_DBUS_IFACE,
Signature · 1 line
1.7.1
Luiz Augusto von Dentz
maintainerPATCH 3/3 Fix not canceling pending calls on maemo6 telephony driver exit
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This happens when the driver exit is called quickly after init due to adapter power changes.
--- audio/telephony-maemo6.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-)
audio/telephony-maemo6.c +20 -1
@@ -150,6 +150,7 @@ static DBusConnection *connection = NULL;static GSList *calls =NULL ;static GSList *watches =NULL ; +static GSList *pending =NULL ;/* Reference count for determining the call indicator status */ static GSList *active_calls =NULL ;
@@ -592,7 +593,7 @@ static int send_method_call(const char *dest, const char *path, }dbus_pending_call_set_notify (call, cb, user_data,NULL ); -dbus_pending_call_unref (call); + pending =g_slist_prepend (pending, call);dbus_message_unref (msg);return 0 ;
@@ -1312,6 +1313,12 @@ static gboolean iter_get_basic_args(DBusMessageIter *iter,return type ==DBUS_TYPE_INVALID ? TRUE : FALSE; } +static void remove_pending (DBusPendingCall *call) +{ + pending =g_slist_remove (pending, call); +dbus_pending_call_unref (call); +} +static void hal_battery_level_reply (DBusPendingCall *call,void *user_data) {DBusError err;
@@ -1360,8 +1367,10 @@ static void hal_battery_level_reply(DBusPendingCall *call, void *user_data)telephony_update_indicator (maemo_indicators,"battchg" , new); } + done:dbus_message_unref (reply); +remove_pending (call); }static void hal_get_integer (const char *path,const char *key,void *user_data)
@@ -1556,6 +1565,7 @@ static void get_property_reply(DBusPendingCall *call, void *user_data) done:g_free (prop);dbus_message_unref (reply); +remove_pending (call); }static int get_property (const char *iface,const char *prop)
@@ -1615,6 +1625,7 @@ static void call_info_reply(DBusPendingCall *call, void *user_data) done:dbus_message_unref (reply); +remove_pending (call); }
@@ -1665,6 +1676,7 @@ static void phonebook_read_reply(DBusPendingCall *call, void *user_data) done:dbus_message_unref (reply); +remove_pending (call); }static void csd_init (void )
@@ -1843,6 +1855,7 @@ static void modem_state_reply(DBusPendingCall *call, void *user_data)handle_modem_state (reply);dbus_message_unref (reply); +remove_pending (call); } static gboolean signal_filter(DBusConnection *conn, DBusMessage *msg,
@@ -1940,6 +1953,7 @@ static void hal_find_device_reply(DBusPendingCall *call, void *user_data) done:dbus_message_unref (reply); +remove_pending (call); }int telephony_init (void )
@@ -2016,6 +2030,11 @@ void telephony_exit(void)g_slist_free (calls); calls =NULL ; +g_slist_foreach (pending, (GFunc ) dbus_pending_call_cancel,NULL ); +g_slist_foreach (pending, (GFunc ) remove_pending,NULL ); +g_slist_free (pending); + pending =NULL ; +g_slist_foreach (watches, (GFunc ) remove_watch,NULL );g_slist_free (watches); watches =NULL ;
Signature · 1 line
1.7.1
Re: [PATCH 3/3] Fix not canceling pending calls on maemo6 telephony driver exit
Hi Luiz,
audio/telephony-maemo6.c void telephony_exit(void) · line 2035
Quoted 2 lines · Luiz Augusto von Dentz
audio/telephony-maemo6.c +2
-0+g_slist_foreach (pending, (GFunc ) remove_pending,NULL ); +g_slist_free (pending);
Maybe GLib can handle removing the items in the foreach callback, but I think it'd be better to just use pending_call_unref in this case.
Johan
Hi Luiz,
Quoted 5 lines · Luiz Augusto von Dentz
From: Luiz Augusto von Dentz <[email protected]>
--- audio/telephony-maemo6.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
The first two patches have been pushed upstream. Thanks.
Johan