Issue Solve #77 Working on Issue #76

Bone-Project · Dec 9, 2016 · e33ecc5 · e33ecc5
1 parent 68dbee4
commit e33ecc5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
@@ -31,7 +31,7 @@ CSRCS = \
 	cpu/interrupts/isr.c \
 	drv/driver.c \
 	drv/ps2/kbd/scancodes.c \
-	drv/ps2/kbd/scancodes_usa.c \
+	drv/ps2/kbd/kbd_layouts/scancodes_usa.c \
 	drv/ps2/kbd/utils.c 
 
 cpu/interrupts/interrupts-asm.o: NASMFLAGS += -i cpu/interrupts/

diff --git a/arch/i386/drv/ps2/kbd/kbd.c b/arch/i386/drv/ps2/kbd/kbd.c
@@ -134,9 +134,14 @@ void wait_until_enter(char key)
  */
 void key_handler()
 {
-   if((((char)kbd_info.key) == '6') || 
-   (((char)kbd_info.key) == '8'))
+   //printk("IN KEY HANDLER");
+   if( 
+       (((char)kbd_info.key) == '6') 
+                  || 
+       (((char)kbd_info.key) == '8')
+     )
    {
+       printk("HERE");
         if(kbd_info.is_caps == false && print_scank == true)
         {
           __backspace_count++;
@@ -157,6 +162,7 @@ void key_handler()
    {
      case KBD_QWERTY_LEFT_SHIFT_PRESS:
      case KBD_QWERTY_RIGHT_SHIFT_PRESS:
+       printk("SHIFT");
        kbd_info.is_shift = true;
        break; 
      case KBD_QWERTY_CAPS_PRESS:

diff --git a/arch/i386/drv/ps2/kbd/scancodes_usa.c → ...6/drv/ps2/kbd/kbd_layouts/scancodes_usa.c b/arch/i386/drv/ps2/kbd/scancodes_usa.c → ...6/drv/ps2/kbd/kbd_layouts/scancodes_usa.c
diff --git a/boot/.hide b/boot/.hide
diff --git a/boot/boot/.hide b/boot/boot/.hide