noux: adaptation to new component environment

Issue genodelabs#1832
chelmuth · Feb 29, 2016 · 6dda3cf · 6dda3cf
1 parent 99f0389
commit 6dda3cf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/repos/ports/run/noux_bash.run b/repos/ports/run/noux_bash.run
@@ -14,8 +14,6 @@ set build_components {
 	drivers/framebuffer drivers/input
 	server/terminal server/ram_fs
 	test/libports/ncurses
-
-	drivers/rtc
 }
 
 lappend_if [use_usb_input]  build_components drivers/usb
@@ -73,10 +71,6 @@ append config {
 		<start name="timer">
 			<resource name="RAM" quantum="1M"/>
 			<provides><service name="Timer"/></provides>
-		</start>
-		<start name="rtc_drv">
-			<resource name="RAM" quantum="1M"/>
-			<provides><service name="Rtc"/></provides>
 		</start>}
 
 append_if [have_spec sdl] config {
@@ -167,7 +161,7 @@ append config {
 				<dir name="ram"> <fs label="root" /> </dir>
 				<dir name="tmp"> <fs label="tmp" /> </dir>
 
-				<dir name="dev"> <rtc/> <zero/> <null/> </dir>
+				<dir name="dev"> <zero/> <null/> </dir>
 
 			</fstab>
 			<start name="/bin/bash">
@@ -190,7 +184,6 @@ set boot_modules {
 	core init timer ld.lib.so noux terminal ram_fs
 	libc.lib.so libm.lib.so libc_noux.lib.so ncurses.lib.so
 	bash.tar coreutils.tar vim.tar
-	rtc_drv
 }
 
 # platform-specific modules

diff --git a/repos/ports/src/noux/cpu_session_component.h b/repos/ports/src/noux/cpu_session_component.h
@@ -74,18 +74,13 @@ namespace Noux {
 			Thread_capability create_thread(size_t weight, Name const &name,
 			                                addr_t utcb)
 			{
-				/*
-				 * Prevent any attempt to create more than the main
-				 * thread.
-				 */
-				if (_main_thread.valid()) {
-					PWRN("Invalid attempt to create a thread besides main");
-					while (1);
-					return Thread_capability();
+				if (!_main_thread.valid()) {
+					_main_thread = _cpu.create_thread(weight, name, utcb);
+					return _main_thread;
 				}
-				_main_thread = _cpu.create_thread(weight, name, utcb);
 
-				return _main_thread;
+				/* create non-main thread */
+				return _cpu.create_thread(weight, name, utcb);
 			}
 
 			Ram_dataspace_capability utcb(Thread_capability thread) {

diff --git a/repos/ports/src/noux/main.cc b/repos/ports/src/noux/main.cc
@@ -1139,7 +1139,7 @@ int main(int argc, char **argv)
 
 	/* whitelist of service requests to be routed to the parent */
 	static Genode::Service_registry parent_services;
-	char const *service_names[] = { "LOG", "ROM", "Timer", 0 };
+	char const *service_names[] = { "LOG", "ROM", "CAP", "Timer", 0 };
 	for (unsigned i = 0; service_names[i]; i++)
 		parent_services.insert(new Genode::Parent_service(service_names[i]));