From 4f69bd9fb8924794b65412ee251823a99d5eb695 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Tue, 22 Jan 2013 12:36:13 +0100
Subject: [PATCH] Remove timer from hello run script (fix #629)

Currently, the hello run script of the hello_tutorial misses some services the
timer driver needs on various platforms. The hello_tutorial is meant for
educational purposes only. So it's desireable to keep it simple. Instead of
complexifying the configuration, this commit just removes the timer from the
example.
---
 hello_tutorial/run/hello.run            | 5 +----
 hello_tutorial/src/hello/client/main.cc | 5 -----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/hello_tutorial/run/hello.run b/hello_tutorial/run/hello.run
index 075bceb52..e93430e40 100644
--- a/hello_tutorial/run/hello.run
+++ b/hello_tutorial/run/hello.run
@@ -15,14 +15,11 @@ install_config {
 	<parent-provides>
 		<service name="CAP"/>
 		<service name="LOG"/>
+		<service name="RM"/>
 	</parent-provides>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
 	</default-route>
-	<start name="timer">
-		<resource name="RAM" quantum="1M"/>
-		<provides><service name="Timer"/></provides>
-	</start>
 	<start name="hello_server">
 		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Hello"/></provides>
diff --git a/hello_tutorial/src/hello/client/main.cc b/hello_tutorial/src/hello/client/main.cc
index c3a69b172..daa4dc91d 100644
--- a/hello_tutorial/src/hello/client/main.cc
+++ b/hello_tutorial/src/hello/client/main.cc
@@ -14,7 +14,6 @@
 #include <base/env.h>
 #include <base/printf.h>
 #include <hello_session/client.h>
-#include <timer_session/connection.h>
 #include <hello_session/connection.h>
 
 using namespace Genode;
@@ -23,15 +22,11 @@ int main(void)
 {
 	Hello::Connection h;
 
-	Timer::Connection timer;
-
 	while (1) {
 		h.say_hello();
-		timer.msleep(1000);
 
 		int foo = h.add(2, 5);
 		PDBG("Added 2 + 5 = %d", foo);
-		timer.msleep(1000);
 	}
 
 	return 0;