summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez/bluez4-4.82
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/bluez/bluez4-4.82')
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf16
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch20
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch35
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch14
4 files changed, 0 insertions, 85 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
deleted file mode 100644
index ca5e9e4f2f..0000000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
+++ /dev/null
@@ -1,16 +0,0 @@
1<!-- This configuration file specifies the required security policies
2 for Bluetooth core daemon to work. -->
3
4<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
5 "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
6<busconfig>
7
8 <!-- ../system.conf have denied everything, so we just punch some holes -->
9
10 <policy context="default">
11 <allow own="org.bluez"/>
12 <allow send_destination="org.bluez"/>
13 <allow send_interface="org.bluez.Agent"/>
14 </policy>
15
16</busconfig>
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
deleted file mode 100644
index 27dead092a..0000000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1# bluez4: add compile patch fixing some usb declaration mismatch
2# Author: Michael 'Mickey' Lauer <mickey@vanille-media.de>
3# Date: Thu Jan 29 16:52:21 2009 +0000
4#
5# Acquired from OpenEmbedded
6Upstream-Status: Pending
7
8Index: bluez-4.27/tools/dfutool.c
9===================================================================
10--- bluez-4.27.orig/tools/dfutool.c
11+++ bluez-4.27/tools/dfutool.c
12@@ -59,7 +59,7 @@
13 #endif
14
15 #ifdef NEED_USB_GET_BUSSES
16-static inline struct usb_bus *usb_get_busses(void)
17+inline struct usb_bus *usb_get_busses(void)
18 {
19 return usb_busses;
20 }
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
deleted file mode 100644
index e8a58e5ccd..0000000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1# Signed-off-by: Khem Raj <raj.khem@gmail.com>
2#
3# Use the new usb1 API for usb_init() and check for fails from
4# usb_init (). Currently we see a crash on a system which does
5# not have USB because usb_init() fails and it cleans up all initialized
6# data (e.g. ctx) which is used in subsequent calls to libusb
7# We return immediately if usb_init() fails for some reason.
8
9Upstream-Status: Inappropriate [not used]
10
11Index: bluez-4.24/tools/hid2hci.c
12===================================================================
13--- bluez-4.24.orig/tools/hid2hci.c 2008-10-25 23:40:34.000000000 -0700
14+++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.000000000 -0800
15@@ -337,7 +337,7 @@
16 int main(int argc, char *argv[])
17 {
18 struct device_info dev[16];
19- int i, opt, num, quiet = 0, mode = HCI;
20+ int i, ret, opt, num, quiet = 0, mode = HCI;
21
22 while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) {
23 switch (opt) {
24@@ -361,8 +361,9 @@
25 argc -= optind;
26 argv += optind;
27 optind = 0;
28-
29- usb_init();
30+ ret = libusb_init();
31+ if (ret < 0)
32+ return ret;
33
34 num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
35 if (num <= 0) {
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
deleted file mode 100644
index 881cb9cd85..0000000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1# Acquired from OpenEmbedded
2Upstream-Status: Inappropriate [embedded specific]
3
4--- bluez/sbc/sbc_math.h~ 2008-03-05 20:18:03.000000000 +0000
5+++ bluez/sbc/sbc_math.h 2008-10-27 13:39:27.000000000 +0000
6@@ -59,7 +59,7 @@
7
8 #define SBC_FIXED_0(val) { val = 0; }
9 #define MUL(a, b) ((a) * (b))
10-#ifdef __arm__
11+#if defined(__arm__) && !defined(__thumb__)
12 #define MULA(a, b, res) ({ \
13 int tmp = res; \
14 __asm__( \