X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=blobdiff_plain;f=init.sh;h=caec3773567c3c753a2f817cc422e571f93847b2;hp=afc347f7ae5fda5b461ba7018327db1dc41edec3;hb=48acfb490747fab34b57c09b4ab583d8402ae3ed;hpb=7c1821bc0fce6f566a532c0ed89049b8c16652d6

diff --git a/init.sh b/init.sh
index afc347f..caec377 100644
--- a/init.sh
+++ b/init.sh
@@ -103,24 +103,15 @@ 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
 
 	[ "$HWACCEL" = "0" ] && bpp=16 || bpp=32
-	modprobe uvesafb mode_option=${UVESA_MODE:-800x600}-$bpp ${UVESA_OPTION:-mtrr=3 scroll=redraw}
+	modprobe uvesafb mode_option=${UVESA_MODE:-1024x768}-$bpp ${UVESA_OPTION:-mtrr=3 scroll=redraw}
 }
 
 function init_hal_gralloc()
@@ -169,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*)
@@ -221,7 +216,6 @@ function init_hal_sensors()
 			;;
 		*Aspire1*25*)
 			modprobe lis3lv02d_i2c
-			hal_sensors=hdaps
 			echo -n "enabled" > /sys/class/thermal/thermal_zone0/mode
 			;;
 		*ThinkPad*Tablet*)
@@ -239,6 +233,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
@@ -287,8 +283,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 ro.radio.noril yes
 			;;
 	esac
 }
@@ -414,7 +412,7 @@ PRODUCT=$(cat $DMIPATH/product_name)
 # import cmdline variables
 for c in `cat /proc/cmdline`; do
 	case $c in
-		*.*=*)
+		BOOT_IMAGE=*|iso-scan/*|*.*=*)
 			;;
 		*=*)
 			eval $c