From: Loic Poulain <loic.poulain@intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: marcel@holtmann.org, Loic Poulain <loic.poulain@intel.com>
Subject: [PATCHv3] tools: Add protocol option for btattach utility
Date: Tue, 7 Apr 2015 17:46:50 +0200 [thread overview]
Message-ID: <1428421610-9405-1-git-send-email-loic.poulain@intel.com> (raw)
---
v2: fix removed NULL terminator in option struct
v3: struct fields swapping + coding style
tools/btattach.c | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 45 insertions(+), 9 deletions(-)
diff --git a/tools/btattach.c b/tools/btattach.c
index b7948a3..a9b892f 100644
--- a/tools/btattach.c
+++ b/tools/btattach.c
@@ -187,28 +187,45 @@ static void usage(void)
printf("options:\n"
"\t-B, --bredr <device> Attach BR/EDR controller\n"
"\t-A, --amp <device> Attach AMP controller\n"
+ "\t-P, --protocol <proto> Specify protocol type\n"
"\t-h, --help Show help options\n");
}
static const struct option main_options[] = {
- { "bredr", required_argument, NULL, 'B' },
- { "amp", required_argument, NULL, 'A' },
- { "version", no_argument, NULL, 'v' },
- { "help", no_argument, NULL, 'h' },
+ { "bredr", required_argument, NULL, 'B' },
+ { "amp", required_argument, NULL, 'A' },
+ { "protocol", required_argument, NULL, 'P' },
+ { "version", no_argument, NULL, 'v' },
+ { "help", no_argument, NULL, 'h' },
+ { }
+};
+
+static const struct {
+ const char *name;
+ unsigned int id;
+} proto_table[] = {
+ { "h4", HCI_UART_H4 },
+ { "bcsp", HCI_UART_BCSP },
+ { "3wire", HCI_UART_3WIRE },
+ { "h4ds", HCI_UART_H4DS },
+ { "ll", HCI_UART_LL },
+ { "ath3k", HCI_UART_ATH3K },
+ { "intel", HCI_UART_INTEL },
+ { "bcm", HCI_UART_BCM },
{ }
};
int main(int argc, char *argv[])
{
- const char *bredr_path = NULL, *amp_path = NULL;
+ const char *bredr_path = NULL, *amp_path = NULL, *proto = NULL;
bool raw_device = false;
sigset_t mask;
- int exit_status, count = 0;
+ int exit_status, count = 0, proto_id = HCI_UART_H4;
for (;;) {
int opt;
- opt = getopt_long(argc, argv, "B:A:Rvh",
+ opt = getopt_long(argc, argv, "B:A:P:Rvh",
main_options, NULL);
if (opt < 0)
break;
@@ -220,6 +237,9 @@ int main(int argc, char *argv[])
case 'A':
amp_path = optarg;
break;
+ case 'P':
+ proto = optarg;
+ break;
case 'R':
raw_device = true;
break;
@@ -247,6 +267,22 @@ int main(int argc, char *argv[])
mainloop_set_signal(&mask, signal_callback, NULL, NULL);
+ if (proto) {
+ unsigned int i;
+
+ for (i = 0; proto_table[i].name; i++) {
+ if (!strcmp(proto_table[i].name, proto)) {
+ proto_id = proto_table[i].id;
+ break;
+ }
+ }
+
+ if (!proto_table[i].name) {
+ fprintf(stderr, "Invalid protocol\n");
+ return EXIT_FAILURE;
+ }
+ }
+
if (bredr_path) {
unsigned long flags;
int fd;
@@ -258,7 +294,7 @@ int main(int argc, char *argv[])
if (raw_device)
flags = (1 << HCI_UART_RAW_DEVICE);
- fd = attach_proto(bredr_path, HCI_UART_H4, flags);
+ fd = attach_proto(bredr_path, proto_id, flags);
if (fd >= 0) {
mainloop_add_fd(fd, 0, uart_callback, NULL, NULL);
count++;
@@ -277,7 +313,7 @@ int main(int argc, char *argv[])
if (raw_device)
flags = (1 << HCI_UART_RAW_DEVICE);
- fd = attach_proto(amp_path, HCI_UART_H4, flags);
+ fd = attach_proto(amp_path, proto_id, flags);
if (fd >= 0) {
mainloop_add_fd(fd, 0, uart_callback, NULL, NULL);
count++;
--
1.9.1
next reply other threads:[~2015-04-07 15:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-07 15:46 Loic Poulain [this message]
2015-04-07 15:50 ` [PATCHv3] tools: Add protocol option for btattach utility Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428421610-9405-1-git-send-email-loic.poulain@intel.com \
--to=loic.poulain@intel.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=marcel@holtmann.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.