From 9f43aa4363e1887935d1407c5c5dd04a88afb8f7 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Tue, 27 May 2014 11:09:58 +0200 Subject: [PATCH] base-nova: fully qualify Utcb type --- repos/base-nova/include/base/ipc_msgbuf.h | 4 ++-- repos/base-nova/include/nova/util.h | 24 ++++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/repos/base-nova/include/base/ipc_msgbuf.h b/repos/base-nova/include/base/ipc_msgbuf.h index 887e61e53..87c7365a3 100644 --- a/repos/base-nova/include/base/ipc_msgbuf.h +++ b/repos/base-nova/include/base/ipc_msgbuf.h @@ -359,11 +359,11 @@ namespace Genode { _rcv_pt_cap_free [i] = (i >= max) ? FREE_INVALID : FREE_SEL; for (unsigned i = 0; i < rcv_items; i++) { - Utcb::Item * item = utcb->get_item(i); + Nova::Utcb::Item * item = utcb->get_item(i); if (!item) break; - Crd cap = Crd(item->crd); + Nova::Crd cap(item->crd); /* track which items we got mapped */ if (!cap.is_null() && item->is_del()) { diff --git a/repos/base-nova/include/nova/util.h b/repos/base-nova/include/nova/util.h index 211021cdd..37d4b5d65 100644 --- a/repos/base-nova/include/nova/util.h +++ b/repos/base-nova/include/nova/util.h @@ -33,19 +33,19 @@ inline void request_event_portal(Genode::Native_capability const &cap, Genode::addr_t sel, Genode::addr_t event, unsigned short log2_count = 0) { - using namespace Nova; - Utcb *utcb = (Utcb *)Genode::Thread_base::myself()->utcb(); + Genode::Thread_base * myself = Genode::Thread_base::myself(); + Nova::Utcb *utcb = reinterpret_cast(myself->utcb()); /* save original receive window */ - Crd orig_crd = utcb->crd_rcv; + Nova::Crd orig_crd = utcb->crd_rcv; /* request event-handler portal */ - utcb->crd_rcv = Obj_crd(sel, log2_count); + utcb->crd_rcv = Nova::Obj_crd(sel, log2_count); utcb->msg[0] = event; utcb->msg[1] = log2_count; utcb->set_msg_word(2); - uint8_t res = call(cap.local_name()); + Genode::uint8_t res = Nova::call(cap.local_name()); /* restore original receive window */ utcb->crd_rcv = orig_crd; @@ -68,18 +68,20 @@ inline void request_signal_sm_cap(Genode::Native_capability const &cap, inline void delegate_vcpu_portals(Genode::Native_capability const &cap, Genode::addr_t sel) { - using namespace Nova; - Utcb *utcb = reinterpret_cast(Genode::Thread_base::myself()->utcb()); + Genode::Thread_base * myself = Genode::Thread_base::myself(); + Nova::Utcb *utcb = reinterpret_cast(myself->utcb()); /* save original receive window */ - Crd orig_crd = utcb->crd_rcv; + Nova::Crd orig_crd = utcb->crd_rcv; - utcb->crd_rcv = Obj_crd(); + Nova::Obj_crd obj_crd(sel, Nova::NUM_INITIAL_VCPU_PT_LOG2); + + utcb->crd_rcv = Nova::Obj_crd(); utcb->set_msg_word(0); - uint8_t res = utcb->append_item(Obj_crd(sel, NUM_INITIAL_VCPU_PT_LOG2), 0); + Genode::uint8_t res = utcb->append_item(obj_crd, 0); (void)res; - res = call(cap.local_name()); + res = Nova::call(cap.local_name()); /* restore original receive window */ utcb->crd_rcv = orig_crd;