Changes in / [ab6fdad3:cbdb6457] in mainline

Location:

uspace/drv

Files:

• ohci/batch.c (modified) (4 diffs)
• ohci/hw_struct/transfer_descriptor.c (modified) (1 diff)
• ohci/hw_struct/transfer_descriptor.h (modified) (2 diffs)
• uhci-hcd/transfers.c (added)

uspace/drv/ohci/batch.c

@@ -147 +147 @@
             data->ed->next);
         size_t i = 0;
-        instance->transfered_size = instance->buffer_size;
         for (; i < tds; ++i) {
                 assert(data->tds[i] != NULL);
@@ -157 +156 @@
                 }
                 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",
@@ -173 +174 @@
         assert(hcd_ep);
         hcd_ep->td = data->tds[i];
-        if (i > 0)
-                instance->transfered_size -= td_remain_size(data->tds[i - 1]);
-
         /* Clear possible ED HALT */
         data->ed->td_head &= ~ED_TDHEAD_HALTED_FLAG;
@@ -240 +238 @@
 {
         assert(instance);
-        instance->next_step = usb_transfer_batch_call_out_and_dispose;
+        instance->next_step = usb_transfer_batch_call_in_and_dispose;
         batch_data(instance);
-        usb_log_debug("Batch(%p) BULK OUT initialized.\n", instance);
+        usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/ohci/hw_struct/transfer_descriptor.c

@@ -52 +52 @@
                 instance->status |= togg[toggle] << TD_STATUS_T_SHIFT;
         }
-        if (dir == USB_DIRECTION_IN) {
-                instance->status |= TD_STATUS_ROUND_FLAG;
-        }
         if (buffer != NULL) {
                 assert(size != 0);

uspace/drv/ohci/hw_struct/transfer_descriptor.h

@@ -59 +59 @@
 #define TD_STATUS_T_0 (0x2)
 #define TD_STATUS_T_1 (0x3)
-#define TD_STATUS_T_ED (0)
 #define TD_STATUS_EC_MASK (0x3) /* error count */
 #define TD_STATUS_EC_SHIFT (26)
@@ -103 +102 @@
         return cc_to_rc(cc);
 }
-
-static inline size_t td_remain_size(td_t *instance)
-{
-        assert(instance);
-        if (instance->cbp == 0)
-                return 0;
-        return instance->be - instance->cbp + 1;
-}
 #endif
 /**