From bf62d6b8962c0f02c455f26b44e8591de18ae1a5 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Thu, 3 Jan 2019 18:01:49 +0100 Subject: [PATCH] Move timer from os to base repository Since the timer and timeout handling is part of the base library (the dynamic linker), it belongs to the base repository. Besides moving the timer and its related infrastructure (alarm, timeout libs, tests) to the base repository, this patch also moves the timer from the 'drivers' subdirectory directly to 'src' and disamibuates the timer's build locations for the various kernels. Otherwise the different timer implementations could interfere with each other when using one build directory with multiple kernels. Note that this patch changes the include paths for the former os/timer, os/alarm.h, os/duration.h, and os/timed_semaphore.h to base/. Issue #3101 --- .../recipes/src/base-fiasco/content.mk | 18 +---------------- repos/base-fiasco/src/timer/fiasco/target.mk | 9 +++++++++ .../base-foc/recipes/src/base-foc_content.inc | 20 ++----------------- repos/base-foc/src/timer/foc/target.mk | 9 +++++++++ repos/base-hw/lib/mk/timeout-hw.mk | 2 +- repos/base-hw/recipes/src/base-hw_content.inc | 19 ++---------------- repos/base-hw/src/timer/hw/target.mk | 7 +++++++ .../src}/timer/hw/time_source.cc | 0 .../src}/timer/hw/time_source.h | 2 +- .../recipes/api/base-linux/content.mk | 7 ++++++- .../recipes/src/base-linux/content.mk | 10 +--------- repos/base-linux/run/region_map_mmap.run | 2 +- repos/base-linux/src/timer/linux/target.mk | 9 +++++++++ .../src}/timer/linux/time_source.cc | 0 .../recipes/api/base-nova/content.mk | 8 +++++++- .../recipes/src/base-nova/content.mk | 19 +----------------- repos/base-nova/src/timer/nova/target.mk | 5 +++++ .../src}/timer/nova/time_source.cc | 0 .../src}/timer/nova/time_source.h | 0 .../recipes/src/base-okl4/content.mk | 18 +---------------- repos/base-okl4/src/timer/pit/target.mk | 1 + .../recipes/src/base-pistachio/content.mk | 18 +---------------- repos/base-pistachio/src/timer/pit/target.mk | 1 + .../src/base-sel4-wand_quad/content.mk | 12 ++--------- .../recipes/src/base-sel4-x86/content.mk | 18 +---------------- .../src/timer/epit/wand_quad/target.mk | 1 + repos/base-sel4/src/timer/pit/target.mk | 1 + .../include/os => base/include/base}/alarm.h | 6 +++--- .../os => base/include/base}/duration.h | 6 +++--- .../include/base}/timed_semaphore.h | 8 ++++---- .../include/spec/arm_v6/trace/timestamp.h | 0 .../include/spec/arm_v7/trace/timestamp.h | 0 .../include/spec/riscv/trace/timestamp.h | 0 .../include/spec/x86_32/trace/timestamp.h | 0 .../include/spec/x86_64/trace/timestamp.h | 0 repos/{os => base}/include/timer/timeout.h | 2 +- .../include/timer_session/capability.h | 0 .../include/timer_session/client.h | 0 .../include/timer_session/connection.h | 0 .../include/timer_session/timer_session.h | 0 repos/base/lib/mk/alarm.mk | 3 +++ repos/{os => base}/lib/mk/timed_semaphore.mk | 0 repos/{os => base}/lib/mk/timeout-arm.mk | 2 +- repos/{os => base}/lib/mk/timeout.mk | 2 +- repos/base/recipes/api/base/content.mk | 5 ----- .../base/recipes/api/timer_session/content.mk | 9 +++++++++ .../recipes/api/timer_session/hash | 0 .../recipes/pkg/test-timer/README | 0 .../recipes/pkg/test-timer/archives | 0 .../{os => base}/recipes/pkg/test-timer/hash | 0 .../recipes/pkg/test-timer/runtime | 0 repos/base/recipes/src/base_content.inc | 18 ++--------------- .../src/test-timed_semaphore/content.mk | 4 ++-- .../recipes/src/test-timed_semaphore/hash | 0 .../src/test-timed_semaphore/used_apis | 0 .../recipes/src/test-timer/content.mk | 0 .../{os => base}/recipes/src/test-timer/hash | 0 .../recipes/src/test-timer/used_apis | 0 repos/{os => base}/run/timer_accuracy.run | 2 +- repos/{os => base}/src/lib/alarm/alarm.cc | 2 +- repos/base/src/lib/ldso/main.cc | 2 +- .../lib/timed_semaphore/timed_semaphore.cc | 2 +- .../lib/timeout/arm/timer_connection_time.cc | 0 .../{os => base}/src/lib/timeout/duration.cc | 2 +- .../timeout/hw/timer_connection_timestamp.cc | 0 repos/{os => base}/src/lib/timeout/timeout.cc | 0 .../src/lib/timeout/timer_connection.cc | 0 .../src/lib/timeout/timer_connection_time.cc | 0 .../lib/timeout/timer_connection_timestamp.cc | 0 .../src/test/timed_semaphore/main.cc | 2 +- .../src/test/timed_semaphore/target.mk | 0 repos/{os => base}/src/test/timer/main.cc | 0 repos/{os => base}/src/test/timer/target.mk | 0 .../src/test/timer_accuracy/main.cc | 0 .../src/test/timer_accuracy/target.mk | 0 .../src}/timer/epit/time_source.cc | 0 .../src}/timer/epit/time_source.h | 0 .../base/src/timer/epit/wand_quad/target.inc | 9 +++++++++ .../src}/timer/epit/wand_quad/timer.cc | 0 .../src}/timer/fiasco/time_source.cc | 0 .../src}/timer/include/root_component.h | 0 .../src}/timer/include/session_component.h | 0 .../timer/include/signalled_time_source.h | 0 .../src}/timer/include/threaded_time_source.h | 0 .../src/drivers => base/src}/timer/main.cc | 0 .../src}/timer/periodic/time_source.cc | 0 .../src}/timer/periodic/time_source.h | 0 repos/base/src/timer/pit/target.inc | 9 +++++++++ .../src}/timer/pit/time_source.cc | 0 .../src}/timer/pit/time_source.h | 2 +- repos/base/src/timer/target.inc | 5 +++++ repos/dde_bsd/run/audio_in.run | 3 +-- repos/dde_bsd/run/audio_out.run | 3 +-- repos/dde_linux/run/intel_fb.run | 3 +-- repos/dde_linux/run/lxip_http_srv.run | 4 ++-- repos/dde_linux/run/lxip_udp_echo.run | 4 ++-- repos/dde_linux/run/nic_router_uplinks.run | 2 +- repos/dde_linux/run/usb_hid.run | 3 +-- repos/dde_linux/run/usb_hid_panda.run | 3 +-- repos/dde_linux/run/usb_hid_reconnect.run | 3 +-- repos/dde_linux/run/usb_net.run | 3 +-- repos/dde_linux/run/usb_rndis.run | 4 ++-- repos/dde_linux/run/usb_storage.run | 3 +-- repos/dde_linux/run/usb_terminal.run | 3 +-- repos/dde_linux/run/vfs_cfg.run | 3 +-- repos/dde_linux/run/vfs_lxip.run | 4 ++-- repos/dde_linux/run/wifi.run | 3 +-- repos/dde_rump/run/fs_rom_update_ext2.run | 3 +-- repos/dde_rump/run/rump_ext2.run | 3 +-- repos/dde_rump/run/rump_fat.run | 3 +-- repos/dde_rump/run/rump_iso.run | 3 +-- repos/dde_rump/run/vfs_stress_ext2.run | 2 +- repos/dde_rump/run/vfs_stress_rump_fs.run | 2 +- repos/dde_rump/src/lib/rump/hypercall.cc | 2 +- repos/dde_rump/src/lib/rump/sync.cc | 2 +- repos/dde_zircon/run/zx_pc_ps2.run | 3 +-- repos/gems/run/cpu_load_display.run | 3 +-- repos/gems/run/cpu_sampler.run | 4 +--- repos/gems/run/gpt_write.run | 2 +- repos/gems/run/noux_vfs_audit.run | 3 +-- repos/gems/run/ssh_terminal.run | 3 +-- repos/gems/run/tcp_terminal.run | 4 ++-- repos/gems/run/terminal_mux.run | 2 +- repos/libports/run/acpica.run | 3 +-- repos/libports/run/fetchurl.inc | 3 +-- repos/libports/run/fs_rom_update_fat.run | 3 +-- repos/libports/run/libc_block.run | 3 +-- repos/libports/run/libc_component.run | 2 +- repos/libports/run/libc_filesystem_test.inc | 3 +-- repos/libports/run/libc_getaddrinfo.run | 3 +-- repos/libports/run/libc_select.run | 2 +- repos/libports/run/libc_vfs_component.run | 2 +- repos/libports/run/libc_vfs_fs_test.inc | 3 +-- repos/libports/run/libc_vfs_select.run | 2 +- repos/libports/run/libc_with_libc.run | 2 +- repos/libports/run/lwip.run | 4 ++-- repos/libports/run/lwip_lx.run | 4 ++-- repos/libports/run/mesa.inc | 3 +-- repos/libports/run/moon.run | 2 +- repos/libports/run/netty.inc | 3 +-- repos/libports/run/netty_lwip.inc | 3 +-- repos/libports/run/nic_bridge.run | 4 ++-- repos/libports/run/nic_bridge_lighttpd.run | 4 ++-- repos/libports/run/nic_router.inc | 2 +- repos/libports/run/nim.run | 3 +-- repos/libports/run/nim_netty.run | 4 ++-- repos/libports/run/smartcard.run | 3 +-- repos/libports/src/lib/libc/task.h | 2 +- repos/libports/src/lib/libc/thread.cc | 2 +- repos/os/lib/mk/alarm.mk | 3 --- repos/os/recipes/api/os/content.mk | 4 +--- repos/os/recipes/api/timer_session/content.mk | 2 -- repos/os/run/ahci_bench.run | 3 +-- repos/os/run/ahci_blk.run | 3 +-- repos/os/run/audio_out_click.run | 3 +-- repos/os/run/block_tester.run | 3 +-- repos/os/run/bomb.run | 2 +- repos/os/run/cpu_quota.run | 2 +- repos/os/run/demo.run | 3 +-- repos/os/run/fb_bench.run | 2 +- repos/os/run/framebuffer.run | 2 +- repos/os/run/gpio_drv.run | 4 ++-- repos/os/run/gpio_led.run | 4 ++-- repos/os/run/gpio_signal.run | 4 ++-- repos/os/run/init_smp.run | 2 +- repos/os/run/input.run | 3 +-- repos/os/run/input_filter.run | 2 +- repos/os/run/kdb_uart_drv.run | 3 +-- repos/os/run/loader.run | 3 +-- repos/os/run/log_core.run | 2 +- repos/os/run/mixer.run | 3 +-- repos/os/run/nic_router_flood.run | 4 +--- repos/os/run/nvme.run | 3 +-- repos/os/run/panda_uart4_echo.run | 4 ++-- repos/os/run/ping.run | 4 +--- repos/os/run/ping_nic_router.run | 4 +--- repos/os/run/pointer.run | 3 +-- repos/os/run/rom_to_file.run | 2 +- repos/os/run/rtc.run | 2 +- repos/os/run/sd_card.run | 5 ++--- repos/os/run/sd_card_bench.run | 3 +-- repos/os/run/tar_rom.run | 2 +- repos/os/run/timeout.run | 2 +- repos/os/run/tz_vmm.run | 2 +- repos/os/run/uart.run | 4 ++-- repos/os/run/usb_block.run | 3 +-- repos/os/run/vmm.run | 3 +-- repos/os/src/app/ping/xml_node.h | 2 +- repos/os/src/app/trace_logger/xml_node.h | 2 +- .../drivers/timer/epit/wand_quad/target.mk | 9 --------- repos/os/src/drivers/timer/fiasco/target.mk | 7 ------- repos/os/src/drivers/timer/foc/target.mk | 7 ------- repos/os/src/drivers/timer/hw/target.mk | 7 ------- repos/os/src/drivers/timer/linux/target.mk | 7 ------- repos/os/src/drivers/timer/nova/target.mk | 6 ------ repos/os/src/drivers/timer/pit/target.mk | 6 ------ repos/os/src/drivers/timer/target.inc | 5 ----- .../os/src/server/nic_router/configuration.h | 2 +- repos/os/src/server/nic_router/xml_node.h | 2 +- repos/ports/run/debug_nitpicker.run | 4 ++-- repos/ports/run/gdb_monitor.run | 4 ++-- repos/ports/run/gdb_monitor_interactive.run | 4 ++-- repos/ports/run/gdb_monitor_target_config.run | 4 ++-- repos/ports/run/genode_org.run | 3 +-- repos/ports/run/libc_noux.run | 2 +- repos/ports/run/lighttpd.run | 3 +-- repos/ports/run/netperf.inc | 3 +-- repos/ports/run/noux.run | 2 +- repos/ports/run/noux_fork.run | 2 +- repos/ports/run/noux_signals.run | 4 ++-- repos/ports/run/noux_tool_chain_auto.run | 2 +- repos/ports/run/noux_uname.run | 3 +-- repos/ports/run/seoul.inc | 3 +-- repos/ports/run/stubby.run | 3 +-- repos/ports/run/vbox5_genode_usb_hid.run | 3 +-- repos/ports/run/virtualbox.run | 3 +-- repos/ports/run/virtualbox_auto.inc | 3 +-- repos/ports/run/virtualbox_nic_router.run | 2 +- repos/ports/run/vmm_utils.run | 2 +- repos/ports/src/app/netperf/timer.cc | 2 +- repos/ports/src/noux/target.mk | 2 +- repos/ports/src/noux/timeout_scheduler.h | 2 +- 222 files changed, 272 insertions(+), 454 deletions(-) create mode 100644 repos/base-fiasco/src/timer/fiasco/target.mk create mode 100644 repos/base-foc/src/timer/foc/target.mk create mode 100644 repos/base-hw/src/timer/hw/target.mk rename repos/{os/src/drivers => base-hw/src}/timer/hw/time_source.cc (100%) rename repos/{os/src/drivers => base-hw/src}/timer/hw/time_source.h (97%) create mode 100644 repos/base-linux/src/timer/linux/target.mk rename repos/{os/src/drivers => base-linux/src}/timer/linux/time_source.cc (100%) create mode 100644 repos/base-nova/src/timer/nova/target.mk rename repos/{os/src/drivers => base-nova/src}/timer/nova/time_source.cc (100%) rename repos/{os/src/drivers => base-nova/src}/timer/nova/time_source.h (100%) create mode 100644 repos/base-okl4/src/timer/pit/target.mk create mode 100644 repos/base-pistachio/src/timer/pit/target.mk create mode 100644 repos/base-sel4/src/timer/epit/wand_quad/target.mk create mode 100644 repos/base-sel4/src/timer/pit/target.mk rename repos/{os/include/os => base/include/base}/alarm.h (97%) rename repos/{os/include/os => base/include/base}/duration.h (95%) rename repos/{os/include/os => base/include/base}/timed_semaphore.h (97%) rename repos/{os => base}/include/spec/arm_v6/trace/timestamp.h (100%) rename repos/{os => base}/include/spec/arm_v7/trace/timestamp.h (100%) rename repos/{os => base}/include/spec/riscv/trace/timestamp.h (100%) rename repos/{os => base}/include/spec/x86_32/trace/timestamp.h (100%) rename repos/{os => base}/include/spec/x86_64/trace/timestamp.h (100%) rename repos/{os => base}/include/timer/timeout.h (99%) rename repos/{os => base}/include/timer_session/capability.h (100%) rename repos/{os => base}/include/timer_session/client.h (100%) rename repos/{os => base}/include/timer_session/connection.h (100%) rename repos/{os => base}/include/timer_session/timer_session.h (100%) create mode 100644 repos/base/lib/mk/alarm.mk rename repos/{os => base}/lib/mk/timed_semaphore.mk (100%) rename repos/{os => base}/lib/mk/timeout-arm.mk (79%) rename repos/{os => base}/lib/mk/timeout.mk (77%) create mode 100644 repos/base/recipes/api/timer_session/content.mk rename repos/{os => base}/recipes/api/timer_session/hash (100%) rename repos/{os => base}/recipes/pkg/test-timer/README (100%) rename repos/{os => base}/recipes/pkg/test-timer/archives (100%) rename repos/{os => base}/recipes/pkg/test-timer/hash (100%) rename repos/{os => base}/recipes/pkg/test-timer/runtime (100%) rename repos/{os => base}/recipes/src/test-timed_semaphore/content.mk (50%) rename repos/{os => base}/recipes/src/test-timed_semaphore/hash (100%) rename repos/{os => base}/recipes/src/test-timed_semaphore/used_apis (100%) rename repos/{os => base}/recipes/src/test-timer/content.mk (100%) rename repos/{os => base}/recipes/src/test-timer/hash (100%) rename repos/{os => base}/recipes/src/test-timer/used_apis (100%) rename repos/{os => base}/run/timer_accuracy.run (97%) rename repos/{os => base}/src/lib/alarm/alarm.cc (99%) rename repos/{os => base}/src/lib/timed_semaphore/timed_semaphore.cc (95%) rename repos/{os => base}/src/lib/timeout/arm/timer_connection_time.cc (100%) rename repos/{os => base}/src/lib/timeout/duration.cc (98%) rename repos/{os => base}/src/lib/timeout/hw/timer_connection_timestamp.cc (100%) rename repos/{os => base}/src/lib/timeout/timeout.cc (100%) rename repos/{os => base}/src/lib/timeout/timer_connection.cc (100%) rename repos/{os => base}/src/lib/timeout/timer_connection_time.cc (100%) rename repos/{os => base}/src/lib/timeout/timer_connection_timestamp.cc (100%) rename repos/{os => base}/src/test/timed_semaphore/main.cc (98%) rename repos/{os => base}/src/test/timed_semaphore/target.mk (100%) rename repos/{os => base}/src/test/timer/main.cc (100%) rename repos/{os => base}/src/test/timer/target.mk (100%) rename repos/{os => base}/src/test/timer_accuracy/main.cc (100%) rename repos/{os => base}/src/test/timer_accuracy/target.mk (100%) rename repos/{os/src/drivers => base/src}/timer/epit/time_source.cc (100%) rename repos/{os/src/drivers => base/src}/timer/epit/time_source.h (100%) create mode 100644 repos/base/src/timer/epit/wand_quad/target.inc rename repos/{os/src/drivers => base/src}/timer/epit/wand_quad/timer.cc (100%) rename repos/{os/src/drivers => base/src}/timer/fiasco/time_source.cc (100%) rename repos/{os/src/drivers => base/src}/timer/include/root_component.h (100%) rename repos/{os/src/drivers => base/src}/timer/include/session_component.h (100%) rename repos/{os/src/drivers => base/src}/timer/include/signalled_time_source.h (100%) rename repos/{os/src/drivers => base/src}/timer/include/threaded_time_source.h (100%) rename repos/{os/src/drivers => base/src}/timer/main.cc (100%) rename repos/{os/src/drivers => base/src}/timer/periodic/time_source.cc (100%) rename repos/{os/src/drivers => base/src}/timer/periodic/time_source.h (100%) create mode 100644 repos/base/src/timer/pit/target.inc rename repos/{os/src/drivers => base/src}/timer/pit/time_source.cc (100%) rename repos/{os/src/drivers => base/src}/timer/pit/time_source.h (98%) create mode 100644 repos/base/src/timer/target.inc delete mode 100644 repos/os/lib/mk/alarm.mk delete mode 100644 repos/os/recipes/api/timer_session/content.mk delete mode 100644 repos/os/src/drivers/timer/epit/wand_quad/target.mk delete mode 100644 repos/os/src/drivers/timer/fiasco/target.mk delete mode 100644 repos/os/src/drivers/timer/foc/target.mk delete mode 100644 repos/os/src/drivers/timer/hw/target.mk delete mode 100644 repos/os/src/drivers/timer/linux/target.mk delete mode 100644 repos/os/src/drivers/timer/nova/target.mk delete mode 100644 repos/os/src/drivers/timer/pit/target.mk delete mode 100644 repos/os/src/drivers/timer/target.inc diff --git a/repos/base-fiasco/recipes/src/base-fiasco/content.mk b/repos/base-fiasco/recipes/src/base-fiasco/content.mk index 7376ef9ca6..1c494bd998 100644 --- a/repos/base-fiasco/recipes/src/base-fiasco/content.mk +++ b/repos/base-fiasco/recipes/src/base-fiasco/content.mk @@ -1,20 +1,5 @@ include $(GENODE_DIR)/repos/base/recipes/src/base_content.inc - -TIMER_SRC := main.cc target.inc include periodic fiasco - -content: src/drivers/timer -src/drivers/timer: - mkdir -p $@ - cp -r $(addprefix $(GENODE_DIR)/repos/os/$@/,$(TIMER_SRC)) $@ - -content: include/spec/x86_32/trace/timestamp.h include/spec/x86_64/trace/timestamp.h - -include/spec/%/trace/timestamp.h: - mkdir -p $(dir $@) - cp $(GENODE_DIR)/repos/os/$@ $@ - - content: README README: cp $(REP_DIR)/recipes/src/base-fiasco/README $@ @@ -32,11 +17,10 @@ KERNEL_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/fiasco) src/kernel/fiasco: src/kernel cp -r $(KERNEL_PORT_DIR)/src/kernel/fiasco/* $@ - 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/ld-fiasco/ld/" src/lib/ld/fiasco/target.mk - sed -i "s/fiasco_timer_drv/timer/" src/drivers/timer/fiasco/target.mk + sed -i "s/fiasco_timer_drv/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 new file mode 100644 index 0000000000..279aff794f --- /dev/null +++ b/repos/base-fiasco/src/timer/fiasco/target.mk @@ -0,0 +1,9 @@ +TARGET = fiasco_timer_drv +LIBS += syscall-fiasco +GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc)) +INC_DIR += $(GEN_DIR)/periodic +SRC_CC += periodic/time_source.cc fiasco/time_source.cc + +vpath %.cc $(GEN_DIR) + +include $(GEN_DIR)/target.inc diff --git a/repos/base-foc/recipes/src/base-foc_content.inc b/repos/base-foc/recipes/src/base-foc_content.inc index 7e6cd81f07..c1b67097d9 100644 --- a/repos/base-foc/recipes/src/base-foc_content.inc +++ b/repos/base-foc/recipes/src/base-foc_content.inc @@ -7,21 +7,6 @@ content: $(FROM_BASE_FOC) $(FROM_BASE_FOC): $(mirror_from_rep_dir) - -TIMER_SRC := main.cc target.inc foc include periodic fiasco - -content: src/drivers/timer -src/drivers/timer: - mkdir -p $@ - cp -r $(addprefix $(GENODE_DIR)/repos/os/$@/,$(TIMER_SRC)) $@ - -content: include/spec/x86_32/trace/timestamp.h include/spec/x86_64/trace/timestamp.h - -include/spec/%/trace/timestamp.h: - mkdir -p $(dir $@) - cp $(GENODE_DIR)/repos/os/$@ $@ - - content: README README: cp $(RECIPE_DIR)/README $@ @@ -39,11 +24,10 @@ KERNEL_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/foc) src/kernel/foc: src/kernel cp -r $(KERNEL_PORT_DIR)/src/kernel/foc/* $@ - content: for spec in x86_32 x86_64 arm; do \ mv lib/mk/spec/$$spec/ld-foc.mk lib/mk/spec/$$spec/ld.mk; \ done; - sed -i "s/ld-foc/ld/" src/lib/ld/foc/target.mk - sed -i "s/foc_timer_drv/timer/" src/drivers/timer/foc/target.mk + sed -i "s/ld-foc/ld/" src/lib/ld/foc/target.mk + sed -i "s/foc_timer_drv/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 new file mode 100644 index 0000000000..cb26c5afac --- /dev/null +++ b/repos/base-foc/src/timer/foc/target.mk @@ -0,0 +1,9 @@ +TARGET = foc_timer_drv +LIBS += syscall-foc +GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc)) +INC_DIR += $(GEN_DIR)/periodic +SRC_CC += periodic/time_source.cc fiasco/time_source.cc + +include $(GEN_DIR)/target.inc + +vpath %.cc $(GEN_DIR) diff --git a/repos/base-hw/lib/mk/timeout-hw.mk b/repos/base-hw/lib/mk/timeout-hw.mk index e8a5a7dc63..41fb1063ca 100644 --- a/repos/base-hw/lib/mk/timeout-hw.mk +++ b/repos/base-hw/lib/mk/timeout-hw.mk @@ -8,4 +8,4 @@ LIBS += alarm INC_DIR += $(BASE_DIR)/src/include -vpath % $(BASE_DIR)/../os/src/lib/timeout +vpath % $(BASE_DIR)/src/lib/timeout diff --git a/repos/base-hw/recipes/src/base-hw_content.inc b/repos/base-hw/recipes/src/base-hw_content.inc index d50527853f..fb24ebcb98 100644 --- a/repos/base-hw/recipes/src/base-hw_content.inc +++ b/repos/base-hw/recipes/src/base-hw_content.inc @@ -5,27 +5,12 @@ content: src/bootstrap src/bootstrap: $(mirror_from_rep_dir) - -TIMER_SRC := main.cc target.inc hw include - -content: src/drivers/timer -src/drivers/timer: - mkdir -p $@ - cp -r $(addprefix $(GENODE_DIR)/repos/os/$@/,$(TIMER_SRC)) $@ - -content: include/spec/x86_32/trace/timestamp.h include/spec/x86_64/trace/timestamp.h - -include/spec/%/trace/timestamp.h: - mkdir -p $(dir $@) - cp $(GENODE_DIR)/repos/os/$@ $@ - - content: generalize_target_names -generalize_target_names: lib/mk src/lib src/drivers/timer +generalize_target_names: lib/mk src/lib src/timer for spec in arm riscv x86_64; do \ mv lib/mk/spec/$$spec/ld-hw.mk lib/mk/spec/$$spec/ld.mk; \ done; sed -i "s/ld-hw/ld/" src/lib/ld/hw/target.mk - sed -i "s/hw_timer_drv/timer/" src/drivers/timer/hw/target.mk + sed -i "s/hw_timer_drv/timer/" src/timer/hw/target.mk diff --git a/repos/base-hw/src/timer/hw/target.mk b/repos/base-hw/src/timer/hw/target.mk new file mode 100644 index 0000000000..bd3672a2d8 --- /dev/null +++ b/repos/base-hw/src/timer/hw/target.mk @@ -0,0 +1,7 @@ +TARGET = hw_timer_drv +REQUIRES = hw +LIBS = syscall-hw +INC_DIR += $(PRG_DIR) +SRC_CC += time_source.cc + +include $(call select_from_repositories,src/timer/target.inc) diff --git a/repos/os/src/drivers/timer/hw/time_source.cc b/repos/base-hw/src/timer/hw/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/hw/time_source.cc rename to repos/base-hw/src/timer/hw/time_source.cc diff --git a/repos/os/src/drivers/timer/hw/time_source.h b/repos/base-hw/src/timer/hw/time_source.h similarity index 97% rename from repos/os/src/drivers/timer/hw/time_source.h rename to repos/base-hw/src/timer/hw/time_source.h index 73e5077464..7a5d76880f 100644 --- a/repos/os/src/drivers/timer/hw/time_source.h +++ b/repos/base-hw/src/timer/hw/time_source.h @@ -15,7 +15,7 @@ #define _TIME_SOURCE_H_ /* Genode includes */ -#include +#include /* local includes */ #include diff --git a/repos/base-linux/recipes/api/base-linux/content.mk b/repos/base-linux/recipes/api/base-linux/content.mk index 1c8d33d630..4fe7f8a6d3 100644 --- a/repos/base-linux/recipes/api/base-linux/content.mk +++ b/repos/base-linux/recipes/api/base-linux/content.mk @@ -1,7 +1,8 @@ FROM_BASE_LINUX := etc src/lib/syscall src/lib/lx_hybrid lib/import FROM_BASE_LINUX_AND_BASE := lib/mk src/lib/base src/include +FROM_BASE := src/lib/alarm src/lib/timeout -content: $(FROM_BASE_LINUX) $(FROM_BASE_LINUX_AND_BASE) LICENSE +content: $(FROM_BASE_LINUX) $(FROM_BASE_LINUX_AND_BASE) $(FROM_BASE) LICENSE $(FROM_BASE_LINUX): mkdir -p $@ @@ -12,5 +13,9 @@ $(FROM_BASE_LINUX_AND_BASE): cp -r $(GENODE_DIR)/repos/base/$@/* $@ cp -r $(REP_DIR)/$@/* $@ +$(FROM_BASE): + mkdir -p $@ + cp -r $(GENODE_DIR)/repos/base/$@/* $@ + LICENSE: cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/base-linux/recipes/src/base-linux/content.mk b/repos/base-linux/recipes/src/base-linux/content.mk index cc06420e78..edb03c63e8 100644 --- a/repos/base-linux/recipes/src/base-linux/content.mk +++ b/repos/base-linux/recipes/src/base-linux/content.mk @@ -5,18 +5,10 @@ content: lib/import src/ld lib/import src/ld: $(mirror_from_rep_dir) -content: src/drivers/timer - -TIMER_SRC := main.cc target.inc linux include periodic - -src/drivers/timer: - mkdir -p $@ - cp -r $(addprefix $(GENODE_DIR)/repos/os/$@/,$(TIMER_SRC)) $@ - content: for spec in x86_32 x86_64 arm; do \ mv lib/mk/spec/$$spec/ld-linux.mk lib/mk/spec/$$spec/ld.mk; done; sed -i "s/core-linux/core/" src/core/linux/target.mk sed -i "s/ld-linux/ld/" src/lib/ld/linux/target.mk - sed -i "s/linux_timer_drv/timer/" src/drivers/timer/linux/target.mk + sed -i "s/linux_timer_drv/timer/" src/timer/linux/target.mk diff --git a/repos/base-linux/run/region_map_mmap.run b/repos/base-linux/run/region_map_mmap.run index 9e0b503c1a..4f822ee850 100644 --- a/repos/base-linux/run/region_map_mmap.run +++ b/repos/base-linux/run/region_map_mmap.run @@ -1,4 +1,4 @@ -build "core init test/region_map_mmap drivers/timer test/signal" +build "core init test/region_map_mmap timer test/signal" create_boot_directory diff --git a/repos/base-linux/src/timer/linux/target.mk b/repos/base-linux/src/timer/linux/target.mk new file mode 100644 index 0000000000..3c14cda4f9 --- /dev/null +++ b/repos/base-linux/src/timer/linux/target.mk @@ -0,0 +1,9 @@ +TARGET = linux_timer_drv +GEN_DIR := $(call select_from_repositories,src/timer/periodic)/.. +INC_DIR += $(GEN_DIR)/periodic +SRC_CC += periodic/time_source.cc time_source.cc +LIBS += syscall-linux + +include $(GEN_DIR)/target.inc + +vpath periodic/time_source.cc $(GEN_DIR) diff --git a/repos/os/src/drivers/timer/linux/time_source.cc b/repos/base-linux/src/timer/linux/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/linux/time_source.cc rename to repos/base-linux/src/timer/linux/time_source.cc diff --git a/repos/base-nova/recipes/api/base-nova/content.mk b/repos/base-nova/recipes/api/base-nova/content.mk index da8ff09fc5..cf61bb01c9 100644 --- a/repos/base-nova/recipes/api/base-nova/content.mk +++ b/repos/base-nova/recipes/api/base-nova/content.mk @@ -1,9 +1,15 @@ FROM_BASE_NOVA := etc include +FROM_BASE := lib/mk/timeout.mk src/lib/timeout \ + lib/mk/alarm.mk src/lib/alarm -content: $(FROM_BASE_NOVA) LICENSE +content: $(FROM_BASE_NOVA) $(FROM_BASE) LICENSE $(FROM_BASE_NOVA): $(mirror_from_rep_dir) +$(FROM_BASE): + mkdir -p $(dir $@) + cp -r $(GENODE_DIR)/repos/base/$@ $@ + LICENSE: cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/base-nova/recipes/src/base-nova/content.mk b/repos/base-nova/recipes/src/base-nova/content.mk index 876ae7e2ad..cf557b5dbe 100644 --- a/repos/base-nova/recipes/src/base-nova/content.mk +++ b/repos/base-nova/recipes/src/base-nova/content.mk @@ -1,25 +1,9 @@ include $(GENODE_DIR)/repos/base/recipes/src/base_content.inc - -TIMER_SRC := main.cc target.inc nova include - -content: src/drivers/timer -src/drivers/timer: - mkdir -p $@ - cp -r $(addprefix $(GENODE_DIR)/repos/os/$@/,$(TIMER_SRC)) $@ - -content: include/spec/x86_32/trace/timestamp.h include/spec/x86_64/trace/timestamp.h - -include/spec/%/trace/timestamp.h: - mkdir -p $(dir $@) - cp $(GENODE_DIR)/repos/os/$@ $@ - - content: README README: cp $(REP_DIR)/recipes/src/base-nova/README $@ - content: src/kernel/nova src/kernel: $(mirror_from_rep_dir) @@ -29,11 +13,10 @@ KERNEL_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/nova) src/kernel/nova: src/kernel cp -r $(KERNEL_PORT_DIR)/src/kernel/nova/* $@ - 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/ld-nova/ld/" src/lib/ld/nova/target.mk - sed -i "s/nova_timer_drv/timer/" src/drivers/timer/nova/target.mk + sed -i "s/nova_timer_drv/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 new file mode 100644 index 0000000000..7380b2ad97 --- /dev/null +++ b/repos/base-nova/src/timer/nova/target.mk @@ -0,0 +1,5 @@ +TARGET = nova_timer_drv +INC_DIR += $(PRG_DIR) +SRC_CC += time_source.cc + +include $(call select_from_repositories,src/timer/target.inc) diff --git a/repos/os/src/drivers/timer/nova/time_source.cc b/repos/base-nova/src/timer/nova/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/nova/time_source.cc rename to repos/base-nova/src/timer/nova/time_source.cc diff --git a/repos/os/src/drivers/timer/nova/time_source.h b/repos/base-nova/src/timer/nova/time_source.h similarity index 100% rename from repos/os/src/drivers/timer/nova/time_source.h rename to repos/base-nova/src/timer/nova/time_source.h diff --git a/repos/base-okl4/recipes/src/base-okl4/content.mk b/repos/base-okl4/recipes/src/base-okl4/content.mk index 21eb0caa24..39d7d59d8a 100644 --- a/repos/base-okl4/recipes/src/base-okl4/content.mk +++ b/repos/base-okl4/recipes/src/base-okl4/content.mk @@ -1,20 +1,5 @@ include $(GENODE_DIR)/repos/base/recipes/src/base_content.inc - -TIMER_SRC := main.cc target.inc pit include - -content: src/drivers/timer -src/drivers/timer: - mkdir -p $@ - cp -r $(addprefix $(GENODE_DIR)/repos/os/$@/,$(TIMER_SRC)) $@ - -content: include/spec/x86_32/trace/timestamp.h include/spec/x86_64/trace/timestamp.h - -include/spec/%/trace/timestamp.h: - mkdir -p $(dir $@) - cp $(GENODE_DIR)/repos/os/$@ $@ - - content: README README: cp $(REP_DIR)/recipes/src/base-okl4/README $@ @@ -32,11 +17,10 @@ KERNEL_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/okl4) src/kernel/okl4: src/kernel cp -r $(KERNEL_PORT_DIR)/src/kernel/okl4/* $@ - 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/ld-okl4/ld/" src/lib/ld/okl4/target.mk - sed -i "s/pit_timer_drv/timer/" src/drivers/timer/pit/target.mk + sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc diff --git a/repos/base-okl4/src/timer/pit/target.mk b/repos/base-okl4/src/timer/pit/target.mk new file mode 100644 index 0000000000..38f3a159c1 --- /dev/null +++ b/repos/base-okl4/src/timer/pit/target.mk @@ -0,0 +1 @@ +include $(call select_from_repositories,src/timer/pit/target.inc) diff --git a/repos/base-pistachio/recipes/src/base-pistachio/content.mk b/repos/base-pistachio/recipes/src/base-pistachio/content.mk index 2852b97317..b8c9dbb474 100644 --- a/repos/base-pistachio/recipes/src/base-pistachio/content.mk +++ b/repos/base-pistachio/recipes/src/base-pistachio/content.mk @@ -1,20 +1,5 @@ include $(GENODE_DIR)/repos/base/recipes/src/base_content.inc - -TIMER_SRC := main.cc target.inc pit include - -content: src/drivers/timer -src/drivers/timer: - mkdir -p $@ - cp -r $(addprefix $(GENODE_DIR)/repos/os/$@/,$(TIMER_SRC)) $@ - -content: include/spec/x86_32/trace/timestamp.h include/spec/x86_64/trace/timestamp.h - -include/spec/%/trace/timestamp.h: - mkdir -p $(dir $@) - cp $(GENODE_DIR)/repos/os/$@ $@ - - content: README README: cp $(REP_DIR)/recipes/src/base-pistachio/README $@ @@ -32,11 +17,10 @@ KERNEL_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/pistachio) src/kernel/pistachio: src/kernel cp -r $(KERNEL_PORT_DIR)/src/kernel/pistachio/* $@ - 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/ld-pistachio/ld/" src/lib/ld/pistachio/target.mk - sed -i "s/pit_timer_drv/timer/" src/drivers/timer/pit/target.mk + sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc diff --git a/repos/base-pistachio/src/timer/pit/target.mk b/repos/base-pistachio/src/timer/pit/target.mk new file mode 100644 index 0000000000..38f3a159c1 --- /dev/null +++ b/repos/base-pistachio/src/timer/pit/target.mk @@ -0,0 +1 @@ +include $(call select_from_repositories,src/timer/pit/target.inc) diff --git a/repos/base-sel4/recipes/src/base-sel4-wand_quad/content.mk b/repos/base-sel4/recipes/src/base-sel4-wand_quad/content.mk index b0c04f7e6e..bc2560a9bb 100644 --- a/repos/base-sel4/recipes/src/base-sel4-wand_quad/content.mk +++ b/repos/base-sel4/recipes/src/base-sel4-wand_quad/content.mk @@ -1,18 +1,10 @@ include $(GENODE_DIR)/repos/base/recipes/src/base_content.inc - -TIMER_SRC := main.cc target.inc epit include - content: enable_board_spec enable_board_spec: etc/specs.conf echo "SPECS += wand_quad" >> etc/specs.conf -content: src/drivers/timer -src/drivers/timer: - mkdir -p $@ - cp -r $(addprefix $(GENODE_DIR)/repos/os/$@/,$(TIMER_SRC)) $@ - -content: include/spec/arm_v7/trace/timestamp.h include/os/attached_mmio.h +content: include/os/attached_mmio.h include/%.h: mkdir -p $(dir $@) @@ -43,5 +35,5 @@ src/tool/elfloader: src/kernel/sel4 content: mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk; sed -i "s/ld-sel4/ld/" src/lib/ld/sel4/target.mk - sed -i "s/wand_quad_timer_drv/timer/" src/drivers/timer/epit/wand_quad/target.mk + sed -i "s/wand_quad_timer_drv/timer/" src/timer/epit/wand_quad/target.inc 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 d3e349a5ab..68c43e1d09 100644 --- a/repos/base-sel4/recipes/src/base-sel4-x86/content.mk +++ b/repos/base-sel4/recipes/src/base-sel4-x86/content.mk @@ -1,20 +1,5 @@ include $(GENODE_DIR)/repos/base/recipes/src/base_content.inc - -TIMER_SRC := main.cc target.inc pit include - -content: src/drivers/timer -src/drivers/timer: - mkdir -p $@ - cp -r $(addprefix $(GENODE_DIR)/repos/os/$@/,$(TIMER_SRC)) $@ - -content: include/spec/x86_32/trace/timestamp.h include/spec/x86_64/trace/timestamp.h - -include/spec/%/trace/timestamp.h: - mkdir -p $(dir $@) - cp $(GENODE_DIR)/repos/os/$@ $@ - - content: README README: cp $(REP_DIR)/recipes/src/base-sel4-x86/README $@ @@ -32,11 +17,10 @@ KERNEL_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/sel4) src/kernel/sel4: src/kernel cp -r $(KERNEL_PORT_DIR)/src/kernel/sel4/* $@ - content: for spec in x86_32 x86_64 arm; do \ mv lib/mk/spec/$$spec/ld-sel4.mk lib/mk/spec/$$spec/ld.mk; \ done; sed -i "s/ld-sel4/ld/" src/lib/ld/sel4/target.mk - sed -i "s/pit_timer_drv/timer/" src/drivers/timer/pit/target.mk + sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc diff --git a/repos/base-sel4/src/timer/epit/wand_quad/target.mk b/repos/base-sel4/src/timer/epit/wand_quad/target.mk new file mode 100644 index 0000000000..5a32ecd384 --- /dev/null +++ b/repos/base-sel4/src/timer/epit/wand_quad/target.mk @@ -0,0 +1 @@ +include $(call select_from_repositories,src/timer/epit/wand_quad/target.inc) diff --git a/repos/base-sel4/src/timer/pit/target.mk b/repos/base-sel4/src/timer/pit/target.mk new file mode 100644 index 0000000000..38f3a159c1 --- /dev/null +++ b/repos/base-sel4/src/timer/pit/target.mk @@ -0,0 +1 @@ +include $(call select_from_repositories,src/timer/pit/target.inc) diff --git a/repos/os/include/os/alarm.h b/repos/base/include/base/alarm.h similarity index 97% rename from repos/os/include/os/alarm.h rename to repos/base/include/base/alarm.h index 3bf0cb5533..ff3badb0d5 100644 --- a/repos/os/include/os/alarm.h +++ b/repos/base/include/base/alarm.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _INCLUDE__OS__ALARM_H_ -#define _INCLUDE__OS__ALARM_H_ +#ifndef _INCLUDE__BASE__ALARM_H_ +#define _INCLUDE__BASE__ALARM_H_ #include @@ -186,4 +186,4 @@ class Genode::Alarm_scheduler bool head_timeout(const Alarm * alarm) { return _head == alarm; } }; -#endif /* _INCLUDE__OS__ALARM_H_ */ +#endif /* _INCLUDE__BASE__ALARM_H_ */ diff --git a/repos/os/include/os/duration.h b/repos/base/include/base/duration.h similarity index 95% rename from repos/os/include/os/duration.h rename to repos/base/include/base/duration.h index b134b75e9c..502e4d227d 100644 --- a/repos/os/include/os/duration.h +++ b/repos/base/include/base/duration.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _OS__DURATION_H_ -#define _OS__DURATION_H_ +#ifndef _INCLUDE__BASE__DURATION_H_ +#define _INCLUDE__BASE__DURATION_H_ /* Genode includes */ #include @@ -115,4 +115,4 @@ namespace Genode return (x.value > y.value) ? x : y; } }; -#endif /* _OS__DURATION_H_ */ +#endif /* _INCLUDE__BASE__DURATION_H_ */ diff --git a/repos/os/include/os/timed_semaphore.h b/repos/base/include/base/timed_semaphore.h similarity index 97% rename from repos/os/include/os/timed_semaphore.h rename to repos/base/include/base/timed_semaphore.h index 5ea4cb26d6..12dd839069 100644 --- a/repos/os/include/os/timed_semaphore.h +++ b/repos/base/include/base/timed_semaphore.h @@ -16,13 +16,13 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _INCLUDE__OS__TIMED_SEMAPHORE_H_ -#define _INCLUDE__OS__TIMED_SEMAPHORE_H_ +#ifndef _INCLUDE__BASE__TIMED_SEMAPHORE_H_ +#define _INCLUDE__BASE__TIMED_SEMAPHORE_H_ #include #include +#include #include -#include namespace Genode { @@ -254,4 +254,4 @@ class Genode::Timed_semaphore : public Semaphore void up() { Semaphore::up(); } }; -#endif /* _INCLUDE__OS__TIMED_SEMAPHORE_H_ */ +#endif /* _INCLUDE__BASE__TIMED_SEMAPHORE_H_ */ diff --git a/repos/os/include/spec/arm_v6/trace/timestamp.h b/repos/base/include/spec/arm_v6/trace/timestamp.h similarity index 100% rename from repos/os/include/spec/arm_v6/trace/timestamp.h rename to repos/base/include/spec/arm_v6/trace/timestamp.h diff --git a/repos/os/include/spec/arm_v7/trace/timestamp.h b/repos/base/include/spec/arm_v7/trace/timestamp.h similarity index 100% rename from repos/os/include/spec/arm_v7/trace/timestamp.h rename to repos/base/include/spec/arm_v7/trace/timestamp.h diff --git a/repos/os/include/spec/riscv/trace/timestamp.h b/repos/base/include/spec/riscv/trace/timestamp.h similarity index 100% rename from repos/os/include/spec/riscv/trace/timestamp.h rename to repos/base/include/spec/riscv/trace/timestamp.h diff --git a/repos/os/include/spec/x86_32/trace/timestamp.h b/repos/base/include/spec/x86_32/trace/timestamp.h similarity index 100% rename from repos/os/include/spec/x86_32/trace/timestamp.h rename to repos/base/include/spec/x86_32/trace/timestamp.h diff --git a/repos/os/include/spec/x86_64/trace/timestamp.h b/repos/base/include/spec/x86_64/trace/timestamp.h similarity index 100% rename from repos/os/include/spec/x86_64/trace/timestamp.h rename to repos/base/include/spec/x86_64/trace/timestamp.h diff --git a/repos/os/include/timer/timeout.h b/repos/base/include/timer/timeout.h similarity index 99% rename from repos/os/include/timer/timeout.h rename to repos/base/include/timer/timeout.h index 01def41e21..3dbab74328 100644 --- a/repos/os/include/timer/timeout.h +++ b/repos/base/include/timer/timeout.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace Genode { diff --git a/repos/os/include/timer_session/capability.h b/repos/base/include/timer_session/capability.h similarity index 100% rename from repos/os/include/timer_session/capability.h rename to repos/base/include/timer_session/capability.h diff --git a/repos/os/include/timer_session/client.h b/repos/base/include/timer_session/client.h similarity index 100% rename from repos/os/include/timer_session/client.h rename to repos/base/include/timer_session/client.h diff --git a/repos/os/include/timer_session/connection.h b/repos/base/include/timer_session/connection.h similarity index 100% rename from repos/os/include/timer_session/connection.h rename to repos/base/include/timer_session/connection.h diff --git a/repos/os/include/timer_session/timer_session.h b/repos/base/include/timer_session/timer_session.h similarity index 100% rename from repos/os/include/timer_session/timer_session.h rename to repos/base/include/timer_session/timer_session.h diff --git a/repos/base/lib/mk/alarm.mk b/repos/base/lib/mk/alarm.mk new file mode 100644 index 0000000000..3923f3944a --- /dev/null +++ b/repos/base/lib/mk/alarm.mk @@ -0,0 +1,3 @@ +SRC_CC = alarm.cc + +vpath alarm.cc $(call select_from_repositories,src/lib/alarm) diff --git a/repos/os/lib/mk/timed_semaphore.mk b/repos/base/lib/mk/timed_semaphore.mk similarity index 100% rename from repos/os/lib/mk/timed_semaphore.mk rename to repos/base/lib/mk/timed_semaphore.mk diff --git a/repos/os/lib/mk/timeout-arm.mk b/repos/base/lib/mk/timeout-arm.mk similarity index 79% rename from repos/os/lib/mk/timeout-arm.mk rename to repos/base/lib/mk/timeout-arm.mk index 2ce3b6a28e..8562616c15 100644 --- a/repos/os/lib/mk/timeout-arm.mk +++ b/repos/base/lib/mk/timeout-arm.mk @@ -7,4 +7,4 @@ LIBS += alarm INC_DIR += $(BASE_DIR)/src/include -vpath % $(BASE_DIR)/../os/src/lib/timeout +vpath % $(BASE_DIR)/src/lib/timeout diff --git a/repos/os/lib/mk/timeout.mk b/repos/base/lib/mk/timeout.mk similarity index 77% rename from repos/os/lib/mk/timeout.mk rename to repos/base/lib/mk/timeout.mk index d2649af4bb..2c7ccfbe7d 100644 --- a/repos/os/lib/mk/timeout.mk +++ b/repos/base/lib/mk/timeout.mk @@ -8,4 +8,4 @@ LIBS += alarm INC_DIR += $(BASE_DIR)/src/include -vpath % $(REP_DIR)/src/lib/timeout +vpath % $(call select_from_repositories,src/lib/timeout) diff --git a/repos/base/recipes/api/base/content.mk b/repos/base/recipes/api/base/content.mk index cfc8990ada..fe80260d9b 100644 --- a/repos/base/recipes/api/base/content.mk +++ b/repos/base/recipes/api/base/content.mk @@ -6,11 +6,6 @@ ARCHS := riscv arm_v6 arm_v7 x86_32 x86_64 include: mkdir -p include cp -r $(REP_DIR)/include/* $@/ - for a in ${ARCHS}; do \ - mkdir -p include/spec/$$a/trace; \ - cp $(GENODE_DIR)/repos/os/include/spec/$$a/trace/timestamp.h \ - include/spec/$$a/trace; \ - done LIB_MK_FILES := base.mk ld.mk ldso-startup.mk diff --git a/repos/base/recipes/api/timer_session/content.mk b/repos/base/recipes/api/timer_session/content.mk new file mode 100644 index 0000000000..e885a01174 --- /dev/null +++ b/repos/base/recipes/api/timer_session/content.mk @@ -0,0 +1,9 @@ +MIRRORED_FROM_REP_DIR := include/timer_session include/timer + +content: $(MIRRORED_FROM_REP_DIR) LICENSE + +$(MIRRORED_FROM_REP_DIR): + $(mirror_from_rep_dir) + +LICENSE: + cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/os/recipes/api/timer_session/hash b/repos/base/recipes/api/timer_session/hash similarity index 100% rename from repos/os/recipes/api/timer_session/hash rename to repos/base/recipes/api/timer_session/hash diff --git a/repos/os/recipes/pkg/test-timer/README b/repos/base/recipes/pkg/test-timer/README similarity index 100% rename from repos/os/recipes/pkg/test-timer/README rename to repos/base/recipes/pkg/test-timer/README diff --git a/repos/os/recipes/pkg/test-timer/archives b/repos/base/recipes/pkg/test-timer/archives similarity index 100% rename from repos/os/recipes/pkg/test-timer/archives rename to repos/base/recipes/pkg/test-timer/archives diff --git a/repos/os/recipes/pkg/test-timer/hash b/repos/base/recipes/pkg/test-timer/hash similarity index 100% rename from repos/os/recipes/pkg/test-timer/hash rename to repos/base/recipes/pkg/test-timer/hash diff --git a/repos/os/recipes/pkg/test-timer/runtime b/repos/base/recipes/pkg/test-timer/runtime similarity index 100% rename from repos/os/recipes/pkg/test-timer/runtime rename to repos/base/recipes/pkg/test-timer/runtime diff --git a/repos/base/recipes/src/base_content.inc b/repos/base/recipes/src/base_content.inc index fbc04f4b01..c7916fcb80 100644 --- a/repos/base/recipes/src/base_content.inc +++ b/repos/base/recipes/src/base_content.inc @@ -2,9 +2,9 @@ # Common content rules shared among all base- source archives # -content: src/include src/core src/lib src/drivers/timer lib/mk LICENSE +content: src/include src/core src/lib src/timer lib/mk LICENSE -src/include src/core src/lib lib/mk: +src/include src/core src/lib src/timer lib/mk: mkdir -p $@ cp -r $(GENODE_DIR)/repos/base/$@/* $@ cp -r $(REP_DIR)/$@/* $@ @@ -16,17 +16,3 @@ content: etc/specs.conf etc/specs.conf: $(mirror_from_rep_dir) - -MIRRORED_FROM_OS := $(addprefix lib/mk/,timeout.mk timeout-arm.mk alarm.mk timed_semaphore.mk)\ - $(addprefix src/lib/,timeout alarm timed_semaphore) \ - $(addprefix include/os/,alarm.h duration.h timed_semaphore.h) \ - include/timer/timeout.h \ - include/timer_session - -content: $(MIRRORED_FROM_OS) - -$(MIRRORED_FROM_OS): lib/mk - -$(MIRRORED_FROM_OS): - mkdir -p $(dir $@) - cp -r $(GENODE_DIR)/repos/os/$@ $(dir $@) diff --git a/repos/os/recipes/src/test-timed_semaphore/content.mk b/repos/base/recipes/src/test-timed_semaphore/content.mk similarity index 50% rename from repos/os/recipes/src/test-timed_semaphore/content.mk rename to repos/base/recipes/src/test-timed_semaphore/content.mk index 7a10a582c6..c00045b374 100644 --- a/repos/os/recipes/src/test-timed_semaphore/content.mk +++ b/repos/base/recipes/src/test-timed_semaphore/content.mk @@ -1,7 +1,7 @@ -SRC_DIR = src/test/timed_semaphore src/lib/timed_semaphore +SRC_DIR = src/test/timed_semaphore src/lib/timed_semaphore src/lib/alarm include $(GENODE_DIR)/repos/base/recipes/src/content.inc -MIRROR_FROM_REP_DIR := lib/mk/timed_semaphore.mk +MIRROR_FROM_REP_DIR := lib/mk/timed_semaphore.mk lib/mk/alarm.mk content: $(MIRROR_FROM_REP_DIR) diff --git a/repos/os/recipes/src/test-timed_semaphore/hash b/repos/base/recipes/src/test-timed_semaphore/hash similarity index 100% rename from repos/os/recipes/src/test-timed_semaphore/hash rename to repos/base/recipes/src/test-timed_semaphore/hash diff --git a/repos/os/recipes/src/test-timed_semaphore/used_apis b/repos/base/recipes/src/test-timed_semaphore/used_apis similarity index 100% rename from repos/os/recipes/src/test-timed_semaphore/used_apis rename to repos/base/recipes/src/test-timed_semaphore/used_apis diff --git a/repos/os/recipes/src/test-timer/content.mk b/repos/base/recipes/src/test-timer/content.mk similarity index 100% rename from repos/os/recipes/src/test-timer/content.mk rename to repos/base/recipes/src/test-timer/content.mk diff --git a/repos/os/recipes/src/test-timer/hash b/repos/base/recipes/src/test-timer/hash similarity index 100% rename from repos/os/recipes/src/test-timer/hash rename to repos/base/recipes/src/test-timer/hash diff --git a/repos/os/recipes/src/test-timer/used_apis b/repos/base/recipes/src/test-timer/used_apis similarity index 100% rename from repos/os/recipes/src/test-timer/used_apis rename to repos/base/recipes/src/test-timer/used_apis diff --git a/repos/os/run/timer_accuracy.run b/repos/base/run/timer_accuracy.run similarity index 97% rename from repos/os/run/timer_accuracy.run rename to repos/base/run/timer_accuracy.run index 4f7940df3d..14e8c38fe3 100644 --- a/repos/os/run/timer_accuracy.run +++ b/repos/base/run/timer_accuracy.run @@ -1,5 +1,5 @@ # build program images -build { core init drivers/timer test/timer_accuracy } +build { core init timer test/timer_accuracy } # create directory where boot files are written to create_boot_directory diff --git a/repos/os/src/lib/alarm/alarm.cc b/repos/base/src/lib/alarm/alarm.cc similarity index 99% rename from repos/os/src/lib/alarm/alarm.cc rename to repos/base/src/lib/alarm/alarm.cc index 945d29e39f..7ee353b478 100644 --- a/repos/os/src/lib/alarm/alarm.cc +++ b/repos/base/src/lib/alarm/alarm.cc @@ -12,7 +12,7 @@ */ #include -#include +#include using namespace Genode; diff --git a/repos/base/src/lib/ldso/main.cc b/repos/base/src/lib/ldso/main.cc index db5781f37e..d6a1437677 100644 --- a/repos/base/src/lib/ldso/main.cc +++ b/repos/base/src/lib/ldso/main.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include /* base-internal includes */ #include diff --git a/repos/os/src/lib/timed_semaphore/timed_semaphore.cc b/repos/base/src/lib/timed_semaphore/timed_semaphore.cc similarity index 95% rename from repos/os/src/lib/timed_semaphore/timed_semaphore.cc rename to repos/base/src/lib/timed_semaphore/timed_semaphore.cc index 3458c9b100..40b47d45cd 100644 --- a/repos/os/src/lib/timed_semaphore/timed_semaphore.cc +++ b/repos/base/src/lib/timed_semaphore/timed_semaphore.cc @@ -11,7 +11,7 @@ * under the terms of the GNU Affero General Public License version 3. */ -#include +#include Genode::Env *Genode::Timeout_thread::_env = nullptr; diff --git a/repos/os/src/lib/timeout/arm/timer_connection_time.cc b/repos/base/src/lib/timeout/arm/timer_connection_time.cc similarity index 100% rename from repos/os/src/lib/timeout/arm/timer_connection_time.cc rename to repos/base/src/lib/timeout/arm/timer_connection_time.cc diff --git a/repos/os/src/lib/timeout/duration.cc b/repos/base/src/lib/timeout/duration.cc similarity index 98% rename from repos/os/src/lib/timeout/duration.cc rename to repos/base/src/lib/timeout/duration.cc index 62ee629eee..47a38b3f01 100644 --- a/repos/os/src/lib/timeout/duration.cc +++ b/repos/base/src/lib/timeout/duration.cc @@ -12,7 +12,7 @@ */ /* Genode includes */ -#include +#include using namespace Genode; diff --git a/repos/os/src/lib/timeout/hw/timer_connection_timestamp.cc b/repos/base/src/lib/timeout/hw/timer_connection_timestamp.cc similarity index 100% rename from repos/os/src/lib/timeout/hw/timer_connection_timestamp.cc rename to repos/base/src/lib/timeout/hw/timer_connection_timestamp.cc diff --git a/repos/os/src/lib/timeout/timeout.cc b/repos/base/src/lib/timeout/timeout.cc similarity index 100% rename from repos/os/src/lib/timeout/timeout.cc rename to repos/base/src/lib/timeout/timeout.cc diff --git a/repos/os/src/lib/timeout/timer_connection.cc b/repos/base/src/lib/timeout/timer_connection.cc similarity index 100% rename from repos/os/src/lib/timeout/timer_connection.cc rename to repos/base/src/lib/timeout/timer_connection.cc diff --git a/repos/os/src/lib/timeout/timer_connection_time.cc b/repos/base/src/lib/timeout/timer_connection_time.cc similarity index 100% rename from repos/os/src/lib/timeout/timer_connection_time.cc rename to repos/base/src/lib/timeout/timer_connection_time.cc diff --git a/repos/os/src/lib/timeout/timer_connection_timestamp.cc b/repos/base/src/lib/timeout/timer_connection_timestamp.cc similarity index 100% rename from repos/os/src/lib/timeout/timer_connection_timestamp.cc rename to repos/base/src/lib/timeout/timer_connection_timestamp.cc diff --git a/repos/os/src/test/timed_semaphore/main.cc b/repos/base/src/test/timed_semaphore/main.cc similarity index 98% rename from repos/os/src/test/timed_semaphore/main.cc rename to repos/base/src/test/timed_semaphore/main.cc index 444029d58b..5a43860382 100644 --- a/repos/os/src/test/timed_semaphore/main.cc +++ b/repos/base/src/test/timed_semaphore/main.cc @@ -14,7 +14,7 @@ /* Genode includes */ #include -#include +#include #include #include diff --git a/repos/os/src/test/timed_semaphore/target.mk b/repos/base/src/test/timed_semaphore/target.mk similarity index 100% rename from repos/os/src/test/timed_semaphore/target.mk rename to repos/base/src/test/timed_semaphore/target.mk diff --git a/repos/os/src/test/timer/main.cc b/repos/base/src/test/timer/main.cc similarity index 100% rename from repos/os/src/test/timer/main.cc rename to repos/base/src/test/timer/main.cc diff --git a/repos/os/src/test/timer/target.mk b/repos/base/src/test/timer/target.mk similarity index 100% rename from repos/os/src/test/timer/target.mk rename to repos/base/src/test/timer/target.mk diff --git a/repos/os/src/test/timer_accuracy/main.cc b/repos/base/src/test/timer_accuracy/main.cc similarity index 100% rename from repos/os/src/test/timer_accuracy/main.cc rename to repos/base/src/test/timer_accuracy/main.cc diff --git a/repos/os/src/test/timer_accuracy/target.mk b/repos/base/src/test/timer_accuracy/target.mk similarity index 100% rename from repos/os/src/test/timer_accuracy/target.mk rename to repos/base/src/test/timer_accuracy/target.mk diff --git a/repos/os/src/drivers/timer/epit/time_source.cc b/repos/base/src/timer/epit/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/epit/time_source.cc rename to repos/base/src/timer/epit/time_source.cc diff --git a/repos/os/src/drivers/timer/epit/time_source.h b/repos/base/src/timer/epit/time_source.h similarity index 100% rename from repos/os/src/drivers/timer/epit/time_source.h rename to repos/base/src/timer/epit/time_source.h diff --git a/repos/base/src/timer/epit/wand_quad/target.inc b/repos/base/src/timer/epit/wand_quad/target.inc new file mode 100644 index 0000000000..310ef4d212 --- /dev/null +++ b/repos/base/src/timer/epit/wand_quad/target.inc @@ -0,0 +1,9 @@ +TARGET = wand_quad_timer_drv +REQUIRES = wand_quad +GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc)) +INC_DIR += $(GEN_DIR)/epit +SRC_CC += epit/time_source.cc epit/wand_quad/timer.cc + +include $(GEN_DIR)/target.inc + +vpath %.cc $(GEN_DIR) diff --git a/repos/os/src/drivers/timer/epit/wand_quad/timer.cc b/repos/base/src/timer/epit/wand_quad/timer.cc similarity index 100% rename from repos/os/src/drivers/timer/epit/wand_quad/timer.cc rename to repos/base/src/timer/epit/wand_quad/timer.cc diff --git a/repos/os/src/drivers/timer/fiasco/time_source.cc b/repos/base/src/timer/fiasco/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/fiasco/time_source.cc rename to repos/base/src/timer/fiasco/time_source.cc diff --git a/repos/os/src/drivers/timer/include/root_component.h b/repos/base/src/timer/include/root_component.h similarity index 100% rename from repos/os/src/drivers/timer/include/root_component.h rename to repos/base/src/timer/include/root_component.h diff --git a/repos/os/src/drivers/timer/include/session_component.h b/repos/base/src/timer/include/session_component.h similarity index 100% rename from repos/os/src/drivers/timer/include/session_component.h rename to repos/base/src/timer/include/session_component.h diff --git a/repos/os/src/drivers/timer/include/signalled_time_source.h b/repos/base/src/timer/include/signalled_time_source.h similarity index 100% rename from repos/os/src/drivers/timer/include/signalled_time_source.h rename to repos/base/src/timer/include/signalled_time_source.h diff --git a/repos/os/src/drivers/timer/include/threaded_time_source.h b/repos/base/src/timer/include/threaded_time_source.h similarity index 100% rename from repos/os/src/drivers/timer/include/threaded_time_source.h rename to repos/base/src/timer/include/threaded_time_source.h diff --git a/repos/os/src/drivers/timer/main.cc b/repos/base/src/timer/main.cc similarity index 100% rename from repos/os/src/drivers/timer/main.cc rename to repos/base/src/timer/main.cc diff --git a/repos/os/src/drivers/timer/periodic/time_source.cc b/repos/base/src/timer/periodic/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/periodic/time_source.cc rename to repos/base/src/timer/periodic/time_source.cc diff --git a/repos/os/src/drivers/timer/periodic/time_source.h b/repos/base/src/timer/periodic/time_source.h similarity index 100% rename from repos/os/src/drivers/timer/periodic/time_source.h rename to repos/base/src/timer/periodic/time_source.h diff --git a/repos/base/src/timer/pit/target.inc b/repos/base/src/timer/pit/target.inc new file mode 100644 index 0000000000..ae785572df --- /dev/null +++ b/repos/base/src/timer/pit/target.inc @@ -0,0 +1,9 @@ +TARGET = pit_timer_drv +REQUIRES = x86 +GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc)) +INC_DIR += $(GEN_DIR)/pit +SRC_CC += time_source.cc + +include $(GEN_DIR)/target.inc + +vpath time_source.cc $(GEN_DIR)/pit diff --git a/repos/os/src/drivers/timer/pit/time_source.cc b/repos/base/src/timer/pit/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/pit/time_source.cc rename to repos/base/src/timer/pit/time_source.cc diff --git a/repos/os/src/drivers/timer/pit/time_source.h b/repos/base/src/timer/pit/time_source.h similarity index 98% rename from repos/os/src/drivers/timer/pit/time_source.h rename to repos/base/src/timer/pit/time_source.h index 6b7e84b1b6..9bad5aa98e 100644 --- a/repos/os/src/drivers/timer/pit/time_source.h +++ b/repos/base/src/timer/pit/time_source.h @@ -18,7 +18,7 @@ /* Genode includes */ #include #include -#include +#include /* local includes */ #include diff --git a/repos/base/src/timer/target.inc b/repos/base/src/timer/target.inc new file mode 100644 index 0000000000..03559f797d --- /dev/null +++ b/repos/base/src/timer/target.inc @@ -0,0 +1,5 @@ +SRC_CC += main.cc +LIBS += base +INC_DIR += $(call select_from_repositories,src/timer/include) + +vpath main.cc $(dir $(call select_from_repositories,src/timer/main.cc)) diff --git a/repos/dde_bsd/run/audio_in.run b/repos/dde_bsd/run/audio_in.run index 5f073b1bc5..cf11ec1444 100644 --- a/repos/dde_bsd/run/audio_in.run +++ b/repos/dde_bsd/run/audio_in.run @@ -16,8 +16,7 @@ if {[have_spec linux]} { # set build_components { - core init - drivers/timer + core init timer drivers/audio test/audio_in } diff --git a/repos/dde_bsd/run/audio_out.run b/repos/dde_bsd/run/audio_out.run index 92c784b43f..d191a186a9 100644 --- a/repos/dde_bsd/run/audio_out.run +++ b/repos/dde_bsd/run/audio_out.run @@ -17,8 +17,7 @@ set use_mixer 0 # set build_components { - core init - drivers/timer + core init timer drivers/audio test/audio_out } diff --git a/repos/dde_linux/run/intel_fb.run b/repos/dde_linux/run/intel_fb.run index ba5aef8478..a0dc187b46 100644 --- a/repos/dde_linux/run/intel_fb.run +++ b/repos/dde_linux/run/intel_fb.run @@ -3,8 +3,7 @@ # set build_components { - core init - drivers/timer + core init timer drivers/framebuffer/intel test/framebuffer server/report_rom diff --git a/repos/dde_linux/run/lxip_http_srv.run b/repos/dde_linux/run/lxip_http_srv.run index d31f7f8dcd..be212dc254 100644 --- a/repos/dde_linux/run/lxip_http_srv.run +++ b/repos/dde_linux/run/lxip_http_srv.run @@ -12,8 +12,8 @@ proc gpio_drv { } { if {[have_spec rpi] && [have_spec hw]} { return hw_gpio_drv return gpio_drv } set build_components { - core init - drivers/timer drivers/nic + core init timer + drivers/nic test/lxip/http_srv } diff --git a/repos/dde_linux/run/lxip_udp_echo.run b/repos/dde_linux/run/lxip_udp_echo.run index d0f0d2759f..3ba7a111c1 100644 --- a/repos/dde_linux/run/lxip_udp_echo.run +++ b/repos/dde_linux/run/lxip_udp_echo.run @@ -6,8 +6,8 @@ set use_nic_driver [expr [have_spec linux] || [expr !$use_usb_driver && ![have_s # set build_components { - core init - drivers/timer drivers/nic + core init timer + drivers/nic test/lxip/udp_echo } diff --git a/repos/dde_linux/run/nic_router_uplinks.run b/repos/dde_linux/run/nic_router_uplinks.run index 270a731243..15d4339f85 100644 --- a/repos/dde_linux/run/nic_router_uplinks.run +++ b/repos/dde_linux/run/nic_router_uplinks.run @@ -25,7 +25,7 @@ proc platform_drv_priority {} { return { priority="-1"} } append build_components { core } append build_components { init } -append build_components { drivers/timer } +append build_components { timer } append build_components { server/nic_router } append build_components { server/dynamic_rom } append build_components { server/report_rom } diff --git a/repos/dde_linux/run/usb_hid.run b/repos/dde_linux/run/usb_hid.run index 7b5b8c5c6e..989e5aecc4 100644 --- a/repos/dde_linux/run/usb_hid.run +++ b/repos/dde_linux/run/usb_hid.run @@ -58,8 +58,7 @@ if { [get_cmd_switch --autopilot] && ![have_spec x86_64] } { # set build_components { - core init - drivers/timer + core init timer drivers/usb_host drivers/usb_hid test/input diff --git a/repos/dde_linux/run/usb_hid_panda.run b/repos/dde_linux/run/usb_hid_panda.run index 06feeaaf97..3587a703c1 100644 --- a/repos/dde_linux/run/usb_hid_panda.run +++ b/repos/dde_linux/run/usb_hid_panda.run @@ -3,8 +3,7 @@ # set build_components { - core init - drivers/timer + core init timer drivers/usb test/input } diff --git a/repos/dde_linux/run/usb_hid_reconnect.run b/repos/dde_linux/run/usb_hid_reconnect.run index f1ca08907e..212893d7b8 100644 --- a/repos/dde_linux/run/usb_hid_reconnect.run +++ b/repos/dde_linux/run/usb_hid_reconnect.run @@ -23,8 +23,7 @@ if { [get_cmd_switch --autopilot] && ![have_spec x86_64] } { # set build_components { - core init - drivers/timer + core init timer drivers/usb test/input server/dynamic_rom diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run index 6d07c8dd63..8894cfe31d 100644 --- a/repos/dde_linux/run/usb_net.run +++ b/repos/dde_linux/run/usb_net.run @@ -12,8 +12,7 @@ # set build_components { - core init - drivers/timer + core init timer drivers/usb_host drivers/usb_net test/lwip/http_srv diff --git a/repos/dde_linux/run/usb_rndis.run b/repos/dde_linux/run/usb_rndis.run index 01aba84459..64bb8087cd 100644 --- a/repos/dde_linux/run/usb_rndis.run +++ b/repos/dde_linux/run/usb_rndis.run @@ -9,8 +9,8 @@ # set build_components { - core init - drivers/timer drivers/usb + core init timer + drivers/usb server/tcp_terminal test/terminal_echo lib/vfs/lwip diff --git a/repos/dde_linux/run/usb_storage.run b/repos/dde_linux/run/usb_storage.run index 29c39b555e..1fb9bc1b07 100644 --- a/repos/dde_linux/run/usb_storage.run +++ b/repos/dde_linux/run/usb_storage.run @@ -9,8 +9,7 @@ # set build_components { - core init - drivers/timer + core init timer drivers/usb test/blk/cli } diff --git a/repos/dde_linux/run/usb_terminal.run b/repos/dde_linux/run/usb_terminal.run index de0177ddb9..a383e30c05 100644 --- a/repos/dde_linux/run/usb_terminal.run +++ b/repos/dde_linux/run/usb_terminal.run @@ -19,8 +19,7 @@ proc gpio_drv { } { if {[have_spec rpi] && [have_spec hw]} { return hw_gpio_drv # Build # set build_components { - core init - drivers/timer + core init timer drivers/usb server/usb_terminal test/terminal_echo diff --git a/repos/dde_linux/run/vfs_cfg.run b/repos/dde_linux/run/vfs_cfg.run index 460299320d..f842b19db5 100644 --- a/repos/dde_linux/run/vfs_cfg.run +++ b/repos/dde_linux/run/vfs_cfg.run @@ -1,7 +1,6 @@ set build_components { - core init + core init timer drivers/nic - drivers/timer lib/vfs/lxip server/vfs server/dynamic_rom diff --git a/repos/dde_linux/run/vfs_lxip.run b/repos/dde_linux/run/vfs_lxip.run index 1b6ef57c49..ab2a100991 100644 --- a/repos/dde_linux/run/vfs_lxip.run +++ b/repos/dde_linux/run/vfs_lxip.run @@ -1,8 +1,8 @@ assert_spec linux set build_components { - core init - drivers/timer drivers/nic + core init timer + drivers/nic server/tcp_terminal test/terminal_echo lib/vfs/lxip diff --git a/repos/dde_linux/run/wifi.run b/repos/dde_linux/run/wifi.run index 7eea74e55c..9c40f20851 100644 --- a/repos/dde_linux/run/wifi.run +++ b/repos/dde_linux/run/wifi.run @@ -20,9 +20,8 @@ assert_spec x86 # set build_components { - core init + core init timer drivers/rtc - drivers/timer drivers/wifi server/report_rom server/dynamic_rom diff --git a/repos/dde_rump/run/fs_rom_update_ext2.run b/repos/dde_rump/run/fs_rom_update_ext2.run index d49856bd91..54e843eafd 100644 --- a/repos/dde_rump/run/fs_rom_update_ext2.run +++ b/repos/dde_rump/run/fs_rom_update_ext2.run @@ -2,10 +2,9 @@ # Build # set build_components { - core init + core init timer app/rom_logger app/rom_to_file - drivers/timer lib/vfs/rump server/dynamic_rom server/fs_rom diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run index 19e08bba5a..706815bcf7 100644 --- a/repos/dde_rump/run/rump_ext2.run +++ b/repos/dde_rump/run/rump_ext2.run @@ -12,8 +12,7 @@ set dd [installed_command dd] # Build # set build_components { - core init - drivers/timer + core init timer server/ram_blk server/rump_fs test/libc_vfs diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run index 67cc9eceb2..70d4c8f657 100644 --- a/repos/dde_rump/run/rump_fat.run +++ b/repos/dde_rump/run/rump_fat.run @@ -12,8 +12,7 @@ set dd [installed_command dd] # Build # set build_components { - core init - drivers/timer + core init timer server/ram_blk server/rump_fs test/libc_vfs diff --git a/repos/dde_rump/run/rump_iso.run b/repos/dde_rump/run/rump_iso.run index b7d5d4a8ac..0bb312f5c5 100644 --- a/repos/dde_rump/run/rump_iso.run +++ b/repos/dde_rump/run/rump_iso.run @@ -11,8 +11,7 @@ set mkisofs [installed_command mkisofs] # Build # set build_components { - core init - drivers/timer + core init timer server/fs_rom server/rom_blk server/rump_fs diff --git a/repos/dde_rump/run/vfs_stress_ext2.run b/repos/dde_rump/run/vfs_stress_ext2.run index 12a1a67d20..aae19c356b 100644 --- a/repos/dde_rump/run/vfs_stress_ext2.run +++ b/repos/dde_rump/run/vfs_stress_ext2.run @@ -10,7 +10,7 @@ set mke2fs [installed_command mke2fs] set dd [installed_command dd] -build "core init drivers/timer test/vfs_stress server/ram_blk lib/vfs/rump" +build "core init timer test/vfs_stress server/ram_blk lib/vfs/rump" # # Build EXT2-file-system image diff --git a/repos/dde_rump/run/vfs_stress_rump_fs.run b/repos/dde_rump/run/vfs_stress_rump_fs.run index 10bc7fad42..96dfc46958 100644 --- a/repos/dde_rump/run/vfs_stress_rump_fs.run +++ b/repos/dde_rump/run/vfs_stress_rump_fs.run @@ -10,7 +10,7 @@ set mke2fs [installed_command mke2fs] set dd [installed_command dd] -build "core init drivers/timer test/vfs_stress server/ram_blk server/rump_fs" +build "core init timer test/vfs_stress server/ram_blk server/rump_fs" # # Build EXT2-file-system image diff --git a/repos/dde_rump/src/lib/rump/hypercall.cc b/repos/dde_rump/src/lib/rump/hypercall.cc index e051431c8b..a3ff19a60b 100644 --- a/repos/dde_rump/src/lib/rump/hypercall.cc +++ b/repos/dde_rump/src/lib/rump/hypercall.cc @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/repos/dde_rump/src/lib/rump/sync.cc b/repos/dde_rump/src/lib/rump/sync.cc index 656471020f..35f6318b2a 100644 --- a/repos/dde_rump/src/lib/rump/sync.cc +++ b/repos/dde_rump/src/lib/rump/sync.cc @@ -17,7 +17,7 @@ extern "C" { } #include #include -#include +#include #include #include "sched.h" diff --git a/repos/dde_zircon/run/zx_pc_ps2.run b/repos/dde_zircon/run/zx_pc_ps2.run index 9bcc95b2b2..6b1cb3aa37 100644 --- a/repos/dde_zircon/run/zx_pc_ps2.run +++ b/repos/dde_zircon/run/zx_pc_ps2.run @@ -5,8 +5,7 @@ assert_spec x86 set build_components { - core init - drivers/timer + core init timer server/dynamic_rom test/input drivers/input/zx_pc_ps2 diff --git a/repos/gems/run/cpu_load_display.run b/repos/gems/run/cpu_load_display.run index f3a6dd55e6..d52c725ef8 100644 --- a/repos/gems/run/cpu_load_display.run +++ b/repos/gems/run/cpu_load_display.run @@ -6,8 +6,7 @@ if {[have_spec odroid_xu]} { puts "Run script not supported on this platform."; exit 0 } set build_components { - core init - drivers/timer + core init timer server/nitpicker server/dynamic_rom server/report_rom diff --git a/repos/gems/run/cpu_sampler.run b/repos/gems/run/cpu_sampler.run index 996b7205f2..96ec4198f2 100644 --- a/repos/gems/run/cpu_sampler.run +++ b/repos/gems/run/cpu_sampler.run @@ -5,9 +5,7 @@ if { ![have_spec foc] && ![have_spec hw] && ![have_spec nova] && } set build_components { - core - init - drivers/timer + core init timer server/cpu_sampler test/cpu_sampler } diff --git a/repos/gems/run/gpt_write.run b/repos/gems/run/gpt_write.run index 43ed451a47..776ccc693f 100644 --- a/repos/gems/run/gpt_write.run +++ b/repos/gems/run/gpt_write.run @@ -6,7 +6,7 @@ assert_spec linux # # Build # -build { core init drivers/timer server/lx_block app/gpt_write } +build { core init timer server/lx_block app/gpt_write } create_boot_directory diff --git a/repos/gems/run/noux_vfs_audit.run b/repos/gems/run/noux_vfs_audit.run index ad66f80c32..a14ce402e6 100644 --- a/repos/gems/run/noux_vfs_audit.run +++ b/repos/gems/run/noux_vfs_audit.run @@ -1,7 +1,6 @@ build { - core init + core init timer app/sequence - drivers/timer lib/libc_noux noux noux-pkg/coreutils diff --git a/repos/gems/run/ssh_terminal.run b/repos/gems/run/ssh_terminal.run index a8e20ba2a5..cf180d5cfc 100644 --- a/repos/gems/run/ssh_terminal.run +++ b/repos/gems/run/ssh_terminal.run @@ -13,8 +13,7 @@ if {[have_spec linux]} { # set build_components { - core init - drivers/timer + core init timer drivers/nic drivers/rtc server/ssh_terminal diff --git a/repos/gems/run/tcp_terminal.run b/repos/gems/run/tcp_terminal.run index 022fb2e150..105881f50e 100644 --- a/repos/gems/run/tcp_terminal.run +++ b/repos/gems/run/tcp_terminal.run @@ -16,8 +16,8 @@ if {[have_spec linux]} { # set build_components { - core init - drivers/timer drivers/nic + core init timer + drivers/nic server/tcp_terminal test/terminal_echo lib/vfs/lwip diff --git a/repos/gems/run/terminal_mux.run b/repos/gems/run/terminal_mux.run index 3c62010b81..e14402d0b6 100644 --- a/repos/gems/run/terminal_mux.run +++ b/repos/gems/run/terminal_mux.run @@ -11,7 +11,7 @@ if {[have_spec linux]} { puts "Run script does not support Linux"; exit 0 } set build_components { core init noux lib/libc_noux app/cli_monitor test/bomb test/signal - test/resource_yield drivers/timer drivers/uart server/terminal_mux + test/resource_yield timer drivers/uart server/terminal_mux server/terminal_log noux-pkg/vim } diff --git a/repos/libports/run/acpica.run b/repos/libports/run/acpica.run index 423d13b76b..89fe19e42f 100644 --- a/repos/libports/run/acpica.run +++ b/repos/libports/run/acpica.run @@ -10,9 +10,8 @@ if { } set build_components { - core init + core init timer drivers/input - drivers/timer server/acpi_input server/dynamic_rom server/input_merger diff --git a/repos/libports/run/fetchurl.inc b/repos/libports/run/fetchurl.inc index eb25c4ad49..d1c6b2a2ae 100644 --- a/repos/libports/run/fetchurl.inc +++ b/repos/libports/run/fetchurl.inc @@ -12,9 +12,8 @@ if {[have_spec odroid_xu] || [have_spec linux] || set build_components { app/fetchurl - core init + core init timer drivers/nic - drivers/timer server/report_rom } diff --git a/repos/libports/run/fs_rom_update_fat.run b/repos/libports/run/fs_rom_update_fat.run index 81bb1780d3..60a376e641 100644 --- a/repos/libports/run/fs_rom_update_fat.run +++ b/repos/libports/run/fs_rom_update_fat.run @@ -2,10 +2,9 @@ # Build # set build_components { - core init + core init timer app/rom_logger app/rom_to_file - drivers/timer lib/vfs/fatfs server/dynamic_rom server/fs_rom diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index c63e6476c7..a008e52ef0 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -17,8 +17,7 @@ if {[expr ![have_include "power_on/qemu"] && !$use_ram_blk]} { # set build_components { - core init - drivers/timer + core init timer test/libc_block } diff --git a/repos/libports/run/libc_component.run b/repos/libports/run/libc_component.run index 39528b5ed2..3f6f950104 100644 --- a/repos/libports/run/libc_component.run +++ b/repos/libports/run/libc_component.run @@ -3,7 +3,7 @@ # set build_components { - core init drivers/timer server/terminal_crosslink + core init timer server/terminal_crosslink test/libc_counter test/libc_component } diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index 6774305cb4..b850c89dae 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -32,8 +32,7 @@ if {[expr ![have_include "power_on/qemu"] && !$use_ram_blk]} { # set build_components { - core init - drivers/timer + core init timer test/libc_block } diff --git a/repos/libports/run/libc_getaddrinfo.run b/repos/libports/run/libc_getaddrinfo.run index 5f433c623a..c53ebc4ea8 100644 --- a/repos/libports/run/libc_getaddrinfo.run +++ b/repos/libports/run/libc_getaddrinfo.run @@ -6,8 +6,7 @@ if {[have_spec linux]} { } set build_components { - core init - drivers/timer + core init timer lib/vfs/lwip test/libc_getaddrinfo } diff --git a/repos/libports/run/libc_select.run b/repos/libports/run/libc_select.run index ae30cb6c80..ae9aa4fcd3 100644 --- a/repos/libports/run/libc_select.run +++ b/repos/libports/run/libc_select.run @@ -1,5 +1,5 @@ set build_components { - core init drivers/timer server/terminal_crosslink + core init timer server/terminal_crosslink test/libc_select test/libc_counter } diff --git a/repos/libports/run/libc_vfs_component.run b/repos/libports/run/libc_vfs_component.run index 948baa7b7e..0bc129a3c4 100644 --- a/repos/libports/run/libc_vfs_component.run +++ b/repos/libports/run/libc_vfs_component.run @@ -3,7 +3,7 @@ # set build_components { - core init drivers/timer server/terminal_crosslink server/vfs + core init timer server/terminal_crosslink server/vfs test/libc_counter test/libc_component } diff --git a/repos/libports/run/libc_vfs_fs_test.inc b/repos/libports/run/libc_vfs_fs_test.inc index 7096efb326..5f34d5f126 100644 --- a/repos/libports/run/libc_vfs_fs_test.inc +++ b/repos/libports/run/libc_vfs_fs_test.inc @@ -17,8 +17,7 @@ if {[have_spec odroid_xu]} { # set build_components { - core init - drivers/timer + core init timer test/libc_vfs } diff --git a/repos/libports/run/libc_vfs_select.run b/repos/libports/run/libc_vfs_select.run index 74e730e27a..7b9698cda2 100644 --- a/repos/libports/run/libc_vfs_select.run +++ b/repos/libports/run/libc_vfs_select.run @@ -1,5 +1,5 @@ set build_components { - core init drivers/timer server/terminal_crosslink server/vfs + core init timer server/terminal_crosslink server/vfs test/libc_select test/libc_counter } diff --git a/repos/libports/run/libc_with_libc.run b/repos/libports/run/libc_with_libc.run index a799918cea..27439ee4e6 100644 --- a/repos/libports/run/libc_with_libc.run +++ b/repos/libports/run/libc_with_libc.run @@ -1,5 +1,5 @@ set build_components { - core init drivers/timer test/libc_with_libc + core init timer test/libc_with_libc } source ${genode_dir}/repos/base/run/platform_drv.inc diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 67945ac20a..7c30bc1bd3 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -34,8 +34,8 @@ set lynx [installed_command lynx] # set build_components { - core init - drivers/timer drivers/nic + core init timer + drivers/nic test/lwip/http_srv lib/vfs/lwip } diff --git a/repos/libports/run/lwip_lx.run b/repos/libports/run/lwip_lx.run index 57a4bae21e..155dec03f2 100644 --- a/repos/libports/run/lwip_lx.run +++ b/repos/libports/run/lwip_lx.run @@ -5,8 +5,8 @@ assert_spec linux # build { - core - init drivers/timer drivers/nic + core init timer + drivers/nic test/lwip/http_srv } diff --git a/repos/libports/run/mesa.inc b/repos/libports/run/mesa.inc index ecb1c64ada..f31a16cb41 100644 --- a/repos/libports/run/mesa.inc +++ b/repos/libports/run/mesa.inc @@ -11,8 +11,7 @@ if {[have_include power_on/qemu] && $use_i965} { set build_components { - core init - drivers/timer + core init timer drivers/input drivers/framebuffer drivers/gpu/intel diff --git a/repos/libports/run/moon.run b/repos/libports/run/moon.run index 26a2fb95ca..f01112b5b5 100644 --- a/repos/libports/run/moon.run +++ b/repos/libports/run/moon.run @@ -2,7 +2,7 @@ # Lua C++ library test # -build "core init drivers/timer test/moon" +build "core init timer test/moon" create_boot_directory diff --git a/repos/libports/run/netty.inc b/repos/libports/run/netty.inc index 805671b80b..0849d7b0e1 100644 --- a/repos/libports/run/netty.inc +++ b/repos/libports/run/netty.inc @@ -3,8 +3,7 @@ assert_spec x86 proc use_dynamic_rom { } { return true } set build_components { - core init - drivers/timer drivers/nic server/vfs + core init timer drivers/nic server/vfs lib/vfs/lxip } diff --git a/repos/libports/run/netty_lwip.inc b/repos/libports/run/netty_lwip.inc index b5283bb3c8..8772575023 100644 --- a/repos/libports/run/netty_lwip.inc +++ b/repos/libports/run/netty_lwip.inc @@ -3,8 +3,7 @@ assert_spec x86 proc use_dynamic_rom { } { return false } set build_components { - core init - drivers/timer + core init timer drivers/nic server/vfs lib/vfs/lwip diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run index 0f5ed1a1ae..b02d6b2b40 100644 --- a/repos/libports/run/nic_bridge.run +++ b/repos/libports/run/nic_bridge.run @@ -8,8 +8,8 @@ if {![have_include power_on/qemu]} { } set build_components { - core init - drivers/timer drivers/nic + core init timer + drivers/nic server/nic_bridge test/lwip/http_srv test/lwip/http_clnt diff --git a/repos/libports/run/nic_bridge_lighttpd.run b/repos/libports/run/nic_bridge_lighttpd.run index 6a422c0ffa..06756de42d 100644 --- a/repos/libports/run/nic_bridge_lighttpd.run +++ b/repos/libports/run/nic_bridge_lighttpd.run @@ -3,8 +3,8 @@ # set build_components { - core init - drivers/timer drivers/input drivers/nic + core init timer + drivers/input drivers/nic server/nic_bridge app/lighttpd test/lwip/http_clnt diff --git a/repos/libports/run/nic_router.inc b/repos/libports/run/nic_router.inc index 5e29d197e9..2f7b2d455e 100644 --- a/repos/libports/run/nic_router.inc +++ b/repos/libports/run/nic_router.inc @@ -1,7 +1,7 @@ source ${genode_dir}/repos/base/run/platform_drv.inc -set targets "core init drivers/timer server/nic_router server/nic_bridge +set targets "core init timer server/nic_router server/nic_bridge test/lwip/http_srv test/lwip/http_clnt test/lwip/udp server/nic_loopback lib/vfs/lwip [platform_drv_build_components]" diff --git a/repos/libports/run/nim.run b/repos/libports/run/nim.run index 4d6d709891..746f6d86e6 100644 --- a/repos/libports/run/nim.run +++ b/repos/libports/run/nim.run @@ -1,6 +1,5 @@ set build_components { - core init - drivers/timer + core init timer drivers/rtc test/nim } diff --git a/repos/libports/run/nim_netty.run b/repos/libports/run/nim_netty.run index 3aaed94912..35884c9eb1 100644 --- a/repos/libports/run/nim_netty.run +++ b/repos/libports/run/nim_netty.run @@ -1,8 +1,8 @@ assert_spec linux set build_components { - core init - drivers/timer drivers/nic server/ram_fs server/vfs + core init timer + drivers/nic server/ram_fs server/vfs test/nim_echo_server lib/vfs/lxip } diff --git a/repos/libports/run/smartcard.run b/repos/libports/run/smartcard.run index 6674689bc1..7f525d3091 100644 --- a/repos/libports/run/smartcard.run +++ b/repos/libports/run/smartcard.run @@ -20,8 +20,7 @@ if { [get_cmd_switch --autopilot] && ![have_spec x86_64] } { # set build_components { - core init - drivers/timer + core init timer drivers/usb test/smartcard } diff --git a/repos/libports/src/lib/libc/task.h b/repos/libports/src/lib/libc/task.h index cf39bf2aa5..a04871d15a 100644 --- a/repos/libports/src/lib/libc/task.h +++ b/repos/libports/src/lib/libc/task.h @@ -21,7 +21,7 @@ #ifndef _LIBC__TASK_H_ #define _LIBC__TASK_H_ -#include +#include #include namespace Libc { diff --git a/repos/libports/src/lib/libc/thread.cc b/repos/libports/src/lib/libc/thread.cc index 81b8380c94..71c362ee49 100644 --- a/repos/libports/src/lib/libc/thread.cc +++ b/repos/libports/src/lib/libc/thread.cc @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/repos/os/lib/mk/alarm.mk b/repos/os/lib/mk/alarm.mk deleted file mode 100644 index a3e066440a..0000000000 --- a/repos/os/lib/mk/alarm.mk +++ /dev/null @@ -1,3 +0,0 @@ -SRC_CC = alarm.cc - -vpath alarm.cc $(REP_DIR)/src/lib/alarm diff --git a/repos/os/recipes/api/os/content.mk b/repos/os/recipes/api/os/content.mk index ed72bd94f6..7cdabd7f47 100644 --- a/repos/os/recipes/api/os/content.mk +++ b/repos/os/recipes/api/os/content.mk @@ -1,8 +1,6 @@ INCLUDE_SUB_DIRS := os util packet_stream_rx packet_stream_tx -MIRRORED_FROM_REP_DIR := $(addprefix include/,$(INCLUDE_SUB_DIRS)) \ - $(addprefix lib/mk/,alarm.mk timeout.mk) \ - $(addprefix src/lib/,alarm timeout) +MIRRORED_FROM_REP_DIR := $(addprefix include/,$(INCLUDE_SUB_DIRS)) content: $(MIRRORED_FROM_REP_DIR) LICENSE diff --git a/repos/os/recipes/api/timer_session/content.mk b/repos/os/recipes/api/timer_session/content.mk deleted file mode 100644 index 8b4f9920e5..0000000000 --- a/repos/os/recipes/api/timer_session/content.mk +++ /dev/null @@ -1,2 +0,0 @@ -MIRRORED_FROM_REP_DIR := include/timer_session include/timer -include $(REP_DIR)/recipes/api/session.inc diff --git a/repos/os/run/ahci_bench.run b/repos/os/run/ahci_bench.run index db26d09f49..7691563938 100644 --- a/repos/os/run/ahci_bench.run +++ b/repos/os/run/ahci_bench.run @@ -6,8 +6,7 @@ set dd [installed_command dd] # Build # set build_components { - core init - drivers/timer + core init timer drivers/ahci drivers/platform test/blk/bench diff --git a/repos/os/run/ahci_blk.run b/repos/os/run/ahci_blk.run index c0769e9ea9..cc8c4aacbd 100644 --- a/repos/os/run/ahci_blk.run +++ b/repos/os/run/ahci_blk.run @@ -6,8 +6,7 @@ set dd [installed_command dd] # Build # set build_components { - core init - drivers/timer + core init timer drivers/ahci server/report_rom test/blk/cli diff --git a/repos/os/run/audio_out_click.run b/repos/os/run/audio_out_click.run index 980252a132..575efcb77e 100644 --- a/repos/os/run/audio_out_click.run +++ b/repos/os/run/audio_out_click.run @@ -5,8 +5,7 @@ assert_spec x86 # set build_components { - core init - drivers/timer + core init timer drivers/audio drivers/input server/mixer diff --git a/repos/os/run/block_tester.run b/repos/os/run/block_tester.run index 919459b033..ebf081e998 100644 --- a/repos/os/run/block_tester.run +++ b/repos/os/run/block_tester.run @@ -9,9 +9,8 @@ set dd [installed_command dd] # Build # set build_components { - core init + core init timer drivers/ahci - drivers/timer server/ram_blk server/lx_block app/block_tester diff --git a/repos/os/run/bomb.run b/repos/os/run/bomb.run index 9cacb0c1d1..f30bb2849b 100644 --- a/repos/os/run/bomb.run +++ b/repos/os/run/bomb.run @@ -1,4 +1,4 @@ -build "core init test/bomb drivers/timer" +build "core init test/bomb timer" set timeout 240 set rounds 20 diff --git a/repos/os/run/cpu_quota.run b/repos/os/run/cpu_quota.run index 8f704070cc..357de16755 100644 --- a/repos/os/run/cpu_quota.run +++ b/repos/os/run/cpu_quota.run @@ -9,7 +9,7 @@ assert_spec hw # Build # -build "core init drivers/timer test/cpu_quota" +build "core init timer test/cpu_quota" # # Boot image diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run index e8ec816d4c..0836bf2fcb 100644 --- a/repos/os/run/demo.run +++ b/repos/os/run/demo.run @@ -11,8 +11,7 @@ if {[have_spec odroid_xu] || } set build_components { - core init - drivers/timer + core init timer server/nitpicker app/pointer app/status_bar app/global_keys_handler app/nit_focus server/liquid_framebuffer app/launchpad app/scout diff --git a/repos/os/run/fb_bench.run b/repos/os/run/fb_bench.run index b48876d71e..a3cf7367be 100644 --- a/repos/os/run/fb_bench.run +++ b/repos/os/run/fb_bench.run @@ -12,7 +12,7 @@ if {[get_cmd_switch --autopilot] && [have_spec linux]} { exit 0 } -set build_components { core init test/fb_bench drivers/framebuffer drivers/timer } +set build_components { core init test/fb_bench drivers/framebuffer timer } source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components diff --git a/repos/os/run/framebuffer.run b/repos/os/run/framebuffer.run index 85fa2a340a..9ab5e8ed35 100644 --- a/repos/os/run/framebuffer.run +++ b/repos/os/run/framebuffer.run @@ -11,7 +11,7 @@ if {[have_include "image/uefi"]} { set fb_drv "fb_boot_drv" } -set build_components { core init test/framebuffer drivers/framebuffer drivers/timer } +set build_components { core init test/framebuffer drivers/framebuffer timer } source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components diff --git a/repos/os/run/gpio_drv.run b/repos/os/run/gpio_drv.run index 755107a949..2348c3c0d0 100644 --- a/repos/os/run/gpio_drv.run +++ b/repos/os/run/gpio_drv.run @@ -7,8 +7,8 @@ if {[have_spec omap4] == 0} { } set build_components { - core init - drivers/timer drivers/gpio + core init timer + drivers/gpio test/gpio_drv } diff --git a/repos/os/run/gpio_led.run b/repos/os/run/gpio_led.run index c51992baaa..a6d6d9a51a 100644 --- a/repos/os/run/gpio_led.run +++ b/repos/os/run/gpio_led.run @@ -7,8 +7,8 @@ if {[have_spec gpio] == 0} { } set build_components { - core init - drivers/timer drivers/gpio + core init timer + drivers/gpio test/gpio_led } diff --git a/repos/os/run/gpio_signal.run b/repos/os/run/gpio_signal.run index 8038ea40eb..e5861fe44f 100644 --- a/repos/os/run/gpio_signal.run +++ b/repos/os/run/gpio_signal.run @@ -7,8 +7,8 @@ if {[have_spec gpio] == 0} { } set build_components { - core init - drivers/timer drivers/gpio + core init timer + drivers/gpio test/gpio_signal } diff --git a/repos/os/run/init_smp.run b/repos/os/run/init_smp.run index 642acd303c..75d4a77656 100644 --- a/repos/os/run/init_smp.run +++ b/repos/os/run/init_smp.run @@ -1,4 +1,4 @@ -build "core init test/bomb drivers/timer" +build "core init test/bomb timer" set timeout 60 set rounds 10 diff --git a/repos/os/run/input.run b/repos/os/run/input.run index ea4b9d3972..0943ce29a6 100644 --- a/repos/os/run/input.run +++ b/repos/os/run/input.run @@ -5,8 +5,7 @@ assert_spec x86 set build_components { - core init - drivers/timer + core init timer server/dynamic_rom test/input } diff --git a/repos/os/run/input_filter.run b/repos/os/run/input_filter.run index f7487df4cb..fcdfbf779c 100644 --- a/repos/os/run/input_filter.run +++ b/repos/os/run/input_filter.run @@ -16,7 +16,7 @@ proc test_char_repeat { } { # set build_components { - core init drivers/timer + core init timer server/report_rom server/input_filter test/input_filter } diff --git a/repos/os/run/kdb_uart_drv.run b/repos/os/run/kdb_uart_drv.run index b9c2a184ce..3c9d6483d6 100644 --- a/repos/os/run/kdb_uart_drv.run +++ b/repos/os/run/kdb_uart_drv.run @@ -12,8 +12,7 @@ if {![have_spec fiasco]} { # build { - core init - drivers/timer + core init timer drivers/uart test/terminal_echo } diff --git a/repos/os/run/loader.run b/repos/os/run/loader.run index bba24425a0..be1cd92ff6 100644 --- a/repos/os/run/loader.run +++ b/repos/os/run/loader.run @@ -3,8 +3,7 @@ # set build_components { - core init - drivers/timer + core init timer server/nitpicker server/loader test/nitpicker test/loader drivers/framebuffer drivers/input diff --git a/repos/os/run/log_core.run b/repos/os/run/log_core.run index f0f86b3c95..4078002565 100644 --- a/repos/os/run/log_core.run +++ b/repos/os/run/log_core.run @@ -18,7 +18,7 @@ if {[have_spec nova]} { proc run_boot_string { } { return "Hypervisor reports "} } -build "core init drivers/timer server/vfs server/fs_log app/log_core" +build "core init timer server/vfs server/fs_log app/log_core" create_boot_directory diff --git a/repos/os/run/mixer.run b/repos/os/run/mixer.run index 6dc34d4fef..a7607ebc29 100644 --- a/repos/os/run/mixer.run +++ b/repos/os/run/mixer.run @@ -4,8 +4,7 @@ # generic components set build_components { - core init - drivers/timer + core init timer drivers/audio server/mixer server/dynamic_rom diff --git a/repos/os/run/nic_router_flood.run b/repos/os/run/nic_router_flood.run index 8d0837283e..08c0a358f3 100644 --- a/repos/os/run/nic_router_flood.run +++ b/repos/os/run/nic_router_flood.run @@ -16,9 +16,7 @@ proc good_dst_ip { } { return "10.0.2.2" } proc bad_dst_ip { } { return "10.0.0.123" } set build_components { - core - init - drivers/timer + core init timer drivers/nic server/nic_router test/net_flood diff --git a/repos/os/run/nvme.run b/repos/os/run/nvme.run index 5c22dc0057..40d6903164 100644 --- a/repos/os/run/nvme.run +++ b/repos/os/run/nvme.run @@ -33,9 +33,8 @@ set dd [installed_command dd] # Build # set build_components { - core init + core init timer drivers/nvme - drivers/timer app/block_tester } diff --git a/repos/os/run/panda_uart4_echo.run b/repos/os/run/panda_uart4_echo.run index 82b9707943..08f6500e12 100644 --- a/repos/os/run/panda_uart4_echo.run +++ b/repos/os/run/panda_uart4_echo.run @@ -6,8 +6,8 @@ assert_spec panda # generic components set build_components { - core init - drivers/timer drivers/uart + core init timer + drivers/uart test/terminal_echo } diff --git a/repos/os/run/ping.run b/repos/os/run/ping.run index 7371a5e99c..49543d68ed 100644 --- a/repos/os/run/ping.run +++ b/repos/os/run/ping.run @@ -5,9 +5,7 @@ set on_hardware [expr ![have_include power_on/qemu]] set build_components { - core - init - drivers/timer + core init timer drivers/nic server/nic_bridge app/ping diff --git a/repos/os/run/ping_nic_router.run b/repos/os/run/ping_nic_router.run index 35f689779e..3c1fcc4432 100644 --- a/repos/os/run/ping_nic_router.run +++ b/repos/os/run/ping_nic_router.run @@ -5,9 +5,7 @@ set on_hardware [expr ![have_include power_on/qemu]] set build_components { - core - init - drivers/timer + core init timer drivers/nic server/nic_router server/nic_bridge diff --git a/repos/os/run/pointer.run b/repos/os/run/pointer.run index a6e41863d0..60768f6783 100644 --- a/repos/os/run/pointer.run +++ b/repos/os/run/pointer.run @@ -7,8 +7,7 @@ assert_spec linux set build_components { - core init - drivers/timer + core init timer drivers/framebuffer server/report_rom server/dynamic_rom diff --git a/repos/os/run/rom_to_file.run b/repos/os/run/rom_to_file.run index 680e7fa222..9d844e7948 100644 --- a/repos/os/run/rom_to_file.run +++ b/repos/os/run/rom_to_file.run @@ -4,7 +4,7 @@ assert_spec linux # Build # -build { core init drivers/timer +build { core init timer server/dynamic_rom app/rom_to_file server/lx_fs diff --git a/repos/os/run/rtc.run b/repos/os/run/rtc.run index c4d53388f4..0f9e7a40e1 100644 --- a/repos/os/run/rtc.run +++ b/repos/os/run/rtc.run @@ -5,7 +5,7 @@ if {(![have_spec x86] || [have_spec linux])} { exit 0 } -build { core init drivers/rtc drivers/timer test/rtc } +build { core init drivers/rtc timer test/rtc } create_boot_directory diff --git a/repos/os/run/sd_card.run b/repos/os/run/sd_card.run index cff2726373..1f38123948 100644 --- a/repos/os/run/sd_card.run +++ b/repos/os/run/sd_card.run @@ -5,7 +5,7 @@ # generic components set build_components { core init - drivers/timer + timer drivers/sd_card test/blk/cli } @@ -65,8 +65,7 @@ install_config $config # generic modules set boot_modules { - core ld.lib.so init - timer + core ld.lib.so init timer sd_card_drv test-blk-cli } diff --git a/repos/os/run/sd_card_bench.run b/repos/os/run/sd_card_bench.run index 1a468ba61f..ef89eb4756 100644 --- a/repos/os/run/sd_card_bench.run +++ b/repos/os/run/sd_card_bench.run @@ -20,8 +20,7 @@ # set build_components { - core init - drivers/timer + core init timer test/sd_card_bench } diff --git a/repos/os/run/tar_rom.run b/repos/os/run/tar_rom.run index 210f146f2b..36db3e8786 100644 --- a/repos/os/run/tar_rom.run +++ b/repos/os/run/tar_rom.run @@ -18,7 +18,7 @@ # if {[have_spec linux]} { puts "Run script does not support Linux"; exit 0 } -build "core init drivers/timer test/timer server/tar_rom" +build "core init timer test/timer server/tar_rom" create_boot_directory diff --git a/repos/os/run/timeout.run b/repos/os/run/timeout.run index 2e4bdd382c..deb7570d00 100644 --- a/repos/os/run/timeout.run +++ b/repos/os/run/timeout.run @@ -66,7 +66,7 @@ proc precise_ref_time { } { return true } -build "core init drivers/platform drivers/timer test/timeout" +build "core init drivers/platform timer test/timeout" # # Boot image diff --git a/repos/os/run/tz_vmm.run b/repos/os/run/tz_vmm.run index 9d9154dec7..8d592eadee 100644 --- a/repos/os/run/tz_vmm.run +++ b/repos/os/run/tz_vmm.run @@ -105,7 +105,7 @@ if { $mmc_rootfs } { if { [have_spec imx53] } { set tz_vmm_block_irq 92 } # add targets that enable MMC access via paravirtualized block - lappend targets drivers/timer + lappend targets timer lappend targets drivers/platform lappend targets drivers/sd_card lappend targets server/part_blk diff --git a/repos/os/run/uart.run b/repos/os/run/uart.run index 35484e3dda..01158f7274 100644 --- a/repos/os/run/uart.run +++ b/repos/os/run/uart.run @@ -4,8 +4,8 @@ # generic components set build_components { - core init - drivers/timer drivers/uart + core init timer + drivers/uart test/uart } diff --git a/repos/os/run/usb_block.run b/repos/os/run/usb_block.run index 58d0a4eca5..847c456a7b 100644 --- a/repos/os/run/usb_block.run +++ b/repos/os/run/usb_block.run @@ -5,8 +5,7 @@ set use_qemu [have_include "power_on/qemu"] # set build_components { - core init - drivers/timer + core init timer drivers/usb_host drivers/usb_block server/report_rom diff --git a/repos/os/run/vmm.run b/repos/os/run/vmm.run index 87923857b9..82a6d874cc 100644 --- a/repos/os/run/vmm.run +++ b/repos/os/run/vmm.run @@ -8,8 +8,7 @@ assert_spec hw assert_spec arndale set build_components { - core init - drivers/timer + core init timer drivers/platform drivers/uart server/vmm diff --git a/repos/os/src/app/ping/xml_node.h b/repos/os/src/app/ping/xml_node.h index 86f3840a62..c910af860f 100644 --- a/repos/os/src/app/ping/xml_node.h +++ b/repos/os/src/app/ping/xml_node.h @@ -16,7 +16,7 @@ /* Genode includes */ #include -#include +#include namespace Genode { diff --git a/repos/os/src/app/trace_logger/xml_node.h b/repos/os/src/app/trace_logger/xml_node.h index 86f3840a62..c910af860f 100644 --- a/repos/os/src/app/trace_logger/xml_node.h +++ b/repos/os/src/app/trace_logger/xml_node.h @@ -16,7 +16,7 @@ /* Genode includes */ #include -#include +#include namespace Genode { diff --git a/repos/os/src/drivers/timer/epit/wand_quad/target.mk b/repos/os/src/drivers/timer/epit/wand_quad/target.mk deleted file mode 100644 index 310f832ab7..0000000000 --- a/repos/os/src/drivers/timer/epit/wand_quad/target.mk +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = wand_quad_timer_drv -REQUIRES = wand_quad -INC_DIR += $(REP_DIR)/src/drivers/timer/epit -SRC_CC += time_source.cc -SRC_CC += timer.cc - -include $(REP_DIR)/src/drivers/timer/target.inc - -vpath time_source.cc $(REP_DIR)/src/drivers/timer/epit diff --git a/repos/os/src/drivers/timer/fiasco/target.mk b/repos/os/src/drivers/timer/fiasco/target.mk deleted file mode 100644 index 95d23b6244..0000000000 --- a/repos/os/src/drivers/timer/fiasco/target.mk +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = fiasco_timer_drv -REQUIRES = fiasco -LIBS += syscall-fiasco -INC_DIR += $(REP_DIR)/src/drivers/timer/periodic -SRC_CC += periodic/time_source.cc fiasco/time_source.cc - -include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/foc/target.mk b/repos/os/src/drivers/timer/foc/target.mk deleted file mode 100644 index 38b2cc8d56..0000000000 --- a/repos/os/src/drivers/timer/foc/target.mk +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = foc_timer_drv -REQUIRES = foc -LIBS += syscall-foc -INC_DIR += $(REP_DIR)/src/drivers/timer/periodic -SRC_CC += periodic/time_source.cc fiasco/time_source.cc - -include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/hw/target.mk b/repos/os/src/drivers/timer/hw/target.mk deleted file mode 100644 index 5ae63888bc..0000000000 --- a/repos/os/src/drivers/timer/hw/target.mk +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = hw_timer_drv -REQUIRES = hw -LIBS = syscall-hw -INC_DIR += $(PRG_DIR) -SRC_CC += hw/time_source.cc - -include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/linux/target.mk b/repos/os/src/drivers/timer/linux/target.mk deleted file mode 100644 index 6ab25b38c2..0000000000 --- a/repos/os/src/drivers/timer/linux/target.mk +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = linux_timer_drv -REQUIRES = linux -INC_DIR += $(REP_DIR)/src/drivers/timer/periodic -SRC_CC += periodic/time_source.cc linux/time_source.cc -LIBS += syscall-linux - -include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/nova/target.mk b/repos/os/src/drivers/timer/nova/target.mk deleted file mode 100644 index 5644a06c43..0000000000 --- a/repos/os/src/drivers/timer/nova/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -TARGET = nova_timer_drv -REQUIRES = nova -INC_DIR += $(REP_DIR)/src/drivers/timer/nova -SRC_CC += nova/time_source.cc - -include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/pit/target.mk b/repos/os/src/drivers/timer/pit/target.mk deleted file mode 100644 index 4ec0074621..0000000000 --- a/repos/os/src/drivers/timer/pit/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -TARGET = pit_timer_drv -REQUIRES = x86 -INC_DIR += $(PRG_DIR) -SRC_CC += time_source.cc - -include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/target.inc b/repos/os/src/drivers/timer/target.inc deleted file mode 100644 index b110dc04b1..0000000000 --- a/repos/os/src/drivers/timer/target.inc +++ /dev/null @@ -1,5 +0,0 @@ -SRC_CC += main.cc -LIBS += base -INC_DIR += $(REP_DIR)/src/drivers/timer/include - -vpath %.cc $(REP_DIR)/src/drivers/timer diff --git a/repos/os/src/server/nic_router/configuration.h b/repos/os/src/server/nic_router/configuration.h index a40389fb14..41f03f2e71 100644 --- a/repos/os/src/server/nic_router/configuration.h +++ b/repos/os/src/server/nic_router/configuration.h @@ -20,7 +20,7 @@ #include /* Genode includes */ -#include +#include namespace Genode { class Allocator; } diff --git a/repos/os/src/server/nic_router/xml_node.h b/repos/os/src/server/nic_router/xml_node.h index 86f3840a62..c910af860f 100644 --- a/repos/os/src/server/nic_router/xml_node.h +++ b/repos/os/src/server/nic_router/xml_node.h @@ -16,7 +16,7 @@ /* Genode includes */ #include -#include +#include namespace Genode { diff --git a/repos/ports/run/debug_nitpicker.run b/repos/ports/run/debug_nitpicker.run index 0a0a3094e0..73df10249a 100644 --- a/repos/ports/run/debug_nitpicker.run +++ b/repos/ports/run/debug_nitpicker.run @@ -17,8 +17,8 @@ # set build_components { - core init - drivers/timer drivers/uart + core init timer + drivers/uart app/gdb_monitor test/gdb_monitor server/nitpicker app/pointer app/scout diff --git a/repos/ports/run/gdb_monitor.run b/repos/ports/run/gdb_monitor.run index 66b50b26df..418c8b1b4a 100644 --- a/repos/ports/run/gdb_monitor.run +++ b/repos/ports/run/gdb_monitor.run @@ -19,8 +19,8 @@ if {![have_include "power_on/qemu"] || # set build_components { - core init - drivers/timer drivers/uart + core init timer + drivers/uart app/gdb_monitor test/gdb_monitor } diff --git a/repos/ports/run/gdb_monitor_interactive.run b/repos/ports/run/gdb_monitor_interactive.run index bbc01fc88b..c13e12e868 100644 --- a/repos/ports/run/gdb_monitor_interactive.run +++ b/repos/ports/run/gdb_monitor_interactive.run @@ -10,8 +10,8 @@ # set build_components { - core init - drivers/timer drivers/uart + core init timer + drivers/uart app/gdb_monitor test/gdb_monitor } diff --git a/repos/ports/run/gdb_monitor_target_config.run b/repos/ports/run/gdb_monitor_target_config.run index 685851a6a1..2d5e4df21c 100644 --- a/repos/ports/run/gdb_monitor_target_config.run +++ b/repos/ports/run/gdb_monitor_target_config.run @@ -9,8 +9,8 @@ # set build_components { - core init - drivers/timer drivers/uart + core init timer + drivers/uart app/gdb_monitor test/gdb_monitor_target_config } diff --git a/repos/ports/run/genode_org.run b/repos/ports/run/genode_org.run index 0ffe2b4926..e8e12461ab 100644 --- a/repos/ports/run/genode_org.run +++ b/repos/ports/run/genode_org.run @@ -15,8 +15,7 @@ if {[have_spec odroid_xu]} { } set build_components { - core init - drivers/timer + core init timer app/lighttpd lib/vfs/lwip } diff --git a/repos/ports/run/libc_noux.run b/repos/ports/run/libc_noux.run index 691c02e039..6ebdeabc81 100644 --- a/repos/ports/run/libc_noux.run +++ b/repos/ports/run/libc_noux.run @@ -4,7 +4,7 @@ if {[have_spec linux]} { } set build_components { - core init drivers/timer drivers/uart + core init timer drivers/uart noux lib/libc_noux server/ram_fs test/libc_noux } diff --git a/repos/ports/run/lighttpd.run b/repos/ports/run/lighttpd.run index 591bd3a720..3026385d55 100644 --- a/repos/ports/run/lighttpd.run +++ b/repos/ports/run/lighttpd.run @@ -5,9 +5,8 @@ # set build_components { - core init + core init timer drivers/nic - drivers/timer app/lighttpd } diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index 33847c94a7..e14cdcaef1 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -81,8 +81,7 @@ if {$use_nic_driver} { set network_driver "nic_drv" } if {$use_wifi_driver} { set network_driver "wifi_drv" } append build_components { - core init - drivers/timer + core init timer app/netperf } diff --git a/repos/ports/run/noux.run b/repos/ports/run/noux.run index 3d84dfb6e7..83fd657141 100644 --- a/repos/ports/run/noux.run +++ b/repos/ports/run/noux.run @@ -1,4 +1,4 @@ -build { core init drivers/timer noux server/log_terminal +build { core init timer noux server/log_terminal lib/libc_noux noux-pkg/coreutils } create_boot_directory diff --git a/repos/ports/run/noux_fork.run b/repos/ports/run/noux_fork.run index c571722e85..39e8467435 100644 --- a/repos/ports/run/noux_fork.run +++ b/repos/ports/run/noux_fork.run @@ -1,5 +1,5 @@ build { - core init drivers/timer server/log_terminal noux lib/libc_noux + core init timer server/log_terminal noux lib/libc_noux test/noux_fork } diff --git a/repos/ports/run/noux_signals.run b/repos/ports/run/noux_signals.run index 4d3c189eb5..133f47e1de 100644 --- a/repos/ports/run/noux_signals.run +++ b/repos/ports/run/noux_signals.run @@ -1,7 +1,7 @@ set build_components { - core init drivers/timer drivers/uart + core init timer drivers/uart noux - test/noux_signals + test/noux_signals } build $build_components diff --git a/repos/ports/run/noux_tool_chain_auto.run b/repos/ports/run/noux_tool_chain_auto.run index 2fc4b09ffb..67bddff4fa 100644 --- a/repos/ports/run/noux_tool_chain_auto.run +++ b/repos/ports/run/noux_tool_chain_auto.run @@ -30,7 +30,7 @@ set use_usb_input [expr ![have_spec ps2] && ![have_spec sdl] && [have_spec usb]] create_boot_directory set build_components { - core init drivers/timer noux lib/libc_noux + core init timer noux lib/libc_noux server/log_terminal server/ram_fs test/libports/ncurses } diff --git a/repos/ports/run/noux_uname.run b/repos/ports/run/noux_uname.run index 54aa3c99b9..4b700bc22b 100644 --- a/repos/ports/run/noux_uname.run +++ b/repos/ports/run/noux_uname.run @@ -1,7 +1,6 @@ build { - core init + core init timer app/sequence - drivers/timer lib/libc_noux noux noux-pkg/coreutils diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc index 76dbc6b49b..6c665d6394 100644 --- a/repos/ports/run/seoul.inc +++ b/repos/ports/run/seoul.inc @@ -21,8 +21,7 @@ source ${genode_dir}/repos/base/run/platform_drv.inc proc platform_drv_priority {} { return { priority="-1"} } set build_components { - core init - drivers/timer + core init timer drivers/rtc drivers/input app/seoul diff --git a/repos/ports/run/stubby.run b/repos/ports/run/stubby.run index c904abb014..82a37bcc87 100644 --- a/repos/ports/run/stubby.run +++ b/repos/ports/run/stubby.run @@ -9,10 +9,9 @@ set build_components { app/drill app/sequence app/stubby - core init + core init timer drivers/nic drivers/rtc - drivers/timer lib/vfs/jitterentropy lib/vfs/lxip server/nic_router diff --git a/repos/ports/run/vbox5_genode_usb_hid.run b/repos/ports/run/vbox5_genode_usb_hid.run index 943f49dc38..6b16ef0a77 100644 --- a/repos/ports/run/vbox5_genode_usb_hid.run +++ b/repos/ports/run/vbox5_genode_usb_hid.run @@ -14,10 +14,9 @@ if { [have_include "power_on/qemu"] || ![have_spec nova] || ![have_spec x86_64]} } set build_components { - core init + core init timer drivers/framebuffer drivers/input - drivers/timer drivers/usb server/log_terminal server/fs_rom diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index bd04791e72..ce89cbcd84 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -12,9 +12,8 @@ set use_gui 0 set use_bridge [expr $use_net && $use_gui] set build_components { - core init + core init timer drivers/framebuffer - drivers/timer } if {$use_vbox4} { diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index bf95916a85..09bbbd8af8 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -28,12 +28,11 @@ if {[have_spec nova]} { } append build_components { - core init + core init timer server/part_blk server/fs_rom drivers/ahci drivers/framebuffer - drivers/timer } lappend_if [expr $use_rumpfs] build_components server/rump_fs diff --git a/repos/ports/run/virtualbox_nic_router.run b/repos/ports/run/virtualbox_nic_router.run index 214b03d6de..3d45d57740 100644 --- a/repos/ports/run/virtualbox_nic_router.run +++ b/repos/ports/run/virtualbox_nic_router.run @@ -13,7 +13,7 @@ proc platform_drv_priority {} { return { priority="-1"} } append build_components { core } append build_components { init } append build_components { drivers/framebuffer } -append build_components { drivers/timer } +append build_components { timer } append build_components { server/nic_router } append build_components { virtualbox } append build_components { server/dynamic_rom } diff --git a/repos/ports/run/vmm_utils.run b/repos/ports/run/vmm_utils.run index f1c0d0936a..2ce0a2a987 100644 --- a/repos/ports/run/vmm_utils.run +++ b/repos/ports/run/vmm_utils.run @@ -1,4 +1,4 @@ -build { core init drivers/timer test/vmm_utils } +build { core init timer test/vmm_utils } create_boot_directory diff --git a/repos/ports/src/app/netperf/timer.cc b/repos/ports/src/app/netperf/timer.cc index 59bb619f2d..be8b879865 100644 --- a/repos/ports/src/app/netperf/timer.cc +++ b/repos/ports/src/app/netperf/timer.cc @@ -11,7 +11,7 @@ * under the terms of the GNU Affero General Public License version 3. */ -#include +#include #include #include diff --git a/repos/ports/src/noux/target.mk b/repos/ports/src/noux/target.mk index 7eb2015698..5bede43093 100644 --- a/repos/ports/src/noux/target.mk +++ b/repos/ports/src/noux/target.mk @@ -1,5 +1,5 @@ TARGET = noux -LIBS = base alarm vfs +LIBS = base vfs SRC_CC = main.cc syscall.cc INC_DIR += $(PRG_DIR) diff --git a/repos/ports/src/noux/timeout_scheduler.h b/repos/ports/src/noux/timeout_scheduler.h index 49e6fbb980..f70b9408a2 100644 --- a/repos/ports/src/noux/timeout_scheduler.h +++ b/repos/ports/src/noux/timeout_scheduler.h @@ -15,7 +15,7 @@ #define _NOUX__TIMEOUT_SCHEDULER_H_ #include -#include +#include namespace Noux { class Timeout_scheduler;