From 2f2410fdffcb0eddd6cfd6a0991a02f15018874d Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Thu, 14 Feb 2013 11:03:46 +0100 Subject: [PATCH] base-host: Build fixes --- base-host/src/base/pager/pager.cc | 4 ++-- base-host/src/core/context_area.cc | 4 +++- base-host/src/core/core_rm_session.cc | 2 +- base-host/src/core/include/core_rm_session.h | 4 +++- base-host/src/core/include/platform_thread.h | 3 ++- base-host/src/core/target.inc | 3 +-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/base-host/src/base/pager/pager.cc b/base-host/src/base/pager/pager.cc index a42f11e1a..565754331 100644 --- a/base-host/src/base/pager/pager.cc +++ b/base-host/src/base/pager/pager.cc @@ -37,7 +37,7 @@ Pager_entrypoint::Pager_entrypoint(Cap_session *, Pager_activation_base *a) void Pager_entrypoint::dissolve(Pager_object *obj) { - remove(obj); + remove_locked(obj); } @@ -53,5 +53,5 @@ Pager_capability Pager_entrypoint::manage(Pager_object *obj) insert(obj); /* return capability that uses the object id as badge */ - return Pager_capability(cap); + return reinterpret_cap_cast(cap); } diff --git a/base-host/src/core/context_area.cc b/base-host/src/core/context_area.cc index dd53cbd05..cb69b2bd5 100644 --- a/base-host/src/core/context_area.cc +++ b/base-host/src/core/context_area.cc @@ -30,7 +30,7 @@ class Context_area_rm_session : public Genode::Rm_session */ Local_addr attach(Genode::Dataspace_capability ds_cap, Genode::size_t size, Genode::off_t offset, - bool use_local_addr, Local_addr local_addr) + bool use_local_addr, Local_addr local_addr, bool) { PWRN("not implemented"); return local_addr; @@ -42,6 +42,8 @@ class Context_area_rm_session : public Genode::Rm_session Genode::Pager_capability add_client(Genode::Thread_capability) { return Genode::Pager_capability(); } + void remove_client(Genode::Pager_capability) { } + void fault_handler(Genode::Signal_context_capability) { } State state() { return State(); } diff --git a/base-host/src/core/core_rm_session.cc b/base-host/src/core/core_rm_session.cc index ee3a9511f..3e40d071f 100644 --- a/base-host/src/core/core_rm_session.cc +++ b/base-host/src/core/core_rm_session.cc @@ -23,7 +23,7 @@ using namespace Genode; Rm_session::Local_addr Core_rm_session::attach(Dataspace_capability ds_cap, size_t size, off_t offset, bool use_local_addr, - Rm_session::Local_addr local_addr) + Rm_session::Local_addr local_addr, bool) { PWRN("not implemented"); return 0; diff --git a/base-host/src/core/include/core_rm_session.h b/base-host/src/core/include/core_rm_session.h index c26e0382c..c26b5874f 100644 --- a/base-host/src/core/include/core_rm_session.h +++ b/base-host/src/core/include/core_rm_session.h @@ -30,13 +30,15 @@ namespace Genode { Local_addr attach(Dataspace_capability ds_cap, size_t size=0, off_t offset=0, bool use_local_addr = false, - Local_addr local_addr = 0); + Local_addr local_addr = 0, bool = false); void detach(Local_addr local_addr) { } Pager_capability add_client(Thread_capability thread) { return Pager_capability(); } + void remove_client(Pager_capability) { } + void fault_handler(Signal_context_capability handler) { } State state() { return State(); } diff --git a/base-host/src/core/include/platform_thread.h b/base-host/src/core/include/platform_thread.h index bee76c851..114ee796a 100644 --- a/base-host/src/core/include/platform_thread.h +++ b/base-host/src/core/include/platform_thread.h @@ -86,9 +86,10 @@ namespace Genode { ************************/ /** - * Set pager + * Set/get pager */ void pager(Pager_object *pager) { } + Pager_object *pager() const { return 0; } /** * Return identification of thread when faulting diff --git a/base-host/src/core/target.inc b/base-host/src/core/target.inc index effb39922..ab78bc8e0 100644 --- a/base-host/src/core/target.inc +++ b/base-host/src/core/target.inc @@ -24,7 +24,6 @@ SRC_CC = \ dataspace_component.cc \ rm_session_component.cc \ rm_session_support.cc \ - io_port_session_component.cc \ irq_session_component.cc \ signal_session_component.cc \ signal_source_component.cc \ @@ -45,7 +44,7 @@ vpath io_mem_session_support.cc $(GEN_CORE_DIR) vpath signal_session_component.cc $(GEN_CORE_DIR) vpath signal_source_component.cc $(GEN_CORE_DIR) vpath dataspace_component.cc $(GEN_CORE_DIR) -vpath platform_serices.cc $(GEN_CORE_DIR) +vpath platform_services.cc $(GEN_CORE_DIR) vpath %.cc $(REP_DIR)/src/core vpath thread_bootstrap.cc $(BASE_DIR)/src/base/thread vpath thread.cc $(BASE_DIR)/src/base/thread