Changeset 50b3d30 in mainline for uspace

Timestamp:

2008-11-30T21:35:13Z (16 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

c716d94

Parents:

1baec4b

Message:

IA64: repair similators support

Location:

uspace/srv/kbd

Files:

• Makefile (modified) (1 diff)
• arch/ia64/include/lkbd.h (added)
• arch/ia64/include/scanc.h (added)
• arch/ia64/src/kbd.c (modified) (4 diffs)
• arch/ia64/src/lkbd.c (added)
• arch/ia64/src/mouse.c (added)
• arch/ia64/src/scanc.c (added)

uspace/srv/kbd/Makefile

@@ -60 +60 @@
         CFLAGS += -DMOUSE_ENABLED
 endif
+ifeq ($(ARCH), ia64)
+        ARCH_SOURCES += \
+                arch/$(ARCH)/src/mouse.c \
+                arch/$(ARCH)/src/scanc.c \
+                arch/$(ARCH)/src/lkbd.c
+        GENARCH_SOURCES = \
+                genarch/src/kbd.c
+        CFLAGS += -DMOUSE_ENABLED
+endif
 ifeq ($(ARCH), amd64)
         ARCH_SOURCES += \

uspace/srv/kbd/arch/ia64/src/kbd.c

@@ -59 +59 @@
 
 
+extern int lkbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call);
+extern int lkbd_arch_init(void);
+
+
+
 #define KEY_F1 0x504f1b
 #define KEY_F2 0x514f1b
@@ -141 +146 @@
                 kbd_type=sysinfo_value("kbd.type");
                 if(kbd_type==KBD_SKI) ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &ski_kbd);
+                if(kbd_type==KBD_LEGACY) return lkbd_arch_init();
                 if(kbd_type==KBD_NS16550) {
                         ns16550_kbd.cmds[0].addr= (void *)  (sysinfo_value("kbd.port")+RBR_REG);
@@ -323 +329 @@
         //keybuffer_push(keybuffer, ' ');
         //*/
-
         
         if (scan_code) {
@@ -390 +395 @@
         if(kbd_type==KBD_SKI) return kbd_ski_process(keybuffer,call);
         if(kbd_type==KBD_NS16550) return kbd_ns16550_process(keybuffer,call);
+        if(kbd_type==KBD_LEGACY) return lkbd_arch_process(keybuffer,call);