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

diff --git a/init.sh b/init.sh
index 4dc85d8..37827a2 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -254,7 +254,7 @@ function init_hal_sensors()
 
        local hal_sensors=kbd
        local has_sensors=true
-       case "$(cat $DMIPATH/uevent)" in
+       case "$UEVENT" in
                *Lucid-MWE*)
                        set_property ro.ignore_atkbd 1
                        hal_sensors=hdaps
@@ -332,7 +332,7 @@ function init_hal_sensors()
                *ST70416-6*)
                        set_property ro.iio.accel.order 102
                        ;;
-               *e-tabPro*|*pnEZpad*)
+               *e-tabPro*|*pnEZpad*|*TECLAST:rntPAD*)
                        set_property ro.iio.accel.quirks no-trig
                        ;&
                *T*0*TA*|*M80TA*)
@@ -372,11 +372,11 @@ function create_pointercal()
 
 function init_tscal()
 {
-       case "$PRODUCT" in
-               ST70416-6*)
+       case "$UEVENT" in
+               *ST70416-6*)
                        modprobe gslx680_ts_acpi
                        ;&
-               T91|T101|ET2002|74499FU|945GSE-ITE8712|CF-19[CDYFGKLP]*)
+               *T91*|*T101*|*ET2002*|*74499FU*|*945GSE-ITE8712*|*CF-19[CDYFGKLP]*|*TECLAST:rntPAD*)
                        create_pointercal
                        return
                        ;;
@@ -398,7 +398,7 @@ function init_tscal()
 
 function init_ril()
 {
-       case "$(cat $DMIPATH/uevent)" in
+       case "$UEVENT" in
                *TEGA*|*2010:svnIntel:*|*Lucid-MWE*)
                        set_property rild.libpath /system/lib/libhuaweigeneric-ril.so
                        set_property rild.libargs "-d /dev/ttyUSB2 -v /dev/ttyUSB1"
@@ -529,6 +529,7 @@ PATH=/sbin:/system/bin:/system/xbin
 DMIPATH=/sys/class/dmi/id
 BOARD=$(cat $DMIPATH/board_name)
 PRODUCT=$(cat $DMIPATH/product_name)
+UEVENT=$(cat $DMIPATH/uevent)
 
 # import cmdline variables
 for c in `cat /proc/cmdline`; do