632 lines
18 KiB
Diff
632 lines
18 KiB
Diff
From 03827726cebf7d8b5bc5a4e7859ea92a7e62044f Mon Sep 17 00:00:00 2001
|
|
From: Bastien Nocera <hadess@hadess.net>
|
|
Date: Fri, 30 Dec 2011 12:34:29 +0100
|
|
Subject: [PATCH] Add sixaxis cable-pairing plugin
|
|
|
|
Implement the old "sixpair" using libudev and libusb-1.0.
|
|
|
|
When a Sixaxis device is plugged in, events are filtered, and
|
|
the device is selected, poked around to set the default Bluetooth
|
|
address, and added to the database of the current default adapter.
|
|
---
|
|
Makefile.am | 9 +-
|
|
acinclude.m4 | 16 +++
|
|
configure.ac | 1 +
|
|
plugins/cable.c | 382 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
src/adapter.c | 19 +++
|
|
src/adapter.h | 3 +
|
|
src/device.c | 37 ++++--
|
|
src/device.h | 2 +
|
|
8 files changed, 456 insertions(+), 13 deletions(-)
|
|
create mode 100644 plugins/cable.c
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 1c214c6..c70ff24 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -238,6 +238,11 @@ builtin_sources += thermometer/main.c \
|
|
endif
|
|
|
|
|
|
+if CABLE
|
|
+builtin_modules += cable
|
|
+builtin_sources += plugins/cable.c
|
|
+endif
|
|
+
|
|
builtin_modules += hciops mgmtops
|
|
builtin_sources += plugins/hciops.c plugins/mgmtops.c
|
|
|
|
@@ -306,7 +311,7 @@ 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-private.la @GLIB_LIBS@ @DBUS_LIBS@ \
|
|
- -ldl -lrt
|
|
+ @CABLE_LIBS@ -ldl -lrt
|
|
src_bluetoothd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic \
|
|
-Wl,--version-script=$(srcdir)/src/bluetooth.ver
|
|
|
|
@@ -428,7 +433,7 @@ EXTRA_DIST += doc/manager-api.txt \
|
|
|
|
AM_YFLAGS = -d
|
|
|
|
-AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@
|
|
+AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CABLE_CFLAGS@
|
|
|
|
INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
|
|
-I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus \
|
|
diff --git a/acinclude.m4 b/acinclude.m4
|
|
index 1d6d736..ae58bbd 100644
|
|
--- a/acinclude.m4
|
|
+++ b/acinclude.m4
|
|
@@ -139,6 +139,12 @@ AC_DEFUN([AC_PATH_UDEV], [
|
|
AC_SUBST(UDEV_LIBS)
|
|
])
|
|
|
|
+AC_DEFUN([AC_PATH_CABLE], [
|
|
+ PKG_CHECK_MODULES(CABLE, libudev libusb-1.0, cable_found=yes, cable_found=no)
|
|
+ AC_SUBST(CABLE_CFLAGS)
|
|
+ AC_SUBST(CABLE_LIBS)
|
|
+])
|
|
+
|
|
AC_DEFUN([AC_PATH_SNDFILE], [
|
|
PKG_CHECK_MODULES(SNDFILE, sndfile, sndfile_found=yes, sndfile_found=no)
|
|
AC_SUBST(SNDFILE_CFLAGS)
|
|
@@ -176,6 +182,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
|
|
sndfile_enable=${sndfile_found}
|
|
hal_enable=no
|
|
usb_enable=${usb_found}
|
|
+ cable_enable=${cable_found}
|
|
alsa_enable=${alsa_found}
|
|
gstreamer_enable=${gstreamer_found}
|
|
audio_enable=yes
|
|
@@ -265,6 +272,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
|
|
usb_enable=${enableval}
|
|
])
|
|
|
|
+ AC_ARG_ENABLE(cable, AC_HELP_STRING([--enable-cable], [enable DeviceKit support]), [
|
|
+ cable_enable=${enableval}
|
|
+ ])
|
|
+
|
|
AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], [install Bluetooth utilities]), [
|
|
tools_enable=${enableval}
|
|
])
|
|
@@ -366,6 +377,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
|
|
AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
|
|
fi
|
|
|
|
+ if (test "${cable_enable}" = "yes" && test "${cable_found}" = "yes"); then
|
|
+ AC_DEFINE(HAVE_CABLE, 1, [Define to 1 if you have libcable.])
|
|
+ fi
|
|
+
|
|
AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
|
|
AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
|
|
AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes" ||
|
|
@@ -398,4 +413,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
|
|
AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes")
|
|
AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes")
|
|
AM_CONDITIONAL(GATTMODULES, test "${gatt_enable}" = "yes")
|
|
+ AM_CONDITIONAL(CABLE, test "${cable_enable}" = "yes" && test "${cable_found}" = "yes")
|
|
])
|
|
diff --git a/configure.ac b/configure.ac
|
|
index f2db920..8e7ad79 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -46,6 +46,7 @@ AC_PATH_GSTREAMER
|
|
AC_PATH_USB
|
|
AC_PATH_UDEV
|
|
AC_PATH_SNDFILE
|
|
+AC_PATH_CABLE
|
|
AC_PATH_OUI
|
|
AC_PATH_READLINE
|
|
AC_PATH_CHECK
|
|
diff --git a/plugins/cable.c b/plugins/cable.c
|
|
new file mode 100644
|
|
index 0000000..89333c4
|
|
--- /dev/null
|
|
+++ b/plugins/cable.c
|
|
@@ -0,0 +1,382 @@
|
|
+/*
|
|
+ *
|
|
+ * BlueZ - Bluetooth protocol stack for Linux
|
|
+ *
|
|
+ * Copyright (C) 2009 Bastien Nocera <hadess@hadess.net>
|
|
+ *
|
|
+ *
|
|
+ * This program is free software; you can redistribute it and/or modify
|
|
+ * it under the terms of the GNU General Public License as published by
|
|
+ * the Free Software Foundation; either version 2 of the License, or
|
|
+ * (at your option) any later version.
|
|
+ *
|
|
+ * This program is distributed in the hope that it will be useful,
|
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+ * GNU General Public License for more details.
|
|
+ *
|
|
+ * You should have received a copy of the GNU General Public License
|
|
+ * along with this program; if not, write to the Free Software
|
|
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
+ *
|
|
+ */
|
|
+
|
|
+#ifdef HAVE_CONFIG_H
|
|
+#include <config.h>
|
|
+#endif
|
|
+
|
|
+#include <glib.h>
|
|
+#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE 1
|
|
+#include <libudev.h>
|
|
+#include <dbus/dbus.h>
|
|
+#include <bluetooth/bluetooth.h>
|
|
+#include <bluetooth/sdp.h>
|
|
+#include <libusb.h>
|
|
+
|
|
+#include "plugin.h"
|
|
+#include "log.h"
|
|
+
|
|
+#include "adapter.h"
|
|
+#include "manager.h"
|
|
+#include "device.h"
|
|
+
|
|
+#include "storage.h"
|
|
+#include "sdp_lib.h"
|
|
+
|
|
+/* Vendor and product ID for the Sixaxis PS3 controller */
|
|
+#define VENDOR 0x054c
|
|
+#define PRODUCT 0x0268
|
|
+#define SIXAXIS_PNP_RECORD "3601920900000A000100000900013503191124090004350D35061901000900113503190011090006350909656E09006A0901000900093508350619112409010009000D350F350D350619010009001335031900110901002513576972656C65737320436F6E74726F6C6C65720901012513576972656C65737320436F6E74726F6C6C6572090102251B536F6E7920436F6D707574657220456E7465727461696E6D656E740902000901000902010901000902020800090203082109020428010902052801090206359A35980822259405010904A101A102850175089501150026FF00810375019513150025013500450105091901291381027501950D0600FF8103150026FF0005010901A10075089504350046FF0009300931093209358102C0050175089527090181027508953009019102750895300901B102C0A1028502750895300901B102C0A10285EE750895300901B102C0A10285EF750895300901B102C0C0090207350835060904090901000902082800090209280109020A280109020B09010009020C093E8009020D280009020E2800"
|
|
+#define HID_UUID "00001124-0000-1000-8000-00805f9b34fb"
|
|
+
|
|
+static struct btd_device *create_cable_association(DBusConnection *conn,
|
|
+ struct btd_adapter *adapter,
|
|
+ const char *name,
|
|
+ const char *address,
|
|
+ guint32 vendor_id,
|
|
+ guint32 product_id,
|
|
+ const char *pnp_record)
|
|
+{
|
|
+ sdp_record_t *rec;
|
|
+ struct btd_device *device;
|
|
+ bdaddr_t src, dst;
|
|
+ char srcaddr[18];
|
|
+
|
|
+ device = adapter_find_device(adapter, address);
|
|
+ if (device == NULL) {
|
|
+ device = device_create(conn, adapter, address, BDADDR_BREDR);
|
|
+ if (device != NULL)
|
|
+ adapter_create_device_for_device(conn, adapter, device);
|
|
+ }
|
|
+ if (device != NULL) {
|
|
+ device_set_temporary(device, FALSE);
|
|
+ device_set_name(device, name);
|
|
+ }
|
|
+
|
|
+ str2ba(address, &dst);
|
|
+ adapter_get_address(adapter, &src);
|
|
+ ba2str(&src, srcaddr);
|
|
+
|
|
+ write_device_name(&dst, &src, (char *) name);
|
|
+
|
|
+ /* Store the device's SDP record */
|
|
+ rec = record_from_string(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);
|
|
+ /* Don't write a profile, it will be updated when the device connects */
|
|
+
|
|
+ device_set_trust (conn, device, TRUE);
|
|
+
|
|
+ return device;
|
|
+}
|
|
+
|
|
+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) {
|
|
+ DBG("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]);
|
|
+
|
|
+ DBG("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) {
|
|
+ DBG("Setting the master Bluetooth address failed");
|
|
+ return FALSE;
|
|
+ }
|
|
+
|
|
+ return TRUE;
|
|
+}
|
|
+static void handle_usb_device(struct btd_adapter *adapter,
|
|
+ libusb_device *dev,
|
|
+ struct libusb_config_descriptor *cfg,
|
|
+ int itfnum,
|
|
+ const struct libusb_interface_descriptor *alt)
|
|
+{
|
|
+ DBusConnection *conn;
|
|
+ libusb_device_handle *devh;
|
|
+ char *device_bdaddr;
|
|
+ char adapter_bdaddr[18];
|
|
+ struct btd_device *device;
|
|
+ bdaddr_t dst;
|
|
+
|
|
+ device_bdaddr = NULL;
|
|
+ conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
|
|
+ if (conn == NULL) {
|
|
+ DBG("Failed to get on the bus");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (libusb_open(dev, &devh) < 0) {
|
|
+ DBG("Can't open device");
|
|
+ goto bail;
|
|
+ }
|
|
+ libusb_detach_kernel_driver(devh, itfnum);
|
|
+
|
|
+ if (libusb_claim_interface(devh, itfnum) < 0) {
|
|
+ DBG("Can't claim interface %d", itfnum);
|
|
+ goto bail;
|
|
+ }
|
|
+
|
|
+ device_bdaddr = get_bdaddr(devh, itfnum);
|
|
+ if (device_bdaddr == NULL) {
|
|
+ DBG("Failed to get the Bluetooth address from the device");
|
|
+ goto bail;
|
|
+ }
|
|
+
|
|
+ device = create_cable_association(conn,
|
|
+ adapter,
|
|
+ "PLAYSTATION(R)3 Controller",
|
|
+ device_bdaddr,
|
|
+ VENDOR, PRODUCT, SIXAXIS_PNP_RECORD);
|
|
+ btd_device_add_uuid(device, HID_UUID);
|
|
+
|
|
+ adapter_get_address(adapter, &dst);
|
|
+ ba2str(&dst, adapter_bdaddr);
|
|
+ DBG("Adapter bdaddr %s", adapter_bdaddr);
|
|
+
|
|
+ if (set_master_bdaddr(devh, itfnum, adapter_bdaddr) == FALSE) {
|
|
+ DBG("Failed to set the master Bluetooth address");
|
|
+ goto bail;
|
|
+ }
|
|
+
|
|
+bail:
|
|
+ dbus_connection_unref(conn);
|
|
+ g_free(device_bdaddr);
|
|
+ libusb_release_interface(devh, itfnum);
|
|
+ /* We ignore errors from the reattach, as there's nothing we
|
|
+ * can do about it */
|
|
+ libusb_attach_kernel_driver(devh, itfnum);
|
|
+ if (devh != NULL)
|
|
+ libusb_close(devh);
|
|
+}
|
|
+
|
|
+static void handle_device_plug(struct udev_device *udevice)
|
|
+{
|
|
+ struct btd_adapter *adapter;
|
|
+ guint i;
|
|
+
|
|
+ libusb_device **list, *usbdev;
|
|
+ ssize_t num_devices;
|
|
+ struct libusb_device_descriptor desc;
|
|
+ guint8 j;
|
|
+
|
|
+ if (g_strcmp0(udev_device_get_property_value(udevice, "ID_SERIAL"),
|
|
+ "Sony_PLAYSTATION_R_3_Controller") != 0)
|
|
+ return;
|
|
+ /* Don't look at events with an associated driver */
|
|
+ if (udev_device_get_property_value(udevice, "ID_USB_DRIVER") != NULL)
|
|
+ return;
|
|
+
|
|
+ DBG("Found Sixaxis device");
|
|
+
|
|
+ /* Look for the default adapter */
|
|
+ adapter = manager_get_default_adapter();
|
|
+ if (adapter == NULL)
|
|
+ return;
|
|
+
|
|
+ /* Look for the USB device */
|
|
+ libusb_init(NULL);
|
|
+
|
|
+ num_devices = libusb_get_device_list(NULL, &list);
|
|
+ if (num_devices < 0) {
|
|
+ DBG("libusb_get_device_list failed");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ usbdev = NULL;
|
|
+ for (i = 0; i < num_devices; i++) {
|
|
+ char *path;
|
|
+
|
|
+ path = g_strdup_printf("%s/%03d/%03d", "/dev/bus/usb",
|
|
+ libusb_get_bus_number(list[i]),
|
|
+ libusb_get_device_address(list[i]));
|
|
+ if (g_strcmp0(path, udev_device_get_devnode(udevice)) == 0) {
|
|
+ g_free(path);
|
|
+ usbdev = libusb_ref_device(list[i]);
|
|
+ break;
|
|
+ }
|
|
+ g_free(path);
|
|
+ }
|
|
+
|
|
+ libusb_free_device_list(list, TRUE);
|
|
+ if (usbdev == NULL) {
|
|
+ DBG("Found a Sixaxis, but couldn't find it via libusb");
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ if (libusb_get_device_descriptor(usbdev, &desc) < 0) {
|
|
+ DBG("libusb_get_device_descriptor() failed");
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ /* Look for the interface number that interests us */
|
|
+ for (j = 0; j < desc.bNumConfigurations; j++) {
|
|
+ struct libusb_config_descriptor *config;
|
|
+ guint8 k;
|
|
+
|
|
+ if (libusb_get_config_descriptor(usbdev, j, &config) < 0) {
|
|
+ DBG("Failed to get config descriptor %d", j);
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ 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_usb_device(adapter, usbdev, config, l, &alt);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+out:
|
|
+ if (usbdev != NULL)
|
|
+ libusb_unref_device(usbdev);
|
|
+ libusb_exit(NULL);
|
|
+}
|
|
+
|
|
+static gboolean device_event_idle(struct udev_device *udevice)
|
|
+{
|
|
+ handle_device_plug(udevice);
|
|
+ udev_device_unref(udevice);
|
|
+ return FALSE;
|
|
+}
|
|
+
|
|
+static struct udev *ctx = NULL;
|
|
+static struct udev_monitor *monitor = NULL;
|
|
+static guint watch_id = 0;
|
|
+
|
|
+static gboolean
|
|
+monitor_event(GIOChannel *source,
|
|
+ GIOCondition condition,
|
|
+ gpointer data)
|
|
+{
|
|
+ struct udev_device *udevice;
|
|
+
|
|
+ udevice = udev_monitor_receive_device(monitor);
|
|
+ if (udevice == NULL)
|
|
+ goto out;
|
|
+ if (g_strcmp0(udev_device_get_action(udevice), "add") != 0)
|
|
+ goto out;
|
|
+
|
|
+ g_timeout_add_seconds(1, (GSourceFunc) device_event_idle, udevice);
|
|
+
|
|
+out:
|
|
+ return TRUE;
|
|
+}
|
|
+
|
|
+
|
|
+static int cable_init(void)
|
|
+{
|
|
+ GIOChannel *channel;
|
|
+
|
|
+ DBG("Setup cable plugin");
|
|
+
|
|
+ ctx = udev_new();
|
|
+ monitor = udev_monitor_new_from_netlink(ctx, "udev");
|
|
+ if (monitor == NULL) {
|
|
+ error ("Could not get udev monitor");
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ /* Listen for newly connected usb device */
|
|
+ udev_monitor_filter_add_match_subsystem_devtype(monitor,
|
|
+ "usb", NULL);
|
|
+ udev_monitor_enable_receiving(monitor);
|
|
+
|
|
+ channel = g_io_channel_unix_new(udev_monitor_get_fd(monitor));
|
|
+ watch_id = g_io_add_watch(channel, G_IO_IN, monitor_event, NULL);
|
|
+ g_io_channel_unref(channel);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void cable_exit(void)
|
|
+{
|
|
+ DBG("Cleanup cable plugin");
|
|
+
|
|
+ if (watch_id != 0) {
|
|
+ g_source_remove(watch_id);
|
|
+ watch_id = 0;
|
|
+ }
|
|
+ if (monitor != NULL) {
|
|
+ udev_monitor_unref(monitor);
|
|
+ monitor = NULL;
|
|
+ }
|
|
+ if (ctx != NULL) {
|
|
+ udev_unref(ctx);
|
|
+ ctx = NULL;
|
|
+ }
|
|
+}
|
|
+
|
|
+BLUETOOTH_PLUGIN_DEFINE(cable, VERSION,
|
|
+ BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, cable_init, cable_exit)
|
|
diff --git a/src/adapter.c b/src/adapter.c
|
|
index f922876..b688642 100644
|
|
--- a/src/adapter.c
|
|
+++ b/src/adapter.c
|
|
@@ -952,6 +952,25 @@ static struct btd_device *adapter_create_device(DBusConnection *conn,
|
|
return device;
|
|
}
|
|
|
|
+void adapter_create_device_for_device(DBusConnection *conn,
|
|
+ struct btd_adapter *adapter,
|
|
+ struct btd_device *device)
|
|
+{
|
|
+ const char *path;
|
|
+
|
|
+ device_set_temporary(device, TRUE);
|
|
+
|
|
+ adapter->devices = g_slist_append(adapter->devices, device);
|
|
+
|
|
+ path = device_get_path(device);
|
|
+ g_dbus_emit_signal(conn, adapter->path,
|
|
+ ADAPTER_INTERFACE, "DeviceCreated",
|
|
+ DBUS_TYPE_OBJECT_PATH, &path,
|
|
+ DBUS_TYPE_INVALID);
|
|
+
|
|
+ adapter_update_devices(adapter);
|
|
+}
|
|
+
|
|
void adapter_remove_device(DBusConnection *conn, struct btd_adapter *adapter,
|
|
struct btd_device *device,
|
|
gboolean remove_storage)
|
|
diff --git a/src/adapter.h b/src/adapter.h
|
|
index b7ea62b..ac0aa2e 100644
|
|
--- a/src/adapter.h
|
|
+++ b/src/adapter.h
|
|
@@ -114,6 +114,9 @@ void adapter_update_found_devices(struct btd_adapter *adapter,
|
|
uint8_t *data, uint8_t data_len);
|
|
void adapter_emit_device_found(struct btd_adapter *adapter,
|
|
struct remote_dev_info *dev);
|
|
+void adapter_create_device_for_device(DBusConnection *conn,
|
|
+ struct btd_adapter *adapter,
|
|
+ struct btd_device *device);
|
|
void adapter_mode_changed(struct btd_adapter *adapter, uint8_t scan_mode);
|
|
int adapter_set_name(struct btd_adapter *adapter, const char *name);
|
|
void adapter_name_changed(struct btd_adapter *adapter, const char *name);
|
|
diff --git a/src/device.c b/src/device.c
|
|
index c210bcb..056b450 100644
|
|
--- a/src/device.c
|
|
+++ b/src/device.c
|
|
@@ -471,31 +471,46 @@ static DBusMessage *set_alias(DBusConnection *conn, DBusMessage *msg,
|
|
return dbus_message_new_method_return(msg);
|
|
}
|
|
|
|
-static DBusMessage *set_trust(DBusConnection *conn, DBusMessage *msg,
|
|
- gboolean value, void *data)
|
|
+int device_set_trust (DBusConnection *conn, struct btd_device *device,
|
|
+ gboolean trusted)
|
|
{
|
|
- struct btd_device *device = data;
|
|
struct btd_adapter *adapter = device->adapter;
|
|
char srcaddr[18], dstaddr[18];
|
|
bdaddr_t src;
|
|
int err;
|
|
|
|
- if (device->trusted == value)
|
|
- return dbus_message_new_method_return(msg);
|
|
-
|
|
adapter_get_address(adapter, &src);
|
|
ba2str(&src, srcaddr);
|
|
ba2str(&device->bdaddr, dstaddr);
|
|
|
|
- err = write_trust(srcaddr, dstaddr, GLOBAL_TRUST, value);
|
|
+ err = write_trust(srcaddr, dstaddr, GLOBAL_TRUST, trusted);
|
|
if (err < 0)
|
|
- return btd_error_failed(msg, strerror(-err));
|
|
+ return err;
|
|
|
|
- device->trusted = value;
|
|
+ device->trusted = trusted;
|
|
|
|
- emit_property_changed(conn, dbus_message_get_path(msg),
|
|
+ emit_property_changed(conn, device->path,
|
|
DEVICE_INTERFACE, "Trusted",
|
|
- DBUS_TYPE_BOOLEAN, &value);
|
|
+ DBUS_TYPE_BOOLEAN, &trusted);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static DBusMessage *set_trust(DBusConnection *conn, DBusMessage *msg,
|
|
+ gboolean value, void *data)
|
|
+{
|
|
+ struct btd_device *device = data;
|
|
+ struct btd_adapter *adapter = device->adapter;
|
|
+ char srcaddr[18], dstaddr[18];
|
|
+ bdaddr_t src;
|
|
+ int err;
|
|
+
|
|
+ if (device->trusted == value)
|
|
+ return dbus_message_new_method_return(msg);
|
|
+
|
|
+ err = device_set_trust (conn, device, value);
|
|
+ if (err < 0)
|
|
+ return btd_error_failed(msg, strerror(-err));
|
|
|
|
return dbus_message_new_method_return(msg);
|
|
}
|
|
diff --git a/src/device.h b/src/device.h
|
|
index 26e17f7..0d5e5ce 100644
|
|
--- a/src/device.h
|
|
+++ b/src/device.h
|
|
@@ -119,6 +119,8 @@ void btd_unregister_device_driver(struct btd_device_driver *driver);
|
|
struct btd_device *btd_device_ref(struct btd_device *device);
|
|
void btd_device_unref(struct btd_device *device);
|
|
|
|
+int device_set_trust(DBusConnection *conn, struct btd_device *device,
|
|
+ gboolean trusted);
|
|
int device_block(DBusConnection *conn, struct btd_device *device,
|
|
gboolean update_only);
|
|
int device_unblock(DBusConnection *conn, struct btd_device *device,
|
|
--
|
|
1.8.3.1
|
|
|