Changeset c309b18 in mainline


Ignore:
Timestamp:
2017-11-27T16:35:20Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
07a70800
Parents:
59953b57
Message:

Move sending side of MSIM console driver out of output server.

Location:
uspace
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/char/msim-con/msim-con.c

    r59953b57 rc309b18  
    106106        }
    107107
     108        rc = pio_enable((void *)res->base, 1, (void **) &con->out_reg);
     109        if (rc != EOK) {
     110                ddf_msg(LVL_ERROR, "Error enabling I/O");
     111                goto error;
     112        }
     113
    108114        ddf_fun_set_conn_handler(fun, msim_con_connection);
    109115
    … …  
    131137                goto error;
    132138        }
     139
     140        ddf_fun_add_to_category(fun, "console");
    133141
    134142        return EOK;
    … …  
    157165static void msim_con_putchar(msim_con_t *con, uint8_t ch)
    158166{
     167        pio_write_8(con->out_reg, ch);
    159168}
    160169

  • uspace/drv/char/msim-con/msim-con.h

    r59953b57 rc309b18  
    3939#include <async.h>
    4040#include <ddf/driver.h>
     41#include <ddi.h>
    4142#include <fibril_synch.h>
    4243#include <io/chardev_srv.h>
    … …  
    6667        fibril_mutex_t buf_lock;
    6768        fibril_condvar_t buf_cv;
     69        ioport8_t *out_reg;
    6870} msim_con_t;
    6971

  • uspace/srv/hid/output/Makefile

    r59953b57 rc309b18  
    3535        ctl/serial.c \
    3636        port/ega.c \
    37         port/kchar.c \
    3837        port/chardev.c \
    3938        proto/vt100.c \

  • uspace/srv/hid/output/output.c

    r59953b57 rc309b18  
    3636#include <config.h>
    3737#include "port/ega.h"
    38 #include "port/kchar.h"
    3938#include "port/chardev.h"
    4039#include "output.h"
    … …  
    477476        if (!config_key_exists("console")) {
    478477                ega_init();
    479                 kchar_init();
    480478        }
    481479       

  • uspace/srv/hid/output/port/chardev.c

    r59953b57 rc309b18  
    190190#elif defined(UARCH_sparc64) && defined(PROCESSOR_sun4v)
    191191                /* OK */
     192#elif defined(MACHINE_msim)
     193                /* OK */
    192194#else
    193195                return EOK;
Note: See TracChangeset for help on using the changeset viewer.