Make it work with new gcc version; use linker script to force entry code in page 0.

userspace/application/alarm.ccp

@@ -1,54 +1,73 @@
 #pypp 0
-// vim: set filetype=cpp : //
 #include <iris.hh>
-#include <devices.hh>
+#include <ui.hh>
 
-enum captypes:
-	CONTROL = 1
-	KBD
-	INTERRUPT
+enum Ins:
+	TOTAL_TIME
+	START
+	NUM_INS
+
+enum Outs:
+	CURRENT_TIME
+	ALARM
+	NUM_OUTS
+
+typedef UI <NUM_INS, NUM_OUTS> ui_t
+static ui_t ui
+static ui_t::in <unsigned> total_time
+static ui_t::in_event do_start
+static ui_t::out <unsigned> current_time
+static ui_t::out_event do_alarm
+
+static bool ticking
+
+static void event (unsigned code):
+	switch code:
+		case TOTAL_TIME:
+			break
+		case START:
+			current_time = total_time
+			if !ticking:
+				if !current_time:
+					do_alarm ()
+				else:
+					ticking = true
+					Iris::my_receiver.set_alarm (HZ)
+			break
+		default:
+			Iris::panic (0, "invalid event for alarm clock")
 
 Iris::Num start ():
-	unsigned *screen = (unsigned *)0x40000000
-	Iris::RTC rtc = Iris::my_parent.get_capability <Iris::RTC> ()
-	Iris::Display display = Iris::my_parent.get_capability <Iris::Display> ()
-	display.map_fb ((unsigned)screen)
-	Iris::Font font = Iris::my_parent.get_capability <Iris::Font> ()
-	font.set_display (display)
-	Iris::Keyboard keyboard = Iris::my_parent.get_capability <Iris::Keyboard> ()
-	Iris::Cap cap = Iris::my_receiver.create_capability (KBD)
-	keyboard.set_cb (cap.copy ())
-	Iris::free_cap (cap)
-	Iris::Buzzer buzzer = Iris::my_parent.get_capability <Iris::Buzzer> ()
-	Iris::Event self = Iris::my_receiver.create_capability (CONTROL)
-	Iris::my_parent.provide_capability <Iris::Event> (self)
-	cap = Iris::my_receiver.create_capability (INTERRUPT)
+	ticking = false;
+	Iris::Cap ui_cap = Iris::my_receiver.create_capability (0)
+	ui.init (ui_cap.copy ());
+	Iris::free_cap (ui_cap)
+	total_time.init ()
+	do_start.init ()
+	current_time.init ()
+	do_alarm.init ()
+	ui.add_in (&total_time, TOTAL_TIME);
+	ui.add_in (&do_start, START);
+	ui.add_out (&current_time, CURRENT_TIME);
+	ui.add_out (&do_alarm, ALARM);
 	Iris::my_parent.init_done ()
+
 	while true:
 		Iris::wait ()
 		switch Iris::recv.protected_data.l:
-			case INTERRUPT:
-				// RTC alarm interrupt.
-				if Iris::recv.data[0].l == ~0:
-					// Not a real interrupt, just an abort notification.
-					continue
-				font.printf ("alarm: RTC alarm interrupt\n")
-				break
-			case CONTROL:
-				// Store callback
-				font.printf ("alarm: control event\n")
-				break
-			case KBD:
-				if Iris::recv.data[0].l & Iris::Keyboard::RELEASE:
-					// Key release.
-					Iris::poweroff ()
+			case ~0:
+				// alarm.
+				if current_time:
+					current_time = current_time - 1
+				if !current_time:
+					do_alarm ()
+					ticking = false
 				else:
-					// Key press.
-					unsigned time = rtc.get_time ()
-					rtc.set_alarm (time + 5, cap)
-					unsigned alarm = rtc.get_alarm ()
-					unsigned enabled = Iris::recv.data[1].l
-					font.printf ("Debug: %d %d %d\n", time, alarm, enabled)
-				break
-			default:
-				Iris::panic (Iris::recv.protected_data.l, "invalid request for alarm")
+					// TODO: use rtc for scheduling an event.
+					Iris::my_receiver.set_alarm (HZ)
+				continue
+			case 0:
+				// ui event.
+				if !ui.event (&event):
+					// Exit request.
+					return 0

userspace/boot/crt0.ccp

@@ -19,9 +19,6 @@
 #include "iris.hh"
 #include "devices.hh"
 
-// For some unknown reason, gcc needs this to be defined.
-unsigned __gxx_personality_v0
-
 struct list:
 	list *prev, *next
 

userspace/data/init.config

@@ -34,15 +34,15 @@
 	driver driver_buzzer = "buzzer.elf"
 	receive driver_buzzer / Buzzer = buzzer
 
-	#program alarm = "alarm.elf"
-	#receive alarm / UI = ui
+	program alarm = "alarm.elf"
+	receive alarm / UI = ui
 
-	#program gui = "gui.elf"
-	#give gui / UI = ui
-	#give gui / Display = display
-	#give gui / Setting = display_bright
-	#give gui / Buzzer = buzzer
-	#give gui / Keyboard = keyboard
+	program gui = "gui.elf"
+	give gui / UI = ui
+	give gui / Display = display
+	give gui / Setting = display_bright
+	give gui / Buzzer = buzzer
+	give gui / Keyboard = keyboard
 
 	#driver sdmmc =  "sd+mmc.elf"
 	#receive sdmmc / WBlock = sdmmc
@@ -62,19 +62,19 @@
 	#program test = "test.elf"
 	#give test / Directory = root
 
-	file fontfile = "font.dat"
-	program font = "font.elf"
-	receive font / Font = font
-	give font / Block = fontfile
+	#file fontfile = "font.dat"
+	#program font = "font.elf"
+	#receive font / Font = font
+	#give font / Block = fontfile
 	#give font / Display = display
 
-	driver driver_rtc = "rtc.elf"
-	receive driver_rtc / RTC = rtc
+	#driver driver_rtc = "rtc.elf"
+	#receive driver_rtc / RTC = rtc
 
-	driver alarm = "alarm.elf"
-	give alarm / Keyboard = keyboard
-	give alarm / Display = display
-	give alarm / Buzzer = buzzer
-	give alarm / Font = font
-	give alarm / RTC = rtc
-	receive alarm / Event = alarm
+	#driver alarm = "alarm.elf"
+	#give alarm / Keyboard = keyboard
+	#give alarm / Display = display
+	#give alarm / Buzzer = buzzer
+	#give alarm / Font = font
+	#give alarm / RTC = rtc
+	#receive alarm / Event = alarm

userspace/glue/font.ccp

@@ -104,12 +104,10 @@ Iris::Num start ():
 	Iris::Font self = Iris::my_receiver.create_capability (0)
 	Iris::my_parent.provide_capability <Iris::Font> (self.copy ())
 	Iris::free_cap (self)
-	//display = Iris::my_parent.get_capability <Iris::Display> ()
 	Iris::Block font = Iris::my_parent.get_capability <Iris::Block> ()
 	load_font (font)
 	Iris::free_cap (font)
 	Iris::my_parent.init_done ()
-	//display_caps = display.map_fb (reinterpret_cast <unsigned> (fb))
 	bool have_display = false
 	while true:
 		Iris::wait ()

userspace/nanonote/lcd.ccp

@@ -20,7 +20,7 @@
 #define ARCH
 #include "arch.hh"
 
-__asm__ volatile (".section .rodata\n.globl charset\ncharset:\n.incbin \"source/data/charset.data\"\n.section .text")
+__asm__ volatile (".section .rodata\n.globl charset\ncharset:\n.incbin \"userspace/data/charset.data\"\n.section .text")
 extern unsigned char const charset[127-32][8][6]
 
 #define assert(x) do { if (!(x)) { kdebug ("assertion failed " #x); while (true) {} } } while (0)