core: Remove DiscoverSchedulerInterval option from main.conf

This option was designed to be the time where name resolving would happen
in between inquiries, but with the introdution of mgmt interface this is
no longer the case as it treats the discovery as both inquiry/scan + name
resolving and keeping it just to delay discovery rounds is probably
useless.

diff --git a/src/adapter.c b/src/adapter.c
index a4180b1..94df0a2 100644 (file)
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2528,11 +2528,10 @@ void adapter_set_discovering(struct btd_adapter *adapter,
        if (!adapter_has_discov_sessions(adapter) || adapter->discov_suspended)
                return;
 
-       DBG("hci%u enabling timer, disc_sessions %u", adapter->dev_id,
+       DBG("hci%u restarting discovery, disc_sessions %u", adapter->dev_id,
                                        g_slist_length(adapter->disc_sessions));
 
-       adapter->discov_id = g_timeout_add_seconds(main_opts.discov_interval,
-                                                       discovery_cb, adapter);
+       adapter->discov_id = g_idle_add(discovery_cb, adapter);
 }
 
 static void suspend_discovery(struct btd_adapter *adapter)

diff --git a/src/hcid.h b/src/hcid.h
index 2c1cbff..1e5e15a 100644 (file)
--- a/src/hcid.h
+++ b/src/hcid.h
@@ -41,7 +41,6 @@ struct main_opts {
        gboolean        gatt_enabled;
 
        uint8_t         mode;
-       uint8_t         discov_interval;
 
        uint16_t        did_source;
        uint16_t        did_vendor;

diff --git a/src/main.c b/src/main.c
index 8763bf9..b062b4a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -190,16 +190,6 @@ static void parse_config(GKeyFile *config)
                g_free(str);
        }
 
-       val = g_key_file_get_integer(config, "General",
-                                       "DiscoverSchedulerInterval", &err);
-       if (err) {
-               DBG("%s", err->message);
-               g_clear_error(&err);
-       } else {
-               DBG("discov_interval=%d", val);
-               main_opts.discov_interval = val;
-       }
-
        boolean = g_key_file_get_boolean(config, "General",
                                                "InitiallyPowered", &err);
        if (err) {

diff --git a/src/main.conf b/src/main.conf
index 3419d07..787ef4f 100644 (file)
--- a/src/main.conf
+++ b/src/main.conf
@@ -26,10 +26,6 @@ PairableTimeout = 0
 # which is 16384 (10 seconds).
 PageTimeout = 8192
 
-# Discover scheduler interval used in Adapter.DiscoverDevices
-# The value is in seconds. Defaults is 30.
-DiscoverSchedulerInterval = 30
-
 # Automatic connection for bonded devices driven by platform/user events.
 # If a platform plugin uses this mechanism, automatic connections will be
 # enabled during the interval defined below. Initially, this feature