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

Correctly deletion of hidden hdp_devices

Browse Source
This commit is contained in:
Santiago Carot-Nemesio 2010-09-30 14:06:01 +02:00 committed by Johan Hedberg
parent 7369e445b2
commit 3218a9e698
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
health/hdp.c
View File

@ -177,6 +177,15 @@ static gboolean set_app_path(struct hdp_application *app)
return TRUE;
};
static void device_unref_mcl(struct hdp_device *hdp_device)
{
if (!hdp_device->mcl)
return;
mcap_mcl_unref(hdp_device->mcl);
hdp_device->mcl = NULL;
hdp_device->mcl_conn = FALSE;
}
static void free_health_device(struct hdp_device *device)
{
if (device->conn) {
@ -189,10 +198,7 @@ static void free_health_device(struct hdp_device *device)
device->dev = NULL;
}
if (device->mcl) {
mcap_mcl_unref(device->mcl);
device->mcl = NULL;
}
device_unref_mcl(device);
g_free(device);
}
@ -443,8 +449,7 @@ static void mcl_uncached(struct mcap_mcl *mcl, gpointer data)
return;
hdp_device = l->data;
mcap_mcl_unref(mcl);
hdp_device->mcl = NULL;
device_unref_mcl(hdp_device);
if (hdp_device->sdp_present)
return;
@ -458,20 +463,26 @@ static void mcl_uncached(struct mcap_mcl *mcl, gpointer data)
DBG("Mcl uncached %s", path);
}
static void device_unref_mcl(struct hdp_device *hdp_device)
static void check_devices_mcl()
{
struct hdp_device *dev;
GSList *l, *to_delete = NULL;
const char *path;
if (hdp_device->mcl)
mcap_mcl_unref(hdp_device->mcl);
hdp_device->mcl = NULL;
hdp_device->mcl_conn = FALSE;
for (l = devices; l; l = l->next) {
dev = l->data;
device_unref_mcl(dev);
if (hdp_device->sdp_present)
return;
if (!dev->sdp_present)
to_delete = g_slist_append(to_delete, dev);
}
path = device_get_path(hdp_device->dev);
g_dbus_unregister_interface(hdp_device->conn, path, HEALTH_DEVICE);
for (l = to_delete; l; l = l->next) {
path = device_get_path(dev->dev);
g_dbus_unregister_interface(dev->conn, path, HEALTH_DEVICE);
}
g_slist_free(to_delete);
}
static gboolean update_adapter(struct hdp_adapter *hdp_adapter)
@ -483,8 +494,7 @@ static gboolean update_adapter(struct hdp_adapter *hdp_adapter)
if (hdp_adapter->mi) {
mcap_release_instance(hdp_adapter->mi);
hdp_adapter->mi = NULL;
g_slist_foreach(devices, (GFunc) device_unref_mcl,
NULL);
check_devices_mcl();
}
goto update;
}