summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/bluez/bluez-cups-backend_3.18.bb25
-rw-r--r--packages/bluez/bluez-cups-backend_3.19.bb25
-rw-r--r--packages/bluez/bluez-cups-backend_3.20.bb25
-rw-r--r--packages/bluez/bluez-cups-backend_3.22.bb25
-rw-r--r--packages/bluez/bluez-cups-backend_3.23.bb25
-rw-r--r--packages/bluez/bluez-cups-backend_3.24.bb27
-rw-r--r--packages/bluez/bluez-gnome_0.10.bb11
-rw-r--r--packages/bluez/bluez-gnome_0.13.bb14
-rw-r--r--packages/bluez/bluez-gnome_0.14.bb14
-rw-r--r--packages/bluez/bluez-gnome_0.15.bb14
-rw-r--r--packages/bluez/bluez-gnome_0.24.bb14
-rw-r--r--packages/bluez/bluez-gstreamer-plugin_3.19.bb25
-rw-r--r--packages/bluez/bluez-gstreamer-plugin_3.20.bb25
-rw-r--r--packages/bluez/bluez-gstreamer-plugin_3.22.bb25
-rw-r--r--packages/bluez/bluez-gstreamer-plugin_3.23.bb25
-rw-r--r--packages/bluez/bluez-gstreamer-plugin_3.24.bb27
-rw-r--r--packages/bluez/bluez-hcidump_1.26.bb15
-rw-r--r--packages/bluez/bluez-hcidump_1.29.bb13
-rw-r--r--packages/bluez/bluez-hcidump_1.31.bb13
-rw-r--r--packages/bluez/bluez-hcidump_1.32.bb13
-rw-r--r--packages/bluez/bluez-hcidump_1.33.bb13
-rw-r--r--packages/bluez/bluez-hcidump_1.37.bb13
-rw-r--r--packages/bluez/bluez-hcidump_1.38.bb13
-rw-r--r--packages/bluez/bluez-libs_3.10.bb1
-rw-r--r--packages/bluez/bluez-libs_3.11.bb1
-rw-r--r--packages/bluez/bluez-libs_3.12.bb1
-rw-r--r--packages/bluez/bluez-libs_3.13.bb1
-rw-r--r--packages/bluez/bluez-libs_3.14.bb1
-rw-r--r--packages/bluez/bluez-libs_3.15.bb1
-rw-r--r--packages/bluez/bluez-libs_3.16.bb1
-rw-r--r--packages/bluez/bluez-libs_3.17.bb1
-rw-r--r--packages/bluez/bluez-libs_3.18.bb1
-rw-r--r--packages/bluez/bluez-libs_3.19.bb1
-rw-r--r--packages/bluez/bluez-libs_3.20.bb1
-rw-r--r--packages/bluez/bluez-libs_3.22.bb1
-rw-r--r--packages/bluez/bluez-libs_3.23.bb1
-rw-r--r--packages/bluez/bluez-libs_3.24.bb4
-rw-r--r--packages/bluez/bluez-libs_3.28.bb4
-rw-r--r--packages/bluez/bluez-libs_3.30.bb1
-rw-r--r--packages/bluez/bluez-libs_3.4.bb22
-rw-r--r--packages/bluez/bluez-libs_3.7.bb22
-rw-r--r--packages/bluez/bluez-libs_3.8.bb22
-rw-r--r--packages/bluez/bluez-libs_3.9.bb1
-rw-r--r--packages/bluez/bluez-utils-3.14/.mtn2git_empty0
-rw-r--r--packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch498
-rw-r--r--packages/bluez/bluez-utils-3.23/.mtn2git_empty0
-rw-r--r--packages/bluez/bluez-utils-3.23/hciattach-ti-bts.patch477
-rw-r--r--packages/bluez/bluez-utils-3.24/.mtn2git_empty0
-rw-r--r--packages/bluez/bluez-utils-3.24/hciattach-ti-bts.patch477
-rw-r--r--packages/bluez/bluez-utils-3.28/.mtn2git_empty0
-rw-r--r--packages/bluez/bluez-utils-3.28/hciattach-ti-bts.patch477
-rw-r--r--packages/bluez/bluez-utils-3.30/.mtn2git_empty0
-rw-r--r--packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch477
-rw-r--r--packages/bluez/bluez-utils-3.9/.mtn2git_empty0
-rw-r--r--packages/bluez/bluez-utils-3.9/hciattach-ti-bts.patch498
-rw-r--r--packages/bluez/bluez-utils-alsa_3.18.bb23
-rw-r--r--packages/bluez/bluez-utils-alsa_3.19.bb23
-rw-r--r--packages/bluez/bluez-utils-alsa_3.20.bb23
-rw-r--r--packages/bluez/bluez-utils-alsa_3.22.bb23
-rw-r--r--packages/bluez/bluez-utils-alsa_3.23.bb24
-rw-r--r--packages/bluez/bluez-utils-alsa_3.24.bb25
-rw-r--r--packages/bluez/bluez-utils_3.11.bb111
-rw-r--r--packages/bluez/bluez-utils_3.12.bb114
-rw-r--r--packages/bluez/bluez-utils_3.13.bb114
-rw-r--r--packages/bluez/bluez-utils_3.14.bb115
-rw-r--r--packages/bluez/bluez-utils_3.15.bb116
-rw-r--r--packages/bluez/bluez-utils_3.16.bb116
-rw-r--r--packages/bluez/bluez-utils_3.17.bb116
-rw-r--r--packages/bluez/bluez-utils_3.18.bb29
-rw-r--r--packages/bluez/bluez-utils_3.19.bb29
-rw-r--r--packages/bluez/bluez-utils_3.20.bb29
-rw-r--r--packages/bluez/bluez-utils_3.22.bb29
-rw-r--r--packages/bluez/bluez-utils_3.23.bb30
-rw-r--r--packages/bluez/bluez-utils_3.24.bb30
-rw-r--r--packages/bluez/bluez-utils_3.28.bb30
-rw-r--r--packages/bluez/bluez-utils_3.30.bb55
-rw-r--r--packages/bluez/bluez-utils_3.4.bb51
-rw-r--r--packages/bluez/bluez-utils_3.7.bb54
-rw-r--r--packages/bluez/bluez-utils_3.8.bb51
-rw-r--r--packages/bluez/bluez-utils_3.9.bb13
80 files changed, 0 insertions, 4805 deletions
diff --git a/packages/bluez/bluez-cups-backend_3.18.bb b/packages/bluez/bluez-cups-backend_3.18.bb
deleted file mode 100644
index d92b53220f..0000000000
--- a/packages/bluez/bluez-cups-backend_3.18.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require bluez-utils3.inc
-
-DEPENDS += "cups"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-
-FILES_${PN} = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_${PN} = "cups" \ No newline at end of file
diff --git a/packages/bluez/bluez-cups-backend_3.19.bb b/packages/bluez/bluez-cups-backend_3.19.bb
deleted file mode 100644
index d92b53220f..0000000000
--- a/packages/bluez/bluez-cups-backend_3.19.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require bluez-utils3.inc
-
-DEPENDS += "cups"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-
-FILES_${PN} = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_${PN} = "cups" \ No newline at end of file
diff --git a/packages/bluez/bluez-cups-backend_3.20.bb b/packages/bluez/bluez-cups-backend_3.20.bb
deleted file mode 100644
index d92b53220f..0000000000
--- a/packages/bluez/bluez-cups-backend_3.20.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require bluez-utils3.inc
-
-DEPENDS += "cups"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-
-FILES_${PN} = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_${PN} = "cups" \ No newline at end of file
diff --git a/packages/bluez/bluez-cups-backend_3.22.bb b/packages/bluez/bluez-cups-backend_3.22.bb
deleted file mode 100644
index d92b53220f..0000000000
--- a/packages/bluez/bluez-cups-backend_3.22.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require bluez-utils3.inc
-
-DEPENDS += "cups"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-
-FILES_${PN} = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_${PN} = "cups" \ No newline at end of file
diff --git a/packages/bluez/bluez-cups-backend_3.23.bb b/packages/bluez/bluez-cups-backend_3.23.bb
deleted file mode 100644
index 46ca0becf0..0000000000
--- a/packages/bluez/bluez-cups-backend_3.23.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require bluez-utils3.inc
-PR = "r1"
-DEPENDS += "cups"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-
-FILES_${PN} = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_${PN} = "cups" \ No newline at end of file
diff --git a/packages/bluez/bluez-cups-backend_3.24.bb b/packages/bluez/bluez-cups-backend_3.24.bb
deleted file mode 100644
index 40e099642a..0000000000
--- a/packages/bluez/bluez-cups-backend_3.24.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require bluez-utils3.inc
-
-PR = "r1"
-
-DEPENDS += "cups"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-
-FILES_${PN} = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_${PN} = "cups"
diff --git a/packages/bluez/bluez-gnome_0.10.bb b/packages/bluez/bluez-gnome_0.10.bb
deleted file mode 100644
index 398e99d5c1..0000000000
--- a/packages/bluez/bluez-gnome_0.10.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Bluetooth configuration applet"
-LICENSE = "GPL+LGPL"
-
-DEPENDS = "dbus-glib gconf libnotify gtk+"
-
-SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
-
-inherit autotools pkgconfig gconf
-
-FILES_${PN} += "${datadir}/gconf"
-
diff --git a/packages/bluez/bluez-gnome_0.13.bb b/packages/bluez/bluez-gnome_0.13.bb
deleted file mode 100644
index e3aaeafeb3..0000000000
--- a/packages/bluez/bluez-gnome_0.13.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Bluetooth configuration applet"
-LICENSE = "GPL+LGPL"
-
-PR = "r1"
-
-DEPENDS = "dbus-glib gconf libnotify gtk+"
-RRECOMMENDS = "gnome-icon-theme"
-
-SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
-
-inherit autotools pkgconfig gconf
-
-FILES_${PN} += "${datadir}/gconf"
-
diff --git a/packages/bluez/bluez-gnome_0.14.bb b/packages/bluez/bluez-gnome_0.14.bb
deleted file mode 100644
index e3aaeafeb3..0000000000
--- a/packages/bluez/bluez-gnome_0.14.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Bluetooth configuration applet"
-LICENSE = "GPL+LGPL"
-
-PR = "r1"
-
-DEPENDS = "dbus-glib gconf libnotify gtk+"
-RRECOMMENDS = "gnome-icon-theme"
-
-SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
-
-inherit autotools pkgconfig gconf
-
-FILES_${PN} += "${datadir}/gconf"
-
diff --git a/packages/bluez/bluez-gnome_0.15.bb b/packages/bluez/bluez-gnome_0.15.bb
deleted file mode 100644
index e3aaeafeb3..0000000000
--- a/packages/bluez/bluez-gnome_0.15.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Bluetooth configuration applet"
-LICENSE = "GPL+LGPL"
-
-PR = "r1"
-
-DEPENDS = "dbus-glib gconf libnotify gtk+"
-RRECOMMENDS = "gnome-icon-theme"
-
-SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
-
-inherit autotools pkgconfig gconf
-
-FILES_${PN} += "${datadir}/gconf"
-
diff --git a/packages/bluez/bluez-gnome_0.24.bb b/packages/bluez/bluez-gnome_0.24.bb
deleted file mode 100644
index e3aaeafeb3..0000000000
--- a/packages/bluez/bluez-gnome_0.24.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Bluetooth configuration applet"
-LICENSE = "GPL+LGPL"
-
-PR = "r1"
-
-DEPENDS = "dbus-glib gconf libnotify gtk+"
-RRECOMMENDS = "gnome-icon-theme"
-
-SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
-
-inherit autotools pkgconfig gconf
-
-FILES_${PN} += "${datadir}/gconf"
-
diff --git a/packages/bluez/bluez-gstreamer-plugin_3.19.bb b/packages/bluez/bluez-gstreamer-plugin_3.19.bb
deleted file mode 100644
index 123259b3a7..0000000000
--- a/packages/bluez/bluez-gstreamer-plugin_3.19.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require bluez-utils3.inc
-
-DEPENDS += "gstreamer gst-plugins-base "
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --disable-cups \
- --enable-glib \
- --enable-gstreamer \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-
-FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
diff --git a/packages/bluez/bluez-gstreamer-plugin_3.20.bb b/packages/bluez/bluez-gstreamer-plugin_3.20.bb
deleted file mode 100644
index 123259b3a7..0000000000
--- a/packages/bluez/bluez-gstreamer-plugin_3.20.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require bluez-utils3.inc
-
-DEPENDS += "gstreamer gst-plugins-base "
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --disable-cups \
- --enable-glib \
- --enable-gstreamer \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-
-FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
diff --git a/packages/bluez/bluez-gstreamer-plugin_3.22.bb b/packages/bluez/bluez-gstreamer-plugin_3.22.bb
deleted file mode 100644
index 123259b3a7..0000000000
--- a/packages/bluez/bluez-gstreamer-plugin_3.22.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require bluez-utils3.inc
-
-DEPENDS += "gstreamer gst-plugins-base "
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --disable-cups \
- --enable-glib \
- --enable-gstreamer \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-
-FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
diff --git a/packages/bluez/bluez-gstreamer-plugin_3.23.bb b/packages/bluez/bluez-gstreamer-plugin_3.23.bb
deleted file mode 100644
index 36e9ca3d91..0000000000
--- a/packages/bluez/bluez-gstreamer-plugin_3.23.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require bluez-utils3.inc
-PR = "r1"
-DEPENDS += "gstreamer gst-plugins-base "
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --disable-cups \
- --enable-glib \
- --enable-gstreamer \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-
-FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
diff --git a/packages/bluez/bluez-gstreamer-plugin_3.24.bb b/packages/bluez/bluez-gstreamer-plugin_3.24.bb
deleted file mode 100644
index 53b7eb86f2..0000000000
--- a/packages/bluez/bluez-gstreamer-plugin_3.24.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require bluez-utils3.inc
-
-PR = "r1"
-
-DEPENDS += "gstreamer gst-plugins-base "
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --disable-cups \
- --enable-glib \
- --enable-gstreamer \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-
-FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
diff --git a/packages/bluez/bluez-hcidump_1.26.bb b/packages/bluez/bluez-hcidump_1.26.bb
deleted file mode 100644
index 0cbc0fd6ec..0000000000
--- a/packages/bluez/bluez-hcidump_1.26.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
-S = "${WORKDIR}/bluez-hcidump-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-
-inherit autotools
-
-
diff --git a/packages/bluez/bluez-hcidump_1.29.bb b/packages/bluez/bluez-hcidump_1.29.bb
deleted file mode 100644
index 877c8db33c..0000000000
--- a/packages/bluez/bluez-hcidump_1.29.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
-S = "${WORKDIR}/bluez-hcidump-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-
-inherit autotools
diff --git a/packages/bluez/bluez-hcidump_1.31.bb b/packages/bluez/bluez-hcidump_1.31.bb
deleted file mode 100644
index 877c8db33c..0000000000
--- a/packages/bluez/bluez-hcidump_1.31.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
-S = "${WORKDIR}/bluez-hcidump-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-
-inherit autotools
diff --git a/packages/bluez/bluez-hcidump_1.32.bb b/packages/bluez/bluez-hcidump_1.32.bb
deleted file mode 100644
index 877c8db33c..0000000000
--- a/packages/bluez/bluez-hcidump_1.32.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
-S = "${WORKDIR}/bluez-hcidump-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-
-inherit autotools
diff --git a/packages/bluez/bluez-hcidump_1.33.bb b/packages/bluez/bluez-hcidump_1.33.bb
deleted file mode 100644
index 877c8db33c..0000000000
--- a/packages/bluez/bluez-hcidump_1.33.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
-S = "${WORKDIR}/bluez-hcidump-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-
-inherit autotools
diff --git a/packages/bluez/bluez-hcidump_1.37.bb b/packages/bluez/bluez-hcidump_1.37.bb
deleted file mode 100644
index 877c8db33c..0000000000
--- a/packages/bluez/bluez-hcidump_1.37.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
-S = "${WORKDIR}/bluez-hcidump-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-
-inherit autotools
diff --git a/packages/bluez/bluez-hcidump_1.38.bb b/packages/bluez/bluez-hcidump_1.38.bb
deleted file mode 100644
index 877c8db33c..0000000000
--- a/packages/bluez/bluez-hcidump_1.38.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
-S = "${WORKDIR}/bluez-hcidump-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-
-inherit autotools
diff --git a/packages/bluez/bluez-libs_3.10.bb b/packages/bluez/bluez-libs_3.10.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.10.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.11.bb b/packages/bluez/bluez-libs_3.11.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.11.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.12.bb b/packages/bluez/bluez-libs_3.12.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.12.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.13.bb b/packages/bluez/bluez-libs_3.13.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.13.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.14.bb b/packages/bluez/bluez-libs_3.14.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.14.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.15.bb b/packages/bluez/bluez-libs_3.15.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.15.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.16.bb b/packages/bluez/bluez-libs_3.16.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.16.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.17.bb b/packages/bluez/bluez-libs_3.17.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.17.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.18.bb b/packages/bluez/bluez-libs_3.18.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.18.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.19.bb b/packages/bluez/bluez-libs_3.19.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.19.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.20.bb b/packages/bluez/bluez-libs_3.20.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.20.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.22.bb b/packages/bluez/bluez-libs_3.22.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.22.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.23.bb b/packages/bluez/bluez-libs_3.23.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.23.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.24.bb b/packages/bluez/bluez-libs_3.24.bb
deleted file mode 100644
index eb515b4aba..0000000000
--- a/packages/bluez/bluez-libs_3.24.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require bluez-libs.inc
-
-PR = "r1"
-
diff --git a/packages/bluez/bluez-libs_3.28.bb b/packages/bluez/bluez-libs_3.28.bb
deleted file mode 100644
index eb515b4aba..0000000000
--- a/packages/bluez/bluez-libs_3.28.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require bluez-libs.inc
-
-PR = "r1"
-
diff --git a/packages/bluez/bluez-libs_3.30.bb b/packages/bluez/bluez-libs_3.30.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.30.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-libs_3.4.bb b/packages/bluez/bluez-libs_3.4.bb
deleted file mode 100644
index d740bd80a9..0000000000
--- a/packages/bluez/bluez-libs_3.4.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
-SECTION = "libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.bluez.org"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
-
-do_stage() {
- oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/bluetooth/
- for f in ${HEADERS}
- do
- install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
- done
-}
diff --git a/packages/bluez/bluez-libs_3.7.bb b/packages/bluez/bluez-libs_3.7.bb
deleted file mode 100644
index d740bd80a9..0000000000
--- a/packages/bluez/bluez-libs_3.7.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
-SECTION = "libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.bluez.org"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
-
-do_stage() {
- oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/bluetooth/
- for f in ${HEADERS}
- do
- install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
- done
-}
diff --git a/packages/bluez/bluez-libs_3.8.bb b/packages/bluez/bluez-libs_3.8.bb
deleted file mode 100644
index d740bd80a9..0000000000
--- a/packages/bluez/bluez-libs_3.8.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
-SECTION = "libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.bluez.org"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
-
-do_stage() {
- oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/bluetooth/
- for f in ${HEADERS}
- do
- install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
- done
-}
diff --git a/packages/bluez/bluez-libs_3.9.bb b/packages/bluez/bluez-libs_3.9.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/packages/bluez/bluez-libs_3.9.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bluez-libs.inc
diff --git a/packages/bluez/bluez-utils-3.14/.mtn2git_empty b/packages/bluez/bluez-utils-3.14/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez/bluez-utils-3.14/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch
deleted file mode 100644
index 7936b7da3c..0000000000
--- a/packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch
+++ /dev/null
@@ -1,498 +0,0 @@
-Index: bluez-utils-3.9/tools/hciattach.c
-===================================================================
---- bluez-utils-3.9.orig/tools/hciattach.c 2007-01-28 21:16:48.000000000 +0100
-+++ bluez-utils-3.9/tools/hciattach.c 2007-01-29 22:51:30.000000000 +0100
-@@ -59,6 +59,8 @@
- #define HCI_UART_3WIRE 2
- #define HCI_UART_H4DS 3
-
-+#include "ti_bts.h"
-+
- struct uart_t {
- char *type;
- int m_id;
-@@ -68,6 +70,7 @@
- int speed;
- int flags;
- int (*init) (int fd, struct uart_t *u, struct termios *ti);
-+ char *bts; /* bluetooth script */
- };
-
- #define FLOW_CTL 0x0001
-@@ -257,6 +260,114 @@
- return 0;
- }
-
-+static int brf6150(int fd, struct uart_t *u, struct termios *ti)
-+{
-+ bts_t *bfp;
-+ int i;
-+ unsigned long vers;
-+ unsigned char actionbuf[256];
-+ unsigned char resp[128]; /* Response */
-+ unsigned long count;
-+ unsigned short atype;
-+
-+ if (u->bts == NULL) /* no script, ignore */
-+ return 0;
-+
-+ bfp = bts_load_script( u->bts, &vers );
-+ if (bfp == NULL)
-+ return -1;
-+
-+ fprintf( stderr, "Loading BTS script version %lu\n", vers );
-+
-+ while ((count = bts_next_action( bfp, actionbuf,
-+ sizeof actionbuf - 1, &atype )) != 0) {
-+ if (atype == ACTION_REMARKS) {
-+ if (actionbuf[0] != 0)
-+ fprintf( stderr, "%s\n", actionbuf );
-+ }
-+ else if (atype == ACTION_SEND_COMMAND) {
-+#if 0
-+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ int n;
-+ n = write(fd, actionbuf, count);
-+ if (n < 0 || n < count) {
-+ perror("Failed to write TI action command");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_WAIT_EVENT) {
-+ action_wait_t *wait = (action_wait_t *)actionbuf;
-+#if 0
-+ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size );
-+ for (i=0; i<wait->size; i++) {
-+ fprintf( stderr, "0x%02x ", wait->data[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ usleep(wait->msec); /* seems they give usec, not msec */
-+ /* Read reply. */
-+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) {
-+ perror("Failed to read TI command response");
-+ return -1;
-+ }
-+ if (count < wait->size) {
-+ fprintf( stderr, "TI command response is short.");
-+ }
-+ for (i=0; i<wait->size; i++) {
-+ if (i == 3) continue; /* ignore */
-+ if (resp[i] != wait->data[i]) {
-+ fprintf( stderr, "TI command response does not match expected result.\n" );
-+ }
-+ }
-+ }
-+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) {
-+ action_serial_t *sercmd = (action_serial_t *)actionbuf;
-+
-+ /* Set actual baudrate */
-+ fprintf( stderr,
-+ "BTS changing baud rate to %u, flow control to %u\n",
-+ sercmd->baud, sercmd->flow_control );
-+
-+ tcflush(fd, TCIOFLUSH);
-+
-+ if (sercmd->flow_control)
-+ ti->c_cflag |= CRTSCTS;
-+ else
-+ ti->c_cflag &= ~CRTSCTS;
-+ if (tcsetattr(fd, TCSANOW, ti) < 0) {
-+ perror("Can't set port settings");
-+ return -1;
-+ }
-+
-+ u->speed = sercmd->baud;
-+
-+ tcflush(fd, TCIOFLUSH);
-+ if (set_speed(fd, ti, sercmd->baud) < 0) {
-+ perror("Can't set baud rate");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_DELAY) {
-+ action_delay_t *delay = (action_delay_t *)actionbuf;
-+ usleep(delay->msec); /* seems they give usec, not msec */
-+ }
-+ else {
-+ fprintf( stderr, "BTS action type = %d: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+ }
-+ }
-+ bts_unload_script( bfp );
-+ return 0;
-+}
-+
- static int texas(int fd, struct uart_t *u, struct termios *ti)
- {
- struct timespec tm = {0, 50000};
-@@ -297,15 +408,26 @@
- } while (resp[4] != cmd[1] && resp[5] != cmd[2]);
-
- /* Verify manufacturer */
-- if ((resp[11] & 0xFF) != 0x0d)
-+ if (resp[11] != 0x0d)
- fprintf(stderr,"WARNING : module's manufacturer is not Texas Instrument\n");
-
- /* Print LMP version */
-- fprintf(stderr, "Texas module LMP version : 0x%02x\n", resp[10] & 0xFF);
-+ fprintf(stderr, "TI module LMP version : 0x%02x\n", resp[10]);
-
- /* Print LMP subversion */
-- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
--
-+ fprintf(stderr, "TI module LMP sub-version : 0x%02x%02x\n", resp[14], resp[13]);
-+ if ((resp[14] >> 2) == 3) {
-+ int err;
-+ nanosleep(&tm, NULL);
-+
-+ /* BRF6150 */
-+ if ((err=brf6150( fd, u, ti )) != 0) {
-+ fprintf( stderr, "TI script failed (err=%d)\n",
-+ err );
-+ return -1;
-+ }
-+ }
-+
- nanosleep(&tm, NULL);
- return 0;
- }
-@@ -1128,7 +1250,7 @@
- {
- printf("hciattach - HCI UART driver initialization utility\n");
- printf("Usage:\n");
-- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
-+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow]\n");
- printf("\thciattach -l\n");
- }
-
-@@ -1143,11 +1265,12 @@
- struct sigaction sa;
- struct pollfd p;
- char dev[PATH_MAX];
-+ char *bts = NULL;
-
- detach = 1;
- printpid = 0;
-
-- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) {
-+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) {
- switch(opt) {
- case 'b':
- send_break = 1;
-@@ -1169,6 +1292,10 @@
- init_speed = atoi(optarg);
- break;
-
-+ case 'S':
-+ bts = optarg;
-+ break;
-+
- case 'l':
- for (i = 0; uart[i].type; i++) {
- printf("%-10s0x%04x,0x%04x\n", uart[i].type,
-@@ -1240,6 +1367,8 @@
- if (init_speed)
- u->init_speed = init_speed;
-
-+ u->bts = bts;
-+
- memset(&sa, 0, sizeof(sa));
- sa.sa_flags = SA_NOCLDSTOP;
- sa.sa_handler = sig_alarm;
-Index: bluez-utils-3.9/tools/Makefile.am
-===================================================================
---- bluez-utils-3.9.orig/tools/Makefile.am 2007-01-28 21:16:48.000000000 +0100
-+++ bluez-utils-3.9/tools/Makefile.am 2007-01-29 22:54:22.000000000 +0100
-@@ -37,7 +37,7 @@
-
- noinst_PROGRAMS = hcisecfilter ppporc
-
--hciattach_SOURCES = hciattach.c hciattach_st.c
-+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
- hciattach_LDADD = @BLUEZ_LIBS@
-
- hciconfig_SOURCES = hciconfig.c csr.h csr.c
-Index: bluez-utils-3.9/tools/ti_bts.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ bluez-utils-3.9/tools/ti_bts.h 2007-01-29 22:51:30.000000000 +0100
-@@ -0,0 +1,116 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+#ifndef BT_SCRIPT_H
-+#define BT_SCRIPT_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Define the interface of Bluetooth Script
-+ */
-+
-+typedef void bts_t;
-+
-+
-+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */
-+#define ACTION_WAIT_EVENT 2 /* Wait for data */
-+#define ACTION_SERIAL_PORT_PARAMETERS 3
-+#define ACTION_DELAY 4
-+#define ACTION_RUN_SCRIPT 5
-+#define ACTION_REMARKS 6
-+
-+/*
-+ * Structure for ACTION_SEND_COMMAND
-+ */
-+typedef struct tagCActionCommand
-+{
-+ unsigned char data[1]; /* Data to send */
-+} action_command_t;
-+
-+/*
-+ * Structure for ACTION_WAIT_EVENT
-+ */
-+typedef struct tagCActionWaitEvent
-+{
-+ unsigned long msec; /* in milliseconds */
-+ unsigned long size;
-+ unsigned char data[1]; /* Data to wait for */
-+} action_wait_t;
-+
-+
-+/*
-+ * Structure for ACTION_SERIAL_PORT_PARAMETERS
-+ */
-+typedef struct tagCActionSerialPortParameters
-+{
-+ unsigned long baud;
-+ unsigned long flow_control;
-+} action_serial_t;
-+
-+/* Flow Control Type */
-+#define FCT_NONE 0
-+#define FCT_HARDWARE 1
-+
-+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */
-+
-+
-+/*
-+ * Structure for ACTION_DELAY
-+ */
-+typedef struct tagCActionDelay
-+{
-+ unsigned long msec; /* in milliseconds */
-+} action_delay_t;
-+
-+/*
-+ * Structure for ACTION_RUN_SCRIPT
-+ */
-+typedef struct tagCActionRunScript
-+{
-+ char filename[1];
-+} action_run_t;
-+
-+/*
-+ * Structure for ACTION_REMARKS
-+ */
-+typedef struct tagCActionRemarks
-+{
-+ char m_szRemarks[1];
-+} action_remarks_t;
-+
-+
-+const char *cis_create_filename(const unsigned char* cmdparms);
-+bts_t * bts_load_script(const char* fname, unsigned long* version);
-+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype);
-+void bts_unload_script(bts_t* bts_fp);
-+
-+#ifdef __cplusplus
-+};
-+#endif
-+
-+#endif /* BT_SCRIPT_H */
-+
-Index: bluez-utils-3.9/tools/ti_bts.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ bluez-utils-3.9/tools/ti_bts.c 2007-01-29 22:51:30.000000000 +0100
-@@ -0,0 +1,149 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include "ti_bts.h"
-+
-+#ifndef MAKEWORD
-+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8))
-+#endif
-+
-+#define TI_MANUFACTURER_ID 13
-+
-+/*
-+ * Common Init Script specific
-+ */
-+const char *
-+cis_create_filename(const unsigned char* cmdparms)
-+{
-+ static char bts_file[50];
-+
-+ /* Check for TI's id */
-+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]);
-+
-+ if (TI_MANUFACTURER_ID == manfid) {
-+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]);
-+
-+ unsigned short chip = (version & 0x7C00) >> 10;
-+ unsigned short min_ver = (version & 0x007F);
-+ unsigned short maj_ver = (version & 0x0380) >> 7;
-+
-+ if (0 != (version & 0x8000)) {
-+ maj_ver |= 0x0008;
-+ }
-+
-+ sprintf( bts_file, "TIInit_%d.%d.%d.bts",
-+ (int)chip, (int)maj_ver, (int)min_ver);
-+
-+ return &bts_file[0];
-+ }
-+ return NULL;
-+}
-+
-+typedef struct tagCHeader
-+{
-+ unsigned long magic;
-+ unsigned long version;
-+ unsigned char future[24];
-+} cheader_t;
-+
-+
-+/* The value 0x42535442 stands for (in ASCII) BTSB */
-+/* which is Bluetooth Script Binary */
-+#define FILE_HEADER_MAGIC 0x42535442
-+
-+
-+bts_t *
-+bts_load_script(const char* fname, unsigned long* version)
-+{
-+ bts_t* bts = NULL;
-+ FILE* fp = fopen(fname, "rb");
-+
-+ if (NULL != fp) {
-+ /* Read header */
-+ cheader_t header;
-+
-+ /* Read header */
-+ if (1 == fread(&header, sizeof(header), 1, fp)) {
-+ /* Check magic number for correctness */
-+ if (header.magic == FILE_HEADER_MAGIC) {
-+ /* If user wants the version number */
-+ if (NULL != version) {
-+ *version = header.version;
-+ }
-+ bts = (bts_t*)fp;
-+ }
-+ }
-+ /* If failed reading the file, close it */
-+ if (NULL == bts) {
-+ fclose(fp);
-+ }
-+ }
-+ return bts;
-+}
-+
-+unsigned long
-+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype)
-+{
-+ unsigned long bytes = 0;
-+ FILE* fp = (FILE*)bts_fp;
-+ unsigned char action_hdr[4];
-+
-+ if (bts_fp == NULL)
-+ return 0;
-+
-+ /* Each Action has the following: */
-+ /* UINT16 type of this action */
-+ /* UINT16 size of rest */
-+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */
-+
-+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) {
-+ unsigned short type = *(unsigned short*)&action_hdr[0];
-+ unsigned short size = *(unsigned short*)&action_hdr[2];
-+
-+ if (size <= nMaxSize) {
-+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp);
-+
-+ if (nread == size) {
-+ *ptype = type;
-+ bytes = (unsigned long)size;
-+ }
-+ }
-+ }
-+
-+ return bytes;
-+}
-+
-+void
-+bts_unload_script(bts_t* bts_fp)
-+{
-+ FILE* fp = (FILE*)bts_fp;
-+
-+ if (NULL != fp) {
-+ fclose(fp);
-+ }
-+}
-+
diff --git a/packages/bluez/bluez-utils-3.23/.mtn2git_empty b/packages/bluez/bluez-utils-3.23/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez/bluez-utils-3.23/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez/bluez-utils-3.23/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.23/hciattach-ti-bts.patch
deleted file mode 100644
index 1b208f7979..0000000000
--- a/packages/bluez/bluez-utils-3.23/hciattach-ti-bts.patch
+++ /dev/null
@@ -1,477 +0,0 @@
---- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200
-+++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200
-@@ -60,6 +60,8 @@
- #define HCI_UART_3WIRE 2
- #define HCI_UART_H4DS 3
-
-+#include "ti_bts.h"
-+
- struct uart_t {
- char *type;
- int m_id;
-@@ -70,6 +72,7 @@
- int flags;
- char *bdaddr;
- int (*init) (int fd, struct uart_t *u, struct termios *ti);
-+ char *bts; /* bluetooth script */
- };
-
- #define FLOW_CTL 0x0001
-@@ -279,6 +282,114 @@
- return 0;
- }
-
-+static int brf6150(int fd, struct uart_t *u, struct termios *ti)
-+{
-+ bts_t *bfp;
-+ int i;
-+ unsigned long vers;
-+ unsigned char actionbuf[256];
-+ unsigned char resp[128]; /* Response */
-+ unsigned long count;
-+ unsigned short atype;
-+
-+ if (u->bts == NULL) /* no script, ignore */
-+ return 0;
-+
-+ bfp = bts_load_script( u->bts, &vers );
-+ if (bfp == NULL)
-+ return -1;
-+
-+ fprintf( stderr, "Loading BTS script version %lu\n", vers );
-+
-+ while ((count = bts_next_action( bfp, actionbuf,
-+ sizeof actionbuf - 1, &atype )) != 0) {
-+ if (atype == ACTION_REMARKS) {
-+ if (actionbuf[0] != 0)
-+ fprintf( stderr, "%s\n", actionbuf );
-+ }
-+ else if (atype == ACTION_SEND_COMMAND) {
-+#if 0
-+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ int n;
-+ n = write(fd, actionbuf, count);
-+ if (n < 0 || n < count) {
-+ perror("Failed to write TI action command");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_WAIT_EVENT) {
-+ action_wait_t *wait = (action_wait_t *)actionbuf;
-+#if 0
-+ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size );
-+ for (i=0; i<wait->size; i++) {
-+ fprintf( stderr, "0x%02x ", wait->data[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ usleep(wait->msec); /* seems they give usec, not msec */
-+ /* Read reply. */
-+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) {
-+ perror("Failed to read TI command response");
-+ return -1;
-+ }
-+ if (count < wait->size) {
-+ fprintf( stderr, "TI command response is short.");
-+ }
-+ for (i=0; i<wait->size; i++) {
-+ if (i == 3) continue; /* ignore */
-+ if (resp[i] != wait->data[i]) {
-+ fprintf( stderr, "TI command response does not match expected result.\n" );
-+ }
-+ }
-+ }
-+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) {
-+ action_serial_t *sercmd = (action_serial_t *)actionbuf;
-+
-+ /* Set actual baudrate */
-+ fprintf( stderr,
-+ "BTS changing baud rate to %u, flow control to %u\n",
-+ sercmd->baud, sercmd->flow_control );
-+
-+ tcflush(fd, TCIOFLUSH);
-+
-+ if (sercmd->flow_control)
-+ ti->c_cflag |= CRTSCTS;
-+ else
-+ ti->c_cflag &= ~CRTSCTS;
-+ if (tcsetattr(fd, TCSANOW, ti) < 0) {
-+ perror("Can't set port settings");
-+ return -1;
-+ }
-+
-+ u->speed = sercmd->baud;
-+
-+ tcflush(fd, TCIOFLUSH);
-+ if (set_speed(fd, ti, sercmd->baud) < 0) {
-+ perror("Can't set baud rate");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_DELAY) {
-+ action_delay_t *delay = (action_delay_t *)actionbuf;
-+ usleep(delay->msec); /* seems they give usec, not msec */
-+ }
-+ else {
-+ fprintf( stderr, "BTS action type = %d: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+ }
-+ }
-+ bts_unload_script( bfp );
-+ return 0;
-+}
-+
- static int texas(int fd, struct uart_t *u, struct termios *ti)
- {
- struct timespec tm = {0, 50000};
-@@ -328,6 +439,17 @@
- /* Print LMP subversion */
- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
-
-+ if ((resp[14] >> 2) == 3) {
-+ /* BRF6150 */
-+ int err;
-+
-+ nanosleep(&tm, NULL);
-+ if ((err = brf6150(fd, u, ti)) != 0) {
-+ fprintf(stderr, "Texas module script failed (err=%d)\n", err);
-+ return -1;
-+ }
-+ }
-+
- nanosleep(&tm, NULL);
- return 0;
- }
-@@ -1204,7 +1326,7 @@
- {
- printf("hciattach - HCI UART driver initialization utility\n");
- printf("Usage:\n");
-- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
-+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
- printf("\thciattach -l\n");
- }
-
-@@ -1219,11 +1341,12 @@
- struct sigaction sa;
- struct pollfd p;
- char dev[PATH_MAX];
-+ char *bts = NULL;
-
- detach = 1;
- printpid = 0;
-
-- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) {
-+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) {
- switch(opt) {
- case 'b':
- send_break = 1;
-@@ -1245,6 +1368,10 @@
- init_speed = atoi(optarg);
- break;
-
-+ case 'S':
-+ bts = optarg;
-+ break;
-+
- case 'l':
- for (i = 0; uart[i].type; i++) {
- printf("%-10s0x%04x,0x%04x\n", uart[i].type,
-@@ -1320,6 +1447,8 @@
- if (init_speed)
- u->init_speed = init_speed;
-
-+ u->bts = bts;
-+
- memset(&sa, 0, sizeof(sa));
- sa.sa_flags = SA_NOCLDSTOP;
- sa.sa_handler = sig_alarm;
---- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200
-+++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200
-@@ -0,0 +1,116 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+#ifndef BT_SCRIPT_H
-+#define BT_SCRIPT_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Define the interface of Bluetooth Script
-+ */
-+
-+typedef void bts_t;
-+
-+
-+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */
-+#define ACTION_WAIT_EVENT 2 /* Wait for data */
-+#define ACTION_SERIAL_PORT_PARAMETERS 3
-+#define ACTION_DELAY 4
-+#define ACTION_RUN_SCRIPT 5
-+#define ACTION_REMARKS 6
-+
-+/*
-+ * Structure for ACTION_SEND_COMMAND
-+ */
-+typedef struct tagCActionCommand
-+{
-+ unsigned char data[1]; /* Data to send */
-+} action_command_t;
-+
-+/*
-+ * Structure for ACTION_WAIT_EVENT
-+ */
-+typedef struct tagCActionWaitEvent
-+{
-+ unsigned long msec; /* in milliseconds */
-+ unsigned long size;
-+ unsigned char data[1]; /* Data to wait for */
-+} action_wait_t;
-+
-+
-+/*
-+ * Structure for ACTION_SERIAL_PORT_PARAMETERS
-+ */
-+typedef struct tagCActionSerialPortParameters
-+{
-+ unsigned long baud;
-+ unsigned long flow_control;
-+} action_serial_t;
-+
-+/* Flow Control Type */
-+#define FCT_NONE 0
-+#define FCT_HARDWARE 1
-+
-+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */
-+
-+
-+/*
-+ * Structure for ACTION_DELAY
-+ */
-+typedef struct tagCActionDelay
-+{
-+ unsigned long msec; /* in milliseconds */
-+} action_delay_t;
-+
-+/*
-+ * Structure for ACTION_RUN_SCRIPT
-+ */
-+typedef struct tagCActionRunScript
-+{
-+ char filename[1];
-+} action_run_t;
-+
-+/*
-+ * Structure for ACTION_REMARKS
-+ */
-+typedef struct tagCActionRemarks
-+{
-+ char m_szRemarks[1];
-+} action_remarks_t;
-+
-+
-+const char *cis_create_filename(const unsigned char* cmdparms);
-+bts_t * bts_load_script(const char* fname, unsigned long* version);
-+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype);
-+void bts_unload_script(bts_t* bts_fp);
-+
-+#ifdef __cplusplus
-+};
-+#endif
-+
-+#endif /* BT_SCRIPT_H */
-+
---- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200
-+++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200
-@@ -0,0 +1,149 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include "ti_bts.h"
-+
-+#ifndef MAKEWORD
-+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8))
-+#endif
-+
-+#define TI_MANUFACTURER_ID 13
-+
-+/*
-+ * Common Init Script specific
-+ */
-+const char *
-+cis_create_filename(const unsigned char* cmdparms)
-+{
-+ static char bts_file[50];
-+
-+ /* Check for TI's id */
-+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]);
-+
-+ if (TI_MANUFACTURER_ID == manfid) {
-+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]);
-+
-+ unsigned short chip = (version & 0x7C00) >> 10;
-+ unsigned short min_ver = (version & 0x007F);
-+ unsigned short maj_ver = (version & 0x0380) >> 7;
-+
-+ if (0 != (version & 0x8000)) {
-+ maj_ver |= 0x0008;
-+ }
-+
-+ sprintf( bts_file, "TIInit_%d.%d.%d.bts",
-+ (int)chip, (int)maj_ver, (int)min_ver);
-+
-+ return &bts_file[0];
-+ }
-+ return NULL;
-+}
-+
-+typedef struct tagCHeader
-+{
-+ unsigned long magic;
-+ unsigned long version;
-+ unsigned char future[24];
-+} cheader_t;
-+
-+
-+/* The value 0x42535442 stands for (in ASCII) BTSB */
-+/* which is Bluetooth Script Binary */
-+#define FILE_HEADER_MAGIC 0x42535442
-+
-+
-+bts_t *
-+bts_load_script(const char* fname, unsigned long* version)
-+{
-+ bts_t* bts = NULL;
-+ FILE* fp = fopen(fname, "rb");
-+
-+ if (NULL != fp) {
-+ /* Read header */
-+ cheader_t header;
-+
-+ /* Read header */
-+ if (1 == fread(&header, sizeof(header), 1, fp)) {
-+ /* Check magic number for correctness */
-+ if (header.magic == FILE_HEADER_MAGIC) {
-+ /* If user wants the version number */
-+ if (NULL != version) {
-+ *version = header.version;
-+ }
-+ bts = (bts_t*)fp;
-+ }
-+ }
-+ /* If failed reading the file, close it */
-+ if (NULL == bts) {
-+ fclose(fp);
-+ }
-+ }
-+ return bts;
-+}
-+
-+unsigned long
-+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype)
-+{
-+ unsigned long bytes = 0;
-+ FILE* fp = (FILE*)bts_fp;
-+ unsigned char action_hdr[4];
-+
-+ if (bts_fp == NULL)
-+ return 0;
-+
-+ /* Each Action has the following: */
-+ /* UINT16 type of this action */
-+ /* UINT16 size of rest */
-+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */
-+
-+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) {
-+ unsigned short type = *(unsigned short*)&action_hdr[0];
-+ unsigned short size = *(unsigned short*)&action_hdr[2];
-+
-+ if (size <= nMaxSize) {
-+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp);
-+
-+ if (nread == size) {
-+ *ptype = type;
-+ bytes = (unsigned long)size;
-+ }
-+ }
-+ }
-+
-+ return bytes;
-+}
-+
-+void
-+bts_unload_script(bts_t* bts_fp)
-+{
-+ FILE* fp = (FILE*)bts_fp;
-+
-+ if (NULL != fp) {
-+ fclose(fp);
-+ }
-+}
-+
---- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200
-+++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200
-@@ -45,7 +45,7 @@
-
- noinst_PROGRAMS = hcisecfilter ppporc
-
--hciattach_SOURCES = hciattach.c hciattach_st.c
-+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
- hciattach_LDADD = @BLUEZ_LIBS@
-
- hciconfig_SOURCES = hciconfig.c csr.h csr.c
diff --git a/packages/bluez/bluez-utils-3.24/.mtn2git_empty b/packages/bluez/bluez-utils-3.24/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez/bluez-utils-3.24/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez/bluez-utils-3.24/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.24/hciattach-ti-bts.patch
deleted file mode 100644
index 1b208f7979..0000000000
--- a/packages/bluez/bluez-utils-3.24/hciattach-ti-bts.patch
+++ /dev/null
@@ -1,477 +0,0 @@
---- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200
-+++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200
-@@ -60,6 +60,8 @@
- #define HCI_UART_3WIRE 2
- #define HCI_UART_H4DS 3
-
-+#include "ti_bts.h"
-+
- struct uart_t {
- char *type;
- int m_id;
-@@ -70,6 +72,7 @@
- int flags;
- char *bdaddr;
- int (*init) (int fd, struct uart_t *u, struct termios *ti);
-+ char *bts; /* bluetooth script */
- };
-
- #define FLOW_CTL 0x0001
-@@ -279,6 +282,114 @@
- return 0;
- }
-
-+static int brf6150(int fd, struct uart_t *u, struct termios *ti)
-+{
-+ bts_t *bfp;
-+ int i;
-+ unsigned long vers;
-+ unsigned char actionbuf[256];
-+ unsigned char resp[128]; /* Response */
-+ unsigned long count;
-+ unsigned short atype;
-+
-+ if (u->bts == NULL) /* no script, ignore */
-+ return 0;
-+
-+ bfp = bts_load_script( u->bts, &vers );
-+ if (bfp == NULL)
-+ return -1;
-+
-+ fprintf( stderr, "Loading BTS script version %lu\n", vers );
-+
-+ while ((count = bts_next_action( bfp, actionbuf,
-+ sizeof actionbuf - 1, &atype )) != 0) {
-+ if (atype == ACTION_REMARKS) {
-+ if (actionbuf[0] != 0)
-+ fprintf( stderr, "%s\n", actionbuf );
-+ }
-+ else if (atype == ACTION_SEND_COMMAND) {
-+#if 0
-+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ int n;
-+ n = write(fd, actionbuf, count);
-+ if (n < 0 || n < count) {
-+ perror("Failed to write TI action command");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_WAIT_EVENT) {
-+ action_wait_t *wait = (action_wait_t *)actionbuf;
-+#if 0
-+ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size );
-+ for (i=0; i<wait->size; i++) {
-+ fprintf( stderr, "0x%02x ", wait->data[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ usleep(wait->msec); /* seems they give usec, not msec */
-+ /* Read reply. */
-+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) {
-+ perror("Failed to read TI command response");
-+ return -1;
-+ }
-+ if (count < wait->size) {
-+ fprintf( stderr, "TI command response is short.");
-+ }
-+ for (i=0; i<wait->size; i++) {
-+ if (i == 3) continue; /* ignore */
-+ if (resp[i] != wait->data[i]) {
-+ fprintf( stderr, "TI command response does not match expected result.\n" );
-+ }
-+ }
-+ }
-+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) {
-+ action_serial_t *sercmd = (action_serial_t *)actionbuf;
-+
-+ /* Set actual baudrate */
-+ fprintf( stderr,
-+ "BTS changing baud rate to %u, flow control to %u\n",
-+ sercmd->baud, sercmd->flow_control );
-+
-+ tcflush(fd, TCIOFLUSH);
-+
-+ if (sercmd->flow_control)
-+ ti->c_cflag |= CRTSCTS;
-+ else
-+ ti->c_cflag &= ~CRTSCTS;
-+ if (tcsetattr(fd, TCSANOW, ti) < 0) {
-+ perror("Can't set port settings");
-+ return -1;
-+ }
-+
-+ u->speed = sercmd->baud;
-+
-+ tcflush(fd, TCIOFLUSH);
-+ if (set_speed(fd, ti, sercmd->baud) < 0) {
-+ perror("Can't set baud rate");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_DELAY) {
-+ action_delay_t *delay = (action_delay_t *)actionbuf;
-+ usleep(delay->msec); /* seems they give usec, not msec */
-+ }
-+ else {
-+ fprintf( stderr, "BTS action type = %d: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+ }
-+ }
-+ bts_unload_script( bfp );
-+ return 0;
-+}
-+
- static int texas(int fd, struct uart_t *u, struct termios *ti)
- {
- struct timespec tm = {0, 50000};
-@@ -328,6 +439,17 @@
- /* Print LMP subversion */
- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
-
-+ if ((resp[14] >> 2) == 3) {
-+ /* BRF6150 */
-+ int err;
-+
-+ nanosleep(&tm, NULL);
-+ if ((err = brf6150(fd, u, ti)) != 0) {
-+ fprintf(stderr, "Texas module script failed (err=%d)\n", err);
-+ return -1;
-+ }
-+ }
-+
- nanosleep(&tm, NULL);
- return 0;
- }
-@@ -1204,7 +1326,7 @@
- {
- printf("hciattach - HCI UART driver initialization utility\n");
- printf("Usage:\n");
-- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
-+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
- printf("\thciattach -l\n");
- }
-
-@@ -1219,11 +1341,12 @@
- struct sigaction sa;
- struct pollfd p;
- char dev[PATH_MAX];
-+ char *bts = NULL;
-
- detach = 1;
- printpid = 0;
-
-- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) {
-+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) {
- switch(opt) {
- case 'b':
- send_break = 1;
-@@ -1245,6 +1368,10 @@
- init_speed = atoi(optarg);
- break;
-
-+ case 'S':
-+ bts = optarg;
-+ break;
-+
- case 'l':
- for (i = 0; uart[i].type; i++) {
- printf("%-10s0x%04x,0x%04x\n", uart[i].type,
-@@ -1320,6 +1447,8 @@
- if (init_speed)
- u->init_speed = init_speed;
-
-+ u->bts = bts;
-+
- memset(&sa, 0, sizeof(sa));
- sa.sa_flags = SA_NOCLDSTOP;
- sa.sa_handler = sig_alarm;
---- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200
-+++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200
-@@ -0,0 +1,116 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+#ifndef BT_SCRIPT_H
-+#define BT_SCRIPT_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Define the interface of Bluetooth Script
-+ */
-+
-+typedef void bts_t;
-+
-+
-+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */
-+#define ACTION_WAIT_EVENT 2 /* Wait for data */
-+#define ACTION_SERIAL_PORT_PARAMETERS 3
-+#define ACTION_DELAY 4
-+#define ACTION_RUN_SCRIPT 5
-+#define ACTION_REMARKS 6
-+
-+/*
-+ * Structure for ACTION_SEND_COMMAND
-+ */
-+typedef struct tagCActionCommand
-+{
-+ unsigned char data[1]; /* Data to send */
-+} action_command_t;
-+
-+/*
-+ * Structure for ACTION_WAIT_EVENT
-+ */
-+typedef struct tagCActionWaitEvent
-+{
-+ unsigned long msec; /* in milliseconds */
-+ unsigned long size;
-+ unsigned char data[1]; /* Data to wait for */
-+} action_wait_t;
-+
-+
-+/*
-+ * Structure for ACTION_SERIAL_PORT_PARAMETERS
-+ */
-+typedef struct tagCActionSerialPortParameters
-+{
-+ unsigned long baud;
-+ unsigned long flow_control;
-+} action_serial_t;
-+
-+/* Flow Control Type */
-+#define FCT_NONE 0
-+#define FCT_HARDWARE 1
-+
-+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */
-+
-+
-+/*
-+ * Structure for ACTION_DELAY
-+ */
-+typedef struct tagCActionDelay
-+{
-+ unsigned long msec; /* in milliseconds */
-+} action_delay_t;
-+
-+/*
-+ * Structure for ACTION_RUN_SCRIPT
-+ */
-+typedef struct tagCActionRunScript
-+{
-+ char filename[1];
-+} action_run_t;
-+
-+/*
-+ * Structure for ACTION_REMARKS
-+ */
-+typedef struct tagCActionRemarks
-+{
-+ char m_szRemarks[1];
-+} action_remarks_t;
-+
-+
-+const char *cis_create_filename(const unsigned char* cmdparms);
-+bts_t * bts_load_script(const char* fname, unsigned long* version);
-+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype);
-+void bts_unload_script(bts_t* bts_fp);
-+
-+#ifdef __cplusplus
-+};
-+#endif
-+
-+#endif /* BT_SCRIPT_H */
-+
---- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200
-+++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200
-@@ -0,0 +1,149 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include "ti_bts.h"
-+
-+#ifndef MAKEWORD
-+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8))
-+#endif
-+
-+#define TI_MANUFACTURER_ID 13
-+
-+/*
-+ * Common Init Script specific
-+ */
-+const char *
-+cis_create_filename(const unsigned char* cmdparms)
-+{
-+ static char bts_file[50];
-+
-+ /* Check for TI's id */
-+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]);
-+
-+ if (TI_MANUFACTURER_ID == manfid) {
-+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]);
-+
-+ unsigned short chip = (version & 0x7C00) >> 10;
-+ unsigned short min_ver = (version & 0x007F);
-+ unsigned short maj_ver = (version & 0x0380) >> 7;
-+
-+ if (0 != (version & 0x8000)) {
-+ maj_ver |= 0x0008;
-+ }
-+
-+ sprintf( bts_file, "TIInit_%d.%d.%d.bts",
-+ (int)chip, (int)maj_ver, (int)min_ver);
-+
-+ return &bts_file[0];
-+ }
-+ return NULL;
-+}
-+
-+typedef struct tagCHeader
-+{
-+ unsigned long magic;
-+ unsigned long version;
-+ unsigned char future[24];
-+} cheader_t;
-+
-+
-+/* The value 0x42535442 stands for (in ASCII) BTSB */
-+/* which is Bluetooth Script Binary */
-+#define FILE_HEADER_MAGIC 0x42535442
-+
-+
-+bts_t *
-+bts_load_script(const char* fname, unsigned long* version)
-+{
-+ bts_t* bts = NULL;
-+ FILE* fp = fopen(fname, "rb");
-+
-+ if (NULL != fp) {
-+ /* Read header */
-+ cheader_t header;
-+
-+ /* Read header */
-+ if (1 == fread(&header, sizeof(header), 1, fp)) {
-+ /* Check magic number for correctness */
-+ if (header.magic == FILE_HEADER_MAGIC) {
-+ /* If user wants the version number */
-+ if (NULL != version) {
-+ *version = header.version;
-+ }
-+ bts = (bts_t*)fp;
-+ }
-+ }
-+ /* If failed reading the file, close it */
-+ if (NULL == bts) {
-+ fclose(fp);
-+ }
-+ }
-+ return bts;
-+}
-+
-+unsigned long
-+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype)
-+{
-+ unsigned long bytes = 0;
-+ FILE* fp = (FILE*)bts_fp;
-+ unsigned char action_hdr[4];
-+
-+ if (bts_fp == NULL)
-+ return 0;
-+
-+ /* Each Action has the following: */
-+ /* UINT16 type of this action */
-+ /* UINT16 size of rest */
-+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */
-+
-+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) {
-+ unsigned short type = *(unsigned short*)&action_hdr[0];
-+ unsigned short size = *(unsigned short*)&action_hdr[2];
-+
-+ if (size <= nMaxSize) {
-+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp);
-+
-+ if (nread == size) {
-+ *ptype = type;
-+ bytes = (unsigned long)size;
-+ }
-+ }
-+ }
-+
-+ return bytes;
-+}
-+
-+void
-+bts_unload_script(bts_t* bts_fp)
-+{
-+ FILE* fp = (FILE*)bts_fp;
-+
-+ if (NULL != fp) {
-+ fclose(fp);
-+ }
-+}
-+
---- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200
-+++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200
-@@ -45,7 +45,7 @@
-
- noinst_PROGRAMS = hcisecfilter ppporc
-
--hciattach_SOURCES = hciattach.c hciattach_st.c
-+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
- hciattach_LDADD = @BLUEZ_LIBS@
-
- hciconfig_SOURCES = hciconfig.c csr.h csr.c
diff --git a/packages/bluez/bluez-utils-3.28/.mtn2git_empty b/packages/bluez/bluez-utils-3.28/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez/bluez-utils-3.28/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez/bluez-utils-3.28/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.28/hciattach-ti-bts.patch
deleted file mode 100644
index 1b208f7979..0000000000
--- a/packages/bluez/bluez-utils-3.28/hciattach-ti-bts.patch
+++ /dev/null
@@ -1,477 +0,0 @@
---- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200
-+++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200
-@@ -60,6 +60,8 @@
- #define HCI_UART_3WIRE 2
- #define HCI_UART_H4DS 3
-
-+#include "ti_bts.h"
-+
- struct uart_t {
- char *type;
- int m_id;
-@@ -70,6 +72,7 @@
- int flags;
- char *bdaddr;
- int (*init) (int fd, struct uart_t *u, struct termios *ti);
-+ char *bts; /* bluetooth script */
- };
-
- #define FLOW_CTL 0x0001
-@@ -279,6 +282,114 @@
- return 0;
- }
-
-+static int brf6150(int fd, struct uart_t *u, struct termios *ti)
-+{
-+ bts_t *bfp;
-+ int i;
-+ unsigned long vers;
-+ unsigned char actionbuf[256];
-+ unsigned char resp[128]; /* Response */
-+ unsigned long count;
-+ unsigned short atype;
-+
-+ if (u->bts == NULL) /* no script, ignore */
-+ return 0;
-+
-+ bfp = bts_load_script( u->bts, &vers );
-+ if (bfp == NULL)
-+ return -1;
-+
-+ fprintf( stderr, "Loading BTS script version %lu\n", vers );
-+
-+ while ((count = bts_next_action( bfp, actionbuf,
-+ sizeof actionbuf - 1, &atype )) != 0) {
-+ if (atype == ACTION_REMARKS) {
-+ if (actionbuf[0] != 0)
-+ fprintf( stderr, "%s\n", actionbuf );
-+ }
-+ else if (atype == ACTION_SEND_COMMAND) {
-+#if 0
-+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ int n;
-+ n = write(fd, actionbuf, count);
-+ if (n < 0 || n < count) {
-+ perror("Failed to write TI action command");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_WAIT_EVENT) {
-+ action_wait_t *wait = (action_wait_t *)actionbuf;
-+#if 0
-+ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size );
-+ for (i=0; i<wait->size; i++) {
-+ fprintf( stderr, "0x%02x ", wait->data[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ usleep(wait->msec); /* seems they give usec, not msec */
-+ /* Read reply. */
-+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) {
-+ perror("Failed to read TI command response");
-+ return -1;
-+ }
-+ if (count < wait->size) {
-+ fprintf( stderr, "TI command response is short.");
-+ }
-+ for (i=0; i<wait->size; i++) {
-+ if (i == 3) continue; /* ignore */
-+ if (resp[i] != wait->data[i]) {
-+ fprintf( stderr, "TI command response does not match expected result.\n" );
-+ }
-+ }
-+ }
-+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) {
-+ action_serial_t *sercmd = (action_serial_t *)actionbuf;
-+
-+ /* Set actual baudrate */
-+ fprintf( stderr,
-+ "BTS changing baud rate to %u, flow control to %u\n",
-+ sercmd->baud, sercmd->flow_control );
-+
-+ tcflush(fd, TCIOFLUSH);
-+
-+ if (sercmd->flow_control)
-+ ti->c_cflag |= CRTSCTS;
-+ else
-+ ti->c_cflag &= ~CRTSCTS;
-+ if (tcsetattr(fd, TCSANOW, ti) < 0) {
-+ perror("Can't set port settings");
-+ return -1;
-+ }
-+
-+ u->speed = sercmd->baud;
-+
-+ tcflush(fd, TCIOFLUSH);
-+ if (set_speed(fd, ti, sercmd->baud) < 0) {
-+ perror("Can't set baud rate");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_DELAY) {
-+ action_delay_t *delay = (action_delay_t *)actionbuf;
-+ usleep(delay->msec); /* seems they give usec, not msec */
-+ }
-+ else {
-+ fprintf( stderr, "BTS action type = %d: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+ }
-+ }
-+ bts_unload_script( bfp );
-+ return 0;
-+}
-+
- static int texas(int fd, struct uart_t *u, struct termios *ti)
- {
- struct timespec tm = {0, 50000};
-@@ -328,6 +439,17 @@
- /* Print LMP subversion */
- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
-
-+ if ((resp[14] >> 2) == 3) {
-+ /* BRF6150 */
-+ int err;
-+
-+ nanosleep(&tm, NULL);
-+ if ((err = brf6150(fd, u, ti)) != 0) {
-+ fprintf(stderr, "Texas module script failed (err=%d)\n", err);
-+ return -1;
-+ }
-+ }
-+
- nanosleep(&tm, NULL);
- return 0;
- }
-@@ -1204,7 +1326,7 @@
- {
- printf("hciattach - HCI UART driver initialization utility\n");
- printf("Usage:\n");
-- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
-+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
- printf("\thciattach -l\n");
- }
-
-@@ -1219,11 +1341,12 @@
- struct sigaction sa;
- struct pollfd p;
- char dev[PATH_MAX];
-+ char *bts = NULL;
-
- detach = 1;
- printpid = 0;
-
-- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) {
-+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) {
- switch(opt) {
- case 'b':
- send_break = 1;
-@@ -1245,6 +1368,10 @@
- init_speed = atoi(optarg);
- break;
-
-+ case 'S':
-+ bts = optarg;
-+ break;
-+
- case 'l':
- for (i = 0; uart[i].type; i++) {
- printf("%-10s0x%04x,0x%04x\n", uart[i].type,
-@@ -1320,6 +1447,8 @@
- if (init_speed)
- u->init_speed = init_speed;
-
-+ u->bts = bts;
-+
- memset(&sa, 0, sizeof(sa));
- sa.sa_flags = SA_NOCLDSTOP;
- sa.sa_handler = sig_alarm;
---- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200
-+++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200
-@@ -0,0 +1,116 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+#ifndef BT_SCRIPT_H
-+#define BT_SCRIPT_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Define the interface of Bluetooth Script
-+ */
-+
-+typedef void bts_t;
-+
-+
-+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */
-+#define ACTION_WAIT_EVENT 2 /* Wait for data */
-+#define ACTION_SERIAL_PORT_PARAMETERS 3
-+#define ACTION_DELAY 4
-+#define ACTION_RUN_SCRIPT 5
-+#define ACTION_REMARKS 6
-+
-+/*
-+ * Structure for ACTION_SEND_COMMAND
-+ */
-+typedef struct tagCActionCommand
-+{
-+ unsigned char data[1]; /* Data to send */
-+} action_command_t;
-+
-+/*
-+ * Structure for ACTION_WAIT_EVENT
-+ */
-+typedef struct tagCActionWaitEvent
-+{
-+ unsigned long msec; /* in milliseconds */
-+ unsigned long size;
-+ unsigned char data[1]; /* Data to wait for */
-+} action_wait_t;
-+
-+
-+/*
-+ * Structure for ACTION_SERIAL_PORT_PARAMETERS
-+ */
-+typedef struct tagCActionSerialPortParameters
-+{
-+ unsigned long baud;
-+ unsigned long flow_control;
-+} action_serial_t;
-+
-+/* Flow Control Type */
-+#define FCT_NONE 0
-+#define FCT_HARDWARE 1
-+
-+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */
-+
-+
-+/*
-+ * Structure for ACTION_DELAY
-+ */
-+typedef struct tagCActionDelay
-+{
-+ unsigned long msec; /* in milliseconds */
-+} action_delay_t;
-+
-+/*
-+ * Structure for ACTION_RUN_SCRIPT
-+ */
-+typedef struct tagCActionRunScript
-+{
-+ char filename[1];
-+} action_run_t;
-+
-+/*
-+ * Structure for ACTION_REMARKS
-+ */
-+typedef struct tagCActionRemarks
-+{
-+ char m_szRemarks[1];
-+} action_remarks_t;
-+
-+
-+const char *cis_create_filename(const unsigned char* cmdparms);
-+bts_t * bts_load_script(const char* fname, unsigned long* version);
-+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype);
-+void bts_unload_script(bts_t* bts_fp);
-+
-+#ifdef __cplusplus
-+};
-+#endif
-+
-+#endif /* BT_SCRIPT_H */
-+
---- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200
-+++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200
-@@ -0,0 +1,149 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include "ti_bts.h"
-+
-+#ifndef MAKEWORD
-+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8))
-+#endif
-+
-+#define TI_MANUFACTURER_ID 13
-+
-+/*
-+ * Common Init Script specific
-+ */
-+const char *
-+cis_create_filename(const unsigned char* cmdparms)
-+{
-+ static char bts_file[50];
-+
-+ /* Check for TI's id */
-+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]);
-+
-+ if (TI_MANUFACTURER_ID == manfid) {
-+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]);
-+
-+ unsigned short chip = (version & 0x7C00) >> 10;
-+ unsigned short min_ver = (version & 0x007F);
-+ unsigned short maj_ver = (version & 0x0380) >> 7;
-+
-+ if (0 != (version & 0x8000)) {
-+ maj_ver |= 0x0008;
-+ }
-+
-+ sprintf( bts_file, "TIInit_%d.%d.%d.bts",
-+ (int)chip, (int)maj_ver, (int)min_ver);
-+
-+ return &bts_file[0];
-+ }
-+ return NULL;
-+}
-+
-+typedef struct tagCHeader
-+{
-+ unsigned long magic;
-+ unsigned long version;
-+ unsigned char future[24];
-+} cheader_t;
-+
-+
-+/* The value 0x42535442 stands for (in ASCII) BTSB */
-+/* which is Bluetooth Script Binary */
-+#define FILE_HEADER_MAGIC 0x42535442
-+
-+
-+bts_t *
-+bts_load_script(const char* fname, unsigned long* version)
-+{
-+ bts_t* bts = NULL;
-+ FILE* fp = fopen(fname, "rb");
-+
-+ if (NULL != fp) {
-+ /* Read header */
-+ cheader_t header;
-+
-+ /* Read header */
-+ if (1 == fread(&header, sizeof(header), 1, fp)) {
-+ /* Check magic number for correctness */
-+ if (header.magic == FILE_HEADER_MAGIC) {
-+ /* If user wants the version number */
-+ if (NULL != version) {
-+ *version = header.version;
-+ }
-+ bts = (bts_t*)fp;
-+ }
-+ }
-+ /* If failed reading the file, close it */
-+ if (NULL == bts) {
-+ fclose(fp);
-+ }
-+ }
-+ return bts;
-+}
-+
-+unsigned long
-+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype)
-+{
-+ unsigned long bytes = 0;
-+ FILE* fp = (FILE*)bts_fp;
-+ unsigned char action_hdr[4];
-+
-+ if (bts_fp == NULL)
-+ return 0;
-+
-+ /* Each Action has the following: */
-+ /* UINT16 type of this action */
-+ /* UINT16 size of rest */
-+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */
-+
-+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) {
-+ unsigned short type = *(unsigned short*)&action_hdr[0];
-+ unsigned short size = *(unsigned short*)&action_hdr[2];
-+
-+ if (size <= nMaxSize) {
-+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp);
-+
-+ if (nread == size) {
-+ *ptype = type;
-+ bytes = (unsigned long)size;
-+ }
-+ }
-+ }
-+
-+ return bytes;
-+}
-+
-+void
-+bts_unload_script(bts_t* bts_fp)
-+{
-+ FILE* fp = (FILE*)bts_fp;
-+
-+ if (NULL != fp) {
-+ fclose(fp);
-+ }
-+}
-+
---- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200
-+++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200
-@@ -45,7 +45,7 @@
-
- noinst_PROGRAMS = hcisecfilter ppporc
-
--hciattach_SOURCES = hciattach.c hciattach_st.c
-+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
- hciattach_LDADD = @BLUEZ_LIBS@
-
- hciconfig_SOURCES = hciconfig.c csr.h csr.c
diff --git a/packages/bluez/bluez-utils-3.30/.mtn2git_empty b/packages/bluez/bluez-utils-3.30/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez/bluez-utils-3.30/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch
deleted file mode 100644
index 1b208f7979..0000000000
--- a/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch
+++ /dev/null
@@ -1,477 +0,0 @@
---- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200
-+++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200
-@@ -60,6 +60,8 @@
- #define HCI_UART_3WIRE 2
- #define HCI_UART_H4DS 3
-
-+#include "ti_bts.h"
-+
- struct uart_t {
- char *type;
- int m_id;
-@@ -70,6 +72,7 @@
- int flags;
- char *bdaddr;
- int (*init) (int fd, struct uart_t *u, struct termios *ti);
-+ char *bts; /* bluetooth script */
- };
-
- #define FLOW_CTL 0x0001
-@@ -279,6 +282,114 @@
- return 0;
- }
-
-+static int brf6150(int fd, struct uart_t *u, struct termios *ti)
-+{
-+ bts_t *bfp;
-+ int i;
-+ unsigned long vers;
-+ unsigned char actionbuf[256];
-+ unsigned char resp[128]; /* Response */
-+ unsigned long count;
-+ unsigned short atype;
-+
-+ if (u->bts == NULL) /* no script, ignore */
-+ return 0;
-+
-+ bfp = bts_load_script( u->bts, &vers );
-+ if (bfp == NULL)
-+ return -1;
-+
-+ fprintf( stderr, "Loading BTS script version %lu\n", vers );
-+
-+ while ((count = bts_next_action( bfp, actionbuf,
-+ sizeof actionbuf - 1, &atype )) != 0) {
-+ if (atype == ACTION_REMARKS) {
-+ if (actionbuf[0] != 0)
-+ fprintf( stderr, "%s\n", actionbuf );
-+ }
-+ else if (atype == ACTION_SEND_COMMAND) {
-+#if 0
-+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ int n;
-+ n = write(fd, actionbuf, count);
-+ if (n < 0 || n < count) {
-+ perror("Failed to write TI action command");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_WAIT_EVENT) {
-+ action_wait_t *wait = (action_wait_t *)actionbuf;
-+#if 0
-+ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size );
-+ for (i=0; i<wait->size; i++) {
-+ fprintf( stderr, "0x%02x ", wait->data[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ usleep(wait->msec); /* seems they give usec, not msec */
-+ /* Read reply. */
-+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) {
-+ perror("Failed to read TI command response");
-+ return -1;
-+ }
-+ if (count < wait->size) {
-+ fprintf( stderr, "TI command response is short.");
-+ }
-+ for (i=0; i<wait->size; i++) {
-+ if (i == 3) continue; /* ignore */
-+ if (resp[i] != wait->data[i]) {
-+ fprintf( stderr, "TI command response does not match expected result.\n" );
-+ }
-+ }
-+ }
-+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) {
-+ action_serial_t *sercmd = (action_serial_t *)actionbuf;
-+
-+ /* Set actual baudrate */
-+ fprintf( stderr,
-+ "BTS changing baud rate to %u, flow control to %u\n",
-+ sercmd->baud, sercmd->flow_control );
-+
-+ tcflush(fd, TCIOFLUSH);
-+
-+ if (sercmd->flow_control)
-+ ti->c_cflag |= CRTSCTS;
-+ else
-+ ti->c_cflag &= ~CRTSCTS;
-+ if (tcsetattr(fd, TCSANOW, ti) < 0) {
-+ perror("Can't set port settings");
-+ return -1;
-+ }
-+
-+ u->speed = sercmd->baud;
-+
-+ tcflush(fd, TCIOFLUSH);
-+ if (set_speed(fd, ti, sercmd->baud) < 0) {
-+ perror("Can't set baud rate");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_DELAY) {
-+ action_delay_t *delay = (action_delay_t *)actionbuf;
-+ usleep(delay->msec); /* seems they give usec, not msec */
-+ }
-+ else {
-+ fprintf( stderr, "BTS action type = %d: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+ }
-+ }
-+ bts_unload_script( bfp );
-+ return 0;
-+}
-+
- static int texas(int fd, struct uart_t *u, struct termios *ti)
- {
- struct timespec tm = {0, 50000};
-@@ -328,6 +439,17 @@
- /* Print LMP subversion */
- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
-
-+ if ((resp[14] >> 2) == 3) {
-+ /* BRF6150 */
-+ int err;
-+
-+ nanosleep(&tm, NULL);
-+ if ((err = brf6150(fd, u, ti)) != 0) {
-+ fprintf(stderr, "Texas module script failed (err=%d)\n", err);
-+ return -1;
-+ }
-+ }
-+
- nanosleep(&tm, NULL);
- return 0;
- }
-@@ -1204,7 +1326,7 @@
- {
- printf("hciattach - HCI UART driver initialization utility\n");
- printf("Usage:\n");
-- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
-+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
- printf("\thciattach -l\n");
- }
-
-@@ -1219,11 +1341,12 @@
- struct sigaction sa;
- struct pollfd p;
- char dev[PATH_MAX];
-+ char *bts = NULL;
-
- detach = 1;
- printpid = 0;
-
-- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) {
-+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) {
- switch(opt) {
- case 'b':
- send_break = 1;
-@@ -1245,6 +1368,10 @@
- init_speed = atoi(optarg);
- break;
-
-+ case 'S':
-+ bts = optarg;
-+ break;
-+
- case 'l':
- for (i = 0; uart[i].type; i++) {
- printf("%-10s0x%04x,0x%04x\n", uart[i].type,
-@@ -1320,6 +1447,8 @@
- if (init_speed)
- u->init_speed = init_speed;
-
-+ u->bts = bts;
-+
- memset(&sa, 0, sizeof(sa));
- sa.sa_flags = SA_NOCLDSTOP;
- sa.sa_handler = sig_alarm;
---- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200
-+++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200
-@@ -0,0 +1,116 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+#ifndef BT_SCRIPT_H
-+#define BT_SCRIPT_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Define the interface of Bluetooth Script
-+ */
-+
-+typedef void bts_t;
-+
-+
-+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */
-+#define ACTION_WAIT_EVENT 2 /* Wait for data */
-+#define ACTION_SERIAL_PORT_PARAMETERS 3
-+#define ACTION_DELAY 4
-+#define ACTION_RUN_SCRIPT 5
-+#define ACTION_REMARKS 6
-+
-+/*
-+ * Structure for ACTION_SEND_COMMAND
-+ */
-+typedef struct tagCActionCommand
-+{
-+ unsigned char data[1]; /* Data to send */
-+} action_command_t;
-+
-+/*
-+ * Structure for ACTION_WAIT_EVENT
-+ */
-+typedef struct tagCActionWaitEvent
-+{
-+ unsigned long msec; /* in milliseconds */
-+ unsigned long size;
-+ unsigned char data[1]; /* Data to wait for */
-+} action_wait_t;
-+
-+
-+/*
-+ * Structure for ACTION_SERIAL_PORT_PARAMETERS
-+ */
-+typedef struct tagCActionSerialPortParameters
-+{
-+ unsigned long baud;
-+ unsigned long flow_control;
-+} action_serial_t;
-+
-+/* Flow Control Type */
-+#define FCT_NONE 0
-+#define FCT_HARDWARE 1
-+
-+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */
-+
-+
-+/*
-+ * Structure for ACTION_DELAY
-+ */
-+typedef struct tagCActionDelay
-+{
-+ unsigned long msec; /* in milliseconds */
-+} action_delay_t;
-+
-+/*
-+ * Structure for ACTION_RUN_SCRIPT
-+ */
-+typedef struct tagCActionRunScript
-+{
-+ char filename[1];
-+} action_run_t;
-+
-+/*
-+ * Structure for ACTION_REMARKS
-+ */
-+typedef struct tagCActionRemarks
-+{
-+ char m_szRemarks[1];
-+} action_remarks_t;
-+
-+
-+const char *cis_create_filename(const unsigned char* cmdparms);
-+bts_t * bts_load_script(const char* fname, unsigned long* version);
-+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype);
-+void bts_unload_script(bts_t* bts_fp);
-+
-+#ifdef __cplusplus
-+};
-+#endif
-+
-+#endif /* BT_SCRIPT_H */
-+
---- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200
-+++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200
-@@ -0,0 +1,149 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include "ti_bts.h"
-+
-+#ifndef MAKEWORD
-+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8))
-+#endif
-+
-+#define TI_MANUFACTURER_ID 13
-+
-+/*
-+ * Common Init Script specific
-+ */
-+const char *
-+cis_create_filename(const unsigned char* cmdparms)
-+{
-+ static char bts_file[50];
-+
-+ /* Check for TI's id */
-+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]);
-+
-+ if (TI_MANUFACTURER_ID == manfid) {
-+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]);
-+
-+ unsigned short chip = (version & 0x7C00) >> 10;
-+ unsigned short min_ver = (version & 0x007F);
-+ unsigned short maj_ver = (version & 0x0380) >> 7;
-+
-+ if (0 != (version & 0x8000)) {
-+ maj_ver |= 0x0008;
-+ }
-+
-+ sprintf( bts_file, "TIInit_%d.%d.%d.bts",
-+ (int)chip, (int)maj_ver, (int)min_ver);
-+
-+ return &bts_file[0];
-+ }
-+ return NULL;
-+}
-+
-+typedef struct tagCHeader
-+{
-+ unsigned long magic;
-+ unsigned long version;
-+ unsigned char future[24];
-+} cheader_t;
-+
-+
-+/* The value 0x42535442 stands for (in ASCII) BTSB */
-+/* which is Bluetooth Script Binary */
-+#define FILE_HEADER_MAGIC 0x42535442
-+
-+
-+bts_t *
-+bts_load_script(const char* fname, unsigned long* version)
-+{
-+ bts_t* bts = NULL;
-+ FILE* fp = fopen(fname, "rb");
-+
-+ if (NULL != fp) {
-+ /* Read header */
-+ cheader_t header;
-+
-+ /* Read header */
-+ if (1 == fread(&header, sizeof(header), 1, fp)) {
-+ /* Check magic number for correctness */
-+ if (header.magic == FILE_HEADER_MAGIC) {
-+ /* If user wants the version number */
-+ if (NULL != version) {
-+ *version = header.version;
-+ }
-+ bts = (bts_t*)fp;
-+ }
-+ }
-+ /* If failed reading the file, close it */
-+ if (NULL == bts) {
-+ fclose(fp);
-+ }
-+ }
-+ return bts;
-+}
-+
-+unsigned long
-+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype)
-+{
-+ unsigned long bytes = 0;
-+ FILE* fp = (FILE*)bts_fp;
-+ unsigned char action_hdr[4];
-+
-+ if (bts_fp == NULL)
-+ return 0;
-+
-+ /* Each Action has the following: */
-+ /* UINT16 type of this action */
-+ /* UINT16 size of rest */
-+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */
-+
-+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) {
-+ unsigned short type = *(unsigned short*)&action_hdr[0];
-+ unsigned short size = *(unsigned short*)&action_hdr[2];
-+
-+ if (size <= nMaxSize) {
-+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp);
-+
-+ if (nread == size) {
-+ *ptype = type;
-+ bytes = (unsigned long)size;
-+ }
-+ }
-+ }
-+
-+ return bytes;
-+}
-+
-+void
-+bts_unload_script(bts_t* bts_fp)
-+{
-+ FILE* fp = (FILE*)bts_fp;
-+
-+ if (NULL != fp) {
-+ fclose(fp);
-+ }
-+}
-+
---- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200
-+++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200
-@@ -45,7 +45,7 @@
-
- noinst_PROGRAMS = hcisecfilter ppporc
-
--hciattach_SOURCES = hciattach.c hciattach_st.c
-+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
- hciattach_LDADD = @BLUEZ_LIBS@
-
- hciconfig_SOURCES = hciconfig.c csr.h csr.c
diff --git a/packages/bluez/bluez-utils-3.9/.mtn2git_empty b/packages/bluez/bluez-utils-3.9/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez/bluez-utils-3.9/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez/bluez-utils-3.9/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.9/hciattach-ti-bts.patch
deleted file mode 100644
index 87bd19f13b..0000000000
--- a/packages/bluez/bluez-utils-3.9/hciattach-ti-bts.patch
+++ /dev/null
@@ -1,498 +0,0 @@
-Index: bluez-utils-3.9/tools/hciattach.c
-===================================================================
---- bluez-utils-3.9.orig/tools/hciattach.c 2007-01-28 21:16:48.000000000 +0100
-+++ bluez-utils-3.9/tools/hciattach.c 2007-01-29 22:51:30.000000000 +0100
-@@ -59,6 +59,8 @@
- #define HCI_UART_3WIRE 2
- #define HCI_UART_H4DS 3
-
-+#include "ti_bts.h"
-+
- struct uart_t {
- char *type;
- int m_id;
-@@ -68,6 +70,7 @@
- int speed;
- int flags;
- int (*init) (int fd, struct uart_t *u, struct termios *ti);
-+ char *bts; /* bluetooth script */
- };
-
- #define FLOW_CTL 0x0001
-@@ -257,6 +260,114 @@
- return 0;
- }
-
-+static int brf6150(int fd, struct uart_t *u, struct termios *ti)
-+{
-+ bts_t *bfp;
-+ int i;
-+ unsigned long vers;
-+ unsigned char actionbuf[256];
-+ unsigned char resp[128]; /* Response */
-+ unsigned long count;
-+ unsigned short atype;
-+
-+ if (u->bts == NULL) /* no script, ignore */
-+ return 0;
-+
-+ bfp = bts_load_script( u->bts, &vers );
-+ if (bfp == NULL)
-+ return -1;
-+
-+ fprintf( stderr, "Loading BTS script version %lu\n", vers );
-+
-+ while ((count = bts_next_action( bfp, actionbuf,
-+ sizeof actionbuf - 1, &atype )) != 0) {
-+ if (atype == ACTION_REMARKS) {
-+ if (actionbuf[0] != 0)
-+ fprintf( stderr, "%s\n", actionbuf );
-+ }
-+ else if (atype == ACTION_SEND_COMMAND) {
-+#if 0
-+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ int n;
-+ n = write(fd, actionbuf, count);
-+ if (n < 0 || n < count) {
-+ perror("Failed to write TI action command");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_WAIT_EVENT) {
-+ action_wait_t *wait = (action_wait_t *)actionbuf;
-+#if 0
-+ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size );
-+ for (i=0; i<wait->size; i++) {
-+ fprintf( stderr, "0x%02x ", wait->data[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+#endif
-+ usleep(wait->msec); /* seems they give usec, not msec */
-+ /* Read reply. */
-+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) {
-+ perror("Failed to read TI command response");
-+ return -1;
-+ }
-+ if (count < wait->size) {
-+ fprintf( stderr, "TI command response is short.");
-+ }
-+ for (i=0; i<wait->size; i++) {
-+ if (i == 3) continue; /* ignore */
-+ if (resp[i] != wait->data[i]) {
-+ fprintf( stderr, "TI command response does not match expected result.\n" );
-+ }
-+ }
-+ }
-+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) {
-+ action_serial_t *sercmd = (action_serial_t *)actionbuf;
-+
-+ /* Set actual baudrate */
-+ fprintf( stderr,
-+ "BTS changing baud rate to %u, flow control to %u\n",
-+ sercmd->baud, sercmd->flow_control );
-+
-+ tcflush(fd, TCIOFLUSH);
-+
-+ if (sercmd->flow_control)
-+ ti->c_cflag |= CRTSCTS;
-+ else
-+ ti->c_cflag &= ~CRTSCTS;
-+ if (tcsetattr(fd, TCSANOW, ti) < 0) {
-+ perror("Can't set port settings");
-+ return -1;
-+ }
-+
-+ u->speed = sercmd->baud;
-+
-+ tcflush(fd, TCIOFLUSH);
-+ if (set_speed(fd, ti, sercmd->baud) < 0) {
-+ perror("Can't set baud rate");
-+ return -1;
-+ }
-+ }
-+ else if (atype == ACTION_DELAY) {
-+ action_delay_t *delay = (action_delay_t *)actionbuf;
-+ usleep(delay->msec); /* seems they give usec, not msec */
-+ }
-+ else {
-+ fprintf( stderr, "BTS action type = %d: ", (int)atype );
-+ for (i=0; i<count; i++) {
-+ fprintf( stderr, "0x%02x ", actionbuf[i] );
-+ }
-+ fprintf( stderr, "\n" );
-+ }
-+ }
-+ bts_unload_script( bfp );
-+ return 0;
-+}
-+
- static int texas(int fd, struct uart_t *u, struct termios *ti)
- {
- struct timespec tm = {0, 50000};
-@@ -297,15 +408,26 @@
- } while (resp[4] != cmd[1] && resp[5] != cmd[2]);
-
- /* Verify manufacturer */
-- if ((resp[11] & 0xFF) != 0x0d)
-+ if (resp[11] != 0x0d)
- fprintf(stderr,"WARNING : module's manufacturer is not Texas Instrument\n");
-
- /* Print LMP version */
-- fprintf(stderr, "Texas module LMP version : 0x%02x\n", resp[10] & 0xFF);
-+ fprintf(stderr, "TI module LMP version : 0x%02x\n", resp[10]);
-
- /* Print LMP subversion */
-- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
--
-+ fprintf(stderr, "TI module LMP sub-version : 0x%02x%02x\n", resp[14], resp[13]);
-+ if ((resp[14] >> 2) == 3) {
-+ int err;
-+ nanosleep(&tm, NULL);
-+
-+ /* BRF6150 */
-+ if ((err=brf6150( fd, u, ti )) != 0) {
-+ fprintf( stderr, "TI script failed (err=%d)\n",
-+ err );
-+ return -1;
-+ }
-+ }
-+
- nanosleep(&tm, NULL);
- return 0;
- }
-@@ -1128,7 +1250,7 @@
- {
- printf("hciattach - HCI UART driver initialization utility\n");
- printf("Usage:\n");
-- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow]\n");
-+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow]\n");
- printf("\thciattach -l\n");
- }
-
-@@ -1143,11 +1265,12 @@
- struct sigaction sa;
- struct pollfd p;
- char dev[PATH_MAX];
-+ char *bts = NULL;
-
- detach = 1;
- printpid = 0;
-
-- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) {
-+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) {
- switch(opt) {
- case 'b':
- send_break = 1;
-@@ -1169,6 +1292,10 @@
- init_speed = atoi(optarg);
- break;
-
-+ case 'S':
-+ bts = optarg;
-+ break;
-+
- case 'l':
- for (i = 0; uart[i].type; i++) {
- printf("%-10s0x%04x,0x%04x\n", uart[i].type,
-@@ -1240,6 +1367,8 @@
- if (init_speed)
- u->init_speed = init_speed;
-
-+ u->bts = bts;
-+
- memset(&sa, 0, sizeof(sa));
- sa.sa_flags = SA_NOCLDSTOP;
- sa.sa_handler = sig_alarm;
-Index: bluez-utils-3.9/tools/Makefile.am
-===================================================================
---- bluez-utils-3.9.orig/tools/Makefile.am 2007-01-28 21:16:48.000000000 +0100
-+++ bluez-utils-3.9/tools/Makefile.am 2007-01-29 22:54:22.000000000 +0100
-@@ -37,7 +37,7 @@
-
- noinst_PROGRAMS = hcisecfilter ppporc
-
--hciattach_SOURCES = hciattach.c hciattach_st.c
-+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
- hciattach_LDADD = @BLUEZ_LIBS@
-
- hciconfig_SOURCES = hciconfig.c csr.h csr.c
-Index: bluez-utils-3.9/tools/ti_bts.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ bluez-utils-3.9/tools/ti_bts.h 2007-01-29 22:51:30.000000000 +0100
-@@ -0,0 +1,116 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+#ifndef BT_SCRIPT_H
-+#define BT_SCRIPT_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Define the interface of Bluetooth Script
-+ */
-+
-+typedef void bts_t;
-+
-+
-+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */
-+#define ACTION_WAIT_EVENT 2 /* Wait for data */
-+#define ACTION_SERIAL_PORT_PARAMETERS 3
-+#define ACTION_DELAY 4
-+#define ACTION_RUN_SCRIPT 5
-+#define ACTION_REMARKS 6
-+
-+/*
-+ * Structure for ACTION_SEND_COMMAND
-+ */
-+typedef struct tagCActionCommand
-+{
-+ unsigned char data[1]; /* Data to send */
-+} action_command_t;
-+
-+/*
-+ * Structure for ACTION_WAIT_EVENT
-+ */
-+typedef struct tagCActionWaitEvent
-+{
-+ unsigned long msec; /* in milliseconds */
-+ unsigned long size;
-+ unsigned char data[1]; /* Data to wait for */
-+} action_wait_t;
-+
-+
-+/*
-+ * Structure for ACTION_SERIAL_PORT_PARAMETERS
-+ */
-+typedef struct tagCActionSerialPortParameters
-+{
-+ unsigned long baud;
-+ unsigned long flow_control;
-+} action_serial_t;
-+
-+/* Flow Control Type */
-+#define FCT_NONE 0
-+#define FCT_HARDWARE 1
-+
-+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */
-+
-+
-+/*
-+ * Structure for ACTION_DELAY
-+ */
-+typedef struct tagCActionDelay
-+{
-+ unsigned long msec; /* in milliseconds */
-+} action_delay_t;
-+
-+/*
-+ * Structure for ACTION_RUN_SCRIPT
-+ */
-+typedef struct tagCActionRunScript
-+{
-+ char filename[1];
-+} action_run_t;
-+
-+/*
-+ * Structure for ACTION_REMARKS
-+ */
-+typedef struct tagCActionRemarks
-+{
-+ char m_szRemarks[1];
-+} action_remarks_t;
-+
-+
-+const char *cis_create_filename(const unsigned char* cmdparms);
-+bts_t * bts_load_script(const char* fname, unsigned long* version);
-+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype);
-+void bts_unload_script(bts_t* bts_fp);
-+
-+#ifdef __cplusplus
-+};
-+#endif
-+
-+#endif /* BT_SCRIPT_H */
-+
-Index: bluez-utils-3.9/tools/ti_bts.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ bluez-utils-3.9/tools/ti_bts.c 2007-01-29 22:51:30.000000000 +0100
-@@ -0,0 +1,149 @@
-+/*
-+ * Copyright (c) 2005 Texas Instruments, Inc.
-+ * Ported by SDG Systems, LLC
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation;
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-+ * SOFTWARE IS DISCLAIMED.
-+ *
-+ */
-+
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include "ti_bts.h"
-+
-+#ifndef MAKEWORD
-+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8))
-+#endif
-+
-+#define TI_MANUFACTURER_ID 13
-+
-+/*
-+ * Common Init Script specific
-+ */
-+const char *
-+cis_create_filename(const unsigned char* cmdparms)
-+{
-+ static char bts_file[50];
-+
-+ /* Check for TI's id */
-+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]);
-+
-+ if (TI_MANUFACTURER_ID == manfid) {
-+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]);
-+
-+ unsigned short chip = (version & 0x7C00) >> 10;
-+ unsigned short min_ver = (version & 0x007F);
-+ unsigned short maj_ver = (version & 0x0380) >> 7;
-+
-+ if (0 != (version & 0x8000)) {
-+ maj_ver |= 0x0008;
-+ }
-+
-+ sprintf( bts_file, "TIInit_%d.%d.%d.bts",
-+ (int)chip, (int)maj_ver, (int)min_ver);
-+
-+ return &bts_file[0];
-+ }
-+ return NULL;
-+}
-+
-+typedef struct tagCHeader
-+{
-+ unsigned long magic;
-+ unsigned long version;
-+ unsigned char future[24];
-+} cheader_t;
-+
-+
-+/* The value 0x42535442 stands for (in ASCII) BTSB */
-+/* which is Bluetooth Script Binary */
-+#define FILE_HEADER_MAGIC 0x42535442
-+
-+
-+bts_t *
-+bts_load_script(const char* fname, unsigned long* version)
-+{
-+ bts_t* bts = NULL;
-+ FILE* fp = fopen(fname, "rb");
-+
-+ if (NULL != fp) {
-+ /* Read header */
-+ cheader_t header;
-+
-+ /* Read header */
-+ if (1 == fread(&header, sizeof(header), 1, fp)) {
-+ /* Check magic number for correctness */
-+ if (header.magic == FILE_HEADER_MAGIC) {
-+ /* If user wants the version number */
-+ if (NULL != version) {
-+ *version = header.version;
-+ }
-+ bts = (bts_t*)fp;
-+ }
-+ }
-+ /* If failed reading the file, close it */
-+ if (NULL == bts) {
-+ fclose(fp);
-+ }
-+ }
-+ return bts;
-+}
-+
-+unsigned long
-+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
-+ unsigned long nMaxSize, unsigned short* ptype)
-+{
-+ unsigned long bytes = 0;
-+ FILE* fp = (FILE*)bts_fp;
-+ unsigned char action_hdr[4];
-+
-+ if (bts_fp == NULL)
-+ return 0;
-+
-+ /* Each Action has the following: */
-+ /* UINT16 type of this action */
-+ /* UINT16 size of rest */
-+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */
-+
-+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) {
-+ unsigned short type = *(unsigned short*)&action_hdr[0];
-+ unsigned short size = *(unsigned short*)&action_hdr[2];
-+
-+ if (size <= nMaxSize) {
-+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp);
-+
-+ if (nread == size) {
-+ *ptype = type;
-+ bytes = (unsigned long)size;
-+ }
-+ }
-+ }
-+
-+ return bytes;
-+}
-+
-+void
-+bts_unload_script(bts_t* bts_fp)
-+{
-+ FILE* fp = (FILE*)bts_fp;
-+
-+ if (NULL != fp) {
-+ fclose(fp);
-+ }
-+}
-+
diff --git a/packages/bluez/bluez-utils-alsa_3.18.bb b/packages/bluez/bluez-utils-alsa_3.18.bb
deleted file mode 100644
index 5c4a07e8ab..0000000000
--- a/packages/bluez/bluez-utils-alsa_3.18.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require bluez-utils3.inc
-
-DEPENDS += "alsa-lib"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --disable-hid2hci \
- --enable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-FILES_${PN} = "${libdir}/alsa-lib/libasound*"
diff --git a/packages/bluez/bluez-utils-alsa_3.19.bb b/packages/bluez/bluez-utils-alsa_3.19.bb
deleted file mode 100644
index 5c4a07e8ab..0000000000
--- a/packages/bluez/bluez-utils-alsa_3.19.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require bluez-utils3.inc
-
-DEPENDS += "alsa-lib"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --disable-hid2hci \
- --enable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-FILES_${PN} = "${libdir}/alsa-lib/libasound*"
diff --git a/packages/bluez/bluez-utils-alsa_3.20.bb b/packages/bluez/bluez-utils-alsa_3.20.bb
deleted file mode 100644
index 5c4a07e8ab..0000000000
--- a/packages/bluez/bluez-utils-alsa_3.20.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require bluez-utils3.inc
-
-DEPENDS += "alsa-lib"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --disable-hid2hci \
- --enable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-FILES_${PN} = "${libdir}/alsa-lib/libasound*"
diff --git a/packages/bluez/bluez-utils-alsa_3.22.bb b/packages/bluez/bluez-utils-alsa_3.22.bb
deleted file mode 100644
index 5c4a07e8ab..0000000000
--- a/packages/bluez/bluez-utils-alsa_3.22.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require bluez-utils3.inc
-
-DEPENDS += "alsa-lib"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --disable-hid2hci \
- --enable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-FILES_${PN} = "${libdir}/alsa-lib/libasound*"
diff --git a/packages/bluez/bluez-utils-alsa_3.23.bb b/packages/bluez/bluez-utils-alsa_3.23.bb
deleted file mode 100644
index 0d7836fa65..0000000000
--- a/packages/bluez/bluez-utils-alsa_3.23.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require bluez-utils3.inc
-PR = "r1"
-
-DEPENDS += "alsa-lib"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --disable-hid2hci \
- --enable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-FILES_${PN} = "${libdir}/alsa-lib/libasound*"
diff --git a/packages/bluez/bluez-utils-alsa_3.24.bb b/packages/bluez/bluez-utils-alsa_3.24.bb
deleted file mode 100644
index a1e3e85818..0000000000
--- a/packages/bluez/bluez-utils-alsa_3.24.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require bluez-utils3.inc
-
-PR = "r1"
-
-DEPENDS += "alsa-lib"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --disable-hid2hci \
- --enable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-FILES_${PN} = "${libdir}/alsa-lib/libasound*"
diff --git a/packages/bluez/bluez-utils_3.11.bb b/packages/bluez/bluez-utils_3.11.bb
deleted file mode 100644
index 25fda9dcff..0000000000
--- a/packages/bluez/bluez-utils_3.11.bb
+++ /dev/null
@@ -1,111 +0,0 @@
-require bluez-utils.inc
-
-DEPENDS += "glib-2.0"
-
-#DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
- "
-PR = "r1"
-
-EXTRA_OECONF = " \
- --enable-bccmd \
- --disable-hid2hci \
- --disable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-# The config options are explained below:
-
-# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
-# --enable-cups install CUPS backend support
-# --enable-bccmd install BCCMD interface utility
-# --enable-avctrl install Audio/Video control utility
-# --enable-hid2hci install HID mode switching utility
-# --enable-dfutool install DFU firmware upgrade utility
-
-# --enable-glib For systems that use and install GLib anyway
-# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
-
-#Following services can be enabled so far:
-# --enable-network
-# --enable-serial
-# --enable-input
-# --enable-audio
-# --enable-echo
-
-#There is no need to modify any init script. They will be started
-#automatically or on demand. Only /etc/bluetooth/*.service files should
-#be patched to change name or the autostart value.
-# --enable-configfile
-# --enable-initscripts
-
-#For even smaller -doc packages
-# --disable-manpages
-# --disable-pcmciarules
-
-#I haven't seen any embedded device with HID proxy support. So simply
-#disable it:
-# --disable-hid2hci
-
-
-PACKAGES =+ "${PN}-compat"
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN} = " \
- ${base_sbindir}/hcid \
- ${libdir}/bluetooth \
- ${sysconfdir}/init.d/bluetooth \
- ${sysconfdir}/bluetooth/*.service \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default \
- ${sysconfdir}/dbus-1 \
- ${base_sbindir}/hciattach \
- "
-
-FILES_${PN}-dbg += " \
- ${libdir}/bluetooth/.debug \
- "
-
-FILES_${PN}-compat = " \
- ${base_bindir}/sdptool \
- ${base_bindir}/dund \
- ${base_bindir}/rctest \
- ${base_bindir}/ciptool \
- ${base_bindir}/l2test \
- ${base_bindir}/rfcomm \
- ${base_bindir}/hcitool \
- ${base_bindir}/pand \
- ${base_bindir}/hidd \
- ${base_bindir}/l2ping \
- ${base_sbindir}/hciconfig \
- ${base_sbindir}/bccmd \
- ${base_sbindir}/hciemu \
- ${base_bindir}/passkey-agent \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_bluez-cups-backend = "cups"
-
-
diff --git a/packages/bluez/bluez-utils_3.12.bb b/packages/bluez/bluez-utils_3.12.bb
deleted file mode 100644
index 98a79af901..0000000000
--- a/packages/bluez/bluez-utils_3.12.bb
+++ /dev/null
@@ -1,114 +0,0 @@
-require bluez-utils.inc
-
-DEPENDS += "glib-2.0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
- "
-PR = "r4"
-
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-# The config options are explained below:
-
-# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
-# --enable-cups install CUPS backend support
-# --enable-bccmd install BCCMD interface utility
-# --enable-avctrl install Audio/Video control utility
-# --enable-hid2hci install HID mode switching utility
-# --enable-dfutool install DFU firmware upgrade utility
-
-# --enable-glib For systems that use and install GLib anyway
-# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
-
-#Following services can be enabled so far:
-# --enable-network
-# --enable-serial
-# --enable-input
-# --enable-audio
-# --enable-echo
-
-#There is no need to modify any init script. They will be started
-#automatically or on demand. Only /etc/bluetooth/*.service files should
-#be patched to change name or the autostart value.
-# --enable-configfile
-# --enable-initscripts
-
-#For even smaller -doc packages
-# --disable-manpages
-# --disable-pcmciarules
-
-#I haven't seen any embedded device with HID proxy support. So simply
-#disable it:
-# --disable-hid2hci
-
-
-PACKAGES =+ "${PN}-compat ${PN}-alsa"
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN} = " \
- ${base_sbindir}/hcid \
- ${libdir}/bluetooth \
- ${sysconfdir}/init.d/bluetooth \
- ${sysconfdir}/bluetooth/*.service \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default \
- ${sysconfdir}/dbus-1 \
- ${base_sbindir}/hciattach \
- "
-
-FILES_${PN}-dbg += " \
- ${libdir}/bluetooth/.debug \
- ${libdir}/cups/backend/.debug \
- ${libdir}/alsa-lib/.debug \
- "
-
-FILES_${PN}-compat = " \
- ${base_bindir}/sdptool \
- ${base_bindir}/dund \
- ${base_bindir}/rctest \
- ${base_bindir}/ciptool \
- ${base_bindir}/l2test \
- ${base_bindir}/rfcomm \
- ${base_bindir}/hcitool \
- ${base_bindir}/pand \
- ${base_bindir}/hidd \
- ${base_bindir}/l2ping \
- ${base_sbindir}/hciconfig \
- ${base_sbindir}/bccmd \
- ${base_sbindir}/hciemu \
- ${base_sbindir}/hid2hci \
- ${base_bindir}/passkey-agent \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
-
-FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_bluez-cups-backend = "cups"
-
-
diff --git a/packages/bluez/bluez-utils_3.13.bb b/packages/bluez/bluez-utils_3.13.bb
deleted file mode 100644
index 0a2a062338..0000000000
--- a/packages/bluez/bluez-utils_3.13.bb
+++ /dev/null
@@ -1,114 +0,0 @@
-require bluez-utils.inc
-
-DEPENDS += "glib-2.0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
- "
-PR = "r0"
-
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-# The config options are explained below:
-
-# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
-# --enable-cups install CUPS backend support
-# --enable-bccmd install BCCMD interface utility
-# --enable-avctrl install Audio/Video control utility
-# --enable-hid2hci install HID mode switching utility
-# --enable-dfutool install DFU firmware upgrade utility
-
-# --enable-glib For systems that use and install GLib anyway
-# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
-
-#Following services can be enabled so far:
-# --enable-network
-# --enable-serial
-# --enable-input
-# --enable-audio
-# --enable-echo
-
-#There is no need to modify any init script. They will be started
-#automatically or on demand. Only /etc/bluetooth/*.service files should
-#be patched to change name or the autostart value.
-# --enable-configfile
-# --enable-initscripts
-
-#For even smaller -doc packages
-# --disable-manpages
-# --disable-pcmciarules
-
-#I haven't seen any embedded device with HID proxy support. So simply
-#disable it:
-# --disable-hid2hci
-
-
-PACKAGES =+ "${PN}-compat ${PN}-alsa"
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN} = " \
- ${base_sbindir}/hcid \
- ${libdir}/bluetooth \
- ${sysconfdir}/init.d/bluetooth \
- ${sysconfdir}/bluetooth/*.service \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default \
- ${sysconfdir}/dbus-1 \
- ${base_sbindir}/hciattach \
- "
-
-FILES_${PN}-dbg += " \
- ${libdir}/bluetooth/.debug \
- ${libdir}/cups/backend/.debug \
- ${libdir}/alsa-lib/.debug \
- "
-
-FILES_${PN}-compat = " \
- ${base_bindir}/sdptool \
- ${base_bindir}/dund \
- ${base_bindir}/rctest \
- ${base_bindir}/ciptool \
- ${base_bindir}/l2test \
- ${base_bindir}/rfcomm \
- ${base_bindir}/hcitool \
- ${base_bindir}/pand \
- ${base_bindir}/hidd \
- ${base_bindir}/l2ping \
- ${base_sbindir}/hciconfig \
- ${base_sbindir}/bccmd \
- ${base_sbindir}/hciemu \
- ${base_sbindir}/hid2hci \
- ${base_bindir}/passkey-agent \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
-
-FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_bluez-cups-backend = "cups"
-
-
diff --git a/packages/bluez/bluez-utils_3.14.bb b/packages/bluez/bluez-utils_3.14.bb
deleted file mode 100644
index 5d0c3cf15b..0000000000
--- a/packages/bluez/bluez-utils_3.14.bb
+++ /dev/null
@@ -1,115 +0,0 @@
-require bluez-utils.inc
-
-DEPENDS += "glib-2.0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
- file://hciattach-ti-bts.patch;patch=1 \
- "
-PR = "r1"
-
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-# The config options are explained below:
-
-# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
-# --enable-cups install CUPS backend support
-# --enable-bccmd install BCCMD interface utility
-# --enable-avctrl install Audio/Video control utility
-# --enable-hid2hci install HID mode switching utility
-# --enable-dfutool install DFU firmware upgrade utility
-
-# --enable-glib For systems that use and install GLib anyway
-# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
-
-#Following services can be enabled so far:
-# --enable-network
-# --enable-serial
-# --enable-input
-# --enable-audio
-# --enable-echo
-
-#There is no need to modify any init script. They will be started
-#automatically or on demand. Only /etc/bluetooth/*.service files should
-#be patched to change name or the autostart value.
-# --enable-configfile
-# --enable-initscripts
-
-#For even smaller -doc packages
-# --disable-manpages
-# --disable-pcmciarules
-
-#I haven't seen any embedded device with HID proxy support. So simply
-#disable it:
-# --disable-hid2hci
-
-
-PACKAGES =+ "${PN}-compat ${PN}-alsa"
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN} = " \
- ${base_sbindir}/hcid \
- ${libdir}/bluetooth \
- ${sysconfdir}/init.d/bluetooth \
- ${sysconfdir}/bluetooth/*.service \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default \
- ${sysconfdir}/dbus-1 \
- ${base_sbindir}/hciattach \
- "
-
-FILES_${PN}-dbg += " \
- ${libdir}/bluetooth/.debug \
- ${libdir}/cups/backend/.debug \
- ${libdir}/alsa-lib/.debug \
- "
-
-FILES_${PN}-compat = " \
- ${base_bindir}/sdptool \
- ${base_bindir}/dund \
- ${base_bindir}/rctest \
- ${base_bindir}/ciptool \
- ${base_bindir}/l2test \
- ${base_bindir}/rfcomm \
- ${base_bindir}/hcitool \
- ${base_bindir}/pand \
- ${base_bindir}/hidd \
- ${base_bindir}/l2ping \
- ${base_sbindir}/hciconfig \
- ${base_sbindir}/bccmd \
- ${base_sbindir}/hciemu \
- ${base_sbindir}/hid2hci \
- ${base_bindir}/passkey-agent \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
-
-FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_bluez-cups-backend = "cups"
-
-
diff --git a/packages/bluez/bluez-utils_3.15.bb b/packages/bluez/bluez-utils_3.15.bb
deleted file mode 100644
index a7d1dce192..0000000000
--- a/packages/bluez/bluez-utils_3.15.bb
+++ /dev/null
@@ -1,116 +0,0 @@
-require bluez-utils.inc
-
-DEPENDS += "glib-2.0"
-
-# ti patch doesn't apply, people using it should rediff it and send it upstream
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
-# file://hciattach-ti-bts.patch;patch=1 \
- "
-PR = "r0"
-
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-# The config options are explained below:
-
-# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
-# --enable-cups install CUPS backend support
-# --enable-bccmd install BCCMD interface utility
-# --enable-avctrl install Audio/Video control utility
-# --enable-hid2hci install HID mode switching utility
-# --enable-dfutool install DFU firmware upgrade utility
-
-# --enable-glib For systems that use and install GLib anyway
-# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
-
-#Following services can be enabled so far:
-# --enable-network
-# --enable-serial
-# --enable-input
-# --enable-audio
-# --enable-echo
-
-#There is no need to modify any init script. They will be started
-#automatically or on demand. Only /etc/bluetooth/*.service files should
-#be patched to change name or the autostart value.
-# --enable-configfile
-# --enable-initscripts
-
-#For even smaller -doc packages
-# --disable-manpages
-# --disable-pcmciarules
-
-#I haven't seen any embedded device with HID proxy support. So simply
-#disable it:
-# --disable-hid2hci
-
-
-PACKAGES =+ "${PN}-compat ${PN}-alsa"
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN} = " \
- ${base_sbindir}/hcid \
- ${libdir}/bluetooth \
- ${sysconfdir}/init.d/bluetooth \
- ${sysconfdir}/bluetooth/*.service \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default \
- ${sysconfdir}/dbus-1 \
- ${base_sbindir}/hciattach \
- "
-
-FILES_${PN}-dbg += " \
- ${libdir}/bluetooth/.debug \
- ${libdir}/cups/backend/.debug \
- ${libdir}/alsa-lib/.debug \
- "
-
-FILES_${PN}-compat = " \
- ${base_bindir}/sdptool \
- ${base_bindir}/dund \
- ${base_bindir}/rctest \
- ${base_bindir}/ciptool \
- ${base_bindir}/l2test \
- ${base_bindir}/rfcomm \
- ${base_bindir}/hcitool \
- ${base_bindir}/pand \
- ${base_bindir}/hidd \
- ${base_bindir}/l2ping \
- ${base_sbindir}/hciconfig \
- ${base_sbindir}/bccmd \
- ${base_sbindir}/hciemu \
- ${base_sbindir}/hid2hci \
- ${base_bindir}/passkey-agent \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
-
-FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_bluez-cups-backend = "cups"
-
-
diff --git a/packages/bluez/bluez-utils_3.16.bb b/packages/bluez/bluez-utils_3.16.bb
deleted file mode 100644
index a7d1dce192..0000000000
--- a/packages/bluez/bluez-utils_3.16.bb
+++ /dev/null
@@ -1,116 +0,0 @@
-require bluez-utils.inc
-
-DEPENDS += "glib-2.0"
-
-# ti patch doesn't apply, people using it should rediff it and send it upstream
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
-# file://hciattach-ti-bts.patch;patch=1 \
- "
-PR = "r0"
-
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-# The config options are explained below:
-
-# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
-# --enable-cups install CUPS backend support
-# --enable-bccmd install BCCMD interface utility
-# --enable-avctrl install Audio/Video control utility
-# --enable-hid2hci install HID mode switching utility
-# --enable-dfutool install DFU firmware upgrade utility
-
-# --enable-glib For systems that use and install GLib anyway
-# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
-
-#Following services can be enabled so far:
-# --enable-network
-# --enable-serial
-# --enable-input
-# --enable-audio
-# --enable-echo
-
-#There is no need to modify any init script. They will be started
-#automatically or on demand. Only /etc/bluetooth/*.service files should
-#be patched to change name or the autostart value.
-# --enable-configfile
-# --enable-initscripts
-
-#For even smaller -doc packages
-# --disable-manpages
-# --disable-pcmciarules
-
-#I haven't seen any embedded device with HID proxy support. So simply
-#disable it:
-# --disable-hid2hci
-
-
-PACKAGES =+ "${PN}-compat ${PN}-alsa"
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN} = " \
- ${base_sbindir}/hcid \
- ${libdir}/bluetooth \
- ${sysconfdir}/init.d/bluetooth \
- ${sysconfdir}/bluetooth/*.service \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default \
- ${sysconfdir}/dbus-1 \
- ${base_sbindir}/hciattach \
- "
-
-FILES_${PN}-dbg += " \
- ${libdir}/bluetooth/.debug \
- ${libdir}/cups/backend/.debug \
- ${libdir}/alsa-lib/.debug \
- "
-
-FILES_${PN}-compat = " \
- ${base_bindir}/sdptool \
- ${base_bindir}/dund \
- ${base_bindir}/rctest \
- ${base_bindir}/ciptool \
- ${base_bindir}/l2test \
- ${base_bindir}/rfcomm \
- ${base_bindir}/hcitool \
- ${base_bindir}/pand \
- ${base_bindir}/hidd \
- ${base_bindir}/l2ping \
- ${base_sbindir}/hciconfig \
- ${base_sbindir}/bccmd \
- ${base_sbindir}/hciemu \
- ${base_sbindir}/hid2hci \
- ${base_bindir}/passkey-agent \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
-
-FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_bluez-cups-backend = "cups"
-
-
diff --git a/packages/bluez/bluez-utils_3.17.bb b/packages/bluez/bluez-utils_3.17.bb
deleted file mode 100644
index a7d1dce192..0000000000
--- a/packages/bluez/bluez-utils_3.17.bb
+++ /dev/null
@@ -1,116 +0,0 @@
-require bluez-utils.inc
-
-DEPENDS += "glib-2.0"
-
-# ti patch doesn't apply, people using it should rediff it and send it upstream
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
-# file://hciattach-ti-bts.patch;patch=1 \
- "
-PR = "r0"
-
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-# The config options are explained below:
-
-# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
-# --enable-cups install CUPS backend support
-# --enable-bccmd install BCCMD interface utility
-# --enable-avctrl install Audio/Video control utility
-# --enable-hid2hci install HID mode switching utility
-# --enable-dfutool install DFU firmware upgrade utility
-
-# --enable-glib For systems that use and install GLib anyway
-# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
-
-#Following services can be enabled so far:
-# --enable-network
-# --enable-serial
-# --enable-input
-# --enable-audio
-# --enable-echo
-
-#There is no need to modify any init script. They will be started
-#automatically or on demand. Only /etc/bluetooth/*.service files should
-#be patched to change name or the autostart value.
-# --enable-configfile
-# --enable-initscripts
-
-#For even smaller -doc packages
-# --disable-manpages
-# --disable-pcmciarules
-
-#I haven't seen any embedded device with HID proxy support. So simply
-#disable it:
-# --disable-hid2hci
-
-
-PACKAGES =+ "${PN}-compat ${PN}-alsa"
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN} = " \
- ${base_sbindir}/hcid \
- ${libdir}/bluetooth \
- ${sysconfdir}/init.d/bluetooth \
- ${sysconfdir}/bluetooth/*.service \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default \
- ${sysconfdir}/dbus-1 \
- ${base_sbindir}/hciattach \
- "
-
-FILES_${PN}-dbg += " \
- ${libdir}/bluetooth/.debug \
- ${libdir}/cups/backend/.debug \
- ${libdir}/alsa-lib/.debug \
- "
-
-FILES_${PN}-compat = " \
- ${base_bindir}/sdptool \
- ${base_bindir}/dund \
- ${base_bindir}/rctest \
- ${base_bindir}/ciptool \
- ${base_bindir}/l2test \
- ${base_bindir}/rfcomm \
- ${base_bindir}/hcitool \
- ${base_bindir}/pand \
- ${base_bindir}/hidd \
- ${base_bindir}/l2ping \
- ${base_sbindir}/hciconfig \
- ${base_sbindir}/bccmd \
- ${base_sbindir}/hciemu \
- ${base_sbindir}/hid2hci \
- ${base_bindir}/passkey-agent \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
-
-FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_bluez-cups-backend = "cups"
-
-
diff --git a/packages/bluez/bluez-utils_3.18.bb b/packages/bluez/bluez-utils_3.18.bb
deleted file mode 100644
index 48f147aa69..0000000000
--- a/packages/bluez/bluez-utils_3.18.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-require bluez-utils3.inc
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
diff --git a/packages/bluez/bluez-utils_3.19.bb b/packages/bluez/bluez-utils_3.19.bb
deleted file mode 100644
index 48f147aa69..0000000000
--- a/packages/bluez/bluez-utils_3.19.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-require bluez-utils3.inc
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
diff --git a/packages/bluez/bluez-utils_3.20.bb b/packages/bluez/bluez-utils_3.20.bb
deleted file mode 100644
index 48f147aa69..0000000000
--- a/packages/bluez/bluez-utils_3.20.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-require bluez-utils3.inc
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
diff --git a/packages/bluez/bluez-utils_3.22.bb b/packages/bluez/bluez-utils_3.22.bb
deleted file mode 100644
index 48f147aa69..0000000000
--- a/packages/bluez/bluez-utils_3.22.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-require bluez-utils3.inc
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
diff --git a/packages/bluez/bluez-utils_3.23.bb b/packages/bluez/bluez-utils_3.23.bb
deleted file mode 100644
index 37365f67fc..0000000000
--- a/packages/bluez/bluez-utils_3.23.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require bluez-utils3.inc
-PR = "r2"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
diff --git a/packages/bluez/bluez-utils_3.24.bb b/packages/bluez/bluez-utils_3.24.bb
deleted file mode 100644
index 37365f67fc..0000000000
--- a/packages/bluez/bluez-utils_3.24.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require bluez-utils3.inc
-PR = "r2"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
diff --git a/packages/bluez/bluez-utils_3.28.bb b/packages/bluez/bluez-utils_3.28.bb
deleted file mode 100644
index 37365f67fc..0000000000
--- a/packages/bluez/bluez-utils_3.28.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require bluez-utils3.inc
-PR = "r2"
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
diff --git a/packages/bluez/bluez-utils_3.30.bb b/packages/bluez/bluez-utils_3.30.bb
deleted file mode 100644
index e4b5f21a84..0000000000
--- a/packages/bluez/bluez-utils_3.30.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-require bluez-utils3.inc
-
-# see bluez-utils3.inc for the explanation of these option
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --disable-alsa \
- --disable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-CONFFILES_${PN} = " \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default/bluetooth \
- "
-
-CONFFILES_${PN}-compat = " \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-PACKAGES =+ "bluez-audio"
-
-FILES_${PN} = " \
- ${base_sbindir}/hcid \
- ${libdir}/bluetooth/plugins/*.so \
- ${sysconfdir}/init.d/bluetooth \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default \
- ${sysconfdir}/dbus-1 \
- ${base_sbindir}/hciattach \
- "
-
-FILES_bluez-audio = " \
- ${libdir}/bluetooth/plugins/libaudio.so \
- ${libdir}/gstreamer-0.10/*.so \
- "
-
-FILES_${PN}-dbg += " \
- ${libdir}/bluetooth/plugins/.debug \
- ${libdir}/gstreamer-0.10/.debug \
- "
-
-FILES_${PN}-dev += " \
- ${libdir}/bluetooth/plugins/*.la \
- ${libdir}/gstreamer-0.10/*.la \
- "
diff --git a/packages/bluez/bluez-utils_3.4.bb b/packages/bluez/bluez-utils_3.4.bb
deleted file mode 100644
index f2bbd15507..0000000000
--- a/packages/bluez/bluez-utils_3.4.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs-${PV} dbus"
-PROVIDES = "bluez-utils-dbus"
-RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
-RREPLACES = "bluez-utils-dbus"
-RCONFLICTS_${PN} = "bluez-utils-nodbus"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
- file://hciattach-ti-bts.patch;patch=1"
-
-# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
-# Let's default to that instead of 'any' until further notice...
-SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
-
-S = "${WORKDIR}/bluez-utils-${PV}"
-
-EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci"
-# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support
-# --enable-cups install CUPS backend support
-# --enable-bccmd install BCCMD interface utility
-# --enable-avctrl install Audio/Video control utility
-# --enable-hid2hci install HID mode switching utility
-# --enable-dfutool install DFU firmware upgrade utility
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-
-do_install_append() {
- install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/
- mv ${D}${sbindir}/* ${D}${base_sbindir}/
- mv ${D}${bindir}/* ${D}${base_bindir}/
- rmdir ${D}${bindir} ${D}${sbindir}
- chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
- install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
-}
-
-CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
- ${sysconfdir}/default/bluetooth"
-
-PACKAGES =+ "${PN}-ciptool"
-FILES_${PN}-ciptool = "/bin/ciptool"
-RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
-RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
diff --git a/packages/bluez/bluez-utils_3.7.bb b/packages/bluez/bluez-utils_3.7.bb
deleted file mode 100644
index 7a76cb3200..0000000000
--- a/packages/bluez/bluez-utils_3.7.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs-${PV} dbus cups alsa-lib openobex"
-PROVIDES = "bluez-utils-dbus"
-RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
-RREPLACES = "bluez-utils-dbus"
-RCONFLICTS_${PN} = "bluez-utils-nodbus"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
- file://hciattach-ti-bts.patch;patch=1"
-
-# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
-# Let's default to that instead of 'any' until further notice...
-SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
-
-S = "${WORKDIR}/bluez-utils-${PV}"
-
-EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-obex --enable-alsa --enable-cups"
-# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support
-# --enable-cups install CUPS backend support
-# --enable-bccmd install BCCMD interface utility
-# --enable-avctrl install Audio/Video control utility
-# --enable-hid2hci install HID mode switching utility
-# --enable-dfutool install DFU firmware upgrade utility
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-
-do_install_append() {
- install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/
- mv ${D}${sbindir}/* ${D}${base_sbindir}/
- mv ${D}${bindir}/* ${D}${base_bindir}/
- rmdir ${D}${bindir} ${D}${sbindir}
- chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
- install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
-}
-
-CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
- ${sysconfdir}/default/bluetooth"
-
-PACKAGES =+ "${PN}-ciptool bluez-cups-backend"
-FILES_${PN}-ciptool = "/bin/ciptool"
-RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
-RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
-
-FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_bluez-cups-backend = "cups"
diff --git a/packages/bluez/bluez-utils_3.8.bb b/packages/bluez/bluez-utils_3.8.bb
deleted file mode 100644
index f2bbd15507..0000000000
--- a/packages/bluez/bluez-utils_3.8.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs-${PV} dbus"
-PROVIDES = "bluez-utils-dbus"
-RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
-RREPLACES = "bluez-utils-dbus"
-RCONFLICTS_${PN} = "bluez-utils-nodbus"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
- file://hciattach-ti-bts.patch;patch=1"
-
-# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
-# Let's default to that instead of 'any' until further notice...
-SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
-
-S = "${WORKDIR}/bluez-utils-${PV}"
-
-EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci"
-# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support
-# --enable-cups install CUPS backend support
-# --enable-bccmd install BCCMD interface utility
-# --enable-avctrl install Audio/Video control utility
-# --enable-hid2hci install HID mode switching utility
-# --enable-dfutool install DFU firmware upgrade utility
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-
-do_install_append() {
- install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/
- mv ${D}${sbindir}/* ${D}${base_sbindir}/
- mv ${D}${bindir}/* ${D}${base_bindir}/
- rmdir ${D}${bindir} ${D}${sbindir}
- chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
- install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
-}
-
-CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
- ${sysconfdir}/default/bluetooth"
-
-PACKAGES =+ "${PN}-ciptool"
-FILES_${PN}-ciptool = "/bin/ciptool"
-RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
-RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb
deleted file mode 100644
index 29c472fbbd..0000000000
--- a/packages/bluez/bluez-utils_3.9.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require bluez-utils.inc
-
-PACKAGES =+ "${PN}-ciptool"
-
-SRC_URI += "file://uclibc-fix.patch;patch=1 \
- file://ppoll-uclibc-arm-r0.patch;patch=1 "
-
-FILES_${PN}-ciptool = "/bin/ciptool"
-RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
-RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
-
-
-PR = "r5"