Chameleon Commit Details - 2494 - Chameleon open source boot loader project.

Date:

2014-11-29 04:20:54 (9 years 4 months ago)

Author:

ErmaC

Commit:

2494

Parents:

2493

Message:

Merge patch from issue 386 (boot2 does not know how to read files from FAT partitions on GPT) credits to zenith432

Changes:

M	/trunk/i386/libsaio/disk.c
M	/trunk/CHANGES

File differences

-1478
1479 1479
1480 1480
1481 
1481
1482 1482
1483 1483
1484 1484
1485 1485
1486 1486
1487 
1487
1488 1488
1489 1489
1490 1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1491 1506
1492 1507
1493 1508
+␉␉␉␉{␊
␉␉␉␉␉case FDISK_NTFS:␊
␉␉␉␉␉␉bvr = newGPTBVRef(biosdev, gptID, gptMap->ent_lba_start, gptMap,␊
␉␉␉␉␉␉0, 0, 0, 0, 0, 0, NTFSGetDescription,␊
␉␉␉␉␉␉0, 0, 0, 0, 0, NTFSGetUUID, NTFSGetDescription,␊
␉␉␉␉␉␉(BVFree)free, 0, kBIOSDevTypeHardDrive, 0);␊
␉␉␉␉␉␉break;␊
␊
␉␉␉␉␉case FDISK_LINUX:␊
␉␉␉␉␉␉bvr = newGPTBVRef(biosdev, gptID, gptMap->ent_lba_start, gptMap,␊
␉␉␉␉␉␉0, 0, 0, 0, 0, 0, EX2GetDescription,␊
␉␉␉␉␉␉0, 0, 0, 0, 0, EX2GetUUID, EX2GetDescription,␊
␉␉␉␉␉␉(BVFree)free, 0, kBIOSDevTypeHardDrive, 0);␊
␉␉␉␉␉␉break;␊
␊
␉␉␉␉␉case FDISK_FAT32:␊
␉␉␉␉␉case FDISK_DOS12:␊
␉␉␉␉␉case FDISK_DOS16B:␊
␉␉␉␉␉␉bvr = newGPTBVRef(biosdev, gptID, gptMap->ent_lba_start, gptMap,␊
␉␉␉␉␉␉MSDOSInitPartition,␊
␉␉␉␉␉␉MSDOSLoadFile,␊
␉␉␉␉␉␉MSDOSReadFile,␊
␉␉␉␉␉␉MSDOSGetDirEntry,␊
␉␉␉␉␉␉MSDOSGetFileBlock,␊
␉␉␉␉␉␉MSDOSGetUUID,␊
␉␉␉␉␉␉MSDOSGetDescription,␊
␉␉␉␉␉␉MSDOSFree,␊
␉␉␉␉␉␉0, kBIOSDevTypeHardDrive, 0);␊
␉␉␉␉␉␉break;␊
␊
␉␉␉␉␉default:␊
␉␉␉␉␉␉bvr = newGPTBVRef(biosdev, gptID, gptMap->ent_lba_start, gptMap,␊
␉␉␉␉␉␉0, 0, 0, 0, 0, 0, 0,␊
 ␉␉␉␉{␊
 ␉␉␉␉␉case FDISK_NTFS:␊
 ␉␉␉␉␉␉bvr = newGPTBVRef(biosdev, gptID, gptMap->ent_lba_start, gptMap,␊
-␉␉␉␉␉␉0, 0, 0, 0, 0, 0, NTFSGetDescription,␊
+␉␉␉␉␉␉0, 0, 0, 0, 0, NTFSGetUUID, NTFSGetDescription,␊
 ␉␉␉␉␉␉(BVFree)free, 0, kBIOSDevTypeHardDrive, 0);␊
 ␉␉␉␉␉␉break;␊
 ␊
 ␉␉␉␉␉case FDISK_LINUX:␊
 ␉␉␉␉␉␉bvr = newGPTBVRef(biosdev, gptID, gptMap->ent_lba_start, gptMap,␊
-␉␉␉␉␉␉0, 0, 0, 0, 0, 0, EX2GetDescription,␊
+␉␉␉␉␉␉0, 0, 0, 0, 0, EX2GetUUID, EX2GetDescription,␊
 ␉␉␉␉␉␉(BVFree)free, 0, kBIOSDevTypeHardDrive, 0);␊
 ␉␉␉␉␉␉break;␊
 ␊
+␉␉␉␉␉case FDISK_FAT32:␊
+␉␉␉␉␉case FDISK_DOS12:␊
+␉␉␉␉␉case FDISK_DOS16B:␊
+␉␉␉␉␉␉bvr = newGPTBVRef(biosdev, gptID, gptMap->ent_lba_start, gptMap,␊
+␉␉␉␉␉␉MSDOSInitPartition,␊
+␉␉␉␉␉␉MSDOSLoadFile,␊
+␉␉␉␉␉␉MSDOSReadFile,␊
+␉␉␉␉␉␉MSDOSGetDirEntry,␊
+␉␉␉␉␉␉MSDOSGetFileBlock,␊
+␉␉␉␉␉␉MSDOSGetUUID,␊
+␉␉␉␉␉␉MSDOSGetDescription,␊
+␉␉␉␉␉␉MSDOSFree,␊
+␉␉␉␉␉␉0, kBIOSDevTypeHardDrive, 0);␊
+␉␉␉␉␉␉break;␊
+␊
 ␉␉␉␉␉default:␊
 ␉␉␉␉␉␉bvr = newGPTBVRef(biosdev, gptID, gptMap->ent_lba_start, gptMap,␊
 ␉␉␉␉␉␉0, 0, 0, 0, 0, 0, 0,␊

-
1 2
2 3
3 4
+- zenith432 : Merge patch from issue 386 (boot2 does not know how to read files from FAT partitions on GPT)␊
- meklort : Update laoder.h to latest, declare gMI global, Load modules passed in via the multiboot header / first bootloader,␊
␉␉Fix mboot.h include, Add ?log command to print out bdmesg without needing Wait=y, Add slightly more debugging for modules.␊
- ErmaC : Rename CPU_MODEL_xxx into CPUID_MODEL_xxx follow Apple source name␊
+- zenith432 : Merge patch from issue 386 (boot2 does not know how to read files from FAT partitions on GPT)␊
 - meklort : Update laoder.h to latest, declare gMI global, Load modules passed in via the multiboot header / first bootloader,␊
 ␉␉Fix mboot.h include, Add ?log command to print out bdmesg without needing Wait=y, Add slightly more debugging for modules.␊
 - ErmaC : Rename CPU_MODEL_xxx into CPUID_MODEL_xxx follow Apple source name␊

Download the corresponding diff file