X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=blobdiff_plain;f=init.sh;h=db82e2423f39e42d4d403511a07ffcdd01acad69;hp=22f579300ea9439e68679f4172884efa0bf774bd;hb=c52e8632c4073802217a45931fe650d75484d172;hpb=4e9023cbaae462caa07439523209e5705b95c627

diff --git a/init.sh b/init.sh
index 22f5793..db82e24 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
@@ -33,13 +38,10 @@ function init_hal_audio()
 		VirtualBox*|Bochs*)
 			[ -d /proc/asound/card0 ] || modprobe snd-sb16 isapnp=0 irq=5
 			;;
-		*)
+		TS10*)
+			set_prop_if_empty hal.audio.out pcmC0D2p
 			;;
 	esac
-
-	if grep -qi "IntelHDMI" /proc/asound/card0/id; then
-		[ -d /proc/asound/card1 ] || set_property ro.hardware.audio.primary hdmi
-	fi
 }
 
 function init_hal_bluetooth()
@@ -50,10 +52,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
@@ -111,10 +115,8 @@ function set_drm_mode()
 		ET1602*)
 			drm_mode=1366x768
 			;;
-		VMware*)
-			[ -n "$video" ] && drm_mode=$video
-			;;
 		*)
+			[ -n "$video" ] && drm_mode=$video
 			;;
 	esac
 
@@ -123,6 +125,8 @@ function set_drm_mode()
 
 function init_uvesafb()
 {
+	UVESA_MODE=${UVESA_MODE:-${video%@*}}
+
 	case "$PRODUCT" in
 		ET2002*)
 			UVESA_MODE=${UVESA_MODE:-1600x900}
@@ -141,6 +145,7 @@ function init_hal_gralloc()
 			if [ "$HWACCEL" != "0" ]; then
 				set_property ro.hardware.hwcomposer drm
 				set_property ro.hardware.gralloc gbm
+				set_property debug.drm.mode.force ${video:-1280x800}
 			fi
 			;;
 		0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
@@ -178,6 +183,9 @@ function init_hal_power()
 
 	# TODO
 	case "$PRODUCT" in
+		HP*Omni*|OEMB|Standard*PC*|Surface*3|T10*TA)
+			set_prop_if_empty sleep.state none
+			;;
 		*)
 			;;
 	esac
@@ -248,22 +256,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*)
+			;;
+		*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 +284,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 +377,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 +417,9 @@ function do_bootcomplete()
 			setkeycodes 0x66 172
 			setkeycodes 0x6b 127
 			;;
+		VMware*)
+			pm disable com.android.bluetooth
+			;;
 		*)
 			;;
 	esac
@@ -426,13 +436,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