summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormike.looijmans@topic.nl <mike.looijmans@topic.nl>2014-12-18 15:17:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-19 18:06:46 +0000
commite82353eb9f76b582122fda27c93339eac5553eb2 (patch)
treeff96c8430e8f267fe5fc28f6f85e6d22a8d0b822
parent44f6df0dfac54845ef5c3ab1af5663d1b6c1d64b (diff)
downloadopenembedded-core-e82353eb9f76b582122fda27c93339eac5553eb2.tar.gz
busybox/find-touchscreen.sh: Simplify script and recognize USB devices
Simplify the grep expression, use the more common "grep" command instead of "egrep", avoid forking extra processes, join multiple invokations into a single combined expression. Change the touchscreen regex so that it also recognizes various USB touchscreen controllers and the ad7879 i2c device. Based on code used in OpenPLi and meta-topic. Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/busybox/files/find-touchscreen.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/recipes-core/busybox/files/find-touchscreen.sh b/meta/recipes-core/busybox/files/find-touchscreen.sh
index 1582ea891c..52c5e7a096 100644
--- a/meta/recipes-core/busybox/files/find-touchscreen.sh
+++ b/meta/recipes-core/busybox/files/find-touchscreen.sh
@@ -1,9 +1,6 @@
#!/bin/sh
-if [ `egrep "input:.*-e0.*,3,.*a0,1,.*18,.*" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then
- ln -sf /dev/input/$MDEV /dev/input/touchscreen0
+if grep -q "input:.*-e0.*,3,.*a0,1,\|ads7846" /sys/class/$MDEV/device/modalias ; then
+ ln -sf /dev/$MDEV /dev/input/touchscreen0
fi
-if [ `egrep "ads7846" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then
- ln -sf /dev/input/$MDEV /dev/input/touchscreen0
-fi