Changeset 8486c07 in mainline for uspace

Timestamp:

2012-07-21T14:01:12Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

eb3683a

Parents:

56c167c

Message:

IRQ pseudocode improvements

• rename CMD_BTEST to CMD_AND (less cryptic)
• implement CMD_LOAD to load a constant value into a scratch register
• implement simple pseudocode static checker
• slightly alter the semantics of several pseudocode commands (scratch[0] is a usable field, although not propagated to the IPC notification)

Location:

uspace

Files:

• drv/bus/usb/ohci/hc.c (modified) (7 diffs)
• drv/bus/usb/uhci/hc.c (modified) (2 diffs)
• drv/char/i8042/i8042.c (modified) (1 diff)
• drv/nic/ne2k/ne2k.c (modified) (1 diff)
• srv/hid/input/port/ns16550.c (modified) (1 diff)
• srv/hid/input/port/pl050.c (modified) (1 diff)
• srv/hw/bus/cuda_adb/cuda_adb.c (modified) (1 diff)

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbohcihc
  * @{
@@ -32 +33 @@
  * @brief OHCI Host controller driver routines
  */
+
 #include <errno.h>
 #include <str_error.h>
@@ -49 +51 @@
 static const irq_pio_range_t ohci_pio_ranges[] = {
         {
-                .base = 0,      /* filled later */
+                .base = 0,
                 .size = sizeof(ohci_regs_t)
         }
@@ -55 +57 @@
 
 static const irq_cmd_t ohci_irq_commands[] = {
-        { .cmd = CMD_PIO_READ_32, .dstarg = 1, .addr = NULL /* filled later */ },
-        { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2, .value = 0 /* filled later */ },
-        { .cmd = CMD_PREDICATE, .srcarg = 2, .value = 2 },
-        { .cmd = CMD_PIO_WRITE_A_32, .srcarg = 1, .addr = NULL /* filled later */ },
-        { .cmd = CMD_ACCEPT },
+        {
+                .cmd = CMD_PIO_READ_32,
+                .dstarg = 1,
+                .addr = NULL
+        },
+        {
+                .cmd = CMD_AND,
+                .srcarg = 1,
+                .dstarg = 2,
+                .value = OHCI_USED_INTERRUPTS
+        },
+        {
+                .cmd = CMD_PREDICATE,
+                .srcarg = 2,
+                .value = 2
+        },
+        {
+                .cmd = CMD_PIO_WRITE_A_32,
+                .srcarg = 1,
+                .addr = NULL
+        },
+        {
+                .cmd = CMD_ACCEPT
+        }
 };
 
@@ -76 +97 @@
         return sizeof(ohci_pio_ranges) / sizeof(irq_pio_range_t);
 }
-
 
 /** Get number of commands used in IRQ code.
@@ -111 +131 @@
         ohci_regs_t *registers = (ohci_regs_t *) regs;
         cmds[0].addr = (void *) &registers->interrupt_status;
-        cmds[1].value = OHCI_USED_INTERRUPTS;
         cmds[3].addr = (void *) &registers->interrupt_status;
 
@@ -445 +464 @@
                 return;
         }
+
         const unsigned hc_status = C_HCFS_GET(instance->registers->control);
         /* Interrupt routing disabled && status != USB_RESET => BIOS active */

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

@@ -50 +50 @@
 static const irq_pio_range_t uhci_irq_pio_ranges[] = {
         {
-                .base = 0,      /* filled later */
+                .base = 0,
                 .size = sizeof(uhci_regs_t)
         }
@@ -56 +56 @@
 
 static const irq_cmd_t uhci_irq_commands[] = {
-        { .cmd = CMD_PIO_READ_16, .dstarg = 1, .addr = NULL/*filled later*/},
-        { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2,
-          .value = UHCI_STATUS_USED_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS },
-        { .cmd = CMD_PREDICATE, .srcarg = 2, .value = 2 },
-        { .cmd = CMD_PIO_WRITE_A_16, .srcarg = 1, .addr = NULL/*filled later*/},
-        { .cmd = CMD_ACCEPT },
+        {
+                .cmd = CMD_PIO_READ_16,
+                .dstarg = 1,
+                .addr = NULL
+        },
+        {
+                .cmd = CMD_AND,
+                .srcarg = 1,
+                .dstarg = 2,
+                .value = UHCI_STATUS_USED_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS
+        },
+        {
+                .cmd = CMD_PREDICATE,
+                .srcarg = 2,
+                .value = 2
+        },
+        {
+                .cmd = CMD_PIO_WRITE_A_16,
+                .srcarg = 1,
+                .addr = NULL
+        },
+        {
+                .cmd = CMD_ACCEPT
+        }
 };
 

uspace/drv/char/i8042/i8042.c

@@ -120 +120 @@
         },
         {
-                .cmd = CMD_BTEST,
+                .cmd = CMD_AND,
                 .value = i8042_OUTPUT_FULL,
                 .srcarg = 1,

uspace/drv/nic/ne2k/ne2k.c

@@ -83 +83 @@
         {
                 /* Mask supported interrupt causes */
-                .cmd = CMD_BTEST,
+                .cmd = CMD_AND,
                 .value = (ISR_PRX | ISR_PTX | ISR_RXE | ISR_TXE | ISR_OVW |
                     ISR_CNT | ISR_RDC),

uspace/srv/hid/input/port/ns16550.c

@@ -84 +84 @@
         },
         {
-                .cmd = CMD_BTEST,
+                .cmd = CMD_AND,
                 .value = LSR_DATA_READY,
                 .srcarg = 1,

uspace/srv/hid/input/port/pl050.c

@@ -80 +80 @@
         },
         {
-                .cmd = CMD_BTEST,
+                .cmd = CMD_AND,
                 .value = PL050_STAT_RXFULL,
                 .srcarg = 1,

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -116 +116 @@
         {
                 .cmd = CMD_PIO_READ_8,
-                .addr = NULL,   /* will be patched in run-time */
+                .addr = NULL,
                 .dstarg = 1
         },
         {
-                .cmd = CMD_BTEST,
+                .cmd = CMD_AND,
                 .value = SR_INT,
                 .srcarg = 1,