2013-11-06 15:08:49

by Lukasz Rymanowski

Subject: [PATCH 1/2] android: Change name for get_disc_timeout

Change name to get_discoverable_timeout. Previous name could be
confusing with disconnection timeout.
---
android/adapter.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/adapter.c b/android/adapter.c
index cf5edcd..1d462c8 100644
--- a/android/adapter.c
+++ b/android/adapter.c
@@ -1284,7 +1284,7 @@ static bool get_devices(void)
return false;
}

-static bool get_disc_timeout(void)
+static bool get_discoverable_timeout(void)
{
DBG("Not implemented");

@@ -1316,7 +1316,7 @@ static bool get_property(void *buf, uint16_t len)
case HAL_PROP_ADAPTER_BONDED_DEVICES:
return get_devices();
case HAL_PROP_ADAPTER_DISC_TIMEOUT:
- return get_disc_timeout();
+ return get_discoverable_timeout();
default:
return false;
}
@@ -1332,7 +1332,7 @@ static void get_properties(void)
get_service();
get_scan_mode();
get_devices();
- get_disc_timeout();
+ get_discoverable_timeout();
}

static bool start_discovery(void)
--
1.8.4

2013-11-07 08:09:14

by Johan Hedberg

Subject: Re: [PATCH 1/2] android: Change name for get_disc_timeout

Hi Lukasz,

On Wed, Nov 06, 2013, Lukasz Rymanowski wrote:
> Change name to get_discoverable_timeout. Previous name could be
> confusing with disconnection timeout.
> ---
> android/adapter.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)

This patch has been applied. Thanks.

Johan

2013-11-06 15:08:50

by Lukasz Rymanowski

Subject: [PATCH 2/2] android: Add set/get for discovery timeout

Android handles discoverable timeout in Settings app, however still
expects BT stack to maintain this value so we should do it as well.
Otherwise we will get some unexpected behaviour.
For now we keep discovery_timeout only during runtime, but we need to move
it to some local storage once we will have it.

Note: That since Android Settings up handles timer there is no reason to
use discovery timer we have in kernel.
---
android/adapter.c | 38 +++++++++++++++++++++++++++++++++++---
1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/android/adapter.c b/android/adapter.c
index 1d462c8..d97f34b 100644
--- a/android/adapter.c
+++ b/android/adapter.c
@@ -47,6 +47,8 @@

/* Default to DisplayYesNo */
#define DEFAULT_IO_CAPABILITY 0x01
+/* Default discoverable timeout 120sec as in Android */
+#define DEFAULT_DISCOVERABLE_TIMEOUT 120

static GIOChannel *notification_io = NULL;
/* This list contains addresses which are asked for records */
@@ -67,6 +69,7 @@ struct bt_adapter {
uint32_t current_settings;

bool discovering;
+ uint32_t discoverable_timeout;
};

struct browse_req {
@@ -1101,6 +1104,17 @@ static uint8_t set_adapter_name(uint8_t *name, uint16_t len)
return HAL_STATUS_FAILED;
}

+static uint8_t set_discoverable_timeout(uint8_t *timeout)
+{
+ /* Android handles discoverable timeout in Settings app.
+ * There is no need to use kernel feature for that.
+ * Just need to store this value here */
+
+ /* TODO: This should be in some storage */
+ memcpy(&adapter->discoverable_timeout, timeout, sizeof(uint32_t));
+
+ return HAL_STATUS_SUCCESS;
+}
static void read_info_complete(uint8_t status, uint16_t length, const void *param,
void *user_data)
{
@@ -1169,6 +1183,8 @@ void bt_adapter_init(uint16_t index, struct mgmt *mgmt, bt_adapter_ready cb)
adapter->index = index;
adapter->discovering = false;
adapter->ready = cb;
+ /* TODO: Read it from some storage */
+ adapter->discoverable_timeout = DEFAULT_DISCOVERABLE_TIMEOUT;

if (mgmt_send(mgmt, MGMT_OP_READ_INFO, index, 0, NULL,
read_info_complete, NULL, NULL) > 0)
@@ -1286,11 +1302,26 @@ static bool get_devices(void)

static bool get_discoverable_timeout(void)
{
- DBG("Not implemented");
+ struct hal_ev_adapter_props_changed *ev;
+ int len;

- /* TODO: Add implementation */
+ len = sizeof(*ev) + sizeof(struct hal_property) + sizeof(uint32_t);

- return false;
+ ev = g_malloc(len);
+
+ ev->num_props = 1;
+ ev->status = HAL_STATUS_SUCCESS;
+
+ ev->props[0].type = HAL_PROP_ADAPTER_DISC_TIMEOUT;
+ ev->props[0].len = sizeof(uint32_t);
+ memcpy(&ev->props[0].val, &adapter->discoverable_timeout, sizeof(uint32_t));
+
+ ipc_send(notification_io, HAL_SERVICE_ID_BLUETOOTH,
+ HAL_EV_ADAPTER_PROPS_CHANGED, len, ev, -1);
+
+ g_free(ev);
+
+ return true;
}

static bool get_property(void *buf, uint16_t len)
@@ -1441,6 +1472,7 @@ static uint8_t set_property(void *buf, uint16_t len)
case HAL_PROP_ADAPTER_NAME:
return set_adapter_name(cmd->val, cmd->len);
case HAL_PROP_ADAPTER_DISC_TIMEOUT:
+ return set_discoverable_timeout(cmd->val);
default:
DBG("Unhandled property type 0x%x", cmd->type);
return HAL_STATUS_FAILED;
--
1.8.4