The-Homebrew-Cloud/libfat
2
0
Fork 0
mirror of https://github.com/wiiu-env/libfat.git synced 2024-11-22 18:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reload partition boot sector when sector 0 is an MBR

Browse Source
This commit is contained in:
Michael Chisholm 2008-11-30 07:12:08 +00:00
parent 94c4eac0cb
commit 198df1272d
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/partition.c
View File

@ -103,7 +103,7 @@ PARTITION* _FAT_partition_constructor (const DISC_INTERFACE* disc, uint32_t cach
uint8_t sectorBuffer[BYTES_PER_READ] = {0}; uint8_t sectorBuffer[BYTES_PER_READ] = {0};
// Read first sector of disc // Read first sector of disc
if ( !_FAT_disc_readSectors (disc, 0, 1, sectorBuffer)) { if (!_FAT_disc_readSectors (disc, startSector, 1, sectorBuffer)) {
return NULL; return NULL;
} }
@ -130,12 +130,20 @@ PARTITION* _FAT_partition_constructor (const DISC_INTERFACE* disc, uint32_t cach
for (i=0x1BE; (i < 0x1FE) && (sectorBuffer[i+0x04] == 0x00); i+= 0x10); for (i=0x1BE; (i < 0x1FE) && (sectorBuffer[i+0x04] == 0x00); i+= 0x10);
} }
// Go to first valid partition
if ( i != 0x1FE) { if ( i != 0x1FE) {
// Make sure it found a partition // Go to first valid partition
startSector = u8array_to_u32(sectorBuffer, 0x8 + i); startSector = u8array_to_u32(sectorBuffer, 0x8 + i);
// Load the BPB
if (!_FAT_disc_readSectors (disc, startSector, 1, sectorBuffer)) {
return NULL;
}
// Make sure it is a valid BPB
if ( (sectorBuffer[BPB_bootSig_55] != 0x55) || (sectorBuffer[BPB_bootSig_AA] != 0xAA)) {
return NULL;
}
} else { } else {
startSector = 0; // No partition found, assume this is a MBR free disk // No partition found, assume this is a MBR free disk
startSector = 0;
} }
} }
@ -146,11 +154,6 @@ PARTITION* _FAT_partition_constructor (const DISC_INTERFACE* disc, uint32_t cach
return NULL; return NULL;
} }
// Read in boot sector
if ( !_FAT_disc_readSectors (disc, startSector, 1, sectorBuffer)) {
return NULL;
}
partition = (PARTITION*) _FAT_mem_allocate (sizeof(PARTITION)); partition = (PARTITION*) _FAT_mem_allocate (sizeof(PARTITION));
if (partition == NULL) { if (partition == NULL) {
return NULL; return NULL;
@ -253,8 +256,10 @@ PARTITION* _FAT_partition_getPartitionFromPath (const char* path) {
devops = GetDeviceOpTab (path); devops = GetDeviceOpTab (path);
if (!devops) { if (!devops) {
iprintf ("\n%s %d\n", __FILE__, __LINE__);
return NULL; return NULL;
} }
iprintf ("\n%s %d\n", __FILE__, __LINE__);
return (PARTITION*)devops->deviceData; return (PARTITION*)devops->deviceData;
} }