* [PATCH 1/3] Fix not deinitializing telephony driver when there is no adapter powered
@ 2010-11-23 11:33 Luiz Augusto von Dentz
2010-11-23 11:33 ` [PATCH 2/3] Fix telephony dummy driver Luiz Augusto von Dentz
2010-11-23 11:33 ` [PATCH 3/3] Fix telephony maemo6 driver deinitialization Luiz Augusto von Dentz
0 siblings, 2 replies; 5+ messages in thread
From: Luiz Augusto von Dentz @ 2010-11-23 11:33 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>
This changes hook telephony driver de/initialization to powered state so
telephony drivers can now free their resources when there is no adapter
active in the system.
---
audio/manager.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/audio/manager.c b/audio/manager.c
index 816c807..8a5616d 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -96,6 +96,7 @@ typedef enum {
struct audio_adapter {
struct btd_adapter *btd_adapter;
+ gboolean powered;
uint32_t hsp_ag_record_id;
uint32_t hfp_ag_record_id;
uint32_t hfp_hs_record_id;
@@ -858,6 +859,49 @@ static struct audio_adapter *audio_adapter_get(struct btd_adapter *adapter)
return adp;
}
+static void state_changed(struct btd_adapter *adapter, gboolean powered)
+{
+ struct audio_adapter *adp;
+ static gboolean telephony = FALSE;
+ GSList *l;
+
+ DBG("%s powered %s", adapter_get_path(adapter),
+ powered ? "on" : "off");
+
+ /* ignore powered change, adapter is powering down */
+ if (powered && adapter_powering_down(adapter))
+ return;
+
+ adp = find_adapter(adapters, adapter);
+ if (!adp)
+ return;
+
+ adp->powered = powered;
+
+ if (powered) {
+ /* telephony driver already initialized*/
+ if (telephony == TRUE)
+ return;
+ telephony_init();
+ telephony = TRUE;
+ return;
+ }
+
+ /* telephony not initialized just ignore power down */
+ if (telephony == FALSE)
+ return;
+
+ for (l = adapters; l; l = l->next) {
+ adp = l->data;
+
+ if (adp->powered == TRUE)
+ return;
+ }
+
+ telephony_exit();
+ telephony = FALSE;
+}
+
static int headset_server_probe(struct btd_adapter *adapter)
{
struct audio_adapter *adp;
@@ -871,10 +915,15 @@ static int headset_server_probe(struct btd_adapter *adapter)
return -EINVAL;
err = headset_server_init(adp);
- if (err < 0)
+ if (err < 0) {
audio_adapter_unref(adp);
+ return err;
+ }
- return err;
+ btd_adapter_register_powered_callback(adapter, state_changed);
+ state_changed(adapter, TRUE);
+
+ return 0;
}
static void headset_server_remove(struct btd_adapter *adapter)
@@ -910,6 +959,8 @@ static void headset_server_remove(struct btd_adapter *adapter)
adp->hfp_ag_server = NULL;
}
+ btd_adapter_unregister_powered_callback(adapter, state_changed);
+
audio_adapter_unref(adp);
}
@@ -1177,10 +1228,8 @@ proceed:
if (enabled.media)
btd_register_adapter_driver(&media_server_driver);
- if (enabled.headset) {
- telephony_init();
+ if (enabled.headset)
btd_register_adapter_driver(&headset_server_driver);
- }
if (enabled.gateway)
btd_register_adapter_driver(&gateway_server_driver);
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] Fix telephony dummy driver
2010-11-23 11:33 [PATCH 1/3] Fix not deinitializing telephony driver when there is no adapter powered Luiz Augusto von Dentz
@ 2010-11-23 11:33 ` Luiz Augusto von Dentz
2010-11-23 11:33 ` [PATCH 3/3] Fix telephony maemo6 driver deinitialization Luiz Augusto von Dentz
1 sibling, 0 replies; 5+ messages in thread
From: Luiz Augusto von Dentz @ 2010-11-23 11:33 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>
Make it unregister its interface on telephony_exit
---
audio/telephony-dummy.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/audio/telephony-dummy.c b/audio/telephony-dummy.c
index 06cb798..54b1857 100644
--- a/audio/telephony-dummy.c
+++ b/audio/telephony-dummy.c
@@ -417,6 +417,8 @@ int telephony_init(void)
AG_FEATURE_ENHANCED_CALL_STATUS |
AG_FEATURE_EXTENDED_ERROR_RESULT_CODES;
+ DBG("");
+
connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
if (g_dbus_register_interface(connection, TELEPHONY_DUMMY_PATH,
@@ -436,6 +438,10 @@ int telephony_init(void)
void telephony_exit(void)
{
+ DBG("");
+
+ g_dbus_unregister_interface(connection, TELEPHONY_DUMMY_PATH,
+ TELEPHONY_DUMMY_IFACE);
dbus_connection_unref(connection);
connection = NULL;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] Fix telephony maemo6 driver deinitialization
2010-11-23 11:33 [PATCH 1/3] Fix not deinitializing telephony driver when there is no adapter powered Luiz Augusto von Dentz
2010-11-23 11:33 ` [PATCH 2/3] Fix telephony dummy driver Luiz Augusto von Dentz
@ 2010-11-23 11:33 ` Luiz Augusto von Dentz
1 sibling, 0 replies; 5+ messages in thread
From: Luiz Augusto von Dentz @ 2010-11-23 11:33 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>
Remove all match rules and unregister its interface when telephony_exit
is called.
---
audio/telephony-maemo6.c | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/audio/telephony-maemo6.c b/audio/telephony-maemo6.c
index 72c8e36..47b0bee 100644
--- a/audio/telephony-maemo6.c
+++ b/audio/telephony-maemo6.c
@@ -1948,6 +1948,8 @@ int telephony_init(void)
AG_FEATURE_EXTENDED_ERROR_RESULT_CODES |
AG_FEATURE_THREE_WAY_CALLING;
+ DBG("");
+
connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
if (!dbus_connection_add_filter(connection, signal_filter,
@@ -2007,6 +2009,8 @@ int telephony_init(void)
void telephony_exit(void)
{
+ DBG("");
+
g_free(net.operator_name);
net.operator_name = NULL;
@@ -2017,8 +2021,30 @@ void telephony_exit(void)
g_slist_free(calls);
calls = NULL;
+ dbus_bus_remove_match(connection,
+ "type=signal,interface=" CSD_CALL_INTERFACE, NULL);
+ dbus_bus_remove_match(connection,
+ "type=signal,interface=" CSD_CALL_INSTANCE, NULL);
+ dbus_bus_remove_match(connection,
+ "type=signal,interface=" CSD_CALL_CONFERENCE, NULL);
+ dbus_bus_remove_match(connection,
+ "type=signal,interface=" CSD_CSNET_REGISTRATION,
+ NULL);
+ dbus_bus_remove_match(connection,
+ "type=signal,interface=" CSD_CSNET_OPERATOR,
+ NULL);
+ dbus_bus_remove_match(connection,
+ "type=signal,interface=" CSD_CSNET_SIGNAL,
+ NULL);
+ dbus_bus_remove_match(connection,
+ "type=signal,interface=" SSC_DBUS_IFACE
+ ",member=modem_state_changed_ind", NULL);
+
dbus_connection_remove_filter(connection, signal_filter, NULL);
+ g_dbus_unregister_interface(connection, TELEPHONY_MAEMO_PATH,
+ TELEPHONY_MAEMO_INTERFACE);
+
dbus_connection_unref(connection);
connection = NULL;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/3] Fix not deinitializing telephony driver when there is no adapter powered
@ 2010-11-25 15:22 Luiz Augusto von Dentz
2010-11-25 20:01 ` Johan Hedberg
0 siblings, 1 reply; 5+ messages in thread
From: Luiz Augusto von Dentz @ 2010-11-25 15:22 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>
This changes hook telephony driver de/initialization to powered state so
telephony drivers can now free their resources when there is no adapter
active in the system.
---
audio/manager.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/audio/manager.c b/audio/manager.c
index 816c807..8a5616d 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -96,6 +96,7 @@ typedef enum {
struct audio_adapter {
struct btd_adapter *btd_adapter;
+ gboolean powered;
uint32_t hsp_ag_record_id;
uint32_t hfp_ag_record_id;
uint32_t hfp_hs_record_id;
@@ -858,6 +859,49 @@ static struct audio_adapter *audio_adapter_get(struct btd_adapter *adapter)
return adp;
}
+static void state_changed(struct btd_adapter *adapter, gboolean powered)
+{
+ struct audio_adapter *adp;
+ static gboolean telephony = FALSE;
+ GSList *l;
+
+ DBG("%s powered %s", adapter_get_path(adapter),
+ powered ? "on" : "off");
+
+ /* ignore powered change, adapter is powering down */
+ if (powered && adapter_powering_down(adapter))
+ return;
+
+ adp = find_adapter(adapters, adapter);
+ if (!adp)
+ return;
+
+ adp->powered = powered;
+
+ if (powered) {
+ /* telephony driver already initialized*/
+ if (telephony == TRUE)
+ return;
+ telephony_init();
+ telephony = TRUE;
+ return;
+ }
+
+ /* telephony not initialized just ignore power down */
+ if (telephony == FALSE)
+ return;
+
+ for (l = adapters; l; l = l->next) {
+ adp = l->data;
+
+ if (adp->powered == TRUE)
+ return;
+ }
+
+ telephony_exit();
+ telephony = FALSE;
+}
+
static int headset_server_probe(struct btd_adapter *adapter)
{
struct audio_adapter *adp;
@@ -871,10 +915,15 @@ static int headset_server_probe(struct btd_adapter *adapter)
return -EINVAL;
err = headset_server_init(adp);
- if (err < 0)
+ if (err < 0) {
audio_adapter_unref(adp);
+ return err;
+ }
- return err;
+ btd_adapter_register_powered_callback(adapter, state_changed);
+ state_changed(adapter, TRUE);
+
+ return 0;
}
static void headset_server_remove(struct btd_adapter *adapter)
@@ -910,6 +959,8 @@ static void headset_server_remove(struct btd_adapter *adapter)
adp->hfp_ag_server = NULL;
}
+ btd_adapter_unregister_powered_callback(adapter, state_changed);
+
audio_adapter_unref(adp);
}
@@ -1177,10 +1228,8 @@ proceed:
if (enabled.media)
btd_register_adapter_driver(&media_server_driver);
- if (enabled.headset) {
- telephony_init();
+ if (enabled.headset)
btd_register_adapter_driver(&headset_server_driver);
- }
if (enabled.gateway)
btd_register_adapter_driver(&gateway_server_driver);
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-11-25 20:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-23 11:33 [PATCH 1/3] Fix not deinitializing telephony driver when there is no adapter powered Luiz Augusto von Dentz
2010-11-23 11:33 ` [PATCH 2/3] Fix telephony dummy driver Luiz Augusto von Dentz
2010-11-23 11:33 ` [PATCH 3/3] Fix telephony maemo6 driver deinitialization Luiz Augusto von Dentz
-- strict thread matches above, loose matches on Subject: below --
2010-11-25 15:22 [PATCH 1/3] Fix not deinitializing telephony driver when there is no adapter powered Luiz Augusto von Dentz
2010-11-25 20:01 ` Johan Hedberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).