Changeset e50bdd92 in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2017-07-23T19:14:43Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

c46c356

Parents:

c4d4fa2

Message:

Event handler now processes all event trbs that belong to us on the event ring. Also added some command testing code to hc_schedule (temporary).

File:

• uspace/drv/bus/usb/xhci/hc.c (modified) (2 diffs)

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

@@ -354 +354 @@
 int hc_schedule(xhci_hc_t *hc, usb_transfer_batch_t *batch)
 {
+        // TODO: This function currently contains cmd ring testing
+        //       stuff, remove it.
+        xhci_cmd_t *cmd = xhci_alloc_command();
         xhci_dump_state(hc);
-        xhci_send_no_op_command(hc, NULL);
-        async_usleep(1000);
+        xhci_send_no_op_command(hc, cmd);
+        xhci_wait_for_command(cmd, 1000000);
+        xhci_free_command(cmd);
+
         xhci_dump_state(hc);
-        async_usleep(10000);
-        xhci_send_no_op_command(hc, NULL);
+
+        for (int i = 0; i < 10; ++i) {
+                xhci_cmd_t *cmd2 = xhci_alloc_command();
+                xhci_send_enable_slot_command(hc, cmd2);
+                xhci_wait_for_command(cmd2, 1000000);
+                usb_log_error("Enabled slot ID: %u.", cmd2->slot_id);
+                xhci_free_command(cmd2);
+        }
+
 
         xhci_dump_trb(hc->event_ring.dequeue_trb);
@@ -386 +398 @@
         xhci_trb_t trb;
 
-        // TODO: Apparently we are supposed to process events until ering is empty
-        //       and then update the erdp?
         err = xhci_event_ring_dequeue(event_ring, &trb);;
 
-        switch (err) {
-        case EOK:
-                usb_log_debug2("Dequeued from event ring.");
-                xhci_dump_trb(&trb);
-
-                hc_handle_event(hc, &trb);
-                break;
-        case ENOENT:
-                usb_log_debug2("Event ring finished.");
-                break;
-        default:
-                usb_log_warning("Error while accessing event ring: %s", str_error(err));
-        }
+        while (err != ENOENT) {
+                if (err == EOK) {
+                        usb_log_debug2("Dequeued from event ring.");
+                        xhci_dump_trb(&trb);
+
+                        hc_handle_event(hc, &trb);
+                } else {
+                        usb_log_warning("Error while accessing event ring: %s", str_error(err));
+                        break;
+                }
+
+                err = xhci_event_ring_dequeue(event_ring, &trb);;
+        }
+        usb_log_debug2("Event ring processing finished.");
 
         /* Update the ERDP to make room in the ring */