diff options
| -rw-r--r-- | hcid/adapter.c | 10 | ||||
| -rw-r--r-- | hcid/dbus-hci.c | 2 | ||||
| -rw-r--r-- | hcid/device.c | 5 | ||||
| -rw-r--r-- | hcid/device.h | 1 |
4 files changed, 12 insertions, 6 deletions
diff --git a/hcid/adapter.c b/hcid/adapter.c index 60f3a58f..6f501713 100644 --- a/hcid/adapter.c +++ b/hcid/adapter.c @@ -757,7 +757,7 @@ void adapter_remove_device(DBusConnection *conn, struct adapter *adapter, remove_bonding(conn, NULL, destination, adapter); - if (!device->temporary) { + if (!device_is_temporary(device)) { g_dbus_emit_signal(conn, adapter->path, ADAPTER_INTERFACE, "DeviceRemoved", @@ -804,7 +804,7 @@ void remove_pending_device(struct adapter *adapter) if (!device) return; - if (device->temporary) + if (device_is_temporary(device)) adapter_remove_device(adapter->bonding->conn, adapter, device); } @@ -1561,7 +1561,7 @@ static DBusMessage *list_devices(DBusConnection *conn, for (l = adapter->devices; l; l = l->next) { struct device *device = l->data; - if (device->temporary) + if (device_is_temporary(device)) continue; dev_path = device_get_path(device); @@ -1673,7 +1673,7 @@ static DBusMessage *remove_device(DBusConnection *conn, "Device does not exist"); device = l->data; - if (device->temporary || device_is_busy(device)) + if (device_is_temporary(device) || device_is_busy(device)) return g_dbus_create_error(msg, ERROR_INTERFACE ".DoesNotExist", "Device creation in progress"); @@ -1706,7 +1706,7 @@ static DBusMessage *find_device(DBusConnection *conn, device = l->data; - if (device->temporary) + if (device_is_temporary(device)) return g_dbus_create_error(msg, ERROR_INTERFACE ".DoesNotExist", "Device creation in progress"); diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c index 61d64c19..d59a4788 100644 --- a/hcid/dbus-hci.c +++ b/hcid/dbus-hci.c @@ -1904,7 +1904,7 @@ void hcid_dbus_disconn_complete(bdaddr_t *local, uint8_t status, dev_path, DEVICE_INTERFACE, "Connected", DBUS_TYPE_BOOLEAN, &connected); - if (device->temporary) { + if (device_is_temporary(device)) { debug("Removing temporary device %s", destination); adapter_remove_device(connection, adapter, device); } diff --git a/hcid/device.c b/hcid/device.c index 49017707..bf187493 100644 --- a/hcid/device.c +++ b/hcid/device.c @@ -973,6 +973,11 @@ gboolean device_is_busy(struct device *device) return device->discov_active ? TRUE : FALSE; } +gboolean device_is_temporary(struct device *device) +{ + return device->temporary; +} + int btd_register_device_driver(struct btd_device_driver *driver) { const char **uuid; diff --git a/hcid/device.h b/hcid/device.h index d30104ea..3a82cf07 100644 --- a/hcid/device.h +++ b/hcid/device.h @@ -62,6 +62,7 @@ const gchar *device_get_path(struct device *device); struct agent *device_get_agent(struct device *device); void device_set_agent(struct device *device, struct agent *agent); gboolean device_is_busy(struct device *device); +gboolean device_is_temporary(struct device *device); #define BTD_UUIDS(args...) ((const char *[]) { args, NULL } ) |