diff --git a/repos/base-hw/include/base/native_types.h b/repos/base-hw/include/base/native_types.h index 3ba0fdc06..0e1359161 100644 --- a/repos/base-hw/include/base/native_types.h +++ b/repos/base-hw/include/base/native_types.h @@ -28,11 +28,6 @@ namespace Genode typedef int Native_connection_state; - /** - * Information that a thread creator hands out to a new thread - */ - class Start_info; - /** * Coherent address region */ @@ -47,29 +42,5 @@ struct Genode::Native_thread }; -/** - * Coherent address region - */ -struct Genode::Native_region -{ - addr_t base; - size_t size; -}; - - -namespace Genode -{ - static constexpr addr_t VIRT_ADDR_SPACE_START = 0x1000; - static constexpr size_t VIRT_ADDR_SPACE_SIZE = 0xfffee000; - - /** - * The main thread's UTCB, used during bootstrap of the main thread before it - * allocates its stack area, needs to be outside the virtual memory area - * controlled by the RM session, because it is needed before the main - * thread can access its RM session. - */ - static constexpr Native_utcb * utcb_main_thread() { - return (Native_utcb *) (VIRT_ADDR_SPACE_START + VIRT_ADDR_SPACE_SIZE); } -} #endif /* _INCLUDE__BASE__NATIVE_TYPES_H_ */ diff --git a/repos/base-hw/src/core/include/util.h b/repos/base-hw/src/core/include/util.h index be86c7b9a..bfdd0499a 100644 --- a/repos/base-hw/src/core/include/util.h +++ b/repos/base-hw/src/core/include/util.h @@ -23,6 +23,12 @@ namespace Genode { + struct Native_region + { + addr_t base; + size_t size; + }; + enum { ACTIVITY_TABLE_ON_FAULTS = 0, }; diff --git a/repos/base-hw/src/include/base/internal/native_utcb.h b/repos/base-hw/src/include/base/internal/native_utcb.h index fecfe1456..376761a9d 100644 --- a/repos/base-hw/src/include/base/internal/native_utcb.h +++ b/repos/base-hw/src/include/base/internal/native_utcb.h @@ -25,7 +25,23 @@ /* kernel includes */ #include -namespace Genode { struct Native_utcb; } +namespace Genode { + + struct Native_utcb; + + static constexpr addr_t VIRT_ADDR_SPACE_START = 0x1000; + static constexpr size_t VIRT_ADDR_SPACE_SIZE = 0xfffee000; + + /** + * The main thread's UTCB, used during bootstrap of the main thread before it + * allocates its stack area, needs to be outside the virtual memory area + * controlled by the RM session, because it is needed before the main + * thread can access its RM session. + */ + static constexpr Native_utcb * utcb_main_thread() { + return (Native_utcb *) (VIRT_ADDR_SPACE_START + VIRT_ADDR_SPACE_SIZE); } +} + class Genode::Native_utcb {