From 84ca4b25dbeec2536278bca99ab074d2f476ffce Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Fri, 9 Mar 2012 12:21:08 +0100 Subject: [PATCH] L4Linux: fix changed name scope of enums. This bug was introduced by commit c9c21ad39c, where Fiasco_capability was removed, and enums defined in that class scope went to the namespace Fiasco. In L4Linux some references to Fiasco_capability remained. --- ports-foc/src/lib/l4lx/l4lx_thread.cc | 6 +++--- ports-foc/src/lib/l4lx/startup.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports-foc/src/lib/l4lx/l4lx_thread.cc b/ports-foc/src/lib/l4lx/l4lx_thread.cc index 2a9ad543d..237e6b33d 100644 --- a/ports-foc/src/lib/l4lx/l4lx_thread.cc +++ b/ports-foc/src/lib/l4lx/l4lx_thread.cc @@ -74,7 +74,7 @@ static void* alloc_vcpu_state() // TODO: use different sizes for 32 vs. 64-bit l4_fpage_t fpage = l4_fpage(addr, L4_LOG2_PAGESIZE, L4_CAP_FPAGE_RW); - l4_msgtag_t tag = l4_task_add_ku_mem(Fiasco_capability::TASK_CAP, fpage); + l4_msgtag_t tag = l4_task_add_ku_mem(Fiasco::TASK_CAP, fpage); if (l4_error(tag)) PERR("l4_task_add_ku_mem for %p failed with %ld!", (void*)addr, l4_error(tag)); @@ -131,8 +131,8 @@ void l4lx_thread_pager_change(l4_cap_idx_t thread, l4_cap_idx_t pager) if (DEBUG) PDBG("Change pager of %lx to %lx", thread, pager); - l4_cap_idx_t p_id = thread - Fiasco_capability::THREAD_GATE_CAP - + Fiasco_capability::THREAD_PAGER_CAP; + l4_cap_idx_t p_id = thread - Fiasco::THREAD_GATE_CAP + + Fiasco::THREAD_PAGER_CAP; l4_task_map(L4_BASE_TASK_CAP, L4_BASE_TASK_CAP, l4_obj_fpage(pager, 0, L4_FPAGE_RWX), p_id | L4_ITEM_MAP); diff --git a/ports-foc/src/lib/l4lx/startup.cc b/ports-foc/src/lib/l4lx/startup.cc index 2f7da30b4..bdff73c13 100644 --- a/ports-foc/src/lib/l4lx/startup.cc +++ b/ports-foc/src/lib/l4lx/startup.cc @@ -114,7 +114,7 @@ static void prepare_l4re_env() env->mem_alloc = L4_INVALID_CAP; env->log = L4_INVALID_CAP; env->main_thread = cpu.native_cap(Genode::env()->cpu_session()->first()).dst(); - env->rm = Fiasco_capability::THREADS_BASE_CAP + Fiasco_capability::THREAD_PAGER_CAP; + env->rm = Fiasco::THREADS_BASE_CAP + Fiasco::THREAD_PAGER_CAP; }