LinuxLists.cc - [PATCH BlueZ 0/4] Sixaxis Plugin, almost there?

2011-08-05 14:09:14

Subject: [PATCH BlueZ 0/4] Sixaxis Plugin, almost there?

Hi,

I hope we are getting there, this is another update to the sixaxis plugin.

The first patch is the same as always, removal of old cruft which I think
could go in even right now.

The second patch is the sixaxis plugin with some updates:

- Fixed various style issues (long lines, indentation)
- Fixed some style issue pointed out by checkpatch.pl from linux,
namely it suggested not to initialize static variables.
- Fixed issue pointed out by Vinicius Costa Gomez:
* remove double newlines
* move defines and static variables on the top
* Add a comment about why the timeout is needed in monitor_event()
- Use manager_get_default_adapter_id() as suggested by Bastien
- Make return values more meaningful
- Set the master bdaddr in the controller only when it is different
from the BT adapter bdaddr, this is how the PS3 does it (thanks Jim
for the dumps), perhaps to avoid unnecessary writes to some eeprom.

I left in the calloc() calls for now, maybe later I'll split the plugin
in a sixaxis-specific part and a bluez-specific part, but for now I
think we can live with that. I also left the return codes called "ret"
because they didn't fit the "err" semantic, as I am checking for < 0.

The third patch is about linking UDEV_LIBS only when needed, embedded
people might like this but I was not sure and I left is a separate patch
for an easier review.

The forth patch makes the plugin wait for actual events (that is: PS button
has been pressed) before setting the leds, this is how the PS3 behaves, and
happens to cure the problem of setting the second led when connecting the
controller via USB when it is working over BT already, in fact the controller
keep sending events over BT even after it is connected via USB after
association, and so the USB connection event will not set the second led on
ever. The trick works with one controller, but I think this will mess up
numbering with multiple controller connected in some mixed order. So again
this change is sent in its own patch to be more visible.

For those of you who can't get the plugin to work, please try cleaning
up your /var/lib/bluetooth dir.

NOTES:

- Testing is needed with multiple BT adapters and/or multiple
controllers, but I haven't got the hardware for that yet.

- Arc Riley suggested to use more generic name for the plugin if it is
going to support the Move too, something like "sony-controllers"
maybe, but I don't mind leaving it called sixaxis for historical
reasons (and laziness reasons too), what do you think?

Thanks,
Antonio

Antonio Ospite (4):
Remove input/sixpair.c
Add sixaxis plugin: USB pairing and LEDs settings
Link to udev only when needed
plugins/sixaxis: Wait for the PS button before setting the LEDs

Makefile.am | 11 +-
acinclude.m4 | 10 +
input/sixpair.c | 299 --------------------------
plugins/sixaxis.c | 599 +++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 619 insertions(+), 300 deletions(-)
delete mode 100644 input/sixpair.c
create mode 100644 plugins/sixaxis.c

--
Antonio Ospite
http://ao2.it

PGP public key ID: 0x4553B001

A: Because it messes up the order in which people normally read text.
See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?

2011-08-26 12:49:25

by Antonio Ospite

[permalink] [raw]

Subject: Re: [PATCH BlueZ 3/4] Link to udev only when needed

On Thu, 25 Aug 2011 14:06:21 -0300
Vinicius Costa Gomes <[email protected]> wrote:

[...]
> > > diff --git a/Makefile.am b/Makefile.am
> > > index 4bcff4d..ff33bf0 100644
> > > --- a/Makefile.am
> > > +++ b/Makefile.am
> > > @@ -230,8 +230,10 @@ builtin_sources += thermometer/main.c \
> > > endif
> > >
> > > if SIXAXISPLUGIN
> > > -builtin_modules += sixaxis
> > > -builtin_sources += plugins/sixaxis.c
> > > +plugin_LTLIBRARIES += plugins/sixaxis.la
> > > +plugins_sixaxis_la_SOURCES = plugins/sixaxis.c
> > > +plugins_sixaxis_la_LDFLAGS = -module -avoid-version -no-undefined @UDEV_LIBS@
> > > +plugins_sixaxis_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ @GLIB_CFLAGS@ @UDEV_CFLAGS@
> > > endif
> > >
> >
> > This is not enough, the external plugin can be compiled but I can be used
> > at runtime because it is using functions from src/storage.c and others,
> > which seem to be embedded inside bluetoothd only, so I get:
> >
> > bluetoothd[23459]: Can't load plugin \
> > /home/ao2/Proj/PS3/PS3_sixaxis/bluez/plugins/.libs/playstation-peripheral.so: \
> > /home/ao2/Proj/PS3/PS3_sixaxis/bluez/plugins/.libs/playstation-peripheral.so: \
> > undefined symbol: write_device_name
> >
> > I could link the needed object files like storage.o and company into the
> > plugin binary, but definitely this doesn't look OK. Should a shared library
> > provide those "utility" functions to bluetoothd _and_ external plugins?
> >
> > This plugin is the first non-trivial external plugin I can see in the tree,
> > so maybe this problem has never showed up before.
>
> The problem is the visibility of the symbols, src/bluetooth.ver defines
> which symbols should[1] be visible to plugins. Every plugin should only
> depend on those methods from the "core".
>

Indeed, adding the needed symbols to the linker script makes the plugin
work:

diff --git a/src/bluetooth.ver b/src/bluetooth.ver
index b71c70d..11fcd33 100644
--- a/src/bluetooth.ver
+++ b/src/bluetooth.ver
@@ -5,6 +5,19 @@
info;
error;
debug;
+ manager_get_default_adapter;
+ adapter_get_address;
+ write_device_name;
+ record_from_string;
+ store_record;
+ sdp_record_free;
+ store_device_id;
+ write_trust;
+ dbus_bus_get;
+ adapter_get_device;
+ device_set_temporary;
+ device_set_name;
+ dbus_connection_unref;
local:
*;
};

> If we want to keep the sixaxis plugin external we need to make the
> symbols it need visible, but I wonder if that is right solution.
>

If there was a public API for plugins to use with well defined prefixes,
the linking scripts could use those, I am thinking to something like:
sdp_*;
storage_*;
device_*;
dbus_*;

But you bluez people have to tell me if this is the way to go and if
you are willing to do that, of if I'd better have the plugin builtin for
now.

> [1] Seems that with builtin plugins that visibility enforcement doesn't
> work, right?
>

This seems to be the case indeed, a bluiltin plugin can use any (non
static?) symbol linked in the bluetoothd binary.

Thanks,
Antonio

--
Antonio Ospite
http://ao2.it

PGP public key ID: 0x4553B001

A: Because it messes up the order in which people normally read text.
See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?

Attachments:

(No filename) (3.42 kB)
(No filename) (198.00 B)
Download all attachments

2011-08-25 17:06:21

by Vinicius Costa Gomes

Hi Antonio,

>
> > Don't link bluetoothd to udev unconditionally, but only when it is
> > needed. For now bluetoothd needs to be linked to udev only when the
> > sixaxis plugin is enabled.
>
> Any comment on this change? If it looks OK I'll fold it in v5.
>
> Thanks,
> Antonio
>
> > ---
> > Makefile.am | 6 +++++-
> > 1 files changed, 5 insertions(+), 1 deletions(-)
> >
> > diff --git a/Makefile.am b/Makefile.am
> > index dbe0170..219ca0f 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -288,7 +288,11 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
> > src/event.h src/event.c \
> > src/oob.h src/oob.c src/eir.h src/eir.c
> > src_bluetoothd_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @DBUS_LIBS@ \
> > - @CAPNG_LIBS@ @UDEV_LIBS@ -ldl -lrt
> > + @CAPNG_LIBS@ -ldl -lrt
> > +if SIXAXISPLUGIN
> > +src_bluetoothd_LDADD += @UDEV_LIBS@
> > +endif
> > +
> > src_bluetoothd_LDFLAGS = -Wl,--export-dynamic \
> > -Wl,--version-script=$(srcdir)/src/bluetooth.ver

I rather have the Sixaxis plugin being an external plugin only then. So
you are not allowed to make this builtin.

Regards

Marcel

2011-08-18 15:26:38

by Alan Ott

[permalink] [raw]

Subject: Re: [PATCH 0/4 incremental 1/2] Generalize controller handling to support different devices

On 08/18/2011 10:22 AM, Antonio Ospite wrote:
> Remove hardcoded #defines and put the values in a struct so we can handle
> different device types.
>
> From the USB dumps I've seen[1], different devices have just different ways to
> get and set the bdaddrs, the pairing algorithm is the same.
>
> [1] http://ps3.jim.sh/sixaxis/dumps/
>
> ---
> plugins/sixaxis.c | 80 ++++++++++++++++++++++++++++++++++------------------
> 1 files changed, 52 insertions(+), 28 deletions(-)
>
> diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
> index e08222c..608474f 100644
> --- a/plugins/sixaxis.c
> +++ b/plugins/sixaxis.c
> @@ -70,12 +70,38 @@
>
> #define BDADDR_STR_SIZE 18 /* strlen("00:00:00:00:00:00") + 1 */
>
> -/* Vendor and product ID for the Sixaxis PS3 controller */
> -#define VENDOR 0x054c
> -#define PRODUCT 0x0268
> -#define SIXAXIS_NAME "PLAYSTATION(R)3 Controller"
> -#define SIXAXIS_PNP_RECORD "3601920900000A000100000900013503191124090004350D35061901000900113503190011090006350909656E09006A0901000900093508350619112409010009000D350F350D350619010009001335031900110901002513576972656C65737320436F6E74726F6C6C65720901012513576972656C65737320436F6E74726F6C6C6572090102251B536F6E7920436F6D707574657220456E7465727461696E6D656E740902000901000902010901000902020800090203082109020428010902052801090206359A35980822259405010904A101A102850175089501150026FF00810375019513150025013500450105091901291381027501950D0600FF8103150026FF0005010901A10075089504350046FF0009300931093209358102C0050175089527090181027508953009019102750895300901B102C0A1028502750895300901B102C0A10285EE750895300901B102C0A10285EF750895300901B102C0C0090207350835060904090901000902082800090209280109020A280109020B09010009020C093E8009020D280009020E2800"
> -#define HID_UUID "00001124-0000-1000-8000-00805f9b34fb"
> +struct sony_controller {
> + uint16_t vendor_id;
> + uint16_t product_id;
> + char *name;
> + char *pnp_record;
> + char *hid_uuid;
> +
> + /* device specific callbacks to get master/device bdaddr and set
> + * master bdaddr
> + */
> + char * (*get_device_bdaddr)(int);
> + char * (*get_master_bdaddr)(int);
> + int (*set_master_bdaddr) (int, char *);
> +};
> +
> +static char *sixaxis_get_device_bdaddr(int fd);
> +static char *sixaxis_get_master_bdaddr(int fd);
> +static int sixaxis_set_master_bdaddr(int fd, char *adapter_bdaddr);
> +
> +static struct sony_controller controllers[] = {
> + {
> + .vendor_id = 0x054c,
> + .product_id = 0x0268,
> + .name = "PLAYSTATION(R)3 Controller",
> + .pnp_record = "3601920900000A000100000900013503191124090004350D35061901000900113503190011090006350909656E09006A0901000900093508350619112409010009000D350F350D350619010009001335031900110901002513576972656C65737320436F6E74726F6C6C65720901012513576972656C65737320436F6E74726F6C6C6572090102251B536F6E7920436F6D707574657220456E7465727461696E6D656E740902000901000902010901000902020800090203082109020428010902052801090206359A35980822259405010904A101A102850175089501150026FF00810375019513150025013500450105091901291381027501950D0600FF8103150026FF0005010901A10075089504350046FF0009300931093209358102C0050175089527090181027508953009019102750895300901B102C0A1028502750895300901B102C0A10285EE750895300901B102C0A10285EF750895300901B102C0C0090207350835060904090901000902082800090209280109020A280109020B09010009020C093E8009020D280009020E2800",
> + .hid_uuid = "00001124-0000-1000-8000-00805f9b34fb",

Where do the pnp_record and hid_uuid come from? It seems a bit odd to
have a giant hard-coded identifier string (pnp), but I'm not an expert
on this stuff, and I'm mostly just curious about it.

> + .get_device_bdaddr = sixaxis_get_device_bdaddr,
> + .get_master_bdaddr = sixaxis_get_master_bdaddr,
> + .set_master_bdaddr = sixaxis_set_master_bdaddr,
> + },
> +};
> +
>
> #define LED_1 (0x01 << 1)
> #define LED_2 (0x01 << 2)
> @@ -90,12 +116,9 @@ static struct udev_monitor *monitor;
> static guint watch_id;
>
>
> -static int create_sixaxis_association(struct btd_adapter *adapter,
> - const char *name,
> +static int create_controller_association(struct btd_adapter *adapter,
> const char *address,
> - guint32 vendor_id,
> - guint32 product_id,
> - const char *pnp_record)
> + struct sony_controller *controller)
> {
> DBusConnection *conn;
> sdp_record_t *rec;
> @@ -108,15 +131,16 @@ static int create_sixaxis_association(struct btd_adapter *adapter,
> adapter_get_address(adapter, &src);
> ba2str(&src, srcaddr);
>
> - write_device_name(&dst, &src, (char *) name);
> + write_device_name(&dst, &src, controller->name);
>
> /* Store the device's SDP record */
> - rec = record_from_string(pnp_record);
> + rec = record_from_string(controller->pnp_record);
> store_record(srcaddr, address, rec);
> sdp_record_free(rec);
>
> /* Set the device id */
> - store_device_id(srcaddr, address, 0xffff, vendor_id, product_id, 0);
> + store_device_id(srcaddr, address, 0xffff, controller->vendor_id,
> + controller->product_id, 0);
> /* Don't write a profile here,
> * it will be updated when the device connects */
>
> @@ -137,8 +161,8 @@ static int create_sixaxis_association(struct btd_adapter *adapter,
> }
>
> device_set_temporary(device, FALSE);
> - device_set_name(device, name);
> - btd_device_add_uuid(device, HID_UUID);
> + device_set_name(device, controller->name);
> + btd_device_add_uuid(device, controller->hid_uuid);
>
> fail_device:
> dbus_connection_unref(conn);
> @@ -184,7 +208,7 @@ static int set_feature_report(int fd, uint8_t *report, int len)
> return ret;
> }
>
> -static char *get_device_bdaddr(int fd)
> +static char *sixaxis_get_device_bdaddr(int fd)
> {
> unsigned char *buf;
> char *address;
> @@ -210,7 +234,7 @@ static char *get_device_bdaddr(int fd)
> return address;
> }
>
> -static char *get_master_bdaddr(int fd)
> +static char *sixaxis_get_master_bdaddr(int fd)
> {
> unsigned char *buf;
> char *address;
> @@ -236,7 +260,7 @@ static char *get_master_bdaddr(int fd)
> return address;
> }
>
> -static int set_master_bdaddr(int fd, char *adapter_bdaddr)
> +static int sixaxis_set_master_bdaddr(int fd, char *adapter_bdaddr)
> {
> uint8_t *report;
> uint8_t addr[6];
> @@ -282,7 +306,7 @@ out:
> return ret;
> }
>
> -static int sixpair(int fd, struct btd_adapter *adapter)
> +static int controller_pair(int fd, struct btd_adapter *adapter, struct sony_controller *controller)
> {
> char *device_bdaddr;
> char *master_bdaddr;
> @@ -294,7 +318,7 @@ static int sixpair(int fd, struct btd_adapter *adapter)
> ba2str(&dst, adapter_bdaddr);
> DBG("Adapter bdaddr %s", adapter_bdaddr);
>
> - master_bdaddr = get_master_bdaddr(fd);
> + master_bdaddr = controller->get_master_bdaddr(fd);
> if (master_bdaddr == NULL) {
> DBG("Failed to get the Old master Bluetooth address from the device");
> return -EPERM;
> @@ -305,7 +329,7 @@ static int sixpair(int fd, struct btd_adapter *adapter)
> */
> if (g_strcmp0(master_bdaddr, adapter_bdaddr) != 0) {
> DBG("Old master Bluetooth address was: %s", master_bdaddr);
> - ret = set_master_bdaddr(fd, adapter_bdaddr);
> + ret = controller->set_master_bdaddr(fd, adapter_bdaddr);
> if (ret < 0) {
> DBG("Failed to set the master Bluetooth address");
> free(master_bdaddr);
> @@ -313,7 +337,7 @@ static int sixpair(int fd, struct btd_adapter *adapter)
> }
> }
>
> - device_bdaddr = get_device_bdaddr(fd);
> + device_bdaddr = controller->get_device_bdaddr(fd);
> if (device_bdaddr == NULL) {
> DBG("Failed to get the Bluetooth address from the device");
> free(master_bdaddr);
> @@ -322,10 +346,7 @@ static int sixpair(int fd, struct btd_adapter *adapter)
>
> DBG("Device bdaddr %s", device_bdaddr);
>
> - ret = create_sixaxis_association(adapter,
> - SIXAXIS_NAME,
> - device_bdaddr,
> - VENDOR, PRODUCT, SIXAXIS_PNP_RECORD);
> + ret = create_controller_association(adapter, device_bdaddr, controller);
> free(device_bdaddr);
> free(master_bdaddr);
> return ret;
> @@ -424,6 +445,7 @@ static void handle_device_plug(struct udev_device *udevice)
> unsigned char is_usb = FALSE;
> int js_num = 0;
> int fd;
> + struct sony_controller *controller;
>
> hid_parent = udev_device_get_parent_with_subsystem_devtype(udevice,
> "hid", NULL);
> @@ -439,6 +461,8 @@ static void handle_device_plug(struct udev_device *udevice)
> if (!is_sixaxis(hid_name))
> return;
>
> + controller = &controllers[0];
> +

I'd expect the part above to have a for loop checking over all the
entries in the controller array instead of hard-coding to the first one.
With only one right now, of course it works, but making it a loop now
would make it trivial to add the second device (PSMove?) in the future.

> DBG("Found a Sixaxis device");
>
> hidraw_node = udev_device_get_devnode(udevice);
> @@ -507,7 +531,7 @@ static void handle_device_plug(struct udev_device *udevice)
> DBG("No adapters, exiting");
> return;
> }
> - sixpair(fd, adapter);
> + controller_pair(fd, adapter, controller);
> }
>
> if (js_num > 0) {

Hey, looks good overall. I like it. It seems much cleaner.

Alan.

2011-08-18 14:22:20

by Antonio Ospite

[permalink] [raw]

Subject: [PATCH 2/2] Match controllers using vendor_id and product_id instead of HID_NAME

Maybe controller->name can be filled in from HID_NAME, but for now having it
hardcoded doesn't hurt.

---
plugins/sixaxis.c | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
index 608474f..fc1cd52 100644
--- a/plugins/sixaxis.c
+++ b/plugins/sixaxis.c
@@ -426,12 +426,29 @@ static int set_controller_number(int fd, unsigned int n)
return set_leds(fd, leds_status);
}

-
-static inline gboolean is_sixaxis(const char *hid_name)
+static inline struct sony_controller *find_sony_controller(const char *hid_id)
{
- return g_str_has_suffix(hid_name, "PLAYSTATION(R)3 Controller") ||
- g_str_has_suffix(hid_name,
- "Sony Computer Entertainment Wireless Controller");
+ unsigned int array_size = sizeof(controllers)/sizeof(controllers[0]);
+ unsigned int i;
+ int ret;
+ uint16_t protocol;
+ uint16_t vendor_id;
+ uint16_t product_id;
+
+ ret = sscanf(hid_id, "%hx:%hx:%hx", &protocol, &vendor_id, &product_id);
+ if (ret != 3) {
+ error("%s:%s() Parsing HID_ID failed",
+ __FILE__, __func__);
+ return NULL;
+ }
+
+ for (i = 0; i < array_size; i++) {
+ if (controllers[i].vendor_id == vendor_id &&
+ controllers[i].product_id == product_id)
+ return &controllers[i];
+ }
+
+ return NULL;
}

static void handle_device_plug(struct udev_device *udevice)
@@ -439,7 +456,7 @@ static void handle_device_plug(struct udev_device *udevice)
struct udev_device *hid_parent;
struct udev_enumerate *enumerate;
struct udev_list_entry *devices, *dev_list_entry;
- const char *hid_name;
+ const char *hid_id;
const char *hid_phys;
const char *hidraw_node;
unsigned char is_usb = FALSE;
@@ -455,15 +472,16 @@ static void handle_device_plug(struct udev_device *udevice)
return;
}

- hid_name = udev_device_get_property_value(hid_parent, "HID_NAME");
- DBG("name: %s", hid_name);
+ hid_id = udev_device_get_property_value(hid_parent, "HID_ID");
+ DBG("HID_ID: %s", hid_id);

- if (!is_sixaxis(hid_name))
+ controller = find_sony_controller(hid_id);
+ if (!controller) {
+ DBG("No supported controller found");
return;
+ }

- controller = &controllers[0];
-
- DBG("Found a Sixaxis device");
+ DBG("Found a Sony controller: %s", controller->name);

hidraw_node = udev_device_get_devnode(udevice);

--
1.7.5.4

2011-08-18 14:22:19

by Antonio Ospite

[permalink] [raw]

Subject: [PATCH 0/4 incremental 1/2] Generalize controller handling to support different devices

Remove hardcoded #defines and put the values in a struct so we can handle
different device types.

>From the USB dumps I've seen[1], different devices have just different ways to
get and set the bdaddrs, the pairing algorithm is the same.

[1] http://ps3.jim.sh/sixaxis/dumps/

---
plugins/sixaxis.c | 80 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
index e08222c..608474f 100644
--- a/plugins/sixaxis.c
+++ b/plugins/sixaxis.c
@@ -70,12 +70,38 @@

#define BDADDR_STR_SIZE 18 /* strlen("00:00:00:00:00:00") + 1 */

-/* Vendor and product ID for the Sixaxis PS3 controller */
-#define VENDOR 0x054c
-#define PRODUCT 0x0268
-#define SIXAXIS_NAME "PLAYSTATION(R)3 Controller"
-#define SIXAXIS_PNP_RECORD "3601920900000A000100000900013503191124090004350D35061901000900113503190011090006350909656E09006A0901000900093508350619112409010009000D350F350D350619010009001335031900110901002513576972656C65737320436F6E74726F6C6C65720901012513576972656C65737320436F6E74726F6C6C6572090102251B536F6E7920436F6D707574657220456E7465727461696E6D656E740902000901000902010901000902020800090203082109020428010902052801090206359A35980822259405010904A101A102850175089501150026FF00810375019513150025013500450105091901291381027501950D0600FF8103150026FF0005010901A10075089504350046FF0009300931093209358102C0050175089527090181027508953009019102750895300901B102C0A1028502750895300901B102C0A10285EE750895300901B102C0A10285EF750895300901B102C0C0090207350835060904090901000902082800090209280109020A280109020B09010009020C093E8009020D280009020E2800"
-#define HID_UUID "00001124-0000-1000-8000-00805f9b34fb"
+struct sony_controller {
+ uint16_t vendor_id;
+ uint16_t product_id;
+ char *name;
+ char *pnp_record;
+ char *hid_uuid;
+
+ /* device specific callbacks to get master/device bdaddr and set
+ * master bdaddr
+ */
+ char * (*get_device_bdaddr)(int);
+ char * (*get_master_bdaddr)(int);
+ int (*set_master_bdaddr) (int, char *);
+};
+
+static char *sixaxis_get_device_bdaddr(int fd);
+static char *sixaxis_get_master_bdaddr(int fd);
+static int sixaxis_set_master_bdaddr(int fd, char *adapter_bdaddr);
+
+static struct sony_controller controllers[] = {
+ {
+ .vendor_id = 0x054c,
+ .product_id = 0x0268,
+ .name = "PLAYSTATION(R)3 Controller",
+ .pnp_record = "3601920900000A000100000900013503191124090004350D35061901000900113503190011090006350909656E09006A0901000900093508350619112409010009000D350F350D350619010009001335031900110901002513576972656C65737320436F6E74726F6C6C65720901012513576972656C65737320436F6E74726F6C6C6572090102251B536F6E7920436F6D707574657220456E7465727461696E6D656E740902000901000902010901000902020800090203082109020428010902052801090206359A35980822259405010904A101A102850175089501150026FF00810375019513150025013500450105091901291381027501950D0600FF8103150026FF0005010901A10075089504350046FF0009300931093209358102C0050175089527090181027508953009019102750895300901B102C0A1028502750895300901B102C0A10285EE750895300901B102C0A10285EF750895300901B102C0C0090207350835060904090901000902082800090209280109020A280109020B09010009020C093E8009020D280009020E2800",
+ .hid_uuid = "00001124-0000-1000-8000-00805f9b34fb",
+ .get_device_bdaddr = sixaxis_get_device_bdaddr,
+ .get_master_bdaddr = sixaxis_get_master_bdaddr,
+ .set_master_bdaddr = sixaxis_set_master_bdaddr,
+ },
+};
+

#define LED_1 (0x01 << 1)
#define LED_2 (0x01 << 2)
@@ -90,12 +116,9 @@ static struct udev_monitor *monitor;
static guint watch_id;

-static int create_sixaxis_association(struct btd_adapter *adapter,
- const char *name,
+static int create_controller_association(struct btd_adapter *adapter,
const char *address,
- guint32 vendor_id,
- guint32 product_id,
- const char *pnp_record)
+ struct sony_controller *controller)
{
DBusConnection *conn;
sdp_record_t *rec;
@@ -108,15 +131,16 @@ static int create_sixaxis_association(struct btd_adapter *adapter,
adapter_get_address(adapter, &src);
ba2str(&src, srcaddr);

- write_device_name(&dst, &src, (char *) name);
+ write_device_name(&dst, &src, controller->name);

/* Store the device's SDP record */
- rec = record_from_string(pnp_record);
+ rec = record_from_string(controller->pnp_record);
store_record(srcaddr, address, rec);
sdp_record_free(rec);

/* Set the device id */
- store_device_id(srcaddr, address, 0xffff, vendor_id, product_id, 0);
+ store_device_id(srcaddr, address, 0xffff, controller->vendor_id,
+ controller->product_id, 0);
/* Don't write a profile here,
* it will be updated when the device connects */

@@ -137,8 +161,8 @@ static int create_sixaxis_association(struct btd_adapter *adapter,
}

device_set_temporary(device, FALSE);
- device_set_name(device, name);
- btd_device_add_uuid(device, HID_UUID);
+ device_set_name(device, controller->name);
+ btd_device_add_uuid(device, controller->hid_uuid);

fail_device:
dbus_connection_unref(conn);
@@ -184,7 +208,7 @@ static int set_feature_report(int fd, uint8_t *report, int len)
return ret;
}

-static char *get_device_bdaddr(int fd)
+static char *sixaxis_get_device_bdaddr(int fd)
{
unsigned char *buf;
char *address;
@@ -210,7 +234,7 @@ static char *get_device_bdaddr(int fd)
return address;
}

-static char *get_master_bdaddr(int fd)
+static char *sixaxis_get_master_bdaddr(int fd)
{
unsigned char *buf;
char *address;
@@ -236,7 +260,7 @@ static char *get_master_bdaddr(int fd)
return address;
}

-static int set_master_bdaddr(int fd, char *adapter_bdaddr)
+static int sixaxis_set_master_bdaddr(int fd, char *adapter_bdaddr)
{
uint8_t *report;
uint8_t addr[6];
@@ -282,7 +306,7 @@ out:
return ret;
}

-static int sixpair(int fd, struct btd_adapter *adapter)
+static int controller_pair(int fd, struct btd_adapter *adapter, struct sony_controller *controller)
{
char *device_bdaddr;
char *master_bdaddr;
@@ -294,7 +318,7 @@ static int sixpair(int fd, struct btd_adapter *adapter)
ba2str(&dst, adapter_bdaddr);
DBG("Adapter bdaddr %s", adapter_bdaddr);

- master_bdaddr = get_master_bdaddr(fd);
+ master_bdaddr = controller->get_master_bdaddr(fd);
if (master_bdaddr == NULL) {
DBG("Failed to get the Old master Bluetooth address from the device");
return -EPERM;
@@ -305,7 +329,7 @@ static int sixpair(int fd, struct btd_adapter *adapter)
*/
if (g_strcmp0(master_bdaddr, adapter_bdaddr) != 0) {
DBG("Old master Bluetooth address was: %s", master_bdaddr);
- ret = set_master_bdaddr(fd, adapter_bdaddr);
+ ret = controller->set_master_bdaddr(fd, adapter_bdaddr);
if (ret < 0) {
DBG("Failed to set the master Bluetooth address");
free(master_bdaddr);
@@ -313,7 +337,7 @@ static int sixpair(int fd, struct btd_adapter *adapter)
}
}

- device_bdaddr = get_device_bdaddr(fd);
+ device_bdaddr = controller->get_device_bdaddr(fd);
if (device_bdaddr == NULL) {
DBG("Failed to get the Bluetooth address from the device");
free(master_bdaddr);
@@ -322,10 +346,7 @@ static int sixpair(int fd, struct btd_adapter *adapter)

DBG("Device bdaddr %s", device_bdaddr);

- ret = create_sixaxis_association(adapter,
- SIXAXIS_NAME,
- device_bdaddr,
- VENDOR, PRODUCT, SIXAXIS_PNP_RECORD);
+ ret = create_controller_association(adapter, device_bdaddr, controller);
free(device_bdaddr);
free(master_bdaddr);
return ret;
@@ -424,6 +445,7 @@ static void handle_device_plug(struct udev_device *udevice)
unsigned char is_usb = FALSE;
int js_num = 0;
int fd;
+ struct sony_controller *controller;

hid_parent = udev_device_get_parent_with_subsystem_devtype(udevice,
"hid", NULL);
@@ -439,6 +461,8 @@ static void handle_device_plug(struct udev_device *udevice)
if (!is_sixaxis(hid_name))
return;

+ controller = &controllers[0];
+
DBG("Found a Sixaxis device");

hidraw_node = udev_device_get_devnode(udevice);
@@ -507,7 +531,7 @@ static void handle_device_plug(struct udev_device *udevice)
DBG("No adapters, exiting");
return;
}
- sixpair(fd, adapter);
+ controller_pair(fd, adapter, controller);
}

if (js_num > 0) {
--
1.7.5.4

2011-08-18 14:13:57

by Antonio Ospite

[permalink] [raw]

Subject: Re: [PATCH BlueZ 2/4] Add sixaxis plugin: USB pairing and LEDs settings

On Tue, 09 Aug 2011 22:24:37 -0400
Alan Ott <[email protected]> wrote:

[...]
> > + ret = create_sixaxis_association(adapter,
> > + SIXAXIS_NAME,
> > + device_bdaddr,
> > + VENDOR, PRODUCT, SIXAXIS_PNP_RECORD);
>
> You create the association with a hard-coded VID/PID. You match the
> device on string name below (not VID/PID), so what if you used the
> actual VID/PID of the device for the association instead?
>

Or use statically defined VID/PID to match the device, see below.

[...]
> > + /*
> > + * the total time the led is active (0xff means forever)
> > + * | duty_length: how long a cycle is in deciseconds:
> > + * | | (0 means "blink very fast")
> > + * | | ??? (Maybe a phase shift or duty_length multiplier?)
> > + * | | | % of duty_length led is off (0xff means 100%)
> > + * | | | | % of duty_length led is on (0xff is 100%)
> > + * | | | | |
> > + * 0xff, 0x27, 0x10, 0x00, 0x32,
> > + */
> > + unsigned char leds_report[] = {
> > + 0x01,
> > + 0x00, 0x00, 0x00, 0x00, 0x00, /* rumble values TBD */
> > + 0x00, 0x00, 0x00, 0x00, 0x1e, /* LED_1=0x02, LED_2=0x04 ... */
> > + 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_4 */
> > + 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_3 */
> > + 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_2 */
> > + 0xff, 0x27, 0x10, 0x00, 0x32, /* LED_1 */
> > + 0x00, 0x00, 0x00, 0x00, 0x00,
> > + };
> >
> > + int leds = 0;
> > + if (leds_status[0])
> > + leds |= LED_1;
> > + if (leds_status[1])
> > + leds |= LED_2;
> > + if (leds_status[2])
> > + leds |= LED_3;
> > + if (leds_status[3])
> > + leds |= LED_4;
> > +
> > + leds_report[10] = leds;
>
> If you are overwriting leds_report[10] unconditionally, why is it
> initialized to 0x1e in the leds_report initializer (unless I counted wrong)?
>

You are right having it initialized to 0x1e is not necessary at all,
but I'd still keep it to 0x1e in the initializer because this is the
"hardware default", meaning "all leds blinking", I see it as a form of
documentation-inside-code, but if it is confusing I will avoid that.

[...]
> > +
> > +static inline gboolean is_sixaxis(const char *hid_name)
> > +{
> > + return g_str_has_suffix(hid_name, "PLAYSTATION(R)3 Controller") ||
> > + g_str_has_suffix(hid_name,
> > + "Sony Computer Entertainment Wireless Controller");
> > +}
>
> Why do you key on the string name here. This seems problematic,
> especially if you want to support things like the PSMove. I'd expect a
> table of VID/PIDs or something.
>

Right, I like this suggestion, I generalized the code a little bit to
handle different devices, see the two follow-up incremental patches, in
the first one I remove static #defines in favor of a structure
representing a device type, in the second one I match devices using
VID/PID from a table of device types.

If the idea looks OK I'll fold those patches in v5, along with the
plugin renaming to "sony-controller", and maybe I'll split the plugin in
several modules too:
sony-controller.c /* udev and bluez stuff */
sony-controller-hid.c /* hidraw and device specific stuff */
sony-controlled-hid.h

[...]
> > +
> > +static gboolean device_event_idle(struct udev_device *udevice)
> > +{
> > + handle_device_plug(udevice);
> > + udev_device_unref(udevice);
> > + return FALSE;
> > +}
>
> I'm a little confused why this is called "idle."
>

I don't know either, maybe trying to communicate that it is called
asynchronously by glib (via g_timeout_add_seconds())? But even if so
this is not a property of the function itself, so I think we can just
call it device_event().

Ah Bastien, I noticed we are using g_timeout_add_seconds() with the
callback always returning FALSE, so the latter is called only once,
can't we in this case just sleep and then call the function directly?
Isn't the main loop in sixaxis_init() enough to handle multiple
overlapping udev events? Maybe I asked that already... :P

> Thanks for your work on this, Antonio. Linux working out of the box with
> these controllers will be really cool.
>
> Alan.
>

Regards,
Antonio

--
Antonio Ospite
http://ao2.it

PGP public key ID: 0x4553B001

A: Because it messes up the order in which people normally read text.
See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?

Attachments:

(No filename) (4.24 kB)
(No filename) (198.00 B)
Download all attachments

2011-08-18 10:44:38

This is the old way to associate to a Sixaxis controller and it is not
even compiled in, so we can safely get rid of it.
---
input/sixpair.c | 299 -------------------------------------------------------
1 files changed, 0 insertions(+), 299 deletions(-)
delete mode 100644 input/sixpair.c

diff --git a/input/sixpair.c b/input/sixpair.c
deleted file mode 100644
index 5c58b9b..0000000
--- a/input/sixpair.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* To compile
- * gcc -g -Wall -I../src -I../lib/ -I../include -DSTORAGEDIR=\"/var/lib/bluetooth\" -o sixpair sixpair.c ../src/storage.c ../common/libhelper.a -I../common `pkg-config --libs --cflags glib-2.0 libusb-1.0` -lbluetooth
- */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <inttypes.h>
-
-#include <sdp.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp_lib.h>
-#include <glib.h>
-#include <libusb.h>
-
-#include "storage.h"
-
-/* Vendor and product ID for the Sixaxis PS3 controller */
-#define VENDOR 0x054c
-#define PRODUCT 0x0268
-
-#define PS3_PNP_RECORD "3601920900000A000100000900013503191124090004350D35061901000900113503190011090006350909656E09006A0901000900093508350619112409010009000D350F350D350619010009001335031900110901002513576972656C65737320436F6E74726F6C6C65720901012513576972656C65737320436F6E74726F6C6C6572090102251B536F6E7920436F6D707574657220456E7465727461696E6D656E740902000901000902010901000902020800090203082109020428010902052801090206359A35980822259405010904A101A102850175089501150026FF00810375019513150025013500450105091901291381027501950D0600FF8103150026FF0005010901A10075089504350046FF0009300931093209358102C0050175089527090181027508953009019102750895300901B102C0A1028502750895300901B102C0A10285EE750895300901B102C0A10285EF750895300901B102C0C0090207350835060904090901000902082800090209280109020A280109020B09010009020C093E8009020D280009020E2800"
-
-gboolean option_get_master = TRUE;
-char *option_master= NULL;
-gboolean option_store_info = TRUE;
-const char *option_device = NULL;
-gboolean option_quiet = FALSE;
-
-const GOptionEntry options[] = {
- { "get-master", '\0', 0, G_OPTION_ARG_NONE, &option_get_master, "Get currently set master address", NULL },
- { "set-master", '\0', 0, G_OPTION_ARG_STRING, &option_master, "Set master address (\"auto\" for automatic)", NULL },
- { "store-info", '\0', 0, G_OPTION_ARG_NONE, &option_store_info, "Store the HID info into the input database", NULL },
- { "device", '\0', 0, G_OPTION_ARG_STRING, &option_device, "Only handle one device (default, all supported", NULL },
- { "quiet", 'q', 0, G_OPTION_ARG_NONE, &option_quiet, "Quieten the output", NULL },
- { NULL }
-};
-
-static gboolean
-show_master (libusb_device_handle *devh, int itfnum)
-{
- unsigned char msg[8];
- int res;
-
- res = libusb_control_transfer (devh,
- LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE,
- 0x01, 0x03f5, itfnum,
- (void*) msg, sizeof(msg),
- 5000);
-
- if (res < 0) {
- g_warning ("Getting the master Bluetooth address failed");
- return FALSE;
- }
- g_print ("Current Bluetooth master: %02X:%02X:%02X:%02X:%02X:%02X\n",
- msg[2], msg[3], msg[4], msg[5], msg[6], msg[7]);
-
- return TRUE;
-}
-
-static char *
-get_bdaddr (libusb_device_handle *devh, int itfnum)
-{
- unsigned char msg[17];
- char *address;
- int res;
-
- res = libusb_control_transfer (devh,
- LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE,
- 0x01, 0x03f2, itfnum,
- (void*) msg, sizeof(msg),
- 5000);
-
- if (res < 0) {
- g_warning ("Getting the device Bluetooth address failed");
- return NULL;
- }
-
- address = g_strdup_printf ("%02X:%02X:%02X:%02X:%02X:%02X",
- msg[4], msg[5], msg[6], msg[7], msg[8], msg[9]);
-
- if (option_quiet == FALSE) {
- g_print ("Device Bluetooth address: %s\n", address);
- }
-
- return address;
-}
-
-static gboolean
-set_master_bdaddr (libusb_device_handle *devh, int itfnum, char *host)
-{
- unsigned char msg[8];
- int mac[6];
- int res;
-
- if (sscanf(host, "%X:%X:%X:%X:%X:%X",
- &mac[0],&mac[1],&mac[2],&mac[3],&mac[4],&mac[5]) != 6) {
- return FALSE;
- }
-
- msg[0] = 0x01;
- msg[1] = 0x00;
- msg[2] = mac[0];
- msg[3] = mac[1];
- msg[4] = mac[2];
- msg[5] = mac[3];
- msg[6] = mac[4];
- msg[7] = mac[5];
-
- res = libusb_control_transfer (devh,
- LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE,
- 0x09, 0x03f5, itfnum,
- (void*) msg, sizeof(msg),
- 5000);
-
- if (res < 0) {
- g_warning ("Setting the master Bluetooth address failed");
- return FALSE;
- }
-
- return TRUE;
-}
-
-static char *
-get_host_bdaddr (void)
-{
- FILE *f;
- int mac[6];
-
- //FIXME use dbus to get the default adapter
-
- f = popen("hcitool dev", "r");
-
- if (f == NULL) {
- //FIXME
- return NULL;
- }
- if (fscanf(f, "%*s\n%*s %X:%X:%X:%X:%X:%X",
- &mac[0],&mac[1],&mac[2],&mac[3],&mac[4],&mac[5]) != 6) {
- //FIXME
- return NULL;
- }
-
- return g_strdup_printf ("%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-}
-
-static int
-handle_device (libusb_device *dev, struct libusb_config_descriptor *cfg, int itfnum, const struct libusb_interface_descriptor *alt)
-{
- libusb_device_handle *devh;
- int res, retval;
-
- retval = -1;
-
- if (libusb_open (dev, &devh) < 0) {
- g_warning ("Can't open device");
- goto bail;
- }
- libusb_detach_kernel_driver (devh, itfnum);
-
- res = libusb_claim_interface (devh, itfnum);
- if (res < 0) {
- g_warning ("Can't claim interface %d", itfnum);
- goto bail;
- }
-
- if (option_get_master != FALSE) {
- if (show_master (devh, itfnum) == FALSE)
- goto bail;
- retval = 0;
- }
-
- if (option_master != NULL) {
- if (strcmp (option_master, "auto") == 0) {
- g_free (option_master);
- option_master = get_host_bdaddr ();
- if (option_master == NULL) {
- g_warning ("Can't get bdaddr from default device");
- retval = -1;
- goto bail;
- }
- }
- } else {
- option_master = get_host_bdaddr ();
- if (option_master == NULL) {
- g_warning ("Can't get bdaddr from default device");
- retval = -1;
- goto bail;
- }
- }
-
- if (option_store_info != FALSE) {
- sdp_record_t *rec;
- char *device;
- bdaddr_t dst, src;
-
- device = get_bdaddr (devh, itfnum);
- if (device == NULL) {
- retval = -1;
- goto bail;
- }
-
- rec = record_from_string (PS3_PNP_RECORD);
- store_record(option_master, device, rec);
- write_trust(option_master, device, "[all]", TRUE);
- store_device_id(option_master, device, 0xffff, 0x054c, 0x0268, 0);
- str2ba(option_master, &src);
- str2ba(device, &dst);
- write_device_profiles(&src, &dst, "");
- write_device_name(&src, &dst, "PLAYSTATION(R)3 Controller");
- sdp_record_free(rec);
-
- if (set_master_bdaddr (devh, itfnum, option_master) == FALSE) {
- retval = -1;
- goto bail;
- }
- }
-
-bail:
- libusb_release_interface (devh, itfnum);
- res = libusb_attach_kernel_driver(devh, itfnum);
- if (res < 0) {
- //FIXME sometimes the kernel tells us ENOENT, but succeeds anyway...
- g_warning ("Reattaching the driver failed: %d", res);
- }
- if (devh != NULL)
- libusb_close (devh);
-
- return retval;
-}
-
-int main (int argc, char **argv)
-{
- GOptionContext *context;
- GError *error = NULL;
- libusb_device **list;
- ssize_t num_devices, i;
-
- context = g_option_context_new ("- Manage Sixaxis PS3 controllers");
- g_option_context_add_main_entries (context, options, NULL);
- if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
- g_warning ("Couldn't parse command-line options: %s", error->message);
- return 1;
- }
-
- /* Check that the passed bdaddr is correct */
- if (option_master != NULL && strcmp (option_master, "auto") != 0) {
- //FIXME check bdaddr
- }
-
- libusb_init (NULL);
-
- /* Find device(s) */
- num_devices = libusb_get_device_list (NULL, &list);
- if (num_devices < 0) {
- g_warning ("libusb_get_device_list failed");
- return 1;
- }
-
- for (i = 0; i < num_devices; i++) {
- struct libusb_config_descriptor *cfg;
- libusb_device *dev = list[i];
- struct libusb_device_descriptor desc;
- guint8 j;
-
- if (libusb_get_device_descriptor (dev, &desc) < 0) {
- g_warning ("libusb_get_device_descriptor failed");
- continue;
- }
-
- /* Here we check for the supported devices */
- if (desc.idVendor != VENDOR || desc.idProduct != PRODUCT)
- continue;
-
- /* Look for the interface number that interests us */
- for (j = 0; j < desc.bNumConfigurations; j++) {
- struct libusb_config_descriptor *config;
- guint8 k;
-
- libusb_get_config_descriptor (dev, j, &config);
-
- for (k = 0; k < config->bNumInterfaces; k++) {
- const struct libusb_interface *itf = &config->interface[k];
- int l;
-
- for (l = 0; l < itf->num_altsetting ; l++) {
- struct libusb_interface_descriptor alt;
-
- alt = itf->altsetting[l];
- if (alt.bInterfaceClass == 3) {
- handle_device (dev, cfg, l, &alt);
- }
- }
- }
- }
- }
-
- return 0;
-}
-
--
1.7.5.4