diff --git a/doc/settings-storage.txt b/doc/settings-storage.txt
index e7ba89d..a43b7af 100644
--- a/doc/settings-storage.txt
+++ b/doc/settings-storage.txt
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 0a3297e..15db015 100644
--- a/src/adapter.c
+++ b/src/adapter.c
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);
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",
GKeyFile *key_file;
char filename[PATH_MAX + 1];
char address[18];
- gboolean powered;
GError *gerr = NULL;
ba2str(&adapter->bdaddr, address);
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,
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 bfbe821..1c3af7d 100644
--- a/src/hcid.h
+++ b/src/hcid.h
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 af590c2..bb4fce1 100644
--- a/src/main.c
+++ b/src/main.c
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);
{
/* 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 aa59c82..97b4519 100644
--- a/src/main.conf
+++ b/src/main.conf
# 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 f82596b..bac9efd 100644
--- a/src/rfkill.c
+++ b/src/rfkill.c
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");