X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=init.sh;h=6b41a502188d32432cf00af7117e8eee828f82c4;hb=823ff7669962cdeae5f61143bf3cebae3fa3b703;hp=2dbe15d91c69895eaab582a8b518665206ad243c;hpb=74b32cbcbb7a8d4a7651c90df60d49c245f9303a;p=android-x86%2Fdevice-generic-common.git

diff --git a/init.sh b/init.sh
index 2dbe15d..6b41a50 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()
@@ -21,6 +21,10 @@ function init_misc()
 
 	# in case no cpu governor driver autoloads
 	[ -d /sys/devices/system/cpu/cpu0/cpufreq ] || modprobe acpi-cpufreq
+
+	# enable sdcardfs if /data is not mounted on tmpfs or 9p
+	mount | grep /data\ | grep -qE 'tmpfs|9p'
+	[ $? -ne 0 ] && modprobe sdcardfs
 }
 
 function init_hal_audio()
@@ -32,6 +36,10 @@ function init_hal_audio()
 		*)
 			;;
 	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()
@@ -42,35 +50,53 @@ function init_hal_bluetooth()
 	done
 
 	case "$PRODUCT" in
-		T10*TA)
-			modprobe ak8975
-			modprobe hci-uart
+		T10*TA|HP*Omni*)
 			BTUART_PORT=/dev/ttyS1
-			brcm_patchram_plus -d --no2bytes --enable_hci --patchram /system/lib/firmware/brcm/bcm43241b4.hcd $BTUART_PORT
+			set_property hal.bluetooth.uart.proto bcm
+			[ -z "$(getprop sleep.state)" ] && set_property sleep.state none
 			;;
 		MacBookPro8*)
 			rmmod b43
 			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
+			for bt in $(busybox lsusb -v | awk ' /Class:.E0/ { print $9 } '); do
 				chown 1002.1002 $bt && chmod 660 $bt
 			done
-			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`"
+		start btattach
+	fi
+
+	# rtl8723bs bluetooth
+	if dmesg -t | grep -qE '8723bs.*BT'; then
+		TTYSTRING=`dmesg -t | grep -E 'tty.*MMIO' | awk '{print $2}' | head -1`
+		if [ -n "$TTYSTRING" ]; then
+			echo "RTL8723BS BT uses $TTYSTRING for Bluetooth."
+			ln -sf $TTYSTRING /dev/rtk_h5
+			start rtk_hciattach
+		fi
 	fi
 }
 
 function init_hal_camera()
 {
-	[ -c /dev/video0 ] || modprobe vivi
+	return
 }
 
 function init_hal_gps()
@@ -85,6 +111,9 @@ function set_drm_mode()
 		ET1602*)
 			drm_mode=1366x768
 			;;
+		VMware*)
+			[ -n "$video" ] && drm_mode=$video
+			;;
 		*)
 			;;
 	esac
@@ -95,39 +124,39 @@ function set_drm_mode()
 function init_uvesafb()
 {
 	case "$PRODUCT" in
-		*Q550)
-			UVESA_MODE=${UVESA_MODE:-1280x800}
-			;;
 		ET2002*)
 			UVESA_MODE=${UVESA_MODE:-1600x900}
 			;;
-		T91*)
-			UVESA_MODE=${UVESA_MODE:-1024x600}
-			;;
-		VirtualBox*|Bochs*)
-			UVESA_MODE=${UVESA_MODE:-1024x768}
-			;;
 		*)
 			;;
 	esac
 
-	modprobe uvesafb mode_option=${UVESA_MODE:-800x600}-16 ${UVESA_OPTION:-mtrr=3 scroll=redraw}
+	modprobe uvesafb mode_option=${UVESA_MODE:-1024x768}-32 ${UVESA_OPTION:-mtrr=3 scroll=redraw}
 }
 
 function init_hal_gralloc()
 {
 	case "$(cat /proc/fb | head -1)" in
-		0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb)
-			set_property ro.hardware.gralloc drm
-			set_drm_mode
+		*virtiodrmfb)
+			if [ "$HWACCEL" != "0" ]; then
+				set_property ro.hardware.hwcomposer drm
+				set_property ro.hardware.gralloc gbm
+			fi
+			;;
+		0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
+			if [ "$HWACCEL" != "0" ]; then
+				set_property ro.hardware.gralloc drm
+				set_drm_mode
+			fi
 			;;
 		"")
 			init_uvesafb
 			;&
 		0*)
-			[ "$HWACCEL" = "1" ] || set_property debug.egl.hw 0
 			;;
 	esac
+
+	[ -n "$DEBUG" ] && set_property debug.egl.trace error
 }
 
 function init_hal_hwcomposer()
@@ -156,7 +185,12 @@ function init_hal_power()
 
 function init_hal_sensors()
 {
+	# if we have sensor module for our hardware, use it
+	ro_hardware=$(getprop ro.hardware)
+	[ -f /system/lib/hw/sensors.${ro_hardware}.so ] && return 0
+
 	local hal_sensors=kbd
+	local has_sensors=true
 	case "$(cat $DMIPATH/uevent)" in
 		*Lucid-MWE*)
 			set_property ro.ignore_atkbd 1
@@ -208,14 +242,23 @@ function init_hal_sensors()
 			;;
 		*Aspire1*25*)
 			modprobe lis3lv02d_i2c
-			hal_sensors=hdaps
 			echo -n "enabled" > /sys/class/thermal/thermal_zone0/mode
 			;;
 		*ThinkPad*Tablet*)
 			modprobe hdaps
 			hal_sensors=hdaps
 			;;
+		*i7Stylus*)
+			set_property hal.sensors.iio.accel.matrix 1,0,0,0,-1,0,0,0,-1
+			;;
+		*ST70416-6*)
+			set_property hal.sensors.iio.accel.matrix 0,-1,0,-1,0,0,0,0,-1
+			;;
+		*ONDATablet*)
+			set_property hal.sensors.iio.accel.matrix 0,1,0,1,0,0,0,0,-1
+			;;
 		*)
+			has_sensors=false
 			;;
 	esac
 
@@ -223,9 +266,13 @@ function init_hal_sensors()
 	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
+	elif lsmod | grep -q lis3lv02d_i2c; then
+		hal_sensors=hdaps
 	fi
 
 	set_property ro.hardware.sensors $hal_sensors
+	[ "$hal_sensors" != "kbd" ] && has_sensors=true
+	set_property config.override_forced_orient $has_sensors
 }
 
 function create_pointercal()
@@ -242,6 +289,9 @@ function create_pointercal()
 function init_tscal()
 {
 	case "$PRODUCT" in
+		ST70416-6*)
+			modprobe gslx680_ts_acpi
+			;&
 		T91|T101|ET2002|74499FU|945GSE-ITE8712|CF-19[CDYFGKLP]*)
 			create_pointercal
 			return
@@ -268,10 +318,10 @@ function init_ril()
 		*TEGA*|*2010:svnIntel:*|*Lucid-MWE*)
 			set_property rild.libpath /system/lib/libhuaweigeneric-ril.so
 			set_property rild.libargs "-d /dev/ttyUSB2 -v /dev/ttyUSB1"
+			set_property ro.radio.noril no
 			;;
 		*)
-			set_property rild.libpath /system/lib/libreference-ril.so
-			set_property rild.libargs "-d /dev/ttyUSB2"
+			set_property ro.radio.noril yes
 			;;
 	esac
 }
@@ -301,7 +351,6 @@ function do_init()
 	init_hal_sensors
 	init_tscal
 	init_ril
-	chmod 640 /x86.prop
 	post_init
 }
 
@@ -316,10 +365,7 @@ function do_bootcomplete()
 
 	[ -z "$(getprop persist.sys.root_access)" ] && setprop persist.sys.root_access 3
 
-	# FIXME: autosleep works better on i965?
-	[ "$(getprop debug.mesa.driver)" = "i965" ] && setprop debug.autosleep 1
-
-	lsmod | grep -e brcmfmac && setprop wlan.no-unload-driver 1
+	lsmod | grep -Ehq "brcmfmac|rtl8723be" && setprop wlan.no-unload-driver 1
 
 	case "$PRODUCT" in
 		1866???|1867???|1869???) # ThinkPad X41 Tablet
@@ -373,20 +419,13 @@ function do_bootcomplete()
 			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
 		fi
 	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
+	post_bootcomplete
 }
 
 PATH=/sbin:/system/bin:/system/xbin
@@ -398,18 +437,17 @@ PRODUCT=$(cat $DMIPATH/product_name)
 # import cmdline variables
 for c in `cat /proc/cmdline`; do
 	case $c in
-		androidboot.hardware=*)
+		BOOT_IMAGE=*|iso-scan/*|*.*=*)
 			;;
 		*=*)
 			eval $c
-			case $c in
-				HWACCEL=*)
-					set_property debug.egl.hw $HWACCEL
-					;;
-				DEBUG=*)
-					set_property debug.logcat 1
-					;;
-			esac
+			if [ -z "$1" ]; then
+				case $c in
+					DEBUG=*)
+						[ -n "$DEBUG" ] && set_property debug.logcat 1
+						;;
+				esac
+			fi
 			;;
 	esac
 done
@@ -427,9 +465,6 @@ case "$1" in
 	bootcomplete)
 		do_bootcomplete
 		;;
-	hci)
-		do_hci
-		;;
 	init|"")
 		do_init
 		;;