From: "Frédéric Danis" <frederic.danis@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v5 06/15] adapter: Read pairable timeout in storage at init
Date: Thu, 18 Oct 2012 11:00:49 +0200 [thread overview]
Message-ID: <1350550858-12239-7-git-send-email-frederic.danis@linux.intel.com> (raw)
In-Reply-To: <1350550858-12239-1-git-send-email-frederic.danis@linux.intel.com>
---
src/adapter.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 74c36ec..6d2aadc 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2117,16 +2117,6 @@ static int get_discoverable_timeout(const char *src)
return main_opts.discovto;
}
-static int get_pairable_timeout(const char *src)
-{
- int timeout;
-
- if (read_pairable_timeout(src, &timeout) == 0)
- return timeout;
-
- return main_opts.pairto;
-}
-
static void set_auto_connect(gpointer data, gpointer user_data)
{
struct btd_device *device = data;
@@ -2253,7 +2243,6 @@ void btd_adapter_start(struct btd_adapter *adapter)
adapter->off_requested = FALSE;
adapter->up = TRUE;
adapter->discov_timeout = get_discoverable_timeout(address);
- adapter->pairable_timeout = get_pairable_timeout(address);
adapter->off_timer = 0;
if (adapter->scan_mode & SCAN_INQUIRY)
@@ -2502,6 +2491,10 @@ static void load_config(struct btd_adapter *adapter)
{
char name[MAX_NAME_LENGTH + 1];
uint8_t class[3];
+ char address[18];
+ int timeout;
+
+ ba2str(&adapter->bdaddr, address);
/* Get name */
if (read_local_name(&adapter->bdaddr, name) < 0)
@@ -2519,6 +2512,12 @@ static void load_config(struct btd_adapter *adapter)
/* Get pairable mode */
if (read_device_pairable(&adapter->bdaddr, &adapter->pairable) < 0)
adapter->pairable = TRUE;
+
+ /* Get pairable timeout */
+ if (read_pairable_timeout(address, &timeout) < 0)
+ adapter->pairable_timeout = main_opts.pairto;
+ else
+ adapter->pairable_timeout = timeout;
}
gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
--
1.7.9.5
next prev parent reply other threads:[~2012-10-18 9:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-18 9:00 [PATCH v5 00/15] Move storage config and names files to ini-file format Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 01/15] doc: Add settings storage documentation Frédéric Danis
2012-10-18 14:02 ` Daniel Wagner
2012-10-18 14:31 ` Frederic Danis
2012-10-18 9:00 ` [PATCH v5 02/15] adapter: Read name in storage at init Frédéric Danis
2012-10-18 14:04 ` Daniel Wagner
2012-10-18 14:41 ` Frederic Danis
2012-10-18 9:00 ` [PATCH v5 03/15] adaptername: Retrieve config name from adapter Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 04/15] adapter: Read device class in storage at init Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 05/15] adapter: Move pairable read to load_config() Frédéric Danis
2012-10-18 9:00 ` Frédéric Danis [this message]
2012-10-18 9:00 ` [PATCH v5 07/15] adapter: Read discoverable timeout in storage at init Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 08/15] adapter: Read mode " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 09/15] adapter: Move saved config to ini-file format Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 10/15] TODO: Add entry to remove storage convertion function Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 11/15] adapter: Move storage names to cache directory Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 12/15] device: Retrieve name from " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 13/15] dbusoob: Store device name in " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 14/15] input: Retrieve device name from " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 15/15] hcitool: Retrieve names " Frédéric Danis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350550858-12239-7-git-send-email-frederic.danis@linux.intel.com \
--to=frederic.danis@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).