diff --git a/repos/base-hw/include/base/pager.h b/repos/base-hw/include/base/pager.h index ab83c0603..a2e141205 100644 --- a/repos/base-hw/include/base/pager.h +++ b/repos/base-hw/include/base/pager.h @@ -135,7 +135,7 @@ class Genode::Pager_object : public Object_pool::Entry, Thread_capability _thread_cap; bool _signal_valid; char _signal_buf[sizeof(Signal)]; - unsigned const _badge; + unsigned long const _badge; /** * Remember an incoming fault for handling @@ -196,7 +196,7 @@ class Genode::Pager_object : public Object_pool::Entry, /** * User identification of pager object */ - unsigned badge() const { return _badge; } + unsigned long badge() const { return _badge; } /** * Resume faulter diff --git a/repos/base-hw/include/kernel/log.h b/repos/base-hw/include/kernel/log.h index 2c1a94cb4..86a01ac75 100644 --- a/repos/base-hw/include/kernel/log.h +++ b/repos/base-hw/include/kernel/log.h @@ -55,7 +55,7 @@ namespace Kernel /** * Print an unsigned integer x as hexadecimal value */ - Log & operator << (unsigned int const x) + Log & operator << (unsigned long const x) { enum { BYTE_WIDTH = 8, @@ -101,7 +101,7 @@ namespace Kernel /** * Print a pointer p as hexadecimal value */ - Log & operator << (void * const p) { return *this << (unsigned)p; } + Log & operator << (void * const p) { return *this << (unsigned long)p; } }; /** diff --git a/repos/base-hw/src/base/signal/signal.cc b/repos/base-hw/src/base/signal/signal.cc index f18c2e586..f56bfdf6d 100644 --- a/repos/base-hw/src/base/signal/signal.cc +++ b/repos/base-hw/src/base/signal/signal.cc @@ -150,7 +150,7 @@ Signal_context_capability Signal_receiver::manage(Signal_context * const c) Signal_connection * const s = signal_connection(); while (1) { try { - c->_cap = s->alloc_context(_cap, (unsigned)c); + c->_cap = s->alloc_context(_cap, (unsigned long)c); c->_receiver = this; _contexts.insert(&c->_receiver_le); return c->_cap; diff --git a/repos/base-hw/src/core/core_rm_session.cc b/repos/base-hw/src/core/core_rm_session.cc index d822658a0..800d17fc8 100644 --- a/repos/base-hw/src/core/core_rm_session.cc +++ b/repos/base-hw/src/core/core_rm_session.cc @@ -39,12 +39,12 @@ Core_rm_session::attach(Dataspace_capability ds_cap, size_t size, if (use_local_addr) { PERR("Parameter 'use_local_addr' not supported within core"); - return 0; + return 0UL; } if (offset) { PERR("Parameter 'offset' not supported within core"); - return 0; + return 0UL; } /* allocate range in core's virtual address space */ @@ -63,7 +63,7 @@ Core_rm_session::attach(Dataspace_capability ds_cap, size_t size, ds.object()->cacheability(), ds.object()->is_io_mem()); if (!map_local(ds->phys_addr(), (addr_t)virt_addr, num_pages, flags)) - return 0; + return 0UL; return virt_addr; } diff --git a/repos/base-hw/src/core/include/kernel/core_interface.h b/repos/base-hw/src/core/include/kernel/core_interface.h index 49260cec1..e58848cdc 100644 --- a/repos/base-hw/src/core/include/kernel/core_interface.h +++ b/repos/base-hw/src/core/include/kernel/core_interface.h @@ -58,7 +58,7 @@ namespace Kernel * \retval >0 kernel name of the new domain * \retval 0 failed */ - inline unsigned new_pd(void * const dst, Platform_pd * const pd) + inline unsigned long new_pd(void * const dst, Platform_pd * const pd) { return call(call_id_new_pd(), (Call_arg)dst, (Call_arg)pd); } diff --git a/repos/base-hw/src/core/include/platform_thread.h b/repos/base-hw/src/core/include/platform_thread.h index b1c8919bf..6a92f52a6 100644 --- a/repos/base-hw/src/core/include/platform_thread.h +++ b/repos/base-hw/src/core/include/platform_thread.h @@ -156,7 +156,7 @@ namespace Genode { /** * Return unique identification of this thread as faulter */ - unsigned pager_object_badge() { return (unsigned)this; } + unsigned long pager_object_badge() { return (unsigned long)this; } /** * Set the executing CPU for this thread diff --git a/repos/base-hw/src/core/rm_session_support.cc b/repos/base-hw/src/core/rm_session_support.cc index fa38b108b..ab5a77003 100644 --- a/repos/base-hw/src/core/rm_session_support.cc +++ b/repos/base-hw/src/core/rm_session_support.cc @@ -82,8 +82,8 @@ int Pager_activation_base::apply_mapping() } catch(Allocator::Out_of_memory) { PERR("Translation table needs to much RAM"); } catch(...) { - PERR("Invalid mapping %p -> %p (%zx)", (void*)_mapping.phys_address, - (void*)_mapping.virt_address, 1 << _mapping.size_log2); + PERR("Invalid mapping %p -> %p (%lx)", (void*)_mapping.phys_address, + (void*)_mapping.virt_address, 1UL << _mapping.size_log2); } return -1; }