Index: uspace/drv/ohci/batch.c
===================================================================
--- uspace/drv/ohci/batch.c	(revision 592369ae7c96d9787cb7de257390fe4ce1afd3ed)
+++ uspace/drv/ohci/batch.c	(revision 9a6fde4bb9c25bfa30c0b3c90d05987bac467574)
@@ -39,4 +39,5 @@
 
 #include "batch.h"
+#include "hcd_endpoint.h"
 #include "utils/malloc32.h"
 #include "hw_struct/endpoint_descriptor.h"
@@ -45,22 +46,31 @@
 typedef struct ohci_transfer_batch {
 	ed_t *ed;
-	td_t *tds;
+	td_t **tds;
 	size_t td_count;
+	size_t leave_td;
+	char *device_buffer;
 } ohci_transfer_batch_t;
 
 static void ohci_transfer_batch_dispose(void *ohci_batch)
 {
-	//TODO: add buffer disposal
 	ohci_transfer_batch_t *instance = ohci_batch;
-	assert(instance);
-	free32(instance->ed);
-	free32(instance->tds);
-}
-
+	if (!instance)
+		return;
+	free32(instance->device_buffer);
+	unsigned i = 0;
+	if (instance->tds) {
+		for (; i< instance->td_count; ++i) {
+			if (i != instance->leave_td)
+				free32(instance->tds[i]);
+		}
+		free(instance->tds);
+	}
+	free(instance);
+}
+/*----------------------------------------------------------------------------*/
 static void batch_control(usb_transfer_batch_t *instance,
     usb_direction_t data_dir, usb_direction_t status_dir);
 static void batch_data(usb_transfer_batch_t *instance);
-
-#define DEFAULT_ERROR_COUNT 3
+/*----------------------------------------------------------------------------*/
 usb_transfer_batch_t * batch_get(ddf_fun_t *fun, endpoint_t *ep,
     char *buffer, size_t buffer_size, char* setup_buffer, size_t setup_size,
@@ -84,11 +94,12 @@
 	    ohci_transfer_batch_dispose);
 
-	ohci_transfer_batch_t *data = malloc(sizeof(ohci_transfer_batch_t));
+	hcd_endpoint_t *hcd_ep = hcd_endpoint_get(ep);
+	assert(hcd_ep);
+
+	ohci_transfer_batch_t *data = calloc(sizeof(ohci_transfer_batch_t), 1);
 	CHECK_NULL_DISPOSE_RETURN(data, "Failed to allocate batch data.\n");
-	bzero(data, sizeof(ohci_transfer_batch_t));
 	instance->private_data = data;
 
-	/* we needs + 1 transfer descriptor as the last one won't be executed */
-	data->td_count = 1 +
+	data->td_count =
 	    ((buffer_size + OHCI_TD_MAX_TRANSFER - 1) / OHCI_TD_MAX_TRANSFER);
 	if (ep->transfer_type == USB_TRANSFER_CONTROL) {
@@ -96,23 +107,26 @@
 	}
 
-	data->tds = malloc32(sizeof(td_t) * data->td_count);
+	/* we need one extra place for td that is currently assigned to hcd_ep*/
+	data->tds = calloc(sizeof(td_t*), data->td_count + 1);
 	CHECK_NULL_DISPOSE_RETURN(data->tds,
 	    "Failed to allocate transfer descriptors.\n");
-	bzero(data->tds, sizeof(td_t) * data->td_count);
-
-	data->ed = malloc32(sizeof(ed_t));
-	CHECK_NULL_DISPOSE_RETURN(data->ed,
-	    "Failed to allocate endpoint descriptor.\n");
-
-        if (buffer_size > 0) {
-                instance->data_buffer = malloc32(buffer_size);
-                CHECK_NULL_DISPOSE_RETURN(instance->data_buffer,
+
+	data->tds[0] = hcd_ep->td;
+	data->leave_td = 0;
+	unsigned i = 1;
+	for (; i <= data->td_count; ++i) {
+		data->tds[i] = malloc32(sizeof(td_t));
+		CHECK_NULL_DISPOSE_RETURN(data->tds[i],
+		    "Failed to allocate TD %d.\n", i );
+	}
+
+	data->ed = hcd_ep->ed;
+
+        if (setup_size + buffer_size > 0) {
+		data->device_buffer = malloc32(setup_size + buffer_size);
+                CHECK_NULL_DISPOSE_RETURN(data->device_buffer,
                     "Failed to allocate device accessible buffer.\n");
-        }
-
-        if (setup_size > 0) {
-                instance->setup_buffer = malloc32(setup_size);
-                CHECK_NULL_DISPOSE_RETURN(instance->setup_buffer,
-                    "Failed to allocate device accessible setup buffer.\n");
+		instance->setup_buffer = data->device_buffer;
+		instance->data_buffer = data->device_buffer + setup_size;
                 memcpy(instance->setup_buffer, setup_buffer, setup_size);
         }
@@ -126,5 +140,5 @@
 	ohci_transfer_batch_t *data = instance->private_data;
 	assert(data);
-	size_t tds = data->td_count - 1;
+	size_t tds = data->td_count;
 	usb_log_debug("Batch(%p) checking %d td(s) for completion.\n",
 	    instance, tds);
@@ -134,20 +148,22 @@
 	size_t i = 0;
 	for (; i < tds; ++i) {
+		assert(data->tds[i] != NULL);
 		usb_log_debug("TD %d: %x:%x:%x:%x.\n", i,
-		    data->tds[i].status, data->tds[i].cbp, data->tds[i].next,
-		    data->tds[i].be);
-		if (!td_is_finished(&data->tds[i])) {
+		    data->tds[i]->status, data->tds[i]->cbp, data->tds[i]->next,
+		    data->tds[i]->be);
+		if (!td_is_finished(data->tds[i])) {
 			return false;
 		}
-		instance->error = td_error(&data->tds[i]);
+		instance->error = td_error(data->tds[i]);
 		/* FIXME: calculate real transfered size */
 		instance->transfered_size = instance->buffer_size;
 		if (instance->error != EOK) {
 			usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
-			    instance, i, data->tds[i].status);
-			return true;
-//			endpoint_toggle_set(instance->ep,
+			    instance, i, data->tds[i]->status);
+			break;
 		}
 	}
+	data->leave_td = ++i;
+	assert(data->leave_td <= data->td_count);
 	return true;
 }
@@ -220,5 +236,5 @@
 	assert(data);
 	ed_init(data->ed, instance->ep);
-	ed_add_tds(data->ed, &data->tds[0], &data->tds[data->td_count - 1]);
+//	ed_add_tds(data->ed, &data->tds[0], &data->tds[data->td_count - 1]);
 	usb_log_debug("Created ED(%p): %x:%x:%x:%x.\n", data->ed,
 	    data->ed->status, data->ed->td_tail, data->ed->td_head,
@@ -226,9 +242,9 @@
 	int toggle = 0;
 	/* setup stage */
-	td_init(&data->tds[0], USB_DIRECTION_BOTH, instance->setup_buffer,
+	td_init(data->tds[0], USB_DIRECTION_BOTH, instance->setup_buffer,
 		instance->setup_size, toggle);
-	td_set_next(&data->tds[0], &data->tds[1]);
-	usb_log_debug("Created SETUP TD: %x:%x:%x:%x.\n", data->tds[0].status,
-	    data->tds[0].cbp, data->tds[0].next, data->tds[0].be);
+	td_set_next(data->tds[0], data->tds[1]);
+	usb_log_debug("Created SETUP TD: %x:%x:%x:%x.\n", data->tds[0]->status,
+	    data->tds[0]->cbp, data->tds[0]->next, data->tds[0]->be);
 
 	/* data stage */
@@ -241,23 +257,24 @@
 		toggle = 1 - toggle;
 
-		td_init(&data->tds[td_current], data_dir, buffer,
+		td_init(data->tds[td_current], data_dir, buffer,
 		    transfer_size, toggle);
-		td_set_next(&data->tds[td_current], &data->tds[td_current + 1]);
+		td_set_next(data->tds[td_current], data->tds[td_current + 1]);
 		usb_log_debug("Created DATA TD: %x:%x:%x:%x.\n",
-		    data->tds[td_current].status, data->tds[td_current].cbp,
-		    data->tds[td_current].next, data->tds[td_current].be);
+		    data->tds[td_current]->status, data->tds[td_current]->cbp,
+		    data->tds[td_current]->next, data->tds[td_current]->be);
 
 		buffer += transfer_size;
 		remain_size -= transfer_size;
-		assert(td_current < data->td_count - 2);
+		assert(td_current < data->td_count - 1);
 		++td_current;
 	}
 
 	/* status stage */
-	assert(td_current == data->td_count - 2);
-	td_init(&data->tds[td_current], status_dir, NULL, 0, 1);
+	assert(td_current == data->td_count - 1);
+	td_init(data->tds[td_current], status_dir, NULL, 0, 1);
+	td_set_next(data->tds[td_current], data->tds[td_current + 1]);
 	usb_log_debug("Created STATUS TD: %x:%x:%x:%x.\n",
-	    data->tds[td_current].status, data->tds[td_current].cbp,
-	    data->tds[td_current].next, data->tds[td_current].be);
+	    data->tds[td_current]->status, data->tds[td_current]->cbp,
+	    data->tds[td_current]->next, data->tds[td_current]->be);
 }
 /*----------------------------------------------------------------------------*/
@@ -268,5 +285,5 @@
 	assert(data);
 	ed_init(data->ed, instance->ep);
-	ed_add_tds(data->ed, &data->tds[0], &data->tds[data->td_count - 1]);
+//	ed_add_tds(data->ed, &data->tds[0], &data->tds[data->td_count - 1]);
 	usb_log_debug("Created ED(%p): %x:%x:%x:%x.\n", data->ed,
 	    data->ed->status, data->ed->td_tail, data->ed->td_head,
@@ -281,10 +298,10 @@
 		    OHCI_TD_MAX_TRANSFER : remain_size;
 
-		td_init(&data->tds[td_current], instance->ep->direction,
+		td_init(data->tds[td_current], instance->ep->direction,
 		    buffer, transfer_size, -1);
-		td_set_next(&data->tds[td_current], &data->tds[td_current + 1]);
+		td_set_next(data->tds[td_current], data->tds[td_current + 1]);
 		usb_log_debug("Created DATA TD: %x:%x:%x:%x.\n",
-		    data->tds[td_current].status, data->tds[td_current].cbp,
-		    data->tds[td_current].next, data->tds[td_current].be);
+		    data->tds[td_current]->status, data->tds[td_current]->cbp,
+		    data->tds[td_current]->next, data->tds[td_current]->be);
 
 		buffer += transfer_size;
Index: uspace/drv/ohci/hc.c
===================================================================
--- uspace/drv/ohci/hc.c	(revision 592369ae7c96d9787cb7de257390fe4ce1afd3ed)
+++ uspace/drv/ohci/hc.c	(revision 9a6fde4bb9c25bfa30c0b3c90d05987bac467574)
@@ -68,7 +68,6 @@
 	    &instance->manager, hub_address, hub_fun->handle);
 
-	ret = usb_endpoint_manager_add_ep(&instance->ep_manager,
-	    hub_address, 0, USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL,
-	    USB_SPEED_FULL, 64, 0);
+	ret = hc_add_endpoint(instance, hub_address, 0, USB_SPEED_FULL,
+	    USB_TRANSFER_CONTROL, USB_DIRECTION_BOTH, 64, 0, 0);
 	if (ret != EOK) {
 		usb_log_error("Failed to add OHCI rh endpoint 0.\n");
Index: uspace/drv/ohci/hcd_endpoint.c
===================================================================
--- uspace/drv/ohci/hcd_endpoint.c	(revision 592369ae7c96d9787cb7de257390fe4ce1afd3ed)
+++ uspace/drv/ohci/hcd_endpoint.c	(revision 9a6fde4bb9c25bfa30c0b3c90d05987bac467574)
@@ -56,5 +56,5 @@
 
 	ed_init(hcd_ep->ed, ep);
-	ed_add_tds(hcd_ep->ed, hcd_ep->td, hcd_ep->td);
+	ed_set_td(hcd_ep->ed, hcd_ep->td);
 	endpoint_set_hc_data(ep, hcd_ep, NULL, NULL);
 
Index: uspace/drv/ohci/hw_struct/endpoint_descriptor.h
===================================================================
--- uspace/drv/ohci/hw_struct/endpoint_descriptor.h	(revision 592369ae7c96d9787cb7de257390fe4ce1afd3ed)
+++ uspace/drv/ohci/hw_struct/endpoint_descriptor.h	(revision 9a6fde4bb9c25bfa30c0b3c90d05987bac467574)
@@ -81,11 +81,19 @@
 void ed_init(ed_t *instance, endpoint_t *ep);
 
-static inline void ed_add_tds(ed_t *instance, td_t *head, td_t *tail)
+static inline void ed_set_td(ed_t *instance, td_t *td)
 {
 	assert(instance);
+	uintptr_t pa = addr_to_phys(td);
 	instance->td_head =
-	    ((addr_to_phys(head) & ED_TDHEAD_PTR_MASK)
+	    ((pa & ED_TDHEAD_PTR_MASK)
 	    | (instance->td_head & ~ED_TDHEAD_PTR_MASK));
-	instance->td_tail = addr_to_phys(tail) & ED_TDTAIL_PTR_MASK;
+	instance->td_tail = pa & ED_TDTAIL_PTR_MASK;
+}
+
+static inline void ed_set_end_td(ed_t *instance, td_t *td)
+{
+	assert(instance);
+	uintptr_t pa = addr_to_phys(td);
+	instance->td_tail = pa & ED_TDTAIL_PTR_MASK;
 }