Changeset 7edfde9 in mainline

Timestamp:

2015-05-13T02:22:50Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0683992

Parents:

6d81e1e

Message:

fix the device driver regressions in a generic way
therefore the previous fix (revision 2329) can be reverted
the root cause of the regression was a forgotten fallback to default_ucode that disappeared in the refactoring of revision 2170 (mea culpa)

Location:

uspace

Files:

• drv/char/ns8250/ns8250.c (modified) (3 diffs)
• lib/c/generic/irq.c (modified) (2 diffs)
• lib/drv/generic/interrupt.c (modified) (1 diff)

uspace/drv/char/ns8250/ns8250.c

@@ -175 +175 @@
         bool removed;
 } ns8250_t;
-
-static irq_cmd_t ns8250_irq_cmds[] = {
-        { .cmd = CMD_ACCEPT }
-};
-
-static irq_code_t ns8250_irq_code = {
-        .rangecount = 0,
-        .cmdcount = sizeof(ns8250_irq_cmds) / sizeof(irq_cmd_t),
-        .cmds = ns8250_irq_cmds
-};
 
 /** Obtain soft-state structure from device node */
@@ -793 +783 @@
 }
 
-
-
 /** Register the interrupt handler for the device.
  *
@@ -802 +790 @@
 {
         return register_interrupt_handler(ns->dev, ns->irq,
-            ns8250_interrupt_handler, &ns8250_irq_code);
+            ns8250_interrupt_handler, NULL);
 }
 

uspace/lib/c/generic/irq.c

@@ -35 +35 @@
 #include <ipc/irq.h>
 #include <libc.h>
+#include <stdlib.h>
+#include <macros.h>
+
+static irq_cmd_t default_cmds[] = {
+        {
+                .cmd = CMD_ACCEPT
+        }
+};
+
+static const irq_code_t default_ucode = {
+        0,
+        NULL,
+        ARRAY_SIZE(default_cmds),
+        default_cmds
+};
 
 /** Subscribe to IRQ notification.
@@ -49 +64 @@
     const irq_code_t *ucode)
 {
+        if (ucode == NULL)
+                ucode = &default_ucode;
+        
         return __SYSCALL4(SYS_IPC_IRQ_SUBSCRIBE, inr, devno, method,
             (sysarg_t) ucode);

uspace/lib/drv/generic/interrupt.c

@@ -44 +44 @@
 #include "private/driver.h"
 
-static irq_cmd_t default_cmds[] = {
-        {
-                .cmd = CMD_ACCEPT
-        }
-};
-
-static const irq_code_t default_pseudocode = {
-        0,
-        NULL,
-        ARRAY_SIZE(default_cmds),
-        default_cmds
-};
-
 int register_interrupt_handler(ddf_dev_t *dev, int irq,
     interrupt_handler_t *handler, const irq_code_t *pseudocode)