diff --git a/repos/base/run/platform_drv.inc b/repos/base/run/platform_drv.inc
index 459e1282add..c442dff71d8 100644
--- a/repos/base/run/platform_drv.inc
+++ b/repos/base/run/platform_drv.inc
@@ -9,7 +9,7 @@ proc have_platform_drv {} {
proc usb_host_drv_binary { } {
if {[have_board rpi]} { return legacy_rpi_usb_host_drv }
if {[have_board imx6q_sabrelite]} { return legacy_imx6q_sabrelite_usb_host_drv }
- if {[have_board pc]} { return legacy_pc_usb_host_drv }
+ if {[have_board pc]} { return pc_usb_host_drv }
return no_usb_drv_available
}
@@ -41,8 +41,8 @@ proc acpi_drv_name { } {
proc platform_drv_build_components {} {
set drv_build_components ""
- lappend_if [have_platform_drv] drv_build_components drivers/platform
if {[have_board pc]} {
+ lappend drv_build_components drivers/platform/legacy/x86
lappend drv_build_components server/report_rom
if {[acpi_drv_name] eq "acpi_drv"} {
lappend drv_build_components drivers/acpi
diff --git a/repos/dde_linux/run/usb_hid_raw.run b/repos/dde_linux/run/usb_hid_raw.run
index 64eabc9a685..49b5cb84bbe 100644
--- a/repos/dde_linux/run/usb_hid_raw.run
+++ b/repos/dde_linux/run/usb_hid_raw.run
@@ -283,6 +283,8 @@ run_genode_until {\[init -\> event_dump\] Input event #11.*\n} 40 [output_spawn_
# pay only attention to the output of init and its children
grep_output {^\[init }
+unify_output { dev_info:} ""
+unify_output { usb [0-9\-]+:} ""
unify_output { number [0-9]+} ""
unify_output {(?n)on usb-usbbus.*$} ""
unify_output {(?n)using .*$} ""
@@ -299,10 +301,10 @@ compare_output_to {
[init -> event_dump] Input event #3 REL_MOTION -1+0 key count: 1
[init -> event_dump] Input event #4 REL_MOTION +0+1 key count: 1
[init -> event_dump] Input event #5 RELEASE BTN_LEFT key count: 0
-[init -> usb_drv] dev_info: USB disconnect, device
-[init -> usb_drv] dev_info: new full-speed USB device
-[init -> usb_hid_drv] dev_info: input: USB HID v1.11 Keyboard [HID 03eb:204d]
-[init -> usb_hid_drv] dev_info: input: USB HID v1.11 Mouse [HID 03eb:204d]
+[init -> usb_drv] USB disconnect, device
+[init -> usb_drv] new full-speed USB device
+[init -> usb_hid_drv] input: USB HID v1.11 Keyboard [HID 03eb:204d]
+[init -> usb_hid_drv] input: USB HID v1.11 Mouse [HID 03eb:204d]
[init -> event_dump] Input event #6 PRESS KEY_X 65534 key count: 1
[init -> event_dump] Input event #7 RELEASE KEY_X key count: 0
[init -> event_dump] Input event #8 PRESS BTN_LEFT 65534 key count: 1
diff --git a/repos/dde_linux/run/usb_hid_reconnect.run b/repos/dde_linux/run/usb_hid_reconnect.run
index 9a60d66e378..74440b02b00 100644
--- a/repos/dde_linux/run/usb_hid_reconnect.run
+++ b/repos/dde_linux/run/usb_hid_reconnect.run
@@ -21,7 +21,7 @@ if {![have_include "power_on/qemu"]} {
set build_components {
core init timer
- drivers/usb_host
+ drivers/usb_host/pc
drivers/usb_hid
server/event_dump
server/dynamic_rom
@@ -72,10 +72,10 @@ append config {
-
+
-
+
@@ -154,9 +154,8 @@ install_config $config
# generic modules
set boot_modules {
core ld.lib.so init timer event_dump dynamic_rom
- usb_hid_drv
+ usb_hid_drv pc_usb_host_drv
}
-append boot_modules [usb_host_drv_binary]
append_platform_drv_boot_modules
diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run
index 9a290f84fc4..0db4ae1ce1d 100644
--- a/repos/dde_linux/run/usb_net.run
+++ b/repos/dde_linux/run/usb_net.run
@@ -71,7 +71,6 @@ append_if [have_spec x86] config {
append config {
-
diff --git a/repos/dde_linux/run/usb_rndis.run b/repos/dde_linux/run/usb_rndis.run
deleted file mode 100644
index 18a72115849..00000000000
--- a/repos/dde_linux/run/usb_rndis.run
+++ /dev/null
@@ -1,172 +0,0 @@
-#
-# \brief Test for using the TCP/IP terminal over USB (RNDIS, CDC_ETHER or USB NIC)
-# \author Alexander Senier
-# \date 2017-10-19
-#
-
-assert_spec x86
-
-#
-# Build
-#
-
-set build_components {
- core init timer
- drivers/usb_host
- drivers/usb_net
- server/tcp_terminal
- test/terminal_echo
- lib/vfs/lwip
- lib/vfs/pipe
- server/nic_router
-}
-
-source ${genode_dir}/repos/base/run/platform_drv.inc
-append_platform_drv_build_components
-
-build $build_components
-
-create_boot_directory
-
-#
-# Generate config
-#
-
-set config ""
-append config {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- }
-
-append_platform_drv_config
-
-append config {
-
-}
-
-install_config $config
-
-#
-# Boot modules
-#
-
-# generic modules
-set boot_modules {
- core ld.lib.so init timer
- libc.lib.so vfs.lib.so vfs_pipe.lib.so
- tcp_terminal
- test-terminal_echo
- vfs_lwip.lib.so
- usb_net_drv
- nic_router
-}
-append boot_modules [usb_host_drv_binary]
-
-append_platform_drv_boot_modules
-
-build_boot_image $boot_modules
-
-append qemu_args " -device usb-ehci,id=ehci"
-
-# Samsung RNDIS (tested with S5, Galaxy Tab S
-append qemu_args " -device usb-host,bus=ehci.0,vendorid=0x04e8,productid=0x6860"
-append qemu_args " -device usb-host,bus=ehci.0,vendorid=0x04e8,productid=0x6863"
-append qemu_args " -device usb-host,bus=ehci.0,vendorid=0x04e8,productid=0x6864"
-
-# ASIX Electronics Corp. AX88179 Gigabit Ethernet
-append qemu_args " -device usb-host,bus=ehci.0,vendorid=0x0b95,productid=0x1790"
-
-# Motorola Moto E, G4 Play
-append qemu_args " -device usb-host,id=motoe,bus=ehci.0,vendorid=0x22b8,productid=0x2e25"
-
-# HTC A9
-append qemu_args " -device usb-host,id=htc,bus=ehci.0,vendorid=0x0bb4,productid=0x0ffe"
-
-append qemu_args " -nographic"
-
-run_genode_until forever
-
-# vi: set ft=tcl :
diff --git a/repos/gems/recipes/pkg/drivers_managed-pc/archives b/repos/gems/recipes/pkg/drivers_managed-pc/archives
index a8588b04215..266f021c236 100644
--- a/repos/gems/recipes/pkg/drivers_managed-pc/archives
+++ b/repos/gems/recipes/pkg/drivers_managed-pc/archives
@@ -1,7 +1,7 @@
_/src/platform_drv
_/src/acpi_drv
_/src/ps2_drv
-_/src/legacy_usb_host_drv
+_/src/pc_usb_host_drv
_/src/usb_hid_drv
_/src/usb_block_drv
_/src/vesa_drv
diff --git a/repos/gems/sculpt/drivers/pc b/repos/gems/sculpt/drivers/pc
index ea773f3c02e..0dae762755a 100644
--- a/repos/gems/sculpt/drivers/pc
+++ b/repos/gems/sculpt/drivers/pc
@@ -133,7 +133,7 @@
-
+
diff --git a/repos/gems/src/app/driver_manager/main.cc b/repos/gems/src/app/driver_manager/main.cc
index 577ba95b38d..801431ce5ac 100644
--- a/repos/gems/src/app/driver_manager/main.cc
+++ b/repos/gems/src/app/driver_manager/main.cc
@@ -712,14 +712,13 @@ void Driver_manager::Main::_generate_usb_drv_config(Reporter &usb_drv_config,
{
Reporter::Xml_generator xml(usb_drv_config, [&] () {
- xml.attribute("uhci", true);
- xml.attribute("ehci", true);
- xml.attribute("ohci", _use_ohci);
- xml.attribute("xhci", true);
xml.attribute("capslock_led", "rom");
xml.attribute("numlock_led", "rom");
- xml.node("report", [&] () { xml.attribute("devices", true); });
+ xml.node("report", [&] () {
+ xml.attribute("config", true);
+ xml.attribute("devices", true);
+ });
/* incorporate user-managed policy */
policy.with_raw_content([&] (char const *start, size_t length) {
diff --git a/repos/libports/run/smartcard.run b/repos/libports/run/smartcard.run
index 6ba9f2ffca1..cfa92347f74 100644
--- a/repos/libports/run/smartcard.run
+++ b/repos/libports/run/smartcard.run
@@ -77,7 +77,7 @@ append config {
-
+
diff --git a/repos/libports/run/webcam.run b/repos/libports/run/webcam.run
index 7786b419ac8..cc4a740ef34 100644
--- a/repos/libports/run/webcam.run
+++ b/repos/libports/run/webcam.run
@@ -1,3 +1,5 @@
+assert_spec x86
+
set build_components { }
# fuji4
@@ -25,7 +27,8 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/nitpicker \
[depot_user]/src/dynamic_rom \
[depot_user]/src/rom_reporter \
- [depot_user]/src/legacy_usb_host_drv \
+ [depot_user]/src/report_rom \
+ [depot_user]/src/pc_usb_host_drv \
[depot_user]/src/vesa_drv \
[depot_user]/src/test-capture \
[depot_user]/pkg/usb_webcam
@@ -66,12 +69,11 @@ append config {
-
+
-
-
+
diff --git a/repos/os/recipes/pkg/drivers_interactive-pc/archives b/repos/os/recipes/pkg/drivers_interactive-pc/archives
index b53cf5ff1d3..764954b3de8 100644
--- a/repos/os/recipes/pkg/drivers_interactive-pc/archives
+++ b/repos/os/recipes/pkg/drivers_interactive-pc/archives
@@ -1,7 +1,7 @@
_/src/platform_drv
_/src/acpi_drv
_/src/ps2_drv
-_/src/legacy_usb_host_drv
+_/src/pc_usb_host_drv
_/src/usb_hid_drv
_/src/vesa_drv
_/src/report_rom
diff --git a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config
index 453dbb8d422..7edf0fac537 100644
--- a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config
+++ b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config
@@ -107,10 +107,10 @@
-
+
-
+
diff --git a/repos/os/src/app/usb_report_filter/README b/repos/os/src/app/usb_report_filter/README
index 5807f6336ac..7dd3fca3f97 100644
--- a/repos/os/src/app/usb_report_filter/README
+++ b/repos/os/src/app/usb_report_filter/README
@@ -59,12 +59,9 @@ following USB driver configuration:
!
![...]
-!
-!
-!
-!
-!
-!
+!
+!
+!
!
!
diff --git a/repos/os/src/drivers/usb_block/README b/repos/os/src/drivers/usb_block/README
index fa2e39b2bd8..056eb495a0e 100644
--- a/repos/os/src/drivers/usb_block/README
+++ b/repos/os/src/drivers/usb_block/README
@@ -29,7 +29,7 @@ driver:
!
!
!
-!
+!
!
!
!
diff --git a/repos/ports/run/vbox5_genode_usb_hid_raw.run b/repos/ports/run/vbox5_genode_usb_hid_raw.run
index c61d96d25e5..9a4dcaae5e0 100644
--- a/repos/ports/run/vbox5_genode_usb_hid_raw.run
+++ b/repos/ports/run/vbox5_genode_usb_hid_raw.run
@@ -84,7 +84,7 @@ append config {
-
+
@@ -289,6 +289,8 @@ regexp {(\[init -\> log_terminal\] \[init -\> event_dump\] Input event #0\t.*)}
run_genode_until {.*\[init -\> event_dump\] Input event #11.*\n} 60 [output_spawn_id]
+unify_output { dev_info:} ""
+unify_output { usb [0-9\-]+:} ""
unify_output { number [0-9]+} ""
unify_output {(?n)on usb-usbbus.*$} ""
unify_output {(?n)using .*$} ""
@@ -308,13 +310,13 @@ compare_output_to {
[init -> log_terminal] [init -> event_dump] Input event #3 REL_MOTION -1+0 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #4 REL_MOTION +0+1 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #5 RELEASE BTN_LEFT key count: 0
-[init -> usb_drv] dev_info: USB disconnect, device
-[init -> log_terminal] [init -> usb_drv] dev_info: USB disconnect, device
-[init -> usb_drv] dev_info: new full-speed USB device
+[init -> usb_drv] USB disconnect, device
+[init -> log_terminal] [init -> usb_drv] USB disconnect, device
+[init -> usb_drv] new full-speed USB device
[init -> virtualbox] Attach USB device (vendor=3eb, product=204d)
-[init -> log_terminal] [init -> usb_drv] dev_info: new full-speed USB device
-[init -> log_terminal] [init -> usb_hid_drv] dev_info: input: USB HID v1.11 Keyboard [HID 03eb:204d]
-[init -> log_terminal] [init -> usb_hid_drv] dev_info: input: USB HID v1.11 Mouse [HID 03eb:204d]
+[init -> log_terminal] [init -> usb_drv] new full-speed USB device
+[init -> log_terminal] [init -> usb_hid_drv] input: USB HID v1.11 Keyboard [HID 03eb:204d]
+[init -> log_terminal] [init -> usb_hid_drv] input: USB HID v1.11 Mouse [HID 03eb:204d]
[init -> log_terminal] [init -> event_dump] Input event #6 PRESS KEY_X 65534 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #7 RELEASE KEY_X key count: 0
[init -> log_terminal] [init -> event_dump] Input event #8 PRESS BTN_LEFT 65534 key count: 1
diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc
index d8082d9ae8c..6e50e9da21d 100644
--- a/repos/ports/run/virtualbox_auto.inc
+++ b/repos/ports/run/virtualbox_auto.inc
@@ -39,7 +39,7 @@ if {$use_vms > 1} {
}
if {$use_usb} {
- import_from_depot [depot_user]/src/legacy_usb_host_drv \
+ import_from_depot [depot_user]/src/pc_usb_host_drv \
[depot_user]/src/usb_hid_drv
}
@@ -280,7 +280,7 @@ append_if [expr $use_usb] config {
-
+
@@ -350,7 +350,7 @@ append_if [expr $use_usb] config {
-
+