Changeset dfa48b0d in mainline

Timestamp:

2011-09-17T21:08:58Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

45a9cf4

Parents:

d1e18573 (diff), 128c78b (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:

Merge serial port related changes.

• Fix ns8250 driver
• Add sportdmp program that reads from serial port

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/sportdmp/Makefile (added)
• uspace/app/sportdmp/sportdmp.c (added)
• uspace/drv/char/ns8250/ns8250.c (modified) (2 diffs)

boot/Makefile.common

@@ -166 +166 @@
         $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
+        $(USPACE_PATH)/app/sportdmp/sportdmp \
         $(USPACE_PATH)/app/redir/redir \
         $(USPACE_PATH)/app/taskdump/taskdump \

uspace/Makefile

@@ -51 +51 @@
         app/redir \
         app/sbi \
+        app/sportdmp \
         app/stats \
         app/taskdump \

uspace/drv/char/ns8250/ns8250.c

@@ -59 +59 @@
 
 #include <devman.h>
+#include <ns.h>
 #include <ipc/devman.h>
+#include <ipc/services.h>
+#include <ipc/irc.h>
 #include <device/hw_res.h>
 #include <ipc/serial_ctl.h>
@@ -409 +412 @@
 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) {
+                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);
+
         /* Enable interrupt on the serial port. */
         ns8250_port_interrupts_enable(ns->port);