X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=blobdiff_plain;f=init.sh;h=b287ec7516e1ffca5a654625517c1500084dc6bd;hp=96cbaa326e299c209038c805039abfba4b8da8a7;hb=97b0ef29fce15a17bc0a1689b5d29ff5e952f1fc;hpb=122e4dd7cb22ad161e205a2867dc6c1f90997e99

diff --git a/init.sh b/init.sh
index 96cbaa3..b287ec7 100644
--- a/init.sh
+++ b/init.sh
@@ -1,17 +1,21 @@
 #
-# 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
 
@@ -28,6 +32,10 @@ function init_hal_audio()
 		*)
 			;;
 	esac
+
+	if [ "`cat /proc/asound/card0/id`" = "IntelHDMI" ]; then
+		[ -d /proc/asound/card1 ] || set_property ro.hardware.audio.primary hdmi
+	fi
 }
 
 function init_hal_bluetooth()
@@ -38,17 +46,24 @@ 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
 			;;
 		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
@@ -60,13 +75,14 @@ function init_hal_bluetooth()
 	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()
@@ -91,28 +107,23 @@ 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
+		*virtiodrmfb)
+#			set_property ro.hardware.hwcomposer drm
+			;&
 		0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb)
 			set_property ro.hardware.gralloc drm
 			set_drm_mode
@@ -121,9 +132,10 @@ function init_hal_gralloc()
 			init_uvesafb
 			;&
 		0*)
-			[ "$HWACCEL" = "1" ] || set_property debug.egl.hw 0
 			;;
 	esac
+
+	[ -n "$DEBUG" ] && set_property debug.egl.trace error
 }
 
 function init_hal_hwcomposer()
@@ -152,6 +164,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*)
@@ -204,13 +220,21 @@ 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
+			;;
 		*)
 			;;
 	esac
@@ -219,6 +243,8 @@ 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
@@ -238,6 +264,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
@@ -264,10 +293,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
 }
@@ -297,7 +326,6 @@ function do_init()
 	init_hal_sensors
 	init_tscal
 	init_ril
-	chmod 640 /x86.prop
 	post_init
 }
 
@@ -394,10 +422,20 @@ 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
+			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