Support to multi-threading and pthread interface (POSIX.1-2008) (#23)

[lunaix-os.git] / lunaix-os / hal / char / ps2kbd.c

diff --git a/lunaix-os/hal/char/ps2kbd.c b/lunaix-os/hal/char/ps2kbd.c
index a5cc93d11c1fe71028f93bbb337e19de54ca6164..7b14048901fd79d2808666f8842c238d5a597a30 100644 (file)
--- a/lunaix-os/hal/char/ps2kbd.c
+++ b/lunaix-os/hal/char/ps2kbd.c
@@ -5,13 +5,13 @@
 #include <lunaix/keyboard.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>
 #include <lunaix/keyboard.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>

+#include <lunaix/pcontext.h>

 
 #include <hal/intc.h>
 
 #include <klibc/string.h>
 
 #include <sys/cpu.h>
 
 #include <hal/intc.h>
 
 #include <klibc/string.h>
 
 #include <sys/cpu.h>

-#include <sys/interrupts.h>

 #include <sys/port_io.h>
 
 #define PS2_PORT_ENC_DATA 0x60
 #include <sys/port_io.h>
 
 #define PS2_PORT_ENC_DATA 0x60


@@ -260,8 +260,6 @@ ps2_kbd_init(struct device_def* devdef)
 
     char result;
 
 
     char result;
 

-    cpu_disable_interrupt();
-

     // 1、禁用任何的PS/2设备
     ps2_post_cmd(PS2_PORT_CTRL_CMDREG, PS2_CMD_PORT1_DISABLE, PS2_NO_ARG);
     ps2_post_cmd(PS2_PORT_CTRL_CMDREG, PS2_CMD_PORT2_DISABLE, PS2_NO_ARG);
     // 1、禁用任何的PS/2设备
     ps2_post_cmd(PS2_PORT_CTRL_CMDREG, PS2_CMD_PORT1_DISABLE, PS2_NO_ARG);
     ps2_post_cmd(PS2_PORT_CTRL_CMDREG, PS2_CMD_PORT2_DISABLE, PS2_NO_ARG);


@@ -311,7 +309,6 @@ ps2_kbd_init(struct device_def* devdef)
      */
     isrm_bindirq(PC_AT_IRQ_KBD, intr_ps2_kbd_handler);
 
      */
     isrm_bindirq(PC_AT_IRQ_KBD, intr_ps2_kbd_handler);
 

-    cpu_enable_interrupt();

     return 0;
 
 done:
     return 0;
 
 done: