X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=init.sh;h=f80f58fc67f3edcbadb52fca22c6a749ddbf5553;hb=7d6692e49a3a077a17a2cbc952b49db343a7f9a7;hp=35de20639aa26163ed5f9de8ae4afebbe974e019;hpb=7585436a5b0fca361b5b0cbd689ce059b0108346;p=android-x86%2Fdevice-generic-common.git diff --git a/init.sh b/init.sh index 35de206..f80f58f 100644 --- a/init.sh +++ b/init.sh @@ -32,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() @@ -103,24 +107,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 +132,6 @@ function init_hal_gralloc() init_uvesafb ;& 0*) - # FIXME: software rendering failed to pass the SetupWizard - set_property ro.setupwizard.mode DISABLED ;; esac @@ -176,6 +169,7 @@ function init_hal_sensors() [ -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 @@ -236,7 +230,14 @@ function init_hal_sensors() *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 @@ -249,6 +250,8 @@ function init_hal_sensors() 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() @@ -294,8 +297,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 } @@ -339,10 +344,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 @@ -421,7 +423,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