Merge remote-tracking branch 'origin/master' into isa/arm64

[lunaix-os.git] / lunaix-os / arch / x86 / hal / ps2kbd.c

diff --git a/lunaix-os/arch/x86/hal/ps2kbd.c b/lunaix-os/arch/x86/hal/ps2kbd.c
index cd5518d8f14afba61c7ad9491de3024ea4e4b4eb..ee4a67e0f99855acb884cd8fc5b87fe386ddcea6 100644 (file)
--- a/lunaix-os/arch/x86/hal/ps2kbd.c
+++ b/lunaix-os/arch/x86/hal/ps2kbd.c
@@ -1,7 +1,6 @@
 #include <lunaix/clock.h>
 #include <lunaix/ds/mutex.h>
 #include <lunaix/input.h>
 #include <lunaix/clock.h>
 #include <lunaix/ds/mutex.h>
 #include <lunaix/input.h>

-#include <asm-generic/isrm.h>

 #include <lunaix/keyboard.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>
 #include <lunaix/keyboard.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>


@@ -12,6 +11,7 @@
 #include <klibc/string.h>
 
 #include "asm/x86_cpu.h"
 #include <klibc/string.h>
 
 #include "asm/x86_cpu.h"

+#include <asm/x86_isrm.h>

 #include <asm/x86_pmio.h>
 
 #define PS2_PORT_ENC_DATA 0x60
 #include <asm/x86_pmio.h>
 
 #define PS2_PORT_ENC_DATA 0x60


@@ -215,7 +215,7 @@ ps2_device_post_cmd(char cmd, char arg)
 }
 
 static int
 }
 
 static int

-ps2_kbd_init(struct device_def* devdef)
+ps2_kbd_create(struct device_def* devdef, morph_t* obj)

 {
 
     memset(&cmd_q, 0, sizeof(cmd_q));
 {
 
     memset(&cmd_q, 0, sizeof(cmd_q));


@@ -569,8 +569,8 @@ ps2_issue_dev_cmd(char cmd, u16_t arg)
 }
 
 static struct device_def devrtc_i8042kbd = {
 }
 
 static struct device_def devrtc_i8042kbd = {

-    .name = "i8042 Keyboard",
-    .class = DEVCLASS(DEVIF_SOC, DEVFN_INPUT, DEV_KBD),
-    .init = ps2_kbd_init
+    def_device_class(INTEL, INPUT, KBD),
+    def_device_name("i8042 Keyboard"),
+    def_on_create(ps2_kbd_create)

 };
 EXPORT_DEVICE(i8042_kbd, &devrtc_i8042kbd, load_onboot);
 };
 EXPORT_DEVICE(i8042_kbd, &devrtc_i8042kbd, load_onboot);