X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=init.sh;h=2a2dc3df29756f7d7557321d889bd6ea249ec61a;hb=71ba16bdf4b6fbf71a1fabc7eb5d56dd8eeebd56;hp=4e6f30c329ccd60361d54a820df79c4db1162367;hpb=ed41a20ac5ae37387bce8115e2faf14160aa1691;p=android-x86%2Fdevice-generic-common.git

diff --git a/init.sh b/init.sh
index 4e6f30c..2a2dc3d 100644
--- a/init.sh
+++ b/init.sh
@@ -6,8 +6,8 @@
 
 function set_property()
 {
-	# this must be run before post-fs stage
-	echo $1=$2 >> /x86.prop
+	setprop "$1" "$2"
+	[ -n "$DEBUG" ] && echo "$1"="$2" >> /dev/x86.prop
 }
 
 function init_misc()
@@ -50,6 +50,16 @@ function init_hal_bluetooth()
 			modprobe b43 btcoex=0
 			modprobe btusb
 			;;
+		# FIXME
+		# Fix MacBook 2013-2015 (Air6/7&Pro11/12) BCM4360 ssb&wl conflict.
+		MacBookPro11* | MacBookPro12* | MacBookAir6* | MacBookAir7*)
+			rmmod b43
+			rmmod ssb
+			rmmod bcma
+			rmmod wl
+			modprobe wl
+			modprobe btusb
+			;;
 		*)
 			for bt in $(lsusb -v | awk ' /Class:.E0/ { print $9 } '); do
 				chown 1002.1002 $bt && chmod 660 $bt
@@ -218,6 +228,9 @@ function init_hal_sensors()
 			modprobe hdaps
 			hal_sensors=hdaps
 			;;
+		*HPPaviliong*)
+			hal_sensors=hdaps
+			;;
 		*i7Stylus*)
 			set_property hal.sensors.iio.accel.matrix 1,0,0,0,-1,0,0,0,-1
 			;;
@@ -308,7 +321,6 @@ function do_init()
 	init_hal_sensors
 	init_tscal
 	init_ril
-	chmod 640 /x86.prop
 	post_init
 }