Index: uspace/srv/hid/input/Makefile =================================================================== --- uspace/srv/hid/input/Makefile (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ uspace/srv/hid/input/Makefile (revision b361bddca86ed91d75f08d01749d54938ed02785) @@ -49,7 +49,5 @@ port/ns16550.c \ port/pl050.c \ - port/sgcn.c \ port/ski.c \ - port/z8530.c \ proto/adb.c \ proto/mousedev.c \ Index: uspace/srv/hid/input/generic/input.c =================================================================== --- uspace/srv/hid/input/generic/input.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ uspace/srv/hid/input/generic/input.c (revision b361bddca86ed91d75f08d01749d54938ed02785) @@ -424,9 +424,5 @@ kbd_add_dev(&niagara_port, &stty_ctl); #endif -#if defined(UARCH_sparc64) && defined(MACHINE_serengeti) - kbd_add_dev(&sgcn_port, &stty_ctl); -#endif #if defined(UARCH_sparc64) && defined(MACHINE_generic) - kbd_add_dev(&z8530_port, &sun_ctl); kbd_add_dev(&ns16550_port, &sun_ctl); #endif @@ -556,5 +552,4 @@ printf("%s: HelenOS input service\n", NAME); - sysarg_t fhc; sysarg_t obio; @@ -562,6 +557,5 @@ list_initialize(&mouse_devs); - if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc)) - || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))) + if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)) irc_service = true; Index: uspace/srv/hid/input/include/kbd_port.h =================================================================== --- uspace/srv/hid/input/include/kbd_port.h (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ uspace/srv/hid/input/include/kbd_port.h (revision b361bddca86ed91d75f08d01749d54938ed02785) @@ -56,7 +56,5 @@ extern kbd_port_ops_t ns16550_port; extern kbd_port_ops_t pl050_port; -extern kbd_port_ops_t sgcn_port; extern kbd_port_ops_t ski_port; -extern kbd_port_ops_t z8530_port; #endif Index: uspace/srv/hid/input/port/niagara.c =================================================================== --- uspace/srv/hid/input/port/niagara.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ uspace/srv/hid/input/port/niagara.c (revision b361bddca86ed91d75f08d01749d54938ed02785) @@ -154,5 +154,5 @@ /** - * Thread to poll SGCN for keypresses. + * Thread to poll Niagara console for keypresses. */ static void niagara_thread_impl(void *arg) Index: uspace/srv/hid/input/port/sgcn.c =================================================================== --- uspace/srv/hid/input/port/sgcn.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ (revision ) @@ -1,205 +1,0 @@ -/* - * Copyright (c) 2008 Pavel Rimsky - * Copyright (c) 2011 Jiri Svoboda - * 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 SGCN (Serengeti Console) keyboard port driver. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static int sgcn_port_init(kbd_dev_t *); -static void sgcn_port_yield(void); -static void sgcn_port_reclaim(void); -static void sgcn_port_write(uint8_t data); - -kbd_port_ops_t sgcn_port = { - .init = sgcn_port_init, - .yield = sgcn_port_yield, - .reclaim = sgcn_port_reclaim, - .write = sgcn_port_write -}; - -static kbd_dev_t *kbd_dev; - -#define POLL_INTERVAL 10000 - -/** - * SGCN buffer header. It is placed at the very beginning of the SGCN - * buffer. - */ -typedef struct { - /** hard-wired to "CON" */ - char magic[4]; - - /** we don't need this */ - char unused[8]; - - /** offset within the SGCN buffer of the input buffer start */ - uint32_t in_begin; - - /** offset within the SGCN buffer of the input buffer end */ - uint32_t in_end; - - /** offset within the SGCN buffer of the input buffer read pointer */ - uint32_t in_rdptr; - - /** offset within the SGCN buffer of the input buffer write pointer */ - uint32_t in_wrptr; -} __attribute__ ((packed)) sgcn_buffer_header_t; - -/* - * Returns a pointer to the object of a given type which is placed at the given - * offset from the console buffer beginning. - */ -#define SGCN_BUFFER(type, offset) \ - ((type *) (sram_virt_addr + sram_buffer_offset + (offset))) - -/** Returns a pointer to the console buffer header. */ -#define SGCN_BUFFER_HEADER (SGCN_BUFFER(sgcn_buffer_header_t, 0)) - -/** - * Virtual address mapped to SRAM. - */ -static uintptr_t sram_virt_addr; - -/** - * SGCN buffer offset within SGCN. - */ -static uintptr_t sram_buffer_offset; - -/* polling thread */ -static void sgcn_thread_impl(void *arg); - -static volatile bool polling_disabled = false; - -/** - * Initializes the SGCN driver. - * Maps the physical memory (SRAM) and creates the polling thread. - */ -static int sgcn_port_init(kbd_dev_t *kdev) -{ - kbd_dev = kdev; - - sysarg_t sram_paddr; - if (sysinfo_get_value("sram.address.physical", &sram_paddr) != EOK) - return -1; - - sysarg_t sram_size; - if (sysinfo_get_value("sram.area.size", &sram_size) != EOK) - return -1; - - if (sysinfo_get_value("sram.buffer.offset", &sram_buffer_offset) != EOK) - sram_buffer_offset = 0; - - sram_virt_addr = (uintptr_t) as_get_mappable_page(sram_size); - - if (physmem_map((void *) sram_paddr, (void *) sram_virt_addr, - sram_size / PAGE_SIZE, AS_AREA_READ | AS_AREA_WRITE) != 0) { - printf("SGCN: uspace driver could not map physical memory."); - return -1; - } - - thread_id_t tid; - int rc = thread_create(sgcn_thread_impl, NULL, "kbd_poll", &tid); - if (rc != 0) - return rc; - - return 0; -} - -static void sgcn_port_yield(void) -{ - polling_disabled = true; -} - -static void sgcn_port_reclaim(void) -{ - polling_disabled = false; -} - -static void sgcn_port_write(uint8_t data) -{ - (void) data; -} - -/** - * Handler of the "key pressed" event. Reads codes of all the pressed keys from - * the buffer. - */ -static void sgcn_key_pressed(void) -{ - char c; - - uint32_t begin = SGCN_BUFFER_HEADER->in_begin; - uint32_t end = SGCN_BUFFER_HEADER->in_end; - uint32_t size = end - begin; - - volatile char *buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); - volatile uint32_t *in_wrptr_ptr = &(SGCN_BUFFER_HEADER->in_wrptr); - volatile uint32_t *in_rdptr_ptr = &(SGCN_BUFFER_HEADER->in_rdptr); - - while (*in_rdptr_ptr != *in_wrptr_ptr) { - c = *buf_ptr; - *in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin; - buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); - kbd_push_data(kbd_dev, c); - } -} - -/** - * Thread to poll SGCN for keypresses. - */ -static void sgcn_thread_impl(void *arg) -{ - (void) arg; - - while (1) { - if (polling_disabled == false) - sgcn_key_pressed(); - usleep(POLL_INTERVAL); - } -} - -/** @} - */ Index: uspace/srv/hid/input/port/z8530.c =================================================================== --- uspace/srv/hid/input/port/z8530.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ (revision ) @@ -1,152 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * Copyright (c) 2011 Jiri Svoboda - * 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 Z8530 keyboard port driver. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static int z8530_port_init(kbd_dev_t *); -static void z8530_port_yield(void); -static void z8530_port_reclaim(void); -static void z8530_port_write(uint8_t data); - -kbd_port_ops_t z8530_port = { - .init = z8530_port_init, - .yield = z8530_port_yield, - .reclaim = z8530_port_reclaim, - .write = z8530_port_write -}; - -static kbd_dev_t *kbd_dev; - -#define CHAN_A_STATUS 4 -#define CHAN_A_DATA 6 - -#define RR0_RCA 1 - -static irq_cmd_t z8530_cmds[] = { - { - .cmd = CMD_PIO_READ_8, - .addr = (void *) 0, /* Will be patched in run-time */ - .dstarg = 1 - }, - { - .cmd = CMD_BTEST, - .value = RR0_RCA, - .srcarg = 1, - .dstarg = 3 - }, - { - .cmd = CMD_PREDICATE, - .value = 2, - .srcarg = 3 - }, - { - .cmd = CMD_PIO_READ_8, - .addr = (void *) 0, /* Will be patched in run-time */ - .dstarg = 2 - }, - { - .cmd = CMD_ACCEPT - } -}; - -static irq_code_t z8530_kbd = { - sizeof(z8530_cmds) / sizeof(irq_cmd_t), - z8530_cmds -}; - -static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call); - -static int z8530_port_init(kbd_dev_t *kdev) -{ - kbd_dev = kdev; - - sysarg_t z8530; - if (sysinfo_get_value("kbd.type.z8530", &z8530) != EOK) - return -1; - if (!z8530) - return -1; - - sysarg_t kaddr; - if (sysinfo_get_value("kbd.address.kernel", &kaddr) != EOK) - return -1; - - sysarg_t inr; - if (sysinfo_get_value("kbd.inr", &inr) != EOK) - return -1; - - z8530_cmds[0].addr = (void *) kaddr + CHAN_A_STATUS; - z8530_cmds[3].addr = (void *) kaddr + CHAN_A_DATA; - - async_set_interrupt_received(z8530_irq_handler); - register_irq(inr, device_assign_devno(), inr, &z8530_kbd); - - return 0; -} - -static void z8530_port_yield(void) -{ -} - -static void z8530_port_reclaim(void) -{ -} - -static void z8530_port_write(uint8_t data) -{ - (void) data; -} - -static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call) -{ - kbd_push_data(kbd_dev, IPC_GET_ARG2(*call)); - - if (irc_service) - async_obsolete_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, - IPC_GET_IMETHOD(*call)); -} - -/** @} - */