Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 7aa9430 in mainline


Ignore:
Timestamp:
2017-11-10T18:59:18Z (3 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
Children:
19397be
Parents:
3a37751
Message:

Move receiving side of Niagara console to a separate driver.

Files:
8 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/sparc64/Makefile.inc

    r3a37751 r7aa9430  
    3939EXTRA_CFLAGS = -mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow
    4040
     41ifeq ($(PROCESSOR), sun4v)
     42RD_DRVS_ESSENTIAL += \
     43        platform/sun4v \
     44        char/sun4v-con
     45else
    4146RD_DRVS_ESSENTIAL += \
    4247        platform/sun4u \
     
    4853RD_DRV_CFG += \
    4954        bus/isa
     55endif
    5056
    5157SOURCES = \
  • uspace/Makefile

    r3a37751 r7aa9430  
    161161        drv/char/ps2mouse \
    162162        drv/char/ski-con \
     163        drv/char/sun4v-con \
    163164        drv/char/xtkbd \
    164165        drv/test/test1 \
     
    183184        drv/platform/pc \
    184185        drv/platform/ski \
     186        drv/platform/sun4v \
    185187        drv/time/cmos-rtc
    186188
  • uspace/drv/char/msim-con/msim-con.c

    r3a37751 r7aa9430  
    6868        msim_cmds
    6969};
    70 #include <stdio.h>
     70
    7171static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call, void *arg)
    7272{
     
    7575
    7676        c = IPC_GET_ARG2(*call);
    77         printf("key=%d\n", c);
     77
    7878        if (con->client_sess != NULL) {
    7979                async_exch_t *exch = async_exchange_begin(con->client_sess);
     
    9090        int rc;
    9191
    92         printf("msim_con_add\n");
    9392        fun = ddf_fun_create(con->dev, fun_exposed, "a");
    9493        if (fun == NULL) {
     
    112111        }
    113112
    114         printf("msim_con_add: irq subscribe\n");
    115 
    116113        msim_ranges[0].base = paddr;
    117114        msim_cmds[0].addr = (void *) paddr;
     
    119116        subscribed = true;
    120117
    121         printf("msim_con_add: bind\n");
    122118        rc = ddf_fun_bind(fun);
    123119        if (rc != EOK) {
     
    126122        }
    127123
    128         printf("msim_con_add: DONE\n");
    129124        return EOK;
    130125error:
     
    162157        async_answer_0(iid, EOK);
    163158
    164         printf("msim_con_connection\n");
    165 
    166159        con = (msim_con_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
    167160
     
    185178                        } else
    186179                                async_answer_0(callid, ELIMIT);
    187                         printf("msim_con_connection: set client_sess\n");
    188180                } else {
    189181                        switch (method) {
  • uspace/drv/platform/sun4u/sun4u.ma

    r3a37751 r7aa9430  
    1110 platform/sun4u
     210 platform/sun4v
  • uspace/srv/hid/input/Makefile

    r3a37751 r7aa9430  
    4040        port/adb_mouse.c \
    4141        port/chardev.c \
    42         port/niagara.c \
    4342        proto/adb.c \
    4443        proto/mousedev.c \
  • uspace/srv/hid/input/input.c

    r3a37751 r7aa9430  
    647647#endif
    648648#if defined(UARCH_sparc64) && defined(PROCESSOR_sun4v)
    649         kbd_add_dev(&niagara_port, &stty_ctl);
     649        kbd_add_dev(&chardev_port, &stty_ctl);
    650650#endif
    651651        /* Silence warning on abs32le about kbd_add_dev() being unused */
  • uspace/srv/hid/input/kbd_port.h

    r3a37751 r7aa9430  
    4949extern kbd_port_ops_t adb_port;
    5050extern kbd_port_ops_t chardev_port;
    51 extern kbd_port_ops_t niagara_port;
    5251extern kbd_port_ops_t ns16550_port;
    5352
  • uspace/srv/hid/input/port/chardev.c

    r3a37751 r7aa9430  
    6161        /** S3C24xx UART - Openmoko debug console */
    6262        "char/s3c24xx_uart",
    63         /** Ski console, MSIM console */
     63        /** Ski console, MSIM console, Sun4v console */
    6464        "devices/\\hw\\console\\a"
    6565};
Note: See TracChangeset for help on using the changeset viewer.