feat: kprintf now goes into dedicated pseudo-dev rather than flooding the framebuffer

[lunaix-os.git] / lunaix-os / kernel / block / block.c

diff --git a/lunaix-os/kernel/block/block.c b/lunaix-os/kernel/block/block.c
index 460e94bf3c4690394b4bf2240113ace6ae5a5397..3f3c1e8ab647905375a0efb1acec730a8fbdbc98 100644 (file)
--- a/lunaix-os/kernel/block/block.c
+++ b/lunaix-os/kernel/block/block.c
@@ -1,4 +1,4 @@
-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>

 #include <klibc/string.h>
 
 #include <hal/ahci/hba.h>
 #include <klibc/string.h>
 
 #include <hal/ahci/hba.h>


@@ -295,7 +295,7 @@ block_mount(struct block_dev* bdev, devfs_exporter fs_export)
 
     errno = blkpart_probegpt(bdev->dev);
     if (errno < 0) {
 
     errno = blkpart_probegpt(bdev->dev);
     if (errno < 0) {

-        kprintf(KERROR "Fail to parse partition table (%d)\n", errno);
+        kprintf(KERROR "Fail to parse partition table (%d)", errno);

     } else if (!errno) {
         // TODO try other PT parser...
     }
     } else if (!errno) {
         // TODO try other PT parser...
     }


@@ -307,7 +307,7 @@ block_mount(struct block_dev* bdev, devfs_exporter fs_export)
     return errno;
 
 error:
     return errno;
 
 error:

-    kprintf(KERROR "Fail to mount block device: %s (%x)\n", bdev->name, -errno);
+    kprintf(KERROR "Fail to mount block device: %s (%x)", bdev->name, -errno);

     return errno;
 }
 
     return errno;
 }
 


@@ -318,16 +318,19 @@ __block_register(struct block_dev* bdev)
         return 0;
     }
 
         return 0;
     }
 

-    struct device* dev =
-      device_addvol(blk_parent_dev, bdev, "sd%c", 'a' + free_slot);
+    struct device* dev = device_allocvol(blk_parent_dev, bdev);

     dev->ops.write = __block_write;
     dev->ops.write_page = __block_write_page;
     dev->ops.read = __block_read;
     dev->ops.read_page = __block_read_page;
 
     bdev->dev = dev;
     dev->ops.write = __block_write;
     dev->ops.write_page = __block_write_page;
     dev->ops.read = __block_read;
     dev->ops.read_page = __block_read_page;
 
     bdev->dev = dev;

-    strcpy(bdev->bdev_id, dev->name_val);
+
+    device_register(dev, bdev->class, "sd%c", 'a' + free_slot);

     dev_registry[free_slot++] = bdev;
     dev_registry[free_slot++] = bdev;

+
+    strcpy(bdev->bdev_id, dev->name_val);
+

     return 1;
 }
 
     return 1;
 }
 


@@ -341,8 +344,7 @@ blk_mount_part(struct block_dev* bdev,
     struct block_dev* pbdev = cake_grab(lbd_pile);
     memcpy(pbdev, bdev, sizeof(*bdev));
 
     struct block_dev* pbdev = cake_grab(lbd_pile);
     memcpy(pbdev, bdev, sizeof(*bdev));
 

-    struct device* dev =
-      device_addvol(NULL, pbdev, "%sp%d", bdev->bdev_id, index + 1);
+    struct device* dev = device_allocvol(NULL, pbdev);

     dev->ops.write = __block_write;
     dev->ops.write_page = __block_write_page;
     dev->ops.read = __block_read;
     dev->ops.write = __block_write;
     dev->ops.write_page = __block_write_page;
     dev->ops.read = __block_read;


@@ -359,5 +361,7 @@ blk_mount_part(struct block_dev* bdev,
 
     llist_append(&bdev->parts, &pbdev->parts);
 
 
     llist_append(&bdev->parts, &pbdev->parts);
 

+    device_register(dev, pbdev->class, "%sp%d", bdev->bdev_id, index + 1);
+

     return pbdev;
 }
\ No newline at end of file
     return pbdev;
 }
\ No newline at end of file