Index: uspace/srv/kbd/Makefile =================================================================== --- uspace/srv/kbd/Makefile (revision f03afad718ff8655274836534b65e4a5b4f6d098) +++ uspace/srv/kbd/Makefile (revision 92393339320e8b26d3efc3a31ddafb4aa99091ae) @@ -60,7 +60,9 @@ ctl/pc.c endif + ifeq ($(UARCH), arm32) GENARCH_SOURCES += \ port/gxemul.c + ifeq ($(CONFIG_FB), y) GENARCH_SOURCES += \ @@ -71,4 +73,5 @@ endif endif + ifeq ($(UARCH), ia32) GENARCH_SOURCES += \ @@ -76,4 +79,5 @@ ctl/pc.c endif + ifeq ($(MACHINE), i460GX) GENARCH_SOURCES += \ @@ -81,4 +85,5 @@ ctl/pc.c endif + ifeq ($(MACHINE), ski) GENARCH_SOURCES += \ @@ -86,4 +91,5 @@ ctl/stty.c endif + ifeq ($(MACHINE), msim) GENARCH_SOURCES += \ @@ -91,7 +97,9 @@ ctl/stty.c endif + ifeq ($(MACHINE), lgxemul) GENARCH_SOURCES += \ port/gxemul.c + ifeq ($(CONFIG_FB), y) GENARCH_SOURCES += \ @@ -102,4 +110,5 @@ endif endif + ifeq ($(MACHINE), bgxemul) GENARCH_SOURCES += \ @@ -107,4 +116,5 @@ ctl/stty.c endif + ifeq ($(UARCH), ppc32) GENARCH_SOURCES += \ @@ -112,14 +122,17 @@ ctl/stty.c endif + ifeq ($(UARCH), sparc64) - ifeq ($(MACHINE),serengeti) - GENARCH_SOURCES += \ - port/sgcn.c \ - ctl/stty.c - else - GENARCH_SOURCES += \ - port/z8530.c \ - ctl/sun.c - endif + ifeq ($(MACHINE),serengeti) + GENARCH_SOURCES += \ + port/sgcn.c \ + ctl/stty.c + else + GENARCH_SOURCES += \ + port/sun.c \ + port/z8530.c \ + port/ns16550.c \ + ctl/sun.c + endif endif Index: uspace/srv/kbd/include/sun.h =================================================================== --- uspace/srv/kbd/include/sun.h (revision 92393339320e8b26d3efc3a31ddafb4aa99091ae) +++ uspace/srv/kbd/include/sun.h (revision 92393339320e8b26d3efc3a31ddafb4aa99091ae) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2009 Martin Decky + * 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 kbdgen generic + * @brief Sun keyboard virtual port driver. + * @ingroup kbd + * @{ + */ +/** @file + */ + +#ifndef KBD_SUN_H_ +#define KBD_SUN_H_ + +extern int ns16550_port_init(void); +extern int z8530_port_init(void); + +#endif + +/** + * @} + */ Index: uspace/srv/kbd/port/ns16550.c =================================================================== --- uspace/srv/kbd/port/ns16550.c (revision f03afad718ff8655274836534b65e4a5b4f6d098) +++ uspace/srv/kbd/port/ns16550.c (revision 92393339320e8b26d3efc3a31ddafb4aa99091ae) @@ -36,8 +36,10 @@ #include +#include #include #include #include #include +#include #include @@ -90,5 +92,5 @@ static uintptr_t ns16550_kernel; -int kbd_port_init(void) +int ns16550_port_init(void) { void *vaddr; @@ -101,5 +103,5 @@ ns16550_kbd.cmds[3].addr = (void *) (ns16550_kernel + RBR_REG); ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), - 0, &ns16550_kbd); + sysinfo_value("kbd.inr"), &ns16550_kbd); return pio_enable((void *) ns16550_physical, 8, &vaddr); } @@ -109,4 +111,8 @@ int scan_code = IPC_GET_ARG2(*call); kbd_push_scancode(scan_code); + + if (cir_service) + async_msg_1(cir_phone, BUS_CLEAR_INTERRUPT, + IPC_GET_METHOD(*call)); } Index: uspace/srv/kbd/port/sun.c =================================================================== --- uspace/srv/kbd/port/sun.c (revision 92393339320e8b26d3efc3a31ddafb4aa99091ae) +++ uspace/srv/kbd/port/sun.c (revision 92393339320e8b26d3efc3a31ddafb4aa99091ae) @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2009 Martin Decky + * 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 Sun keyboard virtual port driver. + */ + +#include +#include +#include +#include + +typedef enum { + KBD_UNKNOWN, + KBD_Z8530, + KBD_NS16550, + KBD_SGCN +} kbd_type_t; + +/** Sun keyboard virtual port driver. + * + * This is a virtual port driver which can use + * both ns16550_port_init and z8530_port_init + * according to the information passed from the + * kernel. This is just a temporal hack. + * + */ +int kbd_port_init(void) +{ + if (sysinfo_value("kbd.type") == KBD_Z8530) + return z8530_port_init(); + else if (sysinfo_value("kbd.type") == KBD_NS16550) + return ns16550_port_init(); + + return -1; +} + +/** @} +*/ Index: uspace/srv/kbd/port/z8530.c =================================================================== --- uspace/srv/kbd/port/z8530.c (revision f03afad718ff8655274836534b65e4a5b4f6d098) +++ uspace/srv/kbd/port/z8530.c (revision 92393339320e8b26d3efc3a31ddafb4aa99091ae) @@ -41,4 +41,5 @@ #include #include +#include #include #include @@ -83,5 +84,5 @@ static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call); -int kbd_port_init(void) +int z8530_port_init(void) { async_set_interrupt_received(z8530_irq_handler);