X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Fvfs%2Ffs%2Ffat.c;h=32bff8d862e49eebdbeac95fd0084fd627a2f599;hb=156885e938b60fee9d061d989ae7711c9aeea493;hp=984c9b4fba6de88653e40e5c6e3c049a18e4dd34;hpb=246ff98ae5b16ef0e19fe082a9c900e9169a1f7b;p=tpg%2Facess2.git diff --git a/Kernel/vfs/fs/fat.c b/Kernel/vfs/fs/fat.c index 984c9b4f..32bff8d8 100644 --- a/Kernel/vfs/fs/fat.c +++ b/Kernel/vfs/fs/fat.c @@ -55,7 +55,7 @@ tVFS_Driver gFAT_FSInfo = { int FAT_Install(char **Arguments) { VFS_AddDriver( &gFAT_FSInfo ); - return MODULE_INIT_SUCCESS; + return MODULE_ERR_OK; } /** @@ -116,6 +116,7 @@ tVFS_Node *FAT_InitDevice(char *Device, char **options) case FAT12: sFatType = "FAT12"; break; case FAT16: sFatType = "FAT16"; break; case FAT32: sFatType = "FAT32"; break; + default: sFatType = "UNKNOWN"; break; } if(iSize <= 2*1024) { sSize = "KiB"; @@ -648,14 +649,12 @@ char *FAT_ReadDir(tVFS_Node *dirNode, int dirpos) offset += (cluster - 2) * disk->bootsect.spc; } // Sector in cluster - if(disk->bootsect.spc == 1) - offset += (dirpos / 16); - else + if(disk->bootsect.spc != 1) offset += (dirpos / 16) % disk->bootsect.spc; // Offset in sector a = dirpos % 16; - LOG("offset=%i, a=%i", (Uint)offset, a); + LOG("offset=%i, a=%i", offset, a); // Read Sector VFS_ReadAt(disk->fileHandle, offset*512, 512, fileinfo); // Read Dir Data