Cleaned up MBR code.

Author: pradosh-arduino

source/includes/ahci.h

@@ -139,21 +139,6 @@ typedef struct {
 
 extern ahci_disk_info_t ahci_disks[32];
 
-typedef struct {
-    int disk;
-    uint32_t lba_start;
-    uint32_t sectors;
-    uint8_t type;
-} block_part_t;
-
-// For block devics
-typedef struct {
-    int port;
-    uint64_t sectors;
-
-    block_part_t partitions[4];
-} block_disk_t;
-
 /**
  * @brief Global AHCI controller pointer.
  */

source/includes/disk/mbr.h

@@ -11,13 +11,9 @@
 #ifndef MBR_H
 #define MBR_H
 #include <basics.h>
-#include <ahci.h>
 
 #define MBR_PART_BOOTABLE   0x80
 
-extern block_disk_t mbr_disks[10];
-extern int mbr_disks_count;
-
 typedef struct {
     uint8_t boot_flag;
     uint8_t chs_start[3];
@@ -27,6 +23,25 @@ typedef struct {
     uint32_t num_sectors;
 } __attribute__((packed)) mbr_partition_t;
 
+// Simplified and cleaned up mbr
+typedef struct {
+    int disk;
+    uint32_t lba_start;
+    uint32_t sectors;
+    uint8_t type;
+} mbr_part_t;
+
+// For block devics
+typedef struct {
+    int port;
+    uint64_t sectors;
+
+    mbr_part_t partitions[4];
+} mbr_disk_t;
+
+extern mbr_disk_t mbr_disks[10];
+extern int mbr_disks_count;
+
 int check_mbr(int portno);
 void parse_mbr_partitions(int8* mbr, int portno);
 

source/kernel/C/disk/mbr.c

@@ -13,7 +13,7 @@
 #include <ahci.h>
 #include <filesystems/fat16.h>
 
-block_disk_t mbr_disks[10];
+mbr_disk_t mbr_disks[10];
 int mbr_disks_count = 0;
 
 int check_mbr(int portno){

source/kernel/C/shell/commands/lsblk.c

@@ -51,7 +51,7 @@ static void print_part_tree(
         printfnoln("disk%dp%d   ", disk_id, p + 1);
 
         if (!is_gpt) {
-            block_part_t* part = &((block_part_t*)parts)[p];
+            mbr_part_t* part = &((mbr_part_t*)parts)[p];
             print_size(part->sectors);
         } else {
             gpt_partition_t* part = &((gpt_partition_t*)parts)[p];
@@ -73,7 +73,7 @@ int cmd_lsblk(int argc, char** argv)
 
     /* ---------- MBR DISKS ---------- */
     for (int i = 0; i < mbr_disks_count; i++) {
-        block_disk_t* d = &mbr_disks[i];
+        mbr_disk_t* d = &mbr_disks[i];
 
         if (d->sectors == 0)
             continue;