init.sh: change uvesafb default mode to 1024x768

[android-x86/device-generic-common.git] / init.sh

diff --git a/init.sh b/init.sh
index 4bb9c40..2755a58 100644 (file)
--- 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()
@@ -137,8 +128,6 @@ function init_hal_gralloc()
                        init_uvesafb
                        ;&
                0*)
-                       # FIXME: software rendering failed to pass the SetupWizard
-                       set_property ro.setupwizard.mode DISABLED
                        ;;
        esac
 
@@ -171,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*)
@@ -223,16 +216,12 @@ 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
                        ;;
-               *HPPaviliong*)
-                       hal_sensors=hdaps
-                       ;;
                *i7Stylus*)
                        set_property hal.sensors.iio.accel.matrix 1,0,0,0,-1,0,0,0,-1
                        ;;
@@ -244,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