Merge remote-tracking branch 'x86/marshmallow-x86' into nougat-x86

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

diff --git a/init.sh b/init.sh
index 3bf7051..e587424 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -32,6 +32,10 @@ function init_hal_audio()
                *)
                        ;;
        esac
+
+       if grep -qi "IntelHDMI" /proc/asound/card0/id; then
+               [ -d /proc/asound/card1 ] || set_property ro.hardware.audio.primary hdmi
+       fi
 }
 
 function init_hal_bluetooth()
@@ -44,6 +48,7 @@ function init_hal_bluetooth()
        case "$PRODUCT" in
                T10*TA|HP*Omni*)
                        BTUART_PORT=/dev/ttyS1
+                       set_property hal.bluetooth.uart.proto bcm
                        ;;
                MacBookPro8*)
                        rmmod b43
@@ -61,18 +66,16 @@ function init_hal_bluetooth()
                        modprobe btusb
                        ;;
                *)
-                       for bt in $(lsusb -v | awk ' /Class:.E0/ { print $9 } '); do
+                       for bt in $(busybox 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`"
+               start btattach
        fi
 }
 
@@ -120,7 +123,7 @@ function init_hal_gralloc()
                *virtiodrmfb)
 #                      set_property ro.hardware.hwcomposer drm
                        ;&
-               0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb)
+               0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
                        set_property ro.hardware.gralloc drm
                        set_drm_mode
                        ;;
@@ -165,6 +168,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
@@ -225,7 +229,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
 
@@ -236,8 +247,10 @@ function init_hal_sensors()
        elif lsmod | grep -q lis3lv02d_i2c; then
                hal_sensors=hdaps
        fi
-       set_property persist.sys.sensors.iio.present 1
+
        set_property ro.hardware.sensors $hal_sensors
+       [ "$hal_sensors" != "kbd" ] && has_sensors=true
+       set_property config.override_forced_orient $has_sensors
 }
 
 function create_pointercal()
@@ -330,10 +343,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
@@ -391,16 +401,8 @@ function do_bootcomplete()
                        alsa_amixer -c $c set 'Internal Mic Boost' 3
                fi
        done
-}
 
-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
+       post_bootcomplete
 }
 
 PATH=/sbin:/system/bin:/system/xbin
@@ -443,9 +445,6 @@ case "$1" in
        bootcomplete)
                do_bootcomplete
                ;;
-       hci)
-               do_hci
-               ;;
        init|"")
                do_init
                ;;