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

File:

• uspace/drv/char/ns8250/ns8250.c (modified) (9 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>
@@ -163 +165 @@
         int irq;
         /** The base i/o address of the devices registers. */
-        uintptr_t io_addr;
+        uint32_t io_addr;
         /** The i/o port used to access the serial ports registers. */
         ioport8_t *port;
@@ -330 +332 @@
         
         /* Gain control over port's registers. */
-        if (pio_enable((void *) ns->io_addr, REG_COUNT,
+        if (pio_enable((void *)(uintptr_t) ns->io_addr, REG_COUNT,
             (void **) &ns->port)) {
-                ddf_msg(LVL_ERROR, "Cannot map the port %#" PRIxn
+                ddf_msg(LVL_ERROR, "Cannot map the port %#" PRIx32
                     " for device %s.", ns->io_addr, ddf_dev_get_name(ns->dev));
                 return false;
@@ -391 +393 @@
         
         /* Connect to the parent's driver. */
-        parent_sess = ddf_dev_parent_sess_create(ns->dev);
+        parent_sess = ddf_dev_parent_sess_create(ns->dev, EXCHANGE_SERIALIZE);
         if (parent_sess == NULL) {
                 ddf_msg(LVL_ERROR, "Failed to connect to parent driver of "
@@ -432 +434 @@
                         ioport = true;
                         ddf_msg(LVL_NOTE, "Device %s was assigned I/O address = "
-                            "0x%#" PRIxn ".", ddf_dev_get_name(ns->dev), ns->io_addr);
+                            "0x%x.", ddf_dev_get_name(ns->dev), ns->io_addr);
                         break;
                         
@@ -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);
+
         uint8_t iir = pio_read_8(&ns->regs->iid);
         if ((iir & NS8250_IID_CAUSE_MASK) == NS8250_IID_CAUSE_RXSTATUS) {
@@ -780 +795 @@
         
         ns8250_read_from_device(ns);
-        irc_disable_interrupt(ns->irq);
 }
 
@@ -857 +871 @@
         }
         need_unreg_intr_handler = true;
-
+        
         /* Enable interrupt. */
         rc = ns8250_interrupt_enable(ns);