diff --git a/repos/base-fiasco/recipes/src/base-fiasco/content.mk b/repos/base-fiasco/recipes/src/base-fiasco/content.mk index cc4c522144..bce0c45fe3 100644 --- a/repos/base-fiasco/recipes/src/base-fiasco/content.mk +++ b/repos/base-fiasco/recipes/src/base-fiasco/content.mk @@ -21,5 +21,5 @@ content: for spec in x86_32; do \ mv lib/mk/spec/$$spec/ld-fiasco.mk lib/mk/spec/$$spec/ld.mk; \ done; - sed -i "s/fiasco_timer_drv/timer/" src/timer/fiasco/target.mk + sed -i "s/fiasco_timer/timer/" src/timer/fiasco/target.mk diff --git a/repos/base-fiasco/src/timer/fiasco/target.mk b/repos/base-fiasco/src/timer/fiasco/target.mk index 279aff794f..25d9d81fb6 100644 --- a/repos/base-fiasco/src/timer/fiasco/target.mk +++ b/repos/base-fiasco/src/timer/fiasco/target.mk @@ -1,4 +1,4 @@ -TARGET = fiasco_timer_drv +TARGET = fiasco_timer LIBS += syscall-fiasco GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc)) INC_DIR += $(GEN_DIR)/periodic diff --git a/repos/base-foc/recipes/src/base-foc_content.inc b/repos/base-foc/recipes/src/base-foc_content.inc index 7d97f7d1e8..d3ab28eb6e 100644 --- a/repos/base-foc/recipes/src/base-foc_content.inc +++ b/repos/base-foc/recipes/src/base-foc_content.inc @@ -39,4 +39,4 @@ content: for spec in x86_32 x86_64 arm arm_64; do \ mv lib/mk/spec/$$spec/ld-foc.mk lib/mk/spec/$$spec/ld.mk; \ done; - sed -i "s/foc_timer_drv/timer/" src/timer/foc/target.mk + sed -i "s/foc_timer/timer/" src/timer/foc/target.mk diff --git a/repos/base-foc/src/timer/foc/target.mk b/repos/base-foc/src/timer/foc/target.mk index cb26c5afac..8b1c911ad7 100644 --- a/repos/base-foc/src/timer/foc/target.mk +++ b/repos/base-foc/src/timer/foc/target.mk @@ -1,4 +1,4 @@ -TARGET = foc_timer_drv +TARGET = foc_timer LIBS += syscall-foc GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc)) INC_DIR += $(GEN_DIR)/periodic diff --git a/repos/base-hw/recipes/src/base-hw_content.inc b/repos/base-hw/recipes/src/base-hw_content.inc index 84f8e3a367..9119ef6833 100644 --- a/repos/base-hw/recipes/src/base-hw_content.inc +++ b/repos/base-hw/recipes/src/base-hw_content.inc @@ -195,7 +195,7 @@ generalize_target_names: $(CONTENT) # apply kernel-agnostic convention of naming the timer and ld.lib.so for subdir in ${call selected_content,LD_MK_DIRS}; do \ mv $$subdir/ld-hw.mk $$subdir/ld.mk; done - sed -i "s/hw_timer_drv/timer/" src/timer/hw/target.mk + sed -i "s/hw_timer/timer/" src/timer/hw/target.mk # supplement BOARD definition that normally comes form the build dir sed -i "s/\?= unknown/:= $(BOARD)/" src/core/hw/target.mk sed -i "s/\?= unknown/:= $(BOARD)/" src/bootstrap/hw/target.mk diff --git a/repos/base-hw/src/timer/hw/target.mk b/repos/base-hw/src/timer/hw/target.mk index 238e61952a..83bde6887b 100644 --- a/repos/base-hw/src/timer/hw/target.mk +++ b/repos/base-hw/src/timer/hw/target.mk @@ -1,4 +1,4 @@ -TARGET = hw_timer_drv +TARGET = hw_timer REQUIRES = hw LIBS = syscall-hw base REP_INC_DIR += src/include diff --git a/repos/base-linux/recipes/src/base-linux/content.mk b/repos/base-linux/recipes/src/base-linux/content.mk index ac78f59846..c0393f0b40 100644 --- a/repos/base-linux/recipes/src/base-linux/content.mk +++ b/repos/base-linux/recipes/src/base-linux/content.mk @@ -10,6 +10,6 @@ content: mv lib/mk/spec/$$spec/ld-linux.mk lib/mk/spec/$$spec/ld.mk; done; sed -i "/TARGET/s/core-linux/core/" src/core/linux/target.mk sed -i "s/BOARD.*unknown/BOARD := linux/" lib/mk/core-linux.inc - sed -i "s/linux_timer_drv/timer/" src/timer/linux/target.mk + sed -i "s/linux_timer/timer/" src/timer/linux/target.mk rm -rf src/initramfs diff --git a/repos/base-linux/src/timer/linux/target.mk b/repos/base-linux/src/timer/linux/target.mk index 3c14cda4f9..5eb1696b0a 100644 --- a/repos/base-linux/src/timer/linux/target.mk +++ b/repos/base-linux/src/timer/linux/target.mk @@ -1,4 +1,4 @@ -TARGET = linux_timer_drv +TARGET = linux_timer GEN_DIR := $(call select_from_repositories,src/timer/periodic)/.. INC_DIR += $(GEN_DIR)/periodic SRC_CC += periodic/time_source.cc time_source.cc diff --git a/repos/base-nova/recipes/src/base-nova/content.mk b/repos/base-nova/recipes/src/base-nova/content.mk index 41278a28a1..b147cab7ae 100644 --- a/repos/base-nova/recipes/src/base-nova/content.mk +++ b/repos/base-nova/recipes/src/base-nova/content.mk @@ -17,5 +17,5 @@ content: for spec in x86_32 x86_64; do \ mv lib/mk/spec/$$spec/ld-nova.mk lib/mk/spec/$$spec/ld.mk; \ done; - sed -i "s/nova_timer_drv/timer/" src/timer/nova/target.mk + sed -i "s/nova_timer/timer/" src/timer/nova/target.mk diff --git a/repos/base-nova/src/timer/nova/target.mk b/repos/base-nova/src/timer/nova/target.mk index c7f6b771e1..dd51a9e787 100644 --- a/repos/base-nova/src/timer/nova/target.mk +++ b/repos/base-nova/src/timer/nova/target.mk @@ -1,4 +1,4 @@ -TARGET = nova_timer_drv +TARGET = nova_timer INC_DIR += $(PRG_DIR) SRC_CC += main.cc LIBS += base diff --git a/repos/base-okl4/recipes/src/base-okl4/content.mk b/repos/base-okl4/recipes/src/base-okl4/content.mk index 4caca8c8cd..69174fb5c7 100644 --- a/repos/base-okl4/recipes/src/base-okl4/content.mk +++ b/repos/base-okl4/recipes/src/base-okl4/content.mk @@ -21,5 +21,5 @@ content: for spec in x86_32; do \ mv lib/mk/spec/$$spec/ld-okl4.mk lib/mk/spec/$$spec/ld.mk; \ done; - sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc + sed -i "s/pit_timer/timer/" src/timer/pit/target.inc diff --git a/repos/base-okl4/tool/weaver_x86.xml b/repos/base-okl4/tool/weaver_x86.xml index 6d848b4926..79a36aa0a4 100644 --- a/repos/base-okl4/tool/weaver_x86.xml +++ b/repos/base-okl4/tool/weaver_x86.xml @@ -66,11 +66,11 @@ - - + + - + diff --git a/repos/base-pistachio/recipes/src/base-pistachio/content.mk b/repos/base-pistachio/recipes/src/base-pistachio/content.mk index c33056fc45..e666d4b917 100644 --- a/repos/base-pistachio/recipes/src/base-pistachio/content.mk +++ b/repos/base-pistachio/recipes/src/base-pistachio/content.mk @@ -21,5 +21,5 @@ content: for spec in x86_32; do \ mv lib/mk/spec/$$spec/ld-pistachio.mk lib/mk/spec/$$spec/ld.mk; \ done; - sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc + sed -i "s/pit_timer/timer/" src/timer/pit/target.inc diff --git a/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk b/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk index 3e4a0c2acb..53fb32c480 100644 --- a/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk +++ b/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk @@ -35,7 +35,7 @@ etc/board.conf: content: mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk; - sed -i "s/imx6_timer_drv/timer/" src/timer/epit/imx6/target.inc + sed -i "s/imx6_timer/timer/" src/timer/epit/imx6/target.inc find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\ grep -v "sel4-imx6q_sabrelite.mk" | xargs rm -rf diff --git a/repos/base-sel4/recipes/src/base-sel4-x86/content.mk b/repos/base-sel4/recipes/src/base-sel4-x86/content.mk index 3b7fca0e97..8f77228f0d 100644 --- a/repos/base-sel4/recipes/src/base-sel4-x86/content.mk +++ b/repos/base-sel4/recipes/src/base-sel4-x86/content.mk @@ -24,7 +24,7 @@ etc/board.conf: content: mv lib/mk/spec/x86_64/ld-sel4.mk lib/mk/spec/x86_64/ld.mk; - sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc + sed -i "s/pit_timer/timer/" src/timer/pit/target.inc find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\ grep -v "sel4-pc.mk" | xargs rm -rf diff --git a/repos/base/src/timer/epit/imx6/target.inc b/repos/base/src/timer/epit/imx6/target.inc index 68fea18f9e..4b3638bf7a 100644 --- a/repos/base/src/timer/epit/imx6/target.inc +++ b/repos/base/src/timer/epit/imx6/target.inc @@ -1,4 +1,4 @@ -TARGET = imx6_timer_drv +TARGET = imx6_timer REQUIRES = arm_v7 GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc)) INC_DIR += $(GEN_DIR)/epit diff --git a/repos/base/src/timer/pit/target.inc b/repos/base/src/timer/pit/target.inc index 1bbe43065f..e8994291d9 100644 --- a/repos/base/src/timer/pit/target.inc +++ b/repos/base/src/timer/pit/target.inc @@ -1,4 +1,4 @@ -TARGET = pit_timer_drv +TARGET = pit_timer REQUIRES = x86 SRC_CC += main.cc LIBS += base diff --git a/repos/dde_bsd/README b/repos/dde_bsd/README index 3eebef4c85..80a1932b08 100644 --- a/repos/dde_bsd/README +++ b/repos/dde_bsd/README @@ -47,7 +47,7 @@ or recording because it may provoke the generation of artefacts. The following configures the driver of playback and recording: -! +! ! ! ! diff --git a/repos/dde_bsd/recipes/pkg/bsd_audio_drv/README b/repos/dde_bsd/recipes/pkg/bsd_audio/README similarity index 100% rename from repos/dde_bsd/recipes/pkg/bsd_audio_drv/README rename to repos/dde_bsd/recipes/pkg/bsd_audio/README diff --git a/repos/dde_bsd/recipes/pkg/bsd_audio/archives b/repos/dde_bsd/recipes/pkg/bsd_audio/archives new file mode 100644 index 0000000000..e552b3f4ab --- /dev/null +++ b/repos/dde_bsd/recipes/pkg/bsd_audio/archives @@ -0,0 +1 @@ +_/src/bsd_audio diff --git a/repos/dde_bsd/recipes/pkg/bsd_audio_drv/hash b/repos/dde_bsd/recipes/pkg/bsd_audio/hash similarity index 100% rename from repos/dde_bsd/recipes/pkg/bsd_audio_drv/hash rename to repos/dde_bsd/recipes/pkg/bsd_audio/hash diff --git a/repos/dde_bsd/recipes/pkg/bsd_audio_drv/runtime b/repos/dde_bsd/recipes/pkg/bsd_audio/runtime similarity index 68% rename from repos/dde_bsd/recipes/pkg/bsd_audio_drv/runtime rename to repos/dde_bsd/recipes/pkg/bsd_audio/runtime index a8612e1229..99cfae20b7 100644 --- a/repos/dde_bsd/recipes/pkg/bsd_audio_drv/runtime +++ b/repos/dde_bsd/recipes/pkg/bsd_audio/runtime @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/repos/dde_bsd/recipes/pkg/bsd_audio_drv/archives b/repos/dde_bsd/recipes/pkg/bsd_audio_drv/archives deleted file mode 100644 index ef624c667a..0000000000 --- a/repos/dde_bsd/recipes/pkg/bsd_audio_drv/archives +++ /dev/null @@ -1 +0,0 @@ -_/src/bsd_audio_drv diff --git a/repos/dde_bsd/recipes/src/bsd_audio_drv/content.mk b/repos/dde_bsd/recipes/src/bsd_audio/content.mk similarity index 100% rename from repos/dde_bsd/recipes/src/bsd_audio_drv/content.mk rename to repos/dde_bsd/recipes/src/bsd_audio/content.mk diff --git a/repos/dde_bsd/recipes/src/bsd_audio_drv/hash b/repos/dde_bsd/recipes/src/bsd_audio/hash similarity index 100% rename from repos/dde_bsd/recipes/src/bsd_audio_drv/hash rename to repos/dde_bsd/recipes/src/bsd_audio/hash diff --git a/repos/dde_bsd/recipes/src/bsd_audio_drv/used_apis b/repos/dde_bsd/recipes/src/bsd_audio/used_apis similarity index 100% rename from repos/dde_bsd/recipes/src/bsd_audio_drv/used_apis rename to repos/dde_bsd/recipes/src/bsd_audio/used_apis diff --git a/repos/dde_bsd/run/audio_in.run b/repos/dde_bsd/run/audio_in.run index a759c3d755..83260f4316 100644 --- a/repos/dde_bsd/run/audio_in.run +++ b/repos/dde_bsd/run/audio_in.run @@ -99,12 +99,12 @@ install_config { - - + + - + @@ -121,7 +121,7 @@ install_config { - + @@ -132,12 +132,12 @@ install_config { - + - - + + diff --git a/repos/dde_bsd/run/audio_out.run b/repos/dde_bsd/run/audio_out.run index 17d48353bf..0ba009f3c5 100644 --- a/repos/dde_bsd/run/audio_out.run +++ b/repos/dde_bsd/run/audio_out.run @@ -117,12 +117,12 @@ install_config { - - + + - + @@ -139,7 +139,7 @@ install_config { - + @@ -150,12 +150,12 @@ install_config { - + - - + + diff --git a/repos/dde_bsd/src/drivers/audio/pci_audio_drv/target.mk b/repos/dde_bsd/src/drivers/audio/pci/target.mk similarity index 86% rename from repos/dde_bsd/src/drivers/audio/pci_audio_drv/target.mk rename to repos/dde_bsd/src/drivers/audio/pci/target.mk index de93aacb7a..cf679be27c 100644 --- a/repos/dde_bsd/src/drivers/audio/pci_audio_drv/target.mk +++ b/repos/dde_bsd/src/drivers/audio/pci/target.mk @@ -1,5 +1,5 @@ REQUIRES = x86 -TARGET = pci_audio_drv +TARGET = pci_audio SRC_CC = main.cc LIBS = dde_bsd_audio base format INC_DIR += $(REP_DIR)/include diff --git a/repos/dde_ipxe/README b/repos/dde_ipxe/README index 0796410e01..73b2283e41 100644 --- a/repos/dde_ipxe/README +++ b/repos/dde_ipxe/README @@ -14,7 +14,7 @@ build directory, for example ! REPOSITORIES += $(GENODE_DIR)/repos/dde_ipxe After a successful build the DDE iPXE based ethernet driver is located -at 'bin/ipxe_nic_drv'. +at 'bin/ipxe_nic'. The driver optionally reports the following information under the label "devices" if requested in the config as depicted. diff --git a/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/README b/repos/dde_ipxe/recipes/pkg/ipxe_nic/README similarity index 100% rename from repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/README rename to repos/dde_ipxe/recipes/pkg/ipxe_nic/README diff --git a/repos/dde_ipxe/recipes/pkg/ipxe_nic/archives b/repos/dde_ipxe/recipes/pkg/ipxe_nic/archives new file mode 100644 index 0000000000..3e347ac533 --- /dev/null +++ b/repos/dde_ipxe/recipes/pkg/ipxe_nic/archives @@ -0,0 +1 @@ +_/src/ipxe_nic diff --git a/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/hash b/repos/dde_ipxe/recipes/pkg/ipxe_nic/hash similarity index 100% rename from repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/hash rename to repos/dde_ipxe/recipes/pkg/ipxe_nic/hash diff --git a/repos/dde_ipxe/recipes/pkg/ipxe_nic/runtime b/repos/dde_ipxe/recipes/pkg/ipxe_nic/runtime new file mode 100644 index 0000000000..163bdbcb92 --- /dev/null +++ b/repos/dde_ipxe/recipes/pkg/ipxe_nic/runtime @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/archives b/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/archives deleted file mode 100644 index a58945b7c5..0000000000 --- a/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/archives +++ /dev/null @@ -1 +0,0 @@ -_/src/ipxe_nic_drv diff --git a/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/runtime b/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/runtime deleted file mode 100644 index 3950b1248a..0000000000 --- a/repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/runtime +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/repos/dde_ipxe/recipes/src/ipxe_nic_drv/content.mk b/repos/dde_ipxe/recipes/src/ipxe_nic/content.mk similarity index 100% rename from repos/dde_ipxe/recipes/src/ipxe_nic_drv/content.mk rename to repos/dde_ipxe/recipes/src/ipxe_nic/content.mk diff --git a/repos/dde_ipxe/recipes/src/ipxe_nic_drv/hash b/repos/dde_ipxe/recipes/src/ipxe_nic/hash similarity index 100% rename from repos/dde_ipxe/recipes/src/ipxe_nic_drv/hash rename to repos/dde_ipxe/recipes/src/ipxe_nic/hash diff --git a/repos/dde_ipxe/recipes/src/ipxe_nic_drv/used_apis b/repos/dde_ipxe/recipes/src/ipxe_nic/used_apis similarity index 100% rename from repos/dde_ipxe/recipes/src/ipxe_nic_drv/used_apis rename to repos/dde_ipxe/recipes/src/ipxe_nic/used_apis diff --git a/repos/dde_ipxe/src/drivers/nic/target.mk b/repos/dde_ipxe/src/drivers/nic/target.mk index 87bc3a4400..0ade3f5ddd 100644 --- a/repos/dde_ipxe/src/drivers/nic/target.mk +++ b/repos/dde_ipxe/src/drivers/nic/target.mk @@ -1,4 +1,4 @@ -TARGET = ipxe_nic_drv +TARGET = ipxe_nic REQUIRES = x86 LIBS = base dde_ipxe_nic nic_driver format SRC_CC = main.cc diff --git a/repos/dde_linux/README b/repos/dde_linux/README index 4cb39a08da..992576bcf3 100644 --- a/repos/dde_linux/README +++ b/repos/dde_linux/README @@ -36,7 +36,7 @@ version of 'libc' by linking your application to 'lxip_libc' plugin in your Wifi #### -The 'wifi_drv' consists of a port of the mac802.11 stack, platform-specific +The 'wifi' driver consists of a port of the mac802.11 stack, platform-specific drivers and the 'wpa_supplicant' to Genode. diff --git a/repos/dde_linux/recipes/src/usb_hid_drv/content.mk b/repos/dde_linux/recipes/src/usb_hid/content.mk similarity index 100% rename from repos/dde_linux/recipes/src/usb_hid_drv/content.mk rename to repos/dde_linux/recipes/src/usb_hid/content.mk diff --git a/repos/dde_linux/recipes/src/usb_hid_drv/hash b/repos/dde_linux/recipes/src/usb_hid/hash similarity index 100% rename from repos/dde_linux/recipes/src/usb_hid_drv/hash rename to repos/dde_linux/recipes/src/usb_hid/hash diff --git a/repos/dde_linux/recipes/src/usb_hid_drv/used_apis b/repos/dde_linux/recipes/src/usb_hid/used_apis similarity index 100% rename from repos/dde_linux/recipes/src/usb_hid_drv/used_apis rename to repos/dde_linux/recipes/src/usb_hid/used_apis diff --git a/repos/dde_linux/recipes/src/usb_net_drv/content.mk b/repos/dde_linux/recipes/src/usb_net/content.mk similarity index 100% rename from repos/dde_linux/recipes/src/usb_net_drv/content.mk rename to repos/dde_linux/recipes/src/usb_net/content.mk diff --git a/repos/dde_linux/recipes/src/usb_net_drv/hash b/repos/dde_linux/recipes/src/usb_net/hash similarity index 100% rename from repos/dde_linux/recipes/src/usb_net_drv/hash rename to repos/dde_linux/recipes/src/usb_net/hash diff --git a/repos/dde_linux/recipes/src/usb_net_drv/used_apis b/repos/dde_linux/recipes/src/usb_net/used_apis similarity index 100% rename from repos/dde_linux/recipes/src/usb_net_drv/used_apis rename to repos/dde_linux/recipes/src/usb_net/used_apis diff --git a/repos/dde_linux/run/nic_router_uplinks.run b/repos/dde_linux/run/nic_router_uplinks.run index 4f8ffb7ce1..ce5147f004 100644 --- a/repos/dde_linux/run/nic_router_uplinks.run +++ b/repos/dde_linux/run/nic_router_uplinks.run @@ -22,15 +22,15 @@ proc router_verbose_domain_state {} { create_boot_directory import_from_depot [depot_user]/src/[base_src] \ [depot_user]/pkg/pc_wifi \ - [depot_user]/src/acpi_drv \ + [depot_user]/src/acpi \ [depot_user]/src/dynamic_rom \ [depot_user]/src/init \ - [depot_user]/src/pc_nic_drv \ + [depot_user]/src/pc_nic \ [depot_user]/src/nic_router \ [depot_user]/src/pci_decode \ - [depot_user]/src/platform_drv \ + [depot_user]/src/platform \ [depot_user]/src/report_rom \ - [depot_user]/src/rtc_drv + [depot_user]/src/pc_rtc build { app/ping } @@ -58,12 +58,12 @@ install_config { - - + + - + @@ -76,7 +76,7 @@ install_config { - + @@ -84,8 +84,8 @@ install_config { - - + + @@ -94,15 +94,15 @@ install_config { - + - - + + @@ -110,7 +110,7 @@ install_config { - + @@ -171,8 +171,8 @@ install_config { verbose_domain_state="} [router_verbose_domain_state] {" verbose_packets="} [router_verbose_packets] {"> - - + + @@ -195,8 +195,8 @@ install_config { verbose_domain_state="} [router_verbose_domain_state] {" verbose_packets="} [router_verbose_packets] {"> - - + + @@ -238,8 +238,8 @@ install_config { verbose_domain_state="} [router_verbose_domain_state] {" verbose_packets="} [router_verbose_packets] {"> - - + + @@ -262,8 +262,8 @@ install_config { verbose_domain_state="} [router_verbose_domain_state] {" verbose_packets="} [router_verbose_packets] {"> - - + + @@ -305,8 +305,8 @@ install_config { verbose_domain_state="} [router_verbose_domain_state] {" verbose_packets="} [router_verbose_packets] {"> - - + + @@ -329,8 +329,8 @@ install_config { verbose_domain_state="} [router_verbose_domain_state] {" verbose_packets="} [router_verbose_packets] {"> - - + + diff --git a/repos/dde_linux/run/usb_hid_raw.run b/repos/dde_linux/run/usb_hid_raw.run index 5104388f23..e74cd0a685 100644 --- a/repos/dde_linux/run/usb_hid_raw.run +++ b/repos/dde_linux/run/usb_hid_raw.run @@ -59,10 +59,10 @@ if { [get_cmd_switch --autopilot] && create_boot_directory import_from_depot [depot_user]/src/[base_src] \ - [depot_user]/pkg/test_usb_host_drv-[board] \ + [depot_user]/pkg/test_usb_host-[board] \ [depot_user]/src/dynamic_rom \ [depot_user]/src/report_rom \ - [depot_user]/src/usb_hid_drv \ + [depot_user]/src/usb_hid \ [depot_user]/src/init build { server/event_dump } @@ -93,14 +93,14 @@ install_config { - + - + @@ -113,7 +113,7 @@ install_config { - + @@ -122,7 +122,7 @@ install_config { - + @@ -188,11 +188,11 @@ install_config { # # Define USB host controller config # -set fd [open [run_dir]/genode/usb_host_drv.config w] +set fd [open [run_dir]/genode/usb_host.config w] puts $fd { - + } close $fd @@ -225,8 +225,8 @@ unify_output {(?n)hid-generic.*input:} "hid-generic: input:" unify_output {(?n)usb-[0-9]-[0-9]: USB disconnect, device number [0-9]} "usb-X-X: USB disconnect, device number X" unify_output {(?n)input[0-9]} "inputX" unify_output {(?n) as /devices/.*} "" -unify_output {(?n)^\[init -\> usb_drv.*} "" -unify_output {(?n)^\[init -\> usb_hid_drv\] Connected device: inputX \(ATEN CS1764A V1.1.110\).*} "" +unify_output {(?n)^\[init -\> usb -\>.*} "" +unify_output {(?n)^\[init -\> usb_hid\] Connected device: inputX \(ATEN CS1764A V1.1.110\).*} "" trim_lines compare_output_to { @@ -235,15 +235,15 @@ compare_output_to { [init -> event_dump] Input event #2 REL_MOTION -1+1 key count: 0 [init -> event_dump] Input event #3 PRESS BTN_LEFT 65534 key count: 1 [init -> event_dump] Input event #4 RELEASE BTN_LEFT key count: 0 -[init -> usb_hid_drv] usb usb-X-X: USB disconnect, device number X -[init -> usb_hid_drv] Disconnected device: inputX -[init -> usb_hid_drv] Disconnected device: inputX -[init -> usb_hid_drv] input: Dean Camera LUFA Mouse and Keyboard Demo -[init -> usb_hid_drv] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) -[init -> usb_hid_drv] hid-generic: input: USB HID v1.11 Keyboard [Dean Camera LUFA Mouse and Keyboard Demo] -[init -> usb_hid_drv] input: Dean Camera LUFA Mouse and Keyboard Demo -[init -> usb_hid_drv] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) MOUSE -[init -> usb_hid_drv] hid-generic: input: USB HID v1.11 Mouse [Dean Camera LUFA Mouse and Keyboard Demo] +[init -> usb_hid] usb usb-X-X: USB disconnect, device number X +[init -> usb_hid] Disconnected device: inputX +[init -> usb_hid] Disconnected device: inputX +[init -> usb_hid] input: Dean Camera LUFA Mouse and Keyboard Demo +[init -> usb_hid] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) +[init -> usb_hid] hid-generic: input: USB HID v1.11 Keyboard [Dean Camera LUFA Mouse and Keyboard Demo] +[init -> usb_hid] input: Dean Camera LUFA Mouse and Keyboard Demo +[init -> usb_hid] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) MOUSE +[init -> usb_hid] hid-generic: input: USB HID v1.11 Mouse [Dean Camera LUFA Mouse and Keyboard Demo] [init -> event_dump] Input event #5 PRESS KEY_X 65534 key count: 1 [init -> event_dump] Input event #6 RELEASE KEY_X key count: 0 [init -> event_dump] Input event #7 REL_MOTION -1+1 key count: 0 diff --git a/repos/dde_linux/run/usb_hid_reconnect.run b/repos/dde_linux/run/usb_hid_reconnect.run index d22a88daf6..70aecbbdc4 100644 --- a/repos/dde_linux/run/usb_hid_reconnect.run +++ b/repos/dde_linux/run/usb_hid_reconnect.run @@ -17,10 +17,10 @@ if {![have_include "power_on/qemu"]} { create_boot_directory import_from_depot [depot_user]/src/[base_src] \ - [depot_user]/pkg/test_usb_host_drv-[board] \ + [depot_user]/pkg/test_usb_host-[board] \ [depot_user]/src/dynamic_rom \ [depot_user]/src/report_rom \ - [depot_user]/src/usb_hid_drv \ + [depot_user]/src/usb_hid \ [depot_user]/src/init build { server/event_dump } @@ -51,11 +51,11 @@ install_config { - + - + @@ -68,7 +68,7 @@ install_config { - + @@ -123,11 +123,11 @@ install_config { # # Define USB host controller config # -set fd [open [run_dir]/genode/usb_host_drv.config w] +set fd [open [run_dir]/genode/usb_host.config w] puts $fd { - + } close $fd diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run index 0b3b9270cf..c62a17eb17 100644 --- a/repos/dde_linux/run/usb_net.run +++ b/repos/dde_linux/run/usb_net.run @@ -9,8 +9,8 @@ create_boot_directory import_from_depot [depot_user]/src/[base_src] \ - [depot_user]/pkg/test_usb_host_drv-[board] \ - [depot_user]/src/usb_net_drv \ + [depot_user]/pkg/test_usb_host-[board] \ + [depot_user]/src/usb_net \ [depot_user]/src/nic_router \ [depot_user]/src/libc \ [depot_user]/src/vfs \ @@ -41,7 +41,7 @@ install_config { - + @@ -53,7 +53,7 @@ install_config { - + @@ -71,7 +71,7 @@ install_config { - + @@ -112,13 +112,13 @@ install_config { # set config {} append_if [have_board rpi] config { - + } append_if [have_spec x86] config { - + } append config {} -set fd [open [run_dir]/genode/usb_host_drv.config w] +set fd [open [run_dir]/genode/usb_host.config w] puts $fd $config close $fd diff --git a/repos/dde_linux/run/wg_reconnect.run b/repos/dde_linux/run/wg_reconnect.run index 5a3c0d053a..1ad80f608f 100644 --- a/repos/dde_linux/run/wg_reconnect.run +++ b/repos/dde_linux/run/wg_reconnect.run @@ -44,15 +44,15 @@ if { ![expr [have_board linux] || [have_board pc]] } { } -proc rtc_drv_binary_name { } { +proc rtc_binary_name { } { switch [board] { - linux { return "linux_rtc_drv" } - pc { return "rtc_drv" } + linux { return "linux_rtc" } + pc { return "pc_rtc" } } } -proc rtc_drv_use_ld { } { +proc rtc_use_ld { } { return [expr [have_board linux] ? "no" : "yes"] } @@ -75,7 +75,7 @@ lappend depot_archives [depot_user]/src/nic_router lappend depot_archives [depot_user]/src/openssl lappend depot_archives [depot_user]/src/posix lappend depot_archives [depot_user]/src/report_rom -lappend depot_archives [depot_user]/src/[rtc_drv_binary_name] +lappend depot_archives [depot_user]/src/[rtc_binary_name] lappend depot_archives [depot_user]/src/vfs lappend depot_archives [depot_user]/src/vfs_jitterentropy lappend depot_archives [depot_user]/src/vfs_lwip @@ -272,8 +272,8 @@ append config { - - + + @@ -319,7 +319,7 @@ append config { - + @@ -332,7 +332,7 @@ append config { - + diff --git a/repos/dde_linux/src/drivers/usb_hid/target.inc b/repos/dde_linux/src/drivers/usb_hid/target.inc index ca9bc69719..572c6b9b50 100644 --- a/repos/dde_linux/src/drivers/usb_hid/target.inc +++ b/repos/dde_linux/src/drivers/usb_hid/target.inc @@ -1,4 +1,4 @@ -TARGET = usb_hid_drv +TARGET = usb_hid LIBS = base jitterentropy virt_lx_emul INC_DIR = $(PRG_DIR)/../.. $(REP_DIR)/src/lib/usb_client diff --git a/repos/dde_linux/src/drivers/usb_net/README b/repos/dde_linux/src/drivers/usb_net/README index 946421acef..6359685398 100644 --- a/repos/dde_linux/src/drivers/usb_net/README +++ b/repos/dde_linux/src/drivers/usb_net/README @@ -18,7 +18,7 @@ NIC configuration Configuration snippet: -! +! ! ! ! @@ -44,11 +44,11 @@ LTE modem configuration Currently there is support for MBIM (Mobile Broadband Interface Model) devices. Tested devices: -Huawai ME906s (P/V: 12d1:15c1) - "configuration=3" for 'usb_net_drv' +Huawai ME906s (P/V: 12d1:15c1) - "configuration=3" for 'usb_net' Fibocom L830-EB-00 (P/V: 2cb7:0210) - automatically detected -! +! ! ! ! diff --git a/repos/dde_linux/src/drivers/usb_net/target.inc b/repos/dde_linux/src/drivers/usb_net/target.inc index 6058c4e822..7fbee1840b 100644 --- a/repos/dde_linux/src/drivers/usb_net/target.inc +++ b/repos/dde_linux/src/drivers/usb_net/target.inc @@ -1,4 +1,4 @@ -TARGET = usb_net_drv +TARGET = usb_net LIBS = base jitterentropy virt_lx_emul INC_DIR = $(PRG_DIR)/../.. diff --git a/repos/dde_linux/src/drivers/wifi/README b/repos/dde_linux/src/drivers/wifi/README index 6cc58346e8..bcac549053 100644 --- a/repos/dde_linux/src/drivers/wifi/README +++ b/repos/dde_linux/src/drivers/wifi/README @@ -1,4 +1,4 @@ -The wifi_drv component is a port of the Linux mac802.11 stack as well as +The wifi component is a port of the Linux mac802.11 stack as well as libnl and wpa_supplicant to Genode. Depending on the used platform it features a selection of drivers for wireless devices. For example on the PC platform it contains the ath9k, iwlwifi and rtlwifi drivers for PCI(e) @@ -6,14 +6,14 @@ devices. In contrast to other DDE Linux based drivers the actual driver portion is confined to its own library to better isolate the various parts of the driver. -The 'wifi_drv' binary is the generic management part that includes the Wifi +The 'wifi' binary is the generic management part that includes the Wifi configuration interface and the 'wpa_supplicant'. A suitable driver library is loaded at run-time (see section [Debugging]). To start the component on the PC platform the following configuration snippet can be used: -! +! ! ! ! @@ -41,7 +41,7 @@ can be used: On other platforms the wifi library will be different. The following snippet illustrates the use of the driver on the PinePhone: -! +! ! ! ! @@ -118,7 +118,7 @@ a better fit accesspoint for the configured network. Also, the driver can be switched to verbose logging during runtime by setting the 'verbose' or 'verbose_state' attribute to 'true'. -The wifi_drv creates two distinct reports to communicate its state and +The wifi driver creates two distinct reports to communicate its state and information about the wireless infrastructure to other components. The first one is a list of all available accesspoints. The following examplary report shows its general structure: @@ -166,7 +166,7 @@ label "devices" if requested in the config as depicted. Debugging ~~~~~~~~~ -As mentioned in the introduction the 'wifi_drv' component is special in the +As mentioned in the introduction the 'wifi' component is special in the regard that the actual driver is provided as a shared-object to better isolate it from the the driver binary that is a Libc::Component managing the 'wpa_supplicant'. Since this code and in return the binary is the same for each @@ -185,7 +185,7 @@ is necessary to link the driver binary directly against the driver library rather then stub ABI library. This is achieved by adapting the driver's 'target.mk' file. In -!TARGET := wifi_drv +!TARGET := wifi !SRC_CC := main.cc wpa.cc access_firmware.cc !LIBS := base wifi ![…] diff --git a/repos/dde_linux/src/drivers/wifi/frontend.h b/repos/dde_linux/src/drivers/wifi/frontend.h index e1f87b47d4..6697ab4767 100644 --- a/repos/dde_linux/src/drivers/wifi/frontend.h +++ b/repos/dde_linux/src/drivers/wifi/frontend.h @@ -1650,7 +1650,7 @@ struct Wifi::Frontend : Wifi::Rfkill_notification_handler /** * Trigger RFKILL notification * - * Used by the wifi_drv to notify front end. + * Used by the wifi driver to notify front end. */ void rfkill_notify() override { diff --git a/repos/dde_linux/src/drivers/wifi/target.mk b/repos/dde_linux/src/drivers/wifi/target.mk index 257d6ec0b5..10ed155c72 100644 --- a/repos/dde_linux/src/drivers/wifi/target.mk +++ b/repos/dde_linux/src/drivers/wifi/target.mk @@ -1,4 +1,4 @@ -TARGET := wifi_drv +TARGET := wifi SRC_CC := main.cc wpa.cc access_firmware.cc LIBS := base wifi LIBS += libc diff --git a/repos/dde_linux/src/lib/wpa_driver_nl80211/symbol.map b/repos/dde_linux/src/lib/wpa_driver_nl80211/symbol.map index 1b750f9d3b..a8e420ee5f 100644 --- a/repos/dde_linux/src/lib/wpa_driver_nl80211/symbol.map +++ b/repos/dde_linux/src/lib/wpa_driver_nl80211/symbol.map @@ -12,7 +12,7 @@ poll; - /* needed by wpa_supplicant lib for wifi_drv */ + /* needed by wpa_supplicant lib for the wifi driver */ nl_set_wpa_ctrl_fd; local: diff --git a/repos/dde_linux/src/lib/wpa_supplicant/symbol.map b/repos/dde_linux/src/lib/wpa_supplicant/symbol.map index 83a2f2d516..9110d727b2 100644 --- a/repos/dde_linux/src/lib/wpa_supplicant/symbol.map +++ b/repos/dde_linux/src/lib/wpa_supplicant/symbol.map @@ -4,7 +4,7 @@ { global: - /* needed by wifi_drv */ + /* needed by wifi driver */ wpa_main; wpa_reporter_init; wpa_ctrl_set_fd; diff --git a/repos/gems/recipes/pkg/drivers_nic-pc/archives b/repos/gems/recipes/pkg/drivers_nic-pc/archives index b86c4d0a5d..1c998e079d 100644 --- a/repos/gems/recipes/pkg/drivers_nic-pc/archives +++ b/repos/gems/recipes/pkg/drivers_nic-pc/archives @@ -1,6 +1,6 @@ -_/src/platform_drv -_/src/acpi_drv -_/src/pc_nic_drv +_/src/platform +_/src/acpi +_/src/pc_nic _/src/report_rom _/src/pci_decode _/raw/drivers_nic-pc diff --git a/repos/gems/recipes/pkg/goa-linux/archives b/repos/gems/recipes/pkg/goa-linux/archives index d4c34aa25d..7569618a6b 100644 --- a/repos/gems/recipes/pkg/goa-linux/archives +++ b/repos/gems/recipes/pkg/goa-linux/archives @@ -1,6 +1,6 @@ _/pkg/drivers_interactive-linux _/src/base-linux _/src/fb_sdl -_/src/linux_nic_drv -_/src/linux_rtc_drv +_/src/linux_nic +_/src/linux_rtc _/src/lx_fs diff --git a/repos/gems/recipes/pkg/sculpt/README b/repos/gems/recipes/pkg/sculpt/README index 2e3b920c86..dbca0190bb 100644 --- a/repos/gems/recipes/pkg/sculpt/README +++ b/repos/gems/recipes/pkg/sculpt/README @@ -688,7 +688,7 @@ displays and their supported resolutions by taking a look at the report at _/report/runtime/intel_fb/connectors_. This report is updated whenever a display is connected or disconnected. You can use this information to enable or disable a display in the driver's configuration, -which you can find at _/config/fb_drv_. +which you can find at _/config/fb_. For a quick test, change the attributes 'height="768"' to 'force_height="768"' and 'width="1024"' to 'force_width="1024"'. When saving the file, the screen diff --git a/repos/gems/recipes/pkg/sculpt_distribution-pc/archives b/repos/gems/recipes/pkg/sculpt_distribution-pc/archives index 7941f50624..28c1bef463 100644 --- a/repos/gems/recipes/pkg/sculpt_distribution-pc/archives +++ b/repos/gems/recipes/pkg/sculpt_distribution-pc/archives @@ -5,5 +5,5 @@ _/pkg/acpica _/pkg/system_clock-pc _/pkg/mesa_gpu-intel _/pkg/file_vault -_/pkg/bsd_audio_drv +_/pkg/bsd_audio _/pkg/gdb_x86 diff --git a/repos/gems/recipes/pkg/sculpt_drivers-pc/archives b/repos/gems/recipes/pkg/sculpt_drivers-pc/archives index aa38c7236f..01aea52ea5 100644 --- a/repos/gems/recipes/pkg/sculpt_drivers-pc/archives +++ b/repos/gems/recipes/pkg/sculpt_drivers-pc/archives @@ -1,16 +1,16 @@ _/pkg/pc_wifi -_/src/acpi_drv -_/src/ahci_drv -_/src/boot_fb_drv -_/src/intel_gpu_drv -_/src/nvme_drv +_/src/acpi +_/src/ahci +_/src/boot_fb +_/src/intel_gpu +_/src/nvme _/src/pci_decode -_/src/pc_intel_fb_drv -_/src/pc_nic_drv -_/src/pc_platform_drv -_/src/pc_usb_host_drv -_/src/ps2_drv -_/src/usb_block_drv -_/src/usb_hid_drv -_/src/vesa_drv +_/src/pc_intel_fb +_/src/pc_nic +_/src/pc_platform +_/src/pc_usb_host +_/src/ps2 +_/src/usb_block +_/src/usb_hid +_/src/vesa_fb _/src/rom_reporter diff --git a/repos/gems/recipes/raw/drivers_nic-pc/drivers.config b/repos/gems/recipes/raw/drivers_nic-pc/drivers.config index a3147991ea..309ac11198 100644 --- a/repos/gems/recipes/raw/drivers_nic-pc/drivers.config +++ b/repos/gems/recipes/raw/drivers_nic-pc/drivers.config @@ -16,9 +16,9 @@ - + - + @@ -38,8 +38,8 @@ - - + + @@ -63,7 +63,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -103,11 +103,11 @@ - - + + - + diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run index d8ea2f2a4f..2e4ea5c5d9 100644 --- a/repos/gems/run/mixer_gui_qt_test.run +++ b/repos/gems/run/mixer_gui_qt_test.run @@ -70,7 +70,7 @@ install_config { - + diff --git a/repos/gems/run/sculpt.run b/repos/gems/run/sculpt.run index ca4c907eb9..09af34a3ee 100644 --- a/repos/gems/run/sculpt.run +++ b/repos/gems/run/sculpt.run @@ -175,43 +175,43 @@ proc log_route { } { proc driver_routes { } { set result(pc) { - + - + } set result(mnt_reform2) { - - - - - - - - + + + + + + + + } set result(imx8q_evk) { - - + + } set result(pinephone) { - + - - - - - - - - + + + + + + + + } @@ -433,8 +433,8 @@ install_config { } [log_route] { - - + + @@ -750,7 +750,7 @@ set optional_configs { event_filter wifi runtime - gpu_drv + gpu } foreach config $optional_configs { @@ -764,7 +764,7 @@ foreach config $optional_configs { set required_configs { nitpicker deploy - fb_drv + fb clipboard drivers numlock_remap @@ -840,7 +840,7 @@ foreach config { fonts wifi runtime event_filter system } { } } -copy_file [file join [initial_config_dir] fb_drv] [managed_config_path fb_drv] +copy_file [file join [initial_config_dir] fb] [managed_config_path fb] # diff --git a/repos/gems/run/sculpt/index b/repos/gems/run/sculpt/index index 6c6c86efbc..5a6596288f 100644 --- a/repos/gems/run/sculpt/index +++ b/repos/gems/run/sculpt/index @@ -22,7 +22,7 @@ - + diff --git a/repos/gems/run/sculpt_test.run b/repos/gems/run/sculpt_test.run index d8b964378e..76a93b3f7b 100644 --- a/repos/gems/run/sculpt_test.run +++ b/repos/gems/run/sculpt_test.run @@ -2,7 +2,7 @@ set use_nvme 0 source ${genode_dir}/repos/gems/run/sculpt.run -# enable Qemu networking, usable via the nic_drv +# enable Qemu networking, usable via the nic driver append_qemu_nic_args append qemu_args " -m 1024 " diff --git a/repos/gems/run/terminal_log.run b/repos/gems/run/terminal_log.run index 5b752fcf0d..1a6488abf9 100644 --- a/repos/gems/run/terminal_log.run +++ b/repos/gems/run/terminal_log.run @@ -23,7 +23,7 @@ install_config { - + diff --git a/repos/gems/run/tiled_wm.run b/repos/gems/run/tiled_wm.run index e8ad0d370f..e7da79b378 100644 --- a/repos/gems/run/tiled_wm.run +++ b/repos/gems/run/tiled_wm.run @@ -118,7 +118,7 @@ install_config { - + @@ -144,7 +144,7 @@ install_config { - + @@ -167,7 +167,7 @@ install_config { - + @@ -190,7 +190,7 @@ install_config { - + @@ -212,7 +212,7 @@ install_config { - + diff --git a/repos/gems/run/trace_recorder.run b/repos/gems/run/trace_recorder.run index fcc4d9725a..78b463ddf4 100644 --- a/repos/gems/run/trace_recorder.run +++ b/repos/gems/run/trace_recorder.run @@ -41,7 +41,7 @@ import_from_depot \ [depot_user]/src/nic_router \ [depot_user]/src/report_rom \ [depot_user]/src/vfs \ - [depot_user]/src/linux_rtc_drv \ + [depot_user]/src/linux_rtc \ [depot_user]/src/trace_recorder \ [depot_user]/raw/trace_recorder \ [depot_user]/src/trace_recorder_policy \ @@ -70,7 +70,7 @@ install_config { - + diff --git a/repos/gems/run/trace_recorder_ctf.run b/repos/gems/run/trace_recorder_ctf.run index 7e070ace6e..f5d4515644 100644 --- a/repos/gems/run/trace_recorder_ctf.run +++ b/repos/gems/run/trace_recorder_ctf.run @@ -26,7 +26,7 @@ import_from_depot \ [depot_user]/src/rom_logger \ [depot_user]/src/report_rom \ [depot_user]/src/vfs \ - [depot_user]/src/dummy_rtc_drv \ + [depot_user]/src/dummy_rtc \ [depot_user]/src/trace_recorder \ [depot_user]/raw/trace_recorder \ [depot_user]/src/trace_recorder_policy \ @@ -113,7 +113,7 @@ install_config { - + diff --git a/repos/gems/run/trace_recorder_pcapng.run b/repos/gems/run/trace_recorder_pcapng.run index 7e455c5f77..6500f2424c 100644 --- a/repos/gems/run/trace_recorder_pcapng.run +++ b/repos/gems/run/trace_recorder_pcapng.run @@ -25,7 +25,7 @@ import_from_depot \ [depot_user]/src/libc \ [depot_user]/src/nic_router \ [depot_user]/src/vfs \ - [depot_user]/src/linux_rtc_drv \ + [depot_user]/src/linux_rtc \ [depot_user]/src/trace_recorder \ [depot_user]/raw/trace_recorder \ [depot_user]/src/trace_recorder_policy \ @@ -54,7 +54,7 @@ install_config { - + diff --git a/repos/gems/sculpt/default-pc.sculpt b/repos/gems/sculpt/default-pc.sculpt index d37da3c369..1cdcee7185 100644 --- a/repos/gems/sculpt/default-pc.sculpt +++ b/repos/gems/sculpt/default-pc.sculpt @@ -1,7 +1,7 @@ # configuration decisions drivers: pc system: pc -gpu_drv: intel +gpu: intel # supplemental depot content added to the system image import: pkg/sculpt_drivers-pc diff --git a/repos/gems/sculpt/deploy/goa_testbed b/repos/gems/sculpt/deploy/goa_testbed index edb495acc2..8af76b9c05 100644 --- a/repos/gems/sculpt/deploy/goa_testbed +++ b/repos/gems/sculpt/deploy/goa_testbed @@ -110,7 +110,7 @@ - + diff --git a/repos/gems/sculpt/drivers/pc b/repos/gems/sculpt/drivers/pc index 4fbaa130e1..fffa3b1ee9 100644 --- a/repos/gems/sculpt/drivers/pc +++ b/repos/gems/sculpt/drivers/pc @@ -22,17 +22,17 @@ - + - - - - - + + + + + @@ -54,7 +54,7 @@ - + @@ -83,8 +83,8 @@ - - + + diff --git a/repos/gems/sculpt/fb_drv/default b/repos/gems/sculpt/fb/default similarity index 100% rename from repos/gems/sculpt/fb_drv/default rename to repos/gems/sculpt/fb/default diff --git a/repos/gems/sculpt/gpu_drv/intel b/repos/gems/sculpt/gpu/intel similarity index 100% rename from repos/gems/sculpt/gpu_drv/intel rename to repos/gems/sculpt/gpu/intel diff --git a/repos/gems/sculpt/launcher/audio b/repos/gems/sculpt/launcher/audio index 5718025d11..c4caf2f4c4 100644 --- a/repos/gems/sculpt/launcher/audio +++ b/repos/gems/sculpt/launcher/audio @@ -1,4 +1,4 @@ - + diff --git a/repos/gems/sculpt/leitzentrale/default b/repos/gems/sculpt/leitzentrale/default index 22952110aa..323b127b96 100644 --- a/repos/gems/sculpt/leitzentrale/default +++ b/repos/gems/sculpt/leitzentrale/default @@ -229,8 +229,8 @@ - - + + diff --git a/repos/gems/src/app/phone_manager/main.cc b/repos/gems/src/app/phone_manager/main.cc index 137699de0c..d397dd8f84 100644 --- a/repos/gems/src/app/phone_manager/main.cc +++ b/repos/gems/src/app/phone_manager/main.cc @@ -2272,7 +2272,7 @@ void Sculpt::Main::_handle_runtime_state(Xml_node const &state) _storage._storage_devices.usb_storage_devices.for_each([&] (Usb_storage_device &dev) { Child_exit_state exit_state(state, dev.driver); if (exit_state.exited) { - dev.discard_usb_block_drv(); + dev.discard_usb_block(); reconfigure_runtime = true; regenerate_dialog = true; } diff --git a/repos/gems/src/app/sculpt_manager/driver/ahci.h b/repos/gems/src/app/sculpt_manager/driver/ahci.h index b709b2ad99..b1f7a3d8e6 100644 --- a/repos/gems/src/app/sculpt_manager/driver/ahci.h +++ b/repos/gems/src/app/sculpt_manager/driver/ahci.h @@ -43,7 +43,7 @@ struct Sculpt::Ahci_driver : private Noncopyable xml.node("start", [&] { _ahci->gen_start_node_content(xml); - gen_named_node(xml, "binary", "ahci_drv"); + gen_named_node(xml, "binary", "ahci"); gen_provides(xml); xml.node("config", [&] { xml.attribute("system", "yes"); @@ -56,7 +56,7 @@ struct Sculpt::Ahci_driver : private Noncopyable }); xml.node("route", [&] { gen_parent_route(xml); - gen_parent_rom_route(xml, "ahci_drv"); + gen_parent_rom_route(xml, "ahci"); gen_parent_rom_route(xml, "system", "config -> managed/system"); gen_common_routes(xml); }); diff --git a/repos/gems/src/app/sculpt_manager/driver/fb.h b/repos/gems/src/app/sculpt_manager/driver/fb.h index 800505ada1..bbc4d1f8c2 100644 --- a/repos/gems/src/app/sculpt_manager/driver/fb.h +++ b/repos/gems/src/app/sculpt_manager/driver/fb.h @@ -43,29 +43,29 @@ struct Sculpt::Fb_driver : private Noncopyable fn(); }); }; - start_node(_intel_gpu, "intel_gpu_drv", [&] { + start_node(_intel_gpu, "intel_gpu", [&] { xml.node("provides", [&] { gen_service_node (xml, [&] { }); gen_service_node(xml, [&] { }); }); xml.node("route", [&] { gen_parent_route(xml); - gen_parent_rom_route(xml, "intel_gpu_drv"); - gen_parent_rom_route(xml, "config", "config -> gpu_drv"); + gen_parent_rom_route(xml, "intel_gpu"); + gen_parent_rom_route(xml, "config", "config -> gpu"); gen_parent_rom_route(xml, "system", "config -> managed/system"); gen_parent_route(xml); gen_common_routes(xml); }); }); - start_node(_intel_fb, "pc_intel_fb_drv", [&] { + start_node(_intel_fb, "pc_intel_fb", [&] { xml.node("heartbeat", [&] { }); xml.node("route", [&] { gen_service_node(xml, [&] { gen_named_node(xml, "child", "intel_gpu"); }); gen_capture_route(xml); - gen_parent_rom_route(xml, "pc_intel_fb_drv"); - gen_parent_rom_route(xml, "config", "config -> managed/fb_drv"); + gen_parent_rom_route(xml, "pc_intel_fb"); + gen_parent_rom_route(xml, "config", "config -> managed/fb"); gen_parent_rom_route(xml, "system", "config -> managed/system"); gen_parent_rom_route(xml, "intel_opregion", "report -> drivers/intel_opregion"); gen_parent_route(xml); @@ -73,22 +73,22 @@ struct Sculpt::Fb_driver : private Noncopyable }); }); - start_node(_vesa_fb, "vesa_fb_drv", [&] { + start_node(_vesa_fb, "vesa_fb", [&] { xml.node("route", [&] { gen_parent_route(xml); gen_capture_route(xml); - gen_parent_rom_route(xml, "vesa_fb_drv"); - gen_parent_rom_route(xml, "config", "config -> fb_drv"); + gen_parent_rom_route(xml, "vesa_fb"); + gen_parent_rom_route(xml, "config", "config -> fb"); gen_parent_route(xml); gen_parent_route(xml); gen_common_routes(xml); }); }); - start_node(_boot_fb, "boot_fb_drv", [&] { + start_node(_boot_fb, "boot_fb", [&] { xml.node("route", [&] { - gen_parent_rom_route(xml, "config", "config -> fb_drv"); - gen_parent_rom_route(xml, "boot_fb_drv"); + gen_parent_rom_route(xml, "config", "config -> fb"); + gen_parent_rom_route(xml, "boot_fb"); gen_parent_rom_route(xml, "platform_info"); gen_parent_route(xml); gen_capture_route(xml); @@ -96,15 +96,15 @@ struct Sculpt::Fb_driver : private Noncopyable }); }); - start_node(_soc_fb, "fb_drv", [&] { + start_node(_soc_fb, "fb", [&] { xml.node("route", [&] { gen_parent_route (xml); gen_parent_route(xml); gen_parent_route(xml); gen_capture_route(xml); - gen_parent_rom_route(xml, "fb_drv"); - gen_parent_rom_route(xml, "config", "config -> fb_drv"); - gen_parent_rom_route(xml, "dtb", "fb_drv.dtb"); + gen_parent_rom_route(xml, "fb"); + gen_parent_rom_route(xml, "config", "config -> fb"); + gen_parent_rom_route(xml, "dtb", "fb.dtb"); gen_parent_route(xml); gen_common_routes(xml); }); diff --git a/repos/gems/src/app/sculpt_manager/driver/mmc.h b/repos/gems/src/app/sculpt_manager/driver/mmc.h index 4f6359b36e..5db2e4d8a5 100644 --- a/repos/gems/src/app/sculpt_manager/driver/mmc.h +++ b/repos/gems/src/app/sculpt_manager/driver/mmc.h @@ -43,7 +43,7 @@ struct Sculpt::Mmc_driver : private Noncopyable xml.node("start", [&] { _mmc->gen_start_node_content(xml); - gen_named_node(xml, "binary", "mmc_drv"); + gen_named_node(xml, "binary", "mmc"); gen_provides(xml); xml.node("config", [&] { xml.attribute("report", "yes"); @@ -58,8 +58,8 @@ struct Sculpt::Mmc_driver : private Noncopyable }); xml.node("route", [&] { gen_parent_route(xml); - gen_parent_rom_route(xml, "dtb", "mmc_drv.dtb"); - gen_parent_rom_route(xml, "mmc_drv"); + gen_parent_rom_route(xml, "dtb", "mmc.dtb"); + gen_parent_rom_route(xml, "mmc"); gen_common_routes(xml); }); }); diff --git a/repos/gems/src/app/sculpt_manager/driver/nic.h b/repos/gems/src/app/sculpt_manager/driver/nic.h index 1a084410eb..4de59cdc12 100644 --- a/repos/gems/src/app/sculpt_manager/driver/nic.h +++ b/repos/gems/src/app/sculpt_manager/driver/nic.h @@ -28,7 +28,7 @@ struct Sculpt::Nic_driver : private Noncopyable xml.node("start", [&] { _nic->gen_start_node_content(xml); - gen_named_node(xml, "binary", "nic_drv"); + gen_named_node(xml, "binary", "nic"); xml.node("config", [&] { }); xml.node("route", [&] { gen_service_node(xml, [&] { @@ -38,8 +38,8 @@ struct Sculpt::Nic_driver : private Noncopyable xml.node("child", [&] { xml.attribute("name", "nic_router"); }); }); gen_common_routes(xml); - gen_parent_rom_route(xml, "nic_drv"); - gen_parent_rom_route(xml, "nic_drv.dtb"); + gen_parent_rom_route(xml, "nic"); + gen_parent_rom_route(xml, "nic.dtb"); gen_parent_route(xml); }); }); diff --git a/repos/gems/src/app/sculpt_manager/driver/nvme.h b/repos/gems/src/app/sculpt_manager/driver/nvme.h index 0675686214..706afe3365 100644 --- a/repos/gems/src/app/sculpt_manager/driver/nvme.h +++ b/repos/gems/src/app/sculpt_manager/driver/nvme.h @@ -43,7 +43,7 @@ struct Sculpt::Nvme_driver : private Noncopyable xml.node("start", [&] { _nvme->gen_start_node_content(xml); - gen_named_node(xml, "binary", "nvme_drv"); + gen_named_node(xml, "binary", "nvme"); gen_provides(xml); xml.node("config", [&] { xml.attribute("system", "yes"); @@ -55,7 +55,7 @@ struct Sculpt::Nvme_driver : private Noncopyable }); xml.node("route", [&] { gen_parent_route(xml); - gen_parent_rom_route(xml, "nvme_drv"); + gen_parent_rom_route(xml, "nvme"); gen_parent_rom_route(xml, "system", "config -> managed/system"); gen_common_routes(xml); }); diff --git a/repos/gems/src/app/sculpt_manager/driver/ps2.h b/repos/gems/src/app/sculpt_manager/driver/ps2.h index 7e530e0b70..7dd06131cb 100644 --- a/repos/gems/src/app/sculpt_manager/driver/ps2.h +++ b/repos/gems/src/app/sculpt_manager/driver/ps2.h @@ -29,7 +29,7 @@ struct Sculpt::Ps2_driver : private Noncopyable xml.node("start", [&] { _ps2->gen_start_node_content(xml); - gen_named_node(xml, "binary", "ps2_drv"); + gen_named_node(xml, "binary", "ps2"); xml.node("config", [&] { xml.attribute("capslock_led", "rom"); diff --git a/repos/gems/src/app/sculpt_manager/driver/touch.h b/repos/gems/src/app/sculpt_manager/driver/touch.h index 1726fb996a..0fde42c103 100644 --- a/repos/gems/src/app/sculpt_manager/driver/touch.h +++ b/repos/gems/src/app/sculpt_manager/driver/touch.h @@ -28,12 +28,12 @@ struct Sculpt::Touch_driver : private Noncopyable xml.node("start", [&] { _soc->gen_start_node_content(xml); - gen_named_node(xml, "binary", "touch_drv"); + gen_named_node(xml, "binary", "touch"); xml.node("config", [&] { }); xml.node("route", [&] { gen_parent_route (xml); - gen_parent_rom_route(xml, "dtb", "touch_drv.dtb"); - gen_parent_rom_route(xml, "touch_drv"); + gen_parent_rom_route(xml, "dtb", "touch.dtb"); + gen_parent_rom_route(xml, "touch"); gen_common_routes(xml); gen_parent_route(xml); gen_parent_route (xml); diff --git a/repos/gems/src/app/sculpt_manager/driver/usb.h b/repos/gems/src/app/sculpt_manager/driver/usb.h index 0584525241..d06c3c2dd8 100644 --- a/repos/gems/src/app/sculpt_manager/driver/usb.h +++ b/repos/gems/src/app/sculpt_manager/driver/usb.h @@ -117,18 +117,18 @@ struct Sculpt::Usb_driver : private Noncopyable fn(); }); }; - start_node(_hcd, "usb_drv", [&] { + start_node(_hcd, "usb", [&] { gen_provides(xml); xml.node("route", [&] { gen_parent_route(xml); - gen_parent_rom_route(xml, "usb_drv"); + gen_parent_rom_route(xml, "usb"); gen_parent_rom_route(xml, "config", "config -> managed/usb"); - gen_parent_rom_route(xml, "dtb", "usb_drv.dtb"); + gen_parent_rom_route(xml, "dtb", "usb.dtb"); gen_common_routes(xml); }); }); - start_node(_hid, "usb_hid_drv", [&] { + start_node(_hid, "usb_hid", [&] { xml.node("config", [&] { xml.attribute("capslock_led", "rom"); xml.attribute("numlock_led", "rom"); @@ -136,7 +136,7 @@ struct Sculpt::Usb_driver : private Noncopyable xml.node("route", [&] { gen_service_node(xml, [&] { gen_named_node(xml, "child", "usb"); }); - gen_parent_rom_route(xml, "usb_hid_drv"); + gen_parent_rom_route(xml, "usb_hid"); gen_parent_rom_route(xml, "capslock", "capslock"); gen_parent_rom_route(xml, "numlock", "numlock"); gen_common_routes(xml); @@ -146,14 +146,14 @@ struct Sculpt::Usb_driver : private Noncopyable }); }); - start_node(_net, "usb_net_drv", [&] { + start_node(_net, "usb_net", [&] { xml.node("config", [&] { xml.attribute("mac", "02:00:00:00:01:05"); }); xml.node("route", [&] { gen_service_node(xml, [&] { gen_named_node(xml, "child", "usb"); }); - gen_parent_rom_route(xml, "usb_net_drv"); + gen_parent_rom_route(xml, "usb_net"); gen_common_routes(xml); gen_service_node(xml, [&] { xml.node("child", [&] { diff --git a/repos/gems/src/app/sculpt_manager/driver/wifi.h b/repos/gems/src/app/sculpt_manager/driver/wifi.h index c6cbf1c0e4..b078cd604e 100644 --- a/repos/gems/src/app/sculpt_manager/driver/wifi.h +++ b/repos/gems/src/app/sculpt_manager/driver/wifi.h @@ -28,10 +28,10 @@ struct Sculpt::Wifi_driver : private Noncopyable xml.node("start", [&] { _wifi->gen_start_node_content(xml); - gen_named_node(xml, "binary", "wifi_drv"); + gen_named_node(xml, "binary", "wifi"); xml.node("config", [&] { - xml.attribute("dtb", "wifi_drv.dtb"); + xml.attribute("dtb", "wifi.dtb"); xml.node("vfs", [&] { gen_named_node(xml, "dir", "dev", [&] { @@ -68,8 +68,8 @@ struct Sculpt::Wifi_driver : private Noncopyable xml.attribute("name", "nic_router"); xml.attribute("label", "wifi -> "); }); }); gen_common_routes(xml); - gen_parent_rom_route(xml, "wifi_drv"); - gen_parent_rom_route(xml, "wifi_drv.dtb"); + gen_parent_rom_route(xml, "wifi"); + gen_parent_rom_route(xml, "wifi.dtb"); gen_parent_rom_route(xml, "libcrypto.lib.so"); gen_parent_rom_route(xml, "vfs.lib.so"); gen_parent_rom_route(xml, "libc.lib.so"); diff --git a/repos/gems/src/app/sculpt_manager/main.cc b/repos/gems/src/app/sculpt_manager/main.cc index 9d513df43d..24f29ed153 100644 --- a/repos/gems/src/app/sculpt_manager/main.cc +++ b/repos/gems/src/app/sculpt_manager/main.cc @@ -1555,12 +1555,12 @@ struct Sculpt::Main : Input_event_handler, _cached_runtime_config, _file_browser_state, *this }; - Managed_config
_fb_drv_config { - _env, "config", "fb_drv", *this, &Main::_handle_fb_drv_config }; + Managed_config
_fb_config { + _env, "config", "fb", *this, &Main::_handle_fb_config }; - void _handle_fb_drv_config(Xml_node const &node) + void _handle_fb_config(Xml_node const &node) { - _fb_drv_config.generate([&] (Xml_generator &xml) { + _fb_config.generate([&] (Xml_generator &xml) { xml.attribute("system", "yes"); copy_attributes(xml, node); node.for_each_sub_node([&] (Xml_node const &sub_node) { @@ -1649,7 +1649,7 @@ struct Sculpt::Main : Input_event_handler, _gui.input()->sigh(_input_handler); _gui.mode_sigh(_gui_mode_handler); _handle_gui_mode(); - _fb_drv_config.trigger_update(); + _fb_config.trigger_update(); /* * Generate initial configurations @@ -2158,7 +2158,7 @@ void Sculpt::Main::_handle_runtime_state(Xml_node const &state) _storage._storage_devices.usb_storage_devices.for_each([&] (Usb_storage_device &dev) { Child_exit_state exit_state(state, dev.driver); if (exit_state.exited) { - dev.discard_usb_block_drv(); + dev.discard_usb_block(); reconfigure_runtime = true; regenerate_dialog = true; } diff --git a/repos/gems/src/app/sculpt_manager/model/usb_storage_device.h b/repos/gems/src/app/sculpt_manager/model/usb_storage_device.h index 41562e5b44..3b2c9c9aed 100644 --- a/repos/gems/src/app/sculpt_manager/model/usb_storage_device.h +++ b/repos/gems/src/app/sculpt_manager/model/usb_storage_device.h @@ -29,7 +29,7 @@ struct Sculpt::Usb_storage_device : List_model::Element, Storage_device { /** - * Information that is reported asynchronously by 'usb_block_drv' + * Information that is reported asynchronously by 'usb_block' */ struct Driver_info { @@ -48,7 +48,7 @@ struct Sculpt::Usb_storage_device : List_model::Element, Env &_env; - /* information provided asynchronously by usb_block_drv */ + /* information provided asynchronously by usb_block */ Constructible driver_info { }; Rom_handler _report { @@ -70,17 +70,17 @@ struct Sculpt::Usb_storage_device : List_model::Element, }); } - bool usb_block_drv_needed() const + bool usb_block_needed() const { - bool drv_needed = false; + bool needed = false; for_each_partition([&] (Partition const &partition) { - drv_needed |= partition.check_in_progress - || partition.format_in_progress - || partition.file_system.inspected - || partition.relabel_in_progress() - || partition.expand_in_progress(); }); + needed |= partition.check_in_progress + || partition.format_in_progress + || partition.file_system.inspected + || partition.relabel_in_progress() + || partition.expand_in_progress(); }); - return drv_needed || Storage_device::state == UNKNOWN; + return needed || Storage_device::state == UNKNOWN; } /** @@ -89,7 +89,7 @@ struct Sculpt::Usb_storage_device : List_model::Element, * This method is called as response to a failed USB-block-driver * initialization. */ - void discard_usb_block_drv() + void discard_usb_block() { Storage_device::state = FAILED; @@ -116,7 +116,7 @@ struct Sculpt::Usb_storage_device : List_model::Element, _env(env) { } - inline void gen_usb_block_drv_start_content(Xml_generator &xml) const; + inline void gen_usb_block_start_content(Xml_generator &xml) const; void gen_usb_policy(Xml_generator &xml) const { @@ -141,12 +141,12 @@ struct Sculpt::Usb_storage_device : List_model::Element, }; -void Sculpt::Usb_storage_device::gen_usb_block_drv_start_content(Xml_generator &xml) const +void Sculpt::Usb_storage_device::gen_usb_block_start_content(Xml_generator &xml) const { gen_common_start_content(xml, driver, Cap_quota{100}, Ram_quota{6*1024*1024}, Priority::STORAGE); - gen_named_node(xml, "binary", "usb_block_drv"); + gen_named_node(xml, "binary", "usb_block"); xml.node("config", [&] { xml.attribute("report", "yes"); @@ -160,7 +160,7 @@ void Sculpt::Usb_storage_device::gen_usb_block_drv_start_content(Xml_generator & xml.node("child", [&] { xml.attribute("name", "usb"); }); }); - gen_parent_rom_route(xml, "usb_block_drv"); + gen_parent_rom_route(xml, "usb_block"); gen_parent_rom_route(xml, "ld.lib.so"); gen_parent_route (xml); gen_parent_route (xml); diff --git a/repos/gems/src/app/sculpt_manager/storage.cc b/repos/gems/src/app/sculpt_manager/storage.cc index b943aa7adb..ed053b6f11 100644 --- a/repos/gems/src/app/sculpt_manager/storage.cc +++ b/repos/gems/src/app/sculpt_manager/storage.cc @@ -118,9 +118,9 @@ void Storage::gen_runtime_start_nodes(Xml_generator &xml) const _storage_devices.usb_storage_devices.for_each([&] (Usb_storage_device const &device) { - if (device.usb_block_drv_needed() || contains_used_fs(device)) + if (device.usb_block_needed() || contains_used_fs(device)) xml.node("start", [&] { - device.gen_usb_block_drv_start_content(xml); }); + device.gen_usb_block_start_content(xml); }); }); _storage_devices.for_each([&] (Storage_device const &device) { diff --git a/repos/libports/ports/mesa.hash b/repos/libports/ports/mesa.hash index beab7178bf..9a6987c4c7 100644 --- a/repos/libports/ports/mesa.hash +++ b/repos/libports/ports/mesa.hash @@ -1 +1 @@ -1fe844251b05c1622f35383317034ec01bac81c2 +bbd7ef22df1a6c0ec3bc3fcae5342bc3114d4e0b diff --git a/repos/libports/recipes/pkg/mesa_gears/runtime b/repos/libports/recipes/pkg/mesa_gears/runtime index c074d826f1..10ad36f9e2 100644 --- a/repos/libports/recipes/pkg/mesa_gears/runtime +++ b/repos/libports/recipes/pkg/mesa_gears/runtime @@ -4,7 +4,7 @@ - + diff --git a/repos/libports/recipes/pkg/qt5_textedit/runtime b/repos/libports/recipes/pkg/qt5_textedit/runtime index 8c271e1340..3e480d62b8 100644 --- a/repos/libports/recipes/pkg/qt5_textedit/runtime +++ b/repos/libports/recipes/pkg/qt5_textedit/runtime @@ -6,7 +6,7 @@ - + diff --git a/repos/libports/recipes/pkg/sntp_dummy_rtc/archives b/repos/libports/recipes/pkg/sntp_dummy_rtc/archives index 7779e3c196..08cc67e11f 100644 --- a/repos/libports/recipes/pkg/sntp_dummy_rtc/archives +++ b/repos/libports/recipes/pkg/sntp_dummy_rtc/archives @@ -1,5 +1,5 @@ _/raw/sntp_dummy_rtc _/src/sntp_client -_/src/dummy_rtc_drv +_/src/dummy_rtc _/src/report_rom _/src/init diff --git a/repos/libports/recipes/pkg/sntp_dummy_rtc/runtime b/repos/libports/recipes/pkg/sntp_dummy_rtc/runtime index 679ea68619..9974f2351f 100644 --- a/repos/libports/recipes/pkg/sntp_dummy_rtc/runtime +++ b/repos/libports/recipes/pkg/sntp_dummy_rtc/runtime @@ -6,7 +6,7 @@ - + diff --git a/repos/libports/recipes/pkg/system_clock-dummy/archives b/repos/libports/recipes/pkg/system_clock-dummy/archives index 9284eccce8..92249e87b8 100644 --- a/repos/libports/recipes/pkg/system_clock-dummy/archives +++ b/repos/libports/recipes/pkg/system_clock-dummy/archives @@ -1,3 +1,3 @@ _/src/system_rtc -_/src/rtc_drv +_/src/pc_rtc _/src/init diff --git a/repos/libports/recipes/pkg/system_clock-dummy/runtime b/repos/libports/recipes/pkg/system_clock-dummy/runtime index 626ec3c10b..1a99e82846 100644 --- a/repos/libports/recipes/pkg/system_clock-dummy/runtime +++ b/repos/libports/recipes/pkg/system_clock-dummy/runtime @@ -7,7 +7,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/repos/libports/recipes/pkg/system_clock-pc/archives b/repos/libports/recipes/pkg/system_clock-pc/archives index 9284eccce8..92249e87b8 100644 --- a/repos/libports/recipes/pkg/system_clock-pc/archives +++ b/repos/libports/recipes/pkg/system_clock-pc/archives @@ -1,3 +1,3 @@ _/src/system_rtc -_/src/rtc_drv +_/src/pc_rtc _/src/init diff --git a/repos/libports/recipes/pkg/system_clock-pc/runtime b/repos/libports/recipes/pkg/system_clock-pc/runtime index 41bccd5405..2caf7a72d0 100644 --- a/repos/libports/recipes/pkg/system_clock-pc/runtime +++ b/repos/libports/recipes/pkg/system_clock-pc/runtime @@ -7,7 +7,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/repos/libports/recipes/pkg/system_rtc-linux/archives b/repos/libports/recipes/pkg/system_rtc-linux/archives index 08ee878baf..4369b8f88f 100644 --- a/repos/libports/recipes/pkg/system_rtc-linux/archives +++ b/repos/libports/recipes/pkg/system_rtc-linux/archives @@ -1,4 +1,4 @@ -_/src/linux_rtc_drv +_/src/linux_rtc _/src/system_rtc _/src/report_rom _/raw/system_rtc-linux diff --git a/repos/libports/recipes/pkg/system_rtc-pc/archives b/repos/libports/recipes/pkg/system_rtc-pc/archives index fd613f37b3..dc67d6a57b 100644 --- a/repos/libports/recipes/pkg/system_rtc-pc/archives +++ b/repos/libports/recipes/pkg/system_rtc-pc/archives @@ -1,4 +1,4 @@ -_/src/rtc_drv +_/src/pc_rtc _/src/system_rtc _/src/report_rom _/raw/system_rtc-pc diff --git a/repos/libports/recipes/raw/sntp_dummy_rtc/ntp_rtc.config b/repos/libports/recipes/raw/sntp_dummy_rtc/ntp_rtc.config index 8874a5e54b..ef35d7f243 100644 --- a/repos/libports/recipes/raw/sntp_dummy_rtc/ntp_rtc.config +++ b/repos/libports/recipes/raw/sntp_dummy_rtc/ntp_rtc.config @@ -10,7 +10,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/repos/libports/recipes/raw/system_rtc-linux/system_rtc.config b/repos/libports/recipes/raw/system_rtc-linux/system_rtc.config index b9bdcdbd12..678d977cd5 100644 --- a/repos/libports/recipes/raw/system_rtc-linux/system_rtc.config +++ b/repos/libports/recipes/raw/system_rtc-linux/system_rtc.config @@ -18,7 +18,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/repos/libports/recipes/raw/system_rtc-pc/system_rtc.config b/repos/libports/recipes/raw/system_rtc-pc/system_rtc.config index 7d3f526a70..2f70c9281b 100644 --- a/repos/libports/recipes/raw/system_rtc-pc/system_rtc.config +++ b/repos/libports/recipes/raw/system_rtc-pc/system_rtc.config @@ -21,7 +21,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/repos/libports/recipes/src/vesa_drv/content.mk b/repos/libports/recipes/src/vesa_fb/content.mk similarity index 100% rename from repos/libports/recipes/src/vesa_drv/content.mk rename to repos/libports/recipes/src/vesa_fb/content.mk diff --git a/repos/libports/recipes/src/vesa_drv/hash b/repos/libports/recipes/src/vesa_fb/hash similarity index 100% rename from repos/libports/recipes/src/vesa_drv/hash rename to repos/libports/recipes/src/vesa_fb/hash diff --git a/repos/libports/recipes/src/vesa_drv/used_apis b/repos/libports/recipes/src/vesa_fb/used_apis similarity index 100% rename from repos/libports/recipes/src/vesa_drv/used_apis rename to repos/libports/recipes/src/vesa_fb/used_apis diff --git a/repos/libports/run/acpi_suspend.run b/repos/libports/run/acpi_suspend.run index 2c5777535a..f262c31bfc 100644 --- a/repos/libports/run/acpi_suspend.run +++ b/repos/libports/run/acpi_suspend.run @@ -5,9 +5,9 @@ # Main test hardware so far: # - Lenovo X201 - resume of intel/display + AHCI + PS/2 working # - Lenovo T490 - resume of intel/display + NVME + PS/2 working + GPU -# - Qemu - resume happens, vesa_fb_drv fails, ahci fails, nvme fails +# - Qemu - resume happens, vesa_fb fails, ahci fails, nvme fails # -# Not working: vesa_fb_drv nor boot_fb_drv after resume +# Not working: vesa_fb nor boot_fb after resume # Untested: all other drivers, e.g. nic, wifi, sd_card, usb ... all others # # UART via Intel AMT SOL is most the time not working after resume. Using @@ -64,10 +64,10 @@ proc display_config { } { if {$board_non_intel} { return { - - + + @@ -79,8 +79,8 @@ proc display_config { } { } return { - - + + @@ -178,9 +178,9 @@ proc gui_config { } { - - - + + + @@ -206,7 +206,7 @@ proc gui_config { } { proc input_config { } { return { - + @@ -316,7 +316,7 @@ proc ahci_config { } { } append return_ahci { - + @@ -325,7 +325,7 @@ proc ahci_config { } { - + @@ -351,7 +351,7 @@ proc ahci_config { } { - + @@ -372,7 +372,7 @@ proc nvme_config { } { } append return_nvme { - + @@ -380,7 +380,7 @@ proc nvme_config { } { - + @@ -406,7 +406,7 @@ proc nvme_config { } { - + @@ -424,8 +424,8 @@ proc gpu_config { } { set return_gpu "" append return_gpu { - - + + @@ -445,7 +445,7 @@ proc gpu_config { } { - + @@ -488,10 +488,10 @@ proc gpu_client { } { - - - - + + + + @@ -524,7 +524,7 @@ create_boot_directory import_from_depot [depot_user]/src/init \ [depot_user]/src/nitpicker \ - [depot_user]/src/ps2_drv \ + [depot_user]/src/ps2 \ [depot_user]/pkg/themed_wm \ [depot_user]/pkg/terminal \ [depot_user]/src/terminal_log \ @@ -572,15 +572,15 @@ append config { - - - - - + + + + + - + @@ -598,8 +598,8 @@ append config { - - + + @@ -607,18 +607,18 @@ append config { - + - + - - + + @@ -644,17 +644,17 @@ append config { - - + + - - + + - - + + - - + + @@ -703,7 +703,7 @@ append config { - + diff --git a/repos/libports/run/acpica.run b/repos/libports/run/acpica.run index d30326bb28..aae53acaad 100644 --- a/repos/libports/run/acpica.run +++ b/repos/libports/run/acpica.run @@ -22,10 +22,10 @@ create_boot_directory import_from_depot [depot_user]/src/dynamic_rom \ [depot_user]/src/event_filter \ - [depot_user]/src/pc_usb_host_drv \ - [depot_user]/src/ps2_drv \ + [depot_user]/src/pc_usb_host \ + [depot_user]/src/ps2 \ [depot_user]/src/report_rom \ - [depot_user]/src/usb_hid_drv \ + [depot_user]/src/usb_hid \ [depot_user]/src/acpi_event set config { @@ -57,13 +57,13 @@ set config { - - - + + + - + @@ -80,14 +80,14 @@ set config { - + - - + + @@ -96,24 +96,24 @@ set config { - + - + - - + + - + @@ -121,12 +121,12 @@ set config { - + - + @@ -249,7 +249,7 @@ set config { install_config $config -# non PCI devices for platform_drv, e.g. ps2/pit +# non PCI devices for the platform driver, e.g. ps2/pit file copy [select_from_repositories board/[board]/devices] [run_dir]/genode/devices build_boot_image [build_artifacts] diff --git a/repos/libports/run/lwip_lx.run b/repos/libports/run/lwip_lx.run index 0e79111634..ebb71aa53d 100644 --- a/repos/libports/run/lwip_lx.run +++ b/repos/libports/run/lwip_lx.run @@ -61,7 +61,7 @@ install_config { - + @@ -82,7 +82,7 @@ install_config { - + diff --git a/repos/libports/run/oss.run b/repos/libports/run/oss.run index 3ec8a07566..93849e4224 100644 --- a/repos/libports/run/oss.run +++ b/repos/libports/run/oss.run @@ -44,12 +44,12 @@ install_config { - - + + - + @@ -66,7 +66,7 @@ install_config { - + @@ -77,12 +77,12 @@ install_config { - + - - + + @@ -109,8 +109,8 @@ install_config { - - + + diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run index 7cb13d5ba8..07127ae942 100644 --- a/repos/libports/run/qt5.run +++ b/repos/libports/run/qt5.run @@ -68,7 +68,7 @@ install_config { - + diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run index 3d1bb097dd..4583155340 100644 --- a/repos/libports/run/qt5_calculatorform.run +++ b/repos/libports/run/qt5_calculatorform.run @@ -32,7 +32,7 @@ install_config { - + diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc index bb599d70d2..cc8cda7f3e 100644 --- a/repos/libports/run/qt5_common.inc +++ b/repos/libports/run/qt5_common.inc @@ -238,10 +238,10 @@ proc qt5_start_nodes { } { - - - - + + + + diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run index c01820a5b1..70a5ada821 100644 --- a/repos/libports/run/qt5_openglwindow.run +++ b/repos/libports/run/qt5_openglwindow.run @@ -20,7 +20,7 @@ install_config { - + diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run index cfb2269a59..c3daf9def6 100644 --- a/repos/libports/run/qt5_quicktest.run +++ b/repos/libports/run/qt5_quicktest.run @@ -34,7 +34,7 @@ install_config { - + diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run index 389201069e..04f59d1f93 100644 --- a/repos/libports/run/qt5_samegame.run +++ b/repos/libports/run/qt5_samegame.run @@ -37,7 +37,7 @@ install_config { - + diff --git a/repos/libports/run/qt5_testqstring.run b/repos/libports/run/qt5_testqstring.run index f4c7120090..c23802e376 100644 --- a/repos/libports/run/qt5_testqstring.run +++ b/repos/libports/run/qt5_testqstring.run @@ -32,7 +32,7 @@ install_config { - + diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run index c7c0bd9dbc..c48fad9834 100644 --- a/repos/libports/run/qt5_tetrix.run +++ b/repos/libports/run/qt5_tetrix.run @@ -32,7 +32,7 @@ install_config { - + diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index 758d7d5d72..80f437ecdf 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -43,7 +43,7 @@ install_config { - + @@ -68,7 +68,7 @@ install_config { - + diff --git a/repos/libports/run/qt5_tooltips.run b/repos/libports/run/qt5_tooltips.run index a03d432468..07cee9749c 100644 --- a/repos/libports/run/qt5_tooltips.run +++ b/repos/libports/run/qt5_tooltips.run @@ -32,7 +32,7 @@ install_config { - + diff --git a/repos/libports/run/qt5_virtualkeyboard.run b/repos/libports/run/qt5_virtualkeyboard.run index b6a5a74ce6..9010d498ef 100644 --- a/repos/libports/run/qt5_virtualkeyboard.run +++ b/repos/libports/run/qt5_virtualkeyboard.run @@ -41,7 +41,7 @@ install_config { - + diff --git a/repos/libports/run/smartcard.run b/repos/libports/run/smartcard.run index 2ae2661d1f..191ea4481b 100644 --- a/repos/libports/run/smartcard.run +++ b/repos/libports/run/smartcard.run @@ -24,7 +24,7 @@ proc smartcard_product_id {} { return "0x5116" } create_boot_directory import_from_depot [depot_user]/src/[base_src] \ - [depot_user]/pkg/test_usb_host_drv-[board] \ + [depot_user]/pkg/test_usb_host-[board] \ [depot_user]/src/report_rom \ [depot_user]/src/init build { @@ -58,14 +58,14 @@ install_config { - + - + @@ -108,7 +108,7 @@ append usb_config { } -set fd [open [run_dir]/genode/usb_host_drv.config w] +set fd [open [run_dir]/genode/usb_host.config w] puts $fd $usb_config close $fd diff --git a/repos/libports/run/webcam.inc b/repos/libports/run/webcam.inc index 7f067e53f9..53f312642e 100644 --- a/repos/libports/run/webcam.inc +++ b/repos/libports/run/webcam.inc @@ -21,16 +21,16 @@ create_boot_directory import_from_depot [depot_user]/src/[base_src] \ [depot_user]/pkg/usb_webcam \ - [depot_user]/src/acpi_drv \ + [depot_user]/src/acpi \ [depot_user]/src/dynamic_rom \ [depot_user]/src/init \ [depot_user]/src/nitpicker \ - [depot_user]/src/pc_usb_host_drv \ + [depot_user]/src/pc_usb_host \ [depot_user]/src/pci_decode \ - [depot_user]/src/platform_drv \ + [depot_user]/src/platform \ [depot_user]/src/report_rom \ [depot_user]/src/rom_reporter \ - [depot_user]/src/vesa_drv + [depot_user]/src/vesa_fb import_from_depot $test_imports @@ -64,12 +64,12 @@ append config { - - + + - + @@ -86,7 +86,7 @@ append config { - + @@ -97,13 +97,13 @@ append config { - - + + - - + + @@ -117,8 +117,8 @@ append config { - - + + @@ -205,7 +205,7 @@ append config { - + diff --git a/repos/libports/src/app/acpica/README b/repos/libports/src/app/acpica/README index 9637bcde6d..c801e3219b 100644 --- a/repos/libports/src/app/acpica/README +++ b/repos/libports/src/app/acpica/README @@ -58,7 +58,7 @@ Excerpt of important parts of the acpica configuration ! ! ! -! +! ! ... ! ! diff --git a/repos/libports/src/drivers/framebuffer/vesa/target.mk b/repos/libports/src/drivers/framebuffer/vesa/target.mk index bdc6bdbe69..0433d2a149 100644 --- a/repos/libports/src/drivers/framebuffer/vesa/target.mk +++ b/repos/libports/src/drivers/framebuffer/vesa/target.mk @@ -1,4 +1,4 @@ -TARGET = vesa_fb_drv +TARGET = vesa_fb REQUIRES = x86 SRC_CC = main.cc framebuffer.cc ifx86emu.cc hw_emul.cc LIBS = base blit x86emu format diff --git a/repos/libports/src/lib/libdrm/ioctl_iris.cc b/repos/libports/src/lib/libdrm/ioctl_iris.cc index e96fda31c3..ca68a1728a 100644 --- a/repos/libports/src/lib/libdrm/ioctl_iris.cc +++ b/repos/libports/src/lib/libdrm/ioctl_iris.cc @@ -361,7 +361,7 @@ struct Drm::Buffer /* * Used to implement OpenGL contexts. Each context uses a dedictated GPU * session which provides a separate GPU context (e.g., page tables, exec - * lists, ...) within the intel_gpu_drv. + * lists, ...) within the intel_gpu driver. */ struct Drm::Context { diff --git a/repos/libports/src/lib/mesa/egl/platform.c b/repos/libports/src/lib/mesa/egl/platform.c index 63b5075156..a11df28fdd 100644 --- a/repos/libports/src/lib/mesa/egl/platform.c +++ b/repos/libports/src/lib/mesa/egl/platform.c @@ -163,8 +163,8 @@ EGLBoolean dri2_initialize_genode(_EGLDisplay *disp) { void *handle; - if (!(handle = dlopen("mesa_gpu_drv.lib.so", 0))) { - printf("Error: could not open EGL back end driver ('mesa_gpu_drv.lib.so')\n"); + if (!(handle = dlopen("mesa_gpu.lib.so", 0))) { + printf("Error: could not open EGL back end driver ('mesa_gpu.lib.so')\n"); return EGL_FALSE; } diff --git a/repos/libports/src/lib/mesa/patches/dri2.patch b/repos/libports/src/lib/mesa/patches/dri2.patch index eaffd33809..8e5030410d 100644 --- a/repos/libports/src/lib/mesa/patches/dri2.patch +++ b/repos/libports/src/lib/mesa/patches/dri2.patch @@ -9,7 +9,7 @@ index ad68f3b..fdd0936 100644 - whandle.type = WINSYS_HANDLE_TYPE_SHARED; + /* + * Change from SHARED to FD because we abuse etna_screen_create -+ * to allocate the BO but the imx8q_gpu_drv is rendernode only. ++ * to allocate the BO but the imx8q_gpu driver is rendernode only. + */ + whandle.type = WINSYS_HANDLE_TYPE_FD; else diff --git a/repos/libports/src/lib/mesa/patches/mesa.patch b/repos/libports/src/lib/mesa/patches/mesa.patch index b6ab66ec8e..6bd0224c6a 100644 --- a/repos/libports/src/lib/mesa/patches/mesa.patch +++ b/repos/libports/src/lib/mesa/patches/mesa.patch @@ -87,7 +87,7 @@ index 19c456c..bf90afe 100644 len = next - p; - snprintf(path, sizeof(path), "%.*s/tls/%s%s.so", len, - p, driver_name, lib_suffix); -+ snprintf(path, sizeof(path), "%.*s/mesa_gpu_drv.lib.so", len, p); ++ snprintf(path, sizeof(path), "%.*s/mesa_gpu.lib.so", len, p); driver = dlopen(path, RTLD_NOW | RTLD_GLOBAL); if (driver == NULL) { snprintf(path, sizeof(path), "%.*s/%s%s.so", len, diff --git a/repos/os/recipes/pkg/drivers_interactive-pbxa9/archives b/repos/os/recipes/pkg/drivers_interactive-pbxa9/archives index 8d16d4080d..c4b618c011 100644 --- a/repos/os/recipes/pkg/drivers_interactive-pbxa9/archives +++ b/repos/os/recipes/pkg/drivers_interactive-pbxa9/archives @@ -1,5 +1,5 @@ _/src/pbxa9_drivers -_/src/platform_drv +_/src/platform _/src/event_filter _/raw/drivers_interactive-pbxa9 _/raw/pbxa9-devices diff --git a/repos/os/recipes/pkg/drivers_interactive-pc/archives b/repos/os/recipes/pkg/drivers_interactive-pc/archives index 8d02ed1cd6..db8a6c9c72 100644 --- a/repos/os/recipes/pkg/drivers_interactive-pc/archives +++ b/repos/os/recipes/pkg/drivers_interactive-pc/archives @@ -1,9 +1,9 @@ -_/src/platform_drv -_/src/acpi_drv -_/src/ps2_drv -_/src/pc_usb_host_drv -_/src/usb_hid_drv -_/src/vesa_drv +_/src/platform +_/src/acpi +_/src/ps2 +_/src/pc_usb_host +_/src/usb_hid +_/src/vesa_fb _/src/report_rom _/src/rom_filter _/src/event_filter diff --git a/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v7a/archives b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v7a/archives index bb1b5d8f0f..55bf47e354 100644 --- a/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v7a/archives +++ b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v7a/archives @@ -1,6 +1,6 @@ -_/src/virtio_fb_drv -_/src/virtio_input_drv -_/src/platform_drv +_/src/virtio_fb +_/src/virtio_input +_/src/platform _/src/event_filter _/src/virtdev_rom _/raw/drivers_interactive-virt_qemu_arm diff --git a/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/archives b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/archives index bb1b5d8f0f..55bf47e354 100644 --- a/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/archives +++ b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/archives @@ -1,6 +1,6 @@ -_/src/virtio_fb_drv -_/src/virtio_input_drv -_/src/platform_drv +_/src/virtio_fb +_/src/virtio_input +_/src/platform _/src/event_filter _/src/virtdev_rom _/raw/drivers_interactive-virt_qemu_arm diff --git a/repos/os/recipes/pkg/drivers_nic-linux/archives b/repos/os/recipes/pkg/drivers_nic-linux/archives index 7f21e908f0..4ea9cf6998 100644 --- a/repos/os/recipes/pkg/drivers_nic-linux/archives +++ b/repos/os/recipes/pkg/drivers_nic-linux/archives @@ -1,2 +1,2 @@ -_/src/linux_nic_drv +_/src/linux_nic _/raw/drivers_nic-linux diff --git a/repos/os/recipes/pkg/drivers_nic-pbxa9/archives b/repos/os/recipes/pkg/drivers_nic-pbxa9/archives index 17a890723c..ee76fc2f81 100644 --- a/repos/os/recipes/pkg/drivers_nic-pbxa9/archives +++ b/repos/os/recipes/pkg/drivers_nic-pbxa9/archives @@ -1,4 +1,4 @@ -_/src/lan9118_nic_drv -_/src/platform_drv +_/src/lan9118_nic +_/src/platform _/raw/drivers_nic-pbxa9 _/raw/pbxa9-devices diff --git a/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v7a/archives b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v7a/archives index c947c8bdc9..0fbf87a9bf 100644 --- a/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v7a/archives +++ b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v7a/archives @@ -1,4 +1,4 @@ _/raw/drivers_nic-virt_qemu_arm _/src/virtdev_rom -_/src/platform_drv -_/src/virtio_nic_drv +_/src/platform +_/src/virtio_nic diff --git a/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/archives b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/archives index c947c8bdc9..0fbf87a9bf 100644 --- a/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/archives +++ b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/archives @@ -1,4 +1,4 @@ _/raw/drivers_nic-virt_qemu_arm _/src/virtdev_rom -_/src/platform_drv -_/src/virtio_nic_drv +_/src/platform +_/src/virtio_nic diff --git a/repos/os/recipes/pkg/test-rtc/archives b/repos/os/recipes/pkg/test-rtc/archives index 1205556cfa..787cafa072 100644 --- a/repos/os/recipes/pkg/test-rtc/archives +++ b/repos/os/recipes/pkg/test-rtc/archives @@ -1,3 +1,3 @@ _/src/init -_/src/rtc_drv +_/src/pc_rtc _/src/test-rtc diff --git a/repos/os/recipes/pkg/test-rtc/runtime b/repos/os/recipes/pkg/test-rtc/runtime index 516b834755..bfffef5b51 100644 --- a/repos/os/recipes/pkg/test-rtc/runtime +++ b/repos/os/recipes/pkg/test-rtc/runtime @@ -8,7 +8,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config b/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config index 41bb675b91..8f0ebc50db 100644 --- a/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config @@ -13,28 +13,28 @@ - + - + - + - - + + - + @@ -45,12 +45,12 @@ - - + + - + diff --git a/repos/os/recipes/raw/drivers_interactive-pc/content.mk b/repos/os/recipes/raw/drivers_interactive-pc/content.mk index 6a6fac4af4..ac40023793 100644 --- a/repos/os/recipes/raw/drivers_interactive-pc/content.mk +++ b/repos/os/recipes/raw/drivers_interactive-pc/content.mk @@ -1,6 +1,6 @@ -content: drivers.config fb_drv.config event_filter.config en_us.chargen special.chargen +content: drivers.config fb.config event_filter.config en_us.chargen special.chargen -drivers.config fb_drv.config event_filter.config: +drivers.config fb.config event_filter.config: cp $(REP_DIR)/recipes/raw/drivers_interactive-pc/$@ $@ en_us.chargen special.chargen: diff --git a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config index 4e364e590a..d2f7463ea9 100644 --- a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config @@ -16,7 +16,7 @@ - + @@ -36,9 +36,9 @@ - - - + + + @@ -62,7 +62,7 @@ - + @@ -81,18 +81,18 @@ - - - + + + - - + + - - + + @@ -104,11 +104,11 @@ - + - + @@ -118,16 +118,16 @@ - - + + - + - + @@ -138,7 +138,7 @@ - + @@ -149,7 +149,7 @@ - + diff --git a/repos/os/recipes/raw/drivers_interactive-pc/fb_drv.config b/repos/os/recipes/raw/drivers_interactive-pc/fb.config similarity index 100% rename from repos/os/recipes/raw/drivers_interactive-pc/fb_drv.config rename to repos/os/recipes/raw/drivers_interactive-pc/fb.config diff --git a/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/drivers.config b/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/drivers.config index 125579c6d2..0f43fc05c0 100644 --- a/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/drivers.config @@ -19,7 +19,7 @@ - + @@ -29,13 +29,13 @@ - + - + - + @@ -57,12 +57,12 @@ - - + + - + @@ -71,12 +71,12 @@ - - + + - + @@ -85,11 +85,11 @@ - - + + - + diff --git a/repos/os/recipes/raw/drivers_nic-linux/drivers.config b/repos/os/recipes/raw/drivers_nic-linux/drivers.config index 52b60259ba..3796211bc2 100644 --- a/repos/os/recipes/raw/drivers_nic-linux/drivers.config +++ b/repos/os/recipes/raw/drivers_nic-linux/drivers.config @@ -13,8 +13,8 @@ - - + + diff --git a/repos/os/recipes/raw/drivers_nic-pbxa9/drivers.config b/repos/os/recipes/raw/drivers_nic-pbxa9/drivers.config index ea3fcb2fb3..c3c69df9b5 100644 --- a/repos/os/recipes/raw/drivers_nic-pbxa9/drivers.config +++ b/repos/os/recipes/raw/drivers_nic-pbxa9/drivers.config @@ -13,23 +13,23 @@ - + - + - - + + - + diff --git a/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/drivers.config b/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/drivers.config index 5c9d0f1d2d..134381a173 100644 --- a/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/drivers.config +++ b/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/drivers.config @@ -19,7 +19,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/repos/os/recipes/src/acpi_drv/content.mk b/repos/os/recipes/src/acpi/content.mk similarity index 100% rename from repos/os/recipes/src/acpi_drv/content.mk rename to repos/os/recipes/src/acpi/content.mk diff --git a/repos/os/recipes/src/acpi_drv/hash b/repos/os/recipes/src/acpi/hash similarity index 100% rename from repos/os/recipes/src/acpi_drv/hash rename to repos/os/recipes/src/acpi/hash diff --git a/repos/os/recipes/src/acpi_drv/used_apis b/repos/os/recipes/src/acpi/used_apis similarity index 100% rename from repos/os/recipes/src/acpi_drv/used_apis rename to repos/os/recipes/src/acpi/used_apis diff --git a/repos/os/recipes/src/ahci_drv/content.mk b/repos/os/recipes/src/ahci/content.mk similarity index 100% rename from repos/os/recipes/src/ahci_drv/content.mk rename to repos/os/recipes/src/ahci/content.mk diff --git a/repos/os/recipes/src/ahci_drv/hash b/repos/os/recipes/src/ahci/hash similarity index 100% rename from repos/os/recipes/src/ahci_drv/hash rename to repos/os/recipes/src/ahci/hash diff --git a/repos/os/recipes/src/ahci_drv/used_apis b/repos/os/recipes/src/ahci/used_apis similarity index 100% rename from repos/os/recipes/src/ahci_drv/used_apis rename to repos/os/recipes/src/ahci/used_apis diff --git a/repos/os/recipes/src/boot_fb_drv/content.mk b/repos/os/recipes/src/boot_fb/content.mk similarity index 100% rename from repos/os/recipes/src/boot_fb_drv/content.mk rename to repos/os/recipes/src/boot_fb/content.mk diff --git a/repos/os/recipes/src/boot_fb_drv/hash b/repos/os/recipes/src/boot_fb/hash similarity index 100% rename from repos/os/recipes/src/boot_fb_drv/hash rename to repos/os/recipes/src/boot_fb/hash diff --git a/repos/os/recipes/src/boot_fb_drv/used_apis b/repos/os/recipes/src/boot_fb/used_apis similarity index 100% rename from repos/os/recipes/src/boot_fb_drv/used_apis rename to repos/os/recipes/src/boot_fb/used_apis diff --git a/repos/os/recipes/src/dummy_rtc_drv/content.mk b/repos/os/recipes/src/dummy_rtc/content.mk similarity index 100% rename from repos/os/recipes/src/dummy_rtc_drv/content.mk rename to repos/os/recipes/src/dummy_rtc/content.mk diff --git a/repos/os/recipes/src/dummy_rtc_drv/hash b/repos/os/recipes/src/dummy_rtc/hash similarity index 100% rename from repos/os/recipes/src/dummy_rtc_drv/hash rename to repos/os/recipes/src/dummy_rtc/hash diff --git a/repos/os/recipes/src/dummy_rtc_drv/used_apis b/repos/os/recipes/src/dummy_rtc/used_apis similarity index 100% rename from repos/os/recipes/src/dummy_rtc_drv/used_apis rename to repos/os/recipes/src/dummy_rtc/used_apis diff --git a/repos/os/recipes/src/intel_gpu_drv/content.mk b/repos/os/recipes/src/intel_gpu/content.mk similarity index 100% rename from repos/os/recipes/src/intel_gpu_drv/content.mk rename to repos/os/recipes/src/intel_gpu/content.mk diff --git a/repos/os/recipes/src/intel_gpu_drv/hash b/repos/os/recipes/src/intel_gpu/hash similarity index 100% rename from repos/os/recipes/src/intel_gpu_drv/hash rename to repos/os/recipes/src/intel_gpu/hash diff --git a/repos/os/recipes/src/intel_gpu_drv/used_apis b/repos/os/recipes/src/intel_gpu/used_apis similarity index 100% rename from repos/os/recipes/src/intel_gpu_drv/used_apis rename to repos/os/recipes/src/intel_gpu/used_apis diff --git a/repos/os/recipes/src/lan9118_nic_drv/content.mk b/repos/os/recipes/src/lan9118_nic/content.mk similarity index 100% rename from repos/os/recipes/src/lan9118_nic_drv/content.mk rename to repos/os/recipes/src/lan9118_nic/content.mk diff --git a/repos/os/recipes/src/lan9118_nic_drv/hash b/repos/os/recipes/src/lan9118_nic/hash similarity index 100% rename from repos/os/recipes/src/lan9118_nic_drv/hash rename to repos/os/recipes/src/lan9118_nic/hash diff --git a/repos/os/recipes/src/lan9118_nic_drv/used_apis b/repos/os/recipes/src/lan9118_nic/used_apis similarity index 100% rename from repos/os/recipes/src/lan9118_nic_drv/used_apis rename to repos/os/recipes/src/lan9118_nic/used_apis diff --git a/repos/os/recipes/src/linux_nic_drv/content.mk b/repos/os/recipes/src/linux_nic/content.mk similarity index 100% rename from repos/os/recipes/src/linux_nic_drv/content.mk rename to repos/os/recipes/src/linux_nic/content.mk diff --git a/repos/os/recipes/src/linux_nic_drv/hash b/repos/os/recipes/src/linux_nic/hash similarity index 100% rename from repos/os/recipes/src/linux_nic_drv/hash rename to repos/os/recipes/src/linux_nic/hash diff --git a/repos/os/recipes/src/linux_nic_drv/used_apis b/repos/os/recipes/src/linux_nic/used_apis similarity index 100% rename from repos/os/recipes/src/linux_nic_drv/used_apis rename to repos/os/recipes/src/linux_nic/used_apis diff --git a/repos/os/recipes/src/linux_rtc_drv/content.mk b/repos/os/recipes/src/linux_rtc/content.mk similarity index 100% rename from repos/os/recipes/src/linux_rtc_drv/content.mk rename to repos/os/recipes/src/linux_rtc/content.mk diff --git a/repos/os/recipes/src/linux_rtc_drv/hash b/repos/os/recipes/src/linux_rtc/hash similarity index 100% rename from repos/os/recipes/src/linux_rtc_drv/hash rename to repos/os/recipes/src/linux_rtc/hash diff --git a/repos/os/recipes/src/linux_rtc_drv/used_apis b/repos/os/recipes/src/linux_rtc/used_apis similarity index 100% rename from repos/os/recipes/src/linux_rtc_drv/used_apis rename to repos/os/recipes/src/linux_rtc/used_apis diff --git a/repos/os/recipes/src/nvme_drv/content.mk b/repos/os/recipes/src/nvme/content.mk similarity index 100% rename from repos/os/recipes/src/nvme_drv/content.mk rename to repos/os/recipes/src/nvme/content.mk diff --git a/repos/os/recipes/src/nvme_drv/hash b/repos/os/recipes/src/nvme/hash similarity index 100% rename from repos/os/recipes/src/nvme_drv/hash rename to repos/os/recipes/src/nvme/hash diff --git a/repos/os/recipes/src/nvme_drv/used_apis b/repos/os/recipes/src/nvme/used_apis similarity index 100% rename from repos/os/recipes/src/nvme_drv/used_apis rename to repos/os/recipes/src/nvme/used_apis diff --git a/repos/os/recipes/src/rtc_drv/content.mk b/repos/os/recipes/src/pc_rtc/content.mk similarity index 100% rename from repos/os/recipes/src/rtc_drv/content.mk rename to repos/os/recipes/src/pc_rtc/content.mk diff --git a/repos/os/recipes/src/rtc_drv/hash b/repos/os/recipes/src/pc_rtc/hash similarity index 100% rename from repos/os/recipes/src/rtc_drv/hash rename to repos/os/recipes/src/pc_rtc/hash diff --git a/repos/os/recipes/src/rtc_drv/used_apis b/repos/os/recipes/src/pc_rtc/used_apis similarity index 100% rename from repos/os/recipes/src/rtc_drv/used_apis rename to repos/os/recipes/src/pc_rtc/used_apis diff --git a/repos/os/recipes/src/platform_drv/content.inc b/repos/os/recipes/src/platform/content.inc similarity index 100% rename from repos/os/recipes/src/platform_drv/content.inc rename to repos/os/recipes/src/platform/content.inc diff --git a/repos/os/recipes/src/platform/content.mk b/repos/os/recipes/src/platform/content.mk new file mode 100644 index 0000000000..79c59d53c1 --- /dev/null +++ b/repos/os/recipes/src/platform/content.mk @@ -0,0 +1,2 @@ +SRC_DIR = src/drivers/platform +include $(GENODE_DIR)/repos/os/recipes/src/platform/content.inc diff --git a/repos/os/recipes/src/platform_drv/hash b/repos/os/recipes/src/platform/hash similarity index 100% rename from repos/os/recipes/src/platform_drv/hash rename to repos/os/recipes/src/platform/hash diff --git a/repos/os/recipes/src/platform_drv/used_apis b/repos/os/recipes/src/platform/used_apis similarity index 100% rename from repos/os/recipes/src/platform_drv/used_apis rename to repos/os/recipes/src/platform/used_apis diff --git a/repos/os/recipes/src/platform_drv/content.mk b/repos/os/recipes/src/platform_drv/content.mk deleted file mode 100644 index e4d3e7b810..0000000000 --- a/repos/os/recipes/src/platform_drv/content.mk +++ /dev/null @@ -1,2 +0,0 @@ -SRC_DIR = src/drivers/platform -include $(GENODE_DIR)/repos/os/recipes/src/platform_drv/content.inc diff --git a/repos/os/recipes/src/ps2_drv/content.mk b/repos/os/recipes/src/ps2/content.mk similarity index 100% rename from repos/os/recipes/src/ps2_drv/content.mk rename to repos/os/recipes/src/ps2/content.mk diff --git a/repos/os/recipes/src/ps2_drv/hash b/repos/os/recipes/src/ps2/hash similarity index 100% rename from repos/os/recipes/src/ps2_drv/hash rename to repos/os/recipes/src/ps2/hash diff --git a/repos/os/recipes/src/ps2_drv/used_apis b/repos/os/recipes/src/ps2/used_apis similarity index 100% rename from repos/os/recipes/src/ps2_drv/used_apis rename to repos/os/recipes/src/ps2/used_apis diff --git a/repos/os/recipes/src/usb_block_drv/content.mk b/repos/os/recipes/src/usb_block/content.mk similarity index 100% rename from repos/os/recipes/src/usb_block_drv/content.mk rename to repos/os/recipes/src/usb_block/content.mk diff --git a/repos/os/recipes/src/usb_block_drv/hash b/repos/os/recipes/src/usb_block/hash similarity index 100% rename from repos/os/recipes/src/usb_block_drv/hash rename to repos/os/recipes/src/usb_block/hash diff --git a/repos/os/recipes/src/usb_block_drv/used_apis b/repos/os/recipes/src/usb_block/used_apis similarity index 100% rename from repos/os/recipes/src/usb_block_drv/used_apis rename to repos/os/recipes/src/usb_block/used_apis diff --git a/repos/os/recipes/src/virtio_fb_drv/content.mk b/repos/os/recipes/src/virtio_fb/content.mk similarity index 100% rename from repos/os/recipes/src/virtio_fb_drv/content.mk rename to repos/os/recipes/src/virtio_fb/content.mk diff --git a/repos/os/recipes/src/virtio_fb_drv/hash b/repos/os/recipes/src/virtio_fb/hash similarity index 100% rename from repos/os/recipes/src/virtio_fb_drv/hash rename to repos/os/recipes/src/virtio_fb/hash diff --git a/repos/os/recipes/src/virtio_fb_drv/used_apis b/repos/os/recipes/src/virtio_fb/used_apis similarity index 100% rename from repos/os/recipes/src/virtio_fb_drv/used_apis rename to repos/os/recipes/src/virtio_fb/used_apis diff --git a/repos/os/recipes/src/virtio_input_drv/content.mk b/repos/os/recipes/src/virtio_input/content.mk similarity index 100% rename from repos/os/recipes/src/virtio_input_drv/content.mk rename to repos/os/recipes/src/virtio_input/content.mk diff --git a/repos/os/recipes/src/virtio_input_drv/hash b/repos/os/recipes/src/virtio_input/hash similarity index 100% rename from repos/os/recipes/src/virtio_input_drv/hash rename to repos/os/recipes/src/virtio_input/hash diff --git a/repos/os/recipes/src/virtio_input_drv/used_apis b/repos/os/recipes/src/virtio_input/used_apis similarity index 100% rename from repos/os/recipes/src/virtio_input_drv/used_apis rename to repos/os/recipes/src/virtio_input/used_apis diff --git a/repos/os/recipes/src/virtio_nic_drv/content.mk b/repos/os/recipes/src/virtio_nic/content.mk similarity index 100% rename from repos/os/recipes/src/virtio_nic_drv/content.mk rename to repos/os/recipes/src/virtio_nic/content.mk diff --git a/repos/os/recipes/src/virtio_nic_drv/hash b/repos/os/recipes/src/virtio_nic/hash similarity index 100% rename from repos/os/recipes/src/virtio_nic_drv/hash rename to repos/os/recipes/src/virtio_nic/hash diff --git a/repos/os/recipes/src/virtio_nic_drv/used_apis b/repos/os/recipes/src/virtio_nic/used_apis similarity index 100% rename from repos/os/recipes/src/virtio_nic_drv/used_apis rename to repos/os/recipes/src/virtio_nic/used_apis diff --git a/repos/os/run/ahci_block.run b/repos/os/run/ahci_block.run index 8616c5af84..71917767c0 100644 --- a/repos/os/run/ahci_block.run +++ b/repos/os/run/ahci_block.run @@ -45,12 +45,12 @@ install_config { - - + + - + @@ -77,7 +77,7 @@ install_config { - + @@ -96,7 +96,7 @@ install_config { - + @@ -107,7 +107,7 @@ install_config { - + @@ -131,7 +131,7 @@ install_config { - + @@ -145,7 +145,7 @@ install_config { - + diff --git a/repos/os/run/block_tester.run b/repos/os/run/block_tester.run index 6f0ee14092..e7e2fe27a4 100644 --- a/repos/os/run/block_tester.run +++ b/repos/os/run/block_tester.run @@ -124,7 +124,7 @@ install_config { - + @@ -208,7 +208,7 @@ install_config { - + diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run index 449ef3c139..2d4368dd5c 100644 --- a/repos/os/run/demo.run +++ b/repos/os/run/demo.run @@ -223,10 +223,10 @@ if {[get_cmd_switch --autopilot]} { grep_output {(requests resources: )|(Error)} # remove Error messages which are not fatal, mostly - unify_output {(?n)^.*platform_drv] Error:.*ACPI table information is wrong.*$} "" - unify_output {(?n)^.*platform_drv] Error: adjust size from.*$} "" - unify_output {(?n)^.*ps2_drv] Error: no data available.*$} "" - unify_output {(?n)^.*ps2_drv] Error: failed to read from port.*$} "" + unify_output {(?n)^.*platform] Error:.*ACPI table information is wrong.*$} "" + unify_output {(?n)^.*platform] Error: adjust size from.*$} "" + unify_output {(?n)^.*ps2] Error: no data available.*$} "" + unify_output {(?n)^.*ps2] Error: failed to read from port.*$} "" unify_output {(?n)^.*] Error: RAM preservation exceeds available memory.*$} "" compare_output_to {} diff --git a/repos/os/run/event_filter.run b/repos/os/run/event_filter.run index f7123b1c02..7c1874727d 100644 --- a/repos/os/run/event_filter.run +++ b/repos/os/run/event_filter.run @@ -14,7 +14,7 @@ proc test_step_char_repeat { } { # the legacy PIT timer driver is too inaccurate to produce stable results # for the character-repeat test - if {[binary_name_timer] == "pit_timer_drv"} { + if {[binary_name_timer] == "pit_timer"} { return { } } return { diff --git a/repos/os/run/i2c_mcp9808.run b/repos/os/run/i2c_mcp9808.run index caa95845b4..495c841bae 100644 --- a/repos/os/run/i2c_mcp9808.run +++ b/repos/os/run/i2c_mcp9808.run @@ -4,7 +4,7 @@ create_boot_directory import_from_depot [depot_user]/src/[base_src] import_from_depot [depot_user]/src/init -import_from_depot [depot_user]/src/platform_drv +import_from_depot [depot_user]/src/platform build { core @@ -36,8 +36,8 @@ install_config { - - + + @@ -45,12 +45,12 @@ install_config { - + - + @@ -68,7 +68,7 @@ install_config { - + diff --git a/repos/os/run/mixer.run b/repos/os/run/mixer.run index f239a43192..ac5388f8f0 100644 --- a/repos/os/run/mixer.run +++ b/repos/os/run/mixer.run @@ -45,13 +45,13 @@ install_config { - - + + - + @@ -78,7 +78,7 @@ install_config { - + @@ -95,12 +95,12 @@ install_config { - + - - + + @@ -166,7 +166,7 @@ install_config { - + diff --git a/repos/os/run/monitor_gdb.inc b/repos/os/run/monitor_gdb.inc index 6a81a7c0c2..58eb170a89 100644 --- a/repos/os/run/monitor_gdb.inc +++ b/repos/os/run/monitor_gdb.inc @@ -65,7 +65,7 @@ if { [have_include power_on/qemu] } { append_if [have_board pc] config { - + @@ -79,7 +79,7 @@ if { [have_include power_on/qemu] } { append_if [have_board rpi3] config { - + diff --git a/repos/os/run/nvme.run b/repos/os/run/nvme.run index a25e824a70..cf39c1474e 100644 --- a/repos/os/run/nvme.run +++ b/repos/os/run/nvme.run @@ -96,12 +96,12 @@ append config { - - + + - + @@ -128,7 +128,7 @@ append config { - + @@ -147,23 +147,23 @@ append config { - + - + - - - - - - + + + + + + @@ -235,7 +235,7 @@ append config { - + diff --git a/repos/os/run/platform.run b/repos/os/run/platform.run new file mode 100644 index 0000000000..123798aa64 --- /dev/null +++ b/repos/os/run/platform.run @@ -0,0 +1,177 @@ +if { ![have_board pbxa9] } { + puts "Platform is unsupported." + exit 0 +} + +create_boot_directory + +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/src/init \ + [depot_user]/src/fs_report \ + [depot_user]/src/fs_rom \ + [depot_user]/src/platform \ + [depot_user]/src/report_rom \ + [depot_user]/src/vfs_import \ + [depot_user]/src/vfs + +build { test/platform } + +install_config { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +} + + +build_boot_image [build_artifacts] + +append qemu_args "-nographic " + +set good_string { +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] +[init -> test-platform] Found next valid device of dummy type +[init -> test-platform] Test has ended! +} + +run_genode_until "Test has ended!.*\n" 100 +grep_output "init -> test-platform" +compare_output_to $good_string diff --git a/repos/os/run/platform_drv.run b/repos/os/run/platform_drv.run deleted file mode 100644 index 5bd225b2a4..0000000000 --- a/repos/os/run/platform_drv.run +++ /dev/null @@ -1,177 +0,0 @@ -if { ![have_board pbxa9] } { - puts "Platform is unsupported." - exit 0 -} - -create_boot_directory - -import_from_depot [depot_user]/src/[base_src] \ - [depot_user]/src/init \ - [depot_user]/src/fs_report \ - [depot_user]/src/fs_rom \ - [depot_user]/src/platform_drv \ - [depot_user]/src/report_rom \ - [depot_user]/src/vfs_import \ - [depot_user]/src/vfs - -build { test/platform_drv } - -install_config { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -} - - -build_boot_image [build_artifacts] - -append qemu_args "-nographic " - -set good_string { -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] -[init -> test-platform_drv] Found next valid device of dummy type -[init -> test-platform_drv] Test has ended! -} - -run_genode_until "Test has ended!.*\n" 100 -grep_output "init -> test-platform_drv" -compare_output_to $good_string diff --git a/repos/os/run/rtc.run b/repos/os/run/rtc.run index 2e330325fc..c2ecab056f 100644 --- a/repos/os/run/rtc.run +++ b/repos/os/run/rtc.run @@ -4,10 +4,10 @@ create_boot_directory proc rtc_src { } { - if {[have_board linux]} { return "linux_rtc_drv" } - if {[have_board pc]} { return "rtc_drv" } + if {[have_board linux]} { return "linux_rtc" } + if {[have_board pc]} { return "pc_rtc" } - return "dummy_rtc_drv" + return "dummy_rtc" } import_from_depot [depot_user]/src/[base_src] \ @@ -17,10 +17,10 @@ import_from_depot [depot_user]/src/[base_src] \ proc rtc_driver_start_attributes { } { - if {[have_board linux]} { return { name="linux_rtc_drv" ld="no" } } - if {[have_board pc]} { return { name="rtc_drv" } } + if {[have_board linux]} { return { name="linux_rtc" ld="no" } } + if {[have_board pc]} { return { name="pc_rtc" } } - return { name="dummy_rtc_drv" } + return { name="dummy_rtc" } } # RTC setting tested on Qemu only diff --git a/repos/os/run/sd_card.run b/repos/os/run/sd_card.run index 187a8ebe38..6a69c20f59 100644 --- a/repos/os/run/sd_card.run +++ b/repos/os/run/sd_card.run @@ -6,7 +6,7 @@ if {![have_board pbxa9]} { create_boot_directory import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/init \ - [depot_user]/src/platform_drv \ + [depot_user]/src/platform \ [depot_user]/raw/pbxa9-devices build { drivers/sd_card app/block_tester } @@ -24,11 +24,11 @@ install_config { - + - + @@ -43,7 +43,7 @@ install_config { - + diff --git a/repos/os/run/sd_card_bench.run b/repos/os/run/sd_card_bench.run index 9222295089..f182fa2234 100644 --- a/repos/os/run/sd_card_bench.run +++ b/repos/os/run/sd_card_bench.run @@ -17,12 +17,12 @@ proc buffer_size_kib {} { exit 0; } -proc sd_card_drv {} { - if {[have_board pbxa9]} { return pl180_sd_card_drv } - if {[have_board imx6q_sabrelite]} { return imx6_sd_card_drv } - if {[have_board imx53_qsb]} { return imx53_sd_card_drv } - if {[have_board imx53_qsb_tz]} { return imx53_sd_card_drv } - if {[have_board rpi]} { return rpi_sd_card_drv } +proc sd_card {} { + if {[have_board pbxa9]} { return pl180_sd_card } + if {[have_board imx6q_sabrelite]} { return imx6_sd_card } + if {[have_board imx53_qsb]} { return imx53_sd_card } + if {[have_board imx53_qsb_tz]} { return imx53_sd_card } + if {[have_board rpi]} { return rpi_sd_card } puts "\n Run script is not supported on this platform. \n"; exit 0; } @@ -30,7 +30,7 @@ proc sd_card_drv {} { create_boot_directory import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/init \ - [depot_user]/src/platform_drv + [depot_user]/src/platform install_config { @@ -45,11 +45,11 @@ install_config { - + - + @@ -60,8 +60,8 @@ install_config { - - + + diff --git a/repos/os/run/smbios_decoder.run b/repos/os/run/smbios_decoder.run index 5ce2788f88..f341f25a73 100644 --- a/repos/os/run/smbios_decoder.run +++ b/repos/os/run/smbios_decoder.run @@ -41,11 +41,11 @@ install_config { - + - + diff --git a/repos/os/run/uart.run b/repos/os/run/uart.run index 76f51a27b5..aa84fc57f2 100644 --- a/repos/os/run/uart.run +++ b/repos/os/run/uart.run @@ -27,7 +27,7 @@ install_config { - + diff --git a/repos/os/run/usb_block.run b/repos/os/run/usb_block.run index f4c2e7d813..f2ff657f8d 100644 --- a/repos/os/run/usb_block.run +++ b/repos/os/run/usb_block.run @@ -10,9 +10,9 @@ if {[get_cmd_switch --autopilot] && ![have_include "power_on/qemu"]} { create_boot_directory import_from_depot [depot_user]/src/[base_src] \ - [depot_user]/pkg/test_usb_host_drv-[board] \ + [depot_user]/pkg/test_usb_host-[board] \ [depot_user]/src/report_rom \ - [depot_user]/src/usb_block_drv \ + [depot_user]/src/usb_block \ [depot_user]/src/init build { app/block_tester } @@ -44,11 +44,11 @@ install_config { - + - + @@ -61,12 +61,12 @@ install_config { - + - + @@ -78,12 +78,12 @@ install_config { - + - + @@ -92,9 +92,9 @@ install_config { # # Define USB host controller config # -set fd [open [run_dir]/genode/usb_host_drv.config w] +set fd [open [run_dir]/genode/usb_host.config w] puts $fd { - + } diff --git a/repos/os/run/vmm_arm.run b/repos/os/run/vmm_arm.run index 569d34eb2c..0673c79aa5 100644 --- a/repos/os/run/vmm_arm.run +++ b/repos/os/run/vmm_arm.run @@ -77,7 +77,7 @@ install_config { - + @@ -119,7 +119,7 @@ install_config { - + } [vmm_config] { diff --git a/repos/os/src/app/pci_decode/main.cc b/repos/os/src/app/pci_decode/main.cc index b46d299e78..52456875db 100644 --- a/repos/os/src/app/pci_decode/main.cc +++ b/repos/os/src/app/pci_decode/main.cc @@ -78,7 +78,7 @@ struct Main /* * If PCI devices happen to miss complete configuration after boot, i.e., have * a zero base address, we report a fixed address for known devices. - * platform_drv in turn, will setup the address from the report when enabling + * platform in turn, will setup the address from the report when enabling * the device. * * The issue was discovered with Intel LPSS devices in Fujitsu notebooks. diff --git a/repos/os/src/drivers/acpi/README b/repos/os/src/drivers/acpi/README index 504677b9a1..6d847bb7a4 100644 --- a/repos/os/src/drivers/acpi/README +++ b/repos/os/src/drivers/acpi/README @@ -16,7 +16,7 @@ the platform driver README for more details. Usage ----- -! +! ! ! ! @@ -27,11 +27,11 @@ Usage ! ! ! -! +! ! ! ! -! +! ! ... Config diff --git a/repos/os/src/drivers/acpi/spec/x86/target.mk b/repos/os/src/drivers/acpi/spec/x86/target.mk index e03b8e5f72..3e7bd24c0c 100644 --- a/repos/os/src/drivers/acpi/spec/x86/target.mk +++ b/repos/os/src/drivers/acpi/spec/x86/target.mk @@ -1,4 +1,4 @@ -TARGET = acpi_drv +TARGET = acpi REQUIRES = x86 SRC_CC = main.cc acpi.cc smbios_table_reporter.cc intel_opregion.cc LIBS = base diff --git a/repos/os/src/drivers/ahci/README b/repos/os/src/drivers/ahci/README index 064747e54b..b5e5614afc 100644 --- a/repos/os/src/drivers/ahci/README +++ b/repos/os/src/drivers/ahci/README @@ -11,7 +11,6 @@ which client can access a certain device: ! -! ! ! } ! @@ -33,8 +32,8 @@ device at port 1, and finally the session "boot_fs" gains read-only access to port 2. ATAPI support is by default disabled and can be enabled by setting the config attribute "atapi" to "yes". -ahci_drv supports reporting of active ports, which can be enabled via -configuration sub-node like follows. +The ahci driver supports the reporting of active ports, which can be enabled +via configuration sub-node like follows. ! diff --git a/repos/os/src/drivers/ahci/target.mk b/repos/os/src/drivers/ahci/target.mk index 6b73696a0b..ffd974e25c 100644 --- a/repos/os/src/drivers/ahci/target.mk +++ b/repos/os/src/drivers/ahci/target.mk @@ -1,4 +1,4 @@ -TARGET = ahci_drv +TARGET = ahci SRC_CC += main.cc INC_DIR += $(PRG_DIR) LIBS += base diff --git a/repos/os/src/drivers/audio/spec/linux/target.mk b/repos/os/src/drivers/audio/spec/linux/target.mk index f0957b49b3..c4ef065080 100644 --- a/repos/os/src/drivers/audio/spec/linux/target.mk +++ b/repos/os/src/drivers/audio/spec/linux/target.mk @@ -1,4 +1,4 @@ -TARGET = linux_audio_drv +TARGET = linux_audio REQUIRES = linux LIBS = lx_hybrid SRC_CC = main.cc diff --git a/repos/os/src/drivers/framebuffer/boot/target.mk b/repos/os/src/drivers/framebuffer/boot/target.mk index ec08267c60..32d8a767a9 100644 --- a/repos/os/src/drivers/framebuffer/boot/target.mk +++ b/repos/os/src/drivers/framebuffer/boot/target.mk @@ -1,3 +1,3 @@ -TARGET = boot_fb_drv +TARGET = boot_fb LIBS = base blit SRC_CC = main.cc diff --git a/repos/os/src/drivers/framebuffer/pl11x/target.mk b/repos/os/src/drivers/framebuffer/pl11x/target.mk index a26af45428..c6e200e567 100644 --- a/repos/os/src/drivers/framebuffer/pl11x/target.mk +++ b/repos/os/src/drivers/framebuffer/pl11x/target.mk @@ -1,4 +1,4 @@ -TARGET = pl11x_fb_drv +TARGET = pl11x_fb REQUIRES = arm_v7 SRC_CC = main.cc LIBS = base blit diff --git a/repos/os/src/drivers/framebuffer/ram/target.mk b/repos/os/src/drivers/framebuffer/ram/target.mk index 6544c8b9e8..c3e5a8bf4f 100644 --- a/repos/os/src/drivers/framebuffer/ram/target.mk +++ b/repos/os/src/drivers/framebuffer/ram/target.mk @@ -1,4 +1,4 @@ -TARGET = ram_fb_drv +TARGET = ram_fb SRC_CC = main.cc LIBS = base blit diff --git a/repos/os/src/drivers/framebuffer/virtio/target_mmio.inc b/repos/os/src/drivers/framebuffer/virtio/target_mmio.inc index 36c892b677..3dfba41863 100644 --- a/repos/os/src/drivers/framebuffer/virtio/target_mmio.inc +++ b/repos/os/src/drivers/framebuffer/virtio/target_mmio.inc @@ -1,4 +1,4 @@ -TARGET = virtio_mmio_fb_drv +TARGET = virtio_mmio_fb SRC_CC = mmio_device.cc LIBS = base blit INC_DIR = $(REP_DIR)/src/drivers/framebuffer/virtio diff --git a/repos/os/src/drivers/gpio/rpi/target.mk b/repos/os/src/drivers/gpio/rpi/target.mk index 7b8a367536..c861dcf97d 100644 --- a/repos/os/src/drivers/gpio/rpi/target.mk +++ b/repos/os/src/drivers/gpio/rpi/target.mk @@ -1,4 +1,4 @@ -TARGET = rpi_gpio_drv +TARGET = rpi_gpio REQUIRES = arm_v6 SRC_CC += main.cc LIBS = base diff --git a/repos/os/src/drivers/gpu/intel/target.mk b/repos/os/src/drivers/gpu/intel/target.mk index 57f525b19e..bd7f850c62 100644 --- a/repos/os/src/drivers/gpu/intel/target.mk +++ b/repos/os/src/drivers/gpu/intel/target.mk @@ -1,4 +1,4 @@ -TARGET = intel_gpu_drv +TARGET = intel_gpu SRC_CC = main.cc mmio_dump.cc LIBS = base diff --git a/repos/os/src/drivers/i2c/README b/repos/os/src/drivers/i2c/README index cf4e69f76d..8e9d25ab1a 100644 --- a/repos/os/src/drivers/i2c/README +++ b/repos/os/src/drivers/i2c/README @@ -27,7 +27,7 @@ The platform driver must provide a device with the following configuration: ! ! ! -! +! The io_mem address, irq number and clock might change from one I2C bus controller to another. The io_mem address for iomux configuration may @@ -46,7 +46,7 @@ Configuration The driver acts as a server that must be configured via a policy, that states which client can access a certain device(s) on the bus: -! +! ! ! ! diff --git a/repos/os/src/drivers/i2c/imx8q_evk/target.mk b/repos/os/src/drivers/i2c/imx8q_evk/target.mk index f3d4b67240..bc19c41175 100644 --- a/repos/os/src/drivers/i2c/imx8q_evk/target.mk +++ b/repos/os/src/drivers/i2c/imx8q_evk/target.mk @@ -1,4 +1,4 @@ -TARGET = imx8q_evk_i2c_drv +TARGET = imx8q_evk_i2c REQUIRES = arm_v8 diff --git a/repos/os/src/drivers/input/virtio/target_mmio.inc b/repos/os/src/drivers/input/virtio/target_mmio.inc index 19c0408141..e85ac392d5 100644 --- a/repos/os/src/drivers/input/virtio/target_mmio.inc +++ b/repos/os/src/drivers/input/virtio/target_mmio.inc @@ -1,4 +1,4 @@ -TARGET = virtio_mmio_input_drv +TARGET = virtio_mmio_input SRC_CC = mmio_device.cc LIBS = base INC_DIR = $(REP_DIR)/src/drivers/input/virtio diff --git a/repos/os/src/drivers/nic/lan9118/target.mk b/repos/os/src/drivers/nic/lan9118/target.mk index 9ecfe7f85d..2ba7f6a145 100644 --- a/repos/os/src/drivers/nic/lan9118/target.mk +++ b/repos/os/src/drivers/nic/lan9118/target.mk @@ -1,5 +1,5 @@ REQUIRES = arm_v7 -TARGET = lan9118_nic_drv +TARGET = lan9118_nic SRC_CC = main.cc LIBS = base nic_driver INC_DIR += $(PRG_DIR) diff --git a/repos/os/src/drivers/nic/spec/linux/target.mk b/repos/os/src/drivers/nic/spec/linux/target.mk index b95e73002f..804c2e7850 100644 --- a/repos/os/src/drivers/nic/spec/linux/target.mk +++ b/repos/os/src/drivers/nic/spec/linux/target.mk @@ -1,4 +1,4 @@ -TARGET = linux_nic_drv +TARGET = linux_nic REQUIRES = linux LIBS = lx_hybrid nic_driver SRC_CC = main.cc diff --git a/repos/os/src/drivers/nvme/README b/repos/os/src/drivers/nvme/README index abad02fcb1..fd99f47ae3 100644 --- a/repos/os/src/drivers/nvme/README +++ b/repos/os/src/drivers/nvme/README @@ -16,7 +16,7 @@ Configuration The following config illustrates how the driver is configured: -! +! ! ! ! diff --git a/repos/os/src/drivers/nvme/target.inc b/repos/os/src/drivers/nvme/target.inc index c3ff468886..3c7e794383 100644 --- a/repos/os/src/drivers/nvme/target.inc +++ b/repos/os/src/drivers/nvme/target.inc @@ -1,4 +1,4 @@ -TARGET = nvme_drv +TARGET = nvme SRC_CC = main.cc INC_DIR += $(PRG_DIR)/../.. $(PRG_DIR) LIBS += base diff --git a/repos/os/src/drivers/platform/README b/repos/os/src/drivers/platform/README index 32c7a1a09e..25ba995849 100644 --- a/repos/os/src/drivers/platform/README +++ b/repos/os/src/drivers/platform/README @@ -37,11 +37,11 @@ Policy usage A policy may contain several nodes describing several devices. -! +! ! ! ... ! -! +! ! ! ! @@ -78,10 +78,10 @@ the device, but can either state a class of devices, or a vendor/device pair of identifiers inside a pci sub-node: ! -! +! ! ! -! +! ! ! diff --git a/repos/os/src/drivers/platform/target.mk b/repos/os/src/drivers/platform/target.mk index 787c060371..c7c0dd4f94 100644 --- a/repos/os/src/drivers/platform/target.mk +++ b/repos/os/src/drivers/platform/target.mk @@ -1,3 +1,3 @@ -TARGET = platform_drv +TARGET = platform include $(PRG_DIR)/target.inc diff --git a/repos/os/src/drivers/ps2/pl050/target.mk b/repos/os/src/drivers/ps2/pl050/target.mk index e8b5d68425..c4d9e64e95 100644 --- a/repos/os/src/drivers/ps2/pl050/target.mk +++ b/repos/os/src/drivers/ps2/pl050/target.mk @@ -1,4 +1,4 @@ -TARGET = pl050_input_drv +TARGET = pl050_input REQUIRES = arm_v7 SRC_CC = main.cc LIBS = base diff --git a/repos/os/src/drivers/ps2/x86/target.mk b/repos/os/src/drivers/ps2/x86/target.mk index bb7c896310..8a60efdfed 100644 --- a/repos/os/src/drivers/ps2/x86/target.mk +++ b/repos/os/src/drivers/ps2/x86/target.mk @@ -1,4 +1,4 @@ -TARGET = ps2_drv +TARGET = ps2 REQUIRES = x86 SRC_CC = main.cc LIBS = base diff --git a/repos/os/src/drivers/rtc/dummy/target.mk b/repos/os/src/drivers/rtc/dummy/target.mk index e7cd80edfc..b99a8013ec 100644 --- a/repos/os/src/drivers/rtc/dummy/target.mk +++ b/repos/os/src/drivers/rtc/dummy/target.mk @@ -1,4 +1,4 @@ -TARGET = dummy_rtc_drv +TARGET = dummy_rtc LIBS = base include $(REP_DIR)/src/drivers/rtc/target.inc diff --git a/repos/os/src/drivers/rtc/spec/linux/target.mk b/repos/os/src/drivers/rtc/spec/linux/target.mk index e467e362d0..19c804d5b5 100644 --- a/repos/os/src/drivers/rtc/spec/linux/target.mk +++ b/repos/os/src/drivers/rtc/spec/linux/target.mk @@ -1,4 +1,4 @@ -TARGET = linux_rtc_drv +TARGET = linux_rtc REQUIRES = linux LIBS = lx_hybrid diff --git a/repos/os/src/drivers/rtc/spec/x86/target.mk b/repos/os/src/drivers/rtc/spec/x86/target.mk index 3949da664c..687ede4910 100644 --- a/repos/os/src/drivers/rtc/spec/x86/target.mk +++ b/repos/os/src/drivers/rtc/spec/x86/target.mk @@ -1,4 +1,4 @@ -TARGET = rtc_drv +TARGET = pc_rtc REQUIRES = x86 LIBS = base diff --git a/repos/os/src/drivers/sd_card/imx53/target.mk b/repos/os/src/drivers/sd_card/imx53/target.mk index 6d87ccdb0b..d1060e3a9f 100644 --- a/repos/os/src/drivers/sd_card/imx53/target.mk +++ b/repos/os/src/drivers/sd_card/imx53/target.mk @@ -1,4 +1,4 @@ -TARGET = imx53_sd_card_drv +TARGET = imx53_sd_card REQUIRES = arm_v7 SRC_CC = adma2.cc imx/driver.cc INC_DIR = $(REP_DIR)/src/drivers/sd_card/imx diff --git a/repos/os/src/drivers/sd_card/imx6/target.mk b/repos/os/src/drivers/sd_card/imx6/target.mk index 34f4db3319..ccba906a91 100644 --- a/repos/os/src/drivers/sd_card/imx6/target.mk +++ b/repos/os/src/drivers/sd_card/imx6/target.mk @@ -1,4 +1,4 @@ -TARGET = imx6_sd_card_drv +TARGET = imx6_sd_card SRC_CC = adma2.cc imx/driver.cc INC_DIR = $(REP_DIR)/src/drivers/sd_card/imx REQUIRES = arm_v7a diff --git a/repos/os/src/drivers/sd_card/pl180/target.mk b/repos/os/src/drivers/sd_card/pl180/target.mk index a54731760d..1fcd465697 100644 --- a/repos/os/src/drivers/sd_card/pl180/target.mk +++ b/repos/os/src/drivers/sd_card/pl180/target.mk @@ -1,4 +1,4 @@ -TARGET = pl180_sd_card_drv +TARGET = pl180_sd_card REQUIRES = arm_v7 include $(REP_DIR)/src/drivers/sd_card/target.inc diff --git a/repos/os/src/drivers/touch/synaptics_dsx/target.mk b/repos/os/src/drivers/touch/synaptics_dsx/target.mk index 37b9932d55..ebf34fc019 100644 --- a/repos/os/src/drivers/touch/synaptics_dsx/target.mk +++ b/repos/os/src/drivers/touch/synaptics_dsx/target.mk @@ -1,4 +1,4 @@ -TARGET = imx8_synaptics_touch_drv +TARGET = imx8_synaptics_touch REQUIRES = arm_v8 SRC_CC = main.cc LIBS = base diff --git a/repos/os/src/drivers/uart/spec/pbxa9/target.mk b/repos/os/src/drivers/uart/spec/pbxa9/target.mk index 2484b148fb..110600cbce 100644 --- a/repos/os/src/drivers/uart/spec/pbxa9/target.mk +++ b/repos/os/src/drivers/uart/spec/pbxa9/target.mk @@ -1,4 +1,4 @@ -TARGET = pbxa9_uart_drv +TARGET = pbxa9_uart REQUIRES = arm_v7 include $(REP_DIR)/src/drivers/uart/target.inc diff --git a/repos/os/src/drivers/uart/spec/x86/target.mk b/repos/os/src/drivers/uart/spec/x86/target.mk index 44ed442e38..c5bb5f8489 100644 --- a/repos/os/src/drivers/uart/spec/x86/target.mk +++ b/repos/os/src/drivers/uart/spec/x86/target.mk @@ -1,4 +1,4 @@ -TARGET = pc_uart_drv +TARGET = pc_uart REQUIRES = x86 include $(REP_DIR)/src/drivers/uart/target.inc diff --git a/repos/os/src/drivers/usb_block/README b/repos/os/src/drivers/usb_block/README index 6f0f75f5e5..2438655721 100644 --- a/repos/os/src/drivers/usb_block/README +++ b/repos/os/src/drivers/usb_block/README @@ -13,13 +13,13 @@ bulk-only interface it finds. The following configuration snippets demonstrates how to use the driver: -! +! ! ! ! ! -! +! ! ! ! @@ -29,12 +29,12 @@ attribute. This attribute specifies the label used when opening the Usb session connection. A matching policy has to be configured at the USB host controller driver: -! +! ! ! ! ! -! +! ! ! ! @@ -42,8 +42,8 @@ driver: For static configurations the 'label' value may be chosen freely or may even be ommitted entirely. On the other hand it is best for dynamic configurations to choose a unique label, e.g. 'usb--', at run-time (this most likely -involves other components that generate configurations for the 'usb_block_drv' -as well as the 'usb_drv'). +involves other components that generate configurations for the 'usb_block' +as well as the USB host driver. The second attribute is 'report'. If its value is 'yes' the driver diff --git a/repos/os/src/drivers/usb_block/target.mk b/repos/os/src/drivers/usb_block/target.mk index a0663d5c01..1d7513d6a9 100644 --- a/repos/os/src/drivers/usb_block/target.mk +++ b/repos/os/src/drivers/usb_block/target.mk @@ -1,4 +1,4 @@ -TARGET = usb_block_drv +TARGET = usb_block SRC_CC = main.cc INC_DIR = $(PRG_DIR) LIBS = base diff --git a/repos/os/src/server/nic_router/README b/repos/os/src/server/nic_router/README index 0a1f032358..8b2d459ff7 100644 --- a/repos/os/src/server/nic_router/README +++ b/repos/os/src/server/nic_router/README @@ -64,7 +64,7 @@ The assignment of NIC clients to domains is controlled through the 'domain' attribute in the '' tag: ! -! +! ! The assignment of NIC and Uplink servers is controlled through the tags @@ -73,8 +73,8 @@ The assignment of NIC and Uplink servers is controlled through the tags ! ! ! -! -! +! +! Each of these tags applies to all NIC and Uplink servers whose session label matches. A domain can be assigned any number of interfaces and interfaces of @@ -941,7 +941,7 @@ following configuration: ! ! -! +! ! ! ! @@ -981,7 +981,7 @@ internet. The router would have the following configuration: ! ! -! +! ! ! ! diff --git a/repos/os/src/server/record_play_mixer/README b/repos/os/src/server/record_play_mixer/README index b0189fade0..8673ebb251 100644 --- a/repos/os/src/server/record_play_mixer/README +++ b/repos/os/src/server/record_play_mixer/README @@ -81,12 +81,12 @@ Record session) node. The following snippet shows an examplary state-report: ! -! -! +! +! ! ! -! -! +! +! ! The state-report additionally also reflects the current version of the diff --git a/repos/os/src/test/gpio_led/target.mk b/repos/os/src/test/gpio_led/target.mk index 606a5db472..60e4162719 100644 --- a/repos/os/src/test/gpio_led/target.mk +++ b/repos/os/src/test/gpio_led/target.mk @@ -1,4 +1,4 @@ -TARGET = led_gpio_drv +TARGET = led_gpio SRC_CC = main.cc LIBS = base diff --git a/repos/os/src/test/gpio_signal/target.mk b/repos/os/src/test/gpio_signal/target.mk index 062a6ba12b..9e61108629 100644 --- a/repos/os/src/test/gpio_signal/target.mk +++ b/repos/os/src/test/gpio_signal/target.mk @@ -1,4 +1,4 @@ -TARGET = signal_gpio_drv +TARGET = signal_gpio SRC_CC = main.cc INC_DIR += $(PRG_DIR) LIBS = base diff --git a/repos/os/src/test/i2c_mcp9808/README b/repos/os/src/test/i2c_mcp9808/README index d2c01ee2e4..4af84aff2a 100644 --- a/repos/os/src/test/i2c_mcp9808/README +++ b/repos/os/src/test/i2c_mcp9808/README @@ -1,14 +1,14 @@ i2c_mcp9808 read ambient temperature from an mcp9808 sensor connected on an I2c bus and print it to standard output. -Example config of a component using the imx8q_evk_i2c_drv driver: +Example config of a component using the imx8q_evk_i2c driver: ! ! ! ! ! -! +! ! ! ! diff --git a/repos/os/src/test/platform_drv/main.cc b/repos/os/src/test/platform/main.cc similarity index 99% rename from repos/os/src/test/platform_drv/main.cc rename to repos/os/src/test/platform/main.cc index 3ba1d65422..b5a3663ff5 100644 --- a/repos/os/src/test/platform_drv/main.cc +++ b/repos/os/src/test/platform/main.cc @@ -104,7 +104,7 @@ struct Main cfg.node("policy", [&] { - cfg.attribute("label", "test-platform_drv -> "); + cfg.attribute("label", "test-platform -> "); cfg.attribute("info", true); cfg.attribute("version", state); diff --git a/repos/os/src/test/platform_drv/target.mk b/repos/os/src/test/platform/target.mk similarity index 63% rename from repos/os/src/test/platform_drv/target.mk rename to repos/os/src/test/platform/target.mk index 6ca1a75675..0385d6ba2f 100644 --- a/repos/os/src/test/platform_drv/target.mk +++ b/repos/os/src/test/platform/target.mk @@ -1,4 +1,4 @@ -TARGET := test-platform_drv +TARGET := test-platform REQUIRES = arm SRC_CC = main.cc LIBS = base diff --git a/repos/pc/recipes/pkg/pc_nic_drv/README b/repos/pc/recipes/pkg/pc_nic/README similarity index 100% rename from repos/pc/recipes/pkg/pc_nic_drv/README rename to repos/pc/recipes/pkg/pc_nic/README diff --git a/repos/pc/recipes/pkg/pc_nic/archives b/repos/pc/recipes/pkg/pc_nic/archives new file mode 100644 index 0000000000..b5a81347ee --- /dev/null +++ b/repos/pc/recipes/pkg/pc_nic/archives @@ -0,0 +1 @@ +_/src/pc_nic diff --git a/repos/pc/recipes/pkg/pc_nic_drv/hash b/repos/pc/recipes/pkg/pc_nic/hash similarity index 100% rename from repos/pc/recipes/pkg/pc_nic_drv/hash rename to repos/pc/recipes/pkg/pc_nic/hash diff --git a/repos/pc/recipes/pkg/pc_nic/runtime b/repos/pc/recipes/pkg/pc_nic/runtime new file mode 100644 index 0000000000..9ec7068085 --- /dev/null +++ b/repos/pc/recipes/pkg/pc_nic/runtime @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/repos/pc/recipes/pkg/pc_nic_drv/archives b/repos/pc/recipes/pkg/pc_nic_drv/archives deleted file mode 100644 index 78bf5a412f..0000000000 --- a/repos/pc/recipes/pkg/pc_nic_drv/archives +++ /dev/null @@ -1 +0,0 @@ -_/src/pc_nic_drv diff --git a/repos/pc/recipes/pkg/pc_nic_drv/runtime b/repos/pc/recipes/pkg/pc_nic_drv/runtime deleted file mode 100644 index 2d2a6c8fa2..0000000000 --- a/repos/pc/recipes/pkg/pc_nic_drv/runtime +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/repos/pc/recipes/pkg/pc_wifi/README b/repos/pc/recipes/pkg/pc_wifi/README index 525a21c805..77ad453189 100644 --- a/repos/pc/recipes/pkg/pc_wifi/README +++ b/repos/pc/recipes/pkg/pc_wifi/README @@ -1,2 +1,2 @@ - Package for bundling pc_wifi_drv and pc_wifi_firmware + Package for bundling pc_wifi and pc_wifi_firmware diff --git a/repos/pc/recipes/pkg/pc_wifi/archives b/repos/pc/recipes/pkg/pc_wifi/archives index e24cd33946..c5bf783894 100644 --- a/repos/pc/recipes/pkg/pc_wifi/archives +++ b/repos/pc/recipes/pkg/pc_wifi/archives @@ -1,4 +1,4 @@ -_/src/pc_wifi_drv +_/src/pc_wifi _/src/openssl _/src/vfs _/src/vfs_jitterentropy diff --git a/repos/pc/recipes/pkg/test_usb_host-pc/README b/repos/pc/recipes/pkg/test_usb_host-pc/README new file mode 100644 index 0000000000..40d45e2cb9 --- /dev/null +++ b/repos/pc/recipes/pkg/test_usb_host-pc/README @@ -0,0 +1,2 @@ + + Package for using the pc_usb_host in test-infrastructure diff --git a/repos/pc/recipes/pkg/test_usb_host-pc/archives b/repos/pc/recipes/pkg/test_usb_host-pc/archives new file mode 100644 index 0000000000..f8594f31d8 --- /dev/null +++ b/repos/pc/recipes/pkg/test_usb_host-pc/archives @@ -0,0 +1,6 @@ +_/raw/test_usb_host-pc +_/src/acpi +_/src/pci_decode +_/src/pc_usb_host +_/src/platform +_/src/report_rom diff --git a/repos/pc/recipes/pkg/test_usb_host_drv-pc/hash b/repos/pc/recipes/pkg/test_usb_host-pc/hash similarity index 100% rename from repos/pc/recipes/pkg/test_usb_host_drv-pc/hash rename to repos/pc/recipes/pkg/test_usb_host-pc/hash diff --git a/repos/pc/recipes/pkg/test_usb_host_drv-pc/README b/repos/pc/recipes/pkg/test_usb_host_drv-pc/README deleted file mode 100644 index fc57919b71..0000000000 --- a/repos/pc/recipes/pkg/test_usb_host_drv-pc/README +++ /dev/null @@ -1,2 +0,0 @@ - - Package for using the pc_usb_host_drv in test-infrastructure diff --git a/repos/pc/recipes/pkg/test_usb_host_drv-pc/archives b/repos/pc/recipes/pkg/test_usb_host_drv-pc/archives deleted file mode 100644 index 373005556b..0000000000 --- a/repos/pc/recipes/pkg/test_usb_host_drv-pc/archives +++ /dev/null @@ -1,6 +0,0 @@ -_/raw/test_usb_host_drv-pc -_/src/acpi_drv -_/src/pci_decode -_/src/pc_usb_host_drv -_/src/platform_drv -_/src/report_rom diff --git a/repos/pc/recipes/raw/pc_wifi_firmware/content.mk b/repos/pc/recipes/raw/pc_wifi_firmware/content.mk index 4c44a5426c..5af9859632 100644 --- a/repos/pc/recipes/raw/pc_wifi_firmware/content.mk +++ b/repos/pc/recipes/raw/pc_wifi_firmware/content.mk @@ -1,6 +1,6 @@ PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux-firmware) -content: ucode_files LICENSE.wifi_drv pc_wifi_firmware.tar +content: ucode_files LICENSE.wifi pc_wifi_firmware.tar .PHONY: ucode_files @@ -11,14 +11,14 @@ ucode_files: cp $(PORT_DIR)/firmware/regulatory.db . cp $(PORT_DIR)/firmware/regulatory.db.p7s . -LICENSE.wifi_drv: +LICENSE.wifi: for i in $(PORT_DIR)/firmware/LICEN*E.*; do \ echo "$${i##*/}:" >> $@; \ cat $$i >> $@; \ echo >> $@; \ done -pc_wifi_firmware.tar: ucode_files LICENSE.wifi_drv +pc_wifi_firmware.tar: ucode_files LICENSE.wifi tar --mtime='2023-05-03 00:00Z' --remove-files \ --owner=0 --group=0 --numeric-owner --mode='go=' \ -cf $@ -C . *.* rtlwifi/*.* && \ diff --git a/repos/pc/recipes/raw/test_usb_host-pc/content.mk b/repos/pc/recipes/raw/test_usb_host-pc/content.mk new file mode 100644 index 0000000000..b384b5694b --- /dev/null +++ b/repos/pc/recipes/raw/test_usb_host-pc/content.mk @@ -0,0 +1,4 @@ +content: drivers.config + +drivers.config: + cp $(REP_DIR)/recipes/raw/test_usb_host-pc/$@ $@ diff --git a/repos/pc/recipes/raw/test_usb_host_drv-pc/drivers.config b/repos/pc/recipes/raw/test_usb_host-pc/drivers.config similarity index 81% rename from repos/pc/recipes/raw/test_usb_host_drv-pc/drivers.config rename to repos/pc/recipes/raw/test_usb_host-pc/drivers.config index 19d8ea36c6..c7a03bd91f 100644 --- a/repos/pc/recipes/raw/test_usb_host_drv-pc/drivers.config +++ b/repos/pc/recipes/raw/test_usb_host-pc/drivers.config @@ -13,7 +13,7 @@ - + @@ -22,8 +22,8 @@ - - + + @@ -33,7 +33,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -77,17 +77,17 @@ - + - - + + - - + + diff --git a/repos/pc/recipes/raw/test_usb_host_drv-pc/hash b/repos/pc/recipes/raw/test_usb_host-pc/hash similarity index 100% rename from repos/pc/recipes/raw/test_usb_host_drv-pc/hash rename to repos/pc/recipes/raw/test_usb_host-pc/hash diff --git a/repos/pc/recipes/raw/test_usb_host_drv-pc/content.mk b/repos/pc/recipes/raw/test_usb_host_drv-pc/content.mk deleted file mode 100644 index 277f1f2239..0000000000 --- a/repos/pc/recipes/raw/test_usb_host_drv-pc/content.mk +++ /dev/null @@ -1,4 +0,0 @@ -content: drivers.config - -drivers.config: - cp $(REP_DIR)/recipes/raw/test_usb_host_drv-pc/$@ $@ diff --git a/repos/pc/recipes/src/pc_intel_fb_drv/content.mk b/repos/pc/recipes/src/pc_intel_fb/content.mk similarity index 100% rename from repos/pc/recipes/src/pc_intel_fb_drv/content.mk rename to repos/pc/recipes/src/pc_intel_fb/content.mk diff --git a/repos/pc/recipes/src/pc_intel_fb_drv/hash b/repos/pc/recipes/src/pc_intel_fb/hash similarity index 100% rename from repos/pc/recipes/src/pc_intel_fb_drv/hash rename to repos/pc/recipes/src/pc_intel_fb/hash diff --git a/repos/pc/recipes/src/pc_intel_fb_drv/used_apis b/repos/pc/recipes/src/pc_intel_fb/used_apis similarity index 100% rename from repos/pc/recipes/src/pc_intel_fb_drv/used_apis rename to repos/pc/recipes/src/pc_intel_fb/used_apis diff --git a/repos/pc/recipes/src/pc_nic_drv/content.mk b/repos/pc/recipes/src/pc_nic/content.mk similarity index 100% rename from repos/pc/recipes/src/pc_nic_drv/content.mk rename to repos/pc/recipes/src/pc_nic/content.mk diff --git a/repos/pc/recipes/src/pc_nic_drv/hash b/repos/pc/recipes/src/pc_nic/hash similarity index 100% rename from repos/pc/recipes/src/pc_nic_drv/hash rename to repos/pc/recipes/src/pc_nic/hash diff --git a/repos/pc/recipes/src/pc_nic_drv/used_apis b/repos/pc/recipes/src/pc_nic/used_apis similarity index 100% rename from repos/pc/recipes/src/pc_nic_drv/used_apis rename to repos/pc/recipes/src/pc_nic/used_apis diff --git a/repos/pc/recipes/src/pc_platform/content.mk b/repos/pc/recipes/src/pc_platform/content.mk new file mode 100644 index 0000000000..5478306037 --- /dev/null +++ b/repos/pc/recipes/src/pc_platform/content.mk @@ -0,0 +1,2 @@ +SRC_DIR = src/drivers/platform/pc +include $(GENODE_DIR)/repos/os/recipes/src/platform/content.inc diff --git a/repos/pc/recipes/src/pc_platform_drv/hash b/repos/pc/recipes/src/pc_platform/hash similarity index 100% rename from repos/pc/recipes/src/pc_platform_drv/hash rename to repos/pc/recipes/src/pc_platform/hash diff --git a/repos/pc/recipes/src/pc_platform_drv/used_apis b/repos/pc/recipes/src/pc_platform/used_apis similarity index 100% rename from repos/pc/recipes/src/pc_platform_drv/used_apis rename to repos/pc/recipes/src/pc_platform/used_apis diff --git a/repos/pc/recipes/src/pc_platform_drv/content.mk b/repos/pc/recipes/src/pc_platform_drv/content.mk deleted file mode 100644 index a7f7992f97..0000000000 --- a/repos/pc/recipes/src/pc_platform_drv/content.mk +++ /dev/null @@ -1,2 +0,0 @@ -SRC_DIR = src/drivers/platform/pc -include $(GENODE_DIR)/repos/os/recipes/src/platform_drv/content.inc diff --git a/repos/pc/recipes/src/pc_usb_host_drv/content.mk b/repos/pc/recipes/src/pc_usb_host/content.mk similarity index 100% rename from repos/pc/recipes/src/pc_usb_host_drv/content.mk rename to repos/pc/recipes/src/pc_usb_host/content.mk diff --git a/repos/pc/recipes/src/pc_usb_host_drv/hash b/repos/pc/recipes/src/pc_usb_host/hash similarity index 100% rename from repos/pc/recipes/src/pc_usb_host_drv/hash rename to repos/pc/recipes/src/pc_usb_host/hash diff --git a/repos/pc/recipes/src/pc_usb_host_drv/used_apis b/repos/pc/recipes/src/pc_usb_host/used_apis similarity index 100% rename from repos/pc/recipes/src/pc_usb_host_drv/used_apis rename to repos/pc/recipes/src/pc_usb_host/used_apis diff --git a/repos/pc/recipes/src/pc_wifi_drv/content.mk b/repos/pc/recipes/src/pc_wifi/content.mk similarity index 100% rename from repos/pc/recipes/src/pc_wifi_drv/content.mk rename to repos/pc/recipes/src/pc_wifi/content.mk diff --git a/repos/pc/recipes/src/pc_wifi_drv/hash b/repos/pc/recipes/src/pc_wifi/hash similarity index 100% rename from repos/pc/recipes/src/pc_wifi_drv/hash rename to repos/pc/recipes/src/pc_wifi/hash diff --git a/repos/pc/recipes/src/pc_wifi_drv/used_apis b/repos/pc/recipes/src/pc_wifi/used_apis similarity index 100% rename from repos/pc/recipes/src/pc_wifi_drv/used_apis rename to repos/pc/recipes/src/pc_wifi/used_apis diff --git a/repos/pc/run/intel_fb.run b/repos/pc/run/intel_fb.run index c3e7271094..54367f9e77 100644 --- a/repos/pc/run/intel_fb.run +++ b/repos/pc/run/intel_fb.run @@ -71,9 +71,9 @@ append config { - - - + + + @@ -83,7 +83,7 @@ append config { - + @@ -112,7 +112,7 @@ append config { - + @@ -127,11 +127,11 @@ append config { - + - + @@ -148,9 +148,9 @@ append config { - - - + + + @@ -188,7 +188,7 @@ append config { - + @@ -200,7 +200,7 @@ append config { - + @@ -223,7 +223,7 @@ append config { } append_if $use_gpu config { - + @@ -248,17 +248,17 @@ append_if $use_gpu config { } append config { - - + + } append_if $use_gpu config { - } + } append config { - + @@ -292,7 +292,7 @@ install_config $config build_boot_image [build_artifacts] if { [get_cmd_switch --autopilot] } { - run_genode_until {\[init -\> init_dynamic -\> intel_fb_drv\] HDMI-A-2: enable.*} 30 + run_genode_until {\[init -\> init_dynamic -\> intel_fb\] HDMI-A-2: enable.*} 30 } else { run_genode_until forever } diff --git a/repos/pc/run/pc_nic.run b/repos/pc/run/pc_nic.run index 036f47b213..67c0900d0b 100644 --- a/repos/pc/run/pc_nic.run +++ b/repos/pc/run/pc_nic.run @@ -12,11 +12,11 @@ import_from_depot \ [depot_user]/src/[base_src] \ [depot_user]/src/report_rom \ [depot_user]/src/init \ - [depot_user]/src/acpi_drv \ + [depot_user]/src/acpi \ [depot_user]/src/pci_decode \ - [depot_user]/src/platform_drv \ + [depot_user]/src/platform \ [depot_user]/src/nic_router \ - [depot_user]/src/pc_nic_drv + [depot_user]/src/pc_nic append config { @@ -50,12 +50,12 @@ append config { - - + + - + @@ -72,14 +72,14 @@ append config { - + - + @@ -88,7 +88,7 @@ append config { - + @@ -101,7 +101,7 @@ append config { - + diff --git a/repos/pc/run/pc_wifi.run b/repos/pc/run/pc_wifi.run index 60dfddd5c0..1c9cfc4f20 100644 --- a/repos/pc/run/pc_wifi.run +++ b/repos/pc/run/pc_wifi.run @@ -25,7 +25,7 @@ proc wifi_wpa { } { } # -# widi_drv config generator (supporting a network list) +# wifi-driver config generator (supporting a network list) # # You may script your tests with this function in the dynamic_rom config below. # The syntax for the networks parameter is @@ -134,8 +134,8 @@ append config { - - + + @@ -145,7 +145,7 @@ append config { - + @@ -174,7 +174,7 @@ append config { - + @@ -189,13 +189,13 @@ append config { - + - + @@ -264,7 +264,7 @@ append config { - + @@ -290,7 +290,7 @@ append config { - + diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/target.inc b/repos/pc/src/drivers/framebuffer/intel/pc/target.inc index ceb62a2889..93004a960f 100644 --- a/repos/pc/src/drivers/framebuffer/intel/pc/target.inc +++ b/repos/pc/src/drivers/framebuffer/intel/pc/target.inc @@ -2,7 +2,7 @@ REQUIRES := x86 REL_PRG_DIR := $(PRG_DIR)/../.. -TARGET := pc_intel_fb_drv +TARGET := pc_intel_fb LIBS := base pc_lx_emul blit jitterentropy INC_DIR += $(REL_PRG_DIR) diff --git a/repos/pc/src/drivers/nic/pc/target.inc b/repos/pc/src/drivers/nic/pc/target.inc index 4c5430f0a5..25f290de59 100644 --- a/repos/pc/src/drivers/nic/pc/target.inc +++ b/repos/pc/src/drivers/nic/pc/target.inc @@ -1,4 +1,4 @@ -TARGET := pc_nic_drv +TARGET := pc_nic LIBS := base pc_lx_emul jitterentropy INC_DIR += $(PRG_DIR)/../.. diff --git a/repos/pc/src/drivers/platform/pc/spec/x86_32/target.mk b/repos/pc/src/drivers/platform/pc/spec/x86_32/target.mk index 109931b9a7..85b458d9a8 100644 --- a/repos/pc/src/drivers/platform/pc/spec/x86_32/target.mk +++ b/repos/pc/src/drivers/platform/pc/spec/x86_32/target.mk @@ -1,4 +1,4 @@ -TARGET = pc_platform_drv +TARGET = pc_platform REQUIRES = x86_32 include $(call select_from_repositories,src/drivers/platform/target.inc) diff --git a/repos/pc/src/drivers/platform/pc/spec/x86_64/target.mk b/repos/pc/src/drivers/platform/pc/spec/x86_64/target.mk index 156dcb5083..0a8ce3ce32 100644 --- a/repos/pc/src/drivers/platform/pc/spec/x86_64/target.mk +++ b/repos/pc/src/drivers/platform/pc/spec/x86_64/target.mk @@ -1,4 +1,4 @@ -TARGET = pc_platform_drv +TARGET = pc_platform REQUIRES = x86_64 include $(call select_from_repositories,src/drivers/platform/target.inc) diff --git a/repos/pc/src/drivers/usb_host/pc/README b/repos/pc/src/drivers/usb_host/pc/README index 6102339439..0f6d7aa443 100644 --- a/repos/pc/src/drivers/usb_host/pc/README +++ b/repos/pc/src/drivers/usb_host/pc/README @@ -8,8 +8,8 @@ It can report the configuration it currently has, as well as a report of all USB devices it has currently recognized. Both reports can be enabled separatly via the config node of the driver: -! -! +! +! ! ! ! @@ -62,14 +62,14 @@ assign devices based on their name, a vendor-product-tuple, or by defining the class-value for all USB device interfaces that matches that class. Here are some examples: -! -! +! +! ! ! ! -! -! -! +! +! +! ! ! ! diff --git a/repos/pc/src/drivers/usb_host/pc/target.inc b/repos/pc/src/drivers/usb_host/pc/target.inc index e6ca4b8df5..3d5f29499a 100644 --- a/repos/pc/src/drivers/usb_host/pc/target.inc +++ b/repos/pc/src/drivers/usb_host/pc/target.inc @@ -2,7 +2,7 @@ REQUIRES := x86 REL_PRG_DIR := $(PRG_DIR)/../.. -TARGET := pc_usb_host_drv +TARGET := pc_usb_host LIBS := base pc_lx_emul jitterentropy INC_DIR += $(REL_PRG_DIR) diff --git a/repos/pc/src/test/framebuffer/intel/main.cc b/repos/pc/src/test/framebuffer/intel/main.cc index b0cd2371df..70e1684592 100644 --- a/repos/pc/src/test/framebuffer/intel/main.cc +++ b/repos/pc/src/test/framebuffer/intel/main.cc @@ -114,7 +114,7 @@ void Framebuffer_controller::_update_fb_config(Xml_node const &report) buf[xml.used()] = 0; { - New_file file { _root_dir, "fb_drv.config" }; + New_file file { _root_dir, "fb.config" }; file.append(buf, xml.used()); } diff --git a/repos/ports/recipes/pkg/vbox6-capture/runtime b/repos/ports/recipes/pkg/vbox6-capture/runtime index 8813f07909..2947d60693 100644 --- a/repos/ports/recipes/pkg/vbox6-capture/runtime +++ b/repos/ports/recipes/pkg/vbox6-capture/runtime @@ -14,7 +14,7 @@ - + @@ -86,8 +86,8 @@ - - + + diff --git a/repos/ports/recipes/pkg/vbox6/runtime b/repos/ports/recipes/pkg/vbox6/runtime index 18e391bfe0..ad971486af 100644 --- a/repos/ports/recipes/pkg/vbox6/runtime +++ b/repos/ports/recipes/pkg/vbox6/runtime @@ -13,7 +13,7 @@ - + @@ -83,8 +83,8 @@ - - + + diff --git a/repos/ports/run/gdb.inc b/repos/ports/run/gdb.inc index 3519479a5a..bd0995bde2 100644 --- a/repos/ports/run/gdb.inc +++ b/repos/ports/run/gdb.inc @@ -87,8 +87,8 @@ append config { if { [have_include power_on/qemu] } { append_if [have_board pc] config { - - + + @@ -101,8 +101,8 @@ if { [have_include power_on/qemu] } { } append_if [have_board rpi3] config { - - + + @@ -292,7 +292,7 @@ append config { - + diff --git a/repos/ports/run/genode_org.run b/repos/ports/run/genode_org.run index 1087d8eb87..fca26991a1 100644 --- a/repos/ports/run/genode_org.run +++ b/repos/ports/run/genode_org.run @@ -45,7 +45,7 @@ install_config { - + @@ -65,7 +65,7 @@ install_config { - + diff --git a/repos/ports/run/lighttpd.run b/repos/ports/run/lighttpd.run index 1e69f303a5..481cf2bb67 100644 --- a/repos/ports/run/lighttpd.run +++ b/repos/ports/run/lighttpd.run @@ -56,7 +56,7 @@ install_config { - + @@ -76,7 +76,7 @@ install_config { - + } [nic_router_uplink] { diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index 40fef583ee..4173f6abd3 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -150,19 +150,19 @@ set packages " [depot_user]/src/vfs [depot_user]/src/nic_router " -set use_nic_drv [expr !$use_usb_driver && !$use_wifi_driver] -append_if $use_nic_drv packages " [depot_user]/pkg/[drivers_nic_pkg] " -append_if [expr !$use_lxip] packages " [depot_user]/src/vfs_lwip " -append_if $use_lxip packages " [depot_user]/src/vfs_lxip " -append_if $use_nic_bridge packages " [depot_user]/src/nic_bridge " -append_if $use_usb_driver packages " [depot_user]/pkg/test_usb_host_drv-[board] " -append_if $use_usb_driver packages " [depot_user]/src/usb_net_drv " -append_if $use_wifi_driver packages " [depot_user]/src/fs_rom " -append_if $use_wifi_driver packages " [depot_user]/src/vfs_import " -append_if $use_wifi_driver packages " [depot_user]/pkg/pc_wifi " -append_if $use_wifi_driver packages " [depot_user]/src/acpi_drv " -append_if $use_wifi_driver packages " [depot_user]/src/pci_decode " -append_if $use_wifi_driver packages " [depot_user]/src/platform_drv " +set use_nic_driver [expr !$use_usb_driver && !$use_wifi_driver] +append_if $use_nic_driver packages " [depot_user]/pkg/[drivers_nic_pkg] " +append_if [expr !$use_lxip] packages " [depot_user]/src/vfs_lwip " +append_if $use_lxip packages " [depot_user]/src/vfs_lxip " +append_if $use_nic_bridge packages " [depot_user]/src/nic_bridge " +append_if $use_usb_driver packages " [depot_user]/pkg/test_usb_host-[board] " +append_if $use_usb_driver packages " [depot_user]/src/usb_net " +append_if $use_wifi_driver packages " [depot_user]/src/fs_rom " +append_if $use_wifi_driver packages " [depot_user]/src/vfs_import " +append_if $use_wifi_driver packages " [depot_user]/pkg/pc_wifi " +append_if $use_wifi_driver packages " [depot_user]/src/acpi " +append_if $use_wifi_driver packages " [depot_user]/src/pci_decode " +append_if $use_wifi_driver packages " [depot_user]/src/platform " import_from_depot $packages @@ -206,12 +206,12 @@ if { $use_wifi_driver } { - - + + - + @@ -223,7 +223,7 @@ if { $use_wifi_driver } { - + @@ -231,7 +231,7 @@ if { $use_wifi_driver } { - + @@ -264,8 +264,8 @@ append config { - - + + @@ -297,7 +297,7 @@ append config { append config { - + @@ -310,8 +310,8 @@ append config { - - + + @@ -324,7 +324,7 @@ append config { append config { - + @@ -348,7 +348,7 @@ append config { if {$use_nic_bridge} { append config { - } + } } else { append config { @@ -356,7 +356,7 @@ if {$use_nic_bridge} { append config { } append config { - + } append_if [have_board rpi] usb_config { - + } append_if [have_spec x86] usb_config { - + } append usb_config {} diff --git a/repos/ports/run/netperf_lwip_wifi.run b/repos/ports/run/netperf_lwip_wifi.run index 57d79ca862..99ba2a31ea 100644 --- a/repos/ports/run/netperf_lwip_wifi.run +++ b/repos/ports/run/netperf_lwip_wifi.run @@ -1,5 +1,5 @@ # -# \brief Test using netperf with the wifi_drv +# \brief Test using netperf with the wifi driver # \author Alexander Boettcher # \date 2013-07-08 # diff --git a/repos/ports/run/netperf_lxip_wifi.run b/repos/ports/run/netperf_lxip_wifi.run index 7580b1f2bb..e6ab126dfa 100644 --- a/repos/ports/run/netperf_lxip_wifi.run +++ b/repos/ports/run/netperf_lxip_wifi.run @@ -1,5 +1,5 @@ # -# \brief Test using netperf with the wifi_drv +# \brief Test using netperf with the wifi driver # \author Alexander Boettcher # \date 2013-07-08 # diff --git a/repos/ports/run/socat.run b/repos/ports/run/socat.run index d5b317d041..357cbae9c6 100644 --- a/repos/ports/run/socat.run +++ b/repos/ports/run/socat.run @@ -58,8 +58,8 @@ append config { if { [have_include power_on/qemu] } { append_if [have_board pc] config { - - + + @@ -72,8 +72,8 @@ if { [have_include power_on/qemu] } { } append_if [have_board rpi3] config { - - + + @@ -209,7 +209,7 @@ append config { - + @@ -256,7 +256,7 @@ if {[have_include power_on/qemu]} { append qemu_args " -chardev socket,id=uart,port=$port,host=$host,server,nowait,ipv4 " - run_genode_until {\[init -> uart_drv\].*\n} 30 + run_genode_until {\[init -> uart\].*\n} 30 } else { diff --git a/repos/ports/run/vbox5_genode_usb_hid_raw.run b/repos/ports/run/vbox5_genode_usb_hid_raw.run index cf5098c4ab..04d702f298 100644 --- a/repos/ports/run/vbox5_genode_usb_hid_raw.run +++ b/repos/ports/run/vbox5_genode_usb_hid_raw.run @@ -15,7 +15,7 @@ if { [have_include "power_on/qemu"] || ![have_spec nova] || ![have_spec x86_64]} create_boot_directory import_from_depot [depot_user]/src/[base_src] \ - [depot_user]/src/acpi_drv \ + [depot_user]/src/acpi \ [depot_user]/src/fs_rom \ [depot_user]/src/init \ [depot_user]/src/jpeg \ @@ -24,15 +24,15 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/libyuv \ [depot_user]/src/log_terminal \ [depot_user]/src/nitpicker \ - [depot_user]/src/pc_usb_host_drv \ + [depot_user]/src/pc_usb_host \ [depot_user]/src/pci_decode \ - [depot_user]/src/platform_drv \ + [depot_user]/src/platform \ [depot_user]/src/posix \ - [depot_user]/src/ps2_drv \ + [depot_user]/src/ps2 \ [depot_user]/src/report_rom \ [depot_user]/src/stdcxx \ [depot_user]/src/vbox5-nova \ - [depot_user]/src/vesa_drv \ + [depot_user]/src/vesa_fb \ [depot_user]/src/vfs \ [depot_user]/src/vfs_import \ [depot_user]/src/vfs_pipe \ @@ -59,14 +59,14 @@ install_config { - - - - + + + + - + @@ -83,7 +83,7 @@ install_config { - + @@ -92,9 +92,9 @@ install_config { - - - + + + @@ -103,8 +103,8 @@ install_config { - - + + @@ -112,7 +112,7 @@ install_config { - + @@ -227,7 +227,7 @@ run_genode_until {.*\[init -\> event_dump\] Input event #11.*\n} 60 [output_spaw # pay only attention to the output of init and its children grep_output {^\[init } -unify_output {(?n)^\[init -\> log_terminal\] \[init -\> usb_hid_drv\] usb usb-[0-9]-[0-9]: input irq status -19 received} "" +unify_output {(?n)^\[init -\> log_terminal\] \[init -\> usb_hid\] usb usb-[0-9]-[0-9]: input irq status -19 received} "" unify_output {(?n) on usb-usbbus.*$} "" unify_output {(?n) at usb-usbbus.*\)} ")" unify_output {(?n)hid-generic.*input:} "hid-generic: input:" @@ -235,8 +235,8 @@ unify_output {(?n)usb-[0-9]-[0-9]: USB disconnect, device number [0-9]} "usb-X-X unify_output {(?n)device number [0-9]+} "device number X" unify_output {(?n)input[0-9]} "inputX" unify_output {(?n) as /devices/.*} "" -unify_output {(?n)^\[init -\> usb_drv.*} "" -unify_output {(?n)^\[init -\> log_terminal\] \[init -\> usb_drv.*} "" +unify_output {(?n)^\[init -\> usb.*} "" +unify_output {(?n)^\[init -\> log_terminal\] \[init -\> usb.*} "" unify_output {(?n)^.*dangling allocation.*$} "" unify_output {(?n)^.*usbfs: process .* did not claim interface.*$} "" trim_lines @@ -247,15 +247,15 @@ compare_output_to { [init -> log_terminal] [init -> event_dump] Input event #2 REL_MOTION -1+1 key count: 0 [init -> log_terminal] [init -> event_dump] Input event #3 PRESS BTN_LEFT 65534 key count: 1 [init -> log_terminal] [init -> event_dump] Input event #4 RELEASE BTN_LEFT key count: 0 -[init -> log_terminal] [init -> usb_hid_drv] usb usb-X-X: USB disconnect, device number X -[init -> log_terminal] [init -> usb_hid_drv] Disconnected device: inputX -[init -> log_terminal] [init -> usb_hid_drv] Disconnected device: inputX -[init -> log_terminal] [init -> usb_hid_drv] input: Dean Camera LUFA Mouse and Keyboard Demo -[init -> log_terminal] [init -> usb_hid_drv] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) -[init -> log_terminal] [init -> usb_hid_drv] hid-generic: input: USB HID v1.11 Keyboard [Dean Camera LUFA Mouse and Keyboard Demo] -[init -> log_terminal] [init -> usb_hid_drv] input: Dean Camera LUFA Mouse and Keyboard Demo -[init -> log_terminal] [init -> usb_hid_drv] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) MOUSE -[init -> log_terminal] [init -> usb_hid_drv] hid-generic: input: USB HID v1.11 Mouse [Dean Camera LUFA Mouse and Keyboard Demo] +[init -> log_terminal] [init -> usb_hid] usb usb-X-X: USB disconnect, device number X +[init -> log_terminal] [init -> usb_hid] Disconnected device: inputX +[init -> log_terminal] [init -> usb_hid] Disconnected device: inputX +[init -> log_terminal] [init -> usb_hid] input: Dean Camera LUFA Mouse and Keyboard Demo +[init -> log_terminal] [init -> usb_hid] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) +[init -> log_terminal] [init -> usb_hid] hid-generic: input: USB HID v1.11 Keyboard [Dean Camera LUFA Mouse and Keyboard Demo] +[init -> log_terminal] [init -> usb_hid] input: Dean Camera LUFA Mouse and Keyboard Demo +[init -> log_terminal] [init -> usb_hid] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) MOUSE +[init -> log_terminal] [init -> usb_hid] hid-generic: input: USB HID v1.11 Mouse [Dean Camera LUFA Mouse and Keyboard Demo] [init -> log_terminal] [init -> event_dump] Input event #5 PRESS KEY_X 65534 key count: 1 [init -> log_terminal] [init -> event_dump] Input event #6 RELEASE KEY_X key count: 0 [init -> log_terminal] [init -> event_dump] Input event #7 REL_MOTION -1+1 key count: 0 diff --git a/repos/ports/run/vbox_share.inc b/repos/ports/run/vbox_share.inc index 37f8a92473..1156c50813 100644 --- a/repos/ports/run/vbox_share.inc +++ b/repos/ports/run/vbox_share.inc @@ -117,8 +117,8 @@ lappend boot_modules bash.tar coreutils.tar test.bin template.bat $vbox_file set config_of_app { - - + + @@ -134,7 +134,7 @@ set config_of_app { - + @@ -272,9 +272,9 @@ set config_of_app { - - - + + + diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc index 064504e9cc..a8d546cb72 100644 --- a/repos/ports/run/vbox_win.inc +++ b/repos/ports/run/vbox_win.inc @@ -75,8 +75,8 @@ set config_of_app { Note: to get network access in the VM, the virtual network adapter needs to be enabled in the .vbox file (disabled by default) --> - - + + @@ -92,8 +92,8 @@ set config_of_app { - - + + @@ -122,8 +122,8 @@ set config_of_app { needs to be enabled in the .vbox file (disabled by default). (Recording is configured to use the external mic.) --> - - + + @@ -140,10 +140,10 @@ set config_of_app { - - } + + } append config_of_app { - + } append_if [expr $use_cpu_load] config_of_app { - + @@ -93,8 +93,8 @@ append config { } append_if [expr $use_net] config { - - + + @@ -110,8 +110,8 @@ append_if [expr $use_net] config { - - + + diff --git a/repos/ports/run/virtualbox6.run b/repos/ports/run/virtualbox6.run index 416a2a9a6f..0c5e408e5c 100644 --- a/repos/ports/run/virtualbox6.run +++ b/repos/ports/run/virtualbox6.run @@ -28,7 +28,7 @@ lappend depot_archives [depot_user]/src/libdrm lappend depot_archives [depot_user]/src/libyuv lappend depot_archives [depot_user]/src/vfs_gpu -lappend_if [expr $use_net] depot_archives [depot_user]/src/pc_nic_drv +lappend_if [expr $use_net] depot_archives [depot_user]/src/pc_nic lappend_if [expr $use_net] depot_archives [depot_user]/src/nic_router import_from_depot $depot_archives @@ -97,7 +97,7 @@ append config { - + @@ -112,8 +112,8 @@ append_if [expr $use_net] config { - - + + - - + + @@ -278,9 +278,9 @@ install_config $config copy_file [genode_dir]/repos/ports/run/virtualbox6.vbox bin/ # -# Instruct vesa_drv to use maximum resolution +# Define VESA driver resolution # -set fd [open bin/fb_drv.config w] +set fd [open bin/fb.config w] puts $fd {} close $fd @@ -296,7 +296,7 @@ append boot_modules { test.iso virtualbox6.vbox } append_if [expr $use_overlay] boot_modules { overlay.vdi } -lappend boot_modules pci_audio_drv +lappend boot_modules pci_audio build_boot_image $boot_modules diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index 6fbe4e0ad1..bcbd07c0c8 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -28,8 +28,8 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/libiconv \ [depot_user]/src/nitpicker \ [depot_user]/src/part_block \ - [depot_user]/src/platform_drv \ - [depot_user]/src/acpi_drv \ + [depot_user]/src/platform \ + [depot_user]/src/acpi \ [depot_user]/src/pci_decode \ [depot_user]/src/report_rom \ [depot_user]/src/stdcxx \ @@ -43,8 +43,8 @@ if {$use_vms > 1} { } if {$use_usb} { - import_from_depot [depot_user]/src/pc_usb_host_drv \ - [depot_user]/src/usb_hid_drv + import_from_depot [depot_user]/src/pc_usb_host \ + [depot_user]/src/usb_hid } if {!$use_usb} { @@ -122,12 +122,12 @@ append config { - - + + - + @@ -144,19 +144,19 @@ append config { - + - - - - + + + + - - + + @@ -164,7 +164,7 @@ append config { - + @@ -172,7 +172,7 @@ append config { - + @@ -181,13 +181,13 @@ append config { - - + + - + @@ -198,7 +198,7 @@ append config { - + } append_if [expr $use_rumpfs] config { @@ -335,8 +335,8 @@ append_if [expr $use_cpu_load] config { } append_if [expr $use_usb] config { - - + + @@ -345,7 +345,7 @@ append_if [expr $use_usb] config { - + @@ -370,19 +370,19 @@ append_if [expr $use_usb] config { - + - + } append_if [expr !$use_usb] config { - + diff --git a/tool/autopilot.list b/tool/autopilot.list index 575419d12b..406e3471d1 100644 --- a/tool/autopilot.list +++ b/tool/autopilot.list @@ -61,7 +61,7 @@ nvme ping ping_nic_router nova -platform_drv +platform rtc rump_ext2 sd_card_bench diff --git a/tool/run/boot_dir/fiasco b/tool/run/boot_dir/fiasco index 21a8ebfa5c..e7f7b86174 100644 --- a/tool/run/boot_dir/fiasco +++ b/tool/run/boot_dir/fiasco @@ -1,6 +1,6 @@ proc binary_name_ld_lib_so { } { return "ld-fiasco.lib.so" } proc binary_name_core_a { } { return "core-fiasco.a" } -proc binary_name_timer { } { return "fiasco_timer_drv" } +proc binary_name_timer { } { return "fiasco_timer" } proc kernel_files { } { return { fiasco sigma0-fiasco bootstrap-fiasco } } diff --git a/tool/run/boot_dir/foc b/tool/run/boot_dir/foc index fd5db6c8d8..35c4be2ed8 100644 --- a/tool/run/boot_dir/foc +++ b/tool/run/boot_dir/foc @@ -1,6 +1,6 @@ -proc binary_name_ld_lib_so { } { return "ld-foc.lib.so" } +proc binary_name_ld_lib_so { } { return "ld-foc.lib.so" } proc binary_name_core_a { } { return "core-foc-[board].a" } -proc binary_name_timer { } { return "foc_timer_drv" } +proc binary_name_timer { } { return "foc_timer" } proc kernel_files { } { return { foc sigma0-foc bootstrap-foc } } diff --git a/tool/run/boot_dir/hw b/tool/run/boot_dir/hw index 7bccb18d75..469a90be50 100644 --- a/tool/run/boot_dir/hw +++ b/tool/run/boot_dir/hw @@ -1,6 +1,6 @@ proc binary_name_ld_lib_so { } { return "ld-hw.lib.so" } proc binary_name_core_a { } { return "core-hw.a" } -proc binary_name_timer { } { return "hw_timer_drv" } +proc binary_name_timer { } { return "hw_timer" } proc binary_name_image_elf { } { return "image-hw.elf" } diff --git a/tool/run/boot_dir/linux b/tool/run/boot_dir/linux index 6d29be5c45..c45f6fe46a 100644 --- a/tool/run/boot_dir/linux +++ b/tool/run/boot_dir/linux @@ -1,6 +1,6 @@ proc binary_name_ld_lib_so { } { return "ld-linux.lib.so" } -proc binary_name_core { } { return "core-linux" } -proc binary_name_timer { } { return "linux_timer_drv" } +proc binary_name_core { } { return "core-linux" } +proc binary_name_timer { } { return "linux_timer" } ## @@ -16,7 +16,7 @@ proc run_boot_dir {binaries} { set dst_binary "[kernel_specific_binary $binary]" if {$dst_binary == "core-linux"} { set dst_binary "core" } if {$dst_binary == "ld-linux.lib.so"} { set dst_binary "ld.lib.so" } - if {$dst_binary == "linux_timer_drv"} { set dst_binary "timer" } + if {$dst_binary == "linux_timer"} { set dst_binary "timer" } if {[file exists $src_binary_path]} { exec ln -sf $src_binary_path [run_dir]/genode/$dst_binary diff --git a/tool/run/boot_dir/nova b/tool/run/boot_dir/nova index 422a48fd9b..720189004f 100644 --- a/tool/run/boot_dir/nova +++ b/tool/run/boot_dir/nova @@ -28,7 +28,7 @@ proc bender_intel_hwp_mode_option { } { proc binary_name_ld_lib_so { } { return "ld-nova.lib.so" } proc binary_name_core_a { } { return "core-nova.a" } -proc binary_name_timer { } { return "nova_timer_drv" } +proc binary_name_timer { } { return "nova_timer" } proc kernel_files { } { return hypervisor } proc kernel_output { } { return "serial" } diff --git a/tool/run/boot_dir/okl4 b/tool/run/boot_dir/okl4 index 62afff09f7..8ccf0ce370 100644 --- a/tool/run/boot_dir/okl4 +++ b/tool/run/boot_dir/okl4 @@ -1,6 +1,6 @@ proc binary_name_ld_lib_so { } { return "ld-okl4.lib.so" } proc binary_name_core_a { } { return "core-okl4.a" } -proc binary_name_timer { } { return "pit_timer_drv" } +proc binary_name_timer { } { return "pit_timer" } proc kernel_files { } { return okl4 } diff --git a/tool/run/boot_dir/pistachio b/tool/run/boot_dir/pistachio index 48a2810889..b59c0b842f 100644 --- a/tool/run/boot_dir/pistachio +++ b/tool/run/boot_dir/pistachio @@ -1,6 +1,6 @@ proc binary_name_ld_lib_so { } { return "ld-pistachio.lib.so" } proc binary_name_core_a { } { return "core-pistachio.a" } -proc binary_name_timer { } { return "pit_timer_drv" } +proc binary_name_timer { } { return "pit_timer" } proc kernel_files { } { return { pistachio sigma0-pistachio kickstart-pistachio } } diff --git a/tool/run/boot_dir/sel4 b/tool/run/boot_dir/sel4 index f02c6952f7..992ac2818d 100644 --- a/tool/run/boot_dir/sel4 +++ b/tool/run/boot_dir/sel4 @@ -1,9 +1,9 @@ proc binary_name_ld_lib_so { } { return "ld-sel4.lib.so" } proc binary_name_core_a { } { return "core-sel4.a" } proc binary_name_timer { } { - if {[have_board imx6q_sabrelite]} { return "imx6_timer_drv" } - if {[have_board imx7d_sabre]} { return "imx7_timer_drv" } - if {[have_board pc]} { return "pit_timer_drv" } + if {[have_board imx6q_sabrelite]} { return "imx6_timer" } + if {[have_board imx7d_sabre]} { return "imx7_timer" } + if {[have_board pc]} { return "pit_timer" } puts "unknown platform - no timer driver" exit -1 }