Changes in uspace/drv/char/ns8250/ns8250.c [8820544:956d4281] in mainline

File:

• uspace/drv/char/ns8250/ns8250.c (modified) (3 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -57 +57 @@
 #include <ops/char_dev.h>
 
-#include <irc.h>
+#include <ns.h>
+#include <ipc/services.h>
+#include <ipc/irc.h>
 #include <device/hw_res.h>
 #include <ipc/serial_ctl.h>
@@ -486 +488 @@
 static int ns8250_interrupt_enable(ns8250_t *ns)
 {
-        /* Enable interrupt using IRC service. */
-        int rc = irc_enable_interrupt(ns->irq);
-        if (rc != EOK)
+        /*
+         * Enable interrupt using IRC service.
+         * TODO: This is a temporary solution until the device framework
+         * takes care of this itself.
+         */
+        async_sess_t *irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+            SERVICE_IRC, 0, 0);
+        if (!irc_sess) {
                 return EIO;
-        
+        }
+
+        async_exch_t *exch = async_exchange_begin(irc_sess);
+        if (!exch) {
+                return EIO;
+        }
+        async_msg_1(exch, IRC_ENABLE_INTERRUPT, ns->irq);
+        async_exchange_end(exch);
+
         /* Read LSR to clear possible previous LSR interrupt */
         pio_read_8(&ns->regs->lsr);
-        
+
         /* Enable interrupt on the serial port. */
         ns8250_port_interrupts_enable(ns->regs);
@@ -764 +779 @@
  * data and reading the line status register.
  *
- * @param dev The serial port device.
- *
- */
-static inline void ns8250_interrupt_handler(ipc_callid_t iid, ipc_call_t *icall,
-    ddf_dev_t *dev)
+ * @param dev           The serial port device.
+ */
+static inline void ns8250_interrupt_handler(ddf_dev_t *dev, ipc_callid_t iid,
+    ipc_call_t *icall)
 {
         ns8250_t *ns = dev_ns8250(dev);