From 0f575386a54382b63a1aa8e90589917747ee1a79 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 13 Dec 2012 16:35:30 +0200 Subject: [PATCH] core: Remove persistent storing of the powered state --- doc/settings-storage.txt | 2 -- src/adapter.c | 26 +------------------------- src/hcid.h | 1 - src/main.c | 19 +------------------ src/main.conf | 7 ------- src/rfkill.c | 3 --- 6 files changed, 2 insertions(+), 56 deletions(-) diff --git a/doc/settings-storage.txt b/doc/settings-storage.txt index e7ba89df5..a43b7aff4 100644 --- a/doc/settings-storage.txt +++ b/doc/settings-storage.txt @@ -63,8 +63,6 @@ Settings file contains one [General] group with adapter info like: Pairable Boolean Can the adapter accept pairing request ? - Powered Boolean Is the adapter powered ? - PairableTimeout Integer How long to stay in pairable mode before going back to non-pairable. The value is in seconds. diff --git a/src/adapter.c b/src/adapter.c index 0a3297e73..15db015f2 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -224,9 +224,6 @@ static void store_adapter_info(struct btd_adapter *adapter) g_key_file_set_string(key_file, "General", "Name", adapter->name); - g_key_file_set_boolean(key_file, "General", "Powered", - adapter->mode > MODE_OFF); - g_key_file_set_boolean(key_file, "General", "Pairable", adapter->pairable); @@ -2716,12 +2713,6 @@ static void convert_config(struct btd_adapter *adapter, const char *filename, g_key_file_set_integer(key_file, "General", "DiscoverableTimeout", timeout); - if (read_device_mode(address, str, sizeof(str)) == 0) { - mode = get_mode(str); - g_key_file_set_boolean(key_file, "General", "Powered", - mode > MODE_OFF); - } - if (read_on_mode(address, str, sizeof(str)) == 0) { mode = get_mode(str); g_key_file_set_boolean(key_file, "General", "Discoverable", @@ -2742,7 +2733,6 @@ static void load_config(struct btd_adapter *adapter) GKeyFile *key_file; char filename[PATH_MAX + 1]; char address[18]; - gboolean powered; GError *gerr = NULL; ba2str(&adapter->bdaddr, address); @@ -2798,18 +2788,7 @@ static void load_config(struct btd_adapter *adapter) gerr = NULL; } - /* Get powered mode */ - powered = g_key_file_get_boolean(key_file, "General", "Powered", - &gerr); - if (gerr) { - adapter->mode = main_opts.mode; - g_error_free(gerr); - gerr = NULL; - } else if (powered) { - adapter->mode = adapter->discoverable ? MODE_DISCOVERABLE : - MODE_CONNECTABLE; - } else - adapter->mode = MODE_OFF; + adapter->mode = main_opts.mode; mgmt_set_connectable(adapter->dev_id, TRUE); mgmt_set_discoverable(adapter->dev_id, adapter->discoverable, @@ -3491,9 +3470,6 @@ void btd_adapter_any_release_path(void) int btd_adapter_restore_powered(struct btd_adapter *adapter) { - if (!main_opts.remember_powered) - return -EINVAL; - if (adapter->up) return 0; diff --git a/src/hcid.h b/src/hcid.h index bfbe821e3..1c3af7d2b 100644 --- a/src/hcid.h +++ b/src/hcid.h @@ -34,7 +34,6 @@ struct main_opts { uint32_t pairto; uint16_t link_mode; uint16_t link_policy; - gboolean remember_powered; gboolean reverse_sdp; gboolean name_resolv; gboolean debug_keys; diff --git a/src/main.c b/src/main.c index af590c2a8..bb4fce1f3 100644 --- a/src/main.c +++ b/src/main.c @@ -188,22 +188,6 @@ static void parse_config(GKeyFile *config) g_free(str); } - boolean = g_key_file_get_boolean(config, "General", - "InitiallyPowered", &err); - if (err) { - DBG("%s", err->message); - g_clear_error(&err); - } else if (boolean == FALSE) - main_opts.mode = MODE_OFF; - - boolean = g_key_file_get_boolean(config, "General", - "RememberPowered", &err); - if (err) { - DBG("%s", err->message); - g_clear_error(&err); - } else - main_opts.remember_powered = boolean; - str = g_key_file_get_string(config, "General", "DeviceID", &err); if (err) { DBG("%s", err->message); @@ -246,11 +230,10 @@ static void init_defaults(void) { /* Default HCId settings */ memset(&main_opts, 0, sizeof(main_opts)); - main_opts.mode = MODE_CONNECTABLE; + main_opts.mode = MODE_OFF; main_opts.name = g_strdup("BlueZ"); main_opts.discovto = DEFAULT_DISCOVERABLE_TIMEOUT; main_opts.autoto = DEFAULT_AUTO_CONNECT_TIMEOUT; - main_opts.remember_powered = TRUE; main_opts.reverse_sdp = TRUE; main_opts.name_resolv = TRUE; diff --git a/src/main.conf b/src/main.conf index aa59c824a..97b451982 100644 --- a/src/main.conf +++ b/src/main.conf @@ -32,13 +32,6 @@ PageTimeout = 8192 # intends to be used to establish connections to ATT channels. AutoConnectTimeout = 60 -# What value should be assumed for the adapter Powered property when -# SetProperty(Powered, ...) hasn't been called yet. Defaults to true -InitiallyPowered = true - -# Remember the previously stored Powered state when initializing adapters -RememberPowered = true - # Use vendor id source (assigner), vendor, product and version information for # DID profile support. The values are separated by ":" and assigner, VID, PID # and version. diff --git a/src/rfkill.c b/src/rfkill.c index f82596b51..bac9efd66 100644 --- a/src/rfkill.c +++ b/src/rfkill.c @@ -146,9 +146,6 @@ void rfkill_init(void) int fd; GIOChannel *channel; - if (!main_opts.remember_powered) - return; - fd = open("/dev/rfkill", O_RDWR); if (fd < 0) { error("Failed to open RFKILL control device"); -- 2.47.3