Changeset 5971dd3 in mainline

Timestamp:

2011-03-21T14:27:13Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

28eee11c, 7102aa5

Parents:

48fe0c9 (diff), 5d1db18 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Interrupt emulator, and rh address reset

Location:

uspace/drv

Files:

• ohci/hc.c (modified) (4 diffs)
• ohci/hc.h (modified) (2 diffs)
• ohci/ohci_regs.h (modified) (1 diff)
• uhci-hcd/uhci_hc.c (modified) (1 diff)

uspace/drv/ohci/hc.c

@@ -45 +45 @@
 #include "hc.h"
 
-static int dummy_reset(int foo, void *arg)
-{
-        hc_t *hc = (hc_t*)arg;
-        assert(hc);
-        hc->rh.address = 0;
-        return EOK;
-}
+static int dummy_reset(int foo, void *arg);
+static int interrupt_emulator(hc_t *instance);
 /*----------------------------------------------------------------------------*/
 int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev,
@@ -66 +61 @@
         instance->ddf_instance = fun;
         device_keeper_init(&instance->manager);
+
+        if (!interrupts) {
+                instance->interrupt_emulator =
+                    fibril_create((int(*)(void*))interrupt_emulator, instance);
+                fibril_add_ready(instance->interrupt_emulator);
+        }
 
 
@@ -99 +100 @@
         ret = usb_hc_new_device_wrapper(dev, &conn, USB_SPEED_FULL, dummy_reset,
             0, instance, &address, &handle, NULL, NULL, NULL);
-        CHECK_RET_RETURN(ret, "Failed to add rh device.\n");
+        if (ret != EOK) {
+                usb_log_error("Failed to add rh device.\n");
+                instance->rh.address = -1;
+                return ret;
+        }
 
         ret = usb_hc_connection_close(&conn);
@@ -117 +122 @@
 }
 /*----------------------------------------------------------------------------*/
-void hc_interrupt(hc_t *instance, uint16_t status)
+void hc_interrupt(hc_t *instance, uint32_t status)
 {
         assert(instance);
-        /* TODO: Check for interrupt cause */
-        rh_interrupt(&instance->rh);
+        if (status == 0)
+                return;
+        if (status & IS_RHSC)
+                rh_interrupt(&instance->rh);
+
+        /* TODO: Check for further interrupt causes */
         /* TODO: implement */
+}
+/*----------------------------------------------------------------------------*/
+static int dummy_reset(int foo, void *arg)
+{
+        hc_t *hc = (hc_t*)arg;
+        assert(hc);
+        hc->rh.address = 0;
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+static int interrupt_emulator(hc_t *instance)
+{
+        assert(instance);
+        usb_log_info("Started interrupt emulator.\n");
+        while (1) {
+                uint32_t status = instance->registers->interrupt_status;
+                instance->registers->interrupt_status = status;
+                hc_interrupt(instance, status);
+                async_usleep(1000);
+        }
+        return EOK;
 }
 /**

uspace/drv/ohci/hc.h

@@ -54 +54 @@
         ddf_fun_t *ddf_instance;
         device_keeper_t manager;
+        fid_t interrupt_emulator;
 } hc_t;
 
@@ -63 +64 @@
 int hc_schedule(hc_t *instance, batch_t *batch);
 
-void hc_interrupt(hc_t *instance, uint16_t status);
+void hc_interrupt(hc_t *instance, uint32_t status);
 
 /** Safely dispose host controller internal structures

uspace/drv/ohci/ohci_regs.h

@@ -43 +43 @@
         volatile uint32_t command_status;
         volatile uint32_t interrupt_status;
+#define IS_SO (1 << 0)
+#define IS_WDH (1 << 1)
+#define IS_SF (1 << 2)
+#define IS_RD (1 << 3)
+#define IS_UE (1 << 4)
+#define IS_FNO (1 << 5)
+#define IS_RHSC (1 << 6)
+#define IS_OC (1 << 30)
         volatile uint32_t interupt_enable;
 #define IE_SO   (1 << 0)

uspace/drv/uhci-hcd/uhci_hc.c

@@ -121 +121 @@
                     fibril_create(uhci_hc_interrupt_emulator, instance);
                 fibril_add_ready(instance->cleaner);
+        } else {
+                /* TODO: enable interrupts here */
         }