| /uspace/trunk/kbd/include/keys.h |
|---|
| 37,11 → 37,7 |
| #ifndef _KBD_KEYS_H_ |
| #define _KBD_KEYS_H_ |
| #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_PUSHCHAR 1024 |
| #define KBD_KEY_F1 0x3b |
| #define KBD_KEY_F2 0x3c |
| /uspace/trunk/kbd/include/kbd.h |
|---|
| 37,10 → 37,8 |
| #ifndef __KBD_H__ |
| #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 |
| /uspace/trunk/kbd/arch/ia32/src/mouse.c |
|---|
| File deleted |
| /uspace/trunk/kbd/arch/ia32/src/kbd.c |
|---|
| 449,16 → 449,17 |
| { |
| int status = IPC_GET_ARG1(*call); |
| 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); |
| 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); |
| } |
| } |
| return 1; |
| } |
| /uspace/trunk/kbd/generic/kbd.c |
|---|
| 64,15 → 64,10 |
| { |
| 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)) |
| break; |
| /uspace/trunk/kbd/Makefile |
|---|
| 48,17 → 48,6 |
| ARCH_SOURCES = \ |
| 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))) |