Module/ATA - Slight cleanup

[tpg/acess2.git] / KernelLand / Modules / Storage / LVM / mbr.c

diff --git a/KernelLand/Modules/Storage/LVM/mbr.c b/KernelLand/Modules/Storage/LVM/mbr.c
index 169f6f3..9de8fcd 100644 (file)
--- a/KernelLand/Modules/Storage/LVM/mbr.c
+++ b/KernelLand/Modules/Storage/LVM/mbr.c
@@ -16,6 +16,11 @@ void LVM_MBR_PopulateSubvolumes(tLVM_Vol *Volume, void *FirstSector);
 Uint64 LVM_MBR_int_ReadExt(tLVM_Vol *Volume, Uint64 Addr, Uint64 *Base, Uint64 *Length);
 
 // === GLOBALS ===
+tLVM_Format    gLVM_MBRType = {
+       .Name = "MBR",
+       .CountSubvolumes = LVM_MBR_CountSubvolumes,
+       .PopulateSubvolumes = LVM_MBR_PopulateSubvolumes
+};
 
 // === CODE ===
 /**
@@ -68,10 +73,19 @@ int LVM_MBR_CountSubvolumes(tLVM_Vol *Volume, void *FirstSector)
                        numPartitions ++;
                }
        }
+       // Detect the GPT protector
+       if( extendedLBA == 0 && numPartitions == 1 && MBR->Parts[0].SystemID == 0xEE )
+       {
+               // TODO: Hand off to GPT parsing code
+               Log_Warning("LBA MBR", "TODO: Hand off to GPT");
+       }
+       
+       // Handle extended partions
        while(extendedLBA != 0)
        {
                extendedLBA = LVM_MBR_int_ReadExt(Volume, extendedLBA, &base, &len);
-               if( extendedLBA == -1 ) break;
+               if( extendedLBA == (Uint64)-1 )
+                       break;
                numPartitions ++;
        }
        LOG("numPartitions = %i", numPartitions);
@@ -122,7 +136,8 @@ void LVM_MBR_PopulateSubvolumes(tLVM_Vol *Volume, void *FirstSector)
        while(extendedLBA != 0)
        {
                extendedLBA = LVM_MBR_int_ReadExt(Volume, extendedLBA, &base, &len);
-               if(extendedLBA == -1)   break;
+               if(extendedLBA == (Uint64)-1)
+                       break;
                LVM_int_SetSubvolume_Anon( Volume, j, base, len );
                j ++ ;
        }