X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=blobdiff_plain;f=init.sh;h=f759a1c639c54ceb5e68761bb6cf76f809c655c9;hp=3cbfe793e6b6e077b38216aeeb7e9c7176b02860;hb=6d50976748ebc61030a91582a885b38283a2e2d2;hpb=f33eee130f88d2d74158282cfe31548269839a2e

diff --git a/init.sh b/init.sh
index 3cbfe79..f759a1c 100644
--- a/init.sh
+++ b/init.sh
@@ -15,6 +15,13 @@ function set_prop_if_empty()
 	[ -z "$(getprop $1)" ] && set_property "$1" "$2"
 }
 
+function rmmod_if_exist()
+{
+	for m in $*; do
+		[ -d /sys/module/$m ] && rmmod $m
+	done
+}
+
 function init_misc()
 {
 	# device information
@@ -30,6 +37,27 @@ function init_misc()
 	# enable sdcardfs if /data is not mounted on tmpfs or 9p
 	mount | grep /data\ | grep -qE 'tmpfs|9p'
 	[ $? -ne 0 ] && modprobe sdcardfs
+
+	# remove wl if it's not used
+	local wifi
+	if [ -d /sys/class/net/wlan0 ]; then
+		wifi=$(basename `readlink /sys/class/net/wlan0/device/driver`)
+		[ "$wifi" != "wl" ] && rmmod_if_exist wl
+	fi
+
+	# enable virt_wifi if needed
+	local eth=`getprop net.virt_wifi eth0`
+	if [ -d /sys/class/net/$eth -a "$VIRT_WIFI" != "0" ]; then
+		if [ -n "$wifi" -a "$VIRT_WIFI" = "1" ]; then
+			rmmod_if_exist iwlmvm $wifi
+		fi
+		if [ ! -d /sys/class/net/wlan0 ]; then
+			ifconfig $eth down
+			ip link set $eth name wifi_eth
+			ifconfig wifi_eth up
+			ip link add link wifi_eth name wlan0 type virt_wifi
+		fi
+	fi
 }
 
 function init_hal_audio()
@@ -150,7 +178,7 @@ function init_hal_gralloc()
 	[ "$VULKAN" = "1" ] && GRALLOC=gbm
 
 	case "$(cat /proc/fb | head -1)" in
-		*virtiodrmfb)
+		*virtiodrmfb|*DRM*emulated)
 			if [ "$HWACCEL" != "0" ]; then
 				set_property ro.hardware.hwcomposer ${HWC:-drm}
 				set_property ro.hardware.gralloc ${GRALLOC:-gbm}
@@ -288,11 +316,14 @@ function init_hal_sensors()
 		*i7Stylus*|*M80TA*)
 			set_property ro.iio.accel.x.opt_scale -1
 			;;
-		*ONDATablet*)
+		*LenovoMIIX320*|*ONDATablet*)
 			set_property ro.iio.accel.order 102
 			set_property ro.iio.accel.x.opt_scale -1
 			set_property ro.iio.accel.y.opt_scale -1
 			;;
+		*SP111-33*)
+			set_property ro.iio.accel.quirks no-trig
+			;&
 		*ST70416-6*)
 			set_property ro.iio.accel.order 102
 			;;
@@ -456,6 +487,9 @@ function do_bootcomplete()
 		VMware*)
 			pm disable com.android.bluetooth
 			;;
+		X80*Power)
+			set_property power.nonboot-cpu-off 1
+			;;
 		*)
 			;;
 	esac