From 76bc2b9e89fe415e77ec41dfa68815c9adb64fc8 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Wed, 12 Apr 2017 10:06:29 +0200 Subject: [PATCH] hw: remove core internal header directories Fix #2393 --- repos/base-hw/lib/mk/core-hw.inc | 2 +- repos/base-hw/lib/mk/spec/arm/core-hw.inc | 2 +- repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc | 2 +- repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc | 2 +- repos/base-hw/lib/mk/spec/arndale/core-hw.mk | 2 +- repos/base-hw/lib/mk/spec/cortex_a15/core-hw.inc | 4 ++-- repos/base-hw/lib/mk/spec/cortex_a8/core-hw.inc | 2 +- repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc | 4 ++-- repos/base-hw/lib/mk/spec/exynos5/core-hw.inc | 2 +- repos/base-hw/lib/mk/spec/imx53/core-hw-trustzone_on.inc | 4 ++-- repos/base-hw/lib/mk/spec/imx53/core-hw.inc | 4 ++-- .../base-hw/lib/mk/spec/imx53_qsb/core-hw-trustzone_on.mk | 2 +- repos/base-hw/lib/mk/spec/imx6/core-hw.mk | 4 ++-- repos/base-hw/lib/mk/spec/panda/core-hw.mk | 4 ++-- repos/base-hw/lib/mk/spec/pbxa9/core-hw.mk | 4 ++-- repos/base-hw/lib/mk/spec/riscv/core-hw.mk | 2 +- repos/base-hw/lib/mk/spec/rpi/core-hw.mk | 4 ++-- repos/base-hw/lib/mk/spec/smp/core-hw.inc | 2 +- .../base-hw/lib/mk/spec/usb_armory/core-hw-trustzone_on.mk | 2 +- repos/base-hw/lib/mk/spec/x86_64/core-hw-muen_on.mk | 2 +- repos/base-hw/lib/mk/spec/x86_64/core-hw.inc | 2 +- repos/base-hw/lib/mk/spec/zynq/core-hw.inc | 2 +- repos/base-hw/lib/mk/spec/zynq_qemu/core-hw.mk | 4 ++-- .../base-hw/src/core/{include => }/cpu_thread_allocator.h | 6 +++--- .../base-hw/src/core/{include => }/irq_session_component.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/clock.h | 6 +++--- .../base-hw/src/core/{include => }/kernel/configuration.h | 6 +++--- .../base-hw/src/core/{include => }/kernel/core_interface.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/cpu.h | 6 +++--- .../base-hw/src/core/{include => }/kernel/cpu_scheduler.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/double_list.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/fifo.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/ipc_node.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/irq.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/kernel.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/log.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/object.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/pd.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/perf_counter.h | 6 +++--- .../src/core/{include => }/kernel/signal_receiver.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/thread.h | 6 +++--- repos/base-hw/src/core/{include => }/kernel/vm.h | 6 +++--- repos/base-hw/src/core/{include => }/map_local.h | 6 +++--- repos/base-hw/src/core/{include => }/object.h | 6 +++--- repos/base-hw/src/core/{include => }/pager.h | 6 +++--- repos/base-hw/src/core/{include => }/platform.h | 6 +++--- repos/base-hw/src/core/{include => }/platform_pd.h | 6 +++--- repos/base-hw/src/core/{include => }/platform_thread.h | 6 +++--- repos/base-hw/src/core/{include => }/rpc_cap_factory.h | 6 +++--- repos/base-hw/src/core/{include => }/signal_broker.h | 6 +++--- .../src/core/{include => }/signal_source_component.h | 6 +++--- .../base-hw/src/core/{include => }/spec/arm/cpu_support.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/arm/fpu.h | 6 +++--- .../src/core/{include => }/spec/arm/macros_support.s | 0 repos/base-hw/src/core/{include => }/spec/arm_gic/pic.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/arm_v6/cpu.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/arm_v6/macros.s | 0 .../src/core/{include => }/spec/arm_v6/translation_table.h | 6 +++--- .../src/core/{include => }/spec/arm_v7/cpu_support.h | 6 +++--- .../src/core/{include => }/spec/arm_v7/macros_support.s | 0 .../spec/arm_v7/trustzone/vm_session_component.h | 6 +++--- .../spec/arm_v7/virtualization/vm_session_component.h | 6 +++--- .../src/core/{include => }/spec/cortex_a15/board_support.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/cortex_a15/cpu.h | 6 +++--- .../src/core/{include => }/spec/cortex_a15/macros.s | 0 .../core/{include => }/spec/cortex_a15/translation_table.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/cortex_a8/cpu.h | 6 +++--- .../base-hw/src/core/{include => }/spec/cortex_a8/macros.s | 0 .../core/{include => }/spec/cortex_a8/translation_table.h | 6 +++--- .../src/core/{include => }/spec/cortex_a9/board_support.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/cortex_a9/cpu.h | 6 +++--- .../base-hw/src/core/{include => }/spec/cortex_a9/macros.s | 0 .../base-hw/src/core/{include => }/spec/cortex_a9/timer.h | 6 +++--- .../core/{include => }/spec/cortex_a9/translation_table.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/exynos5/board.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/exynos5/serial.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/exynos5/timer.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/imx/serial.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/imx53/board.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/imx53/pic.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/imx53/timer.h | 6 +++--- .../{include => }/spec/imx53_qsb/trustzone/csu_config.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/imx6/board.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/panda/board.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/pbxa9/board.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/pl011/serial.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/riscv/board.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/riscv/cpu.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/riscv/macros.s | 0 repos/base-hw/src/core/{include => }/spec/riscv/pic.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/riscv/serial.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/riscv/timer.h | 6 +++--- .../src/core/{include => }/spec/riscv/translation_table.h | 7 +++---- repos/base-hw/src/core/{include => }/spec/rpi/board.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/rpi/pic.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/rpi/timer.h | 6 +++--- .../base-hw/src/core/{include => }/spec/smp/kernel/lock.h | 6 +++--- .../base-hw/src/core/{include => }/spec/tl16c750/serial.h | 6 +++--- .../src/core/{include => }/spec/usb_armory/csu_config.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/x86_64/board.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/x86_64/cpu.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/x86_64/fpu.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/x86_64/macros.s | 0 .../src/core/{include => }/spec/x86_64/muen/board.h | 6 +++--- .../base-hw/src/core/{include => }/spec/x86_64/muen/pic.h | 6 +++--- .../src/core/{include => }/spec/x86_64/muen/serial.h | 6 +++--- .../core/{include => }/spec/x86_64/muen/sinfo_instance.h | 6 +++--- .../src/core/{include => }/spec/x86_64/muen/timer.h | 6 +++--- .../{include => }/spec/x86_64/muen/vm_session_component.h | 6 +++--- .../src/core/{include => }/spec/x86_64/muen/vm_state.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/x86_64/pic.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/x86_64/port_io.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/x86_64/serial.h | 6 +++--- repos/base-hw/src/core/{include => }/spec/x86_64/timer.h | 6 +++--- .../src/core/{include => }/spec/x86_64/translation_table.h | 5 +++++ .../src/core/{include => }/spec/xilinx_uartps_0/serial.h | 6 +++--- .../base-hw/src/core/{include => }/spec/zynq_qemu/board.h | 6 +++--- repos/base-hw/src/core/{include => }/util.h | 6 +++--- repos/base-hw/src/core/{include => }/vm_root.h | 6 +++--- repos/base-hw/src/test/cpu_scheduler/target.mk | 2 +- repos/base-hw/src/test/double_list/target.mk | 2 +- 121 files changed, 300 insertions(+), 296 deletions(-) rename repos/base-hw/src/core/{include => }/cpu_thread_allocator.h (90%) rename repos/base-hw/src/core/{include => }/irq_session_component.h (91%) rename repos/base-hw/src/core/{include => }/kernel/clock.h (94%) rename repos/base-hw/src/core/{include => }/kernel/configuration.h (83%) rename repos/base-hw/src/core/{include => }/kernel/core_interface.h (98%) rename repos/base-hw/src/core/{include => }/kernel/cpu.h (98%) rename repos/base-hw/src/core/{include => }/kernel/cpu_scheduler.h (97%) rename repos/base-hw/src/core/{include => }/kernel/double_list.h (94%) rename repos/base-hw/src/core/{include => }/kernel/fifo.h (86%) rename repos/base-hw/src/core/{include => }/kernel/ipc_node.h (97%) rename repos/base-hw/src/core/{include => }/kernel/irq.h (95%) rename repos/base-hw/src/core/{include => }/kernel/kernel.h (80%) rename repos/base-hw/src/core/{include => }/kernel/log.h (78%) rename repos/base-hw/src/core/{include => }/kernel/object.h (96%) rename repos/base-hw/src/core/{include => }/kernel/pd.h (96%) rename repos/base-hw/src/core/{include => }/kernel/perf_counter.h (76%) rename repos/base-hw/src/core/{include => }/kernel/signal_receiver.h (97%) rename repos/base-hw/src/core/{include => }/kernel/thread.h (98%) rename repos/base-hw/src/core/{include => }/kernel/vm.h (95%) rename repos/base-hw/src/core/{include => }/map_local.h (90%) rename repos/base-hw/src/core/{include => }/object.h (93%) rename repos/base-hw/src/core/{include => }/pager.h (97%) rename repos/base-hw/src/core/{include => }/platform.h (97%) rename repos/base-hw/src/core/{include => }/platform_pd.h (97%) rename repos/base-hw/src/core/{include => }/platform_thread.h (97%) rename repos/base-hw/src/core/{include => }/rpc_cap_factory.h (95%) rename repos/base-hw/src/core/{include => }/signal_broker.h (96%) rename repos/base-hw/src/core/{include => }/signal_source_component.h (91%) rename repos/base-hw/src/core/{include => }/spec/arm/cpu_support.h (98%) rename repos/base-hw/src/core/{include => }/spec/arm/fpu.h (97%) rename repos/base-hw/src/core/{include => }/spec/arm/macros_support.s (100%) rename repos/base-hw/src/core/{include => }/spec/arm_gic/pic.h (88%) rename repos/base-hw/src/core/{include => }/spec/arm_v6/cpu.h (85%) rename repos/base-hw/src/core/{include => }/spec/arm_v6/macros.s (100%) rename repos/base-hw/src/core/{include => }/spec/arm_v6/translation_table.h (80%) rename repos/base-hw/src/core/{include => }/spec/arm_v7/cpu_support.h (95%) rename repos/base-hw/src/core/{include => }/spec/arm_v7/macros_support.s (100%) rename repos/base-hw/src/core/{include => }/spec/arm_v7/trustzone/vm_session_component.h (88%) rename repos/base-hw/src/core/{include => }/spec/arm_v7/virtualization/vm_session_component.h (89%) rename repos/base-hw/src/core/{include => }/spec/cortex_a15/board_support.h (80%) rename repos/base-hw/src/core/{include => }/spec/cortex_a15/cpu.h (98%) rename repos/base-hw/src/core/{include => }/spec/cortex_a15/macros.s (100%) rename repos/base-hw/src/core/{include => }/spec/cortex_a15/translation_table.h (64%) rename repos/base-hw/src/core/{include => }/spec/cortex_a8/cpu.h (87%) rename repos/base-hw/src/core/{include => }/spec/cortex_a8/macros.s (100%) rename repos/base-hw/src/core/{include => }/spec/cortex_a8/translation_table.h (85%) rename repos/base-hw/src/core/{include => }/spec/cortex_a9/board_support.h (87%) rename repos/base-hw/src/core/{include => }/spec/cortex_a9/cpu.h (94%) rename repos/base-hw/src/core/{include => }/spec/cortex_a9/macros.s (100%) rename repos/base-hw/src/core/{include => }/spec/cortex_a9/timer.h (95%) rename repos/base-hw/src/core/{include => }/spec/cortex_a9/translation_table.h (75%) rename repos/base-hw/src/core/{include => }/spec/exynos5/board.h (83%) rename repos/base-hw/src/core/{include => }/spec/exynos5/serial.h (84%) rename repos/base-hw/src/core/{include => }/spec/exynos5/timer.h (97%) rename repos/base-hw/src/core/{include => }/spec/imx/serial.h (83%) rename repos/base-hw/src/core/{include => }/spec/imx53/board.h (76%) rename repos/base-hw/src/core/{include => }/spec/imx53/pic.h (86%) rename repos/base-hw/src/core/{include => }/spec/imx53/timer.h (96%) rename repos/base-hw/src/core/{include => }/spec/imx53_qsb/trustzone/csu_config.h (71%) rename repos/base-hw/src/core/{include => }/spec/imx6/board.h (75%) rename repos/base-hw/src/core/{include => }/spec/panda/board.h (89%) rename repos/base-hw/src/core/{include => }/spec/pbxa9/board.h (73%) rename repos/base-hw/src/core/{include => }/spec/pl011/serial.h (83%) rename repos/base-hw/src/core/{include => }/spec/riscv/board.h (74%) rename repos/base-hw/src/core/{include => }/spec/riscv/cpu.h (97%) rename repos/base-hw/src/core/{include => }/spec/riscv/macros.s (100%) rename repos/base-hw/src/core/{include => }/spec/riscv/pic.h (89%) rename repos/base-hw/src/core/{include => }/spec/riscv/serial.h (79%) rename repos/base-hw/src/core/{include => }/spec/riscv/timer.h (93%) rename repos/base-hw/src/core/{include => }/spec/riscv/translation_table.h (77%) rename repos/base-hw/src/core/{include => }/spec/rpi/board.h (81%) rename repos/base-hw/src/core/{include => }/spec/rpi/pic.h (95%) rename repos/base-hw/src/core/{include => }/spec/rpi/timer.h (89%) rename repos/base-hw/src/core/{include => }/spec/smp/kernel/lock.h (75%) rename repos/base-hw/src/core/{include => }/spec/tl16c750/serial.h (83%) rename repos/base-hw/src/core/{include => }/spec/usb_armory/csu_config.h (74%) rename repos/base-hw/src/core/{include => }/spec/x86_64/board.h (75%) rename repos/base-hw/src/core/{include => }/spec/x86_64/cpu.h (98%) rename repos/base-hw/src/core/{include => }/spec/x86_64/fpu.h (95%) rename repos/base-hw/src/core/{include => }/spec/x86_64/macros.s (100%) rename repos/base-hw/src/core/{include => }/spec/x86_64/muen/board.h (79%) rename repos/base-hw/src/core/{include => }/spec/x86_64/muen/pic.h (88%) rename repos/base-hw/src/core/{include => }/spec/x86_64/muen/serial.h (80%) rename repos/base-hw/src/core/{include => }/spec/x86_64/muen/sinfo_instance.h (73%) rename repos/base-hw/src/core/{include => }/spec/x86_64/muen/timer.h (94%) rename repos/base-hw/src/core/{include => }/spec/x86_64/muen/vm_session_component.h (88%) rename repos/base-hw/src/core/{include => }/spec/x86_64/muen/vm_state.h (72%) rename repos/base-hw/src/core/{include => }/spec/x86_64/pic.h (96%) rename repos/base-hw/src/core/{include => }/spec/x86_64/port_io.h (81%) rename repos/base-hw/src/core/{include => }/spec/x86_64/serial.h (82%) rename repos/base-hw/src/core/{include => }/spec/x86_64/timer.h (93%) rename repos/base-hw/src/core/{include => }/spec/x86_64/translation_table.h (69%) rename repos/base-hw/src/core/{include => }/spec/xilinx_uartps_0/serial.h (84%) rename repos/base-hw/src/core/{include => }/spec/zynq_qemu/board.h (78%) rename repos/base-hw/src/core/{include => }/util.h (92%) rename repos/base-hw/src/core/{include => }/vm_root.h (90%) diff --git a/repos/base-hw/lib/mk/core-hw.inc b/repos/base-hw/lib/mk/core-hw.inc index 93501f8f95..e2540570e5 100644 --- a/repos/base-hw/lib/mk/core-hw.inc +++ b/repos/base-hw/lib/mk/core-hw.inc @@ -7,7 +7,7 @@ LIBS += base-hw-common cxx # add include paths -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include +INC_DIR += $(BASE_DIR)/../base-hw/src/core INC_DIR += $(BASE_DIR)/src/core/include INC_DIR += $(BASE_DIR)/../base-hw/src/include INC_DIR += $(BASE_DIR)/src/include diff --git a/repos/base-hw/lib/mk/spec/arm/core-hw.inc b/repos/base-hw/lib/mk/spec/arm/core-hw.inc index 58c981a5b6..7aa298e54e 100644 --- a/repos/base-hw/lib/mk/spec/arm/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/arm/core-hw.inc @@ -5,7 +5,7 @@ # # add include paths -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/arm +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/arm # add C++ sources SRC_CC += spec/arm/kernel/thread.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc b/repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc index 44568cf712..f9de7b4569 100644 --- a/repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc @@ -6,7 +6,7 @@ # # add include paths -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/arm_v6 +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/arm_v6 # add C++ sources SRC_CC += spec/arm_v6/cpu.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc b/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc index 14b5b5e9ef..d0b8e7a508 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc @@ -5,7 +5,7 @@ # # add include paths -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/arm_v7 +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/arm_v7 # add C++ sources SRC_CC += spec/arm_v7/cpu.cc diff --git a/repos/base-hw/lib/mk/spec/arndale/core-hw.mk b/repos/base-hw/lib/mk/spec/arndale/core-hw.mk index 5ba3e5d5a2..26f47f304a 100644 --- a/repos/base-hw/lib/mk/spec/arndale/core-hw.mk +++ b/repos/base-hw/lib/mk/spec/arndale/core-hw.mk @@ -5,7 +5,7 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/include/spec/arm_v7/virtualization +INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/virtualization # add C++ sources SRC_CC += spec/arm_gic/pic.cc diff --git a/repos/base-hw/lib/mk/spec/cortex_a15/core-hw.inc b/repos/base-hw/lib/mk/spec/cortex_a15/core-hw.inc index d44af57e27..0fe9f92e41 100644 --- a/repos/base-hw/lib/mk/spec/cortex_a15/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/cortex_a15/core-hw.inc @@ -5,8 +5,8 @@ # # add include paths -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/cortex_a15 -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/arm_gic +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/cortex_a15 +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/arm_gic # add C++ sources SRC_CC += spec/cortex_a15/kernel/cpu.cc diff --git a/repos/base-hw/lib/mk/spec/cortex_a8/core-hw.inc b/repos/base-hw/lib/mk/spec/cortex_a8/core-hw.inc index db9a29c17a..615934f3ef 100644 --- a/repos/base-hw/lib/mk/spec/cortex_a8/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/cortex_a8/core-hw.inc @@ -5,7 +5,7 @@ # # add include paths -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/cortex_a8 +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/cortex_a8 # add C++ sources SRC_CC += spec/cortex_a8/cpu.cc diff --git a/repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc b/repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc index 5db2a02e50..d0b7a80d02 100644 --- a/repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc @@ -5,8 +5,8 @@ # # add include paths -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/cortex_a9 -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/arm_gic +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/cortex_a9 +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/arm_gic # add C++ sources SRC_CC += spec/cortex_a9/kernel/cpu.cc diff --git a/repos/base-hw/lib/mk/spec/exynos5/core-hw.inc b/repos/base-hw/lib/mk/spec/exynos5/core-hw.inc index 342c8cb775..762b22c9d3 100644 --- a/repos/base-hw/lib/mk/spec/exynos5/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/exynos5/core-hw.inc @@ -5,7 +5,7 @@ # # add include paths -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/exynos5 +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/exynos5 # add C++ sources SRC_CC += spec/exynos5/cpu.cc diff --git a/repos/base-hw/lib/mk/spec/imx53/core-hw-trustzone_on.inc b/repos/base-hw/lib/mk/spec/imx53/core-hw-trustzone_on.inc index 1c6e8f77ad..2a7bb6b5c4 100644 --- a/repos/base-hw/lib/mk/spec/imx53/core-hw-trustzone_on.inc +++ b/repos/base-hw/lib/mk/spec/imx53/core-hw-trustzone_on.inc @@ -6,8 +6,8 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/include/spec/arm_v7/trustzone -INC_DIR += $(REP_DIR)/src/core/include/spec/imx53/trustzone +INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/trustzone +INC_DIR += $(REP_DIR)/src/core/spec/imx53/trustzone # add C++ sources SRC_CC += spec/imx53/trustzone/platform_support.cc diff --git a/repos/base-hw/lib/mk/spec/imx53/core-hw.inc b/repos/base-hw/lib/mk/spec/imx53/core-hw.inc index 71449fc21a..f432f93fb4 100644 --- a/repos/base-hw/lib/mk/spec/imx53/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/imx53/core-hw.inc @@ -6,8 +6,8 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/include/spec/imx53 -INC_DIR += $(REP_DIR)/src/core/include/spec/imx +INC_DIR += $(REP_DIR)/src/core/spec/imx53 +INC_DIR += $(REP_DIR)/src/core/spec/imx SRC_CC += spec/imx53/pic.cc diff --git a/repos/base-hw/lib/mk/spec/imx53_qsb/core-hw-trustzone_on.mk b/repos/base-hw/lib/mk/spec/imx53_qsb/core-hw-trustzone_on.mk index 75b71130d5..7f7f279aa1 100644 --- a/repos/base-hw/lib/mk/spec/imx53_qsb/core-hw-trustzone_on.mk +++ b/repos/base-hw/lib/mk/spec/imx53_qsb/core-hw-trustzone_on.mk @@ -5,7 +5,7 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/include/spec/imx53_qsb/trustzone +INC_DIR += $(REP_DIR)/src/core/spec/imx53_qsb/trustzone # include less specific configuration include $(REP_DIR)/lib/mk/spec/imx53/core-hw-trustzone_on.inc diff --git a/repos/base-hw/lib/mk/spec/imx6/core-hw.mk b/repos/base-hw/lib/mk/spec/imx6/core-hw.mk index 40dc38f9b5..2718415b2a 100644 --- a/repos/base-hw/lib/mk/spec/imx6/core-hw.mk +++ b/repos/base-hw/lib/mk/spec/imx6/core-hw.mk @@ -7,8 +7,8 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/include/spec/imx6 -INC_DIR += $(REP_DIR)/src/core/include/spec/imx +INC_DIR += $(REP_DIR)/src/core/spec/imx6 +INC_DIR += $(REP_DIR)/src/core/spec/imx # add C++ sources SRC_CC += platform_services.cc diff --git a/repos/base-hw/lib/mk/spec/panda/core-hw.mk b/repos/base-hw/lib/mk/spec/panda/core-hw.mk index 9926391c04..65a29f024e 100644 --- a/repos/base-hw/lib/mk/spec/panda/core-hw.mk +++ b/repos/base-hw/lib/mk/spec/panda/core-hw.mk @@ -6,8 +6,8 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/include/spec/panda -INC_DIR += $(REP_DIR)/src/core/include/spec/tl16c750 +INC_DIR += $(REP_DIR)/src/core/spec/panda +INC_DIR += $(REP_DIR)/src/core/spec/tl16c750 # add C++ sources SRC_CC += platform_services.cc diff --git a/repos/base-hw/lib/mk/spec/pbxa9/core-hw.mk b/repos/base-hw/lib/mk/spec/pbxa9/core-hw.mk index 1e2309204b..c2da9df832 100644 --- a/repos/base-hw/lib/mk/spec/pbxa9/core-hw.mk +++ b/repos/base-hw/lib/mk/spec/pbxa9/core-hw.mk @@ -6,8 +6,8 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/include/spec/pbxa9 -INC_DIR += $(REP_DIR)/src/core/include/spec/pl011 +INC_DIR += $(REP_DIR)/src/core/spec/pbxa9 +INC_DIR += $(REP_DIR)/src/core/spec/pl011 # add C++ sources SRC_CC += platform_services.cc diff --git a/repos/base-hw/lib/mk/spec/riscv/core-hw.mk b/repos/base-hw/lib/mk/spec/riscv/core-hw.mk index d3f66c88fd..b8d03f73ab 100644 --- a/repos/base-hw/lib/mk/spec/riscv/core-hw.mk +++ b/repos/base-hw/lib/mk/spec/riscv/core-hw.mk @@ -1,4 +1,4 @@ -INC_DIR += $(REP_DIR)/src/core/include/spec/riscv +INC_DIR += $(REP_DIR)/src/core/spec/riscv CC_OPT += -fno-delete-null-pointer-checks -msoft-float diff --git a/repos/base-hw/lib/mk/spec/rpi/core-hw.mk b/repos/base-hw/lib/mk/spec/rpi/core-hw.mk index decd8abe7d..47105dc7dd 100644 --- a/repos/base-hw/lib/mk/spec/rpi/core-hw.mk +++ b/repos/base-hw/lib/mk/spec/rpi/core-hw.mk @@ -5,8 +5,8 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/include/spec/rpi -INC_DIR += $(REP_DIR)/src/core/include/spec/pl011 +INC_DIR += $(REP_DIR)/src/core/spec/rpi +INC_DIR += $(REP_DIR)/src/core/spec/pl011 # add C++ sources SRC_CC += platform_services.cc diff --git a/repos/base-hw/lib/mk/spec/smp/core-hw.inc b/repos/base-hw/lib/mk/spec/smp/core-hw.inc index 23739a318f..cf0230590b 100644 --- a/repos/base-hw/lib/mk/spec/smp/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/smp/core-hw.inc @@ -5,7 +5,7 @@ # # add include paths -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/smp +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/smp # add C++ sources SRC_CC += spec/smp/kernel/kernel.cc diff --git a/repos/base-hw/lib/mk/spec/usb_armory/core-hw-trustzone_on.mk b/repos/base-hw/lib/mk/spec/usb_armory/core-hw-trustzone_on.mk index 5a3d407e50..1693ea29d8 100644 --- a/repos/base-hw/lib/mk/spec/usb_armory/core-hw-trustzone_on.mk +++ b/repos/base-hw/lib/mk/spec/usb_armory/core-hw-trustzone_on.mk @@ -5,7 +5,7 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/include/spec/usb_armory +INC_DIR += $(REP_DIR)/src/core/spec/usb_armory # include less specific configuration include $(REP_DIR)/lib/mk/spec/imx53/core-hw-trustzone_on.inc diff --git a/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen_on.mk b/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen_on.mk index f7038bcf93..6ab9f9fe3a 100644 --- a/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen_on.mk +++ b/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen_on.mk @@ -7,7 +7,7 @@ REQUIRES = muen # add include paths -INC_DIR += $(REP_DIR)/src/core/include/spec/x86_64/muen +INC_DIR += $(REP_DIR)/src/core/spec/x86_64/muen # add C++ sources SRC_CC += spec/x86_64/muen/kernel/cpu_exception.cc diff --git a/repos/base-hw/lib/mk/spec/x86_64/core-hw.inc b/repos/base-hw/lib/mk/spec/x86_64/core-hw.inc index 8808ffbe13..860ef27f01 100644 --- a/repos/base-hw/lib/mk/spec/x86_64/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/x86_64/core-hw.inc @@ -6,7 +6,7 @@ # # add include paths -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/x86_64 +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/x86_64 # add assembly sources SRC_S += spec/x86_64/mode_transition.s diff --git a/repos/base-hw/lib/mk/spec/zynq/core-hw.inc b/repos/base-hw/lib/mk/spec/zynq/core-hw.inc index bf8b7f653d..bd3868b156 100644 --- a/repos/base-hw/lib/mk/spec/zynq/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/zynq/core-hw.inc @@ -5,7 +5,7 @@ # # add include paths -INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/zynq +INC_DIR += $(BASE_DIR)/../base-hw/src/core/spec/zynq # add C++ sources SRC_CC += platform_services.cc diff --git a/repos/base-hw/lib/mk/spec/zynq_qemu/core-hw.mk b/repos/base-hw/lib/mk/spec/zynq_qemu/core-hw.mk index 9c1375fa0b..86931d6681 100644 --- a/repos/base-hw/lib/mk/spec/zynq_qemu/core-hw.mk +++ b/repos/base-hw/lib/mk/spec/zynq_qemu/core-hw.mk @@ -5,8 +5,8 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/include/spec/xilinx_uartps_0 -INC_DIR += $(REP_DIR)/src/core/include/spec/zynq_qemu +INC_DIR += $(REP_DIR)/src/core/spec/xilinx_uartps_0 +INC_DIR += $(REP_DIR)/src/core/spec/zynq_qemu NR_OF_CPUS = 1 diff --git a/repos/base-hw/src/core/include/cpu_thread_allocator.h b/repos/base-hw/src/core/cpu_thread_allocator.h similarity index 90% rename from repos/base-hw/src/core/include/cpu_thread_allocator.h rename to repos/base-hw/src/core/cpu_thread_allocator.h index 9ba4b16cb3..cfba45c574 100644 --- a/repos/base-hw/src/core/include/cpu_thread_allocator.h +++ b/repos/base-hw/src/core/cpu_thread_allocator.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_ -#define _CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_ +#ifndef _CORE__CPU_THREAD_ALLOCATOR_H_ +#define _CORE__CPU_THREAD_ALLOCATOR_H_ #include #include @@ -68,4 +68,4 @@ namespace Genode }; } -#endif /* _CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_ */ +#endif /* _CORE__CPU_THREAD_ALLOCATOR_H_ */ diff --git a/repos/base-hw/src/core/include/irq_session_component.h b/repos/base-hw/src/core/irq_session_component.h similarity index 91% rename from repos/base-hw/src/core/include/irq_session_component.h rename to repos/base-hw/src/core/irq_session_component.h index 31cb0eae19..af54837a2b 100644 --- a/repos/base-hw/src/core/include/irq_session_component.h +++ b/repos/base-hw/src/core/irq_session_component.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_ -#define _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_ +#ifndef _CORE__IRQ_SESSION_COMPONENT_H_ +#define _CORE__IRQ_SESSION_COMPONENT_H_ /* Genode includes */ #include @@ -72,4 +72,4 @@ class Genode::Irq_session_component : public Rpc_object, } }; -#endif /* _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_ */ +#endif /* _CORE__IRQ_SESSION_COMPONENT_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/clock.h b/repos/base-hw/src/core/kernel/clock.h similarity index 94% rename from repos/base-hw/src/core/include/kernel/clock.h rename to repos/base-hw/src/core/kernel/clock.h index 7edb4484fc..bc0efc035a 100644 --- a/repos/base-hw/src/core/include/kernel/clock.h +++ b/repos/base-hw/src/core/kernel/clock.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__CLOCK_H_ -#define _CORE__INCLUDE__KERNEL__CLOCK_H_ +#ifndef _CORE__KERNEL__CLOCK_H_ +#define _CORE__KERNEL__CLOCK_H_ /* base-hw includes */ #include @@ -104,4 +104,4 @@ class Kernel::Clock time_t timeout_max_us() const; }; -#endif /* _CORE__INCLUDE__KERNEL__CLOCK_H_ */ +#endif /* _CORE__KERNEL__CLOCK_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/configuration.h b/repos/base-hw/src/core/kernel/configuration.h similarity index 83% rename from repos/base-hw/src/core/include/kernel/configuration.h rename to repos/base-hw/src/core/kernel/configuration.h index a47ba28fa8..4d370ff8ca 100644 --- a/repos/base-hw/src/core/include/kernel/configuration.h +++ b/repos/base-hw/src/core/kernel/configuration.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__CONFIGURATION_H_ -#define _CORE__INCLUDE__KERNEL__CONFIGURATION_H_ +#ifndef _CORE__KERNEL__CONFIGURATION_H_ +#define _CORE__KERNEL__CONFIGURATION_H_ #include @@ -33,4 +33,4 @@ namespace Kernel constexpr time_t cpu_fill_us = 10000; } -#endif /* _CORE__INCLUDE__KERNEL__CONFIGURATION_H_ */ +#endif /* _CORE__KERNEL__CONFIGURATION_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/core_interface.h b/repos/base-hw/src/core/kernel/core_interface.h similarity index 98% rename from repos/base-hw/src/core/include/kernel/core_interface.h rename to repos/base-hw/src/core/kernel/core_interface.h index c1be7ee0a6..b26ef14c36 100644 --- a/repos/base-hw/src/core/include/kernel/core_interface.h +++ b/repos/base-hw/src/core/kernel/core_interface.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__CORE_INTERFACE_H_ -#define _CORE__INCLUDE__KERNEL__CORE_INTERFACE_H_ +#ifndef _CORE__KERNEL__CORE_INTERFACE_H_ +#define _CORE__KERNEL__CORE_INTERFACE_H_ /* base-internal includes */ #include @@ -252,4 +252,4 @@ namespace Kernel } } -#endif /* _CORE__INCLUDE__KERNEL__CORE_INTERFACE_H_ */ +#endif /* _CORE__KERNEL__CORE_INTERFACE_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/cpu.h b/repos/base-hw/src/core/kernel/cpu.h similarity index 98% rename from repos/base-hw/src/core/include/kernel/cpu.h rename to repos/base-hw/src/core/kernel/cpu.h index 13c9510cb1..d9587573e9 100644 --- a/repos/base-hw/src/core/include/kernel/cpu.h +++ b/repos/base-hw/src/core/kernel/cpu.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__CPU_H_ -#define _CORE__INCLUDE__KERNEL__CPU_H_ +#ifndef _CORE__KERNEL__CPU_H_ +#define _CORE__KERNEL__CPU_H_ /* core includes */ #include @@ -376,4 +376,4 @@ class Kernel::Cpu_pool Timer * timer() { return &_timer; } }; -#endif /* _CORE__INCLUDE__KERNEL__CPU_H_ */ +#endif /* _CORE__KERNEL__CPU_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/cpu_scheduler.h b/repos/base-hw/src/core/kernel/cpu_scheduler.h similarity index 97% rename from repos/base-hw/src/core/include/kernel/cpu_scheduler.h rename to repos/base-hw/src/core/kernel/cpu_scheduler.h index 744bd49f8e..a39183011a 100644 --- a/repos/base-hw/src/core/include/kernel/cpu_scheduler.h +++ b/repos/base-hw/src/core/kernel/cpu_scheduler.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__CPU_SCHEDULER_H_ -#define _CORE__INCLUDE__KERNEL__CPU_SCHEDULER_H_ +#ifndef _CORE__KERNEL__CPU_SCHEDULER_H_ +#define _CORE__KERNEL__CPU_SCHEDULER_H_ /* core includes */ #include @@ -230,4 +230,4 @@ class Kernel::Cpu_scheduler unsigned residual() const { return _residual; } }; -#endif /* _CORE__INCLUDE__KERNEL__CPU_SCHEDULER_H_ */ +#endif /* _CORE__KERNEL__CPU_SCHEDULER_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/double_list.h b/repos/base-hw/src/core/kernel/double_list.h similarity index 94% rename from repos/base-hw/src/core/include/kernel/double_list.h rename to repos/base-hw/src/core/kernel/double_list.h index 17c21917a2..c6cdc5d814 100644 --- a/repos/base-hw/src/core/include/kernel/double_list.h +++ b/repos/base-hw/src/core/kernel/double_list.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__DOUBLE_LIST_H_ -#define _CORE__INCLUDE__KERNEL__DOUBLE_LIST_H_ +#ifndef _CORE__KERNEL__DOUBLE_LIST_H_ +#define _CORE__KERNEL__DOUBLE_LIST_H_ namespace Kernel { @@ -126,4 +126,4 @@ template class Kernel::Double_list_typed : public Double_list T * head() const { return _typed(Double_list::head()); } }; -#endif /* _CORE__INCLUDE__KERNEL__DOUBLE_LIST_H_ */ +#endif /* _CORE__KERNEL__DOUBLE_LIST_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/fifo.h b/repos/base-hw/src/core/kernel/fifo.h similarity index 86% rename from repos/base-hw/src/core/include/kernel/fifo.h rename to repos/base-hw/src/core/kernel/fifo.h index 37630361d1..52d93d7de6 100644 --- a/repos/base-hw/src/core/include/kernel/fifo.h +++ b/repos/base-hw/src/core/kernel/fifo.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__FIFO_H_ -#define _CORE__INCLUDE__KERNEL__FIFO_H_ +#ifndef _CORE__KERNEL__FIFO_H_ +#define _CORE__KERNEL__FIFO_H_ /* Genode includes */ #include @@ -40,4 +40,4 @@ namespace Kernel { }; } -#endif /* _CORE__INCLUDE__KERNEL__FIFO_H_ */ +#endif /* _CORE__KERNEL__FIFO_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/ipc_node.h b/repos/base-hw/src/core/kernel/ipc_node.h similarity index 97% rename from repos/base-hw/src/core/include/kernel/ipc_node.h rename to repos/base-hw/src/core/kernel/ipc_node.h index 859ee31781..8932276993 100644 --- a/repos/base-hw/src/core/include/kernel/ipc_node.h +++ b/repos/base-hw/src/core/kernel/ipc_node.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__IPC_NODE_H_ -#define _CORE__INCLUDE__KERNEL__IPC_NODE_H_ +#ifndef _CORE__KERNEL__IPC_NODE_H_ +#define _CORE__KERNEL__IPC_NODE_H_ /* Genode includes */ #include @@ -204,4 +204,4 @@ class Kernel::Ipc_node : public Ipc_node_queue::Element Genode::Native_utcb * utcb() { return _utcb; } }; -#endif /* _CORE__INCLUDE__KERNEL__IPC_NODE_H_ */ +#endif /* _CORE__KERNEL__IPC_NODE_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/irq.h b/repos/base-hw/src/core/kernel/irq.h similarity index 95% rename from repos/base-hw/src/core/include/kernel/irq.h rename to repos/base-hw/src/core/kernel/irq.h index 6804822b87..e5f237777d 100644 --- a/repos/base-hw/src/core/include/kernel/irq.h +++ b/repos/base-hw/src/core/kernel/irq.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__IRQ_H_ -#define _CORE__INCLUDE__KERNEL__IRQ_H_ +#ifndef _CORE__KERNEL__IRQ_H_ +#define _CORE__KERNEL__IRQ_H_ /* Genode includes */ #include @@ -156,4 +156,4 @@ class Kernel::User_irq : public Kernel::Irq, public Kernel::Object return dynamic_cast(_pool()->object(irq)); } }; -#endif /* _CORE__INCLUDE__KERNEL__IRQ_H_ */ +#endif /* _CORE__KERNEL__IRQ_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/kernel.h b/repos/base-hw/src/core/kernel/kernel.h similarity index 80% rename from repos/base-hw/src/core/include/kernel/kernel.h rename to repos/base-hw/src/core/kernel/kernel.h index 15079fce78..a134e486ae 100644 --- a/repos/base-hw/src/core/include/kernel/kernel.h +++ b/repos/base-hw/src/core/kernel/kernel.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__KERNEL_H_ -#define _CORE__INCLUDE__KERNEL__KERNEL_H_ +#ifndef _CORE__KERNEL__KERNEL_H_ +#define _CORE__KERNEL__KERNEL_H_ #include #include @@ -33,4 +33,4 @@ namespace Kernel { Genode::Board & board(); } -#endif /* _CORE__INCLUDE__KERNEL__KERNEL_H_ */ +#endif /* _CORE__KERNEL__KERNEL_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/log.h b/repos/base-hw/src/core/kernel/log.h similarity index 78% rename from repos/base-hw/src/core/include/kernel/log.h rename to repos/base-hw/src/core/kernel/log.h index c56ab4d181..813de7f411 100644 --- a/repos/base-hw/src/core/include/kernel/log.h +++ b/repos/base-hw/src/core/kernel/log.h @@ -11,9 +11,9 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__LOG_H_ -#define _CORE__INCLUDE__KERNEL__LOG_H_ +#ifndef _CORE__KERNEL__LOG_H_ +#define _CORE__KERNEL__LOG_H_ namespace Kernel { void log(char const); } -#endif +#endif /* _CORE__KERNEL__LOG_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/object.h b/repos/base-hw/src/core/kernel/object.h similarity index 96% rename from repos/base-hw/src/core/include/kernel/object.h rename to repos/base-hw/src/core/kernel/object.h index 8e4da7cd25..9dc6bad884 100644 --- a/repos/base-hw/src/core/include/kernel/object.h +++ b/repos/base-hw/src/core/kernel/object.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__OBJECT_H_ -#define _CORE__INCLUDE__KERNEL__OBJECT_H_ +#ifndef _CORE__KERNEL__OBJECT_H_ +#define _CORE__KERNEL__OBJECT_H_ /* Genode includes */ #include @@ -190,4 +190,4 @@ class Kernel::Core_object : public T, public Kernel::Core_object_identity : T(args...), Core_object_identity(*static_cast(this)) { } }; -#endif /* _CORE__INCLUDE__KERNEL__OBJECT_H_ */ +#endif /* _CORE__KERNEL__OBJECT_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/pd.h b/repos/base-hw/src/core/kernel/pd.h similarity index 96% rename from repos/base-hw/src/core/include/kernel/pd.h rename to repos/base-hw/src/core/kernel/pd.h index 0dcfede67a..6199595286 100644 --- a/repos/base-hw/src/core/include/kernel/pd.h +++ b/repos/base-hw/src/core/kernel/pd.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__PD_H_ -#define _CORE__INCLUDE__KERNEL__PD_H_ +#ifndef _CORE__KERNEL__PD_H_ +#define _CORE__KERNEL__PD_H_ /* core includes */ #include @@ -141,4 +141,4 @@ class Kernel::Pd : public Cpu::Pd, Object_identity_reference_tree & cap_tree() { return _cap_tree; } }; -#endif /* _CORE__INCLUDE__KERNEL__PD_H_ */ +#endif /* _CORE__KERNEL__PD_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/perf_counter.h b/repos/base-hw/src/core/kernel/perf_counter.h similarity index 76% rename from repos/base-hw/src/core/include/kernel/perf_counter.h rename to repos/base-hw/src/core/kernel/perf_counter.h index cac1532dd1..c641abbce6 100644 --- a/repos/base-hw/src/core/include/kernel/perf_counter.h +++ b/repos/base-hw/src/core/kernel/perf_counter.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__PERF_COUNTER_H_ -#define _CORE__INCLUDE__KERNEL__PERF_COUNTER_H_ +#ifndef _CORE__KERNEL__PERF_COUNTER_H_ +#define _CORE__KERNEL__PERF_COUNTER_H_ namespace Kernel { @@ -33,4 +33,4 @@ namespace Kernel extern Perf_counter * perf_counter(); } -#endif /* _CORE__INCLUDE__KERNEL__PERF_COUNTER_H_ */ +#endif /* _CORE__KERNEL__PERF_COUNTER_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/signal_receiver.h b/repos/base-hw/src/core/kernel/signal_receiver.h similarity index 97% rename from repos/base-hw/src/core/include/kernel/signal_receiver.h rename to repos/base-hw/src/core/kernel/signal_receiver.h index a766eb03f2..5f8742f77a 100644 --- a/repos/base-hw/src/core/include/kernel/signal_receiver.h +++ b/repos/base-hw/src/core/kernel/signal_receiver.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__SIGNAL_RECEIVER_H_ -#define _CORE__INCLUDE__KERNEL__SIGNAL_RECEIVER_H_ +#ifndef _CORE__KERNEL__SIGNAL_RECEIVER_H_ +#define _CORE__KERNEL__SIGNAL_RECEIVER_H_ /* Genode includes */ #include @@ -305,4 +305,4 @@ class Kernel::Signal_receiver : public Kernel::Object call(call_id_delete_signal_receiver(), (Call_arg)receiver); } }; -#endif /* _CORE__INCLUDE__KERNEL__SIGNAL_RECEIVER_H_ */ +#endif /* _CORE__KERNEL__SIGNAL_RECEIVER_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/thread.h b/repos/base-hw/src/core/kernel/thread.h similarity index 98% rename from repos/base-hw/src/core/include/kernel/thread.h rename to repos/base-hw/src/core/kernel/thread.h index a30aaf40b6..f0d5b46c3a 100644 --- a/repos/base-hw/src/core/include/kernel/thread.h +++ b/repos/base-hw/src/core/kernel/thread.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__THREAD_H_ -#define _CORE__INCLUDE__KERNEL__THREAD_H_ +#ifndef _CORE__KERNEL__THREAD_H_ +#define _CORE__KERNEL__THREAD_H_ /* core includes */ #include @@ -306,4 +306,4 @@ class Kernel::Core_thread : public Core_object static Thread & singleton(); }; -#endif /* _CORE__INCLUDE__KERNEL__THREAD_H_ */ +#endif /* _CORE__KERNEL__THREAD_H_ */ diff --git a/repos/base-hw/src/core/include/kernel/vm.h b/repos/base-hw/src/core/kernel/vm.h similarity index 95% rename from repos/base-hw/src/core/include/kernel/vm.h rename to repos/base-hw/src/core/kernel/vm.h index 6a2e8b449e..cbed428c68 100644 --- a/repos/base-hw/src/core/include/kernel/vm.h +++ b/repos/base-hw/src/core/kernel/vm.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__VM_H_ -#define _CORE__INCLUDE__KERNEL__VM_H_ +#ifndef _CORE__KERNEL__VM_H_ +#define _CORE__KERNEL__VM_H_ #include @@ -122,4 +122,4 @@ class Kernel::Vm : public Cpu_job, Cpu_job * helping_sink() { return this; } }; -#endif /* _CORE__INCLUDE__KERNEL__VM_H_ */ +#endif /* _CORE__KERNEL__VM_H_ */ diff --git a/repos/base-hw/src/core/include/map_local.h b/repos/base-hw/src/core/map_local.h similarity index 90% rename from repos/base-hw/src/core/include/map_local.h rename to repos/base-hw/src/core/map_local.h index c835fc03f1..bfd701c8cd 100644 --- a/repos/base-hw/src/core/include/map_local.h +++ b/repos/base-hw/src/core/map_local.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__MAP_LOCAL_H_ -#define _CORE__INCLUDE__MAP_LOCAL_H_ +#ifndef _CORE__MAP_LOCAL_H_ +#define _CORE__MAP_LOCAL_H_ #include @@ -44,4 +44,4 @@ namespace Genode { bool unmap_local(addr_t virt_addr, size_t num_pages); } -#endif /* _CORE__INCLUDE__MAP_LOCAL_H_ */ +#endif /* _CORE__MAP_LOCAL_H_ */ diff --git a/repos/base-hw/src/core/include/object.h b/repos/base-hw/src/core/object.h similarity index 93% rename from repos/base-hw/src/core/include/object.h rename to repos/base-hw/src/core/object.h index a09209d2ab..667dbbb2ee 100644 --- a/repos/base-hw/src/core/include/object.h +++ b/repos/base-hw/src/core/object.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__OBJECT_H_ -#define _CORE__INCLUDE__OBJECT_H_ +#ifndef _CORE__OBJECT_H_ +#define _CORE__OBJECT_H_ /* Genode includes */ #include @@ -77,4 +77,4 @@ class Genode::Kernel_object } }; -#endif /* _CORE__INCLUDE__OBJECT_H_ */ +#endif /* _CORE__OBJECT_H_ */ diff --git a/repos/base-hw/src/core/include/pager.h b/repos/base-hw/src/core/pager.h similarity index 97% rename from repos/base-hw/src/core/include/pager.h rename to repos/base-hw/src/core/pager.h index aa287a61af..39a19a60cd 100644 --- a/repos/base-hw/src/core/include/pager.h +++ b/repos/base-hw/src/core/pager.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__PAGER_H_ -#define _CORE__INCLUDE__PAGER_H_ +#ifndef _CORE__PAGER_H_ +#define _CORE__PAGER_H_ /* Genode includes */ #include @@ -222,4 +222,4 @@ class Genode::Pager_entrypoint : public Object_pool, void entry(); }; -#endif /* _CORE__INCLUDE__PAGER_H_ */ +#endif /* _CORE__PAGER_H_ */ diff --git a/repos/base-hw/src/core/include/platform.h b/repos/base-hw/src/core/platform.h similarity index 97% rename from repos/base-hw/src/core/include/platform.h rename to repos/base-hw/src/core/platform.h index e850915798..b0b547c0d8 100644 --- a/repos/base-hw/src/core/include/platform.h +++ b/repos/base-hw/src/core/platform.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__PLATFORM_H_ -#define _CORE__INCLUDE__PLATFORM_H_ +#ifndef _CORE__PLATFORM_H_ +#define _CORE__PLATFORM_H_ /* Genode includes */ #include @@ -142,4 +142,4 @@ class Genode::Platform : public Genode::Platform_generic return Affinity::Space(NR_OF_CPUS); } }; -#endif /* _CORE__INCLUDE__PLATFORM_H_ */ +#endif /* _CORE__PLATFORM_H_ */ diff --git a/repos/base-hw/src/core/include/platform_pd.h b/repos/base-hw/src/core/platform_pd.h similarity index 97% rename from repos/base-hw/src/core/include/platform_pd.h rename to repos/base-hw/src/core/platform_pd.h index c7380df91c..59d1f89ef5 100644 --- a/repos/base-hw/src/core/include/platform_pd.h +++ b/repos/base-hw/src/core/platform_pd.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__PLATFORM_PD_H_ -#define _CORE__INCLUDE__PLATFORM_PD_H_ +#ifndef _CORE__PLATFORM_PD_H_ +#define _CORE__PLATFORM_PD_H_ /* Core includes */ #include @@ -217,4 +217,4 @@ struct Genode::Core_platform_pd : Genode::Platform_pd Core_platform_pd(); }; -#endif /* _CORE__INCLUDE__PLATFORM_PD_H_ */ +#endif /* _CORE__PLATFORM_PD_H_ */ diff --git a/repos/base-hw/src/core/include/platform_thread.h b/repos/base-hw/src/core/platform_thread.h similarity index 97% rename from repos/base-hw/src/core/include/platform_thread.h rename to repos/base-hw/src/core/platform_thread.h index bb44ff4065..f02aa38c7f 100644 --- a/repos/base-hw/src/core/include/platform_thread.h +++ b/repos/base-hw/src/core/platform_thread.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__PLATFORM_THREAD_H_ -#define _CORE__INCLUDE__PLATFORM_THREAD_H_ +#ifndef _CORE__PLATFORM_THREAD_H_ +#define _CORE__PLATFORM_THREAD_H_ /* Genode includes */ #include @@ -211,4 +211,4 @@ namespace Genode { }; } -#endif /* _CORE__INCLUDE__PLATFORM_THREAD_H_ */ +#endif /* _CORE__PLATFORM_THREAD_H_ */ diff --git a/repos/base-hw/src/core/include/rpc_cap_factory.h b/repos/base-hw/src/core/rpc_cap_factory.h similarity index 95% rename from repos/base-hw/src/core/include/rpc_cap_factory.h rename to repos/base-hw/src/core/rpc_cap_factory.h index 93c0517436..c585310618 100644 --- a/repos/base-hw/src/core/include/rpc_cap_factory.h +++ b/repos/base-hw/src/core/rpc_cap_factory.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__RPC_CAP_FACTORY_H_ -#define _CORE__INCLUDE__RPC_CAP_FACTORY_H_ +#ifndef _CORE__RPC_CAP_FACTORY_H_ +#define _CORE__RPC_CAP_FACTORY_H_ /* Genode includes */ #include @@ -119,4 +119,4 @@ class Genode::Rpc_cap_factory } }; -#endif /* _CORE__INCLUDE__RPC_CAP_FACTORY_H_ */ +#endif /* _CORE__RPC_CAP_FACTORY_H_ */ diff --git a/repos/base-hw/src/core/include/signal_broker.h b/repos/base-hw/src/core/signal_broker.h similarity index 96% rename from repos/base-hw/src/core/include/signal_broker.h rename to repos/base-hw/src/core/signal_broker.h index bc4e191b08..00fdf0936f 100644 --- a/repos/base-hw/src/core/include/signal_broker.h +++ b/repos/base-hw/src/core/signal_broker.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SIGNAL_BROKER_H_ -#define _CORE__INCLUDE__SIGNAL_BROKER_H_ +#ifndef _CORE__SIGNAL_BROKER_H_ +#define _CORE__SIGNAL_BROKER_H_ /* Genode includes */ #include @@ -147,4 +147,4 @@ class Genode::Signal_broker } }; -#endif /* _CORE__INCLUDE__SIGNAL_BROKER_H_ */ +#endif /* _CORE__SIGNAL_BROKER_H_ */ diff --git a/repos/base-hw/src/core/include/signal_source_component.h b/repos/base-hw/src/core/signal_source_component.h similarity index 91% rename from repos/base-hw/src/core/include/signal_source_component.h rename to repos/base-hw/src/core/signal_source_component.h index fe2fdcb2d9..a6809bf404 100644 --- a/repos/base-hw/src/core/include/signal_source_component.h +++ b/repos/base-hw/src/core/signal_source_component.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SIGNAL_SOURCE_COMPONENT_H_ -#define _CORE__INCLUDE__SIGNAL_SOURCE_COMPONENT_H_ +#ifndef _CORE__SIGNAL_SOURCE_COMPONENT_H_ +#define _CORE__SIGNAL_SOURCE_COMPONENT_H_ /* Genode includes */ #include @@ -62,4 +62,4 @@ Genode::Signal_context_component::Signal_context_component(Signal_source_compone Signal_context_pool::Entry(Kernel_object::_cap) { } -#endif /* _CORE__INCLUDE__SIGNAL_SOURCE_COMPONENT_H_ */ +#endif /* _CORE__SIGNAL_SOURCE_COMPONENT_H_ */ diff --git a/repos/base-hw/src/core/include/spec/arm/cpu_support.h b/repos/base-hw/src/core/spec/arm/cpu_support.h similarity index 98% rename from repos/base-hw/src/core/include/spec/arm/cpu_support.h rename to repos/base-hw/src/core/spec/arm/cpu_support.h index 435330f504..92b026bf53 100644 --- a/repos/base-hw/src/core/include/spec/arm/cpu_support.h +++ b/repos/base-hw/src/core/spec/arm/cpu_support.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__ARM__CPU_SUPPORT_H_ -#define _CORE__INCLUDE__SPEC__ARM__CPU_SUPPORT_H_ +#ifndef _CORE__SPEC__ARM__CPU_SUPPORT_H_ +#define _CORE__SPEC__ARM__CPU_SUPPORT_H_ /* Genode includes */ #include @@ -493,4 +493,4 @@ class Genode::Arm static unsigned primary_id() { return 0; } }; -#endif /* _CORE__INCLUDE__SPEC__ARM__CPU_SUPPORT_H_ */ +#endif /* _CORE__SPEC__ARM__CPU_SUPPORT_H_ */ diff --git a/repos/base-hw/src/core/include/spec/arm/fpu.h b/repos/base-hw/src/core/spec/arm/fpu.h similarity index 97% rename from repos/base-hw/src/core/include/spec/arm/fpu.h rename to repos/base-hw/src/core/spec/arm/fpu.h index be4a562736..5a737ed168 100644 --- a/repos/base-hw/src/core/include/spec/arm/fpu.h +++ b/repos/base-hw/src/core/spec/arm/fpu.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _SPEC__ARM__FPU_H_ -#define _SPEC__ARM__FPU_H_ +#ifndef _CORE__SPEC__ARM__FPU_H_ +#define _CORE__SPEC__ARM__FPU_H_ #include @@ -243,4 +243,4 @@ class Genode::Fpu * head branch as from 2014.04.17. */ -#endif /* _SPEC__ARM__FPU_H_ */ +#endif /* _CORE__SPEC__ARM__FPU_H_ */ diff --git a/repos/base-hw/src/core/include/spec/arm/macros_support.s b/repos/base-hw/src/core/spec/arm/macros_support.s similarity index 100% rename from repos/base-hw/src/core/include/spec/arm/macros_support.s rename to repos/base-hw/src/core/spec/arm/macros_support.s diff --git a/repos/base-hw/src/core/include/spec/arm_gic/pic.h b/repos/base-hw/src/core/spec/arm_gic/pic.h similarity index 88% rename from repos/base-hw/src/core/include/spec/arm_gic/pic.h rename to repos/base-hw/src/core/spec/arm_gic/pic.h index 1f28df8f47..95499c5bab 100644 --- a/repos/base-hw/src/core/include/spec/arm_gic/pic.h +++ b/repos/base-hw/src/core/spec/arm_gic/pic.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__ARM_GIC__PIC_H_ -#define _CORE__INCLUDE__SPEC__ARM_GIC__PIC_H_ +#ifndef _CORE__SPEC__ARM_GIC__PIC_H_ +#define _CORE__SPEC__ARM_GIC__PIC_H_ #include @@ -52,4 +52,4 @@ class Genode::Pic : public Hw::Pic } }; -#endif /* _CORE__INCLUDE__SPEC__ARM_GIC__PIC_H_ */ +#endif /* _CORE__SPEC__ARM_GIC__PIC_H_ */ diff --git a/repos/base-hw/src/core/include/spec/arm_v6/cpu.h b/repos/base-hw/src/core/spec/arm_v6/cpu.h similarity index 85% rename from repos/base-hw/src/core/include/spec/arm_v6/cpu.h rename to repos/base-hw/src/core/spec/arm_v6/cpu.h index f6b293da3e..c24e9924d0 100644 --- a/repos/base-hw/src/core/include/spec/arm_v6/cpu.h +++ b/repos/base-hw/src/core/spec/arm_v6/cpu.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__ARM_V6__CPU_H_ -#define _CORE__INCLUDE__SPEC__ARM_V6__CPU_H_ +#ifndef _CORE__SPEC__ARM_V6__CPU_H_ +#define _CORE__SPEC__ARM_V6__CPU_H_ /* core includes */ #include @@ -47,4 +47,4 @@ class Genode::Cpu : public Arm static void wait_for_interrupt() { /* FIXME */ } }; -#endif /* _CORE__INCLUDE__SPEC__ARM_V6__CPU_H_ */ +#endif /* _CORE__SPEC__ARM_V6__CPU_H_ */ diff --git a/repos/base-hw/src/core/include/spec/arm_v6/macros.s b/repos/base-hw/src/core/spec/arm_v6/macros.s similarity index 100% rename from repos/base-hw/src/core/include/spec/arm_v6/macros.s rename to repos/base-hw/src/core/spec/arm_v6/macros.s diff --git a/repos/base-hw/src/core/include/spec/arm_v6/translation_table.h b/repos/base-hw/src/core/spec/arm_v6/translation_table.h similarity index 80% rename from repos/base-hw/src/core/include/spec/arm_v6/translation_table.h rename to repos/base-hw/src/core/spec/arm_v6/translation_table.h index 761f306c2c..d018c14f48 100644 --- a/repos/base-hw/src/core/include/spec/arm_v6/translation_table.h +++ b/repos/base-hw/src/core/spec/arm_v6/translation_table.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__ARM_V6__TRANSLATION_TABLE_H_ -#define _CORE__INCLUDE__SPEC__ARM_V6__TRANSLATION_TABLE_H_ +#ifndef _CORE__SPEC__ARM_V6__TRANSLATION_TABLE_H_ +#define _CORE__SPEC__ARM_V6__TRANSLATION_TABLE_H_ #include #include @@ -31,4 +31,4 @@ void Hw::Page_table::_translation_added(unsigned long addr, unsigned long size) else Genode::Cpu::clean_invalidate_data_cache(); } -#endif /* _CORE__INCLUDE__SPEC__ARM_V6__TRANSLATION_TABLE_H_ */ +#endif /* _CORE__SPEC__ARM_V6__TRANSLATION_TABLE_H_ */ diff --git a/repos/base-hw/src/core/include/spec/arm_v7/cpu_support.h b/repos/base-hw/src/core/spec/arm_v7/cpu_support.h similarity index 95% rename from repos/base-hw/src/core/include/spec/arm_v7/cpu_support.h rename to repos/base-hw/src/core/spec/arm_v7/cpu_support.h index 4aee68a52b..92055ba543 100644 --- a/repos/base-hw/src/core/include/spec/arm_v7/cpu_support.h +++ b/repos/base-hw/src/core/spec/arm_v7/cpu_support.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__ARM_V7__CPU_SUPPORT_H_ -#define _CORE__INCLUDE__SPEC__ARM_V7__CPU_SUPPORT_H_ +#ifndef _CORE__SPEC__ARM_V7__CPU_SUPPORT_H_ +#define _CORE__SPEC__ARM_V7__CPU_SUPPORT_H_ /* core includes */ #include @@ -148,4 +148,4 @@ class Genode::Arm_v7 : public Arm asm volatile ("mcr p15, 4, %[rd], c12, c0, 0" :: [rd] "r" (a)); } }; -#endif /* _CORE__INCLUDE__SPEC__ARM_V7__CPU_SUPPORT_H_ */ +#endif /* _CORE__SPEC__ARM_V7__CPU_SUPPORT_H_ */ diff --git a/repos/base-hw/src/core/include/spec/arm_v7/macros_support.s b/repos/base-hw/src/core/spec/arm_v7/macros_support.s similarity index 100% rename from repos/base-hw/src/core/include/spec/arm_v7/macros_support.s rename to repos/base-hw/src/core/spec/arm_v7/macros_support.s diff --git a/repos/base-hw/src/core/include/spec/arm_v7/trustzone/vm_session_component.h b/repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.h similarity index 88% rename from repos/base-hw/src/core/include/spec/arm_v7/trustzone/vm_session_component.h rename to repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.h index 66e164c4ab..0ccf3079aa 100644 --- a/repos/base-hw/src/core/include/spec/arm_v7/trustzone/vm_session_component.h +++ b/repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__ARM_V7__TRUSTZONE__VM_SESSION_COMPONENT_H_ -#define _CORE__INCLUDE__SPEC__ARM_V7__TRUSTZONE__VM_SESSION_COMPONENT_H_ +#ifndef _CORE__SPEC__ARM_V7__TRUSTZONE__VM_SESSION_COMPONENT_H_ +#define _CORE__SPEC__ARM_V7__TRUSTZONE__VM_SESSION_COMPONENT_H_ /* Genode includes */ #include @@ -73,4 +73,4 @@ class Genode::Vm_session_component warning("Not implemented for TrustZone case"); } }; -#endif /* _CORE__INCLUDE__SPEC__ARM_V7__TRUSTZONE__VM_SESSION_COMPONENT_H_ */ +#endif /* _CORE__SPEC__ARM_V7__TRUSTZONE__VM_SESSION_COMPONENT_H_ */ diff --git a/repos/base-hw/src/core/include/spec/arm_v7/virtualization/vm_session_component.h b/repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.h similarity index 89% rename from repos/base-hw/src/core/include/spec/arm_v7/virtualization/vm_session_component.h rename to repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.h index ae748fd1e6..88a11678f6 100644 --- a/repos/base-hw/src/core/include/spec/arm_v7/virtualization/vm_session_component.h +++ b/repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__ARM_V7__VIRTUALIZATION__VM_SESSION_COMPONENT_H_ -#define _CORE__INCLUDE__SPEC__ARM_V7__VIRTUALIZATION__VM_SESSION_COMPONENT_H_ +#ifndef _CORE__SPEC__ARM_V7__VIRTUALIZATION__VM_SESSION_COMPONENT_H_ +#define _CORE__SPEC__ARM_V7__VIRTUALIZATION__VM_SESSION_COMPONENT_H_ /* Genode includes */ #include @@ -76,4 +76,4 @@ class Genode::Vm_session_component void detach(addr_t vm_addr, size_t size); }; -#endif /* _CORE__INCLUDE__SPEC__ARM_V7__VIRTUALIZATION__VM_SESSION_COMPONENT_H_ */ +#endif /* _CORE__SPEC__ARM_V7__VIRTUALIZATION__VM_SESSION_COMPONENT_H_ */ diff --git a/repos/base-hw/src/core/include/spec/cortex_a15/board_support.h b/repos/base-hw/src/core/spec/cortex_a15/board_support.h similarity index 80% rename from repos/base-hw/src/core/include/spec/cortex_a15/board_support.h rename to repos/base-hw/src/core/spec/cortex_a15/board_support.h index 892006ffca..68f0ba65d7 100644 --- a/repos/base-hw/src/core/include/spec/cortex_a15/board_support.h +++ b/repos/base-hw/src/core/spec/cortex_a15/board_support.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__CORTEX_A15__BOARD_SUPPORT_H_ -#define _CORE__INCLUDE__SPEC__CORTEX_A15__BOARD_SUPPORT_H_ +#ifndef _CORE__SPEC__CORTEX_A15__BOARD_SUPPORT_H_ +#define _CORE__SPEC__CORTEX_A15__BOARD_SUPPORT_H_ /* core includes */ #include @@ -38,4 +38,4 @@ namespace Cortex_a15 }; } -#endif /* _CORE__INCLUDE__SPEC__CORTEX_A15__BOARD_SUPPORT_H_ */ +#endif /* _CORE__SPEC__CORTEX_A15__BOARD_SUPPORT_H_ */ diff --git a/repos/base-hw/src/core/include/spec/cortex_a15/cpu.h b/repos/base-hw/src/core/spec/cortex_a15/cpu.h similarity index 98% rename from repos/base-hw/src/core/include/spec/cortex_a15/cpu.h rename to repos/base-hw/src/core/spec/cortex_a15/cpu.h index dc804d6ebd..c3c8e15165 100644 --- a/repos/base-hw/src/core/include/spec/cortex_a15/cpu.h +++ b/repos/base-hw/src/core/spec/cortex_a15/cpu.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__CORTEX_A15__CPU_H_ -#define _CORE__INCLUDE__SPEC__CORTEX_A15__CPU_H_ +#ifndef _CORE__SPEC__CORTEX_A15__CPU_H_ +#define _CORE__SPEC__CORTEX_A15__CPU_H_ /* core includes */ #include @@ -309,4 +309,4 @@ class Genode::Cpu : public Arm_v7 bool retry_undefined_instr(Context&) { return false; } }; -#endif /* _CPU_H_ */ +#endif /* _CORE__SPEC__CORTEX_A15__CPU_H_ */ diff --git a/repos/base-hw/src/core/include/spec/cortex_a15/macros.s b/repos/base-hw/src/core/spec/cortex_a15/macros.s similarity index 100% rename from repos/base-hw/src/core/include/spec/cortex_a15/macros.s rename to repos/base-hw/src/core/spec/cortex_a15/macros.s diff --git a/repos/base-hw/src/core/include/spec/cortex_a15/translation_table.h b/repos/base-hw/src/core/spec/cortex_a15/translation_table.h similarity index 64% rename from repos/base-hw/src/core/include/spec/cortex_a15/translation_table.h rename to repos/base-hw/src/core/spec/cortex_a15/translation_table.h index c6a4bd40e5..3f67ed4f82 100644 --- a/repos/base-hw/src/core/include/spec/cortex_a15/translation_table.h +++ b/repos/base-hw/src/core/spec/cortex_a15/translation_table.h @@ -11,10 +11,10 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_ -#define _CORE__INCLUDE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_ +#ifndef _CORE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_ +#define _CORE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_ /* core includes */ #include -#endif /* _CORE__INCLUDE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_ */ +#endif /* _CORE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_ */ diff --git a/repos/base-hw/src/core/include/spec/cortex_a8/cpu.h b/repos/base-hw/src/core/spec/cortex_a8/cpu.h similarity index 87% rename from repos/base-hw/src/core/include/spec/cortex_a8/cpu.h rename to repos/base-hw/src/core/spec/cortex_a8/cpu.h index 3b1c5f09ea..bae1afe1f9 100644 --- a/repos/base-hw/src/core/include/spec/cortex_a8/cpu.h +++ b/repos/base-hw/src/core/spec/cortex_a8/cpu.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__CORTEX_A8__CPU_H_ -#define _CORE__INCLUDE__SPEC__CORTEX_A8__CPU_H_ +#ifndef _CORE__SPEC__CORTEX_A8__CPU_H_ +#define _CORE__SPEC__CORTEX_A8__CPU_H_ /* core includes */ #include @@ -46,4 +46,4 @@ class Genode::Cpu : public Arm_v7 static void translation_added(addr_t const addr, size_t const size); }; -#endif /* _CORE__INCLUDE__SPEC__CORTEX_A8__CPU_H_ */ +#endif /* _CORE__SPEC__CORTEX_A8__CPU_H_ */ diff --git a/repos/base-hw/src/core/include/spec/cortex_a8/macros.s b/repos/base-hw/src/core/spec/cortex_a8/macros.s similarity index 100% rename from repos/base-hw/src/core/include/spec/cortex_a8/macros.s rename to repos/base-hw/src/core/spec/cortex_a8/macros.s diff --git a/repos/base-hw/src/core/include/spec/cortex_a8/translation_table.h b/repos/base-hw/src/core/spec/cortex_a8/translation_table.h similarity index 85% rename from repos/base-hw/src/core/include/spec/cortex_a8/translation_table.h rename to repos/base-hw/src/core/spec/cortex_a8/translation_table.h index f63161a935..1b59a6cc3b 100644 --- a/repos/base-hw/src/core/include/spec/cortex_a8/translation_table.h +++ b/repos/base-hw/src/core/spec/cortex_a8/translation_table.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_ -#define _CORE__INCLUDE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_ +#ifndef _CORE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_ +#define _CORE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_ #include #include @@ -38,4 +38,4 @@ void Hw::Page_table::_translation_added(unsigned long addr, unsigned long size) else Genode::Cpu::clean_invalidate_data_cache(); } -#endif /* _CORE__INCLUDE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_ */ +#endif /* _CORE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_ */ diff --git a/repos/base-hw/src/core/include/spec/cortex_a9/board_support.h b/repos/base-hw/src/core/spec/cortex_a9/board_support.h similarity index 87% rename from repos/base-hw/src/core/include/spec/cortex_a9/board_support.h rename to repos/base-hw/src/core/spec/cortex_a9/board_support.h index ebf8526bc5..1fa958ba82 100644 --- a/repos/base-hw/src/core/include/spec/cortex_a9/board_support.h +++ b/repos/base-hw/src/core/spec/cortex_a9/board_support.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__CORTEX_A9__BOARD_SUPPORT_H_ -#define _CORE__INCLUDE__SPEC__CORTEX_A9__BOARD_SUPPORT_H_ +#ifndef _CORE__SPEC__CORTEX_A9__BOARD_SUPPORT_H_ +#define _CORE__SPEC__CORTEX_A9__BOARD_SUPPORT_H_ /* core includes */ #include @@ -63,4 +63,4 @@ class Cortex_a9::Board : public Genode::Board_base L2_cache _l2_cache; }; -#endif /* _CORE__INCLUDE__SPEC__CORTEX_A9__BOARD_SUPPORT_H_ */ +#endif /* _CORE__SPEC__CORTEX_A9__BOARD_SUPPORT_H_ */ diff --git a/repos/base-hw/src/core/include/spec/cortex_a9/cpu.h b/repos/base-hw/src/core/spec/cortex_a9/cpu.h similarity index 94% rename from repos/base-hw/src/core/include/spec/cortex_a9/cpu.h rename to repos/base-hw/src/core/spec/cortex_a9/cpu.h index 80140cca1a..d9e1fac240 100644 --- a/repos/base-hw/src/core/include/spec/cortex_a9/cpu.h +++ b/repos/base-hw/src/core/spec/cortex_a9/cpu.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _SPEC__CORTEX_A9__CPU_H_ -#define _SPEC__CORTEX_A9__CPU_H_ +#ifndef _CORE__SPEC__CORTEX_A9__CPU_H_ +#define _CORE__SPEC__CORTEX_A9__CPU_H_ /* core includes */ #include @@ -106,4 +106,4 @@ class Genode::Cpu : public Arm_v7 static unsigned executing_id() { return Mpidr::Aff_0::get(Mpidr::read()); } }; -#endif /* _SPEC__CORTEX_A9__CPU_H_ */ +#endif /* _CORE__SPEC__CORTEX_A9__CPU_H_ */ diff --git a/repos/base-hw/src/core/include/spec/cortex_a9/macros.s b/repos/base-hw/src/core/spec/cortex_a9/macros.s similarity index 100% rename from repos/base-hw/src/core/include/spec/cortex_a9/macros.s rename to repos/base-hw/src/core/spec/cortex_a9/macros.s diff --git a/repos/base-hw/src/core/include/spec/cortex_a9/timer.h b/repos/base-hw/src/core/spec/cortex_a9/timer.h similarity index 95% rename from repos/base-hw/src/core/include/spec/cortex_a9/timer.h rename to repos/base-hw/src/core/spec/cortex_a9/timer.h index 342a78e780..4f032c1975 100644 --- a/repos/base-hw/src/core/include/spec/cortex_a9/timer.h +++ b/repos/base-hw/src/core/spec/cortex_a9/timer.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__CORTEX_A9__TIMER_H_ -#define _CORE__INCLUDE__SPEC__CORTEX_A9__TIMER_H_ +#ifndef _CORE__SPEC__CORTEX_A9__TIMER_H_ +#define _CORE__SPEC__CORTEX_A9__TIMER_H_ /* base-hw includes */ #include @@ -129,4 +129,4 @@ class Genode::Timer : public Mmio namespace Kernel { using Genode::Timer; } -#endif /* _CORE__INCLUDE__SPEC__CORTEX_A9__TIMER_H_ */ +#endif /* _CORE__SPEC__CORTEX_A9__TIMER_H_ */ diff --git a/repos/base-hw/src/core/include/spec/cortex_a9/translation_table.h b/repos/base-hw/src/core/spec/cortex_a9/translation_table.h similarity index 75% rename from repos/base-hw/src/core/include/spec/cortex_a9/translation_table.h rename to repos/base-hw/src/core/spec/cortex_a9/translation_table.h index e92f4222e0..c29bdfdaf0 100644 --- a/repos/base-hw/src/core/include/spec/cortex_a9/translation_table.h +++ b/repos/base-hw/src/core/spec/cortex_a9/translation_table.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_ -#define _CORE__INCLUDE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_ +#ifndef _CORE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_ +#define _CORE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_ #include @@ -24,4 +24,4 @@ constexpr bool Hw::Page_table::Descriptor_base::_smp() { return true; } void Hw::Page_table::_translation_added(unsigned long, unsigned long) { } -#endif /* _CORE__INCLUDE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_ */ +#endif /* _CORE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_ */ diff --git a/repos/base-hw/src/core/include/spec/exynos5/board.h b/repos/base-hw/src/core/spec/exynos5/board.h similarity index 83% rename from repos/base-hw/src/core/include/spec/exynos5/board.h rename to repos/base-hw/src/core/spec/exynos5/board.h index 82e1398adb..c0fc19f2ba 100644 --- a/repos/base-hw/src/core/include/spec/exynos5/board.h +++ b/repos/base-hw/src/core/spec/exynos5/board.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__EXYNOS5__BOARD_H_ -#define _CORE__INCLUDE__SPEC__EXYNOS5__BOARD_H_ +#ifndef _CORE__SPEC__EXYNOS5__BOARD_H_ +#define _CORE__SPEC__EXYNOS5__BOARD_H_ /* core includes */ #include @@ -40,4 +40,4 @@ namespace Genode }; } -#endif /* _CORE__INCLUDE__SPEC__EXYNOS5__BOARD_H_ */ +#endif /* _CORE__SPEC__EXYNOS5__BOARD_H_ */ diff --git a/repos/base-hw/src/core/include/spec/exynos5/serial.h b/repos/base-hw/src/core/spec/exynos5/serial.h similarity index 84% rename from repos/base-hw/src/core/include/spec/exynos5/serial.h rename to repos/base-hw/src/core/spec/exynos5/serial.h index d6fe303466..06d5e96170 100644 --- a/repos/base-hw/src/core/include/spec/exynos5/serial.h +++ b/repos/base-hw/src/core/spec/exynos5/serial.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__EXYNOS5__SERIAL_H_ -#define _CORE__INCLUDE__SPEC__EXYNOS5__SERIAL_H_ +#ifndef _CORE__SPEC__EXYNOS5__SERIAL_H_ +#define _CORE__SPEC__EXYNOS5__SERIAL_H_ /* core includes */ #include @@ -44,4 +44,4 @@ namespace Genode }; } -#endif /* _CORE__INCLUDE__SPEC__EXYNOS5__SERIAL_H_ */ +#endif /* _CORE__SPEC__EXYNOS5__SERIAL_H_ */ diff --git a/repos/base-hw/src/core/include/spec/exynos5/timer.h b/repos/base-hw/src/core/spec/exynos5/timer.h similarity index 97% rename from repos/base-hw/src/core/include/spec/exynos5/timer.h rename to repos/base-hw/src/core/spec/exynos5/timer.h index d393b0119e..c8d58a11c7 100644 --- a/repos/base-hw/src/core/include/spec/exynos5/timer.h +++ b/repos/base-hw/src/core/spec/exynos5/timer.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__EXYNOS5__TIMER_H_ -#define _CORE__INCLUDE__SPEC__EXYNOS5__TIMER_H_ +#ifndef _CORE__SPEC__EXYNOS5__TIMER_H_ +#define _CORE__SPEC__EXYNOS5__TIMER_H_ /* base-hw includes */ #include @@ -261,4 +261,4 @@ class Genode::Timer : public Mmio namespace Kernel { class Timer : public Genode::Timer { }; } -#endif /* _CORE__INCLUDE__SPEC__EXYNOS5__TIMER_H_ */ +#endif /* _CORE__SPEC__EXYNOS5__TIMER_H_ */ diff --git a/repos/base-hw/src/core/include/spec/imx/serial.h b/repos/base-hw/src/core/spec/imx/serial.h similarity index 83% rename from repos/base-hw/src/core/include/spec/imx/serial.h rename to repos/base-hw/src/core/spec/imx/serial.h index 3dadd1b245..88c86d9d99 100644 --- a/repos/base-hw/src/core/include/spec/imx/serial.h +++ b/repos/base-hw/src/core/spec/imx/serial.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__IMX__SERIAL_H_ -#define _CORE__INCLUDE__SPEC__IMX__SERIAL_H_ +#ifndef _CORE__SPEC__IMX__SERIAL_H_ +#define _CORE__SPEC__IMX__SERIAL_H_ /* core includes */ #include @@ -36,4 +36,4 @@ namespace Genode }; } -#endif /* _CORE__INCLUDE__SPEC__IMX__SERIAL_H_ */ +#endif /* _CORE__SPEC__IMX__SERIAL_H_ */ diff --git a/repos/base-hw/src/core/include/spec/imx53/board.h b/repos/base-hw/src/core/spec/imx53/board.h similarity index 76% rename from repos/base-hw/src/core/include/spec/imx53/board.h rename to repos/base-hw/src/core/spec/imx53/board.h index 16a87212ba..6377f5c080 100644 --- a/repos/base-hw/src/core/include/spec/imx53/board.h +++ b/repos/base-hw/src/core/spec/imx53/board.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__IMX53__BOARD_H_ -#define _CORE__INCLUDE__SPEC__IMX53__BOARD_H_ +#ifndef _CORE__SPEC__IMX53__BOARD_H_ +#define _CORE__SPEC__IMX53__BOARD_H_ #include @@ -21,4 +21,4 @@ namespace Genode { struct Board; } struct Genode::Board : Genode::Board_base { static constexpr bool SMP = false; }; -#endif /* _CORE__INCLUDE__SPEC__IMX53__BOARD_H_ */ +#endif /* _CORE__SPEC__IMX53__BOARD_H_ */ diff --git a/repos/base-hw/src/core/include/spec/imx53/pic.h b/repos/base-hw/src/core/spec/imx53/pic.h similarity index 86% rename from repos/base-hw/src/core/include/spec/imx53/pic.h rename to repos/base-hw/src/core/spec/imx53/pic.h index 735819bc24..3e22363af0 100644 --- a/repos/base-hw/src/core/include/spec/imx53/pic.h +++ b/repos/base-hw/src/core/spec/imx53/pic.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__IMX53__PIC_H_ -#define _CORE__INCLUDE__SPEC__IMX53__PIC_H_ +#ifndef _CORE__SPEC__IMX53__PIC_H_ +#define _CORE__SPEC__IMX53__PIC_H_ #include @@ -45,4 +45,4 @@ class Genode::Pic : public Hw::Pic namespace Kernel { using Pic = Genode::Pic; } -#endif /* _CORE__INCLUDE__SPEC__IMX53__PIC_H_ */ +#endif /* _CORE__SPEC__IMX53__PIC_H_ */ diff --git a/repos/base-hw/src/core/include/spec/imx53/timer.h b/repos/base-hw/src/core/spec/imx53/timer.h similarity index 96% rename from repos/base-hw/src/core/include/spec/imx53/timer.h rename to repos/base-hw/src/core/spec/imx53/timer.h index 95e4bee4c3..51f429df2e 100644 --- a/repos/base-hw/src/core/include/spec/imx53/timer.h +++ b/repos/base-hw/src/core/spec/imx53/timer.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__IMX53__TIMER_H_ -#define _CORE__INCLUDE__SPEC__IMX53__TIMER_H_ +#ifndef _CORE__SPEC__IMX53__TIMER_H_ +#define _CORE__SPEC__IMX53__TIMER_H_ /* base-hw includes */ #include @@ -174,4 +174,4 @@ class Genode::Timer : public Mmio namespace Kernel { using Timer = Genode::Timer; } -#endif /* _CORE__INCLUDE__SPEC__IMX53__TIMER_H_ */ +#endif /* _CORE__SPEC__IMX53__TIMER_H_ */ diff --git a/repos/base-hw/src/core/include/spec/imx53_qsb/trustzone/csu_config.h b/repos/base-hw/src/core/spec/imx53_qsb/trustzone/csu_config.h similarity index 71% rename from repos/base-hw/src/core/include/spec/imx53_qsb/trustzone/csu_config.h rename to repos/base-hw/src/core/spec/imx53_qsb/trustzone/csu_config.h index 6dfa641c0c..d40eea7e63 100644 --- a/repos/base-hw/src/core/include/spec/imx53_qsb/trustzone/csu_config.h +++ b/repos/base-hw/src/core/spec/imx53_qsb/trustzone/csu_config.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__IMX53_QSB__TRUSTZONE__CSU_CONFIG_H_ -#define _CORE__INCLUDE__SPEC__IMX53_QSB__TRUSTZONE__CSU_CONFIG_H_ +#ifndef _CORE__SPEC__IMX53_QSB__TRUSTZONE__CSU_CONFIG_H_ +#define _CORE__SPEC__IMX53_QSB__TRUSTZONE__CSU_CONFIG_H_ /** * Configuration of the Driver for the Central Security Unit @@ -27,4 +27,4 @@ namespace Csu_config }; }; -#endif /* _CORE__INCLUDE__SPEC__IMX53_QSB__TRUSTZONE__CSU_CONFIG_H_ */ +#endif /* _CORE__SPEC__IMX53_QSB__TRUSTZONE__CSU_CONFIG_H_ */ diff --git a/repos/base-hw/src/core/include/spec/imx6/board.h b/repos/base-hw/src/core/spec/imx6/board.h similarity index 75% rename from repos/base-hw/src/core/include/spec/imx6/board.h rename to repos/base-hw/src/core/spec/imx6/board.h index d5e527efcc..d0f2498cb7 100644 --- a/repos/base-hw/src/core/include/spec/imx6/board.h +++ b/repos/base-hw/src/core/spec/imx6/board.h @@ -12,12 +12,12 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__IMX6__BOARD_H_ -#define _CORE__INCLUDE__SPEC__IMX6__BOARD_H_ +#ifndef _CORE__SPEC__IMX6__BOARD_H_ +#define _CORE__SPEC__IMX6__BOARD_H_ /* core includes */ #include namespace Genode { using Board = Cortex_a9::Board; } -#endif /* _CORE__INCLUDE__SPEC__IMX6__BOARD_H_ */ +#endif /* _CORE__SPEC__IMX6__BOARD_H_ */ diff --git a/repos/base-hw/src/core/include/spec/panda/board.h b/repos/base-hw/src/core/spec/panda/board.h similarity index 89% rename from repos/base-hw/src/core/include/spec/panda/board.h rename to repos/base-hw/src/core/spec/panda/board.h index d90e1bdae3..06415e8ead 100644 --- a/repos/base-hw/src/core/include/spec/panda/board.h +++ b/repos/base-hw/src/core/spec/panda/board.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__PANDA__BOARD_H_ -#define _CORE__INCLUDE__SPEC__PANDA__BOARD_H_ +#ifndef _CORE__SPEC__PANDA__BOARD_H_ +#define _CORE__SPEC__PANDA__BOARD_H_ #include #include @@ -59,4 +59,4 @@ class Genode::Board : public Cortex_a9::Board L2_cache _l2_cache { Base::l2_cache().base() }; }; -#endif /* _CORE__INCLUDE__SPEC__PANDA__BOARD_H_ */ +#endif /* _CORE__SPEC__PANDA__BOARD_H_ */ diff --git a/repos/base-hw/src/core/include/spec/pbxa9/board.h b/repos/base-hw/src/core/spec/pbxa9/board.h similarity index 73% rename from repos/base-hw/src/core/include/spec/pbxa9/board.h rename to repos/base-hw/src/core/spec/pbxa9/board.h index 6b2ce83835..053a4aadaf 100644 --- a/repos/base-hw/src/core/include/spec/pbxa9/board.h +++ b/repos/base-hw/src/core/spec/pbxa9/board.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__PBXA9__BOARD_H_ -#define _CORE__INCLUDE__SPEC__PBXA9__BOARD_H_ +#ifndef _CORE__SPEC__PBXA9__BOARD_H_ +#define _CORE__SPEC__PBXA9__BOARD_H_ /* core includes */ #include @@ -22,4 +22,4 @@ namespace Genode using Board = Cortex_a9::Board; } -#endif /* _CORE__INCLUDE__SPEC__PBXA9__BOARD_H_ */ +#endif /* _CORE__SPEC__PBXA9__BOARD_H_ */ diff --git a/repos/base-hw/src/core/include/spec/pl011/serial.h b/repos/base-hw/src/core/spec/pl011/serial.h similarity index 83% rename from repos/base-hw/src/core/include/spec/pl011/serial.h rename to repos/base-hw/src/core/spec/pl011/serial.h index b1a92ce3c8..191b745850 100644 --- a/repos/base-hw/src/core/include/spec/pl011/serial.h +++ b/repos/base-hw/src/core/spec/pl011/serial.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__PL011__SERIAL_H_ -#define _CORE__INCLUDE__SPEC__PL011__SERIAL_H_ +#ifndef _CORE__SPEC__PL011__SERIAL_H_ +#define _CORE__SPEC__PL011__SERIAL_H_ /* core includes */ #include @@ -40,4 +40,4 @@ class Genode::Serial : public Pl011_base { } }; -#endif /* _CORE__INCLUDE__SPEC__PL011__SERIAL_H_ */ +#endif /* _CORE__SPEC__PL011__SERIAL_H_ */ diff --git a/repos/base-hw/src/core/include/spec/riscv/board.h b/repos/base-hw/src/core/spec/riscv/board.h similarity index 74% rename from repos/base-hw/src/core/include/spec/riscv/board.h rename to repos/base-hw/src/core/spec/riscv/board.h index b7713686e8..1b82538ccc 100644 --- a/repos/base-hw/src/core/include/spec/riscv/board.h +++ b/repos/base-hw/src/core/spec/riscv/board.h @@ -11,9 +11,9 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _BOARD_H_ -#define _BOARD_H_ +#ifndef _CORE__SPEC__RISCV__BOARD_H_ +#define _CORE__SPEC__RISCV__BOARD_H_ namespace Genode { struct Board { void init() { } }; } -#endif /* _BOARD_H_ */ +#endif /* _CORE__SPEC__RISCV__BOARD_H_ */ diff --git a/repos/base-hw/src/core/include/spec/riscv/cpu.h b/repos/base-hw/src/core/spec/riscv/cpu.h similarity index 97% rename from repos/base-hw/src/core/include/spec/riscv/cpu.h rename to repos/base-hw/src/core/spec/riscv/cpu.h index d1a0ae1bab..b8ed75b63e 100644 --- a/repos/base-hw/src/core/include/spec/riscv/cpu.h +++ b/repos/base-hw/src/core/spec/riscv/cpu.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CPU_H_ -#define _CPU_H_ +#ifndef _CORE__SPEC__RISCV__CPU_H_ +#define _CORE__SPEC__RISCV__CPU_H_ /* Genode includes */ #include @@ -160,4 +160,4 @@ class Genode::Cpu void switch_to(User_context&) { } }; -#endif /* _CPU_H_ */ +#endif /* _CORE__SPEC__RISCV__CPU_H_ */ diff --git a/repos/base-hw/src/core/include/spec/riscv/macros.s b/repos/base-hw/src/core/spec/riscv/macros.s similarity index 100% rename from repos/base-hw/src/core/include/spec/riscv/macros.s rename to repos/base-hw/src/core/spec/riscv/macros.s diff --git a/repos/base-hw/src/core/include/spec/riscv/pic.h b/repos/base-hw/src/core/spec/riscv/pic.h similarity index 89% rename from repos/base-hw/src/core/include/spec/riscv/pic.h rename to repos/base-hw/src/core/spec/riscv/pic.h index 92e5821781..b98cb3400f 100644 --- a/repos/base-hw/src/core/include/spec/riscv/pic.h +++ b/repos/base-hw/src/core/spec/riscv/pic.h @@ -13,8 +13,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _PIC_H_ -#define _PIC_H_ +#ifndef _CORE__SPEC__RISCV__PIC_H_ +#define _CORE__SPEC__RISCV__PIC_H_ namespace Genode { class Pic; } @@ -43,4 +43,4 @@ class Genode::Pic namespace Kernel { class Pic : public Genode::Pic { }; } -#endif /* _PIC_H_ */ +#endif /* _CORE__SPEC__RISCV__PIC_H_ */ diff --git a/repos/base-hw/src/core/include/spec/riscv/serial.h b/repos/base-hw/src/core/spec/riscv/serial.h similarity index 79% rename from repos/base-hw/src/core/include/spec/riscv/serial.h rename to repos/base-hw/src/core/spec/riscv/serial.h index b3b67f4535..a9b8f7ace3 100644 --- a/repos/base-hw/src/core/include/spec/riscv/serial.h +++ b/repos/base-hw/src/core/spec/riscv/serial.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _SERIAL_H_ -#define _SERIAL_H_ +#ifndef _CORE__SPEC__RISCV__SERIAL_H_ +#define _CORE__SPEC__RISCV__SERIAL_H_ #include @@ -26,4 +26,4 @@ struct Genode::Serial : Hw::Riscv_uart Serial(unsigned) { } }; -#endif /* _SERIAL_H_ */ +#endif /* _CORE__SPEC__RISCV__SERIAL_H_ */ diff --git a/repos/base-hw/src/core/include/spec/riscv/timer.h b/repos/base-hw/src/core/spec/riscv/timer.h similarity index 93% rename from repos/base-hw/src/core/include/spec/riscv/timer.h rename to repos/base-hw/src/core/spec/riscv/timer.h index 47569d9951..43353c086e 100644 --- a/repos/base-hw/src/core/include/spec/riscv/timer.h +++ b/repos/base-hw/src/core/spec/riscv/timer.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _TIMER_H_ -#define _TIMER_H_ +#ifndef _CORE__SPEC__RISCV__TIMER_H_ +#define _CORE__SPEC__RISCV__TIMER_H_ /* base-hw includes */ #include @@ -89,4 +89,4 @@ struct Genode::Timer namespace Kernel { class Timer : public Genode::Timer { }; } -#endif /* _TIMER_H_ */ +#endif /* _CORE__SPEC__RISCV__TIMER_H_ */ diff --git a/repos/base-hw/src/core/include/spec/riscv/translation_table.h b/repos/base-hw/src/core/spec/riscv/translation_table.h similarity index 77% rename from repos/base-hw/src/core/include/spec/riscv/translation_table.h rename to repos/base-hw/src/core/spec/riscv/translation_table.h index ea46027227..f84f56e605 100644 --- a/repos/base-hw/src/core/include/spec/riscv/translation_table.h +++ b/repos/base-hw/src/core/spec/riscv/translation_table.h @@ -11,9 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ - -#ifndef _CORE__INCLUDE__SPEC__RISCV__TRANSLATION_TABLE_H_ -#define _CORE__INCLUDE__SPEC__RISCV__TRANSLATION_TABLE_H_ +#ifndef _CORE__SPEC__RISCV__TRANSLATION_TABLE_H_ +#define _CORE__SPEC__RISCV__TRANSLATION_TABLE_H_ #include #include @@ -25,4 +24,4 @@ void Sv39::Level_x_translation_table::_translation_added(addr_t addr, Kernel::update_data_region(addr, size); } -#endif /* _CORE__INCLUDE__SPEC__RISCV__TRANSLATION_TABLE_H_ */ +#endif /* _CORE__SPEC__RISCV__TRANSLATION_TABLE_H_ */ diff --git a/repos/base-hw/src/core/include/spec/rpi/board.h b/repos/base-hw/src/core/spec/rpi/board.h similarity index 81% rename from repos/base-hw/src/core/include/spec/rpi/board.h rename to repos/base-hw/src/core/spec/rpi/board.h index 435574a44e..4055ecdce1 100644 --- a/repos/base-hw/src/core/include/spec/rpi/board.h +++ b/repos/base-hw/src/core/spec/rpi/board.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__BOARD_H_ -#define _CORE__INCLUDE__BOARD_H_ +#ifndef _CORE__SPEC__RPI__BOARD_H_ +#define _CORE__SPEC__RPI__BOARD_H_ /* core includes */ #include @@ -27,4 +27,4 @@ struct Genode::Board : Board_base static constexpr bool SMP = false; }; -#endif /* _CORE__INCLUDE__BOARD_H_ */ +#endif /* _CORE__SPEC__RPI__BOARD_H_ */ diff --git a/repos/base-hw/src/core/include/spec/rpi/pic.h b/repos/base-hw/src/core/spec/rpi/pic.h similarity index 95% rename from repos/base-hw/src/core/include/spec/rpi/pic.h rename to repos/base-hw/src/core/spec/rpi/pic.h index f3f3cc9550..1da8f3ddc5 100644 --- a/repos/base-hw/src/core/include/spec/rpi/pic.h +++ b/repos/base-hw/src/core/spec/rpi/pic.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__RPI__PIC_H_ -#define _CORE__INCLUDE__SPEC__RPI__PIC_H_ +#ifndef _CORE__SPEC__RPI__PIC_H_ +#define _CORE__SPEC__RPI__PIC_H_ /* Genode includes */ #include @@ -131,4 +131,4 @@ class Genode::Pic : Mmio namespace Kernel { using Genode::Pic; } -#endif /* _CORE__INCLUDE__SPEC__RPI__PIC_H_ */ +#endif /* _CORE__SPEC__RPI__PIC_H_ */ diff --git a/repos/base-hw/src/core/include/spec/rpi/timer.h b/repos/base-hw/src/core/spec/rpi/timer.h similarity index 89% rename from repos/base-hw/src/core/include/spec/rpi/timer.h rename to repos/base-hw/src/core/spec/rpi/timer.h index 2a405e9233..3498cca8b3 100644 --- a/repos/base-hw/src/core/include/spec/rpi/timer.h +++ b/repos/base-hw/src/core/spec/rpi/timer.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__RPI__TIMER_H_ -#define _CORE__INCLUDE__SPEC__RPI__TIMER_H_ +#ifndef _CORE__SPEC__RPI__TIMER_H_ +#define _CORE__SPEC__RPI__TIMER_H_ /* base-hw includes */ #include @@ -58,4 +58,4 @@ class Genode::Timer : public Mmio namespace Kernel { using Genode::Timer; } -#endif /* _CORE__INCLUDE__SPEC__RPI__TIMER_H_ */ +#endif /* _CORE__SPEC__RPI__TIMER_H_ */ diff --git a/repos/base-hw/src/core/include/spec/smp/kernel/lock.h b/repos/base-hw/src/core/spec/smp/kernel/lock.h similarity index 75% rename from repos/base-hw/src/core/include/spec/smp/kernel/lock.h rename to repos/base-hw/src/core/spec/smp/kernel/lock.h index 2ace7b1772..9787f5d02e 100644 --- a/repos/base-hw/src/core/include/spec/smp/kernel/lock.h +++ b/repos/base-hw/src/core/spec/smp/kernel/lock.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__KERNEL__LOCK_H_ -#define _CORE__INCLUDE__KERNEL__LOCK_H_ +#ifndef _CORE__SPEC__SMP__KERNEL__LOCK_H_ +#define _CORE__SPEC__SMP__KERNEL__LOCK_H_ #include @@ -24,4 +24,4 @@ namespace Kernel Lock & data_lock(); } -#endif /* _CORE__INCLUDE__KERNEL__LOCK_H_ */ +#endif /* _CORE__SPEC__SMP__KERNEL__LOCK_H_ */ diff --git a/repos/base-hw/src/core/include/spec/tl16c750/serial.h b/repos/base-hw/src/core/spec/tl16c750/serial.h similarity index 83% rename from repos/base-hw/src/core/include/spec/tl16c750/serial.h rename to repos/base-hw/src/core/spec/tl16c750/serial.h index e247e08190..ab1ce8a441 100644 --- a/repos/base-hw/src/core/include/spec/tl16c750/serial.h +++ b/repos/base-hw/src/core/spec/tl16c750/serial.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__TL16C750__SERIAL_H_ -#define _CORE__INCLUDE__SPEC__TL16C750__SERIAL_H_ +#ifndef _CORE__SPEC__TL16C750__SERIAL_H_ +#define _CORE__SPEC__TL16C750__SERIAL_H_ /* core includes */ #include @@ -43,4 +43,4 @@ namespace Genode }; } -#endif /* _CORE__INCLUDE__SPEC__TL16C750__SERIAL_H_ */ +#endif /* _CORE__SPEC__TL16C750__SERIAL_H_ */ diff --git a/repos/base-hw/src/core/include/spec/usb_armory/csu_config.h b/repos/base-hw/src/core/spec/usb_armory/csu_config.h similarity index 74% rename from repos/base-hw/src/core/include/spec/usb_armory/csu_config.h rename to repos/base-hw/src/core/spec/usb_armory/csu_config.h index 19583176a1..c48edb8359 100644 --- a/repos/base-hw/src/core/include/spec/usb_armory/csu_config.h +++ b/repos/base-hw/src/core/spec/usb_armory/csu_config.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__USB_ARMORY__CSU_CONFIG_H_ -#define _CORE__INCLUDE__SPEC__USB_ARMORY__CSU_CONFIG_H_ +#ifndef _CORE__SPEC__USB_ARMORY__CSU_CONFIG_H_ +#define _CORE__SPEC__USB_ARMORY__CSU_CONFIG_H_ /** * Configuration of the Driver for the Central Security Unit @@ -27,4 +27,4 @@ namespace Csu_config }; }; -#endif /* _CORE__INCLUDE__SPEC__USB_ARMORY__CSU_CONFIG_H_ */ +#endif /* _CORE__SPEC__USB_ARMORY__CSU_CONFIG_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/board.h b/repos/base-hw/src/core/spec/x86_64/board.h similarity index 75% rename from repos/base-hw/src/core/include/spec/x86_64/board.h rename to repos/base-hw/src/core/spec/x86_64/board.h index afdca80572..f67c564863 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/board.h +++ b/repos/base-hw/src/core/spec/x86_64/board.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__BOARD_H_ -#define _CORE__INCLUDE__SPEC__X86_64__BOARD_H_ +#ifndef _CORE__SPEC__X86_64__BOARD_H_ +#define _CORE__SPEC__X86_64__BOARD_H_ namespace Genode { @@ -27,4 +27,4 @@ namespace Genode }; } -#endif /* _CORE__INCLUDE__SPEC__X86_64__BOARD_H_ */ +#endif /* _CORE__SPEC__X86_64__BOARD_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/cpu.h b/repos/base-hw/src/core/spec/x86_64/cpu.h similarity index 98% rename from repos/base-hw/src/core/include/spec/x86_64/cpu.h rename to repos/base-hw/src/core/spec/x86_64/cpu.h index 563abf6549..8b60f64e55 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/cpu.h +++ b/repos/base-hw/src/core/spec/x86_64/cpu.h @@ -14,8 +14,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__CPU_H_ -#define _CORE__INCLUDE__SPEC__X86_64__CPU_H_ +#ifndef _CORE__SPEC__X86_64__CPU_H_ +#define _CORE__SPEC__X86_64__CPU_H_ /* Genode includes */ #include @@ -290,4 +290,4 @@ struct Genode::Cpu::Cr4 : Register<64> } }; -#endif /* _CORE__INCLUDE__SPEC__X86_64__CPU_H_ */ +#endif /* _CORE__SPEC__X86_64__CPU_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/fpu.h b/repos/base-hw/src/core/spec/x86_64/fpu.h similarity index 95% rename from repos/base-hw/src/core/include/spec/x86_64/fpu.h rename to repos/base-hw/src/core/spec/x86_64/fpu.h index b8ef0dd1ad..87468638f6 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/fpu.h +++ b/repos/base-hw/src/core/spec/x86_64/fpu.h @@ -14,8 +14,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _SPEC__X86_64__FPU_H_ -#define _SPEC__X86_64__FPU_H_ +#ifndef _CORE__SPEC__X86_64__FPU_H_ +#define _CORE__SPEC__X86_64__FPU_H_ /* Genode includes */ #include @@ -142,4 +142,4 @@ class Genode::Fpu if (_context == &context) _context = nullptr; } }; -#endif /* _SPEC__X86_64__FPU_H_ */ +#endif /* _CORE__SPEC__X86_64__FPU_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/macros.s b/repos/base-hw/src/core/spec/x86_64/macros.s similarity index 100% rename from repos/base-hw/src/core/include/spec/x86_64/macros.s rename to repos/base-hw/src/core/spec/x86_64/macros.s diff --git a/repos/base-hw/src/core/include/spec/x86_64/muen/board.h b/repos/base-hw/src/core/spec/x86_64/muen/board.h similarity index 79% rename from repos/base-hw/src/core/include/spec/x86_64/muen/board.h rename to repos/base-hw/src/core/spec/x86_64/muen/board.h index 2464961505..b4e158dab8 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/muen/board.h +++ b/repos/base-hw/src/core/spec/x86_64/muen/board.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__MUEN__BOARD_H_ -#define _CORE__INCLUDE__SPEC__X86_64__MUEN__BOARD_H_ +#ifndef _CORE__SPEC__X86_64__MUEN__BOARD_H_ +#define _CORE__SPEC__X86_64__MUEN__BOARD_H_ namespace Genode { @@ -33,4 +33,4 @@ namespace Genode }; } -#endif /* _CORE__INCLUDE__SPEC__X86_64__MUEN__BOARD_H_ */ +#endif /* _CORE__SPEC__X86_64__MUEN__BOARD_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/muen/pic.h b/repos/base-hw/src/core/spec/x86_64/muen/pic.h similarity index 88% rename from repos/base-hw/src/core/include/spec/x86_64/muen/pic.h rename to repos/base-hw/src/core/spec/x86_64/muen/pic.h index 413e085885..2ddf3d02a7 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/muen/pic.h +++ b/repos/base-hw/src/core/spec/x86_64/muen/pic.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__MUEN__PIC_H_ -#define _CORE__INCLUDE__SPEC__X86_64__MUEN__PIC_H_ +#ifndef _CORE__SPEC__X86_64__MUEN__PIC_H_ +#define _CORE__SPEC__X86_64__MUEN__PIC_H_ namespace Genode { @@ -70,4 +70,4 @@ class Genode::Pic namespace Kernel { class Pic : public Genode::Pic { }; } -#endif /* _CORE__INCLUDE__SPEC__X86_64__MUEN__PIC_H_ */ +#endif /* _CORE__SPEC__X86_64__MUEN__PIC_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/muen/serial.h b/repos/base-hw/src/core/spec/x86_64/muen/serial.h similarity index 80% rename from repos/base-hw/src/core/include/spec/x86_64/muen/serial.h rename to repos/base-hw/src/core/spec/x86_64/muen/serial.h index 20f76ee57d..99655d6230 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/muen/serial.h +++ b/repos/base-hw/src/core/spec/x86_64/muen/serial.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__MUEN__SERIAL_H_ -#define _CORE__INCLUDE__SPEC__X86_64__MUEN__SERIAL_H_ +#ifndef _CORE__SPEC__X86_64__MUEN__SERIAL_H_ +#define _CORE__SPEC__X86_64__MUEN__SERIAL_H_ /* Genode includes */ #include @@ -40,4 +40,4 @@ class Genode::Serial : public X86_uart_base { } }; -#endif /* _CORE__INCLUDE__SPEC__X86_64__MUEN__SERIAL_H_ */ +#endif /* _CORE__SPEC__X86_64__MUEN__SERIAL_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/muen/sinfo_instance.h b/repos/base-hw/src/core/spec/x86_64/muen/sinfo_instance.h similarity index 73% rename from repos/base-hw/src/core/include/spec/x86_64/muen/sinfo_instance.h rename to repos/base-hw/src/core/spec/x86_64/muen/sinfo_instance.h index d5a204aa0a..d8e6b15e7b 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/muen/sinfo_instance.h +++ b/repos/base-hw/src/core/spec/x86_64/muen/sinfo_instance.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__MUEN__SINFO_INSTANCE_H_ -#define _CORE__INCLUDE__SPEC__X86_64__MUEN__SINFO_INSTANCE_H_ +#ifndef _CORE__SPEC__X86_64__MUEN__SINFO_INSTANCE_H_ +#define _CORE__SPEC__X86_64__MUEN__SINFO_INSTANCE_H_ /* base includes */ #include @@ -29,4 +29,4 @@ namespace Genode } } -#endif /* _CORE__INCLUDE__SPEC__X86_64__MUEN__SINFO_INSTANCE_H_ */ +#endif /* _CORE__SPEC__X86_64__MUEN__SINFO_INSTANCE_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/muen/timer.h b/repos/base-hw/src/core/spec/x86_64/muen/timer.h similarity index 94% rename from repos/base-hw/src/core/include/spec/x86_64/muen/timer.h rename to repos/base-hw/src/core/spec/x86_64/muen/timer.h index 27596dd1ca..f85b8e52e8 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/muen/timer.h +++ b/repos/base-hw/src/core/spec/x86_64/muen/timer.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__MUEN__TIMER_H_ -#define _CORE__INCLUDE__SPEC__X86_64__MUEN__TIMER_H_ +#ifndef _CORE__SPEC__X86_64__MUEN__TIMER_H_ +#define _CORE__SPEC__X86_64__MUEN__TIMER_H_ /* base includes */ #include @@ -123,4 +123,4 @@ class Genode::Timer namespace Kernel { class Timer : public Genode::Timer { }; } -#endif /* _CORE__INCLUDE__SPEC__X86_64__MUEN__TIMER_H_ */ +#endif /* _CORE__SPEC__X86_64__MUEN__TIMER_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/muen/vm_session_component.h b/repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h similarity index 88% rename from repos/base-hw/src/core/include/spec/x86_64/muen/vm_session_component.h rename to repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h index 8f627a2dd0..e5f7f329d9 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/muen/vm_session_component.h +++ b/repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__MUEN__VM_SESSION_COMPONENT_H_ -#define _CORE__INCLUDE__SPEC__X86_64__MUEN__VM_SESSION_COMPONENT_H_ +#ifndef _CORE__SPEC__X86_64__MUEN__VM_SESSION_COMPONENT_H_ +#define _CORE__SPEC__X86_64__MUEN__VM_SESSION_COMPONENT_H_ /* Genode includes */ #include @@ -72,4 +72,4 @@ class Genode::Vm_session_component void detach(addr_t vm_addr, size_t size) {} }; -#endif /* _CORE__INCLUDE__SPEC__X86_64__MUEN__VM_SESSION_COMPONENT_H_ */ +#endif /* _CORE__SPEC__X86_64__MUEN__VM_SESSION_COMPONENT_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/muen/vm_state.h b/repos/base-hw/src/core/spec/x86_64/muen/vm_state.h similarity index 72% rename from repos/base-hw/src/core/include/spec/x86_64/muen/vm_state.h rename to repos/base-hw/src/core/spec/x86_64/muen/vm_state.h index cdbf11af3f..bd4a45127a 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/muen/vm_state.h +++ b/repos/base-hw/src/core/spec/x86_64/muen/vm_state.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _VM_STATE_H_ -#define _VM_STATE_H_ +#ifndef _CORE__SPEC__X86_64__MUEN__VM_STATE_H_ +#define _CORE__SPEC__X86_64__MUEN__VM_STATE_H_ namespace Genode { @@ -20,4 +20,4 @@ namespace Genode using Vm_state = Cpu_state; } -#endif /* _VM_STATE_H_ */ +#endif /* _CORE__SPEC__X86_64__MUEN__VM_STATE_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/pic.h b/repos/base-hw/src/core/spec/x86_64/pic.h similarity index 96% rename from repos/base-hw/src/core/include/spec/x86_64/pic.h rename to repos/base-hw/src/core/spec/x86_64/pic.h index 5ead995909..595ad9f4e9 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/pic.h +++ b/repos/base-hw/src/core/spec/x86_64/pic.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__PIC_H_ -#define _CORE__INCLUDE__SPEC__X86_64__PIC_H_ +#ifndef _CORE__SPEC__X86_64__PIC_H_ +#define _CORE__SPEC__X86_64__PIC_H_ /* Genode includes */ #include @@ -199,4 +199,4 @@ class Genode::Pic : public Mmio namespace Kernel { using Genode::Pic; } -#endif /* _CORE__INCLUDE__SPEC__X86_64__PIC_H_ */ +#endif /* _CORE__SPEC__X86_64__PIC_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/port_io.h b/repos/base-hw/src/core/spec/x86_64/port_io.h similarity index 81% rename from repos/base-hw/src/core/include/spec/x86_64/port_io.h rename to repos/base-hw/src/core/spec/x86_64/port_io.h index f726f9afb9..921984edd9 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/port_io.h +++ b/repos/base-hw/src/core/spec/x86_64/port_io.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__PORT_IO_H_ -#define _CORE__INCLUDE__SPEC__X86_64__PORT_IO_H_ +#ifndef _CORE__SPEC__X86_64__PORT_IO_H_ +#define _CORE__SPEC__X86_64__PORT_IO_H_ #include @@ -37,4 +37,4 @@ namespace Genode } } -#endif /* _CORE__INCLUDE__SPEC__X86_64__PORT_IO_H_ */ +#endif /* _CORE__SPEC__X86_64__PORT_IO_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/serial.h b/repos/base-hw/src/core/spec/x86_64/serial.h similarity index 82% rename from repos/base-hw/src/core/include/spec/x86_64/serial.h rename to repos/base-hw/src/core/spec/x86_64/serial.h index 6d3e3c5203..27295ae3fc 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/serial.h +++ b/repos/base-hw/src/core/spec/x86_64/serial.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__SERIAL_H_ -#define _CORE__INCLUDE__SPEC__X86_64__SERIAL_H_ +#ifndef _CORE__SPEC__X86_64__SERIAL_H_ +#define _CORE__SPEC__X86_64__SERIAL_H_ /* Genode includes */ #include @@ -38,4 +38,4 @@ class Genode::Serial : public X86_uart_base { } }; -#endif /* _CORE__INCLUDE__SPEC__X86_64__SERIAL_H_ */ +#endif /* _CORE__SPEC__X86_64__SERIAL_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/timer.h b/repos/base-hw/src/core/spec/x86_64/timer.h similarity index 93% rename from repos/base-hw/src/core/include/spec/x86_64/timer.h rename to repos/base-hw/src/core/spec/x86_64/timer.h index d0c047d1ce..9b8214beae 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/timer.h +++ b/repos/base-hw/src/core/spec/x86_64/timer.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__X86_64__TIMER_H_ -#define _CORE__INCLUDE__SPEC__X86_64__TIMER_H_ +#ifndef _CORE__SPEC__X86_64__TIMER_H_ +#define _CORE__SPEC__X86_64__TIMER_H_ /* base-hw includes */ #include @@ -97,4 +97,4 @@ class Genode::Timer : public Mmio namespace Kernel { using Genode::Timer; } -#endif /* _CORE__INCLUDE__SPEC__X86_64__TIMER_H_ */ +#endif /* _CORE__SPEC__X86_64__TIMER_H_ */ diff --git a/repos/base-hw/src/core/include/spec/x86_64/translation_table.h b/repos/base-hw/src/core/spec/x86_64/translation_table.h similarity index 69% rename from repos/base-hw/src/core/include/spec/x86_64/translation_table.h rename to repos/base-hw/src/core/spec/x86_64/translation_table.h index ff74888318..dc7543cf8f 100644 --- a/repos/base-hw/src/core/include/spec/x86_64/translation_table.h +++ b/repos/base-hw/src/core/spec/x86_64/translation_table.h @@ -11,4 +11,9 @@ * under the terms of the GNU Affero General Public License version 3. */ +#ifndef _CORE__SPEC__X86_64__TRANSLATION_TABLE_H_ +#define _CORE__SPEC__X86_64__TRANSLATION_TABLE_H_ + #include + +#endif /* _CORE__SPEC__X86_64__TRANSLATION_TABLE_H_ */ diff --git a/repos/base-hw/src/core/include/spec/xilinx_uartps_0/serial.h b/repos/base-hw/src/core/spec/xilinx_uartps_0/serial.h similarity index 84% rename from repos/base-hw/src/core/include/spec/xilinx_uartps_0/serial.h rename to repos/base-hw/src/core/spec/xilinx_uartps_0/serial.h index ddb37d0714..805cb907e2 100644 --- a/repos/base-hw/src/core/include/spec/xilinx_uartps_0/serial.h +++ b/repos/base-hw/src/core/spec/xilinx_uartps_0/serial.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__XILINX__SERIAL_H_ -#define _CORE__INCLUDE__SPEC__XILINX__SERIAL_H_ +#ifndef _CORE__SPEC__XILINX_UARTPS_0__SERIAL_H_ +#define _CORE__SPEC__XILINX_UARTPS_0__SERIAL_H_ /* core includes */ #include @@ -42,4 +42,4 @@ class Genode::Serial : public Xilinx_uartps_base { } }; -#endif /* _CORE__INCLUDE__SPEC__XILINX__SERIAL_H_ */ +#endif /* _CORE__SPEC__XILINX_UARTPS_0__SERIAL_H_ */ diff --git a/repos/base-hw/src/core/include/spec/zynq_qemu/board.h b/repos/base-hw/src/core/spec/zynq_qemu/board.h similarity index 78% rename from repos/base-hw/src/core/include/spec/zynq_qemu/board.h rename to repos/base-hw/src/core/spec/zynq_qemu/board.h index 97278edaa7..cf30eb8171 100644 --- a/repos/base-hw/src/core/include/spec/zynq_qemu/board.h +++ b/repos/base-hw/src/core/spec/zynq_qemu/board.h @@ -13,8 +13,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__SPEC__ZYNQ_QEMU__BOARD_H_ -#define _CORE__INCLUDE__SPEC__ZYNQ_QEMU__BOARD_H_ +#ifndef _CORE__SPEC__ZYNQ_QEMU__BOARD_H_ +#define _CORE__SPEC__ZYNQ_QEMU__BOARD_H_ /* core includes */ #include @@ -30,4 +30,4 @@ namespace Genode }; } -#endif /* _CORE__INCLUDE__SPEC__ZYNQ_QEMU__BOARD_H_ */ +#endif /* _CORE__SPEC__ZYNQ_QEMU__BOARD_H_ */ diff --git a/repos/base-hw/src/core/include/util.h b/repos/base-hw/src/core/util.h similarity index 92% rename from repos/base-hw/src/core/include/util.h rename to repos/base-hw/src/core/util.h index 23d80b3931..6bf737fd60 100644 --- a/repos/base-hw/src/core/include/util.h +++ b/repos/base-hw/src/core/util.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__UTIL_H_ -#define _CORE__INCLUDE__UTIL_H_ +#ifndef _CORE__UTIL_H_ +#define _CORE__UTIL_H_ #include @@ -45,4 +45,4 @@ namespace Genode return (size_log2 < 20) ? 12 : 20; } } -#endif /* _CORE__INCLUDE__UTIL_H_ */ +#endif /* _CORE__UTIL_H_ */ diff --git a/repos/base-hw/src/core/include/vm_root.h b/repos/base-hw/src/core/vm_root.h similarity index 90% rename from repos/base-hw/src/core/include/vm_root.h rename to repos/base-hw/src/core/vm_root.h index 02ac75419d..0778892fba 100644 --- a/repos/base-hw/src/core/include/vm_root.h +++ b/repos/base-hw/src/core/vm_root.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _CORE__INCLUDE__VM_ROOT_H_ -#define _CORE__INCLUDE__VM_ROOT_H_ +#ifndef _CORE__VM_ROOT_H_ +#define _CORE__VM_ROOT_H_ /* Genode includes */ #include @@ -47,4 +47,4 @@ namespace Genode { }; } -#endif /* _CORE__INCLUDE__VM_ROOT_H_ */ +#endif /* _CORE__VM_ROOT_H_ */ diff --git a/repos/base-hw/src/test/cpu_scheduler/target.mk b/repos/base-hw/src/test/cpu_scheduler/target.mk index 64a7369f69..d3e8931140 100644 --- a/repos/base-hw/src/test/cpu_scheduler/target.mk +++ b/repos/base-hw/src/test/cpu_scheduler/target.mk @@ -6,7 +6,7 @@ TARGET = test-cpu_scheduler SRC_CC = test.cc cpu_scheduler.cc double_list.cc -INC_DIR = $(REP_DIR)/src/core/include $(BASE_DIR)/src/include +INC_DIR = $(REP_DIR)/src/core $(REP_DIR)/src/lib $(BASE_DIR)/src/include LIBS = base vpath test.cc $(PRG_DIR) diff --git a/repos/base-hw/src/test/double_list/target.mk b/repos/base-hw/src/test/double_list/target.mk index a5945637b8..159690dbf6 100644 --- a/repos/base-hw/src/test/double_list/target.mk +++ b/repos/base-hw/src/test/double_list/target.mk @@ -5,7 +5,7 @@ # TARGET = test-double_list -INC_DIR = $(REP_DIR)/src/core/include +INC_DIR = $(REP_DIR)/src/core SRC_CC = test.cc double_list.cc LIBS = base