fix: symlink resolve.

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

diff --git a/lunaix-os/kernel/block.c b/lunaix-os/kernel/block.c
index 23b937488a9b1cd197c942e0f1dcb60d8c4404a7..b855910ffc18fc12a1506e105540dda74fc62964 100644 (file)
--- a/lunaix-os/kernel/block.c
+++ b/lunaix-os/kernel/block.c
@@ -39,60 +39,24 @@ block_init()
 }
 
 int
 }
 
 int

-__block_read(struct v_file* file, void* buffer, size_t len);
-
-int
-__block_write(struct v_file* file, void* buffer, size_t len);
-
-void
-block_twifs_create()
+__block_read(struct device* dev, void* buf, size_t offset, size_t len)

 {
 {

-    struct twifs_node* dev = twifs_toplevel_node("dev", 3);
-    struct twifs_node* dev_block = twifs_dir_node(dev, "block", 5);
-
-    if (!dev_block) {
-        kprintf(KERROR "fail to create twifs node");
-        return;
-    }
-
-    struct block_dev* bdev;
-    struct twifs_node* bdev_node;
-    for (size_t i = 0; i < MAX_DEV; i++) {
-        if (!(bdev = dev_registry[i])) {
-            continue;
-        }
-
-        bdev_node =
-          twifs_dir_node(dev_block, bdev->bdev_id, strlen(bdev->bdev_id));
-        bdev_node->fops.read = __block_read;
-        bdev_node->fops.write = __block_write;
-        bdev_node->data = i;
-        bdev_node->inode->fsize = bdev->hd_dev->max_lba;
-    }
-}
-
-int
-__block_read(struct v_file* file, void* buffer, size_t len)
-{
-    int index = (int)((struct twifs_node*)file->inode->data)->data;

     int errno;
     int errno;

-    struct block_dev* bdev;
-    if (index < 0 || index >= MAX_DEV || !(bdev = dev_registry[index])) {
-        return ENXIO;
-    }
+    struct block_dev* bdev = (struct block_dev*)dev->underlay;

     size_t acc_size = 0, rd_size = 0, bsize = bdev->hd_dev->block_size,
     size_t acc_size = 0, rd_size = 0, bsize = bdev->hd_dev->block_size,

-           rd_block = 0;
-    void* block = valloc(bsize);
+           rd_block = offset / bsize, r = offset % bsize;
+    void* block = vzalloc(bsize);

 
     while (acc_size < len) {
         if (!bdev->hd_dev->ops.read_buffer(
 
     while (acc_size < len) {
         if (!bdev->hd_dev->ops.read_buffer(

-              bdev->hd_dev, file->f_pos + rd_block, block, bsize)) {
+              bdev->hd_dev, rd_block, block, bsize)) {

             errno = ENXIO;
             goto error;
         }
             errno = ENXIO;
             goto error;
         }

-        rd_size = MIN(len - acc_size, bsize);
-        memcpy(buffer + acc_size, block, rd_size);
+        rd_size = MIN(len - acc_size, bsize - r);
+        memcpy(buf + acc_size, block + r, rd_size);

         acc_size += rd_size;
         acc_size += rd_size;

+        r = 0;

         rd_block++;
     }
 
         rd_block++;
     }
 


@@ -105,27 +69,24 @@ error:
 }
 
 int
 }
 
 int

-__block_write(struct v_file* file, void* buffer, size_t len)
+__block_write(struct device* dev, void* buf, size_t offset, size_t len)

 {
 {

-    int index = (int)((struct twifs_node*)file->inode->data)->data;

     int errno;
     int errno;

-    struct block_dev* bdev;
-    if (index < 0 || index >= MAX_DEV || !(bdev = dev_registry[index])) {
-        return ENXIO;
-    }
+    struct block_dev* bdev = (struct block_dev*)dev->underlay;

     size_t acc_size = 0, wr_size = 0, bsize = bdev->hd_dev->block_size,
     size_t acc_size = 0, wr_size = 0, bsize = bdev->hd_dev->block_size,

-           wr_block = 0;
-    void* block = valloc(bsize);
+           wr_block = offset / bsize, r = offset % bsize;
+    void* block = vzalloc(bsize);

 
     while (acc_size < len) {
 
     while (acc_size < len) {

-        wr_size = MIN(len - acc_size, bsize);
-        memcpy(block, buffer + acc_size, wr_size);
+        wr_size = MIN(len - acc_size, bsize - r);
+        memcpy(block + r, buf + acc_size, wr_size);

         if (!bdev->hd_dev->ops.write_buffer(
         if (!bdev->hd_dev->ops.write_buffer(

-              bdev->hd_dev, file->f_pos + wr_block, block, bsize)) {
+              bdev->hd_dev, wr_block, block, bsize)) {

             errno = ENXIO;
             break;
         }
         acc_size += wr_size;
             errno = ENXIO;
             break;
         }
         acc_size += wr_size;

+        r = 0;

         wr_block++;
     }
 
         wr_block++;
     }
 


@@ -141,12 +102,12 @@ int
 block_mount_disk(struct hba_device* hd_dev)
 {
     int errno = 0;
 block_mount_disk(struct hba_device* hd_dev)
 {
     int errno = 0;

-    struct block_dev* dev = cake_grab(lbd_pile);
-    strncpy(dev->name, hd_dev->model, PARTITION_NAME_SIZE);
-    dev->hd_dev = hd_dev;
-    dev->base_lba = 0;
-    dev->end_lba = hd_dev->max_lba;
-    if (!__block_register(dev)) {
+    struct block_dev* bdev = cake_grab(lbd_pile);
+    strncpy(bdev->name, hd_dev->model, PARTITION_NAME_SIZE);
+    bdev->hd_dev = hd_dev;
+    bdev->base_lba = 0;
+    bdev->end_lba = hd_dev->max_lba;
+    if (!__block_register(bdev)) {

         errno = BLOCK_EFULL;
         goto error;
     }
         errno = BLOCK_EFULL;
         goto error;
     }


@@ -160,63 +121,18 @@ error:
             -errno);
 }
 
             -errno);
 }
 

-// FIXME make it more general, manipulate the device through vfs mapping

 int
 int

-__block_mount_partitions(struct hba_device* hd_dev)
-{
-    int errno = 0;
-    void* buffer = valloc_dma(hd_dev->block_size);
-    if (!hd_dev->ops.read_buffer(hd_dev, 1, buffer, hd_dev->block_size)) {
-        errno = BLOCK_EREAD;
-        goto done;
-    }
-
-    struct lpt_header* header = (struct lpt_header*)buffer;
-    if (header->signature != LPT_SIG) {
-        errno = BLOCK_ESIG;
-        goto done;
-    }
-
-    if (header->crc != crc32b(buffer, sizeof(*header))) {
-        errno = BLOCK_ECRC;
-        goto done;
-    }
-
-    uint64_t lba = header->pt_start_lba;
-    int j = 0;
-    int count_per_sector = hd_dev->block_size / sizeof(struct lpt_entry);
-    while (lba < header->pt_end_lba) {
-        if (!hd_dev->ops.read_buffer(hd_dev, lba, buffer, hd_dev->block_size)) {
-            errno = BLOCK_EREAD;
-            goto done;
-        }
-        struct lpt_entry* entry = (struct lpt_entry*)buffer;
-        for (int i = 0; i < count_per_sector; i++, j++) {
-            struct block_dev* dev = cake_grab(lbd_pile);
-            strncpy(dev->name, entry->part_name, PARTITION_NAME_SIZE);
-            dev->hd_dev = hd_dev;
-            dev->base_lba = entry->base_lba;
-            dev->end_lba = entry->end_lba;
-            __block_register(dev);
-
-            if (j >= header->table_len) {
-                goto done;
-            }
-        }
-    }
-
-done:
-    vfree_dma(buffer);
-    return -errno;
-}
-
-int
-__block_register(struct block_dev* dev)
+__block_register(struct block_dev* bdev)

 {
     if (free_slot >= MAX_DEV) {
         return 0;
     }
 {
     if (free_slot >= MAX_DEV) {
         return 0;
     }

-    snprintf(dev->bdev_id, DEV_ID_SIZE, "bd%x", free_slot);
-    dev_registry[free_slot++] = dev;
+
+    struct device* dev = device_addvol(NULL, bdev, "sd%c", 'a' + free_slot);
+    dev->write = __block_write;
+    dev->read = __block_read;
+
+    bdev->dev = dev;
+    dev_registry[free_slot++] = bdev;

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