Index: init/init.c
===================================================================
--- init/init.c	(revision 7048773f605ab3aa8b8a1306fe2ef177a2b3049f)
+++ init/init.c	(revision 07824fda7b0f391520ba09d63f6597347ecb1bb2)
@@ -113,9 +113,10 @@
 	int retval;
 
+	printf("Pinging\n");
 	retval = ipc_call_sync(PHONE_NS, NS_PING, 0xbeef,&result);
 	printf("Retval: %d - received: %P\n", retval, result);
 }
 
-static void got_answer(void *private, int retval, ipc_data_t *data)
+static void got_answer(void *private, int retval, ipc_call_t *data)
 {
 	printf("Retval: %d...%s...%zX, %zX\n", retval, private,
@@ -149,5 +150,5 @@
 
 
-static void got_answer_2(void *private, int retval, ipc_data_t *data)
+static void got_answer_2(void *private, int retval, ipc_call_t *data)
 {
 	printf("Pong\n");
@@ -156,5 +157,5 @@
 {
 	int res;
-	unsigned long long taskid;
+	ipcarg_t phonead;
 	ipc_callid_t callid;
 	ipc_call_t data;
@@ -162,6 +163,6 @@
 
 	printf("Asking 0 to connect to me...\n");
-	res = ipc_connect_to_me(0, 1, 2, &taskid);
-	printf("Result: %d - taskid: %llu\n", res, taskid);
+	res = ipc_connect_to_me(0, 1, 2, &phonead);
+	printf("Result: %d - phonead: %llu\n", res, phonead);
 	for (i=0; i < 100; i++) {
 		printf("----------------\n");
@@ -179,4 +180,5 @@
 	int res;
 	ipcarg_t result;
+	int phoneid;
 
 	printf("Starting connect...\n");
@@ -253,9 +255,9 @@
 //	test_connection_ipc();
 //	test_hangup();
-	test_slam();
-
-//	if ((tid = thread_create(utest, NULL, "utest") != -1)) {
-//		printf("Created thread tid=%d\n", tid);
-//	}
+//	test_slam();
+
+	if ((tid = thread_create(utest, NULL, "utest") != -1)) {
+		printf("Created thread tid=%d\n", tid);
+	}
 	return 0;
 }