To: bluez-devel@lists.sourceforge.net
From: =?iso-8859-1?Q?M=E5ns_Rullg=E5rd?= <mru@inprovide.com>
Date: Sun, 21 Jan 2007 18:23:54 +0000
Message-ID: <yw1x4pqk44sl.fsf@thrashbarg.inprovide.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Subject: [Bluez-devel] [PATCH] make 64-bit headsetd work with 32-bit clients
Reply-To: BlueZ development <bluez-devel@lists.sourceforge.net>
Sender: bluez-devel-bounces@lists.sourceforge.net
Errors-To: bluez-devel-bounces@lists.sourceforge.net

--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable

The attached patch makes headsetd and the ALSA PCM plugin use
fixed-width types in the IPC data structures.  Without this, a 32-bit
client will not work with a 64-bit headsetd and vice versa because of
the different sizes of the 'long' type.

--=20
M=E5ns Rullg=E5rd
mru@inprovide.com

--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=headset-32-64bit.patch

Index: alsa-plugins/pcm_sco.c
===================================================================
RCS file: /cvsroot/bluetooth-alsa/plugz/alsa-plugins/pcm_sco.c,v
retrieving revision 1.2
diff -u -r1.2 pcm_sco.c
--- alsa-plugins/pcm_sco.c	28 Dec 2006 12:52:37 -0000	1.2
+++ alsa-plugins/pcm_sco.c	21 Jan 2007 16:05:30 -0000
@@ -24,6 +24,7 @@
 #include <sys/un.h>
 #include <unistd.h>
 #include <errno.h>
+#include <stdint.h>
 
 #include <alsa/asoundlib.h>
 #include <alsa/pcm_external.h>
@@ -85,8 +86,8 @@
 	unsigned char type;
 	union {
 		bdaddr_t     bdaddr;	               /* PKT_TYPE_CFG_BDADDR        */
-		long         timeout;                  /* PKT_TYPE_CFG_PAGINGTIMEOUT */
-		int	     errorcode;		       /* PKT_TYPE_ERROR_IND        */
+		int32_t      timeout;                  /* PKT_TYPE_CFG_PAGINGTIMEOUT */
+		int32_t	     errorcode;		       /* PKT_TYPE_ERROR_IND        */
 	};
 } ipc_packet_t;
 
Index: alsa-plugins/headsetd/states.c
===================================================================
RCS file: /cvsroot/bluetooth-alsa/plugz/alsa-plugins/headsetd/states.c,v
retrieving revision 1.2
diff -u -r1.2 states.c
--- alsa-plugins/headsetd/states.c	28 Dec 2006 12:52:38 -0000	1.2
+++ alsa-plugins/headsetd/states.c	21 Jan 2007 16:05:30 -0000
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <syslog.h>
+#include <stdint.h>
 
 #include <config.h>
 #include "states.h"
@@ -59,8 +60,8 @@
 	unsigned char type;
 	union {
 		bdaddr_t     bdaddr;	               /* PKT_TYPE_CFG_BDADDR        */
-		long         timeout;                  /* PKT_TYPE_CFG_PAGINGTIMEOUT */
-		int	     errorcode;		       /* PKT_TYPE_ERROR_IND         */
+		int32_t      timeout;                  /* PKT_TYPE_CFG_PAGINGTIMEOUT */
+		int32_t	     errorcode;		       /* PKT_TYPE_ERROR_IND         */
 	};
 } ipc_packet_t;
 

--=-=-=
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
--=-=-=
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

--=-=-=--