From: Bastien Nocera <hadess@hadess.net>
To: linux-bluetooth@vger.kernel.org
Cc: Bastien Nocera <hadess@hadess.net>
Subject: [PATCH v2 10/11] plugins/sixaxis: Add cable pairing for PS3 Keypads
Date: Wed, 18 Oct 2017 03:58:14 +0200 [thread overview]
Message-ID: <20171018015815.10045-10-hadess@hadess.net> (raw)
In-Reply-To: <20171018015815.10045-1-hadess@hadess.net>
As documented in qtsixa's sixpair_kbd.c, from unknown origin:
https://github.com/falkTX/qtsixa/blob/master/utils/sixpair_kbd.c
---
plugins/sixaxis.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 67 insertions(+), 1 deletion(-)
diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
index a05e95c1f..a2946f864 100644
--- a/plugins/sixaxis.c
+++ b/plugins/sixaxis.c
@@ -127,10 +127,33 @@ static int ds4_get_device_bdaddr(int fd, bdaddr_t *bdaddr)
return 0;
}
+static int ps3_keypad_get_device_bdaddr(int fd, bdaddr_t *bdaddr)
+{
+ uint8_t buf[16];
+ int ret;
+
+ memset(buf, 0, sizeof(buf));
+
+ buf[0] = 0x4;
+
+ ret = ioctl(fd, HIDIOCGFEATURE(sizeof(buf)), buf);
+ if (ret < 0) {
+ error("sixaxis: failed to read device address (%s)",
+ strerror(errno));
+ return ret;
+ }
+
+ baswap(bdaddr, (bdaddr_t *) (buf + 1));
+
+ return 0;
+}
+
static int get_device_bdaddr(int fd, bdaddr_t *bdaddr, CablePairingType type)
{
if (type == CABLE_PAIRING_SIXAXIS)
return sixaxis_get_device_bdaddr(fd, bdaddr);
+ else if (type == CABLE_PAIRING_PS3_WIRELESS_KEYPAD)
+ return ps3_keypad_get_device_bdaddr(fd, bdaddr);
else if (type == CABLE_PAIRING_DS4)
return ds4_get_device_bdaddr(fd, bdaddr);
return -1;
@@ -179,10 +202,33 @@ static int ds4_get_master_bdaddr(int fd, bdaddr_t *bdaddr)
return 0;
}
+static int ps3_keypad_get_master_bdaddr(int fd, bdaddr_t *bdaddr)
+{
+ uint8_t buf[16];
+ int ret;
+
+ memset(buf, 0, sizeof(buf));
+
+ buf[0] = 0x4;
+
+ ret = ioctl(fd, HIDIOCGFEATURE(sizeof(buf)), buf);
+ if (ret < 0) {
+ error("sixaxis: failed to read master address (%s)",
+ strerror(errno));
+ return ret;
+ }
+
+ bacpy(bdaddr, (bdaddr_t *) (buf + 10));
+
+ return 0;
+}
+
static int get_master_bdaddr(int fd, bdaddr_t *bdaddr, CablePairingType type)
{
if (type == CABLE_PAIRING_SIXAXIS)
return sixaxis_get_master_bdaddr(fd, bdaddr);
+ else if (type == CABLE_PAIRING_PS3_WIRELESS_KEYPAD)
+ return ps3_keypad_get_master_bdaddr(fd, bdaddr);
else if (type == CABLE_PAIRING_DS4)
return ds4_get_master_bdaddr(fd, bdaddr);
return -1;
@@ -226,11 +272,30 @@ static int ds4_set_master_bdaddr(int fd, const bdaddr_t *bdaddr)
return ret;
}
+static int ps3_keypad_set_master_bdaddr(int fd, const bdaddr_t *bdaddr)
+{
+ uint8_t buf[7];
+ int ret;
+
+ buf[0] = 0x05;
+
+ baswap((bdaddr_t*) (buf + 1), bdaddr);
+
+ ret = ioctl(fd, HIDIOCSFEATURE(sizeof(buf)), buf);
+ if (ret < 0)
+ error("sixaxis: failed to write PS3 Keypad master address (%s)",
+ strerror(errno));
+
+ return ret;
+}
+
static int set_master_bdaddr(int fd, const bdaddr_t *bdaddr,
CablePairingType type)
{
if (type == CABLE_PAIRING_SIXAXIS)
return sixaxis_set_master_bdaddr(fd, bdaddr);
+ else if (type == CABLE_PAIRING_PS3_WIRELESS_KEYPAD)
+ return ps3_keypad_set_master_bdaddr(fd, bdaddr);
else if (type == CABLE_PAIRING_DS4)
return ds4_set_master_bdaddr(fd, bdaddr);
return -1;
@@ -424,7 +489,8 @@ static void device_added(struct udev_device *udevice)
&source,
&version);
if (type != CABLE_PAIRING_SIXAXIS &&
- type != CABLE_PAIRING_DS4)
+ type != CABLE_PAIRING_DS4 &&
+ type != CABLE_PAIRING_PS3_WIRELESS_KEYPAD)
return;
if (bus != BUS_USB)
return;
--
2.14.2
next prev parent reply other threads:[~2017-10-18 1:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-18 1:58 [PATCH v2 01/11] adapter: Add btd_request_authorization_cable_configured() Bastien Nocera
2017-10-18 1:58 ` [PATCH v2 02/11] sixaxis: Ask user whether cable configuration should be allowed Bastien Nocera
2017-10-18 1:58 ` [PATCH v2 03/11] plugins/sixaxis: Move device discovery to shared header Bastien Nocera
2017-10-18 1:58 ` [PATCH v2 04/11] profiles/input: Use sixaxis header to simplify device detection Bastien Nocera
2017-10-18 1:58 ` [PATCH v2 05/11] profiles/input: Add DS4 devices to the shared header Bastien Nocera
2017-10-18 1:58 ` [PATCH v2 06/11] plugins/sixaxis: Rename sixaxis specific functions Bastien Nocera
2017-10-18 1:58 ` [PATCH v2 07/11] plugins/sixaxis: Add support for DualShock 4/PS4 cable pairing Bastien Nocera
2017-10-18 1:58 ` [PATCH v2 08/11] plugins/sixaxis: Cancel cable pairing if unplugged Bastien Nocera
2017-10-18 1:58 ` [PATCH v2 09/11] profiles/input: Add support for detecting PS3 Keypads Bastien Nocera
2017-10-18 1:58 ` Bastien Nocera [this message]
2017-10-18 1:58 ` [PATCH v2 11/11] plugins/autopair: Don't try to pair PS3 Keypad Bastien Nocera
2017-10-27 8:00 ` [PATCH v2 01/11] adapter: Add btd_request_authorization_cable_configured() Szymon Janc
2017-10-27 11:34 ` Bastien Nocera
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=20171018015815.10045-10-hadess@hadess.net \
--to=hadess@hadess.net \
--cc=linux-bluetooth@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).