Re: [Bluez-devel] hcid: memory alignment problems on arm

[pHilipp Zabel <philipp.zabel@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

Hi Marcel,

On 9/21/05, Marcel Holtmann <marcel@holtmann.org> wrote:
> the patch looks good, but you must redo it against the latest CVS. I
> removed the compat code for the D-Bus 0.23 API.

Thanks, I have attached an updated patch against CVS.

--
Philipp

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: hcid-alignment-fix.patch --]
[-- Type: text/x-patch; name="hcid-alignment-fix.patch", Size: 1111 bytes --]

--- utils/hcid/dbus.c.orig	2005-09-22 11:12:17 +0200
+++ utils/hcid/dbus.c	2005-09-22 11:14:36 +0200
@@ -124,6 +124,7 @@
 	DBusPendingCall *pending = NULL;
 	struct pin_request *req;
 	uint8_t *addr = (uint8_t *) &ci->bdaddr;
+	uint32_t tmp_out = ci->out;
 
 	message = dbus_message_new_method_call(SERVICE_NAME, PATH_NAME,
 						INTERFACE_NAME, REQUEST_NAME);
@@ -136,7 +137,7 @@
 	req->dev = dev;
 	bacpy(&req->bda, &ci->bdaddr);
 
-	dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci->out,
+	dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &tmp_out,
 			DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE,
 			&addr, sizeof(bdaddr_t), DBUS_TYPE_INVALID);
 
@@ -233,6 +234,7 @@
 {
 	DBusMessage *message;
 	char *local_addr, *peer_addr;
+	int32_t tmp_rssi = rssi;
 	bdaddr_t tmp;
 
 	baswap(&tmp, local); local_addr = batostr(&tmp);
@@ -249,7 +251,7 @@
 					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);
 
 	if (dbus_connection_send(connection, message, NULL) == FALSE) {