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

Timestamp:

2017-10-15T15:05:06Z (8 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

816f5f4

Parents:

20eaa82

Message:

Fixed few bugs related to control transfers and some deadlocks. Registering control endpoint with HelenOS. Can read out device descriptors through MID and initialize mouse driver!

File:

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

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

@@ -213 +213 @@
                 goto err_scratch;
 
+        if ((err = xhci_init_transfers(hc)))
+                goto err_cmd;
+
         if ((err = xhci_rh_init(&hc->rh, hc)))
-                goto err_cmd;
+                goto err_transfers;
 
         if ((err = xhci_bus_init(&hc->bus)))
@@ -224 +227 @@
 err_rh:
         xhci_rh_fini(&hc->rh);
+err_transfers:
+        xhci_fini_transfers(hc);
 err_cmd:
         xhci_fini_commands(hc);
@@ -472 +477 @@
         case USB_TRANSFER_ISOCHRONOUS:
                 /* TODO: Implement me. */
-                break;
+                usb_log_error("Isochronous transfers are not yet implemented!");
+                return ENOTSUP;
         case USB_TRANSFER_BULK:
                 return xhci_schedule_bulk_transfer(hc, batch);
         case USB_TRANSFER_INTERRUPT:
                 /* TODO: Implement me. */
-                break;
+                usb_log_error("Interrupt transfers are not yet implemented!");
+                return ENOTSUP;
         }
 
@@ -617 +624 @@
         xhci_event_ring_fini(&hc->event_ring);
         hc_dcbaa_fini(hc);
+        xhci_fini_transfers(hc);
         xhci_fini_commands(hc);
         xhci_rh_fini(&hc->rh);