From d53dbb38c43da3fd04fed9a55e7b3b9e2c512b9a Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Tue, 7 Nov 2017 10:32:26 -0800
Subject: meta-intel: Reorganize the layout to remove common

Remove the concept of the common directory and move all the recipes-* dirs
to the top level as a normal layer would be. layer.conf is updated appropriately

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 recipes-bsp/formfactor/formfactor/machconfig   | 39 ++++++++++++++++++++++++++
 recipes-bsp/formfactor/formfactor_0.0.bbappend |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 recipes-bsp/formfactor/formfactor/machconfig
 create mode 100644 recipes-bsp/formfactor/formfactor_0.0.bbappend

(limited to 'recipes-bsp/formfactor')

diff --git a/recipes-bsp/formfactor/formfactor/machconfig b/recipes-bsp/formfactor/formfactor/machconfig
new file mode 100644
index 00000000..73695fac
--- /dev/null
+++ b/recipes-bsp/formfactor/formfactor/machconfig
@@ -0,0 +1,39 @@
+# Note: superuser permission is required to run usbhid-dump
+# successfully.
+
+# HEX keys are according to the USB HID spec and USB HID usage table
+# We can add more keys as needed in the future.
+
+# This test may not be very accurate, as we only look for the first
+# two lines of a descriptor section.  Example:
+#
+# 001:003:000:DESCRIPTOR         1460501386.337809
+#  05 01 09 02 A1 01 09 01 A1 00 05 09 19 01 29 03
+#  15 00 25 01 95 03 75 01 81 02 .. .. .. .. .. ..
+#  .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. ..
+#
+# By doing so we eliminate false matches when HEX keys are in the lines
+# in the middle of the whole descriptor section.
+
+if type usbhid-dump &>/dev/null; then
+    if USBHID_DUMP_OUTPUT=$(usbhid-dump -e descriptor 2>/dev/null|grep -A1 DESCRIPTOR); then
+        # checker for generic USB HID keyboard
+        USBHID_KBD_CMD="grep -E '^ 05 01 09 06'"
+
+        # checker for touch screen
+        USBHID_TS_CMD="grep -E '^ 05 0D 09 04'"
+
+        if echo "$USBHID_DUMP_OUTPUT"|eval $USBHID_TS_CMD &>/dev/null; then
+            HAVE_TOUCHSCREEN=1
+        fi
+
+        if echo "$USBHID_DUMP_OUTPUT"|eval $USBHID_KBD_CMD &>/dev/null; then
+            HAVE_KEYBOARD=1
+        else
+            # config script in OE will set HAVE_KEYBOARD=1
+            # if we don't set any value. We have to explicitly
+            # tell it when keyboard is not detected.
+            HAVE_KEYBOARD=0
+        fi
+    fi
+fi
diff --git a/recipes-bsp/formfactor/formfactor_0.0.bbappend b/recipes-bsp/formfactor/formfactor_0.0.bbappend
new file mode 100644
index 00000000..6dd422ae
--- /dev/null
+++ b/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
-- 
cgit v1.2.3-54-g00ecf