summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Takahasi <claudio.takahasi@openbossa.org>2010-10-26 16:35:26 -0300
committerClaudio Takahasi <claudio.takahasi@openbossa.org>2010-10-26 19:05:19 -0300
commit5515a8de9ba7125406ae1030d7d1c343bd6560b0 (patch)
treeeb4081f7e4fe411c9afe6d1feba74858b30abc31
parent0948c4c0e87f2a4179320e903123acbb296935f6 (diff)
Move HCID_DEFAULT_DISCOVERABLE_TIMEOUT declaration to main.c
-rw-r--r--src/hcid.h2
-rw-r--r--src/main.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/hcid.h b/src/hcid.h
index 977b2e6f..55ba12b4 100644
--- a/src/hcid.h
+++ b/src/hcid.h
@@ -42,8 +42,6 @@
#define MODE_LIMITED 0x03
#define MODE_UNKNOWN 0xff
-#define HCID_DEFAULT_DISCOVERABLE_TIMEOUT 180 /* 3 minutes */
-
/* Timeout for hci_send_req (milliseconds) */
#define HCI_REQ_TIMEOUT 5000
diff --git a/src/main.c b/src/main.c
index d0e4e584..5460c320 100644
--- a/src/main.c
+++ b/src/main.c
@@ -67,6 +67,8 @@
#define LAST_ADAPTER_EXIT_TIMEOUT 30
+#define DEFAULT_DISCOVERABLE_TIMEOUT 180 /* 3 minutes */
+
struct main_opts main_opts;
static GKeyFile *load_config(const char *file)
@@ -233,7 +235,7 @@ static void init_defaults(void)
main_opts.scan = SCAN_PAGE;
main_opts.mode = MODE_CONNECTABLE;
main_opts.name = g_strdup("BlueZ");
- main_opts.discovto = HCID_DEFAULT_DISCOVERABLE_TIMEOUT;
+ main_opts.discovto = DEFAULT_DISCOVERABLE_TIMEOUT;
main_opts.remember_powered = TRUE;
main_opts.reverse_sdp = TRUE;
main_opts.name_resolv = TRUE;