Changeset e26a9d95 in mainline

Timestamp:

2014-01-18T17:14:42Z (11 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

Files:

• drv/bus/usb/ehci/main.c (modified) (2 diffs)
• drv/bus/usb/ohci/hc.c (modified) (1 diff)
• drv/bus/usb/ohci/hc.h (modified) (1 diff)
• drv/bus/usb/ohci/main.c (modified) (2 diffs)
• drv/bus/usb/uhci/hc.c (modified) (1 diff)
• drv/bus/usb/uhci/hc.h (modified) (1 diff)
• drv/bus/usb/uhci/main.c (modified) (2 diffs)
• drv/bus/usb/vhc/main.c (modified) (1 diff)
• lib/usbhost/include/usb/host/hcd.h (modified) (4 diffs)

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

@@ -64 +64 @@
                 return ENOMEM;
 
-        const int ret =  hc_init(instance, res, irq);
+        const int ret = hc_init(instance, res, irq);
         if (ret == EOK)
                 hcd_set_implementation(hcd, instance, hc_schedule,
-                    NULL, NULL, ehci_interrupt);
+                    NULL, NULL, ehci_interrupt, NULL);
         return ret;
 }
@@ -78 +78 @@
 
         free(hcd->driver.data);
-        hcd_set_implementation(hcd, NULL, NULL, NULL, NULL, NULL);
+        hcd_set_implementation(hcd, NULL, NULL, NULL, NULL, NULL, NULL);
 }
 

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);
 }
 

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

@@ -412 +412 @@
 }
 
+int hc_status(hcd_t *hcd, uint32_t *status)
+{
+        assert(hcd);
+        assert(status);
+        hc_t *instance = hcd->driver.data;
+        assert(instance);
+
+        *status = 0;
+        if (instance->registers) {
+                uint16_t s = pio_read_16(&instance->registers->usbsts);
+                pio_write_16(&instance->registers->usbsts, s);
+                *status = s;
+        }
+        return EOK;
+}
+
 /** Schedule batch for execution.
  *

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

@@ -127 +127 @@
 } hc_t;
 
-int hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
-void hc_interrupt(hc_t *instance, uint16_t status);
 int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interupts);
 void hc_fini(hc_t *instance);
+int hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
+
+void hc_interrupt(hc_t *instance, uint16_t status);
+int hc_status(hcd_t *hcd, uint32_t *status);
 int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 

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

@@ -68 +68 @@
         if (ret == EOK)
                 hcd_set_implementation(hcd, instance, hc_schedule, NULL, NULL,
-                    uhci_interrupt);
+                    uhci_interrupt, hc_status);
         return ret;
 }
@@ -79 +79 @@
 
         free(hcd->driver.data);
-        hcd_set_implementation(hcd, NULL, NULL, NULL, NULL, NULL);
+        hcd_set_implementation(hcd, NULL, NULL, NULL, NULL, NULL, NULL);
 }
 

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

@@ -95 +95 @@
         }
 
-        hcd_set_implementation(dev_to_hcd(dev), data, vhc_schedule, NULL, NULL, NULL);
+        hcd_set_implementation(dev_to_hcd(dev), data, vhc_schedule, NULL, NULL, NULL, NULL);
 
         /* Add virtual hub device */

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -52 +52 @@
 typedef void (*ep_remove_hook_t)(hcd_t *, endpoint_t *);
 typedef void (*interrupt_hook_t)(hcd_t *, uint32_t);
+typedef int (*status_hook_t)(hcd_t *, uint32_t *);
 
 typedef struct {
@@ -64 +65 @@
         /** Hook to be called on device interrupt, passes ARG1 */
         interrupt_hook_t irq_hook;
+        /** Periodic polling hook */
+        status_hook_t status_hook;
 } hc_driver_t;
 
@@ -80 +83 @@
 static inline void hcd_set_implementation(hcd_t *hcd, void *data,
     schedule_hook_t schedule, ep_add_hook_t add_hook, ep_remove_hook_t rem_hook,
-    interrupt_hook_t irq_hook)
+    interrupt_hook_t irq_hook, status_hook_t status_hook)
 {
         assert(hcd);
@@ -88 +91 @@
         hcd->driver.ep_remove_hook = rem_hook;
         hcd->driver.irq_hook = irq_hook;
+        hcd->driver.status_hook = status_hook;
 }