WebSVN – HelenOS – Path Comparison – / – /branches/network/uspace/srv/kbd/port/ Rev 4326 and /branches/network/uspace/srv/kbd/port/ Rev 4327

Ignore whitespace Rev 4326 → Rev 4327

 /branches/network/uspace/srv/kbd/port/ns16550.c
 ,10 → 35,12
  */
 #include <ipc/ipc.h>
+#include <ipc/bus.h>
 #include <async.h>
 #include <sysinfo.h>
 #include <kbd.h>
 #include <kbd_port.h>
+#include <sun.h>
 #include <ddi.h>
 /* NS16550 registers */
 ,7 → 91,7
 static uintptr_t ns16550_physical;
 static uintptr_t ns16550_kernel;
-int kbd_port_init(void)
+int ns16550_port_init(void)
 {
     void *vaddr;
 ,7 → 102,7
     ns16550_kbd.cmds[0].addr = (void *) (ns16550_kernel + LSR_REG);
     ns16550_kbd.cmds[3].addr = (void *) (ns16550_kernel + RBR_REG);
     ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
-, &ns16550_kbd);
+        sysinfo_value("kbd.inr"), &ns16550_kbd);
     return pio_enable((void *) ns16550_physical, 8, &vaddr);
 }
 ,6 → 110,10
 {
     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));
 }
 /**

 /branches/network/uspace/srv/kbd/port/sun.c
 ,0 → 1,66
+/*
+ * 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 <kbd.h>
+#include <kbd_port.h>
+#include <sun.h>
+#include <sysinfo.h>
+/** 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.z8530")) {
+        if (z8530_port_init() == 0)
+            return 0;
+    }
+    if (sysinfo_value("kbd.type.ns16550")) {
+        if (ns16550_port_init() == 0)
+            return 0;
+    }
+    return -1;
+}
+/** @}
+*/

 /branches/network/uspace/srv/kbd/port/z8530.c
 ,6 → 40,7
 #include <sysinfo.h>
 #include <kbd.h>
 #include <kbd_port.h>
+#include <sun.h>
 #include <sys/types.h>
 #include <ddi.h>
 ,7 → 83,7
 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);
     z8530_cmds[0].addr = (void *) sysinfo_value("kbd.address.kernel") +

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4326 → Rev 4327