Date:2010-07-10 20:14:54 (13 years 8 months ago)
Author:Bas Wijnen
Commit:2122a743cf585dae00f4401f71288f585892aaae
Message:fix things

Files: devices.hhp (1 diff)
mips/nanonote/Makefile.arch (1 diff)
source/gui.ccp (2 diffs)

Change Details

devices.hhp
329329            INPUT = 1 << 31
330330        void get_state (Cap cap):
331331            ocall (cap, CAP_MASTER_DIRECT | GET_STATE)
332        void event (unsigned code, unsigned value = 0):
332        void event (unsigned code, Iris::Num value = 0):
333333            call (Num (CAP_MASTER_DIRECT | EVENT, code), value)
334334        void exit ():
335335            call (CAP_MASTER_DIRECT | EXIT)
mips/nanonote/Makefile.arch
4545ARCH_CXXFLAGS = -DNUM_THREADS=4
4646all: iris-sd.tar
4747iris-sd.tar: $(addprefix fs/,$(addsuffix .elf,$(programs))) iris.raw init.config
48    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'
48    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'
4949    cd fs && tar cvf ../$@ uimage init.config $(addsuffix .elf,$(programs)) --dereference
5050endif
5151
source/gui.ccp
160160    Iris::my_receiver.set_alarm (HZ / 3)
161161
162162Iris::Num start ():
163    Iris::my_parent.init_done ()
164
165163    display = Iris::my_parent.get_capability <Iris::Display> ()
166164    Iris::Setting bright = Iris::my_parent.get_capability <Iris::Setting> ()
167165    Iris::Keyboard keyboard = Iris::my_parent.get_capability <Iris::Keyboard> ()
...... 
188186
189187    unsigned total_time = 0
190188    alarming = 0
189
190    Iris::my_parent.init_done ()
191
191192    while true:
192193        Iris::wait ()
193194        switch Iris::recv.protected_data.l:

Archive Download the corresponding diff file

Branches:
master



interactive