qi-hardware/iris
1
0
Fork 0
mirror of git://projects.qi-hardware.com/iris.git synced 2024-09-29 00:12:55 +03:00
Code

more fixes by Xiangfu Liu <xiangfu@sharism.cc>

Browse Source
This commit is contained in:
Bas Wijnen 2010-07-12 14:59:22 +02:00
parent 662df387cf
commit a2add9a1d6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
iris.hhp
View File

@ -464,9 +464,9 @@ namespace Iris:
bool set_flags (unsigned set, unsigned reset = 0): bool set_flags (unsigned set, unsigned reset = 0):
call (CAP_MASTER_DIRECT | SET_FLAGS, Num (set, set | reset)) call (CAP_MASTER_DIRECT | SET_FLAGS, Num (set, set | reset))
return recv.data[0].l == NO_ERROR 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 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)) my_thread.ocall (*this, CAP_MASTER_DIRECT | Thread::PRIV_ALLOC_PHYSICAL, (address & PAGE_MASK) | (cachable ? 1 : 0) | (freeable ? 2 : 0))
struct Listitem : public Cap: struct Listitem : public Cap:
@ -544,12 +544,12 @@ namespace Iris:
void destroy (Cap target): void destroy (Cap target):
ocall (target, CAP_MASTER_DIRECT | DESTROY) ocall (target, CAP_MASTER_DIRECT | DESTROY)
// TODO: LIST // 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 return ocall (page, CAP_MASTER_DIRECT | MAP, address).l == NO_ERROR
bool unmap (Cap page): bool unmap (Cap page):
return map (page, ~0) return map (page, ~0)
Page mapping (void *address): Page mapping (void *address):
icall (CAP_MASTER_DIRECT | MAPPING, Num ((unsigned)address)) icall (CAP_MASTER_DIRECT | MAPPING, Num ((unsigned long)address))
return get_arg () return get_arg ()
unsigned get_limit (): unsigned get_limit ():
return call (CAP_MASTER_DIRECT | GET_LIMIT).l return call (CAP_MASTER_DIRECT | GET_LIMIT).l

4
mips/nanonote/Makefile.arch
View File

@ -97,8 +97,8 @@ servers:
while : ; do $(MAKE) server ; done while : ; do $(MAKE) server ; done
setup: setup:
x-terminal-emulator -e make debug x-terminal-emulator -e make debug &
x-terminal-emulator -e make servers 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 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