Index: uspace/app/usb/example.c
===================================================================
--- uspace/app/usb/example.c	(revision efedee77fb501f874d3f1d14038169bcca374afc)
+++ uspace/app/usb/example.c	(revision 1d1f8944ede1a0aa44224dfdbf374178bcb040a0)
@@ -82,62 +82,4 @@
 }
 
-static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
-	ipc_answer_0(iid, EOK);
-	//printf("%s: client connection()\n", NAME);
-	
-	while (true) {
-		ipc_callid_t callid; 
-		ipc_call_t call; 
-		int rc;
-		void * buffer;
-		size_t len;
-		
-		callid = async_get_call(&call);
-		
-		switch (IPC_GET_METHOD(call)) {
-			case IPC_M_USB_HCD_DATA_SENT:
-				printf("%s: >> Data sent over USB (handle %d, outcome %s).\n",
-				    NAME, IPC_GET_ARG1(call),
-				    usb_str_transaction_outcome(IPC_GET_ARG2(call)));
-				ipc_answer_0(callid, EOK);
-				break;
-				
-			case IPC_M_USB_HCD_DATA_RECEIVED:
-				printf("%s: << Data received over USB (handle %d, outcome %s).\n",
-				    NAME, IPC_GET_ARG1(call),
-				    usb_str_transaction_outcome(IPC_GET_ARG2(call)));
-				if (IPC_GET_ARG2(call) != USB_OUTCOME_OK) {
-					ipc_answer_0(callid, EOK);
-					break;
-				}
-				len = IPC_GET_ARG3(call);
-				if (len > 0) {
-					rc = async_data_write_accept(&buffer, false,
-					    1, MAX_SIZE_RECEIVE,
-					    0, &len);
-					if (rc != EOK) {
-						ipc_answer_0(callid, rc);
-						break;
-					}
-					free(buffer);
-				}
-				printf("%s: << Received %uB long buffer (handle %d).\n",
-				    NAME, len, IPC_GET_ARG1(call));
-				ipc_answer_0(callid, EOK);
-				break;
-				
-			case IPC_M_PHONE_HUNGUP:
-				//printf("%s: hang-up.\n", NAME);
-				return;
-				
-			default:
-				printf("%s: method %d called.\n", NAME, IPC_GET_METHOD(call));
-				ipc_answer_0(callid, EOK);
-				break;
-		}
-	}
-}
-
 static void data_dump(uint8_t *data, size_t len)
 {
@@ -154,5 +96,5 @@
 int main(int argc, char * argv[])
 {
-	int hcd_phone = usb_hcd_create_phones(DEV_HCD_NAME, client_connection);
+	int hcd_phone = usb_hcd_connect(DEV_HCD_NAME);
 	if (hcd_phone < 0) {
 		printf("%s: Unable to start comunication with HCD at usb://%s (%d: %s).\n",
@@ -233,26 +175,4 @@
 	
 	fibril_sleep(1);
-	
-#if 0
-	int rc;
-	
-	printf("%s: usb_hcd_transfer_control_write_setup(...)\n", NAME);
-	rc = usb_hcd_transfer_control_write_setup(hcd_phone, target,
-	    &setup_packet, sizeof(setup_packet), NULL);
-	if (rc != EOK) {
-		printf("%s: failed setting address (%d).\n", NAME, rc);
-		return rc;
-	}
-	
-	printf("%s: usb_hcd_transfer_control_write_status(...)\n", NAME);
-	rc = usb_hcd_transfer_control_write_status(hcd_phone, target, NULL);
-	if (rc != EOK) {
-		printf("%s: failed completing control transfer (%d).\n", NAME, rc);
-		return rc;
-	}
-	
-	printf("%s: sleeping for a while...\n", NAME);
-	fibril_sleep(5);
-#endif
 
 	printf("%s: exiting.\n", NAME);
Index: uspace/app/virtusbkbd/virtusbkbd.c
===================================================================
--- uspace/app/virtusbkbd/virtusbkbd.c	(revision efedee77fb501f874d3f1d14038169bcca374afc)
+++ uspace/app/virtusbkbd/virtusbkbd.c	(revision 1d1f8944ede1a0aa44224dfdbf374178bcb040a0)
@@ -58,5 +58,5 @@
 #define NAME "virt-usb-kbd"
 
-#define DEV_HCD_NAME "hcd-virt"
+#define DEV_HCD_NAME "hcd-virt-dev"
 
 #define __QUOTEME(x) #x