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

diff --git a/init.sh b/init.sh
index a4dd6f7..5f367db 100644
--- a/init.sh
+++ b/init.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2015 The Android-x86 Open Source Project
+# Copyright (C) 2013-2018 The Android-x86 Open Source Project
 #
 # License: GNU Public License v2 or later
 #
@@ -10,6 +10,11 @@ function set_property()
 	[ -n "$DEBUG" ] && echo "$1"="$2" >> /dev/x86.prop
 }
 
+function set_prop_if_empty()
+{
+	[ -z "$(getprop $1)" ] && set_property "$1" "$2"
+}
+
 function init_misc()
 {
 	# device information
@@ -50,10 +55,12 @@ 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
-			[ -z "$(getprop sleep.state)" ] && set_property sleep.state none
 			;;
 		MacBookPro8*)
 			rmmod b43
@@ -142,6 +149,7 @@ function init_hal_gralloc()
 				set_property ro.hardware.hwcomposer drm
 				set_property ro.hardware.gralloc gbm
 			fi
+			set_prop_if_empty sleep.state none
 			;;
 		0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
 			if [ "$HWACCEL" != "0" ]; then
@@ -178,6 +186,9 @@ function init_hal_power()
 
 	# TODO
 	case "$PRODUCT" in
+		HP*Omni*|OEMB|Surface*3|T10*TA)
+			set_prop_if_empty sleep.state none
+			;;
 		*)
 			;;
 	esac
@@ -248,22 +259,19 @@ function init_hal_sensors()
 			modprobe hdaps
 			hal_sensors=hdaps
 			;;
-		*i7Stylus*)
-			set_property ro.iio.accel.y.opt_scale -1
-			set_property ro.iio.accel.z.opt_scale -1
+		*i7Stylus*|*M80TA*)
+			set_property ro.iio.accel.x.opt_scale -1
 			;;
 		*ONDATablet*)
 			set_property ro.iio.accel.order 102
+			set_property ro.iio.accel.x.opt_scale -1
+			set_property ro.iio.accel.y.opt_scale -1
 			;;
 		*ST70416-6*)
 			set_property ro.iio.accel.order 102
-			;&
-		*Surface*3*|*svnOEMB*|*T305CA*|*Venue11Pro5130*|*20FQ*|*20FR*)
+			;;
+		*T*0*TA*|*pnEZpad*)
 			set_property ro.iio.accel.y.opt_scale -1
-			;&
-		*T10*TA*)
-			set_property ro.iio.accel.x.opt_scale -1
-			set_property ro.iio.accel.z.opt_scale -1
 			;;
 		*)
 			has_sensors=false
@@ -279,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()
@@ -372,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
@@ -410,6 +420,9 @@ function do_bootcomplete()
 			setkeycodes 0x66 172
 			setkeycodes 0x6b 127
 			;;
+		VMware*)
+			pm disable com.android.bluetooth
+			;;
 		*)
 			;;
 	esac
@@ -426,13 +439,13 @@ function do_bootcomplete()
 			alsa_amixer -c $c set Headphone on
 			alsa_amixer -c $c set Headphone 100%
 			alsa_amixer -c $c set Speaker 100%
-			alsa_amixer -c $c set Capture 100%
+			alsa_amixer -c $c set Capture 80%
 			alsa_amixer -c $c set Capture cap
 			alsa_amixer -c $c set PCM 100 unmute
 			alsa_amixer -c $c set SPO unmute
 			alsa_amixer -c $c set IEC958 on
-			alsa_amixer -c $c set 'Mic Boost' 3
-			alsa_amixer -c $c set 'Internal Mic Boost' 3
+			alsa_amixer -c $c set 'Mic Boost' 1
+			alsa_amixer -c $c set 'Internal Mic Boost' 1
 		fi
 	done