diff --git a/devices.hhp b/devices.hhp index 1aed3f2..68642a5 100644 --- a/devices.hhp +++ b/devices.hhp @@ -329,7 +329,7 @@ namespace Iris: INPUT = 1 << 31 void get_state (Cap cap): 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) void exit (): call (CAP_MASTER_DIRECT | EXIT) diff --git a/mips/nanonote/Makefile.arch b/mips/nanonote/Makefile.arch index 1621f9e..79cdf92 100644 --- a/mips/nanonote/Makefile.arch +++ b/mips/nanonote/Makefile.arch @@ -45,7 +45,7 @@ threadlist = mips/nanonote/threadlist-sd ARCH_CXXFLAGS = -DNUM_THREADS=4 all: iris-sd.tar 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 endif diff --git a/source/gui.ccp b/source/gui.ccp index dcaa6e5..e0ca566 100644 --- a/source/gui.ccp +++ b/source/gui.ccp @@ -160,8 +160,6 @@ static void do_alarm (): Iris::my_receiver.set_alarm (HZ / 3) Iris::Num start (): - Iris::my_parent.init_done () - display = Iris::my_parent.get_capability () Iris::Setting bright = Iris::my_parent.get_capability () Iris::Keyboard keyboard = Iris::my_parent.get_capability () @@ -188,6 +186,9 @@ Iris::Num start (): unsigned total_time = 0 alarming = 0 + + Iris::my_parent.init_done () + while true: Iris::wait () switch Iris::recv.protected_data.l: