Index: uspace/srv/hid/fb/Makefile.build =================================================================== --- uspace/srv/hid/fb/Makefile.build (revision ed90317444652a29e89501a128d66020aaea52b5) +++ uspace/srv/hid/fb/Makefile.build (revision 0eda6e092bb349f2c4f1d222bbc6b02aaa4c82e1) @@ -72,7 +72,15 @@ ifeq ($(UARCH),sparc64) - SOURCES += sgcn.c \ - serial_console.c - CFLAGS += -DSGCN_ENABLED + ifeq ($(PROCESSOR), sun4v) + SOURCES += niagara.c \ + serial_console.c + CFLAGS += -DNIAGARA_ENABLED + endif + + ifeq ($(MACHINE), serengeti) + SOURCES += sgcn.c \ + serial_console.c + CFLAGS += -DSGCN_ENABLED + endif endif Index: uspace/srv/hid/fb/main.c =================================================================== --- uspace/srv/hid/fb/main.c (revision ed90317444652a29e89501a128d66020aaea52b5) +++ uspace/srv/hid/fb/main.c (revision 0eda6e092bb349f2c4f1d222bbc6b02aaa4c82e1) @@ -41,4 +41,5 @@ #include "ski.h" #include "sgcn.h" +#include "niagara.h" #include "main.h" @@ -88,4 +89,10 @@ } #endif +#ifdef NIAGARA_ENABLED + if ((!initialized) && (sysinfo_value("fb.kind") == 5)) { + if (niagara_init() == 0) + initialized = true; + } +#endif #ifdef SKI_ENABLED if ((!initialized) && (sysinfo_value("fb") != true)) { Index: uspace/srv/hid/fb/niagara.c =================================================================== --- uspace/srv/hid/fb/niagara.c (revision 0eda6e092bb349f2c4f1d222bbc6b02aaa4c82e1) +++ uspace/srv/hid/fb/niagara.c (revision 0eda6e092bb349f2c4f1d222bbc6b02aaa4c82e1) @@ -0,0 +1,114 @@ +/* + * 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. + */ + +/** @defgroup niagarafb SGCN + * @brief userland driver of the Niagara console output + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include + +#include "serial_console.h" +#include "niagara.h" + +#define WIDTH 80 +#define HEIGHT 24 + +/** + * Virtual address mapped to the buffer shared with the kernel counterpart. + */ +static uintptr_t output_buffer_addr; + +/* + * Kernel counterpart of the driver reads characters to be printed from here. + * Keep in sync with the definition from + * kernel/arch/sparc64/src/drivers/niagara.c. + */ +#define OUTPUT_BUFFER_SIZE ((PAGE_SIZE) - 2 * 8) +typedef volatile struct { + uint64_t read_ptr; + uint64_t write_ptr; + char data[OUTPUT_BUFFER_SIZE]; +} + __attribute__ ((packed)) + __attribute__ ((aligned(PAGE_SIZE))) + *output_buffer_t; + +output_buffer_t output_buffer; + +/** + * Pushes the character to the Niagara serial. + * @param c character to be pushed + */ +static void niagara_putc(char c) +{ + while (output_buffer->write_ptr == + (output_buffer->read_ptr + OUTPUT_BUFFER_SIZE - 1) + % OUTPUT_BUFFER_SIZE) + ; + output_buffer->data[output_buffer->write_ptr] = (uint64_t) c; + output_buffer->write_ptr = + ((output_buffer->write_ptr) + 1) % OUTPUT_BUFFER_SIZE; +} + +/** + * Initializes the Niagara serial driver. + */ +int niagara_init(void) +{ + output_buffer_addr = (uintptr_t) as_get_mappable_page(PAGE_SIZE); + int result = physmem_map( + (void *) sysinfo_value("niagara.outbuf.address"), + (void *) output_buffer_addr, + 1, AS_AREA_READ | AS_AREA_WRITE); + + if (result != 0) { + printf("Niagara: uspace driver couldn't map physical memory: %d\n", + result); + } + + output_buffer = (output_buffer_t) output_buffer_addr; + + serial_console_init(niagara_putc, WIDTH, HEIGHT); + async_set_client_connection(serial_client_connection); + return 0; +} + +/** + * @} + */ + Index: uspace/srv/hid/fb/niagara.h =================================================================== --- uspace/srv/hid/fb/niagara.h (revision 0eda6e092bb349f2c4f1d222bbc6b02aaa4c82e1) +++ uspace/srv/hid/fb/niagara.h (revision 0eda6e092bb349f2c4f1d222bbc6b02aaa4c82e1) @@ -0,0 +1,46 @@ +/* + * 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. + */ + +/** @defgroup sgcnfb SGCN + * @brief userland driver of the Serengeti console output + * @{ + */ + +/** @file + */ + +#ifndef FB_NIAGARA_H_ +#define FB_NIAGARA_H_ + +int niagara_init(void); + +#endif + +/** + * @} + */ Index: uspace/srv/hid/kbd/Makefile.build =================================================================== --- uspace/srv/hid/kbd/Makefile.build (revision ed90317444652a29e89501a128d66020aaea52b5) +++ uspace/srv/hid/kbd/Makefile.build (revision 0eda6e092bb349f2c4f1d222bbc6b02aaa4c82e1) @@ -130,14 +130,21 @@ ifeq ($(UARCH),sparc64) - ifeq ($(MACHINE),serengeti) + ifeq ($(PROCESSOR),sun4v) SOURCES += \ - port/sgcn.c \ + port/niagara.c \ ctl/stty.c else - SOURCES += \ + ifeq ($(MACHINE),serengeti) + SOURCES += \ + port/sgcn.c \ + ctl/stty.c + endif + ifeq ($(MACHINE),generic) + SOURCES += \ port/sun.c \ port/z8530.c \ port/ns16550.c \ ctl/sun.c + endif endif endif Index: uspace/srv/hid/kbd/port/niagara.c =================================================================== --- uspace/srv/hid/kbd/port/niagara.c (revision 0eda6e092bb349f2c4f1d222bbc6b02aaa4c82e1) +++ uspace/srv/hid/kbd/port/niagara.c (revision 0eda6e092bb349f2c4f1d222bbc6b02aaa4c82e1) @@ -0,0 +1,149 @@ +/* + * 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. + */ + +/** @addtogroup kbd_port + * @ingroup kbd + * @{ + */ +/** @file + * @brief Niagara console keyboard port driver. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define POLL_INTERVAL 10000 + +/** + * Virtual address mapped to the buffer shared with the kernel counterpart. + */ +static uintptr_t input_buffer_addr; + +/* + * Kernel counterpart of the driver pushes characters (it has read) here. + * Keep in sync with the definition from + * kernel/arch/sparc64/src/drivers/niagara.c. + */ +#define INPUT_BUFFER_SIZE ((PAGE_SIZE) - 2 * 8) +typedef volatile struct { + uint64_t write_ptr; + uint64_t read_ptr; + char data[INPUT_BUFFER_SIZE]; +} + __attribute__ ((packed)) + __attribute__ ((aligned(PAGE_SIZE))) + *input_buffer_t; + +/* virtual address of the shared buffer */ +input_buffer_t input_buffer; + +static volatile bool polling_disabled = false; +static void niagara_thread_impl(void *arg); + +/** + * Initializes the Niagara driver. + * Maps the shared buffer and creates the polling thread. + */ +int kbd_port_init(void) +{ + input_buffer_addr = (uintptr_t) as_get_mappable_page(PAGE_SIZE); + int result = physmem_map( + (void *) sysinfo_value("niagara.inbuf.address"), + (void *) input_buffer_addr, + 1, AS_AREA_READ | AS_AREA_WRITE); + + if (result != 0) { + printf("Niagara: uspace driver couldn't map physical memory: %d\n", + result); + } + + input_buffer = (input_buffer_t) input_buffer_addr; + + thread_id_t tid; + int rc; + + rc = thread_create(niagara_thread_impl, NULL, "kbd_poll", &tid); + if (rc != 0) { + return rc; + } + return 0; +} + +void kbd_port_yield(void) +{ + polling_disabled = true; +} + +void kbd_port_reclaim(void) +{ + polling_disabled = false; +} + +void kbd_port_write(uint8_t data) +{ + (void) data; +} + +/** + * Called regularly by the polling thread. Reads codes of all the + * pressed keys from the buffer. + */ +static void niagara_key_pressed(void) +{ + char c; + + while (input_buffer->read_ptr != input_buffer->write_ptr) { + c = input_buffer->data[input_buffer->read_ptr]; + input_buffer->read_ptr = + ((input_buffer->read_ptr) + 1) % INPUT_BUFFER_SIZE; + kbd_push_scancode(c); + } +} + +/** + * Thread to poll SGCN for keypresses. + */ +static void niagara_thread_impl(void *arg) +{ + (void) arg; + + while (1) { + if (polling_disabled == false) + niagara_key_pressed(); + usleep(POLL_INTERVAL); + } +} +/** @} + */