diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2006-04-19 17:18:16 +0000 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2006-04-19 17:18:16 +0000 |
| commit | 7950cc52aba07e8323ddb275c25c454d4546daeb (patch) | |
| tree | c82b3d3ec3d1a4fe47a8857db1ab7b4b3b1d21cc | |
| parent | 66ee11f572972796398b5cb541398ee754cc0995 (diff) | |
DiscoverableTimeout should be seconds instead of milliseconds
| -rw-r--r-- | hcid/dbus-adapter.c | 2 | ||||
| -rw-r--r-- | hcid/dbus.c | 4 | ||||
| -rw-r--r-- | hcid/hcid.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c index 7c3bcfe9..039b0672 100644 --- a/hcid/dbus-adapter.c +++ b/hcid/dbus-adapter.c @@ -391,7 +391,7 @@ static DBusHandlerResult handle_dev_set_discoverable_to_req(DBusConnection *conn } if ((timeout != 0) && (dbus_data->mode & SCAN_INQUIRY)) - dbus_data->timeout_id = g_timeout_add(timeout, discoverable_timeout_handler, dbus_data); + dbus_data->timeout_id = g_timeout_add(timeout * 1000, discoverable_timeout_handler, dbus_data); dbus_data->discoverable_timeout = timeout; diff --git a/hcid/dbus.c b/hcid/dbus.c index 3f99c272..2b310958 100644 --- a/hcid/dbus.c +++ b/hcid/dbus.c @@ -1681,13 +1681,13 @@ void hcid_dbus_setscan_enable_complete(bdaddr_t *local) case (SCAN_PAGE | SCAN_INQUIRY): scan_mode = MODE_DISCOVERABLE; if (pdata->discoverable_timeout != 0) - pdata->timeout_id = g_timeout_add(pdata->discoverable_timeout, + pdata->timeout_id = g_timeout_add(pdata->discoverable_timeout * 1000, discoverable_timeout_handler, pdata); break; case SCAN_INQUIRY: /* Address the scenario where another app changed the scan mode */ if (pdata->discoverable_timeout != 0) - pdata->timeout_id = g_timeout_add(pdata->discoverable_timeout, + pdata->timeout_id = g_timeout_add(pdata->discoverable_timeout * 1000, discoverable_timeout_handler, pdata); /* ignore, this event should not be sent*/ default: diff --git a/hcid/hcid.h b/hcid/hcid.h index d10bdc0d..672c1c7a 100644 --- a/hcid/hcid.h +++ b/hcid/hcid.h @@ -34,7 +34,7 @@ #define HCID_CONFIG_FILE CONFIGDIR "/hcid.conf" -#define HCID_DEFAULT_DISCOVERABLE_TIMEOUT (180*1000) /* 3 minutes */ +#define HCID_DEFAULT_DISCOVERABLE_TIMEOUT 180 /* 3 minutes */ /* * Scanning modes, used by DEV_SET_MODE |