Changeset cbfece7 in mainline for uspace/drv/char/ns8250/ns8250.c

Timestamp:

2014-07-21T22:10:18Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

1f1fa64

Parents:

96e368a (diff), 54a1ca7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

• Merged mainline changes
• Refactored rtl8169 driver to work with recent driver framework changes
• Fixed speed selection in rtl8169 (disables autonegotiation first)
• Added support for restarting autonegotiation
• Added new switch to 'nic' utility which restarts autonegotiation

File:

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

uspace/drv/char/ns8250/ns8250.c

@@ -57 +57 @@
 #include <ops/char_dev.h>
 
-#include <ns.h>
-#include <ipc/services.h>
-#include <ipc/irc.h>
+#include <irc.h>
 #include <device/hw_res.h>
 #include <ipc/serial_ctl.h>
@@ -488 +486 @@
 static int ns8250_interrupt_enable(ns8250_t *ns)
 {
-        /*
-         * 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) {
+        /* Enable interrupt using IRC service. */
+        int rc = irc_enable_interrupt(ns->irq);
+        if (rc != EOK)
                 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);