Commit: 629e30983cbe67af5cfaada24aa3f3be9a6e0e1d - device-generic-x86 (git)

device/generic/x86

Commit MetaInfo

• Revision: 629e30983cbe67af5cfaada24aa3f3be9a6e0e1d (tree)
• Zeit: 2015-06-06 08:58:07
• Autor: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

init.sh: add support of iio sensors

Ändern Zusammenfassung

• modified: device.mk
• modified: init.sh

Diff

--- a/device.mk
+++ b/device.mk
@@ -57,6 +57,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
     frameworks/native/data/etc/android.hardware.sensor.barometer.xml:system/etc/permissions/android.hardware.sensor.barometer.xml \
     frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
+    frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \

--- a/init.sh
+++ b/init.sh
@@ -20,6 +20,7 @@ function init_misc()
 
 	case "$PRODUCT" in
 		T10*TA)
+			modprobe ak8975
 			;;
 		*)
 			;;
@@ -139,34 +140,32 @@ function init_hal_power()
 
 function init_hal_sensors()
 {
+	local hal_sensors=kbd
 	case "$(cat $DMIPATH/uevent)" in
 		*Lucid-MWE*)
 			set_property ro.ignore_atkbd 1
-			set_property hal.sensors hdaps
+			hal_sensors=hdaps
 			;;
 		*ICONIA*W5*)
-			set_property hal.sensors w500
+			hal_sensors=w500
 			;;
 		*S10-3t*)
-			set_property hal.sensors s103t
+			hal_sensors=s103t
 			;;
 		*Inagua*)
 			#setkeycodes 0x62 29
 			#setkeycodes 0x74 56
 			set_property ro.ignore_atkbd 1
-			set_property hal.sensors kbd
 			set_property hal.sensors.kbd.type 2
 			;;
 		*TEGA*|*2010:svnIntel:*)
 			set_property ro.ignore_atkbd 1
-			set_property hal.sensors kbd
 			set_property hal.sensors.kbd.type 1
 			io_switch 0x0 0x1
 			setkeycodes 0x6d 125
 			;;
 		*DLI*)
 			set_property ro.ignore_atkbd 1
-			set_property hal.sensors kbd
 			set_property hal.sensors.kbd.type 1
 			setkeycodes 0x64 1
 			setkeycodes 0x65 172
@@ -180,7 +179,6 @@ function init_hal_sensors()
 		*tx2*)
 			setkeycodes 0xb1 138
 			setkeycodes 0x8a 152
-			set_property hal.sensors kbd
 			set_property hal.sensors.kbd.type 6
 			set_property poweroff.doubleclick 0
 			set_property qemu.hw.mainkeys 1
@@ -193,26 +191,25 @@ function init_hal_sensors()
 			;;
 		*Aspire1*25*)
 			modprobe lis3lv02d_i2c
-			set_property hal.sensors hdaps
+			hal_sensors=hdaps
 			echo -n "enabled" > /sys/class/thermal/thermal_zone0/mode
 			;;
 		*ThinkPad*Tablet*)
 			modprobe hdaps
-			set_property hal.sensors hdaps
+			hal_sensors=hdaps
 			;;
 		*)
-			set_property hal.sensors kbd
 			;;
 	esac
 
 	# has sensor-hub?
 	for i in /sys/bus/iio/devices/iio:device?; do
-		if [ -e $i/in_accel_scale ]; then
-			busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device?/
-			set_property hal.sensors hsb
-			break
-		fi
+		busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device?/
+		lsmod | grep -q hid_sensor_accel_3d && hal_sensors=hsb || hal_sensors=iio
+		break
 	done
+
+	set_property hal.sensors $hal_sensors
 }
 
 function create_pointercal()