Changeset 830ac99 in mainline for kbd

Timestamp:

2006-06-15T19:53:38Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

096ba7a

Parents:

7a0c530

Message:

Added mouse input. Still missing support in console and framebuffer.

Location:

kbd

Files:

• Makefile (modified) (1 diff)
• arch/ia32/src/kbd.c (modified) (1 diff)
• arch/ia32/src/mouse.c (added)
• generic/kbd.c (modified) (1 diff)
• include/kbd.h (modified) (1 diff)
• include/keys.h (modified) (1 diff)

kbd/Makefile

@@ -49 +49 @@
         arch/$(ARCH)/src/kbd.c
 
+ifeq ($(ARCH), ia32)
+        ARCH_SOURCES += arch/$(ARCH)/src/mouse.c
+        CFLAGS += -DMOUSE_ENABLED
+endif
+ifeq ($(ARCH), amd64)
+        ARCH_SOURCES += arch/$(ARCH)/src/mouse.c
+        CFLAGS += -DMOUSE_ENABLED
+endif
+
+
+
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))

kbd/arch/ia32/src/kbd.c

@@ -450 +450 @@
         int status = IPC_GET_ARG1(*call);
 
-        if ((status & i8042_MOUSE_DATA)) {
-                ;
-        } else {
-                int scan_code = IPC_GET_ARG2(*call);
-                
-                if (scan_code != IGNORE_CODE) {
-                        if (scan_code & KEY_RELEASE)
-                                key_released(keybuffer, scan_code ^ KEY_RELEASE);
-                        else
-                                key_pressed(keybuffer, scan_code);
-                }
+        if ((status & i8042_MOUSE_DATA))
+                return 0;
+        
+        int scan_code = IPC_GET_ARG2(*call);
+        
+        if (scan_code != IGNORE_CODE) {
+                if (scan_code & KEY_RELEASE)
+                        key_released(keybuffer, scan_code ^ KEY_RELEASE);
+                else
+                        key_pressed(keybuffer, scan_code);
         }
         return  1;

kbd/generic/kbd.c

@@ -65 +65 @@
         int chr;
 
+#ifdef MOUSE_ENABLED
+        if (mouse_arch_process(phone2cons, call))
+                return;
+#endif
+        
+        kbd_arch_process(&keybuffer, call);
+
         if (cons_connected && phone2cons != -1) {
                 /* recode to ASCII - one interrupt can produce more than one code so result is stored in fifo */
-                kbd_arch_process(&keybuffer, call);
-                
                 while (!keybuffer_empty(&keybuffer)) {
                         if (!keybuffer_pop(&keybuffer, (int *)&chr))

kbd/include/kbd.h

@@ -38 +38 @@
 #define __KBD_H__
 
+#include <key_buffer.h>
 
 int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call);
+int mouse_arch_process(int phoneid, ipc_call_t *call);
 
 #endif

kbd/include/keys.h

@@ -38 +38 @@
 #define _KBD_KEYS_H_
 
-#define KBD_PUSHCHAR 1024
+#define KBD_PUSHCHAR    1024
+#define KBD_MS_LEFT     1025
+#define KBD_MS_RIGHT    1026
+#define KBD_MS_MIDDLE   1027
+#define KBD_MS_MOVE     1028
 
 #define KBD_KEY_F1      0x3b