diff options
Diffstat (limited to 'hcid/dbus.h')
| -rw-r--r-- | hcid/dbus.h | 103 |
1 files changed, 61 insertions, 42 deletions
diff --git a/hcid/dbus.h b/hcid/dbus.h index 8ba45517..4ac2f738 100644 --- a/hcid/dbus.h +++ b/hcid/dbus.h @@ -44,17 +44,35 @@ /*======================================================================== BlueZ D-Bus Device service definitions "/org/bluez/Device" *========================================================================*/ +#define DEV_GET_DEV "DeviceList" #define DEV_UP "Up" #define DEV_DOWN "Down" #define DEV_RESET "Reset" #define DEV_SET_PROPERTY "SetProperty" #define DEV_GET_PROPERTY "GetProperty" -#define DEV_UP_SIGNATURE __END_SIG__ -#define DEV_DOWN_SIGNATURE __END_SIG__ -#define DEV_RESET_SIGNATURE __END_SIG__ -#define DEV_SET_PROPERTY_SIGNATURE __END_SIG__ -#define DEV_GET_PROPERTY_SIGNATURE __END_SIG__ +#define DEV_GET_DEV_SIGNATURE __END_SIG__ + +/* DeviceList Reply: a(devname, addr, type, up/down, a(flags)) - all types strings */ +#define DEV_GET_DEV_REPLY_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 DEV_GET_DEV_REPLY_SIGNATURE DBUS_TYPE_ARRAY_AS_STRING \ + DEV_GET_DEV_REPLY_STRUCT_SIGNATURE \ + __END_SIG__ + +#define DEV_UP_SIGNATURE __END_SIG__ +#define DEV_DOWN_SIGNATURE __END_SIG__ +#define DEV_RESET_SIGNATURE __END_SIG__ +#define DEV_SET_PROPERTY_SIGNATURE __END_SIG__ +#define DEV_GET_PROPERTY_SIGNATURE __END_SIG__ /*======================================================================== BlueZ D-Bus Manager service definitions "/org/bluez/Manager" @@ -68,14 +86,14 @@ #define MGR_ENABLE "Enable" #define MGR_DISABLE "Disable" -//signatures +/* Signatures */ #define MGR_GET_DEV_SIGNATURE __END_SIG__ -/* yya(ss)*/ -#define MGR_GET_DEV_REPLY_SIGNATURE DBUS_TYPE_BYTE_AS_STRING\ - DBUS_TYPE_BYTE_AS_STRING\ - DBUS_TYPE_ARRAY_AS_STRING\ - HCI_DEVICE_STRUCT_SIGNATURE\ +/* yya(ss) */ +#define MGR_GET_DEV_REPLY_SIGNATURE DBUS_TYPE_BYTE_AS_STRING \ + DBUS_TYPE_BYTE_AS_STRING \ + DBUS_TYPE_ARRAY_AS_STRING \ + HCI_DEVICE_STRUCT_SIGNATURE \ __END_SIG__ /* ===== HCI definitions ===== */ @@ -83,7 +101,7 @@ #define BLUEZ_HCI_PATH MANAGER_PATH "/" BLUEZ_HCI #define BLUEZ_HCI_INTERFACE MANAGER_INTERFACE "." BLUEZ_HCI -//Device based HCI signals +/* Device based HCI signals */ #define BLUEZ_HCI_INQ_START "InquiryStart" #define BLUEZ_HCI_INQ_COMPLETE "InquiryComplete" #define BLUEZ_HCI_INQ_RESULT "InquiryResult" @@ -91,11 +109,11 @@ #define BLUEZ_HCI_REMOTE_NAME_FAILED "RemoteNameFailed" #define BLUEZ_HCI_AUTH_COMPLETE "AuthenticationComplete" -//HCI signals sent in the BLUEZ_HCI_PATH +/* HCI signals sent in the BLUEZ_HCI_PATH */ #define BLUEZ_HCI_DEV_ADDED "DeviceAdded" #define BLUEZ_HCI_DEV_REMOVED "DeviceRemoved" -//HCI Provided services +/* HCI Provided services */ #define HCI_PERIODIC_INQ "PeriodicInquiry" #define HCI_CANCEL_PERIODIC_INQ "CancelPeriodic" #define HCI_INQ "Inquiry" @@ -106,51 +124,52 @@ #define HCI_AUTHENTICATE "Authenticate" -#define HCI_PERIODIC_INQ_SIGNATURE DBUS_TYPE_BYTE_AS_STRING\ - DBUS_TYPE_BYTE_AS_STRING\ - DBUS_TYPE_BYTE_AS_STRING\ +#define HCI_PERIODIC_INQ_SIGNATURE DBUS_TYPE_BYTE_AS_STRING \ + DBUS_TYPE_BYTE_AS_STRING \ + DBUS_TYPE_BYTE_AS_STRING \ __END_SIG__ #define HCI_CANCEL_PERIODIC_INQ_SIGNATURE __END_SIG__ -#define HCI_INQ_SIGNATURE DBUS_TYPE_BYTE_AS_STRING\ - DBUS_TYPE_BYTE_AS_STRING\ +#define HCI_INQ_SIGNATURE DBUS_TYPE_BYTE_AS_STRING \ + DBUS_TYPE_BYTE_AS_STRING \ __END_SIG__ #define HCI_CANCEL_INQ_SIGNATURE __END_SIG__ -#define HCI_ROLE_SWITCH_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ - DBUS_TYPE_BYTE_AS_STRING\ +#define HCI_ROLE_SWITCH_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ + DBUS_TYPE_BYTE_AS_STRING \ __END_SIG__ - -#define HCI_REMOTE_NAME_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ + +#define HCI_REMOTE_NAME_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ - + #define HCI_CONNECTIONS_SIGNATURE __END_SIG__ -#define HCI_CONN_INFO_STRUCT_SIGNATURE DBUS_STRUCT_BEGIN_CHAR_AS_STRING\ - DBUS_TYPE_UINT16_AS_STRING\ - DBUS_TYPE_STRING_AS_STRING\ - DBUS_TYPE_BYTE_AS_STRING\ - DBUS_TYPE_BYTE_AS_STRING\ - DBUS_TYPE_UINT16_AS_STRING\ - DBUS_TYPE_UINT32_AS_STRING\ - DBUS_STRUCT_END_CHAR_AS_STRING\ +#define HCI_CONN_INFO_STRUCT_SIGNATURE DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ + DBUS_TYPE_UINT16_AS_STRING \ + DBUS_TYPE_STRING_AS_STRING \ + DBUS_TYPE_BYTE_AS_STRING \ + DBUS_TYPE_BYTE_AS_STRING \ + DBUS_TYPE_UINT16_AS_STRING \ + DBUS_TYPE_UINT32_AS_STRING \ + DBUS_STRUCT_END_CHAR_AS_STRING \ __END_SIG__ -#define HCI_DEVICE_STRUCT_SIGNATURE DBUS_STRUCT_BEGIN_CHAR_AS_STRING\ - DBUS_TYPE_STRING_AS_STRING\ - DBUS_TYPE_STRING_AS_STRING\ - DBUS_STRUCT_END_CHAR_AS_STRING +#define HCI_DEVICE_STRUCT_SIGNATURE DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ + DBUS_TYPE_STRING_AS_STRING \ + DBUS_TYPE_STRING_AS_STRING \ + DBUS_STRUCT_END_CHAR_AS_STRING \ + __END_SIG__ -#define HCI_INQ_REPLY_SIGNATURE DBUS_STRUCT_BEGIN_CHAR_AS_STRING\ - DBUS_TYPE_STRING_AS_STRING\ - DBUS_TYPE_UINT32_AS_STRING\ - DBUS_TYPE_UINT16_AS_STRING\ - DBUS_STRUCT_END_CHAR_AS_STRING\ +#define HCI_INQ_REPLY_SIGNATURE DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ + DBUS_TYPE_STRING_AS_STRING \ + DBUS_TYPE_UINT32_AS_STRING \ + DBUS_TYPE_UINT16_AS_STRING \ + DBUS_STRUCT_END_CHAR_AS_STRING \ __END_SIG__ -#define HCI_AUTHENTICATE_SIGNATURE DBUS_TYPE_STRING_AS_STRING\ +#define HCI_AUTHENTICATE_SIGNATURE DBUS_TYPE_STRING_AS_STRING \ __END_SIG__ |