Changeset 763dbcb in mainline

Timestamp:

2014-01-24T20:21:28Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0a751aa

Parents:

5f5321ee

Message:

ehci: Implement dequeue.

Includes async list doorbell interrupt handling

Location:

uspace/drv/bus/usb/ehci

Files:

• ehci_endpoint.c (modified) (1 diff)
• hc.c (modified) (5 diffs)
• hc.h (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_endpoint.c

@@ -107 +107 @@
         ehci_endpoint_t *instance = ehci_endpoint_get(ep);
         hc_dequeue_endpoint(hcd->driver.data, ep);
+        endpoint_clear_hc_data(ep);
         if (instance) {
                 free32(instance->qh);
                 free(instance);
         }
-        endpoint_clear_hc_data(ep);
 }
 /**

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

@@ -176 +176 @@
         list_initialize(&instance->pending_batches);
         fibril_mutex_initialize(&instance->guard);
+        fibril_condvar_initialize(&instance->async_doorbell);
 
         ret = hc_init_memory(instance);
@@ -230 +231 @@
 void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep)
 {
+        assert(instance);
+        assert(ep);
+        ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
+        switch (ep->transfer_type)
+        {
+        case USB_TRANSFER_INTERRUPT:
+                endpoint_list_append_ep(&instance->int_list, ehci_ep);
+                /* Fall through */
+        case USB_TRANSFER_ISOCHRONOUS:
+                /* NOT SUPPORTED */
+                return;
+        case USB_TRANSFER_CONTROL:
+        case USB_TRANSFER_BULK:
+                endpoint_list_remove_ep(&instance->async_list, ehci_ep);
+                break;
+        }
+        fibril_mutex_lock(&instance->guard);
+        EHCI_SET(instance->registers->usbcmd, USB_CMD_ASYNC_SCHEDULE_FLAG);
+        fibril_condvar_wait(&instance->async_doorbell, &instance->guard);
+        fibril_mutex_unlock(&instance->guard);
 }
 
@@ -279 +300 @@
         if (status & USB_STS_PORT_CHANGE_FLAG) {
                 ehci_rh_interrupt(&instance->rh);
+        }
+        if (status & USB_STS_ASYNC_SCHED_FLAG) {
+                fibril_condvar_signal(&instance->async_doorbell);
         }
 }
@@ -313 +337 @@
         }
         /* Enable interrupts */
-        EHCI_WR(instance->registers->usbintr, USB_INTR_PORT_CHANGE_FLAG | USB_INTR_IRQ_FLAG);
-        /* Use lower 4G segment */
+        EHCI_WR(instance->registers->usbintr, USB_INTR_PORT_CHANGE_FLAG | USB_INTR_IRQ_FLAG | USB_INTR_ASYNC_ADVANCE_FLAG);
+        /* Use the lowest 4G segment */
         EHCI_WR(instance->registers->ctrldssegment, 0);
         /* Set periodic list */
@@ -326 +350 @@
         EHCI_SET(instance->registers->usbcmd, USB_CMD_RUN_FLAG);
         EHCI_SET(instance->registers->configflag, USB_CONFIG_FLAG_FLAG);
+
 #if 0
         /*

uspace/drv/bus/usb/ehci/hc.h

@@ -75 +75 @@
         fibril_mutex_t guard;
 
+        /** Wait for hc to restart async chedule */
+        fibril_condvar_t async_doorbell;
+
         /** USB hub emulation structure */
         ehci_rh_t rh;