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

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

diff --git a/lunaix-os/hal/char/devzero.c b/lunaix-os/hal/char/devzero.c
index 77885d7a0e4975252ff244ff0b5d1103e24742d3..3eb9ea49d6855a1951e6a2891ee99952c65dca3b 100644 (file)
--- a/lunaix-os/hal/char/devzero.c
+++ b/lunaix-os/hal/char/devzero.c
@@ -1,24 +1,24 @@
 #include <lunaix/device.h>
-#include <lunaix/mm/page.h>
+#include <lunaix/mm/pagetable.h>
 
 #include <klibc/string.h>
 
 static int
 __zero_rd_pg(struct device* dev, void* buf, size_t offset)
 {
-    memset(&((u8_t*)buf)[offset], 0, PG_SIZE);
-    return PG_SIZE;
+    memset(buf, 0, PAGE_SIZE);
+    return PAGE_SIZE;
 }
 
 static int
 __zero_rd(struct device* dev, void* buf, size_t offset, size_t len)
 {
-    memset(&((u8_t*)buf)[offset], 0, len);
+    memset(buf, 0, len);
     return len;
 }
 
 static int
-pdev_zerodev_init(struct device_def* def)
+pdev_zerodev_create(struct device_def* def, morph_t* obj)
 {
     struct device* devzero = device_allocseq(NULL, NULL);
     devzero->ops.read_page = __zero_rd_pg;
@@ -30,7 +30,8 @@ pdev_zerodev_init(struct device_def* def)
 }
 
 static struct device_def devzero_def = {
-    .name = "zero",
-    .class = DEVCLASSV(DEVIF_NON, DEVFN_PSEUDO, DEV_ZERO, DEV_BUILTIN_ZERO),
-    .init = pdev_zerodev_init};
+    def_device_name("nihil"),
+    def_device_class(LUNAIX, PSEUDO, ZERO),
+    def_on_create(pdev_zerodev_create)
+};
 EXPORT_DEVICE(zerodev, &devzero_def, load_onboot);