commit bluez-libs

31 Jul 2006

Hello community,

here is the log from the commit of package bluez-libs
checked in at Mon Jul 31 23:27:05 CEST 2006.

--------

--- bluez-libs/bluez-libs.changes	2006-07-06 16:21:28.000000000 +0200
+++ bluez-libs/bluez-libs.changes	2006-07-31 19:25:31.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Jul 31 19:24:32 CEST 2006 - seife@suse.de
+
+- update to v3.2
+  * Fix handling of SDP strings.
+  * Add adapter type for SDIO cards.
+  * Add features bit for link supervision timeout.
+
+-------------------------------------------------------------------

Old:
----
  bluez-libs-3.1.tar.gz

New:
----
  bluez-libs-3.2.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ bluez-libs.spec ++++++
--- /var/tmp/diff_new_pack.ys8evr/_old	2006-07-31 23:26:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ys8evr/_new	2006-07-31 23:26:59.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package bluez-libs (Version 3.1)
+# spec file for package bluez-libs (Version 3.2)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
 
 Name:           bluez-libs
 URL:            http://bluez.sourceforge.net
-Version:        3.1
+Version:        3.2
 Release:        1
 Summary:        Bluetooth Libraries
 License:        GPL
@@ -65,6 +65,11 @@
 %doc AUTHORS COPYING INSTALL ChangeLog NEWS README
 
 %changelog -n bluez-libs
+* Mon Jul 31 2006 - seife@suse.de
+- update to v3.2
+  * Fix handling of SDP strings.
+  * Add adapter type for SDIO cards.
+  * Add features bit for link supervision timeout.
 * Thu Jul 06 2006 - seife@suse.de
 - update to v3.1:
   * Add missing placeholders for feature bits.

++++++ bluez-libs-3.1.tar.gz -> bluez-libs-3.2.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.1/ChangeLog new/bluez-libs-3.2/ChangeLog
--- old/bluez-libs-3.1/ChangeLog	2006-06-17 16:31:35.000000000 +0200
+++ new/bluez-libs-3.2/ChangeLog	2006-07-27 06:36:59.000000000 +0200
@@ -1,3 +1,8 @@
+ver 3.2
+	Fix handling of SDP strings.
+	Add adapter type for SDIO cards.
+	Add features bit for link supervision timeout.
+
 ver 3.1:
 	Add missing placeholders for feature bits.
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.1/configure new/bluez-libs-3.2/configure
--- old/bluez-libs-3.1/configure	2006-06-17 16:32:29.000000000 +0200
+++ new/bluez-libs-3.2/configure	2006-07-27 06:37:35.000000000 +0200
@@ -1775,7 +1775,7 @@
 
 # Define the identity of the package.
  PACKAGE=bluez-libs
- VERSION=3.1
+ VERSION=3.2
 
 
 cat >>confdefs.h <<_ACEOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.1/configure.in new/bluez-libs-3.2/configure.in
--- old/bluez-libs-3.1/configure.in	2006-06-17 16:31:35.000000000 +0200
+++ new/bluez-libs-3.2/configure.in	2006-07-27 06:36:59.000000000 +0200
@@ -1,7 +1,7 @@
 AC_PREREQ(2.50)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(bluez-libs, 3.1)
+AM_INIT_AUTOMAKE(bluez-libs, 3.2)
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.1/include/hci.h new/bluez-libs-3.2/include/hci.h
--- old/bluez-libs-3.1/include/hci.h	2006-05-31 17:42:39.000000000 +0200
+++ new/bluez-libs-3.2/include/hci.h	2006-07-27 06:36:59.000000000 +0200
@@ -48,12 +48,13 @@
 #define HCI_DEV_RESUME	6
 
 /* HCI device types */
-#define HCI_VHCI	0
+#define HCI_VIRTUAL	0
 #define HCI_USB		1
 #define HCI_PCCARD	2
 #define HCI_UART	3
 #define HCI_RS232	4
 #define HCI_PCI		5
+#define HCI_SDIO	6
 
 /* HCI device flags */
 enum {
@@ -254,6 +255,7 @@
 
 #define LMP_EXT_INQ	0x01
 
+#define LMP_LSTO	0x01
 #define LMP_EXT_FEAT	0x80
 
 /* Link policies */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.1/src/Makefile.am new/bluez-libs-3.2/src/Makefile.am
--- old/bluez-libs-3.1/src/Makefile.am	2006-06-17 16:31:35.000000000 +0200
+++ new/bluez-libs-3.2/src/Makefile.am	2006-07-27 06:36:59.000000000 +0200
@@ -2,7 +2,7 @@
 lib_LTLIBRARIES = libbluetooth.la
 
 libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c
-libbluetooth_la_LDFLAGS = -version-info 2:1:0
+libbluetooth_la_LDFLAGS = -version-info 3:0:1
 
 INCLUDES = -I$(top_builddir)/include
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.1/src/Makefile.in new/bluez-libs-3.2/src/Makefile.in
--- old/bluez-libs-3.1/src/Makefile.in	2006-06-17 16:32:28.000000000 +0200
+++ new/bluez-libs-3.2/src/Makefile.in	2006-07-27 06:37:33.000000000 +0200
@@ -165,7 +165,7 @@
 target_alias = @target_alias@
 lib_LTLIBRARIES = libbluetooth.la
 libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c
-libbluetooth_la_LDFLAGS = -version-info 2:1:0
+libbluetooth_la_LDFLAGS = -version-info 3:0:1
 INCLUDES = -I$(top_builddir)/include
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.1/src/hci.c new/bluez-libs-3.2/src/hci.c
--- old/bluez-libs-3.1/src/hci.c	2006-06-17 16:31:35.000000000 +0200
+++ new/bluez-libs-3.2/src/hci.c	2006-07-27 06:36:59.000000000 +0200
@@ -138,8 +138,8 @@
 char *hci_dtypetostr(int type)
 {
 	switch (type) {
-	case HCI_VHCI:
-		return "VHCI";
+	case HCI_VIRTUAL:
+		return "VIRTUAL";
 	case HCI_USB:
 		return "USB";
 	case HCI_PCCARD:
@@ -150,8 +150,10 @@
 		return "RS232";
 	case HCI_PCI:
 		return "PCI";
+	case HCI_SDIO:
+		return "SDIO";
 	default:
-		return "UKNW";
+		return "UNKNOWN";
 	}
 }
 
@@ -603,7 +605,7 @@
 		{ NULL }
 	},
 	{	/* Byte 7 */
-		{ "<no. 56>",		0x01		},	/* Bit 1 */
+		{ "<LSTO>",		LMP_LSTO	},	/* Bit 1 */
 		{ "<no. 57>",		0x02		},	/* Bit 1 */
 		{ "<no. 58>",		0x04		},	/* Bit 2 */
 		{ "<no. 59>",		0x08		},	/* Bit 3 */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.1/src/sdp.c new/bluez-libs-3.2/src/sdp.c
--- old/bluez-libs-3.1/src/sdp.c	2006-06-09 17:45:08.000000000 +0200
+++ new/bluez-libs-3.2/src/sdp.c	2006-07-27 06:36:59.000000000 +0200
@@ -432,22 +432,6 @@
 			}
 
 			memcpy(d->val.str, value, length);
-
-			if (length <= UCHAR_MAX) {
-				d->unitSize += sizeof(uint8_t);
-				if (dtd != SDP_URL_STR8 && dtd != SDP_TEXT_STR8) {
-					if (dtd == SDP_URL_STR16)
-						dtd = SDP_URL_STR8;
-					else
-						dtd = SDP_TEXT_STR8;
-				}
-			} else {
-				d->unitSize += sizeof(uint16_t);
-				if (dtd == SDP_TEXT_STR8)
-					dtd = SDP_TEXT_STR16;
-				else
-					dtd = SDP_URL_STR16;
-			}
 		} else {
 			SDPERR("Strings of size > USHRT_MAX not supported\n");
 			free(d);
@@ -742,10 +726,6 @@
 	case SDP_TEXT_STR32:
 		src = (unsigned char *)d->val.str;
 		data_size = d->unitSize - sizeof(uint8_t);
-		if (data_size - sizeof(uint8_t) <= UCHAR_MAX)
-			data_size -= sizeof(uint8_t);
-		else
-			data_size -= sizeof(uint16_t);
 		sdp_set_seq_len(seqp, data_size);
 		break;
 	case SDP_URL_STR8:
@@ -973,7 +953,7 @@
 	SDPDBG("Str : %s\n", s);
 
 	d->val.str = s;
-	d->unitSize = n;
+	d->unitSize = n + sizeof(uint8_t);
 	return d;
 }
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org

    

root＠suse.de

tags

participants (1)