From: Yun-Hao Chung <[email protected]>
This adds device_added and device_removed to btd_adapter_driver so that
a driver can get notification when device is added or removed.
---
(no changes since v1)
src/adapter.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++-----
src/adapter.h | 4 ++++
2 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 6c8096147bdd..5c556b569ca7 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1218,6 +1218,9 @@ void adapter_service_remove(struct btd_adapter *adapter, uint32_t handle)
remove_record_from_server(rec->handle);
}
+static void adapter_add_device(struct btd_adapter *adapter,
+ struct btd_device *device);
+
static struct btd_device *adapter_create_device(struct btd_adapter *adapter,
const bdaddr_t *bdaddr,
uint8_t bdaddr_type)
@@ -1228,8 +1231,7 @@ static struct btd_device *adapter_create_device(struct btd_adapter *adapter,
if (!device)
return NULL;
- adapter->devices = g_slist_append(adapter->devices, device);
-
+ adapter_add_device(adapter, device);
return device;
}
@@ -1256,6 +1258,9 @@ static void service_auth_cancel(struct service_auth *auth)
g_free(auth);
}
+static void adapter_remove_device(struct btd_adapter *adapter,
+ struct btd_device *device);
+
void btd_adapter_remove_device(struct btd_adapter *adapter,
struct btd_device *dev)
{
@@ -1263,7 +1268,7 @@ void btd_adapter_remove_device(struct btd_adapter *adapter,
adapter->connect_list = g_slist_remove(adapter->connect_list, dev);
- adapter->devices = g_slist_remove(adapter->devices, dev);
+ adapter_remove_device(adapter, dev);
btd_adv_monitor_device_remove(adapter->adv_monitor_manager, dev);
adapter->discovery_found = g_slist_remove(adapter->discovery_found,
@@ -4665,7 +4670,7 @@ static void load_devices(struct btd_adapter *adapter)
goto free;
btd_device_set_temporary(device, false);
- adapter->devices = g_slist_append(adapter->devices, device);
+ adapter_add_device(adapter, device);
/* TODO: register services from pre-loaded list of primaries */
@@ -4827,6 +4832,48 @@ void adapter_remove_profile(struct btd_adapter *adapter, gpointer p)
profile->adapter_remove(profile, adapter);
}
+static void device_added_drivers(struct btd_adapter *adapter,
+ struct btd_device *device)
+{
+ struct btd_adapter_driver *driver;
+ GSList *l;
+
+ for (l = adapter_drivers; l; l = l->next) {
+ driver = l->data;
+
+ if (driver->device_added)
+ driver->device_added(adapter, device);
+ }
+}
+
+static void device_removed_drivers(struct btd_adapter *adapter,
+ struct btd_device *device)
+{
+ struct btd_adapter_driver *driver;
+ GSList *l;
+
+ for (l = adapter_drivers; l; l = l->next) {
+ driver = l->data;
+
+ if (driver->device_removed)
+ driver->device_removed(adapter, device);
+ }
+}
+
+static void adapter_add_device(struct btd_adapter *adapter,
+ struct btd_device *device)
+{
+ adapter->devices = g_slist_append(adapter->devices, device);
+ device_added_drivers(adapter, device);
+}
+
+static void adapter_remove_device(struct btd_adapter *adapter,
+ struct btd_device *device)
+{
+ adapter->devices = g_slist_remove(adapter->devices, device);
+ device_removed_drivers(adapter, device);
+}
+
static void adapter_add_connection(struct btd_adapter *adapter,
struct btd_device *device,
uint8_t bdaddr_type)
@@ -6445,8 +6492,10 @@ static void adapter_remove(struct btd_adapter *adapter)
g_slist_free(adapter->connect_list);
adapter->connect_list = NULL;
- for (l = adapter->devices; l; l = l->next)
+ for (l = adapter->devices; l; l = l->next) {
+ device_removed_drivers(adapter, l->data);
device_remove(l->data, FALSE);
+ }
g_slist_free(adapter->devices);
adapter->devices = NULL;
diff --git a/src/adapter.h b/src/adapter.h
index 7cac51451249..a2567330ddc9 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -111,6 +111,10 @@ struct btd_adapter_driver {
int (*probe) (struct btd_adapter *adapter);
void (*remove) (struct btd_adapter *adapter);
void (*resume) (struct btd_adapter *adapter);
+ void (*device_added) (struct btd_adapter *adapter,
+ struct btd_device *device);
+ void (*device_removed) (struct btd_adapter *adapter,
+ struct btd_device *device);
};
typedef void (*service_auth_cb) (DBusError *derr, void *user_data);
--
2.32.0.554.ge1b32706d8-goog