From 7ce1f8e92d958c648b92e0fca332359d1f89db71 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Thu, 4 Mar 2021 09:20:07 +0100
Subject: [PATCH] Enable en_us chargen in drivers_interactive-imx8q_evk

Issue #4038
---
 .../drivers_interactive-imx8q_evk/archives    | 12 +++++-----
 .../drivers_interactive-imx8q_evk/content.mk  |  7 ++++--
 .../drivers.config                            | 21 +++++-----------
 .../event_filter.config                       | 24 +++++++++++++++++++
 4 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/event_filter.config

diff --git a/repos/dde_linux/recipes/pkg/drivers_interactive-imx8q_evk/archives b/repos/dde_linux/recipes/pkg/drivers_interactive-imx8q_evk/archives
index 3ebb4efcf3..69e5763dab 100644
--- a/repos/dde_linux/recipes/pkg/drivers_interactive-imx8q_evk/archives
+++ b/repos/dde_linux/recipes/pkg/drivers_interactive-imx8q_evk/archives
@@ -1,7 +1,7 @@
-_/src/event_filter
-_/src/imx8q_evk_drivers
-_/src/imx8_fb_drv
-_/src/platform_drv
-_/src/usb_host_drv
-_/src/usb_hid_drv
 _/raw/drivers_interactive-imx8q_evk
+_/src/event_filter
+_/src/imx8_fb_drv
+_/src/imx8q_evk_drivers
+_/src/platform_drv
+_/src/usb_hid_drv
+_/src/usb_host_drv
diff --git a/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/content.mk b/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/content.mk
index b28dbd977a..402a31dcb1 100644
--- a/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/content.mk
+++ b/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/content.mk
@@ -1,4 +1,7 @@
-content: drivers.config fb_drv.config
+content: drivers.config fb_drv.config event_filter.config en_us.chargen special.chargen
 
-drivers.config fb_drv.config:
+drivers.config fb_drv.config event_filter.config:
 	cp $(REP_DIR)/recipes/raw/drivers_interactive-imx8q_evk/$@ $@
+
+en_us.chargen special.chargen:
+	cp $(GENODE_DIR)/repos/os/src/server/event_filter/$@ $@
diff --git a/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/drivers.config b/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/drivers.config
index 364f36d87c..00a511372b 100644
--- a/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/drivers.config
+++ b/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/drivers.config
@@ -167,20 +167,11 @@
 		<route> <any-service> <parent/> </any-service> </route>
 	</start>
 
-	<start name="event_filter">
-		<resource name="RAM" quantum="1M" />
-		<provides> <service name="Event" /> </provides>
-		<config>
-			<output>
-				<merge>
-					<input name="usb_hid_drv"/>
-					<input name="touch_drv"/>
-				</merge>
-			</output>
-			<policy label="usb_hid_drv -> "  input="usb_hid_drv"/>
-			<policy label="touch_drv -> " input="touch_drv"/>
-		</config>
+	<start name="event_filter" caps="80">
+		<resource name="RAM" quantum="1M"/>
+		<provides> <service name="Event"/> </provides>
 		<route>
+			<service name="ROM" label="config"> <parent label="event_filter.config"/> </service>
 			<service name="Event"> <parent/> </service>
 			<any-service> <parent/> </any-service>
 		</route>
@@ -212,7 +203,7 @@
 		<config use_report="yes"/>
 		<route>
 			<service name="ROM" label="report"> <child name="report_rom"/> </service>
-			<service name="Event"> <child name="event_filter"/> </service>
+			<service name="Event"> <child name="event_filter" label="usb"/> </service>
 			<service name="RM">    <parent/> </service>
 			<service name="ROM">   <parent/> </service>
 			<service name="PD">    <parent/> </service>
@@ -248,7 +239,7 @@
 			<service name="CPU">      <parent/> </service>
 			<service name="LOG">      <parent/> </service>
 			<service name="Timer">    <parent/> </service>
-			<service name="Event">    <child name="event_filter"/> </service>
+			<service name="Event">    <child name="event_filter" label="touch"/> </service>
 			<service name="Platform"> <child name="platform_drv"/> </service>
 			<service name="Gpio"> <child name="gpio_drv"/> </service>
 		</route>
diff --git a/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/event_filter.config b/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/event_filter.config
new file mode 100644
index 0000000000..244d969915
--- /dev/null
+++ b/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/event_filter.config
@@ -0,0 +1,24 @@
+<config>
+	<output>
+		<chargen>
+			<merge>
+				<input name="usb"/>
+				<input name="touch"/>
+			</merge>
+			<mod1>
+				<key name="KEY_LEFTSHIFT"/> <key name="KEY_RIGHTSHIFT"/>
+			</mod1>
+			<mod2>
+				<key name="KEY_LEFTCTRL"/> <key name="KEY_RIGHTCTRL"/>
+			</mod2>
+			<mod3>
+				<key name="KEY_RIGHTALT"/> <!-- AltGr -->
+			</mod3>
+			<repeat delay_ms="230" rate_ms="90"/>
+			<include rom="en_us.chargen"/>
+			<include rom="special.chargen"/>
+		</chargen>
+	</output>
+	<policy label="usb"   input="usb"/>
+	<policy label="touch" input="touch"/>
+</config>