From e82353eb9f76b582122fda27c93339eac5553eb2 Mon Sep 17 00:00:00 2001 From: "mike.looijmans@topic.nl" Date: Thu, 18 Dec 2014 15:17:29 +0100 Subject: 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 Signed-off-by: Ross Burton --- meta/recipes-core/busybox/files/find-touchscreen.sh | 7 ++----- 1 file 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 -- cgit 1.2.3-korg