diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/bluetooth-firmware-bcm.install (renamed from debian/bt-firmware-43xx.install) | 1 | ||||
| -rw-r--r-- | debian/bluetooth-firmware-bcm.postinst.in (renamed from debian/bt-firmware-43xx.postinst.in) | 0 | ||||
| -rwxr-xr-x | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | packaging/bluetooth-firmware-bcm.spec (renamed from packaging/bt-firmware-43xx.spec) | 14 | ||||
| -rwxr-xr-x | scripts/bt-dev-start.sh | 13 |
8 files changed, 26 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8608e04..c0285fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) INCLUDE(FindPkgConfig) -pkg_check_modules(package REQUIRED glib-2.0 dbus-glib-1 vconf) +pkg_check_modules(package REQUIRED glib-2.0 vconf) FOREACH(flag ${package_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/debian/bt-firmware-43xx.install b/debian/bluetooth-firmware-bcm.install index 4ae9840..a99d1b4 100644 --- a/debian/bt-firmware-43xx.install +++ b/debian/bluetooth-firmware-bcm.install @@ -1,3 +1,2 @@ usr/bin/* usr/etc/bluetooth/BCM4330B1_002.001.003.0221.0265.hcd -usr/etc/bluetooth/* diff --git a/debian/bt-firmware-43xx.postinst.in b/debian/bluetooth-firmware-bcm.postinst.in index cb03b3c..cb03b3c 100644 --- a/debian/bt-firmware-43xx.postinst.in +++ b/debian/bluetooth-firmware-bcm.postinst.in diff --git a/debian/changelog b/debian/changelog index b06cbd4..fb08aec 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bluetooth-firmware-bcm (0.1.3) unstable; urgency=low + + * rename bt-firmware-43xx to bluetooth-firmware-bcm + + -- Jaekyun Lee <jkyun.lee@samsung.com> Sat, 11 Aug 2012 14:26:05 +0900 + bt-firmware-43xx (0.1.2) unstable; urgency=low * Fix set bd bug as TAPI IMEI API deprecated diff --git a/debian/control b/debian/control index ec8cb24..91d830a 100644 --- a/debian/control +++ b/debian/control @@ -1,23 +1,23 @@ -Source: bt-firmware-43xx +Source: bluetooth-firmware-bcm Section: devel Priority: optional Maintainer: DoHyun Pyun <dh79.pyun@samsung.com>, ChanYeol Park <chanyeol.park@samsung.com>, Girish A J <girish.joshi@samsung.com>, InJun Yang <injun.yang@samsung.com>, Jaekyun Lee <jkyun.lee@samsung.com> Uploaders: Sunil Behera <sunil.behera@samsung.com>, Syam Sidhardhan <s.syam@samsung.com> -Build-Depends: debhelper (>= 5), libglib2.0-dev, libdbus-glib-1-dev, libvconf-dev +Build-Depends: debhelper (>= 5), libglib2.0-dev, libvconf-dev Standards-Version: 3.7.2 Homepage: N/A -Package: bt-firmware-43xx +Package: bluetooth-firmware-bcm Architecture: any Section: utils Depends: ${shlibs:Depends}, ${misc:Depends}, bluetooth-tools Description: firmware and tools firmware and tools -Package: bt-firmware-43xx-dbg +Package: bluetooth-firmware-bcm-dbg Section: debug Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, bt-firmware-43xx (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, bluetooth-firmware-bcm (= ${Source-Version}) Description: Tools for bluetooth-firmware-bcm (unstripped) The package contains detached debugging symbols for the binary packages produced by the bt-firmware-43xx soruce. diff --git a/debian/rules b/debian/rules index 116771c..531d1a1 100755 --- a/debian/rules +++ b/debian/rules @@ -97,7 +97,7 @@ binary-arch: build install # dh_installinfo dh_installman dh_link - dh_strip --dbg-package=bt-firmware-43xx-dbg + dh_strip --dbg-package=bluetooth-firmware-bcm-dbg dh_compress dh_fixperms # dh_perl diff --git a/packaging/bt-firmware-43xx.spec b/packaging/bluetooth-firmware-bcm.spec index 67c8dbb..5c06516 100644 --- a/packaging/bt-firmware-43xx.spec +++ b/packaging/bluetooth-firmware-bcm.spec @@ -1,13 +1,13 @@ -Name: bt-firmware-43xx +Name: bluetooth-firmware-bcm Summary: firmware and tools for bluetooth -Version: 0.1.2 +Version: 0.1.3 Release: 1 -Group: TO_BE_FILLED -License: TO_BE_FILLED -Source0: bluetooth-firmware-bcm-%{version}.tar.gz +Group: Hardware Support/Handset +License: Apache +# NOTE: Source name does not match package name. This should be +# resolved in the future, by I don't have that power. - Ryan Ware +Source0: %{name}-%{version}.tar.gz -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(vconf) BuildRequires: cmake diff --git a/scripts/bt-dev-start.sh b/scripts/bt-dev-start.sh index 842cc14..7a3e70f 100755 --- a/scripts/bt-dev-start.sh +++ b/scripts/bt-dev-start.sh @@ -1,17 +1,16 @@ #!/bin/sh -# # Script for registering Broadcom UART BT device -# -PLUGIN_DIR= BT_UART_DEVICE=/dev/ttySAC0 BT_CHIP_TYPE=bcm2035 -BCM_TOOL=$PLUGIN_DIR/usr/bin/bcmtool_4330b1 -BCM_FIRMWARE=BCM4330B1_002.001.003.0221.0265.hcd +BCM_TOOL=/usr/bin/bcmtool_4330b1 -BT_PLATFORM_DEFAULT_HCI_NAME="TIZEN_BT" +BT_PLATFORM_DEFAULT_HCI_NAME="TIZEN-Mobile" UART_SPEED=921600 +#set default firmware +BCM_FIRMWARE=BCM4330B1_002.001.003.0221.0265.hcd + REVISION_NUM=`grep Revision /proc/cpuinfo | awk "{print \\$3}"` REVISION_HIGH=`echo $REVISION_NUM| cut -c1-2` REVISION_LOW=`echo $REVISION_NUM| cut -c3-` @@ -40,7 +39,7 @@ else echo "Bluetooth device is DOWN" echo "Registering Bluetooth device" - $BCM_TOOL $BT_UART_DEVICE -FILE=$PLUGIN_DIR/usr/etc/bluetooth/$BCM_FIRMWARE -BAUD=$UART_SPEED -ADDR=/opt/etc/.bd_addr -SETSCO=0,0,0,0,0,0,0,3,3,0 -LP > /dev/null 2>&1 + $BCM_TOOL $BT_UART_DEVICE -FILE=/usr/etc/bluetooth/$BCM_FIRMWARE -BAUD=$UART_SPEED -ADDR=/opt/etc/.bd_addr -SETSCO=0,0,0,0,0,0,0,3,3,0 -LP > /dev/null 2>&1 # Attaching Broadcom device if (/usr/sbin/hciattach $BT_UART_DEVICE -s $UART_SPEED $BT_CHIP_TYPE $UART_SPEED flow); then |