X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=init.sh;h=5f367db8a23a5c3027f287845152b27e74b345c3;hb=c98790a491e05e07360d62324a9f7420e3a1935c;hp=89670f8151f5bd4fba669c754ab4e8cfd05287da;hpb=2cae43df47994631a340f415523f66f40be10733;p=android-x86%2Fdevice-generic-common.git

diff --git a/init.sh b/init.sh
index 89670f8..5f367db 100644
--- a/init.sh
+++ b/init.sh
@@ -55,7 +55,10 @@ function init_hal_bluetooth()
 	done
 
 	case "$PRODUCT" in
-		T10*TA|HP*Omni*)
+		T100TAF)
+			set_property bluetooth.interface hci1
+			;;
+		T10*TA|M80TA|HP*Omni*)
 			BTUART_PORT=/dev/ttyS1
 			set_property hal.bluetooth.uart.proto bcm
 			;;
@@ -256,7 +259,7 @@ function init_hal_sensors()
 			modprobe hdaps
 			hal_sensors=hdaps
 			;;
-		*i7Stylus*)
+		*i7Stylus*|*M80TA*)
 			set_property ro.iio.accel.x.opt_scale -1
 			;;
 		*ONDATablet*)
@@ -267,7 +270,7 @@ function init_hal_sensors()
 		*ST70416-6*)
 			set_property ro.iio.accel.order 102
 			;;
-		*T10*TA*)
+		*T*0*TA*|*pnEZpad*)
 			set_property ro.iio.accel.y.opt_scale -1
 			;;
 		*)
@@ -284,11 +287,11 @@ function init_hal_sensors()
 		hal_sensors=hdaps
 		has_sensors=true
 	elif [ "$hal_sensors" != "kbd" ]; then
-		has_sensors=${HAS_SENSORS:-true}
+		has_sensors=true
 	fi
 
 	set_property ro.hardware.sensors $hal_sensors
-	set_property config.override_forced_orient $has_sensors
+	set_property config.override_forced_orient ${HAS_SENSORS:-$has_sensors}
 }
 
 function create_pointercal()
@@ -377,6 +380,8 @@ function do_netconsole()
 
 function do_bootcomplete()
 {
+	hciconfig | grep -q hci || pm disable com.android.bluetooth
+
 	init_cpu_governor
 
 	[ -z "$(getprop persist.sys.root_access)" ] && setprop persist.sys.root_access 3
@@ -415,6 +420,9 @@ function do_bootcomplete()
 			setkeycodes 0x66 172
 			setkeycodes 0x6b 127
 			;;
+		VMware*)
+			pm disable com.android.bluetooth
+			;;
 		*)
 			;;
 	esac