Changeset 9239333 in mainline

Timestamp:

2009-04-15T15:44:51Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d15815e2

Parents:

f03afad

Message:

add NS16550 support for sparc64

Location:

uspace/srv/kbd

Files:

• Makefile (modified) (9 diffs)
• include/sun.h (added)
• port/ns16550.c (modified) (4 diffs)
• port/sun.c (added)
• port/z8530.c (modified) (2 diffs)

uspace/srv/kbd/Makefile

@@ -60 +60 @@
                 ctl/pc.c
 endif
+
 ifeq ($(UARCH), arm32)
         GENARCH_SOURCES += \
                 port/gxemul.c
+        
         ifeq ($(CONFIG_FB), y)
                 GENARCH_SOURCES += \
@@ -71 +73 @@
         endif
 endif
+
 ifeq ($(UARCH), ia32)
         GENARCH_SOURCES += \
@@ -76 +79 @@
                 ctl/pc.c
 endif
+
 ifeq ($(MACHINE), i460GX)
         GENARCH_SOURCES += \
@@ -81 +85 @@
                 ctl/pc.c
 endif
+
 ifeq ($(MACHINE), ski)
         GENARCH_SOURCES += \
@@ -86 +91 @@
                 ctl/stty.c
 endif
+
 ifeq ($(MACHINE), msim)
         GENARCH_SOURCES += \
@@ -91 +97 @@
                 ctl/stty.c
 endif
+
 ifeq ($(MACHINE), lgxemul)
         GENARCH_SOURCES += \
                 port/gxemul.c
+        
         ifeq ($(CONFIG_FB), y)
                 GENARCH_SOURCES += \
@@ -102 +110 @@
         endif
 endif
+
 ifeq ($(MACHINE), bgxemul)
         GENARCH_SOURCES += \
@@ -107 +116 @@
                 ctl/stty.c
 endif
+
 ifeq ($(UARCH), ppc32)
         GENARCH_SOURCES += \
@@ -112 +122 @@
                 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
 

uspace/srv/kbd/port/ns16550.c

@@ -36 +36 @@
 
 #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>
 
@@ -90 +92 @@
 static uintptr_t ns16550_kernel; 
 
-int kbd_port_init(void)
+int ns16550_port_init(void)
 {
         void *vaddr;
@@ -101 +103 @@
         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 +111 @@
         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));
 }
 

uspace/srv/kbd/port/z8530.c

@@ -41 +41 @@
 #include <kbd.h>
 #include <kbd_port.h>
+#include <sun.h>
 #include <sys/types.h>
 #include <ddi.h>
@@ -83 +84 @@
 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);