Commit: 61645aa2dda1df5f7f339fd65aad7523e2db273c - device-generic-x86 (git)

device/generic/x86

Commit MetaInfo

• Revision: 61645aa2dda1df5f7f339fd65aad7523e2db273c (tree)
• Time: 2015-07-17 16:06:31
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

android-x86-4.4-r3 release (20150717)

Change Summary

• modified: BoardConfig.mk
• modified: app/AndroidTerm.apk
• modified: app/LIME-HD.apk
• delete: bluetooth/bdroid_buildcfg.h
• modified: init.sh
• modified: init.x86.rc

Incremental Difference

--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,9 +14,6 @@ TARGET_BOARD_PLATFORM := android-x86
 
 # Some framework code requires this to enable BT
 BOARD_HAVE_BLUETOOTH := true
-BLUETOOTH_HCI_USE_USB := true
-BOARD_HAVE_BLUETOOTH_BCM := true
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/x86/bluetooth
 
 # customize the malloced address to be 16-byte aligned
 BOARD_MALLOC_ALIGNMENT := 16

Binary files a/app/AndroidTerm.apk and b/app/AndroidTerm.apk differ

Binary files a/app/LIME-HD.apk and b/app/LIME-HD.apk differ

--- a/bluetooth/bdroid_buildcfg.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2013 The Android-x86 Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _BDROID_BUILDCFG_H
-#define _BDROID_BUILDCFG_H
-
-#define BTM_DEF_LOCAL_NAME "Android-x86"
-// At present either USB or UART is supported
-#define BLUETOOTH_HCI_USE_USB          TRUE
-// Bluetooth Low Power Mode is supported on BT4.0
-#define HCILP_INCLUDED                 FALSE
-
-#endif

--- a/init.sh
+++ b/init.sh
@@ -17,14 +17,6 @@ function init_misc()
 
 	# in case no cpu governor driver autoloads
 	[ -d /sys/devices/system/cpu/cpu0/cpufreq ] || modprobe acpi-cpufreq
-
-	case "$PRODUCT" in
-		T10*TA)
-			modprobe ak8975
-			;;
-		*)
-			;;
-	esac
 }
 
 function init_hal_audio()
@@ -45,11 +37,26 @@ function init_hal_bluetooth()
 		[ "$type" = "wlan" -o "$type" = "bluetooth" ] && echo 1 > $r/state
 	done
 
-	# these modules are incompatible with bluedroid
-	rmmod ath3k
-	rmmod btusb
-	rmmod bluetooth
-	set_property ro.rfkilldisabled 1
+	case "$PRODUCT" in
+		T10*TA)
+			modprobe ak8975
+			modprobe hci-uart
+			BTUART_PORT=/dev/ttyS1
+			brcm_patchram_plus -d --no2bytes --enable_hci --patchram /system/lib/firmware/brcm/bcm43241b4.hcd $BTUART_PORT
+			;;
+		*)
+			for bt in $(lsusb -v | awk ' /Class:.E0/ { print $9 } '); do
+				chown 1002.1002 $bt && chmod 660 $bt
+			done
+			[ -n "$bt" ] && modprobe btusb
+			;;
+	esac
+
+	if [ -n "$BTUART_PORT" ]; then
+		set_property hal.bluetooth.uart $BTUART_PORT
+		chown bluetooth.bluetooth $BTUART_PORT
+		log -t hciconfig -p i "`hciconfig`"
+	fi
 }
 
 function init_hal_camera()
@@ -202,12 +209,11 @@ function init_hal_sensors()
 			;;
 	esac
 
-	# has sensor-hub?
-	for i in /sys/bus/iio/devices/iio:device?; do
-		busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device?/
+	# has iio sensor-hub?
+	if [ -n "`ls /sys/bus/iio/devices/iio:device* 2> /dev/null`" ]; then
+		busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device*/
 		lsmod | grep -q hid_sensor_accel_3d && hal_sensors=hsb || hal_sensors=iio
-		break
-	done
+	fi
 
 	set_property hal.sensors $hal_sensors
 }
@@ -305,11 +311,6 @@ function do_bootcomplete()
 
 	lsmod | grep -e brcmfmac && setprop wlan.no-unload-driver 1
 
-	for bt in $(lsusb -v | awk ' /Class:.E0/ { print $9 } '); do
-		chown 1002.1002 $bt && chmod 660 $bt
-	done
-#	am force-stop com.android.bluetooth
-
 	case "$PRODUCT" in
 		1866???|1867???|1869???) # ThinkPad X41 Tablet
 			start tablet-mode
@@ -366,6 +367,16 @@ function do_bootcomplete()
 	done
 }
 
+function do_hci()
+{
+	local hci=`hciconfig | grep ^hci | cut -d: -f1`
+	local btd="`getprop init.svc.bluetoothd`"
+	log -t bluetoothd -p i "$btd ($hci)"
+	if [ -n "`getprop hal.bluetooth.uart`" ]; then
+		[ "`getprop init.svc.bluetoothd`" = "running" ] && hciconfig $hci up
+	fi
+}
+
 PATH=/system/bin:/system/xbin
 
 DMIPATH=/sys/class/dmi/id
@@ -396,6 +407,9 @@ case "$1" in
 	bootcomplete)
 		do_bootcomplete
 		;;
+	hci)
+		do_hci
+		;;
 	init|"")
 		do_init
 		;;

--- a/init.x86.rc
+++ b/init.x86.rc
@@ -1,3 +1,4 @@
+import /init.bluetooth.rc
 import /init.superuser.rc
 
 on early-init
@@ -176,6 +177,12 @@ on property:sys.boot_completed=1
     write /proc/sys/kernel/ctrl-alt-del 0
     exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh bootcomplete
 
+on property:init.svc.bluetoothd=running
+    exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh hci
+
+on property:init.svc.bluetoothd=stopped
+    exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh hci
+
 on property:net.dns1=*
     exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh netconsole