Second Extended Filesystem (ext2) and other improvements (#33)

[lunaix-os.git] / lunaix-os / kernel / device / input.c

diff --git a/lunaix-os/kernel/device/input.c b/lunaix-os/kernel/device/input.c
index 3d974a7987d84f12cea8251d778163b303a473ce..cc3cc1328f2f38c38c1a98af4f4f7f114d6a5c32 100644 (file)
--- a/lunaix-os/kernel/device/input.c
+++ b/lunaix-os/kernel/device/input.c
@@ -1,6 +1,6 @@
 #include <lunaix/clock.h>
 #include <lunaix/input.h>
 #include <lunaix/clock.h>
 #include <lunaix/input.h>

-#include <lunaix/mm/page.h>
+#include <lunaix/mm/pagetable.h>

 #include <lunaix/mm/valloc.h>
 #include <lunaix/spike.h>
 #include <lunaix/status.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/spike.h>
 #include <lunaix/status.h>


@@ -9,7 +9,7 @@
 
 static DEFINE_LLIST(listener_chain);
 
 
 static DEFINE_LLIST(listener_chain);
 

-static struct device* input_devcat = NULL;
+static struct device_cat* input_devcat = NULL;

 
 void
 input_init()
 
 void
 input_init()


@@ -66,7 +66,7 @@ __input_dev_read(struct device* dev, void* buf, size_t offset, size_t len)
 int
 __input_dev_read_pg(struct device* dev, void* buf, size_t offset)
 {
 int
 __input_dev_read_pg(struct device* dev, void* buf, size_t offset)
 {

-    return __input_dev_read(dev, buf, offset, PG_SIZE);
+    return __input_dev_read(dev, buf, offset, PAGE_SIZE);

 }
 
 struct input_device*
 }
 
 struct input_device*


@@ -80,10 +80,10 @@ input_add_device(struct devclass* class, char* name_fmt, ...)
     va_list args;
     va_start(args, name_fmt);
 
     va_list args;
     va_start(args, name_fmt);
 

-    struct device* dev = device_allocseq(input_devcat, idev);
+    struct device* dev = device_allocseq(dev_meta(input_devcat), idev);

 
 

-    device_setname_vargs(dev, name_fmt, args);
-    device_register(dev, class, NULL);
+    device_setname_vargs(dev_meta(dev), name_fmt, args);
+    register_device(dev, class, NULL);

 
     idev->dev_if = dev;
     dev->ops.read = __input_dev_read;
 
     idev->dev_if = dev;
     dev->ops.read = __input_dev_read;