Diff between 68b42ae96a3580fe0e4650d504f47e79f4c49021 and 0f575386a54382b63a1aa8e90589917747ee1a79

Changed Files

File Additions Deletions Status
doc/settings-storage.txt +0 -2 modified
src/adapter.c +1 -25 modified
src/hcid.h +0 -1 modified
src/main.c +1 -18 modified
src/main.conf +0 -7 modified
src/rfkill.c +0 -3 modified

Full Patch

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
@@ -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 0a3297e..15db015 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 bfbe821..1c3af7d 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 af590c2..bb4fce1 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 aa59c82..97b4519 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 f82596b..bac9efd 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");