X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=blobdiff_plain;f=init.sh;h=2755a581639bd46578664cc63d746a05adeb8867;hp=906f081096499b22a57f79bd0271efd5121ebf7a;hb=787f578b952771205b94fb914b9a950005b961a6;hpb=a3a5b70964b0c817729c1ab981b2ca2e8a6fe563

diff --git a/init.sh b/init.sh
index 906f081..2755a58 100644
--- a/init.sh
+++ b/init.sh
@@ -1,29 +1,26 @@
 #
-# Copyright (C) 2013 The Android-x86 Open Source Project
+# Copyright (C) 2013-2015 The Android-x86 Open Source Project
 #
 # License: GNU Public License v2 or later
 #
 
 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()
 {
+	# device information
+	setprop ro.product.manufacturer "$(cat $DMIPATH/sys_vendor)"
+	setprop ro.product.model "$PRODUCT"
+
 	# a hack for USB modem
 	lsusb | grep 1a8d:1000 && eject
 
 	# in case no cpu governor driver autoloads
 	[ -d /sys/devices/system/cpu/cpu0/cpufreq ] || modprobe acpi-cpufreq
-
-	case "$PRODUCT" in
-		T10*TA)
-			;;
-		*)
-			;;
-	esac
 }
 
 function init_hal_audio()
@@ -44,16 +41,44 @@ function init_hal_bluetooth()
 		[ "$type" = "wlan" -o "$type" = "bluetooth" ] && echo 1 > $r/state
 	done
 
-	# these modules are incompatible with bluedroid
-	rmmod ath3k
-	rmmod btusb
-	rmmod bluetooth
-	set_property ro.rfkilldisabled 1
+	case "$PRODUCT" in
+		T10*TA|HP*Omni*)
+			BTUART_PORT=/dev/ttyS1
+			;;
+		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
+				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
+		start btattach:-B$BTUART_PORT
+		log -t hciconfig -p i "`hciconfig`"
+	fi
 }
 
 function init_hal_camera()
 {
-	[ -c /dev/video0 ] || modprobe vivi
+	return
 }
 
 function init_hal_gps()
@@ -78,41 +103,35 @@ 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}
+	[ "$HWACCEL" = "0" ] && bpp=16 || bpp=32
+	modprobe uvesafb mode_option=${UVESA_MODE:-1024x768}-$bpp ${UVESA_OPTION:-mtrr=3 scroll=redraw}
 }
 
 function init_hal_gralloc()
 {
 	case "$(cat /proc/fb | head -1)" in
-		0*inteldrmfb|0*radeondrmfb)
+		*virtiodrmfb)
+#			set_property ro.hardware.hwcomposer drm
+			;&
+		0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb)
 			set_property ro.hardware.gralloc drm
 			set_drm_mode
 			;;
-		0*svgadrmfb)
-			;;
 		"")
 			init_uvesafb
 			;&
 		0*)
-			[ "$HWACCEL" = "1" ] || set_property debug.egl.hw 0
 			;;
 	esac
+
+	[ -n "$DEBUG" ] && set_property debug.egl.trace error
 }
 
 function init_hal_hwcomposer()
@@ -141,6 +160,10 @@ 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
 	case "$(cat $DMIPATH/uevent)" in
 		*Lucid-MWE*)
@@ -193,25 +216,26 @@ 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
+			;;
 		*)
 			;;
 	esac
 
-	# has sensor-hub?
-	for i in /sys/bus/iio/devices/iio:device?; do
-		if [ -e $i/in_accel_scale ]; then
-			busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device?/
-			hal_sensors=hsb
-			break
-		fi
-	done
+	# has iio sensor-hub?
+	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
 }
@@ -230,6 +254,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
@@ -258,8 +285,6 @@ function init_ril()
 			set_property rild.libargs "-d /dev/ttyUSB2 -v /dev/ttyUSB1"
 			;;
 		*)
-			set_property rild.libpath /system/lib/libreference-ril.so
-			set_property rild.libargs "-d /dev/ttyUSB2"
 			;;
 	esac
 }
@@ -289,7 +314,6 @@ function do_init()
 	init_hal_sensors
 	init_tscal
 	init_ril
-	chmod 640 /x86.prop
 	post_init
 }
 
@@ -309,10 +333,6 @@ function do_bootcomplete()
 
 	lsmod | grep -e brcmfmac && setprop wlan.no-unload-driver 1
 
-	for bt in $(lsusb -v | awk ' /Class:.E0/ { print $9 } '); do
-		chown 1002.1002 $bt && chmod 660 $bt
-	done
-
 	case "$PRODUCT" in
 		1866???|1867???|1869???) # ThinkPad X41 Tablet
 			start tablet-mode
@@ -364,13 +384,24 @@ function do_bootcomplete()
 			alsa_amixer -c $c set Capture 100%
 			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 'Mic Boost' 3
 			alsa_amixer -c $c set 'Internal Mic Boost' 3
 		fi
 	done
 }
 
-PATH=/system/bin:/system/xbin
+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
+}
+
+PATH=/sbin:/system/bin:/system/xbin
 
 DMIPATH=/sys/class/dmi/id
 BOARD=$(cat $DMIPATH/board_name)
@@ -379,10 +410,20 @@ PRODUCT=$(cat $DMIPATH/product_name)
 # import cmdline variables
 for c in `cat /proc/cmdline`; do
 	case $c in
-		androidboot.hardware=*)
+		*.*=*)
 			;;
 		*=*)
 			eval $c
+			if [ -z "$1" ]; then
+				case $c in
+					HWACCEL=*)
+						set_property debug.egl.hw $HWACCEL
+						;;
+					DEBUG=*)
+						[ -n "$DEBUG" ] && set_property debug.logcat 1
+						;;
+				esac
+			fi
 			;;
 	esac
 done
@@ -400,6 +441,9 @@ case "$1" in
 	bootcomplete)
 		do_bootcomplete
 		;;
+	hci)
+		do_hci
+		;;
 	init|"")
 		do_init
 		;;