removed old device handling

source/buzzer.ccp

@@ -57,38 +57,24 @@ Iris::Num start ():
 
 	DevBuzzer buzzer
 
-	Iris::Device dev = Iris::my_receiver.create_capability (BUZZER)
+	Iris::Buzzer dev = Iris::my_receiver.create_capability (BUZZER)
 	Iris::my_parent.provide_device <Iris::Buzzer> (dev.copy ())
 	Iris::free_cap (dev)
 	Iris::my_parent.init_done ()
-	unsigned user (~0)
-	unsigned next_user (0)
 	while true:
 		Iris::wait ()
-		switch Iris::recv.protected_data.h:
-			case ~0:
-				// Alarm.
-				buzzer.stop ()
-				break
-			case 0:
-				switch Iris::recv.protected_data.l:
-					case BUZZER:
-						// Buzzer device control request.
-						Iris::Cap reply = Iris::get_reply ()
-						Iris::Cap arg = Iris::get_arg ()
-						Iris::Device::host (BUZZER, user, reply, arg)
-						break
-					default:
-						kdebug ("invalid buzzer request\n")
-						break
-				break
+		if Iris::recv.protected_data.h == ~0:
+			// Alarm.
+			buzzer.stop ()
+			break
+		switch Iris::recv.protected_data.l:
 			case BUZZER:
 				// Buzzer device user request.
-				if Iris::recv.protected_data.l != user:
-					kdebug ("invalid user requesting buzzer\n")
-					Iris::recv.reply.invoke ()
-					break
 				switch Iris::recv.data[0].l:
+					case Iris::Device::RESET:
+						buzzer.stop ()
+						Iris::recv.reply.invoke ()
+						break
 					case Iris::Buzzer::BEEP:
 						// Volume is not used by this buzzer.
 						Iris::Cap arg = Iris::get_arg ()
@@ -107,5 +93,5 @@ Iris::Num start ():
 				break
 			default:
 				kdebug ("Buzzer: unknown num: ")
-				kdebug_num (Iris::recv.protected_data.h)
+				kdebug_num (Iris::recv.protected_data.l)
 				kdebug ("\n")

source/display-emu.ccp

@@ -1,82 +0,0 @@
-#pypp 0
-// Iris: micro-kernel for a capability-based operating system.
-// source/display-emu.ccp: Display interface emulation layer.
-// Copyright 2009 Bas Wijnen <wijnen@debian.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include <devices.hh>
-#include <iris.hh>
-
-Iris::Num start ():
-	Iris::Device d = Iris::my_receiver.create_capability (0)
-	Iris::my_parent.provide_device <Iris::Display> (d.copy (), 0x10000)
-	Iris::free_cap (d)
-	Iris::my_parent.init_done ()
-	Iris::Display real = Iris::my_parent.get_device <Iris::Display> (0)
-	while true:
-		Iris::wait ()
-		Iris::Cap arg = Iris::get_arg ()
-		Iris::Cap reply = Iris::get_reply ()
-		switch Iris::recv.protected_data.h:
-			case 0:
-				switch Iris::recv.data[0].l:
-					case Iris::Device::CREATE_USER:
-						Iris::Memory mem (arg)
-						Iris::Caps ret = mem.create_caps (3)
-						Iris::Cap target = Iris::my_receiver.create_capability (Iris::Num (0, 1))
-						ret.set (0, target.copy ())
-						ret.set (1, mem)
-						Iris::free_cap (target)
-						for unsigned i = 0; i < 320 * 240 * 4; i += PAGE_SIZE:
-							Iris::Page p = Iris::my_memory.mapping ((void *)(0x15000 + i))
-							Iris::Page t = mem.create_page ()
-							t.set_flags (Iris::Page::PAYING, Iris::Page::PAYING)
-							p.share (t, Iris::Page::FORGET)
-							mem.map (t, 0x15000 + i)
-							Iris::my_memory.destroy (t)
-							Iris::free_cap (t)
-							Iris::free_cap (p)
-						reply.invoke (0, 0, ret.copy ())
-						Iris::free_cap (ret)
-						break
-					case Iris::Device::DESTROY_USER:
-						Iris::panic (0, "destroying emulation user")
-					case Iris::Device::USE:
-					case Iris::Device::UNUSE:
-						reply.invoke ()
-						break
-					default:
-						kdebug_num (Iris::recv.data[0].l)
-						kdebug ("\n")
-						Iris::panic (0, "invalid emulation command")
-				break
-			case 1:
-				switch Iris::recv.data[0].l:
-					case Iris::Display::SET_EOF_CB:
-						real.set_eof_cb (arg.copy ())
-						while Iris::recv.data[0].l != 0:
-							Iris::my_parent.wait <Iris::Display> (0)
-							real.set_eof_cb (arg.copy ())
-						reply.invoke ()
-						break
-					default:
-						kdebug_num (Iris::recv.data[0].l)
-						kdebug_char ('\n')
-						Iris::panic (Iris::recv.data[0].l, "invalid operation on display emulation")
-				break
-			default:
-				Iris::panic (0, "bug in display emulation")
-		Iris::free_cap (arg)
-		Iris::free_cap (reply)

source/elfrun.ccp

@@ -234,53 +234,47 @@ static Iris::Caps run (Iris::Caps data, Iris::Memory parent_memory, Iris::Cap pa
 Iris::Num start ():
 	kdebug ("elfrun started.\n")
 	init_alloc ()
-	Iris::Device dev = Iris::my_receiver.create_capability (0)
+	Iris::Elfrun dev = Iris::my_receiver.create_capability (0)
 	Iris::my_parent.provide_device <Iris::Elfrun> (dev.copy ())
+	Iris::free_cap (dev)
 
-	unsigned user = ~0
 	while true:
 		Iris::wait ()
 		Iris::Cap reply = Iris::get_reply ()
 		Iris::Cap arg = Iris::get_arg ()
-		Iris::print_caps ()
-		switch Iris::recv.protected_data.h:
-			case 0:
-				Iris::Device::host (1, user, reply, arg)
+		switch Iris::recv.data[0].l:
+			case Iris::Elfrun::RUN_STRING:
+				unsigned num_slots = Iris::recv.data[1].l
+				unsigned num_caps = Iris::recv.data[1].h
+				parent_memory = Iris::Caps (arg).get (Iris::Elfrun::PARENT_MEMORY)
+				parent = Iris::Caps (arg).get (Iris::Elfrun::PARENT)
+				Iris::String data = Iris::Caps (arg).get (Iris::Elfrun::DATA)
+				map_string (data)
+				Iris::Caps ret = run (data, parent_memory, parent, num_slots, num_caps)
+				reply.invoke (0, 0, ret.copy ())
+				free_cap (ret)
+				free_cap (parent_memory)
+				free_cap (parent)
+				free_cap (data)
 				break
-			case 1:
-				switch Iris::recv.data[0].l:
-					case Iris::Elfrun::RUN_STRING:
-						unsigned num_slots = Iris::recv.data[1].l
-						unsigned num_caps = Iris::recv.data[1].h
-						parent_memory = Iris::Caps (arg).get (Iris::Elfrun::PARENT_MEMORY)
-						parent = Iris::Caps (arg).get (Iris::Elfrun::PARENT)
-						Iris::String data = Iris::Caps (arg).get (Iris::Elfrun::DATA)
-						map_string (data)
-						Iris::Caps ret = run (data, parent_memory, parent, num_slots, num_caps)
-						reply.invoke (0, 0, ret.copy ())
-						free_cap (ret)
-						free_cap (parent_memory)
-						free_cap (parent)
-						free_cap (data)
-						break
-					case Iris::Elfrun::RUN_CAPS:
-						unsigned num_slots = Iris::recv.data[1].l
-						unsigned num_caps = Iris::recv.data[1].h
-						unsigned p = Iris::recv.data[0].h
-						parent_memory = Iris::Caps (arg).get (Iris::Elfrun::PARENT_MEMORY)
-						parent = Iris::Caps (arg).get (Iris::Elfrun::PARENT)
-						Iris::Caps data = Iris::Caps (arg).get (Iris::Elfrun::DATA)
-						map_caps (data, p)
-						Iris::Caps ret = run (data, parent_memory, parent, num_slots, num_caps)
-						reply.invoke (0, 0, ret.copy ())
-						free_cap (ret)
-						free_cap (parent_memory)
-						free_cap (parent)
-						free_cap (data)
-						break
-					default:
-						Iris::panic (0, "invalid operation for elfrun")
-						reply.invoke (~0)
-						break
-				Iris::free_cap (arg)
-				Iris::free_cap (reply)
+			case Iris::Elfrun::RUN_CAPS:
+				unsigned num_slots = Iris::recv.data[1].l
+				unsigned num_caps = Iris::recv.data[1].h
+				unsigned p = Iris::recv.data[0].h
+				parent_memory = Iris::Caps (arg).get (Iris::Elfrun::PARENT_MEMORY)
+				parent = Iris::Caps (arg).get (Iris::Elfrun::PARENT)
+				Iris::Caps data = Iris::Caps (arg).get (Iris::Elfrun::DATA)
+				map_caps (data, p)
+				Iris::Caps ret = run (data, parent_memory, parent, num_slots, num_caps)
+				reply.invoke (0, 0, ret.copy ())
+				free_cap (ret)
+				free_cap (parent_memory)
+				free_cap (parent)
+				free_cap (data)
+				break
+			default:
+				Iris::panic (0, "invalid operation for elfrun")
+				reply.invoke (~0)
+				break
+		Iris::free_cap (arg)
+		Iris::free_cap (reply)

source/lcd.ccp

@@ -369,7 +369,7 @@ Iris::Num start ():
 	Iris::free_cap (backlight)
 
 	// Register the display device.
-	Iris::Cap display = Iris::my_receiver.create_capability (LCD)
+	Iris::Display display = Iris::my_receiver.create_capability (LCD)
 	Iris::my_parent.provide_device <Iris::Display> (display.copy ())
 	Iris::free_cap (display)
 	Iris::my_parent.init_done ()
@@ -377,46 +377,25 @@ Iris::Num start ():
 	Iris::Cap eof_cb
 	bool have_eof = false
 	is_on = true
-	unsigned lcd_user = 0
-	unsigned current_backlight = 0
 	while true:
 		Iris::wait ()
 		//log_msg ()
-		switch Iris::recv.protected_data.h:
-			case 0:
-				switch Iris::recv.protected_data.l:
-					case IRQ_LCD:
-						have_eof = false
-						eof_cb.invoke ()
-						Iris::free_cap (eof_cb)
-						break
-					#if defined (TRENDTAC)
-					case LOG:
-						log_char (Iris::recv.data[0].l)
-						break
-					#endif
-					case BACKLIGHT:
-						Iris::Cap reply = Iris::get_reply ()
-						Iris::Cap arg = Iris::get_arg ()
-						Iris::Device::host (BACKLIGHT, current_backlight, reply, arg)
-						break
-					case LCD:
-						Iris::Cap reply = Iris::get_reply ()
-						Iris::Cap arg = Iris::get_arg ()
-						Iris::Device::host (LCD, lcd_user, reply, arg, 3, create, destroy, use, unuse)
-						break
-					default:
-						Iris::panic (Iris::recv.protected_data.l, "invalid operation for master lcd")
-						break
+		switch Iris::recv.protected_data.l:
+			case IRQ_LCD:
+				have_eof = false
+				eof_cb.invoke ()
+				Iris::free_cap (eof_cb)
 				break
+			#if defined (TRENDTAC)
+			case LOG:
+				log_char (Iris::recv.data[0].l)
+				break
+			#endif
 			case BACKLIGHT:
-				if current_backlight != Iris::recv.protected_data.l:
-					log_char ('&')
-					log_num (current_backlight)
-					log_num (Iris::recv.protected_data)
-					log_char ('\n')
-					break
 				switch Iris::recv.data[0].l:
+					case Iris::Device::RESET:
+						Iris::recv.reply.invoke ()
+						break
 					case Iris::Setting::SET:
 						// TODO
 						unsigned state = Iris::recv.data[1].l
@@ -444,11 +423,10 @@ Iris::Num start ():
 						break
 				break
 			case LCD:
-				if descriptor.frame != Iris::recv.protected_data.l:
-					//Iris::panic (0, "invalid user requesting lcd")
-					Iris::recv.reply.invoke (~0)
-					break
 				switch Iris::recv.data[0].l:
+					case Iris::Device::RESET:
+						Iris::recv.reply.invoke ()
+						break
 					case Iris::Display::SET_EOF_CB:
 						Iris::Cap reply = Iris::get_reply ()
 						Iris::Cap arg = Iris::get_arg ()
@@ -469,5 +447,5 @@ Iris::Num start ():
 						Iris::panic (Iris::recv.data[0].l, "invalid operation for lcd")
 				break
 			default:
-				Iris::panic (0, "invalid master operation type for lcd")
+				Iris::panic (0, "invalid operation type for lcd")
 				break

source/nanonote-gpio.ccp

@@ -211,50 +211,30 @@ Iris::Num start ():
 	Iris::my_parent.init_done ()
 	if kbd.scanning ():
 		Iris::my_receiver.set_alarm (SCAN_INTERVAL)
-	unsigned user (0), power_user (0)
-	unsigned next_user (0)
 	Iris::register_interrupt (IRQ_GPIO3)
 	while true:
 		Iris::wait ()
-		switch Iris::recv.protected_data.h:
-			case ~0:
-				// Alarm.
+		if Iris::recv.protected_data.h == ~0:
+			// Alarm.
+			kbd.scan ()
+			if kbd.scanning ():
+				Iris::my_receiver.set_alarm (SCAN_INTERVAL)
+			continue
+		switch Iris::recv.protected_data.l:
+			case IRQ_GPIO3:
+				// Interrupt.
+				pwr.scan ()
 				kbd.scan ()
 				if kbd.scanning ():
 					Iris::my_receiver.set_alarm (SCAN_INTERVAL)
-				break
-			case 0:
-				switch Iris::recv.protected_data.l:
-					case IRQ_GPIO3:
-						// Interrupt.
-						pwr.scan ()
-						kbd.scan ()
-						if kbd.scanning ():
-							Iris::my_receiver.set_alarm (SCAN_INTERVAL)
-						Iris::register_interrupt (IRQ_GPIO3)
-						break
-					case PWR:
-						// Power button request.
-						Iris::Cap reply = Iris::get_reply ()
-						Iris::Cap arg = Iris::get_arg ()
-						Iris::Device::host (PWR, power_user, reply, arg)
-						break
-					case KBD_DEV:
-						// Keyboard device control request.
-						Iris::Cap reply = Iris::get_reply ()
-						Iris::Cap arg = Iris::get_arg ()
-						Iris::Device::host (KBD_DEV, user, reply, arg)
-						break
-					default:
-						break
+				Iris::register_interrupt (IRQ_GPIO3)
 				break
 			case KBD_DEV:
 				// Keyboard device user request.
-				if Iris::recv.protected_data.l != user:
-					kdebug ("invalid user requesting keyboard\n")
-					Iris::recv.reply.invoke ()
-					break
 				switch Iris::recv.data[0].l:
+					case Iris::Device::RESET:
+						Iris::recv.reply.invoke ()
+						break
 					case Iris::Keyboard::SET_CB:
 						Iris::Cap reply = Iris::get_reply ()
 						kbd.active (Iris::get_arg ())
@@ -272,11 +252,10 @@ Iris::Num start ():
 						break
 				break
 			case PWR:
-				if Iris::recv.protected_data.l != power_user:
-					kdebug ("invalid user requesting power\n")
-					Iris::recv.reply.invoke ()
-					break
 				switch Iris::recv.data[0].l:
+					case Iris::Device::RESET:
+						Iris::recv.reply.invoke ()
+						break
 					case Iris::Keyboard::SET_CB:
 						Iris::Cap reply = Iris::get_reply ()
 						pwr.set_cb (Iris::get_arg ())