Changeset e26a9d95 in mainline for uspace/drv/bus/usb/ohci

Timestamp:

2014-01-18T17:14:42Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3e200736

Parents:

19b3cc6

Message:

libusbhost: Add status hook.

Implement in UHCI, OHCI

Location:

uspace/drv/bus/usb/ohci

Files:

• hc.c (modified) (1 diff)
• hc.h (modified) (1 diff)
• main.c (modified) (2 diffs)

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

@@ -273 +273 @@
 }
 
+int hc_status(hcd_t *hcd, uint32_t *status)
+{
+        assert(hcd);
+        assert(status);
+        hc_t *instance = hcd->driver.data;
+        assert(instance);
+
+        async_usleep(10000);
+        if (instance->registers){
+                *status = OHCI_RD(instance->registers->interrupt_status);
+                OHCI_WR(instance->registers->interrupt_status, *status);
+        }
+        return EOK;
+}
+
 /** Add USB transfer to the schedule.
  *

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

@@ -83 +83 @@
 void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep);
 int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
+int hc_status(hcd_t *hcd, uint32_t *status);
 
 void hc_interrupt(hc_t *instance, uint32_t status);

uspace/drv/bus/usb/ohci/main.c

@@ -66 +66 @@
         if (ret == EOK)
                 hcd_set_implementation(hcd, instance, hc_schedule,
-                    ohci_endpoint_init, ohci_endpoint_fini, ohci_interrupt);
+                    ohci_endpoint_init, ohci_endpoint_fini, ohci_interrupt,
+                    hc_status);
         return ret;
 }
@@ -77 +78 @@
 
         free(hcd->driver.data);
-        hcd_set_implementation(hcd, NULL, NULL, NULL, NULL, NULL);
+        hcd_set_implementation(hcd, NULL, NULL, NULL, NULL, NULL, NULL);
 }