X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=init.sh;h=21dbb6969184b6b9bdfdeb680862dbeb93adbd5b;hb=b6b3228b44d9c2c8a8750a3a9aa7ae7be4dc8e7e;hp=82931269ecf1f3c86b26d8a2994ca74a29c6498b;hpb=590e9cd1b34ca70557b3ed5399243fbdc6e3ab64;p=android-x86%2Fdevice-generic-common.git

diff --git a/init.sh b/init.sh
index 8293126..21dbb69 100644
--- a/init.sh
+++ b/init.sh
@@ -128,11 +128,15 @@ function init_hal_bluetooth()
 
 function init_hal_camera()
 {
-	case "$PRODUCT" in
-		e-tab*Pro)
+	case "$UEVENT" in
+		*e-tabPro*)
 			set_prop_if_empty hal.camera.0 0,270
 			set_prop_if_empty hal.camera.2 1,90
 			;;
+		*LenovoideapadD330*)
+			set_prop_if_empty hal.camera.0 0,90
+			set_prop_if_empty hal.camera.2 1,90
+			;;
 		*)
 			;;
 	esac
@@ -178,15 +182,14 @@ function init_hal_gralloc()
 	[ "$VULKAN" = "1" ] && GRALLOC=gbm
 
 	case "$(cat /proc/fb | head -1)" in
-		*virtiodrmfb)
-			if [ "$HWACCEL" != "0" ]; then
-				set_property ro.hardware.hwcomposer ${HWC:-drm}
-				set_property ro.hardware.gralloc ${GRALLOC:-gbm}
-				set_property debug.drm.mode.force ${video:-1280x800}
-			fi
-			;;
-		0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
+		*virtio*drmfb|*DRM*emulated)
+			HWC=${HWC:-drm}
+			GRALLOC=${GRALLOC:-gbm}
+			video=${video:-1280x768}
+			;&
+		0*i915drmfb|0*inteldrmfb|0*radeondrmfb|0*nouveau*|0*svgadrmfb|0*amdgpudrmfb)
 			if [ "$HWACCEL" != "0" ]; then
+				set_property ro.hardware.hwcomposer ${HWC:-}
 				set_property ro.hardware.gralloc ${GRALLOC:-drm}
 				set_drm_mode
 			fi
@@ -198,6 +201,7 @@ function init_hal_gralloc()
 			;;
 	esac
 
+	[ -z "$(getprop ro.hardware.gralloc)" ] && set_property ro.hardware.egl swiftshader
 	[ -n "$DEBUG" ] && set_property debug.egl.trace error
 }
 
@@ -210,7 +214,7 @@ function init_hal_hwcomposer()
 function init_hal_vulkan()
 {
 	case "$(cat /proc/fb | head -1)" in
-		0*inteldrmfb)
+		0*i915drmfb|0*inteldrmfb)
 			set_property ro.hardware.vulkan android-x86
 			;;
 		0*amdgpudrmfb)
@@ -253,7 +257,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
@@ -310,10 +314,18 @@ function init_hal_sensors()
 			modprobe hdaps
 			hal_sensors=hdaps
 			;;
+		*LenovoideapadD330*)
+			set_property ro.iio.accel.quirks no-trig
+			set_property ro.iio.accel.order 102
+			;&
 		*LINX1010B*)
+			set_property ro.iio.accel.x.opt_scale -1
 			set_property ro.iio.accel.z.opt_scale -1
+			;;
+		*i7-WN*)
+			set_property ro.iio.accel.quirks no-trig
 			;&
-		*i7Stylus*|*M80TA*)
+		*i7Stylus*)
 			set_property ro.iio.accel.x.opt_scale -1
 			;;
 		*LenovoMIIX320*|*ONDATablet*)
@@ -327,10 +339,10 @@ 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*)
+		*T*0*TA*|*M80TA*)
 			set_property ro.iio.accel.y.opt_scale -1
 			;;
 		*)
@@ -367,11 +379,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
 			;;
@@ -393,7 +405,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"
@@ -524,6 +536,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
@@ -536,8 +549,13 @@ for c in `cat /proc/cmdline`; do
 				case $c in
 					DEBUG=*)
 						[ -n "$DEBUG" ] && set_property debug.logcat 1
+						[ "$DEBUG" = "0" ] || SETUPWIZARD=${SETUPWIZARD:-0}
+						;;
+					DPI=*)
+						set_property ro.sf.lcd_density "$DPI"
 						;;
 				esac
+				[ "$SETUPWIZARD" = "0" ] && set_property ro.setupwizard.mode DISABLED
 			fi
 			;;
 	esac