Index: uspace/app/tester/devmap/devmap1.c
===================================================================
--- uspace/app/tester/devmap/devmap1.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
+++ uspace/app/tester/devmap/devmap1.c	(revision ee1b8ca73ee74edd4f777249bab470594b67a438)
@@ -50,6 +50,7 @@
 	int retval;
 	
-	printf("connected: method=%u arg1=%u, arg2=%u arg3=%u.\n", IPC_GET_METHOD(*icall), 
-		IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall), IPC_GET_ARG3(*icall));
+	printf("connected: method=%u arg1=%u, arg2=%u arg3=%u.\n",
+	    IPC_GET_METHOD(*icall), IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall),
+	    IPC_GET_ARG3(*icall));
 
 	printf("driver_client_connection.\n");
@@ -60,6 +61,7 @@
 		callid = async_get_call(&call);
 		retval = EOK;
-		printf("method=%u arg1=%u, arg2=%u arg3=%u.\n", IPC_GET_METHOD(call), 
-			IPC_GET_ARG1(call), IPC_GET_ARG2(call), IPC_GET_ARG3(call));
+		printf("method=%u arg1=%u, arg2=%u arg3=%u.\n",
+		    IPC_GET_METHOD(call), IPC_GET_ARG1(call),
+		    IPC_GET_ARG2(call), IPC_GET_ARG3(call));
 		switch (IPC_GET_METHOD(call)) {
 		case IPC_M_PHONE_HUNGUP:
@@ -67,5 +69,6 @@
 			return;
 		default:
-			printf("Unknown device method %u.\n", IPC_GET_METHOD(call));
+			printf("Unknown device method %u.\n",
+			    IPC_GET_METHOD(call));
 			retval = ENOENT;
 		}
@@ -82,10 +85,10 @@
 	handle = (int)arg;
 
-	device_phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, \
-		DEVMAP_CONNECT_TO_DEVICE, handle);
+	device_phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
+	    DEVMAP_CONNECT_TO_DEVICE, handle);
 
 	if (device_phone < 0) {
-		printf("Failed to connect to devmap as client (handle = %u).\n", 
-			handle);
+		printf("Failed to connect to devmap as client (handle = %u).\n",
+		    handle);
 		return -1;
 	}
@@ -130,16 +133,15 @@
 	ipcarg_t callback_phonehash;
 
-	phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
-		DEVMAP_DRIVER, 0);
+	phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_DRIVER, 0);
 
 	while (phone < 0) {
 		usleep(100000);
 		phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
-			DEVMAP_DRIVER, 0);
+		    DEVMAP_DRIVER, 0);
 	}
 	
 	req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
 
-	retval = ipc_data_send(phone, (char *)name, strlen(name) + 1); 
+	retval = ipc_data_write_send(phone, (char *)name, strlen(name) + 1); 
 
 	if (retval != EOK) {
@@ -171,7 +173,8 @@
 	ipc_call_t answer;
 
-	req = async_send_2(driver_phone, DEVMAP_DEVICE_GET_HANDLE, 0, 0, &answer);
-
-	retval = ipc_data_send(driver_phone, name, strlen(name) + 1); 
+	req = async_send_2(driver_phone, DEVMAP_DEVICE_GET_HANDLE, 0, 0,
+	    &answer);
+
+	retval = ipc_data_write_send(driver_phone, name, strlen(name) + 1); 
 
 	if (retval != EOK) {
@@ -192,5 +195,6 @@
 			*handle = (int) IPC_GET_ARG1(answer);
 		}
-		printf("Device '%s' has handle %u.\n", name, (int) IPC_GET_ARG1(answer));
+		printf("Device '%s' has handle %u.\n", name,
+		    (int) IPC_GET_ARG1(answer));
 	} else {
 		printf("Failed to get handle for device '%s'.\n", name);
@@ -213,5 +217,6 @@
 	req = async_send_2(driver_phone, DEVMAP_DEVICE_REGISTER, 0, 0, &answer);
 
-	retval = ipc_data_send(driver_phone, (char *)name, strlen(name) + 1); 
+	retval = ipc_data_write_send(driver_phone, (char *)name,
+	    strlen(name) + 1); 
 
 	if (retval != EOK) {
@@ -232,5 +237,6 @@
 			*handle = (int) IPC_GET_ARG1(answer);
 		}
-		printf("Device registered with handle %u.\n", (int) IPC_GET_ARG1(answer));
+		printf("Device registered with handle %u.\n",
+		    (int) IPC_GET_ARG1(answer));
 	}