diff --git a/iris.hhp b/iris.hhp index a839c53..ab3b547 100644 --- a/iris.hhp +++ b/iris.hhp @@ -464,9 +464,9 @@ namespace Iris: bool set_flags (unsigned set, unsigned reset = 0): call (CAP_MASTER_DIRECT | SET_FLAGS, Num (set, set | reset)) return recv.data[0].l == NO_ERROR - unsigned physical_address (): + unsigned long physical_address (): return my_thread.ocall (*this, CAP_MASTER_DIRECT | Thread::PRIV_PHYSICAL_ADDRESS).l - void alloc_physical (unsigned address, bool cachable, bool freeable): + void alloc_physical (unsigned long address, bool cachable, bool freeable): my_thread.ocall (*this, CAP_MASTER_DIRECT | Thread::PRIV_ALLOC_PHYSICAL, (address & PAGE_MASK) | (cachable ? 1 : 0) | (freeable ? 2 : 0)) struct Listitem : public Cap: @@ -544,12 +544,12 @@ namespace Iris: void destroy (Cap target): ocall (target, CAP_MASTER_DIRECT | DESTROY) // TODO: LIST - bool map (Cap page, unsigned address): + bool map (Cap page, unsigned long address): return ocall (page, CAP_MASTER_DIRECT | MAP, address).l == NO_ERROR bool unmap (Cap page): return map (page, ~0) Page mapping (void *address): - icall (CAP_MASTER_DIRECT | MAPPING, Num ((unsigned)address)) + icall (CAP_MASTER_DIRECT | MAPPING, Num ((unsigned long)address)) return get_arg () unsigned get_limit (): return call (CAP_MASTER_DIRECT | GET_LIMIT).l diff --git a/mips/nanonote/Makefile.arch b/mips/nanonote/Makefile.arch index 184ac9a..e49647c 100644 --- a/mips/nanonote/Makefile.arch +++ b/mips/nanonote/Makefile.arch @@ -97,8 +97,8 @@ servers: while : ; do $(MAKE) server ; done setup: - x-terminal-emulator -e make debug - x-terminal-emulator -e make servers + x-terminal-emulator -e make debug & + x-terminal-emulator -e make servers & ARCH_CLEAN_FILES = $(boot_sources) $(addsuffix .elf,$(boot_threads)) $(arch_headers) devices.hh keys.hh mips/*.o mips/nanonote/*.o source/charset.data iris.elf iris.raw mips/nanonote/sdram-setup.elf mips/nanonote/sdram-setup.raw