Changeset b9d910f in mainline for uspace/drv/uhci-hcd/uhci.c

Timestamp:

2011-02-19T23:02:49Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fb78ae72

Parents:

6edc69a

Message:

Use properly initialized interrupt code

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (2 diffs)

uspace/drv/uhci-hcd/uhci.c

@@ -39 +39 @@
 
 #include "uhci.h"
+static irq_cmd_t uhci_cmds[] = {
+        {
+                .cmd = CMD_PIO_READ_16,
+                .addr = (void*)0xc022,
+                .dstarg = 1
+        },
+        {
+                .cmd = CMD_PIO_WRITE_16,
+                .addr = (void*)0xc022,
+                .value = 0x1f
+        },
+        {
+                .cmd = CMD_ACCEPT
+        }
+};
 
 static int uhci_init_transfer_lists(uhci_t *instance);
@@ -101 +116 @@
 {
         assert(instance);
+
+        /* init interrupt code */
+        irq_cmd_t *interrupt_commands = malloc(sizeof(uhci_cmds));
+        if (interrupt_commands == NULL) {
+                return ENOMEM;
+        }
+        memcpy(interrupt_commands, uhci_cmds, sizeof(uhci_cmds));
+        interrupt_commands[0].addr = (void*)&instance->registers->usbsts;
+        interrupt_commands[1].addr = (void*)&instance->registers->usbsts;
+        instance->interrupt_code.cmds = interrupt_commands;
+        instance->interrupt_code.cmdcount =
+            sizeof(uhci_cmds) / sizeof(irq_cmd_t);
+
         /* init transfer lists */
         int ret = uhci_init_transfer_lists(instance);