On Fri, Aug 13, 2010 at 12:19 PM, Daniel Örstadius
<daniel.orstadius@xxxxxxxxx> wrote:
> Since bluetoothd power cycles the adapter at startup, it is possible
> that the plugin gets a reply from reading the state of the MCE and
> tries to power the adapter before it is down. The patch checks for
> that situation and if it occurs postpones powering the adapter to
> the mode change callback. The off_requested member of btd_adapter
> is used for the check, so it is set to FALSE when the adapter is
> down.
>
Attaching updated patch.
/Daniel
From ab1249f50673d6da226c1d8f490b962d999fd890 Mon Sep 17 00:00:00 2001
From: Daniel Orstadius <daniel.orstadius@xxxxxxxxx>
Date: Wed, 18 Aug 2010 14:22:31 +0300
Subject: [PATCH] Maemo6 MCE: handle race condition at startup
Since bluetoothd power cycles the adapter at startup, it is possible
that the plugin gets a reply from reading the state of the MCE and
tries to power the adapter before it is down. The patch checks for
that situation and if it occurs postpones powering the adapter to
the powered state callback. The off_requested member of btd_adapter
is used for the check, so it is set to FALSE when the adapter is
down.
---
plugins/maemo6.c | 22 ++++++++++++++++++++++
src/adapter.c | 1 +
2 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/plugins/maemo6.c b/plugins/maemo6.c
index 55ea508..ad86c30 100644
--- a/plugins/maemo6.c
+++ b/plugins/maemo6.c
@@ -50,6 +50,7 @@
static guint watch_id;
static DBusConnection *conn = NULL;
static gboolean mce_bt_set = FALSE;
+static gboolean collision = FALSE;
static gboolean mce_signal_callback(DBusConnection *connection,
DBusMessage *message, void *user_data)
@@ -112,6 +113,14 @@ static void read_radio_states_cb(DBusPendingCall *call, void *user_data)
mce_bt_set = radio_states & MCE_RADIO_STATE_BLUETOOTH;
+ /* check if the adapter has not completed the initial power
+ cycle, if so delay action to mce_notify_powered */
+
+ collision = mce_bt_set && adapter_powering_down(adapter);
+
+ if (collision)
+ goto done;
+
if (mce_bt_set)
btd_adapter_switch_online(adapter);
else
@@ -129,6 +138,19 @@ static void adapter_powered(struct btd_adapter *adapter, gboolean powered)
DBG("adapter_powered called with %d", powered);
+ /* check if the plugin got the get_radio_states reply from the
+ mce when the adapter was not yet down during the power
+ cycling when bluetoothd is started */
+ if (collision) {
+ error("maemo6: powered state collision");
+ collision = FALSE;
+
+ if (mce_bt_set)
+ btd_adapter_switch_online(adapter);
+
+ return;
+ }
+
/* nothing to do if the states match */
if (mce_bt_set == powered)
return;
diff --git a/src/adapter.c b/src/adapter.c
index 4ad4165..98db2d5 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2502,6 +2502,7 @@ int adapter_stop(struct btd_adapter *adapter)
adapter->state = DISCOVER_TYPE_NONE;
adapter->cache_enable = TRUE;
adapter->pending_cod = 0;
+ adapter->off_requested = FALSE;
call_adapter_powered_callbacks(adapter, FALSE);
--
1.6.0.4
