summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2006-02-24 02:26:45 +0000
committerMarcel Holtmann <marcel@holtmann.org>2006-02-24 02:26:45 +0000
commit9e58a4f7963cb84e5804feb979aa6a479c90a897 (patch)
tree1c8da6b0fe28ac4f88b7ac6fd8ce5b86b5b7fefe
parentcbedcb58d895cc15f6b697926834eb9f421956bb (diff)
Make features return an empty list and remove class method
-rw-r--r--hcid/dbus-device.c23
-rw-r--r--hcid/dbus.h1
2 files changed, 14 insertions, 10 deletions
diff --git a/hcid/dbus-device.c b/hcid/dbus-device.c
index 8f7d6bfe..6491aacf 100644
--- a/hcid/dbus-device.c
+++ b/hcid/dbus-device.c
@@ -259,7 +259,20 @@ static DBusMessage *handle_dev_get_company_req(DBusMessage *msg, void *data)
static DBusMessage *handle_dev_get_features_req(DBusMessage *msg, void *data)
{
- return bluez_new_failure_msg(msg, BLUEZ_EDBUS_NOT_IMPLEMENTED);
+ DBusMessage *reply;
+ DBusMessageIter iter;
+ DBusMessageIter array_iter;
+
+ reply = dbus_message_new_method_return(msg);
+
+ dbus_message_iter_init_append(reply, &iter);
+
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_STRING_AS_STRING, &array_iter);
+
+ dbus_message_iter_close_container(&iter, &array_iter);
+
+ return reply;
}
static DBusMessage *handle_dev_get_name_req(DBusMessage *msg, void *data)
@@ -445,12 +458,6 @@ static DBusMessage *handle_dev_is_discoverable_req(DBusMessage *msg, void *data)
return reply;
}
-static DBusMessage *handle_dev_set_class_req(DBusMessage *msg, void *data)
-{
- /*FIXME: */
- return bluez_new_failure_msg(msg, BLUEZ_EDBUS_NOT_IMPLEMENTED);
-}
-
static DBusMessage *handle_dev_set_discoverable_to_req(DBusMessage *msg, void *data)
{
struct hci_dbus_data *dbus_data = data;
@@ -651,7 +658,6 @@ failed:
hci_close_dev(dd);
return reply;
-
}
static DBusMessage *handle_dev_discover_cache_req(DBusMessage *msg, void *data)
@@ -1085,7 +1091,6 @@ static const struct service_data dev_services[] = {
{ DEV_IS_CONNECTABLE, handle_dev_is_connectable_req, DEV_IS_CONNECTABLE_SIGNATURE },
{ DEV_IS_DISCOVERABLE, handle_dev_is_discoverable_req, DEV_IS_DISCOVERABLE_SIGNATURE },
- { DEV_SET_CLASS, handle_dev_set_class_req, DEV_SET_CLASS_SIGNATURE },
{ DEV_SET_DISCOVERABLE_TO, handle_dev_set_discoverable_to_req, DEV_SET_DISCOVERABLE_TO_SIGNATURE },
{ DEV_SET_MINOR_CLASS, handle_dev_set_minor_class_req, DEV_SET_MINOR_CLASS_SIGNATURE },
{ DEV_SET_MODE, handle_dev_set_mode_req, DEV_SET_MODE_SIGNATURE },
diff --git a/hcid/dbus.h b/hcid/dbus.h
index 86303ef1..acbd6c62 100644
--- a/hcid/dbus.h
+++ b/hcid/dbus.h
@@ -122,7 +122,6 @@ int get_default_dev_id(void);
#define DEV_GET_VERSION "GetVersion"
#define DEV_IS_CONNECTABLE "IsConnectable"
#define DEV_IS_DISCOVERABLE "IsDiscoverable"
-#define DEV_SET_CLASS "SetClass"
#define DEV_SET_DISCOVERABLE_TO "SetDiscoverableTimeout"
#define DEV_SET_MINOR_CLASS "SetMinorClass"
#define DEV_SET_MODE "SetMode"