diff options
| author | ccsmart <ccsmart@smartpal.de> | 2005-09-21 12:05:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-21 12:05:30 +0000 |
| commit | cac237d6d44bb53b78e92e2381fe969103ef166b (patch) | |
| tree | f2ae3843c312a02a3ba2c844ac07b89d74d2f10f /packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch | |
| parent | d2940707a1e6e8397f46c21d6820eeb0f941bdd7 (diff) | |
| parent | 1aa844cac6e6034826f9bf1b8fc59d49b7125599 (diff) | |
merge of 15102cf542cc997f3e0ddb34d8f69395cdf724c0
and 26c9a4c6e4fd286acde8c53cec3cd492e7bbd3cf
Diffstat (limited to 'packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch')
| -rw-r--r-- | packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch b/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch new file mode 100644 index 0000000000..276281c14e --- /dev/null +++ b/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch @@ -0,0 +1,42 @@ +--- bluez-utils-2.20/hcid/dbus.c.orig 2005-09-21 11:27:26 +0200 ++++ bluez-utils-2.20/hcid/dbus.c 2005-09-21 11:27:35 +0200 +@@ -120,6 +121,7 @@ + DBusMessage *message; + #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC + uint8_t *addr = (uint8_t *) &ci->bdaddr; ++ uint32_t ci_out = ci->out; + #else + DBusMessageIter iter; + #endif +@@ -138,7 +140,7 @@ + bacpy(&req->bda, &ci->bdaddr); + + #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC +- dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci->out, ++ dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci_out, + DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, + &addr, sizeof(bdaddr_t), DBUS_TYPE_INVALID); + #else +@@ -261,6 +263,8 @@ + DBusMessage *message; + #ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC + DBusMessageIter iter; ++#else ++ int32_t tmp_rssi = rssi; + #endif + char *local_addr, *peer_addr; + bdaddr_t tmp; +@@ -276,11 +280,12 @@ + } + + #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC ++ + dbus_message_append_args(message, + DBUS_TYPE_STRING, &local_addr, + DBUS_TYPE_STRING, &peer_addr, + DBUS_TYPE_UINT32, &class, +- DBUS_TYPE_INT32, &rssi, ++ DBUS_TYPE_INT32, &tmp_rssi, + DBUS_TYPE_INVALID); + #else + dbus_message_append_iter_init(message, &iter); |