Changeset 1f6eb7d in mainline

Timestamp:

2011-07-10T21:22:54Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

78ab6d4

Parents:

2e8a01b

Message:

OHCI: Remove irq code from hc_t structure.

Location:

uspace/drv/bus/usb/ohci

Files:

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

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

@@ -632 +632 @@
             instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa);
 
-        /* Init interrupt code */
-        instance->interrupt_code.cmds = instance->interrupt_commands;
-        instance->interrupt_code.cmdcount = OHCI_NEEDED_IRQ_COMMANDS;
-        {
-                /* Read status register */
-                instance->interrupt_commands[0].cmd = CMD_MEM_READ_32;
-                instance->interrupt_commands[0].dstarg = 1;
-                instance->interrupt_commands[0].addr =
-                    (void*)&instance->registers->interrupt_status;
-
-                /* Test whether we are the interrupt cause */
-                instance->interrupt_commands[1].cmd = CMD_BTEST;
-                instance->interrupt_commands[1].value =
-                    OHCI_USED_INTERRUPTS;
-                instance->interrupt_commands[1].srcarg = 1;
-                instance->interrupt_commands[1].dstarg = 2;
-
-                /* Predicate cleaning and accepting */
-                instance->interrupt_commands[2].cmd = CMD_PREDICATE;
-                instance->interrupt_commands[2].value = 2;
-                instance->interrupt_commands[2].srcarg = 2;
-
-                /* Write-clean status register */
-                instance->interrupt_commands[3].cmd = CMD_MEM_WRITE_A_32;
-                instance->interrupt_commands[3].srcarg = 1;
-                instance->interrupt_commands[3].addr =
-                    (void*)&instance->registers->interrupt_status;
-
-                /* Accept interrupt */
-                instance->interrupt_commands[4].cmd = CMD_ACCEPT;
-        }
-
         return EOK;
 }

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

@@ -51 +51 @@
 #include "hw_struct/hcca.h"
 
-#define OHCI_NEEDED_IRQ_COMMANDS 5
-
-/** Main OHCI drier structure */
+/** Main OHCI driver structure */
 typedef struct hc {
         /** USB bus driver, devices and addresses */
@@ -75 +73 @@
         /** Guards schedule and endpoint manipulation */
         fibril_mutex_t guard;
-
-        /** Code to be executed in kernel interrupt handler */
-        irq_code_t interrupt_code;
-
-        /** Commands that form interrupt code */
-        irq_cmd_t interrupt_commands[OHCI_NEEDED_IRQ_COMMANDS];
 
         /** USB hub emulation structure */