From: Mikel Astiz <mikel.astiz.oss@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Mikel Astiz <mikel.astiz@bmw-carit.de>
Subject: [RFC v1 03/16] manager: Extend FindAdapter with "default" pattern
Date: Thu, 15 Nov 2012 16:09:06 +0100 [thread overview]
Message-ID: <1352992159-11559-4-git-send-email-mikel.astiz.oss@gmail.com> (raw)
In-Reply-To: <1352992159-11559-1-git-send-email-mikel.astiz.oss@gmail.com>
From: Mikel Astiz <mikel.astiz@bmw-carit.de>
Extend the supported values in the given pattern in order to return the
default adapter if "default" is given.
---
doc/manager-api.txt | 1 +
src/manager.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/doc/manager-api.txt b/doc/manager-api.txt
index 8497141..b0d534d 100644
--- a/doc/manager-api.txt
+++ b/doc/manager-api.txt
@@ -27,6 +27,7 @@ Object path /
patterns are "hci0" or "00:11:22:33:44:55". Other
supported values are:
"any"
+ "default"
Possible errors: org.bluez.Error.InvalidArguments
org.bluez.Error.NoSuchAdapter
diff --git a/src/manager.c b/src/manager.c
index 3088dd9..79d049b 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -110,7 +110,9 @@ static DBusMessage *find_adapter(DBusConnection *conn,
} else if (!strncmp(pattern, "hci", 3) && strlen(pattern) >= 4) {
dev_id = atoi(pattern + 3);
adapter = manager_find_adapter_by_id(dev_id);
- } else {
+ } else if (!strcmp(pattern, "default"))
+ adapter = manager_find_adapter_by_id(default_adapter_id);
+ else {
bdaddr_t bdaddr;
str2ba(pattern, &bdaddr);
adapter = manager_find_adapter(&bdaddr);
--
1.7.11.7
next prev parent reply other threads:[~2012-11-15 15:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-15 15:09 [RFC v1 00/16] Manager/Adapter transition to ObjectManager Mikel Astiz
2012-11-15 15:09 ` [RFC v1 01/16] cups: Remove unnecessary code Mikel Astiz
2012-11-15 15:09 ` [RFC v1 02/16] doc: Add missing documentation in FindAdapter Mikel Astiz
2012-11-15 15:09 ` Mikel Astiz [this message]
2012-11-16 13:29 ` [RFC v1 03/16] manager: Extend FindAdapter with "default" pattern Luiz Augusto von Dentz
2012-11-15 15:09 ` [RFC v1 04/16] test: Avoid using DefaultAdapter() Mikel Astiz
2012-11-15 15:09 ` [RFC v1 05/16] manager: Move org.bluez.Manager to org/bluez Mikel Astiz
2012-11-15 15:09 ` [RFC v1 06/16] test: Update to new Manager path Mikel Astiz
2012-11-15 15:09 ` [RFC v1 07/16] test: Update monitor script to ObjectManager Mikel Astiz
2012-11-15 15:09 ` [RFC v1 08/16] manager: Expose default adapter using property Mikel Astiz
2012-11-15 15:09 ` [RFC v1 09/16] test: Update test-manager script to ObjectManager Mikel Astiz
2012-11-15 15:09 ` [RFC v1 10/16] manager: Remove AdapterAdded/AdapterRemoved signals Mikel Astiz
2012-11-15 15:09 ` [RFC v1 11/16] manager: Remove redundant Adapters property Mikel Astiz
2012-11-15 15:09 ` [RFC v1 12/16] test: Use ObjectManager instead of " Mikel Astiz
2012-11-15 15:09 ` [RFC v1 13/16] adapter: Remove DeviceCreated/DeviceRemoved signals Mikel Astiz
2012-11-15 15:09 ` [RFC v1 14/16] adapter: Remove redundant Devices property Mikel Astiz
2012-11-15 15:09 ` [RFC v1 15/16] test: Use ObjectManager instead of " Mikel Astiz
2012-11-15 15:09 ` [RFC v1 16/16] adapter: Remove FindDevice method from D-Bus API Mikel Astiz
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=1352992159-11559-4-git-send-email-mikel.astiz.oss@gmail.com \
--to=mikel.astiz.oss@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=mikel.astiz@bmw-carit.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox