From 28727a872aa877dadd27ab150262df557d48f704 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 10 Dec 2012 13:43:29 +0200 Subject: [PATCH] core: Remove unused adapter powered callbacks feature --- src/adapter.c | 41 ----------------------------------------- src/adapter.h | 7 ------- 2 files changed, 48 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index b7dd58899..4437051cd 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -171,7 +171,6 @@ struct btd_adapter { guint off_timer; - GSList *powered_callbacks; GSList *pin_callbacks; GSList *drivers; @@ -2052,28 +2051,6 @@ static void load_connections(struct btd_adapter *adapter) g_slist_free_full(conns, g_free); } -static void set_auto_connect(gpointer data, gpointer user_data) -{ - struct btd_device *device = data; - gboolean *enable = user_data; - - device_set_auto_connect(device, *enable); -} - -static void call_adapter_powered_callbacks(struct btd_adapter *adapter, - gboolean powered) -{ - GSList *l; - - for (l = adapter->powered_callbacks; l; l = l->next) { - btd_adapter_powered_cb cb = l->data; - - cb(adapter, powered); - } - - g_slist_foreach(adapter->devices, set_auto_connect, &powered); -} - void btd_adapter_get_mode(struct btd_adapter *adapter, uint8_t *mode, uint16_t *discoverable_timeout, gboolean *pairable) @@ -2173,8 +2150,6 @@ void btd_adapter_start(struct btd_adapter *adapter) g_dbus_emit_property_changed(btd_get_dbus_connection(), adapter->path, ADAPTER_INTERFACE, "Powered"); - call_adapter_powered_callbacks(adapter, TRUE); - info("Adapter %s has been enabled", adapter->path); if (g_slist_length(adapter->connect_list) == 0 || @@ -2336,8 +2311,6 @@ int btd_adapter_stop(struct btd_adapter *adapter) g_dbus_emit_property_changed(conn, adapter->path, ADAPTER_INTERFACE, "Powered"); - call_adapter_powered_callbacks(adapter, FALSE); - info("Adapter %s has been disabled", adapter->path); set_mode_complete(adapter); @@ -3572,20 +3545,6 @@ ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, pin_buf); } -void btd_adapter_register_powered_callback(struct btd_adapter *adapter, - btd_adapter_powered_cb cb) -{ - adapter->powered_callbacks = - g_slist_append(adapter->powered_callbacks, cb); -} - -void btd_adapter_unregister_powered_callback(struct btd_adapter *adapter, - btd_adapter_powered_cb cb) -{ - adapter->powered_callbacks = - g_slist_remove(adapter->powered_callbacks, cb); -} - int btd_adapter_set_fast_connectable(struct btd_adapter *adapter, gboolean enable) { diff --git a/src/adapter.h b/src/adapter.h index 680cce387..5b46474e3 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -166,13 +166,6 @@ void btd_adapter_unregister_pin_cb(struct btd_adapter *adapter, ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev, char *pin_buf, gboolean *display); -typedef void (*btd_adapter_powered_cb) (struct btd_adapter *adapter, - gboolean powered); -void btd_adapter_register_powered_callback(struct btd_adapter *adapter, - btd_adapter_powered_cb cb); -void btd_adapter_unregister_powered_callback(struct btd_adapter *adapter, - btd_adapter_powered_cb cb); - /* If TRUE, enables fast connectabe, i.e. reduces page scan interval and changes * type. If FALSE, disables fast connectable, i.e. sets page scan interval and * type to default values. Valid for both connectable and discoverable modes. */ -- 2.47.3