From f9c7947c4524b951d10cb0963c64a1c99525d12e Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Tue, 25 May 2021 13:51:17 +0200
Subject: [PATCH] drivers_interactive-pc: use usb host/hid driver

Issue #4173
---
 .../pkg/drivers_interactive-pc/archives       |  3 +-
 .../raw/drivers_interactive-pc/drivers.config | 40 ++++++++++++++-----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/repos/os/recipes/pkg/drivers_interactive-pc/archives b/repos/os/recipes/pkg/drivers_interactive-pc/archives
index 9a43a00c3e..b896b1f466 100644
--- a/repos/os/recipes/pkg/drivers_interactive-pc/archives
+++ b/repos/os/recipes/pkg/drivers_interactive-pc/archives
@@ -1,7 +1,8 @@
 _/src/platform_drv
 _/src/acpi_drv
 _/src/ps2_drv
-_/src/usb_drv
+_/src/usb_host_drv
+_/src/usb_hid_drv
 _/src/vesa_drv
 _/src/report_rom
 _/src/event_filter
diff --git a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config
index e051b2ad13..e8fde7ce60 100644
--- a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config
+++ b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config
@@ -36,7 +36,8 @@
 			<service name="Report" />
 		</provides>
 		<config>
-			<policy label="platform_drv -> acpi" report="acpi_drv -> acpi"/>
+			<policy label="platform_drv -> acpi"  report="acpi_drv -> acpi"/>
+			<policy label="usb_hid_drv -> report" report="usb_drv -> devices"/>
 		</config>
 		<route>
 			<service name="LOG"> <parent/> </service>
@@ -103,17 +104,38 @@
 	</start>
 
 	<start name="usb_drv" caps="150">
-		<resource name="RAM" quantum="14M"/>
-		<config uhci="yes" ehci="yes" xhci="yes"> <hid/> </config>
+		<binary name="x86_pc_usb_host_drv"/>
+		<resource name="RAM" quantum="16M"/>
+		<provides> <service name="Usb"/> </provides>
+		<config uhci="yes" ohci="yes" ehci="yes" xhci="yes">
+			<report devices="yes"/>
+			<policy label_prefix="usb_hid_drv" class="0x3"/>
+		</config>
 		<route>
 			<service name="Platform"> <child name="platform_drv"/> </service>
+			<service name="Report" label="devices"> <child name="report_rom"/> </service>
+			<service name="ROM">   <parent/> </service>
+			<service name="PD">    <parent/> </service>
+			<service name="RM">    <parent/> </service>
+			<service name="CPU">   <parent/> </service>
+			<service name="LOG">   <parent/> </service>
+			<service name="Timer"> <parent/> </service>
+		</route>
+	</start>
+
+	<start name="usb_hid_drv" caps="140">
+		<resource name="RAM" quantum="11M"/>
+		<config use_report="yes"/>
+		<route>
+			<service name="ROM" label="report"> <child name="report_rom"/> </service>
+			<service name="ROM">   <parent/> </service>
+			<service name="PD">    <parent/> </service>
+			<service name="RM">    <parent/> </service>
+			<service name="CPU">   <parent/> </service>
+			<service name="LOG">   <parent/> </service>
+			<service name="Timer"> <parent/> </service>
 			<service name="Event"> <child name="event_filter" label="usb"/> </service>
-			<service name="ROM">      <parent/> </service>
-			<service name="PD">       <parent/> </service>
-			<service name="RM">       <parent/> </service>
-			<service name="CPU">      <parent/> </service>
-			<service name="LOG">      <parent/> </service>
-			<service name="Timer">    <parent/> </service>
+			<service name="Usb">   <child name="usb_drv"/> </service>
 		</route>
 	</start>