summaryrefslogtreecommitdiffstats
path: root/hcid/adapter.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-08-17 20:28:47 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-08-17 20:28:47 +0000
commit86892be8d38960096f9b9c5613ba28fc9003d288 (patch)
treefdf1987d0e4f261112ea3fb4561c3cb4fd50e943 /hcid/adapter.c
parentc2f12da34adf0e5d2a04b7b3dbeb3753cb77f5d7 (diff)
Add initial steps for generic device handling
Diffstat (limited to 'hcid/adapter.c')
-rw-r--r--hcid/adapter.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/hcid/adapter.c b/hcid/adapter.c
index 70bac90f..16db0ba7 100644
--- a/hcid/adapter.c
+++ b/hcid/adapter.c
@@ -49,6 +49,7 @@
#include "hcid.h"
#include "dbus.h"
+#include "device.h"
#include "textfile.h"
#include "oui.h"
@@ -3099,13 +3100,19 @@ static DBusHandlerResult adapter_list_trusts(DBusConnection *conn,
return send_message_and_unref(conn, reply);
}
+static void do_append_device(struct device_data *device, DBusMessageIter *iter)
+{
+ const char *path = device->path;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &path);
+}
+
static DBusHandlerResult list_devices(DBusConnection *conn,
DBusMessage *msg, void *data)
{
DBusMessage *reply;
DBusMessageIter iter;
DBusMessageIter array_iter;
- //const char *path = "/org/bluez/device";
if (!dbus_message_has_signature(msg, DBUS_TYPE_INVALID_AS_STRING))
return error_invalid_arguments(conn, msg);
@@ -3118,7 +3125,7 @@ static DBusHandlerResult list_devices(DBusConnection *conn,
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
DBUS_TYPE_STRING_AS_STRING, &array_iter);
- //dbus_message_iter_append_basic(&array_iter, DBUS_TYPE_STRING, &path);
+ device_foreach((GFunc) do_append_device, &array_iter);
dbus_message_iter_close_container(&iter, &array_iter);
@@ -3128,8 +3135,10 @@ static DBusHandlerResult list_devices(DBusConnection *conn,
static DBusHandlerResult create_device(DBusConnection *conn,
DBusMessage *msg, void *data)
{
+ struct adapter *adapter = data;
+ struct device_data *device;
DBusMessage *reply;
- const char *address, *path = "/org/bluez/device";
+ const char *address, *path;
if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &address,
DBUS_TYPE_INVALID) == FALSE)
@@ -3142,8 +3151,12 @@ static DBusHandlerResult create_device(DBusConnection *conn,
if (!reply)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
+ device = device_create(adapter->address, address);
+
+ path = device->path;
+
dbus_message_append_args(reply, DBUS_TYPE_STRING, &path,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
return send_message_and_unref(conn, reply);
}
@@ -3162,6 +3175,8 @@ static DBusHandlerResult remove_device(DBusConnection *conn,
if (!reply)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
+ device_remove(path);
+
return send_message_and_unref(conn, reply);
}