org.handhelds.familiar/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch

   1 --- bluez-utils-2.20/hcid/dbus.c.orig   2005-09-21 11:27:26 +0200
   2 +++ bluez-utils-2.20/hcid/dbus.c        2005-09-21 11:27:35 +0200
   3 @@ -120,6 +121,7 @@
   4         DBusMessage *message;
   5  #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
   6         uint8_t *addr = (uint8_t *) &ci->bdaddr;
   7 +       uint32_t ci_out = ci->out;
   8  #else
   9         DBusMessageIter iter;
  10  #endif
  11 @@ -138,7 +140,7 @@
  12         bacpy(&req->bda, &ci->bdaddr);
  13
  14  #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
  15 -       dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci->out,
  16 +       dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci_out,
  17                         DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE,
  18                         &addr, sizeof(bdaddr_t), DBUS_TYPE_INVALID);
  19  #else
  20 @@ -261,6 +263,8 @@
  21         DBusMessage *message;
  22  #ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
  23         DBusMessageIter iter;
  24 +#else
  25 +       int32_t tmp_rssi = rssi;
  26  #endif
  27         char *local_addr, *peer_addr;
  28         bdaddr_t tmp;
  29 @@ -276,11 +280,12 @@
  30         }
  31
  32  #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
  33 +
  34         dbus_message_append_args(message,
  35                                         DBUS_TYPE_STRING, &local_addr,
  36                                         DBUS_TYPE_STRING, &peer_addr,
  37                                         DBUS_TYPE_UINT32, &class,
  38 -                                       DBUS_TYPE_INT32, &rssi,
  39 +                                       DBUS_TYPE_INT32, &tmp_rssi,
  40                                         DBUS_TYPE_INVALID);
  41  #else
  42         dbus_message_append_iter_init(message, &iter);