Changeset 42bc933 in mainline

Timestamp:

2017-10-09T16:27:02Z (7 years ago)

Author:

Michal Staruch <salmelu@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ac18b08

Parents:

a0be5d0

Message:

Dummy for bulk transfers (need to support streams)

Location:

uspace

Files:

• drv/bus/usb/xhci/hc.c (modified) (1 diff)
• drv/bus/usb/xhci/transfers.c (modified) (1 diff)
• drv/bus/usb/xhci/transfers.h (modified) (2 diffs)
• lib/usbhost/src/ddf_helpers.c (modified) (3 diffs)

uspace/drv/bus/usb/xhci/hc.c

@@ -464 +464 @@
         switch (batch->ep->transfer_type) {
         case USB_TRANSFER_CONTROL:
-                xhci_schedule_control_transfer(hc, batch);
-                break;
+                return xhci_schedule_control_transfer(hc, batch);
         case USB_TRANSFER_ISOCHRONOUS:
                 /* TODO: Implement me. */
                 break;
         case USB_TRANSFER_BULK:
-                /* TODO: Implement me. */
-                break;
+                return xhci_schedule_bulk_transfer(hc, batch);
         case USB_TRANSFER_INTERRUPT:
                 /* TODO: Implement me. */

uspace/drv/bus/usb/xhci/transfers.c

@@ -221 +221 @@
 }
 
+int xhci_schedule_bulk_transfer(xhci_hc_t* hc, usb_transfer_batch_t* batch) {
+        if (batch->setup_size) {
+                usb_log_warning("Setup packet present for a bulk transfer.");
+        }
+
+        uint8_t slot_id = batch->ep->hc_data.slot_id;
+        xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[batch->ep->endpoint];
+
+        xhci_transfer_t *transfer = xhci_transfer_alloc(batch);
+
+        xhci_trb_t trb;
+        memset(&trb, 0, sizeof(xhci_trb_t));
+        trb.parameter = (uintptr_t) addr_to_phys(batch->buffer);
+
+        // data size (sent for OUT, or buffer size)
+        TRB_CTRL_SET_XFER_LEN(trb, batch->buffer_size);
+        // FIXME: TD size 4.11.2.4
+        TRB_CTRL_SET_TD_SIZE(trb, 1);
+
+        // we want an interrupt after this td is done
+        TRB_CTRL_SET_IOC(trb, 1);
+
+        TRB_CTRL_SET_TRB_TYPE(trb, XHCI_TRB_TYPE_NORMAL);
+
+        xhci_trb_ring_enqueue(ring, &trb, &transfer->interrupt_trb_phys);
+        list_append(&transfer->link, &hc->transfers);
+
+        /* For control transfers, the target is always 1. */
+        hc_ring_doorbell(hc, slot_id, 1);
+        return EOK;
+}
+
 int xhci_handle_transfer_event(xhci_hc_t* hc, xhci_trb_t* trb)
 {

uspace/drv/bus/usb/xhci/transfers.h

@@ -37 +37 @@
 #include "trb_ring.h"
 
-/*
-
-typedef struct xhci_command {
-        link_t link;
-
-        xhci_trb_t trb;
-        uintptr_t trb_phys;
-
-        uint32_t slot_id;
-        uint32_t status;
-
-        bool completed;
-
-        fibril_mutex_t completed_mtx;
-        fibril_condvar_t completed_cv;
-} xhci_cmd_t;
-*/
-
 typedef struct {
         link_t link;
@@ -69 +51 @@
 void xhci_transfer_fini(xhci_transfer_t*);
 int xhci_schedule_control_transfer(xhci_hc_t*, usb_transfer_batch_t*);
+int xhci_schedule_bulk_transfer(xhci_hc_t*, usb_transfer_batch_t*);
 int xhci_handle_transfer_event(xhci_hc_t*, xhci_trb_t*);

uspace/lib/usbhost/src/ddf_helpers.c

@@ -395 +395 @@
         assert(l);
         assert(d);
-        
+
         if (d->vendor_id != 0) {
                 /* First, with release number. */
@@ -402 +402 @@
                     d->vendor_id, d->product_id, (d->device_version >> 8),
                     (d->device_version & 0xff));
-        
+
                 /* Next, without release number. */
                 ADD_MATCHID_OR_RETURN(l, 90, "usb&vendor=%#04x&product=%#04x",
@@ -944 +944 @@
             driver->name, ddf_dev_get_name(device));
         return EOK;
-        
+
 err_polling:
         // TODO: Stop the polling fibril (refactor the interrupt_polling func)