2012-02-22 20:29:51

by David Herrmann

Subject: [PATCH] Detect Wii Remotes by device name

We currently detect Wii Remotes by DID information. However, not all Wii Remotes
(especially 3rd party Wii Remotes) provide DID information. Moreover, they
provide no way of identifying them aside from their device name. Hence, this
adds an experimental name-detection for Wii Remotes.
---
plugins/wiimote.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/wiimote.c b/plugins/wiimote.c
index 1ae638b..568bfd5 100644
--- a/plugins/wiimote.c
+++ b/plugins/wiimote.c
@@ -26,6 +26,7 @@
#endif

#include <bluetooth/bluetooth.h>
+#include <glib.h>

#include "plugin.h"
#include "adapter.h"
@@ -60,18 +61,20 @@ static ssize_t wii_pincb(struct btd_adapter *adapter, struct btd_device *device,
{
uint16_t vendor, product;
bdaddr_t sba, dba;
- char addr[18];
+ char addr[18], name[25];

adapter_get_address(adapter, &sba);
device_get_address(device, &dba, NULL);
ba2str(&dba, addr);

vendor = btd_device_get_vendor(device);
- if (vendor != 0x057e)
- return 0;
-
product = btd_device_get_product(device);
- if (product == 0x0306) {
+
+ device_get_name(device, name, sizeof(name));
+ name[sizeof(name) - 1] = 0;
+
+ if (g_str_equal(name, "Nintendo RVL-CNT-01") ||
+ (vendor == 0x057e && product == 0x0306)) {
DBG("Forcing fixed pin on detected wiimote %s", addr);
memcpy(pinbuf, &sba, 6);
return 6;
--
1.7.8.1

2012-03-16 15:20:06

by Johan Hedberg

Subject: Re: [PATCH] Detect Wii Remotes by device name

Hi David,

On Wed, Feb 22, 2012, David Herrmann wrote:
> We currently detect Wii Remotes by DID information. However, not all
> Wii Remotes (especially 3rd party Wii Remotes) provide DID
> information. Moreover, they provide no way of identifying them aside
> from their device name. Hence, this adds an experimental
> name-detection for Wii Remotes.
> ---
> plugins/wiimote.c | 13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-)

Applied. Thanks.

Johan