2013-11-26 13:47:04

by Andrei Emeltchenko

Subject: [PATCH 1/2] android/haltest: trivial: Fix typo channle -> channel

From: Andrei Emeltchenko <[email protected]>

---
android/client/if-sock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/client/if-sock.c b/android/client/if-sock.c
index eef9a76..12ac755 100644
--- a/android/client/if-sock.c
+++ b/android/client/if-sock.c
@@ -328,9 +328,9 @@ static void connect_p(int argc, const char **argv)
/* Methods available in btsock_interface_t */
static struct method methods[] = {
STD_METHODCH(listen,
- "<sock_type> <srvc_name> <uuid> [<channle>] [<flags>]"),
+ "<sock_type> <srvc_name> <uuid> [<channel>] [<flags>]"),
STD_METHODCH(connect,
- "<addr> <sock_type> <uuid> <channle> [<flags>]"),
+ "<addr> <sock_type> <uuid> <channel> [<flags>]"),
END_METHOD
};

--
1.8.3.2

2013-11-26 15:43:14

by Johan Hedberg

Subject: Re: [PATCH 1/2] android/haltest: trivial: Fix typo channle -> channel

Hi Andrei,

On Tue, Nov 26, 2013, Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> ---
> android/client/if-sock.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Both patches have been applied. Thanks.

Johan

2013-11-26 13:47:05

by Andrei Emeltchenko

Subject: [PATCH 2/2] android/haltest: Add uuid autocompletions

From: Andrei Emeltchenko <[email protected]>

---
android/client/if-sock.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/android/client/if-sock.c b/android/client/if-sock.c
index 12ac755..5394a5d 100644
--- a/android/client/if-sock.c
+++ b/android/client/if-sock.c
@@ -35,6 +35,10 @@ ENDMAP
static int listen_fd[MAX_LISTEN_FD];
static int listen_fd_count;

+static const char * const uuids[] = {
+ "00001101", "00001105", "0000112f", NULL
+};
+
/*
* This function reads data from file descriptor and
* prints it to the user
@@ -193,6 +197,9 @@ static void listen_c(int argc, const char **argv, enum_func *enum_func,
if (argc == 3) {
*user = TYPE_ENUM(btsock_type_t);
*enum_func = enum_defines;
+ } else if (argc == 5) {
+ *user = (void *) uuids;
+ *enum_func = enum_strings;
}
}

@@ -264,6 +271,9 @@ static void connect_c(int argc, const char **argv, enum_func *enum_func,
} else if (argc == 4) {
*user = TYPE_ENUM(btsock_type_t);
*enum_func = enum_defines;
+ } else if (argc == 5) {
+ *user = (void *) uuids;
+ *enum_func = enum_strings;
}
}

--
1.8.3.2