Changeset dfa48b0d in mainline


Ignore:
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:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    rd1e18573 rdfa48b0d  
    166166        $(USPACE_PATH)/app/lsusb/lsusb \
    167167        $(USPACE_PATH)/app/sbi/sbi \
     168        $(USPACE_PATH)/app/sportdmp/sportdmp \
    168169        $(USPACE_PATH)/app/redir/redir \
    169170        $(USPACE_PATH)/app/taskdump/taskdump \
  • uspace/Makefile

    rd1e18573 rdfa48b0d  
    5151        app/redir \
    5252        app/sbi \
     53        app/sportdmp \
    5354        app/stats \
    5455        app/taskdump \
  • uspace/drv/char/ns8250/ns8250.c

    rd1e18573 rdfa48b0d  
    5959
    6060#include <devman.h>
     61#include <ns.h>
    6162#include <ipc/devman.h>
     63#include <ipc/services.h>
     64#include <ipc/irc.h>
    6265#include <device/hw_res.h>
    6366#include <ipc/serial_ctl.h>
     
    409412static int ns8250_interrupt_enable(ns8250_t *ns)
    410413{
     414        /*
     415         * Enable interrupt using IRC service.
     416         * TODO: This is a temporary solution until the device framework
     417         * takes care of this itself.
     418         */
     419        async_sess_t *irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
     420            SERVICE_IRC, 0, 0);
     421        if (!irc_sess) {
     422                return EIO;
     423        }
     424
     425        async_exch_t *exch = async_exchange_begin(irc_sess);
     426        if (!exch) {
     427                return EIO;
     428        }
     429        async_msg_1(exch, IRC_ENABLE_INTERRUPT, ns->irq);
     430        async_exchange_end(exch);
     431
    411432        /* Enable interrupt on the serial port. */
    412433        ns8250_port_interrupts_enable(ns->port);
Note: See TracChangeset for help on using the changeset viewer.