From 49c931aeb0366e9cfa8d8332da5e8cf4ba2ff7e4 Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Tue, 20 May 2014 08:24:37 +0000 Subject: [PATCH] Fixed some issues with numeric part of keyboard. git-svn-id: svn://kolibrios.org@4929 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/hid/keyboard.inc | 45 +++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/kernel/trunk/hid/keyboard.inc b/kernel/trunk/hid/keyboard.inc index 69201f2780..8811aca691 100644 --- a/kernel/trunk/hid/keyboard.inc +++ b/kernel/trunk/hid/keyboard.inc @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2011. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;; ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa ;; ;; Distributed under terms of the GNU General Public License ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -457,19 +457,40 @@ send_scancode: test bl, bl jz .exit.irq1 + cmp cl, 0xE0 ; extended keycode + jne @f + + cmp ch, 53 + jne .dowrite + + mov bl, '/' + jmp .dowrite +@@: + + cmp ch, 55 + jne @f + + mov bl, '*' + jmp .dowrite +@@: + + cmp ch, 74 + jne @f + + mov bl, '-' + jmp .dowrite +@@: + + cmp ch, 78 + jne @f + + mov bl, '+' + jmp .dowrite +@@: + test [kb_state], VKEY_NUMLOCK jz .dowrite - - cmp cl, 0xE0 - jz .dowrite - - cmp ch, 55 - jnz @f - - mov bl, 0x2A ;* - jmp .dowrite -;-------------------------------------- -@@: + cmp ch, 71 jb .dowrite