// --- Helpers\r
int FAT_int_GetAddress(tVFS_Node *Node, Uint64 Offset, Uint64 *Addr, Uint32 *Cluster);\r
// --- File IO\r
-size_t FAT_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer);\r
+size_t FAT_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags);\r
#if SUPPORT_WRITE\r
-size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer);\r
+size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer, Uint Flags);\r
#endif\r
void FAT_CloseFile(tVFS_Node *node);\r
\r
\r
if(bs.bps == 0 || bs.spc == 0)\r
return 0;\r
- \r
+\r
+ Log_Debug("FAT", "_Detect: Media type = %02x", bs.mediaDesc);\r
+ if( bs.mediaDesc < 0xF0 )\r
+ return 0;\r
+\r
return 1;\r
}\r
/**\r
// Compute Root directory offset\r
if(diskInfo->type == FAT32)\r
diskInfo->rootOffset = bs->spec.fat32.rootClust;\r
- else\r
+ else {\r
+ diskInfo->RootSector = FATSz * bs->fatCount;\r
diskInfo->rootOffset = (FATSz * bs->fatCount) / bs->spc;\r
+ }\r
\r
diskInfo->firstDataSect = bs->resvSectCount + (bs->fatCount * FATSz) + RootDirSectors;\r
\r
\r
cluster = base_cluster = Node->Inode & 0xFFFFFFF; // Cluster ID\r
// LOG("base cluster = 0x%07x", cluster);\r
- \r
- // Do Cluster Skip\r
+\r
+ // Handle root directory\r
// - Pre FAT32 had a reserved area for the root.\r
- if( disk->type == FAT32 || cluster != disk->rootOffset )\r
+ if( disk->type != FAT32 && Node == &disk->rootNode )\r
{\r
- skip = Offset / disk->BytesPerCluster;\r
- LOG("skip = %i", skip);\r
- // Skip previous clusters\r
- for(; skip-- ; )\r
- {\r
- if(Cluster) *Cluster = cluster;\r
- cluster = FAT_int_GetFatValue(disk, cluster);\r
- // Check for end of cluster chain\r
- if(cluster == 0xFFFFFFFF) { LEAVE('i', 1); return 1;}\r
+ Uint32 root_byte_count = disk->bootsect.files_in_root * 32 ;\r
+ if( Offset >= root_byte_count ) {\r
+ LOG("FAT12/16 root out of range (%i >= %i)", Offset, root_byte_count);\r
+ LEAVE('i', 1);\r
+ return 1;\r
}\r
- if(Cluster) *Cluster = cluster;\r
+ LOG("FAT12/16 root");\r
+ \r
+ // Calculate address\r
+ addr = (disk->bootsect.resvSectCount + disk->RootSector) * disk->bootsect.bps;\r
+ addr += Offset;\r
+\r
+ LOG("addr = %llx", addr);\r
+ *Addr = addr;\r
+ LEAVE('i', 0);\r
+ return 0;\r
}\r
- else {\r
- // TODO: Bounds checking on root\r
-// LOG("Root cluster count %i", disk->bootsect.files_in_root*32/disk->BytesPerCluster);\r
- // Increment by clusters in offset\r
- cluster += Offset / disk->BytesPerCluster;\r
+\r
+ // Do Cluster Skip\r
+ skip = Offset / disk->BytesPerCluster;\r
+ LOG("skip = %i", skip);\r
+ // Skip previous clusters\r
+ for(; skip-- ; )\r
+ {\r
+ if(Cluster) *Cluster = cluster;\r
+ cluster = FAT_int_GetFatValue(disk, cluster);\r
+ // Check for end of cluster chain\r
+ if(cluster == GETFATVALUE_EOC) { LEAVE('i', 1); return 1; }\r
}\r
+ if(Cluster) *Cluster = cluster;\r
\r
-// LOG("cluster = 0x%07x", cluster);\r
+ LOG("cluster = 0x%07x", cluster);\r
\r
// Bounds Checking (Used to spot corruption)\r
if(cluster > disk->ClusterCount + 2)\r
}\r
\r
// Compute Offsets\r
- // - Pre FAT32 cluster base (in sectors)\r
- if( base_cluster == disk->rootOffset && disk->type != FAT32 ) {\r
- addr = disk->bootsect.resvSectCount * disk->bootsect.bps;\r
- addr += cluster * disk->BytesPerCluster;\r
- }\r
- else {\r
- addr = disk->firstDataSect * disk->bootsect.bps;\r
- addr += (cluster - 2) * disk->BytesPerCluster;\r
- }\r
+ addr = disk->firstDataSect * disk->bootsect.bps;\r
+ addr += (cluster - 2) * disk->BytesPerCluster;\r
// In-cluster offset\r
addr += Offset % disk->BytesPerCluster;\r
\r
/**\r
* \brief Reads data from a specified file\r
*/\r
-size_t FAT_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)\r
+size_t FAT_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags)\r
{\r
int preSkip, count;\r
Uint64 final_bytes;\r
for(i = preSkip; i--; )\r
{\r
cluster = FAT_int_GetFatValue(disk, cluster);\r
- if(cluster == -1) {\r
+ if(cluster == GETFATVALUE_EOC) {\r
Log_Warning("FAT", "Offset is past end of cluster chain mark");\r
LEAVE('i', 0);\r
return 0;\r
}\r
}\r
\r
+ // TODO: Handle (Flags & VFS_IOFLAG_NOBLOCK)\r
+\r
// Reading from within one cluster\r
if((int)Offset + (int)Length <= bpc)\r
{\r
LOG("pos = %i, Reading the rest of the clusters");\r
// Get next cluster in the chain\r
cluster = FAT_int_GetFatValue(disk, cluster);\r
- if(cluster == -1) {\r
+ if(cluster == GETFATVALUE_EOC) {\r
Log_Warning("FAT", "Read past End of Cluster Chain (Align)");\r
LEAVE('X', pos);\r
return pos;\r
// Read the rest of the cluster data\r
for( ; count; count -- )\r
{\r
- if(cluster == -1) {\r
+ if(cluster == GETFATVALUE_EOC) {\r
Log_Warning("FAT", "Read past End of Cluster Chain (Bulk)");\r
LEAVE('X', pos);\r
return pos;\r
* \param Length Size of data to write\r
* \param Buffer Data source\r
*/\r
-size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer)\r
+size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer, Uint Flags)\r
{\r
tFAT_VolInfo *disk = Node->ImplPtr;\r
char tmpBuf[disk->BytesPerCluster];\r
off_t original_offset = Offset;\r
\r
if(Offset > Node->Size) return 0;\r
+ // TODO: Handle (Flags & VFS_IOFLAG_NOBLOCK)\r
\r
ENTER("pNode Xoffset xlength pbuffer", Node, Offset, Length, Buffer);\r
\r
while( Offset > disk->BytesPerCluster )\r
{\r
cluster = FAT_int_GetFatValue( disk, cluster );\r
- if(cluster == -1) {\r
+ if(cluster == GETFATVALUE_EOC) {\r
Log_Warning("FAT", "EOC Unexpectedly Reached");\r
LEAVE('i', 0);\r
return 0;\r
\r
// Get next cluster (allocating if needed)\r
tmpCluster = FAT_int_GetFatValue(disk, cluster);\r
- if(tmpCluster == -1) {\r
+ if(tmpCluster == GETFATVALUE_EOC) {\r
tmpCluster = FAT_int_AllocateCluster(disk, cluster);\r
if( tmpCluster == 0 )\r
goto ret_incomplete;\r
\r
// Get next cluster (allocating if needed)\r
tmpCluster = FAT_int_GetFatValue(disk, cluster);\r
- if(tmpCluster == -1) {\r
+ if(tmpCluster == GETFATVALUE_EOC) {\r
bNewCluster = 1;\r
tmpCluster = FAT_int_AllocateCluster(disk, cluster);\r
if( tmpCluster == 0 )\r