Index: uspace/drv/uhci-rhd/main.c
===================================================================
--- uspace/drv/uhci-rhd/main.c	(revision 4abc304ad9746878e6ac0f52927611953d8ac861)
+++ uspace/drv/uhci-rhd/main.c	(revision dced52af3bee58828a4b524068bd68da26c46c60)
@@ -116,5 +116,5 @@
 int main(int argc, char *argv[])
 {
-	usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+	usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 	return ddf_driver_main(&uhci_rh_driver);
 }
Index: uspace/drv/uhci-rhd/port.c
===================================================================
--- uspace/drv/uhci-rhd/port.c	(revision 4abc304ad9746878e6ac0f52927611953d8ac861)
+++ uspace/drv/uhci-rhd/port.c	(revision dced52af3bee58828a4b524068bd68da26c46c60)
@@ -71,10 +71,11 @@
 	port->checker = fibril_create(uhci_port_check, port);
 	if (port->checker == 0) {
-		usb_log_error(": failed to launch root hub fibril.");
+		usb_log_error("Port(%p - %d): failed to launch root hub fibril.",
+		    port->address, port->number);
 		return ENOMEM;
 	}
 	fibril_add_ready(port->checker);
-	usb_log_debug(
-	  "Added fibril for port %d: %p.\n", number, port->checker);
+	usb_log_debug("Port(%p - %d): Added fibril. %x\n",
+	    port->address, port->number, port->checker);
 	return EOK;
 }
@@ -92,7 +93,7 @@
 	uhci_port_t *port_instance = port;
 	assert(port_instance);
-	port_status_write(port_instance->address, 0);
-
-	uint64_t count = 0;
+//	port_status_write(port_instance->address, 0);
+
+	unsigned count = 0;
 
 	while (1) {
@@ -106,12 +107,12 @@
 		static fibril_mutex_t dbg_mtx = FIBRIL_MUTEX_INITIALIZER(dbg_mtx);
 		fibril_mutex_lock(&dbg_mtx);
-		usb_log_debug("Port %d status at %p: 0x%04x. === %llu\n",
-		  port_instance->number, port_instance->address, port_status, count++);
+		usb_log_debug2("Port(%p - %d): Status: %#04x. === %u\n",
+		  port_instance->address, port_instance->number, port_status, count++);
 //		print_port_status(port_status);
 		fibril_mutex_unlock(&dbg_mtx);
 
 		if ((port_status & STATUS_CONNECTED_CHANGED) != 0) {
-			usb_log_debug("Change detected on port %d: %x.\n",
-			    port_instance->number, port_status);
+			usb_log_debug("Port(%p - %d): Connected change detected: %x.\n",
+			    port_instance->address, port_instance->number, port_status);
 
 
@@ -119,5 +120,6 @@
 			    &port_instance->hc_connection);
 			if (rc != EOK) {
-				usb_log_error("Failed to connect to HC.");
+				usb_log_error("Port(%p - %d): Failed to connect to HC.",
+				    port_instance->address, port_instance->number);
 				continue;
 			}
@@ -125,6 +127,6 @@
 			/* remove any old device */
 			if (port_instance->attached_device) {
-				usb_log_debug("Removing device on port %d.\n",
-				    port_instance->number);
+				usb_log_debug("Port(%p - %d): Removing device.\n",
+				    port_instance->address, port_instance->number);
 				uhci_port_remove_device(port_instance);
 			}
@@ -136,6 +138,6 @@
 				/* ack changes by writing one to WC bits */
 				port_status_write(port_instance->address, port_status);
-				usb_log_debug("Change status ack on port %d.\n",
-						port_instance->number);
+				usb_log_debug("Port(%p - %d): Change status ACK.\n",
+						port_instance->address, port_instance->number);
 			}
 
@@ -143,5 +145,6 @@
 			    &port_instance->hc_connection);
 			if (rc != EOK) {
-				usb_log_error("Failed to disconnect from HC.");
+				usb_log_error("Port(%p - %d): Failed to disconnect from HC.",
+				    port_instance->address, port_instance->number);
 			}
 		}
@@ -160,5 +163,6 @@
 	uhci_port_t *port = (uhci_port_t *) arg;
 
-	usb_log_debug("new_device_enable_port(%d)\n", port->number);
+	usb_log_debug2("Port(%p - %d): new_device_enable_port.\n",
+	    port->address, port->number);
 
 	/*
@@ -173,6 +177,6 @@
 	 */
 	{
-		usb_log_debug("Reset Signal start on port %d.\n",
-		    port->number);
+		usb_log_debug("Port(%p - %d): Reset Signal start.\n",
+		    port->address, port->number);
 		port_status_t port_status =
 			port_status_read(port->address);
@@ -184,6 +188,6 @@
 		port_status &= ~STATUS_IN_RESET;
 		port_status_write(port->address, port_status);
-		usb_log_debug("Reset Signal stop on port %d.\n",
-		    port->number);
+		usb_log_debug("Port(%p - %d): Reset Signal stop.\n",
+		    port->address, port->number);
 	}
 
@@ -200,5 +204,6 @@
 	assert(usb_hc_connection_is_opened(&port->hc_connection));
 
-	usb_log_info("Detected new device on port %u.\n", port->number);
+	usb_log_info("Port(%p-%d): Detected new device.\n",
+	    port->address, port->number);
 
 	usb_address_t dev_addr;
@@ -209,12 +214,12 @@
 
 	if (rc != EOK) {
-		usb_log_error("Failed adding new device on port %u: %s.\n",
-		    port->number, str_error(rc));
+		usb_log_error("Port(%p-%d): Failed(%d) adding new device: %s.\n",
+		    port->address, port->number, rc, str_error(rc));
 		uhci_port_set_enabled(port, false);
 		return rc;
 	}
 
-	usb_log_info("New device on port %u has address %d (handle %zu).\n",
-	    port->number, dev_addr, port->attached_device);
+	usb_log_info("Port(%p-%d): New device has address %d (handle %zu).\n",
+	    port->address, port->number, dev_addr, port->attached_device);
 
 	return EOK;
@@ -224,6 +229,6 @@
 static int uhci_port_remove_device(uhci_port_t *port)
 {
-	usb_log_error("Don't know how to remove device %#x.\n",
-		(unsigned int)port->attached_device);
+	usb_log_error("Port(%p-%d): Don't know how to remove device %#x.\n",
+		port->address, port->number, (unsigned int)port->attached_device);
 //	uhci_port_set_enabled(port, false);
 	return EOK;
@@ -246,6 +251,6 @@
 	port_status_write(port->address, port_status);
 
-	usb_log_info("%s port %d.\n",
-	  enabled ? "Enabled" : "Disabled", port->number);
+	usb_log_info("Port(%p-%d): %sabled port.\n",
+		port->address, port->number, enabled ? "En" : "Dis");
 	return EOK;
 }
Index: uspace/drv/uhci-rhd/root_hub.c
===================================================================
--- uspace/drv/uhci-rhd/root_hub.c	(revision 4abc304ad9746878e6ac0f52927611953d8ac861)
+++ uspace/drv/uhci-rhd/root_hub.c	(revision dced52af3bee58828a4b524068bd68da26c46c60)
@@ -46,15 +46,9 @@
 	assert(rh);
 	int ret;
-	ret = usb_hc_find(rh->handle, &instance->hc_handle);
-	usb_log_info("rh found(%d) hc handle: %d.\n", ret, instance->hc_handle);
-	if (ret != EOK) {
-		return ret;
-	}
 
 	/* allow access to root hub registers */
 	assert(sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT == size);
 	port_status_t *regs;
-	ret = pio_enable(
-	  addr, sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT, (void**)&regs);
+	ret = pio_enable(addr, size, (void**)&regs);
 
 	if (ret < 0) {
@@ -67,5 +61,5 @@
 	for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
 		/* mind pointer arithmetics */
-		int ret = uhci_port_init(
+		ret = uhci_port_init(
 		  &instance->ports[i], regs + i, i, ROOT_HUB_WAIT_USEC, rh);
 		if (ret != EOK) {