diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2006-02-12 05:13:08 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2006-02-12 05:13:08 +0000 |
| commit | 96449478703013c0028864afc1ec544b6a098f65 (patch) | |
| tree | 085b54f264470c7c535cee3aae388ea9712264c2 /hcid/dbus.h | |
| parent | 26e327337a93571c7b27421e0d2f81a9e8392e42 (diff) | |
Update the device listing method
Diffstat (limited to 'hcid/dbus.h')
| -rw-r--r-- | hcid/dbus.h | 57 |
1 files changed, 20 insertions, 37 deletions
diff --git a/hcid/dbus.h b/hcid/dbus.h index 2e92a3bd..668302c3 100644 --- a/hcid/dbus.h +++ b/hcid/dbus.h @@ -67,25 +67,9 @@ #define MGR_DEVICE_LIST_SIGNATURE __END_SIG__ #define MGR_DEFAULT_DEVICE_SIGNATURE __END_SIG__ - -/*FIXME: should it be moved to a internal header file? */ -/* DeviceList Reply: a(devname, addr, type, up/down, a(flags)) - all types strings */ -#define MGR_REPLY_DEVICE_LIST_STRUCT_SIGNATURE DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ - DBUS_TYPE_STRING_AS_STRING \ - DBUS_TYPE_STRING_AS_STRING \ - DBUS_TYPE_STRING_AS_STRING \ - DBUS_TYPE_STRING_AS_STRING \ - DBUS_TYPE_ARRAY_AS_STRING \ - DBUS_TYPE_STRING_AS_STRING \ - DBUS_STRUCT_END_CHAR_AS_STRING \ - __END_SIG__ - #define MGR_REPLY_DEVICE_LIST_SIGNATURE DBUS_TYPE_ARRAY_AS_STRING \ - MGR_REPLY_DEVICE_LIST_STRUCT_SIGNATURE \ __END_SIG__ - - /*======================================================================== BlueZ D-Bus Device path definitions "/org/bluez/Device" *========================================================================*/ @@ -125,7 +109,7 @@ /*FIXME: maybe this section can be moved to a internal header file */ /* Device service signature */ #define DEV_GET_ADDRESS_SIGNATURE __END_SIG__ -#define DEV_GET_ALIAS_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_GET_ALIAS_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ #define DEV_GET_COMPANY_SIGNATURE __END_SIG__ #define DEV_GET_DISCOVERABLE_TO_SIGNATURE __END_SIG__ @@ -136,44 +120,44 @@ #define DEV_GET_REVISION_SIGNATURE __END_SIG__ #define DEV_GET_VERSION_SIGNATURE __END_SIG__ #define DEV_IS_CONNECTABLE_SIGNATURE __END_SIG__ -#define DEV_IS_DISCOVERABLE_SIGNATURE __END_SIG__ -#define DEV_SET_ALIAS_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ - DBUS_TYPE_STRING_AS_STRING\ +#define DEV_IS_DISCOVERABLE_SIGNATURE __END_SIG__ +#define DEV_SET_ALIAS_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ + DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_SET_CLASS_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ - DBUS_TYPE_STRING_AS_STRING\ +#define DEV_SET_CLASS_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ + DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_SET_DISCOVERABLE_TO_SIGNATURE DBUS_TYPE_UINT32_AS_STRING\ +#define DEV_SET_DISCOVERABLE_TO_SIGNATURE DBUS_TYPE_UINT32_AS_STRING \ __END_SIG__ -#define DEV_SET_MODE_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_SET_MODE_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_SET_NAME_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_SET_NAME_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ #define DEV_DISCOVER_SIGNATURE __END_SIG__ #define DEV_DISCOVER_CACHE_SIGNATURE __END_SIG__ #define DEV_DISCOVER_CANCEL_SIGNATURE __END_SIG__ -#define DEV_DISCOVER_SERVICE_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_DISCOVER_SERVICE_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_LAST_SEEN_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_LAST_SEEN_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_LAST_USED_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_LAST_USED_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_REMOTE_ALIAS_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_REMOTE_ALIAS_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_REMOTE_NAME_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_REMOTE_NAME_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_REMOTE_VERSION_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_REMOTE_VERSION_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_CREATE_BONDING_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_CREATE_BONDING_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ #define DEV_LIST_BONDINGS_SIGNATURE __END_SIG__ -#define DEV_HAS_BONDING_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_HAS_BONDING_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_REMOVE_BONDING_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_REMOVE_BONDING_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_PIN_CODE_LENGTH_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_PIN_CODE_LENGTH_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ -#define DEV_ENCRYPTION_KEY_SIZE_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define DEV_ENCRYPTION_KEY_SIZE_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ @@ -233,4 +217,3 @@ #define BLUEZ_DBUS_ERR_NO_MEMORY_STR "No memory" #endif /* __H_BLUEZ_DBUS_H__ */ - |