Index: ns/ns.c
===================================================================
--- ns/ns.c	(revision 108602edcc3c9087905062b8132e7aa21999ee3a)
+++ ns/ns.c	(revision ec153a05a58461d65a28c1f1bec1a537ed89ad7e)
@@ -72,26 +72,4 @@
 } hashed_service_t;
 
-/*
-irq_cmd_t msim_cmds[1] = {
-	{ CMD_MEM_READ_1, (void *)0xB0000000, 0 }
-};
-
-irq_code_t msim_kbd = {
-	1,
-	msim_cmds
-};
-*/
-/*
-irq_cmd_t i8042_cmds[1] = {
-	{ CMD_PORT_READ_1, (void *)0x60, 0 }
-};
-
-irq_code_t i8042_kbd = {
-	1,
-	i8042_cmds
-};
-*/
-
-
 int static ping_phone;
 
@@ -110,16 +88,13 @@
 		return ENOMEM;
 	}
-	
-	
-//	ipc_register_irq(2, &msim_kbd);
-//	ipc_register_irq(1, &i8042_kbd);
+		
 	while (1) {
 		callid = ipc_wait_for_call(&call, 0);
-		printf("NS: Call in_phone_hash=%lX...", call.in_phone_hash);
+//		printf("NS: Call in_phone_hash=%lX...", call.in_phone_hash);
 		switch (IPC_GET_METHOD(call)) {
 		case IPC_M_AS_SEND:
 			as = (char *)IPC_GET_ARG2(call);
 			printf("Received as: %P, size:%d\n", as, IPC_GET_ARG3(call));
-			retval = ipc_answer(callid, 0,(sysarg_t)(1024*1024), 0);
+			retval = ipc_answer_fast(callid, 0,(sysarg_t)(1024*1024), 0);
 			if (!retval) {
 				printf("Reading shared memory...");
@@ -171,6 +146,6 @@
 		}
 		if (! (callid & IPC_CALLID_NOTIFICATION)) {
-			printf("Answering.\n");
-			ipc_answer(callid, retval, arg1, arg2);
+//			printf("Answering.\n");
+			ipc_answer_fast(callid, retval, arg1, arg2);
 		}
 	}
@@ -228,5 +203,5 @@
 	hlp = hash_table_find(&ns_hash_table, keys);
 	if (!hlp) {
-		printf("Service %d not registered.\n", service);
+//		printf("Service %d not registered.\n", service);
 		return ENOENT;
 	}