ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base-nova: fully qualify Utcb type

This commit is contained in:
Norman Feske 2014-05-27 11:09:58 +02:00
parent f1aa137c9d
commit 9f43aa4363
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/base-nova/include/base/ipc_msgbuf.h
View File

@ -359,11 +359,11 @@ namespace Genode {
_rcv_pt_cap_free [i] = (i >= max) ? FREE_INVALID : FREE_SEL; _rcv_pt_cap_free [i] = (i >= max) ? FREE_INVALID : FREE_SEL;
for (unsigned i = 0; i < rcv_items; i++) { 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) if (!item)
break; break;
Crd cap = Crd(item->crd); Nova::Crd cap(item->crd);
/* track which items we got mapped */ /* track which items we got mapped */
if (!cap.is_null() && item->is_del()) { if (!cap.is_null() && item->is_del()) {

24
repos/base-nova/include/nova/util.h
View File

@ -33,19 +33,19 @@ inline void request_event_portal(Genode::Native_capability const &cap,
Genode::addr_t sel, Genode::addr_t event, Genode::addr_t sel, Genode::addr_t event,
unsigned short log2_count = 0) unsigned short log2_count = 0)
{ {
using namespace Nova; Genode::Thread_base * myself = Genode::Thread_base::myself();
Utcb *utcb = (Utcb *)Genode::Thread_base::myself()->utcb(); Nova::Utcb *utcb = reinterpret_cast<Nova::Utcb *>(myself->utcb());
/* save original receive window */ /* save original receive window */
Crd orig_crd = utcb->crd_rcv; Nova::Crd orig_crd = utcb->crd_rcv;
/* request event-handler portal */ /* 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[0] = event;
utcb->msg[1] = log2_count; utcb->msg[1] = log2_count;
utcb->set_msg_word(2); 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 */ /* restore original receive window */
utcb->crd_rcv = orig_crd; 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, inline void delegate_vcpu_portals(Genode::Native_capability const &cap,
Genode::addr_t sel) Genode::addr_t sel)
{ {
using namespace Nova; Genode::Thread_base * myself = Genode::Thread_base::myself();
Utcb *utcb = reinterpret_cast<Utcb *>(Genode::Thread_base::myself()->utcb()); Nova::Utcb *utcb = reinterpret_cast<Nova::Utcb *>(myself->utcb());
/* save original receive window */ /* 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); 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; (void)res;
res = call(cap.local_name()); res = Nova::call(cap.local_name());
/* restore original receive window */ /* restore original receive window */
utcb->crd_rcv = orig_crd; utcb->crd_rcv = orig_crd;