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

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

diff --git a/lunaix-os/hal/char/devnull.c b/lunaix-os/hal/char/devnull.c
index 7dfd0a780ddcc620e6acb44da4cfad8a29790151..3991548addec6dee0731677d412c00ca55f3fe19 100644 (file)
--- a/lunaix-os/hal/char/devnull.c
+++ b/lunaix-os/hal/char/devnull.c
@@ -1,11 +1,11 @@
 #include <lunaix/device.h>
 #include <lunaix/device.h>

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

 
 static int
 __null_wr_pg(struct device* dev, void* buf, size_t offset)
 {
     // do nothing
 
 static int
 __null_wr_pg(struct device* dev, void* buf, size_t offset)
 {
     // do nothing

-    return PG_SIZE;
+    return PAGE_SIZE;

 }
 
 static int
 }
 
 static int


@@ -30,7 +30,7 @@ __null_rd(struct device* dev, void* buf, size_t offset, size_t len)
 }
 
 static int
 }
 
 static int

-pdev_nulldev_init(struct device_def* def)
+pdev_nulldev_create(struct device_def* def, morph_t* obj)

 {
     struct device* devnull = device_allocseq(NULL, NULL);
     devnull->ops.write_page = __null_wr_pg;
 {
     struct device* devnull = device_allocseq(NULL, NULL);
     devnull->ops.write_page = __null_wr_pg;


@@ -38,14 +38,14 @@ pdev_nulldev_init(struct device_def* def)
     devnull->ops.read_page = __null_rd_pg;
     devnull->ops.read = __null_rd;
 
     devnull->ops.read_page = __null_rd_pg;
     devnull->ops.read = __null_rd;
 

-    device_register(devnull, &def->class, "null");
+    register_device(devnull, &def->class, "null");

 
     return 0;
 }
 
 static struct device_def devnull_def = {
 
     return 0;
 }
 
 static struct device_def devnull_def = {

-    .name = "null",
-    .class = DEVCLASSV(DEVIF_NON, DEVFN_PSEUDO, DEV_NULL, DEV_BUILTIN_NULL),
-    .init = pdev_nulldev_init
+    def_device_name("edendi"),
+    def_device_class(LUNAIX, PSEUDO, NIHIL),
+    def_on_create(pdev_nulldev_create)

 };
 EXPORT_DEVICE(nulldev, &devnull_def, load_onboot);
 };
 EXPORT_DEVICE(nulldev, &devnull_def, load_onboot);