From 4ae5537fffdc9c8dc11b26511c2c8a3196916071 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 1 Jun 2009 14:17:44 +0100
Subject: bluez: Update bluez4 version from OE.dev and drop bluez 3.x

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/bluez/files/02dtl1_cs.sh             | 57 ----------------------
 .../bluez/files/default-manfid-0x0-to-bcps.patch   | 22 ---------
 2 files changed, 79 deletions(-)
 delete mode 100644 meta/packages/bluez/files/02dtl1_cs.sh
 delete mode 100644 meta/packages/bluez/files/default-manfid-0x0-to-bcps.patch

(limited to 'meta/packages/bluez/files')

diff --git a/meta/packages/bluez/files/02dtl1_cs.sh b/meta/packages/bluez/files/02dtl1_cs.sh
deleted file mode 100644
index fefc72e07..000000000
--- a/meta/packages/bluez/files/02dtl1_cs.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	suspend)
-		if [ "`/sbin/hciconfig`" != "" ]; then
-			#If hciconfig outputs anything then there's probably a Bluetooth
-			# CF card in the slot so shut it down.
-			hcitool dc `hcitool con | grep ACL | sed 's/^.*\([0-9A-F]\{2\}\(:[0-9A-F]\{2\}\)\{5\}\).*$/\1/'`
-			hciconfig hci0 down
-			killall hciattach > /dev/null 2>&1 
-		fi 
-		;;
-
-	resume)
-		#check for kernel version
-		if [ "`uname -r | grep 2.4.`" != "" ]; then
-			k="o"
-		elif [ "`uname -r | grep 2.6.`" != "" ]; then
-			k="ko"
-		else
-			exit 0
-		fi
-
-		if test -e /sbin/cardctl; then
-			CARDCTL=/sbin/cardctl
-		elif test -e /sbin/pccardctl; then
-			CARDCTL=/sbin/pccardctl
-		else
-			exit 0
-		fi
-
-		if [ "`lsmod | grep hci_uart`" != "" ]; then
-			#If the hci_usb module is still loaded then there's a serial based
-			# Bluetooth CF card in the slot, which only needs a resume to get it going
-			# again. 
-			rfcomm bind all
-			$CARDCTL resume
-			hciconfig hci0 up
-		else
-			# only works for nokia dtl1 cards
-			for f in /lib/modules/`uname -r`/kernel/drivers/bluetooth/dtl1_cs.$k
-			do
-				#Enumerate all the self-contained Bluetooth CF card drivers
-				f=`echo $f | sed 's/\.'$k'$//'`
-				f=`basename $f`
-				if [ "`lsmod | grep $f`" != "" ]; then
-					#If one of these drivers is still loaded, then there is probably
-					#a non-serial based Bluetooth CF card in the slot that needs
-					#ejecting and reinserting to get it going again
-					rfcomm bind all
-					$CARDCTL eject
-					$CARDCTL insert
-					hciconfig hci0 up
-				fi
-			done
-		fi
-esac
diff --git a/meta/packages/bluez/files/default-manfid-0x0-to-bcps.patch b/meta/packages/bluez/files/default-manfid-0x0-to-bcps.patch
deleted file mode 100644
index 3d993543b..000000000
--- a/meta/packages/bluez/files/default-manfid-0x0-to-bcps.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- bluez-utils-2.16/tools/hciattach.c~default-manfid-0x0-to-bcps
-+++ bluez-utils-2.16/tools/hciattach.c
-@@ -796,13 +796,12 @@
- }
- 
- struct uart_t uart[] = {
-+        { "bcsp",       0x0000, 0x0000, HCI_UART_BCSP, 115200, 115200, 0,        bcsp     },
- 	{ "any",        0x0000, 0x0000, HCI_UART_H4,   115200, 115200, FLOW_CTL, NULL     },
- 	{ "ericsson",   0x0000, 0x0000, HCI_UART_H4,   57600,  115200, FLOW_CTL, ericsson },
- 	{ "digi",       0x0000, 0x0000, HCI_UART_H4,   9600,   115200, FLOW_CTL, digi     },
- 	{ "texas",      0x0000, 0x0000, HCI_UART_H4,   115200, 115200, FLOW_CTL, texas    },
- 
--	{ "bcsp",       0x0000, 0x0000, HCI_UART_BCSP, 115200, 115200, 0,        bcsp     },
--
- 	/* Xircom PCMCIA cards: Credit Card Adapter and Real Port Adapter */
- 	{ "xircom",     0x0105, 0x080a, HCI_UART_H4,   115200, 115200, FLOW_CTL, NULL     },
- 
-- 
cgit v1.2.3