git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes to the module loader to handle specific errors from modules
[tpg/acess2.git]
/
Kernel
/
vfs
/
fs
/
fat.c
diff --git
a/Kernel/vfs/fs/fat.c
b/Kernel/vfs/fs/fat.c
index
984c9b4
..
32bff8d
100644
(file)
--- 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)
\r
{
\r
VFS_AddDriver( &gFAT_FSInfo );
\r
int FAT_Install(char **Arguments)
\r
{
\r
VFS_AddDriver( &gFAT_FSInfo );
\r
- return MODULE_
INIT_SUCCESS
;
\r
+ return MODULE_
ERR_OK
;
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-116,6
+116,7
@@
tVFS_Node *FAT_InitDevice(char *Device, char **options)
case FAT12: sFatType = "FAT12"; break;
\r
case FAT16: sFatType = "FAT16"; break;
\r
case FAT32: sFatType = "FAT32"; break;
\r
case FAT12: sFatType = "FAT12"; break;
\r
case FAT16: sFatType = "FAT16"; break;
\r
case FAT32: sFatType = "FAT32"; break;
\r
+ default: sFatType = "UNKNOWN"; break;
\r
}
\r
if(iSize <= 2*1024) {
\r
sSize = "KiB";
\r
}
\r
if(iSize <= 2*1024) {
\r
sSize = "KiB";
\r
@@
-648,14
+649,12
@@
char *FAT_ReadDir(tVFS_Node *dirNode, int dirpos)
offset += (cluster - 2) * disk->bootsect.spc;
\r
}
\r
// Sector in cluster
\r
offset += (cluster - 2) * disk->bootsect.spc;
\r
}
\r
// Sector in cluster
\r
- if(disk->bootsect.spc == 1)
\r
- offset += (dirpos / 16);
\r
- else
\r
+ if(disk->bootsect.spc != 1)
\r
offset += (dirpos / 16) % disk->bootsect.spc;
\r
// Offset in sector
\r
a = dirpos % 16;
\r
\r
offset += (dirpos / 16) % disk->bootsect.spc;
\r
// Offset in sector
\r
a = dirpos % 16;
\r
\r
- LOG("offset=%i, a=%i",
(Uint)
offset, a);
\r
+ LOG("offset=%i, a=%i", offset, a);
\r
\r
// Read Sector
\r
VFS_ReadAt(disk->fileHandle, offset*512, 512, fileinfo); // Read Dir Data
\r
\r
// Read Sector
\r
VFS_ReadAt(disk->fileHandle, offset*512, 512, fileinfo); // Read Dir Data
\r
UCC
git Repository :: git.ucc.asn.au