Decoupling Architectural-specific Code (#35)

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

diff --git a/lunaix-os/kernel/block/blkpart_gpt.c b/lunaix-os/kernel/block/blkpart_gpt.c
index 22bb48b6d7bb61b9e9afd89d1fc8718446af9611..e9770ceaeb8beaebd084c1ad6a8d92f683cfe2b4 100644 (file)
--- a/lunaix-os/kernel/block/blkpart_gpt.c
+++ b/lunaix-os/kernel/block/blkpart_gpt.c
@@ -5,10 +5,12 @@
 #include <lunaix/status.h>
 #include <lunaix/syslog.h>
 
 #include <lunaix/status.h>
 #include <lunaix/syslog.h>
 

-#include <lib/crc.h>
+#include <sys/muldiv64.h>
+
+#include <klibc/crc.h>

 
 #define GPT_BLKSIZE 512
 
 #define GPT_BLKSIZE 512

-#define LBA2OFF(lba) ((lba)*GPT_BLKSIZE)
+#define LBA2OFF(lba) ((lba) * GPT_BLKSIZE)

 #define ENT_PER_BLK (GPT_BLKSIZE / sizeof(struct gpt_entry))
 
 #define GPTSIG_LO 0x20494645UL
 #define ENT_PER_BLK (GPT_BLKSIZE / sizeof(struct gpt_entry))
 
 #define GPTSIG_LO 0x20494645UL


@@ -25,13 +27,13 @@ blkpart_parse(struct device* master, struct gpt_header* header)
     if (!bdev)
         return ENODEV;
 
     if (!bdev)
         return ENODEV;
 

-    int errno;
+    int errno = 0;

     u32_t ent_lba = (u32_t)header->ents_lba;
     struct gpt_entry* ents_parial = (struct gpt_entry*)valloc(GPT_BLKSIZE);
 
     for (size_t i = 0; i < header->ents_len; i++) {
         if (!(i % ENT_PER_BLK)) {
     u32_t ent_lba = (u32_t)header->ents_lba;
     struct gpt_entry* ents_parial = (struct gpt_entry*)valloc(GPT_BLKSIZE);
 
     for (size_t i = 0; i < header->ents_len; i++) {
         if (!(i % ENT_PER_BLK)) {

-            errno = master->read(
+            errno = master->ops.read(

               master, ents_parial, LBA2OFF(ent_lba++), GPT_BLKSIZE);
             if (errno < 0) {
                 goto done;
               master, ents_parial, LBA2OFF(ent_lba++), GPT_BLKSIZE);
             if (errno < 0) {
                 goto done;


@@ -46,10 +48,10 @@ blkpart_parse(struct device* master, struct gpt_header* header)
         }
 
         // Convert UEFI's 512B LB representation into local LBA range.
         }
 
         // Convert UEFI's 512B LB representation into local LBA range.

-        u64_t slba_local = (ent->start_lba * GPT_BLKSIZE) / bdev->blk_size;
-        u64_t elba_local = (ent->end_lba * GPT_BLKSIZE) / (u64_t)bdev->blk_size;
+        u64_t slba_local = udiv64(ent->start_lba * GPT_BLKSIZE, bdev->blk_size);
+        u64_t elba_local = udiv64(ent->end_lba * GPT_BLKSIZE, bdev->blk_size);

 
 

-        kprintf("%s: guid part#%d: %d..%d\n",
+        kprintf("%s: guid part#%d: %d..%d",

                 bdev->bdev_id,
                 i,
                 (u32_t)slba_local,
                 bdev->bdev_id,
                 i,
                 (u32_t)slba_local,


@@ -69,7 +71,8 @@ blkpart_probegpt(struct device* master)
     int errno;
     struct gpt_header* gpt_hdr = (struct gpt_header*)valloc(GPT_BLKSIZE);
 
     int errno;
     struct gpt_header* gpt_hdr = (struct gpt_header*)valloc(GPT_BLKSIZE);
 

-    if ((errno = master->read(master, gpt_hdr, LBA2OFF(1), LBA2OFF(1))) < 0) {
+    if ((errno = master->ops.read(master, gpt_hdr, LBA2OFF(1), LBA2OFF(1))) <
+        0) {

         goto done;
     }
 
         goto done;
     }
 


@@ -81,7 +84,7 @@ blkpart_probegpt(struct device* master)
     u32_t crc = gpt_hdr->hdr_cksum;
     gpt_hdr->hdr_cksum = 0;
     if (crc32b((void*)gpt_hdr, sizeof(*gpt_hdr)) != crc) {
     u32_t crc = gpt_hdr->hdr_cksum;
     gpt_hdr->hdr_cksum = 0;
     if (crc32b((void*)gpt_hdr, sizeof(*gpt_hdr)) != crc) {

-        kprintf(KWARN "checksum failed\n");
+        WARN("checksum failed");

         // FUTURE check the backup header
         return EINVAL;
     }
         // FUTURE check the backup header
         return EINVAL;
     }