korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-16 08:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Maemo6 MCE: handle race condition at startup

Browse Source 
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.
This commit is contained in:
Daniel Orstadius 2010-08-18 15:48:28 +03:00 committed by Johan Hedberg
parent 65f8694909
commit 5ac50f2903
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/maemo6.c
View File

@ -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,13 @@ 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 +137,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;