2014-11-10 09:04:47

by Andrei Emeltchenko

Subject: [PATCH 1/2] android/tester: initialize unused callback to NULL

From: Andrei Emeltchenko <[email protected]>

---
android/tester-main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/tester-main.c b/android/tester-main.c
index 44a2726..33ef3ce 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -1394,7 +1394,8 @@ static bthh_callbacks_t bthh_callbacks = {
.protocol_mode_cb = hidhost_protocol_mode_cb,
.idle_time_cb = NULL,
.get_report_cb = hidhost_get_report_cb,
- .virtual_unplug_cb = hidhost_virtual_unplug_cb
+ .virtual_unplug_cb = hidhost_virtual_unplug_cb,
+ .handshake_cb = NULL,
};

static void gattc_register_client_cb(int status, int client_if,
--
1.9.1

2014-11-10 19:49:52

by Szymon Janc

Subject: Re: [PATCH 1/2] android/tester: initialize unused callback to NULL

Hi Andrei,

On Monday 10 of November 2014 11:04:47 Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> ---
> android/tester-main.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/android/tester-main.c b/android/tester-main.c
> index 44a2726..33ef3ce 100644
> --- a/android/tester-main.c
> +++ b/android/tester-main.c
> @@ -1394,7 +1394,8 @@ static bthh_callbacks_t bthh_callbacks = {
> .protocol_mode_cb = hidhost_protocol_mode_cb,
> .idle_time_cb = NULL,
> .get_report_cb = hidhost_get_report_cb,
> - .virtual_unplug_cb = hidhost_virtual_unplug_cb
> + .virtual_unplug_cb = hidhost_virtual_unplug_cb,
> + .handshake_cb = NULL,
> };
>
> static void gattc_register_client_cb(int status, int client_if,

Both patches applied, thanks.

--
BR
Szymon Janc

2014-11-10 09:04:48

by Andrei Emeltchenko

Subject: [PATCH 2/2] android/client: Fix argument count in create_bond()

From: Andrei Emeltchenko <[email protected]>

---
android/client/if-bt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index 48aff1b..7325242 100644
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -628,7 +628,7 @@ static void create_bond_p(int argc, const char **argv)
VERIFY_ADDR_ARG(2, &addr);

#if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0)
- if (argc < 3)
+ if (argc < 4)
transport = BT_TRANSPORT_UNKNOWN;
else
transport = atoi(argv[3]);
--
1.9.1