Index: uspace/drv/char/ski-con/ski-con.c =================================================================== --- uspace/drv/char/ski-con/ski-con.c (revision 9940ce0abda70ea8d091bd0be88bbccc2059eceb) +++ uspace/drv/char/ski-con/ski-con.c (revision 5f4c41b2707b6ce8c74bbc436ccf3231213e90a8) @@ -193,4 +193,7 @@ static void ski_con_putchar(ski_con_t *con, char ch) { + if (ch == '\n') + ski_con_putchar(con, '\r'); + #ifdef UARCH_ia64 asm volatile ( @@ -205,6 +208,4 @@ (void) ch; #endif - if (ch == '\n') - ski_con_putchar(con, '\r'); } Index: uspace/drv/char/sun4v-con/sun4v-con.c =================================================================== --- uspace/drv/char/sun4v-con/sun4v-con.c (revision 9940ce0abda70ea8d091bd0be88bbccc2059eceb) +++ uspace/drv/char/sun4v-con/sun4v-con.c (revision 5f4c41b2707b6ce8c74bbc436ccf3231213e90a8) @@ -38,5 +38,5 @@ #include #include -#include +#include #include "sun4v-con.h" @@ -59,6 +59,15 @@ } __attribute__((packed)) __attribute__((aligned(PAGE_SIZE))) *input_buffer_t; +#define OUTPUT_FIFO_SIZE ((PAGE_SIZE) - 2 * sizeof(uint64_t)) + +typedef volatile struct { + uint64_t read_ptr; + uint64_t write_ptr; + char data[OUTPUT_FIFO_SIZE]; +} __attribute__((packed)) output_fifo_t; + /* virtual address of the shared buffer */ static input_buffer_t input_buffer; +static output_fifo_t *output_fifo; static int sun4v_con_read(chardev_srv_t *, void *, size_t, size_t *); @@ -72,6 +81,14 @@ static void sun4v_con_putchar(sun4v_con_t *con, uint8_t data) { - (void) con; - (void) data; + if (data == '\n') + sun4v_con_putchar(con, '\r'); + + while (output_fifo->write_ptr == + (output_fifo->read_ptr + OUTPUT_FIFO_SIZE - 1) + % OUTPUT_FIFO_SIZE); + + output_fifo->data[output_fifo->write_ptr] = data; + output_fifo->write_ptr = + ((output_fifo->write_ptr) + 1) % OUTPUT_FIFO_SIZE; } @@ -105,4 +122,20 @@ } + sysarg_t paddr; + rc = sysinfo_get_value("niagara.outbuf.address", &paddr); + if (rc != EOK) { + ddf_msg(LVL_ERROR, "Outbuf address information not found"); + return rc; + } + + output_fifo = (output_fifo_t *) AS_AREA_ANY; + + rc = physmem_map(paddr, 1, AS_AREA_READ | AS_AREA_WRITE, + (void *) &output_fifo); + if (rc != EOK) { + ddf_msg(LVL_ERROR, "Error mapping memory: %d", rc); + return rc; + } + rc = ddf_fun_bind(fun); if (rc != EOK) { @@ -111,8 +144,8 @@ } + ddf_fun_add_to_category(fun, "console"); + return EOK; error: - /* XXX Clean up thread */ - if (input_buffer != (input_buffer_t) AS_AREA_ANY) physmem_unmap((void *) input_buffer); Index: uspace/srv/hid/output/Makefile =================================================================== --- uspace/srv/hid/output/Makefile (revision 9940ce0abda70ea8d091bd0be88bbccc2059eceb) +++ uspace/srv/hid/output/Makefile (revision 5f4c41b2707b6ce8c74bbc436ccf3231213e90a8) @@ -36,5 +36,4 @@ port/ega.c \ port/kchar.c \ - port/niagara.c \ port/chardev.c \ proto/vt100.c \ Index: uspace/srv/hid/output/output.c =================================================================== --- uspace/srv/hid/output/output.c (revision 9940ce0abda70ea8d091bd0be88bbccc2059eceb) +++ uspace/srv/hid/output/output.c (revision 5f4c41b2707b6ce8c74bbc436ccf3231213e90a8) @@ -37,5 +37,4 @@ #include "port/ega.h" #include "port/kchar.h" -#include "port/niagara.h" #include "port/chardev.h" #include "output.h" @@ -479,5 +478,4 @@ ega_init(); kchar_init(); - niagara_init(); } Index: uspace/srv/hid/output/port/chardev.c =================================================================== --- uspace/srv/hid/output/port/chardev.c (revision 9940ce0abda70ea8d091bd0be88bbccc2059eceb) +++ uspace/srv/hid/output/port/chardev.c (revision 5f4c41b2707b6ce8c74bbc436ccf3231213e90a8) @@ -151,4 +151,14 @@ } + printf("%s: Connecting service %zu\n", NAME, sid); + char *name; + rc = loc_service_get_name(sid, &name); + if (rc != EOK) { + fibril_mutex_unlock(&discovery_lock); + return; + } + printf("%s: Service name is %s\n", NAME, name); + free(name); + sess = loc_service_connect(sid, INTERFACE_DDF, IPC_FLAG_BLOCKING); if (!sess) { @@ -176,5 +186,9 @@ if (!config_key_exists("console")) { console = NULL; -#ifndef MACHINE_ski +#ifdef MACHINE_ski + /* OK */ +#elif defined(UARCH_sparc64) && defined(PROCESSOR_sun4v) + /* OK */ +#else return EOK; #endif Index: pace/srv/hid/output/port/niagara.c =================================================================== --- uspace/srv/hid/output/port/niagara.c (revision 9940ce0abda70ea8d091bd0be88bbccc2059eceb) +++ (revision ) @@ -1,117 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * Copyright (c) 2008 Martin Decky - * Copyright (c) 2008 Pavel Rimsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include "../ctl/serial.h" -#include "niagara.h" - -#define OUTPUT_FIFO_SIZE ((PAGE_SIZE) - 2 * sizeof(uint64_t)) - -typedef volatile struct { - uint64_t read_ptr; - uint64_t write_ptr; - char data[OUTPUT_FIFO_SIZE]; -} __attribute__((packed)) output_fifo_t; - -typedef struct { - output_fifo_t *fifo; -} niagara_t; - -static niagara_t niagara; - -static void niagara_putc(const char c) -{ - while (niagara.fifo->write_ptr == - (niagara.fifo->read_ptr + OUTPUT_FIFO_SIZE - 1) - % OUTPUT_FIFO_SIZE); - - niagara.fifo->data[niagara.fifo->write_ptr] = c; - niagara.fifo->write_ptr = - ((niagara.fifo->write_ptr) + 1) % OUTPUT_FIFO_SIZE; -} - -static void niagara_putchar(wchar_t ch) -{ - if (ascii_check(ch)) - niagara_putc(ch); - else - niagara_putc('?'); -} - -static void niagara_control_puts(const char *str) -{ - while (*str) - niagara_putc(*(str++)); -} - -int niagara_init(void) -{ - sysarg_t present; - int rc = sysinfo_get_value("fb", &present); - if (rc != EOK) - present = false; - - if (!present) - return ENOENT; - - sysarg_t kind; - rc = sysinfo_get_value("fb.kind", &kind); - if (rc != EOK) - kind = (sysarg_t) -1; - - if (kind != 5) - return EINVAL; - - sysarg_t paddr; - rc = sysinfo_get_value("niagara.outbuf.address", &paddr); - if (rc != EOK) - return rc; - - niagara.fifo = (output_fifo_t *) AS_AREA_ANY; - - rc = physmem_map(paddr, 1, AS_AREA_READ | AS_AREA_WRITE, - (void *) &niagara.fifo); - if (rc != EOK) - return rc; - - return serial_init(niagara_putchar, niagara_control_puts); -} - -/** @} - */ Index: pace/srv/hid/output/port/niagara.h =================================================================== --- uspace/srv/hid/output/port/niagara.h (revision 9940ce0abda70ea8d091bd0be88bbccc2059eceb) +++ (revision ) @@ -1,40 +1,0 @@ -/* - * Copyright (c) 2008 Pavel Rimsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @file - */ - -#ifndef OUTPUT_PORT_NIAGARA_H_ -#define OUTPUT_PORT_NIAGARA_H_ - -extern int niagara_init(void); - -#endif - -/** @} - */