Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset d6522dd in mainline


Ignore:
Timestamp:
2011-04-13T14:49:28Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
651b352, a0a134b
Parents:
7013b14
Message:

Fixes (OHCI works with new architecture)

Remove completed batch from the list of pending batches.
Do not reinitialize ED during transfer initialization

Location:
uspace/drv/ohci
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/ohci/batch.c

    r7013b14 rd6522dd  
    164164                }
    165165        }
    166         data->leave_td = ++i;
     166        data->leave_td = i;
    167167        assert(data->leave_td <= data->td_count);
     168        hcd_endpoint_t *hcd_ep = hcd_endpoint_get(instance->ep);
     169        assert(hcd_ep);
     170        hcd_ep->td = data->tds[i];
     171
    168172        return true;
    169173}
     
    243247        ohci_transfer_batch_t *data = instance->private_data;
    244248        assert(data);
    245         ed_init(data->ed, instance->ep);
    246 //      ed_add_tds(data->ed, &data->tds[0], &data->tds[data->td_count - 1]);
    247         usb_log_debug("Created ED(%p): %x:%x:%x:%x.\n", data->ed,
     249        usb_log_debug("Using ED(%p): %x:%x:%x:%x.\n", data->ed,
    248250            data->ed->status, data->ed->td_tail, data->ed->td_head,
    249251            data->ed->next);
     
    292294        ohci_transfer_batch_t *data = instance->private_data;
    293295        assert(data);
    294         ed_init(data->ed, instance->ep);
    295 //      ed_add_tds(data->ed, &data->tds[0], &data->tds[data->td_count - 1]);
    296         usb_log_debug("Created ED(%p): %x:%x:%x:%x.\n", data->ed,
     296        usb_log_debug("Using ED(%p): %x:%x:%x:%x.\n", data->ed,
    297297            data->ed->status, data->ed->td_tail, data->ed->td_head,
    298298            data->ed->next);
    299299
    300         /* data stage */
    301300        size_t td_current = 0;
    302301        size_t remain_size = instance->buffer_size;
  • uspace/drv/ohci/hc.c

    r7013b14 rd6522dd  
    306306
    307307                        if (batch_is_complete(batch)) {
     308                                list_remove(current);
    308309                                usb_transfer_batch_finish(batch);
    309310                        }
Note: See TracChangeset for help on using the changeset viewer.