extern tVFS_Node *FAT_int_CacheNode(tFAT_VolInfo *Disk, const tVFS_Node *Node);
// === CODE ===
+tTime FAT_int_GetAcessTimestamp(Uint16 Date, Uint16 Time, Uint8 MS)
+{
+ return MS * 10 + timestamp(
+ // Seconds Minutes Hours
+ (Time & 0x1F) * 2, (Time >> 5) & 0x3F, (Time >> 11) & 0x1F,
+ // Day Month Year
+ (Date & 0x1F) - 1, ((Date >> 5) & 0xF) - 1, 1980 + ((Date >> 9) & 0xFF)
+ );
+}
+
+void FAT_int_GetFATTimestamp(tTime AcessTimestamp, Uint16 *Date, Uint16 *Time, Uint8 *MS)
+{
+ int y, m, d;
+ int h, min, s, ms;
+ format_date(AcessTimestamp, &y, &m, &d, &h, &min, &s, &ms);
+ if(Date)
+ *Date = (d + 1) | ((m + 1) << 5) | ((y - 1980) << 9);
+ if(Time)
+ *Time = (s / 2) | (min << 5) | (h << 11);
+ if(MS)
+ *MS = (ms / 10) + (s & 1) * 100;
+}
+
/**
* \brief Creates a tVFS_Node structure for a given file entry
* \param Parent Parent directory VFS node
ENTER("pParent pEntry", Parent, Entry);
LOG("disk = %p", disk);
- if( (ret = FAT_int_GetNode(disk, Entry->cluster | (Entry->clusterHi<<16))) ) {
- LEAVE('p', ret);
- return ret;
+ if( (ret = FAT_int_GetNode(disk, Entry->cluster | (Entry->clusterHi<<16))) )
+ {
+ if( (ret->Inode >> 32) != 0 )
+ {
+ LEAVE('p', ret);
+ return ret;
+ }
+ }
+ else
+ {
+ ret = &node;
+ memset(ret, 0, sizeof(tVFS_Node));
}
-
- memset(&node, 0, sizeof(tVFS_Node));
// Set Other Data
// 0-27: Cluster, 32-59: Parent Cluster
- node.Inode = Entry->cluster | (Entry->clusterHi<<16) | (Parent->Inode << 32);
- LOG("node.Inode = %llx", node.Inode);
- node.ImplInt = 0;
+ ret->Inode = Entry->cluster | (Entry->clusterHi<<16) | (Parent->Inode << 32);
+ LOG("node.Inode = %llx", ret->Inode);
+ ret->ImplInt = 0;
// Disk Pointer
- node.ImplPtr = disk;
- node.Size = Entry->size;
+ ret->ImplPtr = disk;
+ ret->Size = Entry->size;
LOG("Entry->size = %i", Entry->size);
// root:root
- node.UID = 0; node.GID = 0;
- node.NumACLs = 1;
+ ret->UID = 0; ret->GID = 0;
+ ret->NumACLs = 1;
- node.Flags = 0;
- if(Entry->attrib & ATTR_DIRECTORY) node.Flags |= VFS_FFLAG_DIRECTORY;
+ ret->Flags = 0;
+ if(Entry->attrib & ATTR_DIRECTORY)
+ ret->Flags |= VFS_FFLAG_DIRECTORY;
if(Entry->attrib & ATTR_READONLY) {
- node.Flags |= VFS_FFLAG_READONLY;
- node.ACLs = &gVFS_ACL_EveryoneRX; // R-XR-XR-X
+ ret->Flags |= VFS_FFLAG_READONLY;
+ ret->ACLs = &gVFS_ACL_EveryoneRX; // R-XR-XR-X
}
else {
- node.ACLs = &gVFS_ACL_EveryoneRWX; // RWXRWXRWX
+ ret->ACLs = &gVFS_ACL_EveryoneRWX; // RWXRWXRWX
}
// Create timestamps
- node.ATime = timestamp(0,0,0,
- ((Entry->adate&0x1F) - 1), // Days
- ((Entry->adate&0x1E0) - 1), // Months
- 1980+((Entry->adate&0xFF00)>>8) // Years
- );
-
- node.CTime = Entry->ctimems * 10; // Miliseconds
- node.CTime += timestamp(
- ((Entry->ctime&0x1F)<<1), // Seconds
- ((Entry->ctime&0x3F0)>>5), // Minutes
- ((Entry->ctime&0xF800)>>11), // Hours
- ((Entry->cdate&0x1F)-1), // Days
- ((Entry->cdate&0x1E0)-1), // Months
- 1980+((Entry->cdate&0xFF00)>>8) // Years
- );
-
- node.MTime = timestamp(
- ((Entry->mtime&0x1F)<<1), // Seconds
- ((Entry->mtime&0x3F0)>>5), // Minutes
- ((Entry->mtime&0xF800)>>11), // Hours
- ((Entry->mdate&0x1F)-1), // Days
- ((Entry->mdate&0x1E0)-1), // Months
- 1980+((Entry->mdate&0xFF00)>>8) // Years
- );
+ ret->CTime = FAT_int_GetAcessTimestamp(Entry->cdate, Entry->ctime, Entry->ctimems);
+ ret->MTime = FAT_int_GetAcessTimestamp(Entry->mdate, Entry->mtime, 0);
+ ret->ATime = FAT_int_GetAcessTimestamp(Entry->adate, 0, 0);
// Set pointers
- if(node.Flags & VFS_FFLAG_DIRECTORY) {
+ if(ret->Flags & VFS_FFLAG_DIRECTORY) {
//Log_Debug("FAT", "Directory %08x has size 0x%x", node.Inode, node.Size);
- node.Type = &gFAT_DirType;
- node.Size = -1;
+ ret->Type = &gFAT_DirType;
+ ret->Size = -1;
}
else {
- node.Type = &gFAT_FileType;
+ ret->Type = &gFAT_FileType;
}
- // TODO: Cache node
- ret = FAT_int_CacheNode(disk, &node);
+ // Cache node only if we're not updating a cache
+ if( ret == &node ) {
+ ret = FAT_int_CacheNode(disk, &node);
+ }
+
LEAVE('p', ret);
return ret;
}
tVFS_Node *FAT_int_CreateIncompleteDirNode(tFAT_VolInfo *Disk, Uint32 Cluster)
{
+ if( Cluster == Disk->rootOffset )
+ return &Disk->rootNode;
+
// If the directory isn't in the cache, what do?
// - we want to lock it such that we don't collide, but don't want to put crap data in the cache
// - Put a temp node in with a flag that indicates it's incomplete?
- return NULL;
+
+ Mutex_Acquire(&Disk->lNodeCache);
+ tFAT_CachedNode *cnode, *prev = NULL;
+
+ for(cnode = Disk->NodeCache; cnode; prev = cnode, cnode = cnode->Next)
+ {
+ if( (cnode->Node.Inode & 0xFFFFFFFF) == Cluster ) {
+ cnode->Node.ReferenceCount ++;
+ Mutex_Release(&Disk->lNodeCache);
+ return &cnode->Node;
+ }
+ }
+
+ // Create a temporary node?
+ cnode = calloc( sizeof(tFAT_CachedNode), 1 );
+ cnode->Node.Inode = Cluster;
+ cnode->Node.ReferenceCount = 1;
+ cnode->Node.ImplPtr = Disk;
+ cnode->Node.Type = &gFAT_DirType;
+ cnode->Node.Size = -1;
+
+ if( prev )
+ prev->Next = cnode;
+ else
+ Disk->NodeCache = cnode;
+
+ Mutex_Release(&Disk->lNodeCache);
+ return &cnode->Node;
}
tVFS_Node *FAT_int_GetNode(tFAT_VolInfo *Disk, Uint32 Cluster)
Mutex_Release(&Disk->lNodeCache);
return &cnode->Node;
}
- }
+ }
Mutex_Release(&Disk->lNodeCache);
return NULL;
}
if(Node->ReferenceCount == 0 && cnode) {
// Already out of the list :)
- free(cnode->Node.Data);
+ if(cnode->Node.Data)
+ free(cnode->Node.Data);
free(cnode);
bFreed = 1;
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au