qi-hardware/iris
1
0
Fork 0
mirror of git://projects.qi-hardware.com/iris.git synced 2025-02-07 05:01:56 +02:00
Code

fix things

Browse Source
This commit is contained in:
Bas Wijnen 2010-07-10 20:14:54 +02:00
parent 19f1d128d0
commit 2122a743cf
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices.hhp
View File

@ -329,7 +329,7 @@ namespace Iris:
INPUT = 1 << 31 INPUT = 1 << 31
void get_state (Cap cap): void get_state (Cap cap):
ocall (cap, CAP_MASTER_DIRECT | GET_STATE) ocall (cap, CAP_MASTER_DIRECT | GET_STATE)
void event (unsigned code, unsigned value = 0): void event (unsigned code, Iris::Num value = 0):
call (Num (CAP_MASTER_DIRECT | EVENT, code), value) call (Num (CAP_MASTER_DIRECT | EVENT, code), value)
void exit (): void exit ():
call (CAP_MASTER_DIRECT | EXIT) call (CAP_MASTER_DIRECT | EXIT)

2
mips/nanonote/Makefile.arch
View File

@ -45,7 +45,7 @@ threadlist = mips/nanonote/threadlist-sd
ARCH_CXXFLAGS = -DNUM_THREADS=4 ARCH_CXXFLAGS = -DNUM_THREADS=4
all: iris-sd.tar all: iris-sd.tar
iris-sd.tar: $(addprefix fs/,$(addsuffix .elf,$(programs))) iris.raw init.config iris-sd.tar: $(addprefix fs/,$(addsuffix .elf,$(programs))) iris.raw init.config
mkimage -a $(load) -e a$(shell /bin/sh -c '$(OBJDUMP) -t iris.elf | grep __start$$ | cut -b2-8') -n Iris -d iris.raw fs/uimage | sed -e 's/:/;/g' mkimage -A mips -T kernel -a $(load) -e a$(shell /bin/sh -c '$(OBJDUMP) -t iris.elf | grep __start$$ | cut -b2-8') -n Iris -d iris.raw fs/uimage | sed -e 's/:/;/g'
cd fs && tar cvf ../$@ uimage init.config $(addsuffix .elf,$(programs)) --dereference cd fs && tar cvf ../$@ uimage init.config $(addsuffix .elf,$(programs)) --dereference
endif endif

5
source/gui.ccp
View File

@ -160,8 +160,6 @@ static void do_alarm ():
Iris::my_receiver.set_alarm (HZ / 3) Iris::my_receiver.set_alarm (HZ / 3)
Iris::Num start (): Iris::Num start ():
Iris::my_parent.init_done ()
display = Iris::my_parent.get_capability <Iris::Display> () display = Iris::my_parent.get_capability <Iris::Display> ()
Iris::Setting bright = Iris::my_parent.get_capability <Iris::Setting> () Iris::Setting bright = Iris::my_parent.get_capability <Iris::Setting> ()
Iris::Keyboard keyboard = Iris::my_parent.get_capability <Iris::Keyboard> () Iris::Keyboard keyboard = Iris::my_parent.get_capability <Iris::Keyboard> ()
@ -188,6 +186,9 @@ Iris::Num start ():
unsigned total_time = 0 unsigned total_time = 0
alarming = 0 alarming = 0
Iris::my_parent.init_done ()
while true: while true:
Iris::wait () Iris::wait ()
switch Iris::recv.protected_data.l: switch Iris::recv.protected_data.l: